From 4c58727a4f33e5092ba0a279adbdc34ad631d54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Thu, 10 Aug 2023 01:21:29 +0800
Subject: [PATCH] first commit

---
 .idea/.gitignore                              |    8 +
 .idea/construction.iml                        |    9 +
 .idea/modules.xml                             |    8 +
 .idea/vcs.xml                                 |    6 +
 cloudfunctions/callback/config.json           |    7 +
 cloudfunctions/callback/index.js              |   26 +
 cloudfunctions/callback/package.json          |   14 +
 cloudfunctions/echo/config.json               |    5 +
 cloudfunctions/echo/index.js                  |    8 +
 cloudfunctions/echo/package.json              |   14 +
 cloudfunctions/login/config.json              |    5 +
 cloudfunctions/login/index.js                 |   36 +
 cloudfunctions/login/package.json             |   14 +
 cloudfunctions/openapi/config.json            |   15 +
 cloudfunctions/openapi/index.js               |   87 +
 cloudfunctions/openapi/package.json           |   14 +
 miniprogram/app.js                            |  152 ++
 miniprogram/app.js.mine                       |   71 +
 miniprogram/app.json                          |  147 ++
 miniprogram/app.wxss                          | 1525 +++++++++++++++++
 miniprogram/components/@mkl/cell/index.d.ts   |    1 +
 miniprogram/components/@mkl/cell/index.js     |   37 +
 miniprogram/components/@mkl/cell/index.json   |    6 +
 miniprogram/components/@mkl/cell/index.wxml   |   45 +
 miniprogram/components/@mkl/cell/index.wxss   |    1 +
 .../components/@mkl/collapse-item/index.d.ts  |    1 +
 .../components/@mkl/collapse-item/index.js    |   92 +
 .../components/@mkl/collapse-item/index.json  |    6 +
 .../components/@mkl/collapse-item/index.wxml  |   15 +
 .../components/@mkl/collapse-item/index.wxss  |   60 +
 .../components/@mkl/collapse/index.d.ts       |    1 +
 miniprogram/components/@mkl/collapse/index.js |   47 +
 .../components/@mkl/collapse/index.json       |    3 +
 .../components/@mkl/collapse/index.wxml       |    3 +
 .../components/@mkl/collapse/index.wxss       |    1 +
 miniprogram/components/@mkl/common/color.d.ts |    7 +
 miniprogram/components/@mkl/common/color.js   |    7 +
 .../components/@mkl/common/component.d.ts     |    3 +
 .../components/@mkl/common/component.js       |  101 ++
 miniprogram/components/@mkl/common/index.wxss |    1 +
 .../@mkl/common/style/clearfix.wxss           |    1 +
 .../@mkl/common/style/ellipsis.wxss           |    1 +
 .../@mkl/common/style/hairline.wxss           |    1 +
 .../@mkl/common/style/mixins/clearfix.wxss    |    0
 .../@mkl/common/style/mixins/ellipsis.wxss    |    0
 .../@mkl/common/style/mixins/hairline.wxss    |    0
 .../components/@mkl/common/style/theme.wxss   |    0
 .../components/@mkl/common/style/var.wxss     |    0
 miniprogram/components/@mkl/common/utils.d.ts |    8 +
 miniprogram/components/@mkl/common/utils.js   |   32 +
 .../components/@mkl/common/version.d.ts       |    2 +
 miniprogram/components/@mkl/common/version.js |   31 +
 miniprogram/components/@mkl/icon/index.d.ts   |    1 +
 miniprogram/components/@mkl/icon/index.js     |   27 +
 miniprogram/components/@mkl/icon/index.json   |    6 +
 miniprogram/components/@mkl/icon/index.wxml   |   20 +
 miniprogram/components/@mkl/icon/index.wxss   |    1 +
 miniprogram/components/@mkl/info/index.d.ts   |    1 +
 miniprogram/components/@mkl/info/index.js     |    8 +
 miniprogram/components/@mkl/info/index.json   |    3 +
 miniprogram/components/@mkl/info/index.wxml   |    7 +
 miniprogram/components/@mkl/info/index.wxss   |    1 +
 .../components/@mkl/loading/index.d.ts        |    1 +
 miniprogram/components/@mkl/loading/index.js  |   16 +
 .../components/@mkl/loading/index.json        |    3 +
 .../components/@mkl/loading/index.wxml        |   18 +
 .../components/@mkl/loading/index.wxss        |    1 +
 miniprogram/components/@mkl/mixins/basic.d.ts |    1 +
 miniprogram/components/@mkl/mixins/basic.js   |   27 +
 .../components/@mkl/mixins/button.d.ts        |    1 +
 miniprogram/components/@mkl/mixins/button.js  |   15 +
 miniprogram/components/@mkl/mixins/link.d.ts  |    1 +
 miniprogram/components/@mkl/mixins/link.js    |   17 +
 .../components/@mkl/mixins/open-type.d.ts     |    1 +
 .../components/@mkl/mixins/open-type.js       |   25 +
 .../components/@mkl/mixins/page-scroll.d.ts   |    5 +
 .../components/@mkl/mixins/page-scroll.js     |   33 +
 miniprogram/components/@mkl/mixins/touch.d.ts |    1 +
 miniprogram/components/@mkl/mixins/touch.js   |   36 +
 .../components/@mkl/mixins/transition.d.ts    |    1 +
 .../components/@mkl/mixins/transition.js      |  118 ++
 .../components/@mkl/multi-select/index.d.ts   |    1 +
 .../components/@mkl/multi-select/index.js     |  145 ++
 .../components/@mkl/multi-select/index.json   |    6 +
 .../components/@mkl/multi-select/index.wxml   |    1 +
 .../components/@mkl/multi-select/index.wxss   |    1 +
 .../components/@mkl/picker-column/index.d.ts  |    1 +
 .../components/@mkl/picker-column/index.js    |  123 ++
 .../components/@mkl/picker-column/index.json  |    3 +
 .../components/@mkl/picker-column/index.wxml  |   22 +
 .../components/@mkl/picker-column/index.wxs   |    8 +
 .../components/@mkl/picker-column/index.wxss  |    1 +
 miniprogram/components/@mkl/picker/index.d.ts |    1 +
 miniprogram/components/@mkl/picker/index.js   |  145 ++
 miniprogram/components/@mkl/picker/index.json |    7 +
 miniprogram/components/@mkl/picker/index.wxml |   19 +
 miniprogram/components/@mkl/picker/index.wxss |    1 +
 .../components/@mkl/picker/shared.d.ts        |   21 +
 miniprogram/components/@mkl/picker/shared.js  |   21 +
 .../components/@mkl/picker/toolbar.wxml       |   28 +
 miniprogram/components/@mkl/sticky/index.d.ts |    1 +
 miniprogram/components/@mkl/sticky/index.js   |  105 ++
 miniprogram/components/@mkl/sticky/index.json |    3 +
 miniprogram/components/@mkl/sticky/index.wxml |    7 +
 miniprogram/components/@mkl/sticky/index.wxs  |   37 +
 miniprogram/components/@mkl/sticky/index.wxss |    1 +
 miniprogram/components/@mkl/tab/index.d.ts    |    1 +
 miniprogram/components/@mkl/tab/index.js      |   59 +
 miniprogram/components/@mkl/tab/index.json    |    3 +
 miniprogram/components/@mkl/tab/index.wxml    |    4 +
 miniprogram/components/@mkl/tab/index.wxss    |   21 +
 miniprogram/components/@mkl/tabs/index.d.ts   |    1 +
 miniprogram/components/@mkl/tabs/index.js     |  255 +++
 miniprogram/components/@mkl/tabs/index.json   |    7 +
 miniprogram/components/@mkl/tabs/index.wxml   |   26 +
 miniprogram/components/@mkl/tabs/index.wxs    |   64 +
 miniprogram/components/@mkl/tabs/index.wxss   |  134 ++
 miniprogram/components/@mkl/wxs/add-unit.wxs  |   14 +
 miniprogram/components/@mkl/wxs/array.wxs     |    5 +
 miniprogram/components/@mkl/wxs/bem.wxs       |   38 +
 miniprogram/components/@mkl/wxs/memoize.wxs   |   54 +
 miniprogram/components/@mkl/wxs/object.wxs    |   13 +
 miniprogram/components/@mkl/wxs/utils.wxs     |   10 +
 miniprogram/components/chatroom/chatroom.js   |  336 ++++
 miniprogram/components/chatroom/chatroom.json |    4 +
 miniprogram/components/chatroom/chatroom.wxml |   85 +
 miniprogram/components/chatroom/chatroom.wxss |  161 ++
 miniprogram/components/chatroom/photo.png     |  Bin 0 -> 3692 bytes
 miniprogram/ec-canvas/ec-canvas.js            |  250 +++
 miniprogram/ec-canvas/ec-canvas.json          |    4 +
 miniprogram/ec-canvas/ec-canvas.wxml          |    4 +
 miniprogram/ec-canvas/ec-canvas.wxss          |    4 +
 miniprogram/ec-canvas/echarts.js              |   22 +
 miniprogram/ec-canvas/wx-canvas.js            |  121 ++
 miniprogram/images/biyan.png                  |  Bin 0 -> 579 bytes
 miniprogram/images/bottom.png                 |  Bin 0 -> 1280 bytes
 miniprogram/images/core.png                   |  Bin 0 -> 1091 bytes
 miniprogram/images/cz_1.png                   |  Bin 0 -> 1960 bytes
 miniprogram/images/cz_2.png                   |  Bin 0 -> 1317 bytes
 miniprogram/images/dingwei.png                |  Bin 0 -> 4176 bytes
 miniprogram/images/early.png                  |  Bin 0 -> 3302 bytes
 miniprogram/images/fanhui.png                 |  Bin 0 -> 1304 bytes
 miniprogram/images/foot_1.png                 |  Bin 0 -> 1225 bytes
 miniprogram/images/foot_2.png                 |  Bin 0 -> 1218 bytes
 miniprogram/images/foot_3.png                 |  Bin 0 -> 1922 bytes
 miniprogram/images/foot_4.png                 |  Bin 0 -> 1749 bytes
 miniprogram/images/foot_5.png                 |  Bin 0 -> 1856 bytes
 miniprogram/images/foot_6.png                 |  Bin 0 -> 1623 bytes
 miniprogram/images/foot_7.png                 |  Bin 0 -> 2650 bytes
 miniprogram/images/footer_1.png               |  Bin 0 -> 1237 bytes
 miniprogram/images/footer_2.png               |  Bin 0 -> 1270 bytes
 miniprogram/images/footer_3.png               |  Bin 0 -> 1886 bytes
 miniprogram/images/footer_4.png               |  Bin 0 -> 1914 bytes
 miniprogram/images/footer_5.png               |  Bin 0 -> 1764 bytes
 miniprogram/images/footer_6.png               |  Bin 0 -> 1727 bytes
 miniprogram/images/footer_7.png               |  Bin 0 -> 2092 bytes
 miniprogram/images/guodu.gif                  |  Bin 0 -> 2538 bytes
 miniprogram/images/i_location.png             |  Bin 0 -> 4541 bytes
 miniprogram/images/i_mechanics.png            |  Bin 0 -> 4895 bytes
 miniprogram/images/i_personnel.png            |  Bin 0 -> 4250 bytes
 miniprogram/images/icon_1.png                 |  Bin 0 -> 3365 bytes
 miniprogram/images/icon_2.png                 |  Bin 0 -> 2592 bytes
 miniprogram/images/icon_3.png                 |  Bin 0 -> 3580 bytes
 miniprogram/images/icon_4.png                 |  Bin 0 -> 3215 bytes
 miniprogram/images/icon_5.png                 |  Bin 0 -> 2647 bytes
 miniprogram/images/icons_1.png                |  Bin 0 -> 1965 bytes
 miniprogram/images/icons_2.png                |  Bin 0 -> 1342 bytes
 miniprogram/images/icons_3.png                |  Bin 0 -> 1989 bytes
 miniprogram/images/icons_4.png                |  Bin 0 -> 1723 bytes
 miniprogram/images/icons_5.png                |  Bin 0 -> 1435 bytes
 miniprogram/images/img_1.png                  |  Bin 0 -> 2178 bytes
 miniprogram/images/img_10.png                 |  Bin 0 -> 3681 bytes
 miniprogram/images/img_11.png                 |  Bin 0 -> 3630 bytes
 miniprogram/images/img_12.png                 |  Bin 0 -> 3549 bytes
 miniprogram/images/img_2.png                  |  Bin 0 -> 1838 bytes
 miniprogram/images/img_3.png                  |  Bin 0 -> 1800 bytes
 miniprogram/images/img_4.png                  |  Bin 0 -> 1346 bytes
 miniprogram/images/img_5.png                  |  Bin 0 -> 1888 bytes
 miniprogram/images/img_6.png                  |  Bin 0 -> 2125 bytes
 miniprogram/images/img_7.png                  |  Bin 0 -> 1482 bytes
 miniprogram/images/img_8.png                  |  Bin 0 -> 1991 bytes
 miniprogram/images/img_9.png                  |  Bin 0 -> 3523 bytes
 miniprogram/images/jt.png                     |  Bin 0 -> 2899 bytes
 miniprogram/images/left.png                   |  Bin 0 -> 3404 bytes
 miniprogram/images/lw_1.png                   |  Bin 0 -> 1545 bytes
 miniprogram/images/lw_2.png                   |  Bin 0 -> 1521 bytes
 miniprogram/images/lw_3.png                   |  Bin 0 -> 1794 bytes
 miniprogram/images/lw_4.png                   |  Bin 0 -> 1669 bytes
 miniprogram/images/lw_5.png                   |  Bin 0 -> 1462 bytes
 miniprogram/images/lw_6.png                   |  Bin 0 -> 1378 bytes
 miniprogram/images/lw_7.png                   |  Bin 0 -> 1299 bytes
 miniprogram/images/lw_8.png                   |  Bin 0 -> 1740 bytes
 miniprogram/images/middl_right.png            |  Bin 0 -> 3159 bytes
 miniprogram/images/middle_left.png            |  Bin 0 -> 3123 bytes
 miniprogram/images/quanping.png               |  Bin 0 -> 1289 bytes
 miniprogram/images/right.png                  |  Bin 0 -> 1320 bytes
 miniprogram/images/s_1.png                    |  Bin 0 -> 2515 bytes
 miniprogram/images/s_10.png                   |  Bin 0 -> 1953 bytes
 miniprogram/images/s_11.png                   |  Bin 0 -> 1912 bytes
 miniprogram/images/s_12.png                   |  Bin 0 -> 1887 bytes
 miniprogram/images/s_13.png                   |  Bin 0 -> 2016 bytes
 miniprogram/images/s_14.png                   |  Bin 0 -> 1961 bytes
 miniprogram/images/s_15.png                   |  Bin 0 -> 1914 bytes
 miniprogram/images/s_16.png                   |  Bin 0 -> 2124 bytes
 miniprogram/images/s_17.png                   |  Bin 0 -> 2081 bytes
 miniprogram/images/s_18.png                   |  Bin 0 -> 1699 bytes
 miniprogram/images/s_2.png                    |  Bin 0 -> 2078 bytes
 miniprogram/images/s_3.png                    |  Bin 0 -> 2529 bytes
 miniprogram/images/s_4.png                    |  Bin 0 -> 2098 bytes
 miniprogram/images/s_5.png                    |  Bin 0 -> 2048 bytes
 miniprogram/images/s_6.png                    |  Bin 0 -> 1549 bytes
 miniprogram/images/s_7.png                    |  Bin 0 -> 1787 bytes
 miniprogram/images/s_8.png                    |  Bin 0 -> 1624 bytes
 miniprogram/images/s_9.png                    |  Bin 0 -> 1477 bytes
 miniprogram/images/set.png                    |  Bin 0 -> 2260 bytes
 miniprogram/images/sliding_up.png             |  Bin 0 -> 3376 bytes
 miniprogram/images/user_3.png                 |  Bin 0 -> 4920 bytes
 miniprogram/images/video.png                  |  Bin 0 -> 1660 bytes
 miniprogram/images/warning.png                |  Bin 0 -> 1408 bytes
 miniprogram/images/wl_fg.png                  |  Bin 0 -> 1961 bytes
 miniprogram/images/yj_01.png                  |  Bin 0 -> 556 bytes
 .../@vant/weapp/action-sheet/index.js         |   64 +
 .../@vant/weapp/action-sheet/index.json       |    8 +
 .../@vant/weapp/action-sheet/index.wxml       |   67 +
 .../@vant/weapp/action-sheet/index.wxss       |    1 +
 .../miniprogram_npm/@vant/weapp/area/index.js |  257 +++
 .../@vant/weapp/area/index.json               |    6 +
 .../@vant/weapp/area/index.wxml               |   18 +
 .../@vant/weapp/area/index.wxss               |    1 +
 .../@vant/weapp/button/index.js               |   81 +
 .../@vant/weapp/button/index.json             |    7 +
 .../@vant/weapp/button/index.wxml             |   68 +
 .../@vant/weapp/button/index.wxss             |    1 +
 .../@vant/weapp/calendar/calendar.wxml        |   57 +
 .../weapp/calendar/components/header/index.js |   18 +
 .../calendar/components/header/index.json     |    3 +
 .../calendar/components/header/index.wxml     |   16 +
 .../calendar/components/header/index.wxss     |    1 +
 .../weapp/calendar/components/month/index.js  |  167 ++
 .../calendar/components/month/index.json      |    3 +
 .../calendar/components/month/index.wxml      |   39 +
 .../weapp/calendar/components/month/index.wxs |   67 +
 .../calendar/components/month/index.wxss      |    1 +
 .../@vant/weapp/calendar/index.js             |  318 ++++
 .../@vant/weapp/calendar/index.json           |    9 +
 .../@vant/weapp/calendar/index.wxml           |   31 +
 .../@vant/weapp/calendar/index.wxs            |   37 +
 .../@vant/weapp/calendar/index.wxss           |    1 +
 .../@vant/weapp/calendar/utils.js             |   91 +
 .../@vant/weapp/calendar/utils.wxs            |   25 +
 .../miniprogram_npm/@vant/weapp/card/index.js |   51 +
 .../@vant/weapp/card/index.json               |    6 +
 .../@vant/weapp/card/index.wxml               |   50 +
 .../@vant/weapp/card/index.wxss               |    1 +
 .../@vant/weapp/cell-group/index.js           |   12 +
 .../@vant/weapp/cell-group/index.json         |    3 +
 .../@vant/weapp/cell-group/index.wxml         |    9 +
 .../@vant/weapp/cell-group/index.wxss         |    1 +
 .../miniprogram_npm/@vant/weapp/cell/index.js |   39 +
 .../@vant/weapp/cell/index.json               |    6 +
 .../@vant/weapp/cell/index.wxml               |   45 +
 .../@vant/weapp/cell/index.wxss               |    1 +
 .../@vant/weapp/checkbox-group/index.js       |   42 +
 .../@vant/weapp/checkbox-group/index.json     |    3 +
 .../@vant/weapp/checkbox-group/index.wxml     |    1 +
 .../@vant/weapp/checkbox-group/index.wxss     |    1 +
 .../@vant/weapp/checkbox/index.js             |   83 +
 .../@vant/weapp/checkbox/index.json           |    6 +
 .../@vant/weapp/checkbox/index.wxml           |   20 +
 .../@vant/weapp/checkbox/index.wxs            |   20 +
 .../@vant/weapp/checkbox/index.wxss           |    1 +
 .../@vant/weapp/circle/canvas.js              |   47 +
 .../@vant/weapp/circle/index.js               |  209 +++
 .../@vant/weapp/circle/index.json             |    3 +
 .../@vant/weapp/circle/index.wxml             |    9 +
 .../@vant/weapp/circle/index.wxss             |    1 +
 .../miniprogram_npm/@vant/weapp/col/index.js  |   28 +
 .../@vant/weapp/col/index.json                |    3 +
 .../@vant/weapp/col/index.wxml                |    8 +
 .../@vant/weapp/col/index.wxss                |    1 +
 .../@vant/weapp/collapse-item/index.js        |  114 ++
 .../@vant/weapp/collapse-item/index.json      |    6 +
 .../@vant/weapp/collapse-item/index.wxml      |   44 +
 .../@vant/weapp/collapse-item/index.wxss      |    1 +
 .../@vant/weapp/collapse/index.js             |   53 +
 .../@vant/weapp/collapse/index.json           |    3 +
 .../@vant/weapp/collapse/index.wxml           |    3 +
 .../@vant/weapp/collapse/index.wxss           |    1 +
 .../@vant/weapp/common/color.js               |   10 +
 .../@vant/weapp/common/component.js           |  118 ++
 .../@vant/weapp/common/index.wxss             |    1 +
 .../@vant/weapp/common/style/clearfix.wxss    |    1 +
 .../@vant/weapp/common/style/ellipsis.wxss    |    1 +
 .../@vant/weapp/common/style/hairline.wxss    |    1 +
 .../weapp/common/style/mixins/clearfix.wxss   |    0
 .../weapp/common/style/mixins/ellipsis.wxss   |    0
 .../weapp/common/style/mixins/hairline.wxss   |    0
 .../@vant/weapp/common/style/theme.wxss       |    0
 .../@vant/weapp/common/style/var.wxss         |    0
 .../@vant/weapp/common/utils.js               |   42 +
 .../@vant/weapp/common/version.js             |   36 +
 .../@vant/weapp/count-down/index.js           |  103 ++
 .../@vant/weapp/count-down/index.json         |    3 +
 .../@vant/weapp/count-down/index.wxml         |    4 +
 .../@vant/weapp/count-down/index.wxss         |    1 +
 .../@vant/weapp/count-down/utils.js           |   65 +
 .../@vant/weapp/datetime-picker/index.js      |  377 ++++
 .../@vant/weapp/datetime-picker/index.json    |    6 +
 .../@vant/weapp/datetime-picker/index.wxml    |   16 +
 .../@vant/weapp/datetime-picker/index.wxss    |    1 +
 .../@vant/weapp/definitions/index.js          |    2 +
 .../@vant/weapp/definitions/weapp.js          |    2 +
 .../@vant/weapp/dialog/dialog.js              |   85 +
 .../@vant/weapp/dialog/index.js               |  111 ++
 .../@vant/weapp/dialog/index.json             |    7 +
 .../@vant/weapp/dialog/index.wxml             |   71 +
 .../@vant/weapp/dialog/index.wxss             |    1 +
 .../@vant/weapp/divider/index.js              |   35 +
 .../@vant/weapp/divider/index.json            |    4 +
 .../@vant/weapp/divider/index.wxml            |    8 +
 .../@vant/weapp/divider/index.wxss            |    1 +
 .../@vant/weapp/dropdown-item/index.js        |  115 ++
 .../@vant/weapp/dropdown-item/index.json      |    8 +
 .../@vant/weapp/dropdown-item/index.wxml      |   48 +
 .../@vant/weapp/dropdown-item/index.wxss      |    1 +
 .../@vant/weapp/dropdown-menu/index.js        |  133 ++
 .../@vant/weapp/dropdown-menu/index.json      |    3 +
 .../@vant/weapp/dropdown-menu/index.wxml      |   23 +
 .../@vant/weapp/dropdown-menu/index.wxs       |   16 +
 .../@vant/weapp/dropdown-menu/index.wxss      |    1 +
 .../@vant/weapp/field/index.js                |  147 ++
 .../@vant/weapp/field/index.json              |    7 +
 .../@vant/weapp/field/index.wxml              |  105 ++
 .../@vant/weapp/field/index.wxs               |   21 +
 .../@vant/weapp/field/index.wxss              |    1 +
 .../@vant/weapp/field/props.js                |   66 +
 .../@vant/weapp/goods-action-button/index.js  |   44 +
 .../weapp/goods-action-button/index.json      |    6 +
 .../weapp/goods-action-button/index.wxml      |   30 +
 .../weapp/goods-action-button/index.wxss      |    1 +
 .../@vant/weapp/goods-action-icon/index.js    |   24 +
 .../@vant/weapp/goods-action-icon/index.json  |    7 +
 .../@vant/weapp/goods-action-icon/index.wxml  |   38 +
 .../@vant/weapp/goods-action-icon/index.wxss  |    1 +
 .../@vant/weapp/goods-action/index.js         |   35 +
 .../@vant/weapp/goods-action/index.json       |    3 +
 .../@vant/weapp/goods-action/index.wxml       |    5 +
 .../@vant/weapp/goods-action/index.wxss       |    1 +
 .../@vant/weapp/grid-item/index.js            |   85 +
 .../@vant/weapp/grid-item/index.json          |    6 +
 .../@vant/weapp/grid-item/index.wxml          |   22 +
 .../@vant/weapp/grid-item/index.wxss          |    1 +
 .../miniprogram_npm/@vant/weapp/grid/index.js |   67 +
 .../@vant/weapp/grid/index.json               |    3 +
 .../@vant/weapp/grid/index.wxml               |    3 +
 .../@vant/weapp/grid/index.wxss               |    1 +
 .../miniprogram_npm/@vant/weapp/icon/index.js |   29 +
 .../@vant/weapp/icon/index.json               |    6 +
 .../@vant/weapp/icon/index.wxml               |   20 +
 .../@vant/weapp/icon/index.wxss               |    1 +
 .../@vant/weapp/image/index.js                |  106 ++
 .../@vant/weapp/image/index.json              |    7 +
 .../@vant/weapp/image/index.wxml              |   33 +
 .../@vant/weapp/image/index.wxss              |    1 +
 .../@vant/weapp/index-anchor/index.js         |   33 +
 .../@vant/weapp/index-anchor/index.json       |    3 +
 .../@vant/weapp/index-anchor/index.wxml       |   14 +
 .../@vant/weapp/index-anchor/index.wxss       |    1 +
 .../@vant/weapp/index-bar/index.js            |  279 +++
 .../@vant/weapp/index-bar/index.json          |    3 +
 .../@vant/weapp/index-bar/index.wxml          |   22 +
 .../@vant/weapp/index-bar/index.wxss          |    1 +
 .../miniprogram_npm/@vant/weapp/info/index.js |   10 +
 .../@vant/weapp/info/index.json               |    3 +
 .../@vant/weapp/info/index.wxml               |    7 +
 .../@vant/weapp/info/index.wxss               |    1 +
 .../@vant/weapp/loading/index.js              |   18 +
 .../@vant/weapp/loading/index.json            |    3 +
 .../@vant/weapp/loading/index.wxml            |   18 +
 .../@vant/weapp/loading/index.wxss            |    1 +
 .../@vant/weapp/mixins/basic.js               |   37 +
 .../@vant/weapp/mixins/button.js              |   18 +
 .../@vant/weapp/mixins/link.js                |   23 +
 .../@vant/weapp/mixins/open-type.js           |   28 +
 .../@vant/weapp/mixins/page-scroll.js         |   40 +
 .../@vant/weapp/mixins/touch.js               |   39 +
 .../@vant/weapp/mixins/transition.js          |  161 ++
 .../@vant/weapp/nav-bar/index.js              |   75 +
 .../@vant/weapp/nav-bar/index.json            |    6 +
 .../@vant/weapp/nav-bar/index.wxml            |   41 +
 .../@vant/weapp/nav-bar/index.wxss            |    1 +
 .../@vant/weapp/notice-bar/index.js           |  140 ++
 .../@vant/weapp/notice-bar/index.json         |    6 +
 .../@vant/weapp/notice-bar/index.wxml         |   37 +
 .../@vant/weapp/notice-bar/index.wxss         |    1 +
 .../@vant/weapp/notify/index.js               |   66 +
 .../@vant/weapp/notify/index.json             |    6 +
 .../@vant/weapp/notify/index.wxml             |   20 +
 .../@vant/weapp/notify/index.wxss             |    1 +
 .../@vant/weapp/notify/notify.js              |   61 +
 .../@vant/weapp/overlay/index.js              |   24 +
 .../@vant/weapp/overlay/index.json            |    6 +
 .../@vant/weapp/overlay/index.wxml            |   10 +
 .../@vant/weapp/overlay/index.wxss            |    1 +
 .../@vant/weapp/panel/index.js                |   12 +
 .../@vant/weapp/panel/index.json              |    6 +
 .../@vant/weapp/panel/index.wxml              |   19 +
 .../@vant/weapp/panel/index.wxss              |    1 +
 .../@vant/weapp/picker-column/index.js        |  131 ++
 .../@vant/weapp/picker-column/index.json      |    3 +
 .../@vant/weapp/picker-column/index.wxml      |   22 +
 .../@vant/weapp/picker-column/index.wxs       |    8 +
 .../@vant/weapp/picker-column/index.wxss      |    1 +
 .../@vant/weapp/picker/index.js               |  175 ++
 .../@vant/weapp/picker/index.json             |    7 +
 .../@vant/weapp/picker/index.wxml             |   41 +
 .../@vant/weapp/picker/index.wxss             |    1 +
 .../@vant/weapp/picker/shared.js              |   24 +
 .../@vant/weapp/picker/toolbar.wxml           |   28 +
 .../@vant/weapp/popup/index.js                |   85 +
 .../@vant/weapp/popup/index.json              |    7 +
 .../@vant/weapp/popup/index.wxml              |   24 +
 .../@vant/weapp/popup/index.wxss              |    1 +
 .../@vant/weapp/progress/index.js             |   29 +
 .../@vant/weapp/progress/index.json           |    3 +
 .../@vant/weapp/progress/index.wxml           |   20 +
 .../@vant/weapp/progress/index.wxs            |    5 +
 .../@vant/weapp/progress/index.wxss           |    1 +
 .../@vant/weapp/radio-group/index.js          |   41 +
 .../@vant/weapp/radio-group/index.json        |    3 +
 .../@vant/weapp/radio-group/index.wxml        |    1 +
 .../@vant/weapp/radio-group/index.wxss        |    1 +
 .../@vant/weapp/radio/index.js                |   53 +
 .../@vant/weapp/radio/index.json              |    6 +
 .../@vant/weapp/radio/index.wxml              |   29 +
 .../@vant/weapp/radio/index.wxss              |    1 +
 .../miniprogram_npm/@vant/weapp/rate/index.js |  110 ++
 .../@vant/weapp/rate/index.json               |    6 +
 .../@vant/weapp/rate/index.wxml               |   34 +
 .../@vant/weapp/rate/index.wxss               |    1 +
 .../miniprogram_npm/@vant/weapp/row/index.js  |   43 +
 .../@vant/weapp/row/index.json                |    3 +
 .../@vant/weapp/row/index.wxml                |    3 +
 .../@vant/weapp/row/index.wxss                |    1 +
 .../@vant/weapp/search/index.js               |   81 +
 .../@vant/weapp/search/index.json             |    6 +
 .../@vant/weapp/search/index.wxml             |   50 +
 .../@vant/weapp/search/index.wxss             |    1 +
 .../@vant/weapp/sidebar-item/index.js         |   34 +
 .../@vant/weapp/sidebar-item/index.json       |    6 +
 .../@vant/weapp/sidebar-item/index.wxml       |   19 +
 .../@vant/weapp/sidebar-item/index.wxss       |    1 +
 .../@vant/weapp/sidebar/index.js              |   45 +
 .../@vant/weapp/sidebar/index.json            |    3 +
 .../@vant/weapp/sidebar/index.wxml            |    3 +
 .../@vant/weapp/sidebar/index.wxss            |    1 +
 .../@vant/weapp/skeleton/index.js             |   48 +
 .../@vant/weapp/skeleton/index.json           |    4 +
 .../@vant/weapp/skeleton/index.wxml           |   29 +
 .../@vant/weapp/skeleton/index.wxss           |    1 +
 .../@vant/weapp/slider/index.js               |  113 ++
 .../@vant/weapp/slider/index.json             |    3 +
 .../@vant/weapp/slider/index.wxml             |   30 +
 .../@vant/weapp/slider/index.wxs              |   20 +
 .../@vant/weapp/slider/index.wxss             |    1 +
 .../@vant/weapp/stepper/index.js              |  214 +++
 .../@vant/weapp/stepper/index.json            |    3 +
 .../@vant/weapp/stepper/index.wxml            |   37 +
 .../@vant/weapp/stepper/index.wxss            |    1 +
 .../@vant/weapp/steps/index.js                |   35 +
 .../@vant/weapp/steps/index.json              |    6 +
 .../@vant/weapp/steps/index.wxml              |   54 +
 .../@vant/weapp/steps/index.wxss              |    1 +
 .../@vant/weapp/sticky/index.js               |  119 ++
 .../@vant/weapp/sticky/index.json             |    3 +
 .../@vant/weapp/sticky/index.wxml             |    8 +
 .../@vant/weapp/sticky/index.wxs              |   37 +
 .../@vant/weapp/sticky/index.wxss             |    1 +
 .../@vant/weapp/submit-bar/index.js           |   61 +
 .../@vant/weapp/submit-bar/index.json         |    7 +
 .../@vant/weapp/submit-bar/index.wxml         |   44 +
 .../@vant/weapp/submit-bar/index.wxss         |    1 +
 .../@vant/weapp/swipe-cell/index.js           |  161 ++
 .../@vant/weapp/swipe-cell/index.json         |    3 +
 .../@vant/weapp/swipe-cell/index.wxml         |   20 +
 .../@vant/weapp/swipe-cell/index.wxss         |    1 +
 .../@vant/weapp/switch/index.js               |   59 +
 .../@vant/weapp/switch/index.json             |    6 +
 .../@vant/weapp/switch/index.wxml             |   11 +
 .../@vant/weapp/switch/index.wxss             |    1 +
 .../miniprogram_npm/@vant/weapp/tab/index.js  |   61 +
 .../@vant/weapp/tab/index.json                |    3 +
 .../@vant/weapp/tab/index.wxml                |    8 +
 .../@vant/weapp/tab/index.wxss                |    1 +
 .../@vant/weapp/tabbar-item/index.js          |   50 +
 .../@vant/weapp/tabbar-item/index.json        |    7 +
 .../@vant/weapp/tabbar-item/index.wxml        |   30 +
 .../@vant/weapp/tabbar-item/index.wxss        |    1 +
 .../@vant/weapp/tabbar/index.js               |   67 +
 .../@vant/weapp/tabbar/index.json             |    3 +
 .../@vant/weapp/tabbar/index.wxml             |    8 +
 .../@vant/weapp/tabbar/index.wxss             |    1 +
 .../miniprogram_npm/@vant/weapp/tabs/index.js |  329 ++++
 .../@vant/weapp/tabs/index.json               |    7 +
 .../@vant/weapp/tabs/index.wxml               |   63 +
 .../@vant/weapp/tabs/index.wxs                |   78 +
 .../@vant/weapp/tabs/index.wxss               |    1 +
 .../miniprogram_npm/@vant/weapp/tag/index.js  |   23 +
 .../@vant/weapp/tag/index.json                |    6 +
 .../@vant/weapp/tag/index.wxml                |   14 +
 .../@vant/weapp/tag/index.wxss                |    1 +
 .../@vant/weapp/toast/index.js                |   31 +
 .../@vant/weapp/toast/index.json              |    9 +
 .../@vant/weapp/toast/index.wxml              |   33 +
 .../@vant/weapp/toast/index.wxss              |    1 +
 .../@vant/weapp/toast/toast.js                |   92 +
 .../@vant/weapp/transition/index.js           |   15 +
 .../@vant/weapp/transition/index.json         |    3 +
 .../@vant/weapp/transition/index.wxml         |    8 +
 .../@vant/weapp/transition/index.wxss         |    1 +
 .../@vant/weapp/tree-select/index.js          |   69 +
 .../@vant/weapp/tree-select/index.json        |    8 +
 .../@vant/weapp/tree-select/index.wxml        |   39 +
 .../@vant/weapp/tree-select/index.wxs         |   12 +
 .../@vant/weapp/tree-select/index.wxss        |    1 +
 .../@vant/weapp/uploader/index.js             |  226 +++
 .../@vant/weapp/uploader/index.json           |    7 +
 .../@vant/weapp/uploader/index.wxml           |   68 +
 .../@vant/weapp/uploader/index.wxss           |    1 +
 .../@vant/weapp/uploader/shared.js            |   33 +
 .../@vant/weapp/uploader/utils.js             |   91 +
 .../@vant/weapp/wxs/add-unit.wxs              |   14 +
 .../miniprogram_npm/@vant/weapp/wxs/array.wxs |    5 +
 .../miniprogram_npm/@vant/weapp/wxs/bem.wxs   |   38 +
 .../@vant/weapp/wxs/memoize.wxs               |   54 +
 .../@vant/weapp/wxs/object.wxs                |   13 +
 .../miniprogram_npm/@vant/weapp/wxs/utils.wxs |   10 +
 miniprogram/newComponents/number/index.js     |   55 +
 miniprogram/newComponents/number/index.json   |    4 +
 miniprogram/newComponents/number/index.wxml   |    6 +
 miniprogram/newComponents/number/index.wxss   |   46 +
 .../newComponents/safety-bar-chart/index.js   |  264 +++
 .../newComponents/safety-bar-chart/index.json |    6 +
 .../newComponents/safety-bar-chart/index.wxml |    4 +
 .../newComponents/safety-bar-chart/index.wxss |    5 +
 .../newComponents/safety-bar-charts/index.js  |  273 +++
 .../safety-bar-charts/index.json              |    6 +
 .../safety-bar-charts/index.wxml              |    4 +
 .../safety-bar-charts/index.wxss              |    5 +
 .../newComponents/safety-bar-chartss/index.js |  230 +++
 .../safety-bar-chartss/index.json             |    6 +
 .../safety-bar-chartss/index.wxml             |    4 +
 .../safety-bar-chartss/index.wxss             |    5 +
 .../newComponents/safety-pie-chart/index.js   |  177 ++
 .../newComponents/safety-pie-chart/index.json |    6 +
 .../newComponents/safety-pie-chart/index.wxml |    4 +
 .../newComponents/safety-pie-chart/index.wxss |    6 +
 .../newComponents/safety-pie-charts/index.js  |  191 +++
 .../safety-pie-charts/index.json              |    6 +
 .../safety-pie-charts/index.wxml              |    4 +
 .../safety-pie-charts/index.wxss              |    6 +
 .../newComponents/select-person/index.js      |  113 ++
 .../newComponents/select-person/index.json    |    4 +
 .../newComponents/select-person/index.wxml    |   41 +
 .../newComponents/select-person/index.wxss    |  108 ++
 miniprogram/pageage/AIWarningList/index.js    |  139 ++
 miniprogram/pageage/AIWarningList/index.json  |    6 +
 miniprogram/pageage/AIWarningList/index.wxml  |   54 +
 miniprogram/pageage/AIWarningList/index.wxss  |    4 +
 miniprogram/pageage/AIvideoAnalysis/index.js  |  203 +++
 .../pageage/AIvideoAnalysis/index.json        |    7 +
 .../pageage/AIvideoAnalysis/index.wxml        |  122 ++
 .../pageage/AIvideoAnalysis/index.wxss        |    4 +
 .../pageage/Material-Management/index.js      |  752 ++++++++
 .../pageage/Material-Management/index.json    |    7 +
 .../pageage/Material-Management/index.wxml    |  339 ++++
 .../pageage/Material-Management/index.wxss    |  230 +++
 .../pageage/Progress-management/index.js      |  567 ++++++
 .../pageage/Progress-management/index.json    |    8 +
 .../pageage/Progress-management/index.wxml    |  185 ++
 .../pageage/Progress-management/index.wxss    |  181 ++
 .../pageage/Security-control-echarts/index.js |   66 +
 .../Security-control-echarts/index.json       |    3 +
 .../Security-control-echarts/index.wxml       |    2 +
 .../Security-control-echarts/index.wxss       |    1 +
 miniprogram/pageage/biangeng/index.js         |  339 ++++
 miniprogram/pageage/biangeng/index.json       |    7 +
 miniprogram/pageage/biangeng/index.wxml       |  130 ++
 miniprogram/pageage/biangeng/index.wxss       |    8 +
 miniprogram/pageage/dangerousProject/index.js |  267 +++
 .../pageage/dangerousProject/index.json       |    7 +
 .../pageage/dangerousProject/index.wxml       |  114 ++
 .../pageage/dangerousProject/index.wxss       |    5 +
 miniprogram/pageage/educations-add/index.js   |  353 ++++
 miniprogram/pageage/educations-add/index.json |    6 +
 miniprogram/pageage/educations-add/index.wxml |   80 +
 miniprogram/pageage/educations-add/index.wxss |   30 +
 .../pageage/educations-details/index.js       |  272 +++
 .../pageage/educations-details/index.json     |    6 +
 .../pageage/educations-details/index.wxml     |  106 ++
 .../pageage/educations-details/index.wxss     |   31 +
 miniprogram/pageage/educations-list/index.js  |  292 ++++
 .../pageage/educations-list/index.json        |    7 +
 .../pageage/educations-list/index.wxml        |  165 ++
 .../pageage/educations-list/index.wxss        |  150 ++
 .../lw-baobiaochaxun/lw-baobiaochaxun.js      |  149 ++
 .../lw-baobiaochaxun/lw-baobiaochaxun.json    |    9 +
 .../lw-baobiaochaxun/lw-baobiaochaxun.wxml    |   84 +
 .../lw-baobiaochaxun/lw-baobiaochaxun.wxss    |   77 +
 .../pageage/lw-gerenxinxi/lw-gerenxinxi.js    |   97 ++
 .../pageage/lw-gerenxinxi/lw-gerenxinxi.json  |    8 +
 .../pageage/lw-gerenxinxi/lw-gerenxinxi.wxml  |   88 +
 .../pageage/lw-gerenxinxi/lw-gerenxinxi.wxss  |   75 +
 miniprogram/pageage/lw-index/lw-index.js      |  151 ++
 miniprogram/pageage/lw-index/lw-index.json    |    9 +
 miniprogram/pageage/lw-index/lw-index.wxml    |  100 ++
 miniprogram/pageage/lw-index/lw-index.wxss    |   35 +
 .../pageage/lw-jibenxinxi/lw-jibenxinxi.js    |  480 ++++++
 .../pageage/lw-jibenxinxi/lw-jibenxinxi.json  |   14 +
 .../pageage/lw-jibenxinxi/lw-jibenxinxi.wxml  |  139 ++
 .../pageage/lw-jibenxinxi/lw-jibenxinxi.wxss  |  261 +++
 .../addSafetyInspect/index.js                 |  399 +++++
 .../addSafetyInspect/index.json               |    6 +
 .../addSafetyInspect/index.wxml               |  143 ++
 .../addSafetyInspect/index.wxss               |    7 +
 .../problemRectification/index.js             |  226 +++
 .../problemRectification/index.json           |    4 +
 .../problemRectification/index.wxml           |   99 ++
 .../problemRectification/index.wxss           |    1 +
 .../problemRectificationGR/index.js           |  309 ++++
 .../problemRectificationGR/index.json         |    6 +
 .../problemRectificationGR/index.wxml         |  126 ++
 .../problemRectificationGR/index.wxss         |    1 +
 .../safetyManagement/securityCheck/index.js   |  361 ++++
 .../safetyManagement/securityCheck/index.json |    7 +
 .../safetyManagement/securityCheck/index.wxml |  148 ++
 .../safetyManagement/securityCheck/index.wxss |    1 +
 .../safetyManagement/securityCheckGR/index.js |  262 +++
 .../securityCheckGR/index.json                |    4 +
 .../securityCheckGR/index.wxml                |  111 ++
 .../securityCheckGR/index.wxss                |    1 +
 .../securityCheckRectified/index.js           |  130 ++
 .../securityCheckRectified/index.json         |    4 +
 .../securityCheckRectified/index.wxml         |   53 +
 .../securityCheckRectified/index.wxss         |    1 +
 .../samplingAddRetestingDeliver/index.js      |  274 +++
 .../samplingAddRetestingDeliver/index.json    |    6 +
 .../samplingAddRetestingDeliver/index.wxml    |  114 ++
 .../samplingAddRetestingDeliver/index.wxss    |    1 +
 .../pageage/samplingRetesting/index.js        |  283 +++
 .../pageage/samplingRetesting/index.json      |    6 +
 .../pageage/samplingRetesting/index.wxml      |   60 +
 .../pageage/samplingRetesting/index.wxss      |    1 +
 .../pageage/samplingRetestingDeliver/index.js |  335 ++++
 .../samplingRetestingDeliver/index.json       |    6 +
 .../samplingRetestingDeliver/index.wxml       |  114 ++
 .../samplingRetestingDeliver/index.wxss       |    1 +
 .../pageage/samplingRetestingDetail/index.js  |  141 ++
 .../samplingRetestingDetail/index.json        |    6 +
 .../samplingRetestingDetail/index.wxml        |  102 ++
 .../samplingRetestingDetail/index.wxss        |   29 +
 .../pageage/samplingRetestingUpload/index.js  |  293 ++++
 .../samplingRetestingUpload/index.json        |    6 +
 .../samplingRetestingUpload/index.wxml        |  152 ++
 .../samplingRetestingUpload/index.wxss        |   29 +
 .../pageage/shipinquanping/shipingquanping.js |  191 +++
 .../shipinquanping/shipingquanping.json       |    3 +
 .../shipinquanping/shipingquanping.wxml       |   34 +
 .../shipinquanping/shipingquanping.wxss       |  135 ++
 .../pageage/suishoupai-psh/suishoupai-psh.js  |   38 +
 .../suishoupai-psh/suishoupai-psh.json        |    3 +
 .../suishoupai-psh/suishoupai-psh.wxml        |    3 +
 .../suishoupai-psh/suishoupai-psh.wxss        |    1 +
 miniprogram/pageage/suishoupai/suishoupai.js  |   38 +
 .../pageage/suishoupai/suishoupai.json        |    3 +
 .../pageage/suishoupai/suishoupai.wxml        |    3 +
 .../pageage/suishoupai/suishoupai.wxss        |    1 +
 .../pageage/technical-management/index.js     |  807 +++++++++
 .../pageage/technical-management/index.json   |   16 +
 .../pageage/technical-management/index.wxml   |  283 +++
 .../pageage/technical-management/index.wxss   |  207 +++
 miniprogram/pageage/vehicleManage/index.js    |  140 ++
 miniprogram/pageage/vehicleManage/index.json  |    7 +
 miniprogram/pageage/vehicleManage/index.wxml  |  123 ++
 miniprogram/pageage/vehicleManage/index.wxss  |   18 +
 .../pageage/voucherManagement/index.js        |  167 ++
 .../pageage/voucherManagement/index.json      |    7 +
 .../pageage/voucherManagement/index.wxml      |  109 ++
 .../pageage/voucherManagement/index.wxss      |   17 +
 .../pageage/voucherManagementAddto/index.js   |  202 +++
 .../pageage/voucherManagementAddto/index.json |    6 +
 .../pageage/voucherManagementAddto/index.wxml |   62 +
 .../pageage/voucherManagementAddto/index.wxss |   14 +
 .../xiangmuhuanjing/xiangmuhuanjing.js        |  922 ++++++++++
 .../xiangmuhuanjing/xiangmuhuanjing.json      |   14 +
 .../xiangmuhuanjing/xiangmuhuanjing.wxml      |  125 ++
 .../xiangmuhuanjing/xiangmuhuanjing.wxss      |   68 +
 .../pageage/xiangmushipin/xiangmushipin.js    |  171 ++
 .../pageage/xiangmushipin/xiangmushipin.json  |   14 +
 .../pageage/xiangmushipin/xiangmushipin.wxml  |  135 ++
 .../pageage/xiangmushipin/xiangmushipin.wxss  |   99 ++
 .../pageage/xiangmuyujing/xiangmuyujing.js    | 1391 +++++++++++++++
 .../pageage/xiangmuyujing/xiangmuyujing.json  |   14 +
 .../pageage/xiangmuyujing/xiangmuyujing.wxml  |  283 +++
 .../pageage/xiangmuyujing/xiangmuyujing.wxss  |  200 +++
 .../pageage/yujingxinxi/yujingxinxi.js        |  220 +++
 .../pageage/yujingxinxi/yujingxinxi.json      |   11 +
 .../pageage/yujingxinxi/yujingxinxi.wxml      |  140 ++
 .../pageage/yujingxinxi/yujingxinxi.wxss      |  148 ++
 miniprogram/pages/Concrete-usage/index.js     |   70 +
 miniprogram/pages/Concrete-usage/index.json   |    4 +
 miniprogram/pages/Concrete-usage/index.wxml   |   58 +
 miniprogram/pages/Concrete-usage/index.wxss   |   48 +
 miniprogram/pages/Construction-Log/index.js   |  247 +++
 miniprogram/pages/Construction-Log/index.json |    4 +
 miniprogram/pages/Construction-Log/index.wxml |   93 +
 miniprogram/pages/Construction-Log/index.wxss |   73 +
 miniprogram/pages/Highlight-photos/index.js   |  193 +++
 miniprogram/pages/Highlight-photos/index.json |    6 +
 miniprogram/pages/Highlight-photos/index.wxml |  111 ++
 miniprogram/pages/Highlight-photos/index.wxss |   93 +
 miniprogram/pages/Information-review/index.js |  108 ++
 .../pages/Information-review/index.json       |    4 +
 .../pages/Information-review/index.wxml       |  183 ++
 .../pages/Information-review/index.wxss       |  104 ++
 .../Personnel-information-binding/index.js    |   87 +
 .../Personnel-information-binding/index.json  |    4 +
 .../Personnel-information-binding/index.wxml  |   21 +
 .../Personnel-information-binding/index.wxss  |   21 +
 miniprogram/pages/Quality-Assurance/index.js  |  447 +++++
 .../pages/Quality-Assurance/index.json        |    4 +
 .../pages/Quality-Assurance/index.wxml        |  596 +++++++
 .../pages/Quality-Assurance/index.wxss        |  141 ++
 .../pages/Security-control-echarts/index.js   |  357 ++++
 .../pages/Security-control-echarts/index.json |    5 +
 .../pages/Security-control-echarts/index.wxml |  124 ++
 .../pages/Security-control-echarts/index.wxss |   79 +
 .../index.js                                  |  269 +++
 .../index.json                                |    6 +
 .../index.wxml                                |   91 +
 .../index.wxss                                |   89 +
 .../components/bar-chart-warning/index.js     |  252 +++
 .../components/bar-chart-warning/index.json   |    6 +
 .../components/bar-chart-warning/index.wxml   |    4 +
 .../components/bar-chart-warning/index.wxss   |    6 +
 .../pages/components/bar-chart/index.js       |  206 +++
 .../pages/components/bar-chart/index.json     |    6 +
 .../pages/components/bar-chart/index.wxml     |    4 +
 .../pages/components/bar-chart/index.wxss     |    6 +
 .../components/curve-echarts-copy/index.js    |  187 ++
 .../components/curve-echarts-copy/index.json  |    4 +
 .../components/curve-echarts-copy/index.wxml  |    5 +
 .../components/curve-echarts-copy/index.wxss  |    1 +
 .../pages/components/curve-echarts/index.js   |  148 ++
 .../pages/components/curve-echarts/index.json |    4 +
 .../pages/components/curve-echarts/index.wxml |    5 +
 .../pages/components/curve-echarts/index.wxss |    1 +
 .../pages/components/deep-select/index.js     |   73 +
 .../pages/components/deep-select/index.json   |    4 +
 .../pages/components/deep-select/index.wxml   |   14 +
 .../pages/components/deep-select/index.wxss   |  103 ++
 .../components/file-uploader-copy/index.js    |   82 +
 .../components/file-uploader-copy/index.json  |    4 +
 .../components/file-uploader-copy/index.wxml  |   18 +
 .../components/file-uploader-copy/index.wxss  |  143 ++
 .../pages/components/file-uploader/index.js   |   89 +
 .../pages/components/file-uploader/index.json |    4 +
 .../pages/components/file-uploader/index.wxml |   14 +
 .../pages/components/file-uploader/index.wxss |  143 ++
 .../pages/components/pie-chart/index.js       |  140 ++
 .../pages/components/pie-chart/index.json     |    4 +
 .../pages/components/pie-chart/index.wxml     |    4 +
 .../pages/components/pie-chart/index.wxss     |    5 +
 .../pages/components/project-select/index.js  |   96 ++
 .../components/project-select/index.json      |    4 +
 .../components/project-select/index.wxml      |   18 +
 .../components/project-select/index.wxss      |   49 +
 .../pz-screen-training-index/index.js         |  122 ++
 .../pz-screen-training-index/index.json       |    4 +
 .../pz-screen-training-index/index.wxml       |   46 +
 .../pz-screen-training-index/index.wxss       |  107 ++
 .../components/pz-screen-training/index.js    |  107 ++
 .../components/pz-screen-training/index.json  |    4 +
 .../components/pz-screen-training/index.wxml  |   37 +
 .../components/pz-screen-training/index.wxss  |  104 ++
 .../pages/components/pz-screen/index.js       |  107 ++
 .../pages/components/pz-screen/index.json     |    4 +
 .../pages/components/pz-screen/index.wxml     |   37 +
 .../pages/components/pz-screen/index.wxss     |  104 ++
 .../pages/components/select-btn/index.js      |   28 +
 .../pages/components/select-btn/index.json    |    4 +
 .../pages/components/select-btn/index.wxml    |    5 +
 .../pages/components/select-btn/index.wxss    |   36 +
 .../pages/components/select-date/index.js     |   62 +
 .../pages/components/select-date/index.json   |    4 +
 .../pages/components/select-date/index.wxml   |   18 +
 .../pages/components/select-date/index.wxss   |   13 +
 miniprogram/pages/components/sign/sign.js     |  205 +++
 miniprogram/pages/components/sign/sign.json   |    8 +
 miniprogram/pages/components/sign/sign.wxml   |   65 +
 miniprogram/pages/components/sign/sign.wxss   |   98 ++
 .../components/voucher-date-copy/index.js     |  133 ++
 .../components/voucher-date-copy/index.json   |    6 +
 .../components/voucher-date-copy/index.wxml   |   68 +
 .../components/voucher-date-copy/index.wxss   |   68 +
 .../pages/components/voucher-date/index.js    |   92 +
 .../pages/components/voucher-date/index.json  |    4 +
 .../pages/components/voucher-date/index.wxml  |   54 +
 .../pages/components/voucher-date/index.wxss  |   68 +
 .../components/voucher-many-select/index.js   |   83 +
 .../components/voucher-many-select/index.json |    4 +
 .../components/voucher-many-select/index.wxml |   60 +
 .../components/voucher-many-select/index.wxss |  102 ++
 .../pages/components/voucher-select/index.js  |  103 ++
 .../components/voucher-select/index.json      |    4 +
 .../components/voucher-select/index.wxml      |   55 +
 .../components/voucher-select/index.wxss      |   68 +
 .../components/voucher-selected/index.js      |   92 +
 .../components/voucher-selected/index.json    |    4 +
 .../components/voucher-selected/index.wxml    |   56 +
 .../components/voucher-selected/index.wxss    |   69 +
 .../pages/components/voucher-selects/index.js |   95 +
 .../components/voucher-selects/index.json     |    4 +
 .../components/voucher-selects/index.wxml     |   55 +
 .../components/voucher-selects/index.wxss     |   68 +
 .../pages/construction-details/index.js       |  135 ++
 .../pages/construction-details/index.json     |    6 +
 .../pages/construction-details/index.wxml     |  756 ++++++++
 .../pages/construction-details/index.wxss     |   77 +
 miniprogram/pages/construction/index.js       |  512 ++++++
 miniprogram/pages/construction/index.json     |    6 +
 miniprogram/pages/construction/index.wxml     |  791 +++++++++
 miniprogram/pages/construction/index.wxss     |   89 +
 miniprogram/pages/deepExcavation/index.js     |  589 +++++++
 miniprogram/pages/deepExcavation/index.json   |    9 +
 miniprogram/pages/deepExcavation/index.wxml   |  186 ++
 miniprogram/pages/deepExcavation/index.wxss   |    8 +
 .../pages/gengduogongneng/gengduogongneng.js  |  209 +++
 .../gengduogongneng/gengduogongneng.json      |   12 +
 .../gengduogongneng/gengduogongneng.wxml      |  195 +++
 .../gengduogongneng/gengduogongneng.wxss      |   23 +
 .../gongchengliebiao/gongchengliebiao.js      |  596 +++++++
 .../gongchengliebiao/gongchengliebiao.json    |   16 +
 .../gongchengliebiao/gongchengliebiao.wxml    |  166 ++
 .../gongchengliebiao/gongchengliebiao.wxss    |  323 ++++
 miniprogram/pages/hnt-strong/index.js         |  291 ++++
 miniprogram/pages/hnt-strong/index.json       |    6 +
 miniprogram/pages/hnt-strong/index.wxml       |   91 +
 miniprogram/pages/hnt-strong/index.wxss       |   69 +
 miniprogram/pages/learn-page/index.js         |   88 +
 miniprogram/pages/learn-page/index.json       |    4 +
 miniprogram/pages/learn-page/index.wxml       |   20 +
 miniprogram/pages/learn-page/index.wxss       |   23 +
 miniprogram/pages/login/login.js              |  144 ++
 miniprogram/pages/login/login.json            |    5 +
 miniprogram/pages/login/login.wxml            |   58 +
 miniprogram/pages/login/login.wxss            |   58 +
 miniprogram/pages/map/map.js                  |  693 ++++++++
 miniprogram/pages/map/map.json                |   12 +
 miniprogram/pages/map/map.wxml                |  241 +++
 miniprogram/pages/map/map.wxss                |  254 +++
 miniprogram/pages/measures-Chakan/index.js    |  187 ++
 miniprogram/pages/measures-Chakan/index.json  |    4 +
 miniprogram/pages/measures-Chakan/index.wxml  |  289 ++++
 miniprogram/pages/measures-Chakan/index.wxss  |   45 +
 miniprogram/pages/measures/index.js           |   66 +
 miniprogram/pages/measures/index.json         |    4 +
 miniprogram/pages/measures/index.wxml         |  261 +++
 miniprogram/pages/measures/index.wxss         |   40 +
 .../newAddPage/letterCommitment/index.js      |  201 +++
 .../newAddPage/letterCommitment/index.json    |    4 +
 .../newAddPage/letterCommitment/index.wxml    |  251 +++
 .../newAddPage/letterCommitment/index.wxss    |   71 +
 .../safetyBriefingLearning/index.js           |  613 +++++++
 .../safetyBriefingLearning/index.json         |    7 +
 .../safetyBriefingLearning/index.wxml         |  102 ++
 .../safetyBriefingLearning/index.wxss         |   68 +
 .../newAddPage/safetyManagement/index.js      |  559 ++++++
 .../newAddPage/safetyManagement/index.json    |    7 +
 .../newAddPage/safetyManagement/index.wxml    |  371 ++++
 .../newAddPage/safetyManagement/index.wxss    |    1 +
 .../newAddPage2/letterCommitment/index.js     |  210 +++
 .../newAddPage2/letterCommitment/index.json   |    4 +
 .../newAddPage2/letterCommitment/index.wxml   |  251 +++
 .../newAddPage2/letterCommitment/index.wxss   |   71 +
 .../safetyBriefingLearning/index.js           |  670 ++++++++
 .../safetyBriefingLearning/index.json         |    7 +
 .../safetyBriefingLearning/index.wxml         |  102 ++
 .../safetyBriefingLearning/index.wxss         |   68 +
 miniprogram/pages/ranyuanguanli-map/map.js    |  336 ++++
 miniprogram/pages/ranyuanguanli-map/map.json  |   13 +
 miniprogram/pages/ranyuanguanli-map/map.wxml  |  199 +++
 miniprogram/pages/ranyuanguanli-map/map.wxss  |  277 +++
 .../pages/renyuanguanli/renyuanguanli.js      |  577 +++++++
 .../pages/renyuanguanli/renyuanguanli.json    |   16 +
 .../pages/renyuanguanli/renyuanguanli.wxml    |  267 +++
 .../pages/renyuanguanli/renyuanguanli.wxss    |  207 +++
 .../pages/saft-education-user-bind/index.js   |  468 +++++
 .../pages/saft-education-user-bind/index.json |    8 +
 .../pages/saft-education-user-bind/index.wxml |   88 +
 .../pages/saft-education-user-bind/index.wxss |   31 +
 miniprogram/pages/saft-qr-view/index.js       |  178 ++
 miniprogram/pages/saft-qr-view/index.json     |    3 +
 miniprogram/pages/saft-qr-view/index.wxml     |    2 +
 miniprogram/pages/saft-qr-view/index.wxss     |    1 +
 .../pages/shebeiguanli-map/jixiedingwei.js    |  670 ++++++++
 .../pages/shebeiguanli-map/jixiedingwei.json  |   18 +
 .../pages/shebeiguanli-map/jixiedingwei.wxml  |  210 +++
 .../pages/shebeiguanli-map/jixiedingwei.wxss  |  454 +++++
 .../pages/shebieguanli-jxsb/shajiangguan.js   |  224 +++
 .../pages/shebieguanli-jxsb/shajiangguan.json |   15 +
 .../pages/shebieguanli-jxsb/shajiangguan.wxml |  241 +++
 .../pages/shebieguanli-jxsb/shajiangguan.wxss |  261 +++
 miniprogram/pages/shebieguanli-tzsb/taji.js   |  249 +++
 miniprogram/pages/shebieguanli-tzsb/taji.json |   15 +
 miniprogram/pages/shebieguanli-tzsb/taji.wxml |  297 ++++
 miniprogram/pages/shebieguanli-tzsb/taji.wxss |  132 ++
 miniprogram/pages/tempRegistration/index.js   |  860 ++++++++++
 miniprogram/pages/tempRegistration/index.json |    6 +
 miniprogram/pages/tempRegistration/index.wxml |  136 ++
 miniprogram/pages/tempRegistration/index.wxss |   47 +
 miniprogram/pages/temporaryToExamine/index.js |  517 ++++++
 .../pages/temporaryToExamine/index.json       |   11 +
 .../pages/temporaryToExamine/index.wxml       |  402 +++++
 .../pages/temporaryToExamine/index.wxss       |  167 ++
 .../pages/updatePassword/updatePassword.js    |  162 ++
 .../pages/updatePassword/updatePassword.json  |   14 +
 .../pages/updatePassword/updatePassword.wxml  |   61 +
 .../pages/updatePassword/updatePassword.wxss  |    0
 miniprogram/pages/winter-training/index.js    |  252 +++
 miniprogram/pages/winter-training/index.json  |    6 +
 miniprogram/pages/winter-training/index.wxml  |   70 +
 miniprogram/pages/winter-training/index.wxss  |   48 +
 .../pages/xiangmugaikuang/xiangmugaikuang.js  |  694 ++++++++
 .../xiangmugaikuang/xiangmugaikuang.json      |   17 +
 .../xiangmugaikuang/xiangmugaikuang.wxml      |  279 +++
 .../xiangmugaikuang/xiangmugaikuang.wxss      |  153 ++
 miniprogram/sitemap.json                      |    7 +
 miniprogram/style/guide.wxss                  |  144 ++
 project.config.json                           |  286 ++++
 project.private.config.json                   |    7 +
 941 files changed, 64594 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/construction.iml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 cloudfunctions/callback/config.json
 create mode 100644 cloudfunctions/callback/index.js
 create mode 100644 cloudfunctions/callback/package.json
 create mode 100644 cloudfunctions/echo/config.json
 create mode 100644 cloudfunctions/echo/index.js
 create mode 100644 cloudfunctions/echo/package.json
 create mode 100644 cloudfunctions/login/config.json
 create mode 100644 cloudfunctions/login/index.js
 create mode 100644 cloudfunctions/login/package.json
 create mode 100644 cloudfunctions/openapi/config.json
 create mode 100644 cloudfunctions/openapi/index.js
 create mode 100644 cloudfunctions/openapi/package.json
 create mode 100644 miniprogram/app.js
 create mode 100644 miniprogram/app.js.mine
 create mode 100644 miniprogram/app.json
 create mode 100644 miniprogram/app.wxss
 create mode 100644 miniprogram/components/@mkl/cell/index.d.ts
 create mode 100644 miniprogram/components/@mkl/cell/index.js
 create mode 100644 miniprogram/components/@mkl/cell/index.json
 create mode 100644 miniprogram/components/@mkl/cell/index.wxml
 create mode 100644 miniprogram/components/@mkl/cell/index.wxss
 create mode 100644 miniprogram/components/@mkl/collapse-item/index.d.ts
 create mode 100644 miniprogram/components/@mkl/collapse-item/index.js
 create mode 100644 miniprogram/components/@mkl/collapse-item/index.json
 create mode 100644 miniprogram/components/@mkl/collapse-item/index.wxml
 create mode 100644 miniprogram/components/@mkl/collapse-item/index.wxss
 create mode 100644 miniprogram/components/@mkl/collapse/index.d.ts
 create mode 100644 miniprogram/components/@mkl/collapse/index.js
 create mode 100644 miniprogram/components/@mkl/collapse/index.json
 create mode 100644 miniprogram/components/@mkl/collapse/index.wxml
 create mode 100644 miniprogram/components/@mkl/collapse/index.wxss
 create mode 100644 miniprogram/components/@mkl/common/color.d.ts
 create mode 100644 miniprogram/components/@mkl/common/color.js
 create mode 100644 miniprogram/components/@mkl/common/component.d.ts
 create mode 100644 miniprogram/components/@mkl/common/component.js
 create mode 100644 miniprogram/components/@mkl/common/index.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/clearfix.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/ellipsis.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/hairline.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/mixins/clearfix.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/mixins/ellipsis.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/mixins/hairline.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/theme.wxss
 create mode 100644 miniprogram/components/@mkl/common/style/var.wxss
 create mode 100644 miniprogram/components/@mkl/common/utils.d.ts
 create mode 100644 miniprogram/components/@mkl/common/utils.js
 create mode 100644 miniprogram/components/@mkl/common/version.d.ts
 create mode 100644 miniprogram/components/@mkl/common/version.js
 create mode 100644 miniprogram/components/@mkl/icon/index.d.ts
 create mode 100644 miniprogram/components/@mkl/icon/index.js
 create mode 100644 miniprogram/components/@mkl/icon/index.json
 create mode 100644 miniprogram/components/@mkl/icon/index.wxml
 create mode 100644 miniprogram/components/@mkl/icon/index.wxss
 create mode 100644 miniprogram/components/@mkl/info/index.d.ts
 create mode 100644 miniprogram/components/@mkl/info/index.js
 create mode 100644 miniprogram/components/@mkl/info/index.json
 create mode 100644 miniprogram/components/@mkl/info/index.wxml
 create mode 100644 miniprogram/components/@mkl/info/index.wxss
 create mode 100644 miniprogram/components/@mkl/loading/index.d.ts
 create mode 100644 miniprogram/components/@mkl/loading/index.js
 create mode 100644 miniprogram/components/@mkl/loading/index.json
 create mode 100644 miniprogram/components/@mkl/loading/index.wxml
 create mode 100644 miniprogram/components/@mkl/loading/index.wxss
 create mode 100644 miniprogram/components/@mkl/mixins/basic.d.ts
 create mode 100644 miniprogram/components/@mkl/mixins/basic.js
 create mode 100644 miniprogram/components/@mkl/mixins/button.d.ts
 create mode 100644 miniprogram/components/@mkl/mixins/button.js
 create mode 100644 miniprogram/components/@mkl/mixins/link.d.ts
 create mode 100644 miniprogram/components/@mkl/mixins/link.js
 create mode 100644 miniprogram/components/@mkl/mixins/open-type.d.ts
 create mode 100644 miniprogram/components/@mkl/mixins/open-type.js
 create mode 100644 miniprogram/components/@mkl/mixins/page-scroll.d.ts
 create mode 100644 miniprogram/components/@mkl/mixins/page-scroll.js
 create mode 100644 miniprogram/components/@mkl/mixins/touch.d.ts
 create mode 100644 miniprogram/components/@mkl/mixins/touch.js
 create mode 100644 miniprogram/components/@mkl/mixins/transition.d.ts
 create mode 100644 miniprogram/components/@mkl/mixins/transition.js
 create mode 100644 miniprogram/components/@mkl/multi-select/index.d.ts
 create mode 100644 miniprogram/components/@mkl/multi-select/index.js
 create mode 100644 miniprogram/components/@mkl/multi-select/index.json
 create mode 100644 miniprogram/components/@mkl/multi-select/index.wxml
 create mode 100644 miniprogram/components/@mkl/multi-select/index.wxss
 create mode 100644 miniprogram/components/@mkl/picker-column/index.d.ts
 create mode 100644 miniprogram/components/@mkl/picker-column/index.js
 create mode 100644 miniprogram/components/@mkl/picker-column/index.json
 create mode 100644 miniprogram/components/@mkl/picker-column/index.wxml
 create mode 100644 miniprogram/components/@mkl/picker-column/index.wxs
 create mode 100644 miniprogram/components/@mkl/picker-column/index.wxss
 create mode 100644 miniprogram/components/@mkl/picker/index.d.ts
 create mode 100644 miniprogram/components/@mkl/picker/index.js
 create mode 100644 miniprogram/components/@mkl/picker/index.json
 create mode 100644 miniprogram/components/@mkl/picker/index.wxml
 create mode 100644 miniprogram/components/@mkl/picker/index.wxss
 create mode 100644 miniprogram/components/@mkl/picker/shared.d.ts
 create mode 100644 miniprogram/components/@mkl/picker/shared.js
 create mode 100644 miniprogram/components/@mkl/picker/toolbar.wxml
 create mode 100644 miniprogram/components/@mkl/sticky/index.d.ts
 create mode 100644 miniprogram/components/@mkl/sticky/index.js
 create mode 100644 miniprogram/components/@mkl/sticky/index.json
 create mode 100644 miniprogram/components/@mkl/sticky/index.wxml
 create mode 100644 miniprogram/components/@mkl/sticky/index.wxs
 create mode 100644 miniprogram/components/@mkl/sticky/index.wxss
 create mode 100644 miniprogram/components/@mkl/tab/index.d.ts
 create mode 100644 miniprogram/components/@mkl/tab/index.js
 create mode 100644 miniprogram/components/@mkl/tab/index.json
 create mode 100644 miniprogram/components/@mkl/tab/index.wxml
 create mode 100644 miniprogram/components/@mkl/tab/index.wxss
 create mode 100644 miniprogram/components/@mkl/tabs/index.d.ts
 create mode 100644 miniprogram/components/@mkl/tabs/index.js
 create mode 100644 miniprogram/components/@mkl/tabs/index.json
 create mode 100644 miniprogram/components/@mkl/tabs/index.wxml
 create mode 100644 miniprogram/components/@mkl/tabs/index.wxs
 create mode 100644 miniprogram/components/@mkl/tabs/index.wxss
 create mode 100644 miniprogram/components/@mkl/wxs/add-unit.wxs
 create mode 100644 miniprogram/components/@mkl/wxs/array.wxs
 create mode 100644 miniprogram/components/@mkl/wxs/bem.wxs
 create mode 100644 miniprogram/components/@mkl/wxs/memoize.wxs
 create mode 100644 miniprogram/components/@mkl/wxs/object.wxs
 create mode 100644 miniprogram/components/@mkl/wxs/utils.wxs
 create mode 100644 miniprogram/components/chatroom/chatroom.js
 create mode 100644 miniprogram/components/chatroom/chatroom.json
 create mode 100644 miniprogram/components/chatroom/chatroom.wxml
 create mode 100644 miniprogram/components/chatroom/chatroom.wxss
 create mode 100644 miniprogram/components/chatroom/photo.png
 create mode 100644 miniprogram/ec-canvas/ec-canvas.js
 create mode 100644 miniprogram/ec-canvas/ec-canvas.json
 create mode 100644 miniprogram/ec-canvas/ec-canvas.wxml
 create mode 100644 miniprogram/ec-canvas/ec-canvas.wxss
 create mode 100644 miniprogram/ec-canvas/echarts.js
 create mode 100644 miniprogram/ec-canvas/wx-canvas.js
 create mode 100644 miniprogram/images/biyan.png
 create mode 100644 miniprogram/images/bottom.png
 create mode 100644 miniprogram/images/core.png
 create mode 100644 miniprogram/images/cz_1.png
 create mode 100644 miniprogram/images/cz_2.png
 create mode 100644 miniprogram/images/dingwei.png
 create mode 100644 miniprogram/images/early.png
 create mode 100644 miniprogram/images/fanhui.png
 create mode 100644 miniprogram/images/foot_1.png
 create mode 100644 miniprogram/images/foot_2.png
 create mode 100644 miniprogram/images/foot_3.png
 create mode 100644 miniprogram/images/foot_4.png
 create mode 100644 miniprogram/images/foot_5.png
 create mode 100644 miniprogram/images/foot_6.png
 create mode 100644 miniprogram/images/foot_7.png
 create mode 100644 miniprogram/images/footer_1.png
 create mode 100644 miniprogram/images/footer_2.png
 create mode 100644 miniprogram/images/footer_3.png
 create mode 100644 miniprogram/images/footer_4.png
 create mode 100644 miniprogram/images/footer_5.png
 create mode 100644 miniprogram/images/footer_6.png
 create mode 100644 miniprogram/images/footer_7.png
 create mode 100644 miniprogram/images/guodu.gif
 create mode 100644 miniprogram/images/i_location.png
 create mode 100644 miniprogram/images/i_mechanics.png
 create mode 100644 miniprogram/images/i_personnel.png
 create mode 100644 miniprogram/images/icon_1.png
 create mode 100644 miniprogram/images/icon_2.png
 create mode 100644 miniprogram/images/icon_3.png
 create mode 100644 miniprogram/images/icon_4.png
 create mode 100644 miniprogram/images/icon_5.png
 create mode 100644 miniprogram/images/icons_1.png
 create mode 100644 miniprogram/images/icons_2.png
 create mode 100644 miniprogram/images/icons_3.png
 create mode 100644 miniprogram/images/icons_4.png
 create mode 100644 miniprogram/images/icons_5.png
 create mode 100644 miniprogram/images/img_1.png
 create mode 100644 miniprogram/images/img_10.png
 create mode 100644 miniprogram/images/img_11.png
 create mode 100644 miniprogram/images/img_12.png
 create mode 100644 miniprogram/images/img_2.png
 create mode 100644 miniprogram/images/img_3.png
 create mode 100644 miniprogram/images/img_4.png
 create mode 100644 miniprogram/images/img_5.png
 create mode 100644 miniprogram/images/img_6.png
 create mode 100644 miniprogram/images/img_7.png
 create mode 100644 miniprogram/images/img_8.png
 create mode 100644 miniprogram/images/img_9.png
 create mode 100644 miniprogram/images/jt.png
 create mode 100644 miniprogram/images/left.png
 create mode 100644 miniprogram/images/lw_1.png
 create mode 100644 miniprogram/images/lw_2.png
 create mode 100644 miniprogram/images/lw_3.png
 create mode 100644 miniprogram/images/lw_4.png
 create mode 100644 miniprogram/images/lw_5.png
 create mode 100644 miniprogram/images/lw_6.png
 create mode 100644 miniprogram/images/lw_7.png
 create mode 100644 miniprogram/images/lw_8.png
 create mode 100644 miniprogram/images/middl_right.png
 create mode 100644 miniprogram/images/middle_left.png
 create mode 100644 miniprogram/images/quanping.png
 create mode 100644 miniprogram/images/right.png
 create mode 100644 miniprogram/images/s_1.png
 create mode 100644 miniprogram/images/s_10.png
 create mode 100644 miniprogram/images/s_11.png
 create mode 100644 miniprogram/images/s_12.png
 create mode 100644 miniprogram/images/s_13.png
 create mode 100644 miniprogram/images/s_14.png
 create mode 100644 miniprogram/images/s_15.png
 create mode 100644 miniprogram/images/s_16.png
 create mode 100644 miniprogram/images/s_17.png
 create mode 100644 miniprogram/images/s_18.png
 create mode 100644 miniprogram/images/s_2.png
 create mode 100644 miniprogram/images/s_3.png
 create mode 100644 miniprogram/images/s_4.png
 create mode 100644 miniprogram/images/s_5.png
 create mode 100644 miniprogram/images/s_6.png
 create mode 100644 miniprogram/images/s_7.png
 create mode 100644 miniprogram/images/s_8.png
 create mode 100644 miniprogram/images/s_9.png
 create mode 100644 miniprogram/images/set.png
 create mode 100644 miniprogram/images/sliding_up.png
 create mode 100644 miniprogram/images/user_3.png
 create mode 100644 miniprogram/images/video.png
 create mode 100644 miniprogram/images/warning.png
 create mode 100644 miniprogram/images/wl_fg.png
 create mode 100644 miniprogram/images/yj_01.png
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/area/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/area/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/area/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/area/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/button/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/button/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/button/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/button/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/calendar.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/card/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/card/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/card/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/card/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/circle/canvas.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/circle/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/circle/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/col/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/col/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/col/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/col/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/color.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/component.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/clearfix.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/ellipsis.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/hairline.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/clearfix.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/ellipsis.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/hairline.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/theme.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/style/var.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/utils.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/common/version.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/count-down/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/count-down/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/count-down/utils.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/definitions/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/definitions/weapp.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dialog/dialog.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dialog/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dialog/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/divider/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/divider/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/field/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/field/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/field/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/field/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/field/props.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/icon/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/icon/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/image/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/image/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/image/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/image/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/info/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/info/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/info/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/info/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/loading/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/loading/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/mixins/basic.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/mixins/button.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/mixins/link.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/mixins/open-type.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/mixins/page-scroll.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/mixins/touch.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/mixins/transition.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notify/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notify/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/notify/notify.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/overlay/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/overlay/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/panel/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/panel/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker/shared.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/picker/toolbar.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/popup/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/popup/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/progress/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/progress/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/rate/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/rate/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/row/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/row/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/row/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/row/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/search/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/search/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/search/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/search/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/slider/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/slider/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/stepper/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/stepper/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/steps/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/steps/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sticky/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sticky/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/switch/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/switch/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tab/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tab/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabs/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabs/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tag/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tag/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/toast/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/toast/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/toast/toast.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/transition/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/transition/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/uploader/index.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/uploader/index.json
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxml
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxss
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/uploader/shared.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/uploader/utils.js
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/wxs/add-unit.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/wxs/array.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/wxs/bem.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/wxs/memoize.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/wxs/object.wxs
 create mode 100644 miniprogram/miniprogram_npm/@vant/weapp/wxs/utils.wxs
 create mode 100644 miniprogram/newComponents/number/index.js
 create mode 100644 miniprogram/newComponents/number/index.json
 create mode 100644 miniprogram/newComponents/number/index.wxml
 create mode 100644 miniprogram/newComponents/number/index.wxss
 create mode 100644 miniprogram/newComponents/safety-bar-chart/index.js
 create mode 100644 miniprogram/newComponents/safety-bar-chart/index.json
 create mode 100644 miniprogram/newComponents/safety-bar-chart/index.wxml
 create mode 100644 miniprogram/newComponents/safety-bar-chart/index.wxss
 create mode 100644 miniprogram/newComponents/safety-bar-charts/index.js
 create mode 100644 miniprogram/newComponents/safety-bar-charts/index.json
 create mode 100644 miniprogram/newComponents/safety-bar-charts/index.wxml
 create mode 100644 miniprogram/newComponents/safety-bar-charts/index.wxss
 create mode 100644 miniprogram/newComponents/safety-bar-chartss/index.js
 create mode 100644 miniprogram/newComponents/safety-bar-chartss/index.json
 create mode 100644 miniprogram/newComponents/safety-bar-chartss/index.wxml
 create mode 100644 miniprogram/newComponents/safety-bar-chartss/index.wxss
 create mode 100644 miniprogram/newComponents/safety-pie-chart/index.js
 create mode 100644 miniprogram/newComponents/safety-pie-chart/index.json
 create mode 100644 miniprogram/newComponents/safety-pie-chart/index.wxml
 create mode 100644 miniprogram/newComponents/safety-pie-chart/index.wxss
 create mode 100644 miniprogram/newComponents/safety-pie-charts/index.js
 create mode 100644 miniprogram/newComponents/safety-pie-charts/index.json
 create mode 100644 miniprogram/newComponents/safety-pie-charts/index.wxml
 create mode 100644 miniprogram/newComponents/safety-pie-charts/index.wxss
 create mode 100644 miniprogram/newComponents/select-person/index.js
 create mode 100644 miniprogram/newComponents/select-person/index.json
 create mode 100644 miniprogram/newComponents/select-person/index.wxml
 create mode 100644 miniprogram/newComponents/select-person/index.wxss
 create mode 100644 miniprogram/pageage/AIWarningList/index.js
 create mode 100644 miniprogram/pageage/AIWarningList/index.json
 create mode 100644 miniprogram/pageage/AIWarningList/index.wxml
 create mode 100644 miniprogram/pageage/AIWarningList/index.wxss
 create mode 100644 miniprogram/pageage/AIvideoAnalysis/index.js
 create mode 100644 miniprogram/pageage/AIvideoAnalysis/index.json
 create mode 100644 miniprogram/pageage/AIvideoAnalysis/index.wxml
 create mode 100644 miniprogram/pageage/AIvideoAnalysis/index.wxss
 create mode 100644 miniprogram/pageage/Material-Management/index.js
 create mode 100644 miniprogram/pageage/Material-Management/index.json
 create mode 100644 miniprogram/pageage/Material-Management/index.wxml
 create mode 100644 miniprogram/pageage/Material-Management/index.wxss
 create mode 100644 miniprogram/pageage/Progress-management/index.js
 create mode 100644 miniprogram/pageage/Progress-management/index.json
 create mode 100644 miniprogram/pageage/Progress-management/index.wxml
 create mode 100644 miniprogram/pageage/Progress-management/index.wxss
 create mode 100644 miniprogram/pageage/Security-control-echarts/index.js
 create mode 100644 miniprogram/pageage/Security-control-echarts/index.json
 create mode 100644 miniprogram/pageage/Security-control-echarts/index.wxml
 create mode 100644 miniprogram/pageage/Security-control-echarts/index.wxss
 create mode 100644 miniprogram/pageage/biangeng/index.js
 create mode 100644 miniprogram/pageage/biangeng/index.json
 create mode 100644 miniprogram/pageage/biangeng/index.wxml
 create mode 100644 miniprogram/pageage/biangeng/index.wxss
 create mode 100644 miniprogram/pageage/dangerousProject/index.js
 create mode 100644 miniprogram/pageage/dangerousProject/index.json
 create mode 100644 miniprogram/pageage/dangerousProject/index.wxml
 create mode 100644 miniprogram/pageage/dangerousProject/index.wxss
 create mode 100644 miniprogram/pageage/educations-add/index.js
 create mode 100644 miniprogram/pageage/educations-add/index.json
 create mode 100644 miniprogram/pageage/educations-add/index.wxml
 create mode 100644 miniprogram/pageage/educations-add/index.wxss
 create mode 100644 miniprogram/pageage/educations-details/index.js
 create mode 100644 miniprogram/pageage/educations-details/index.json
 create mode 100644 miniprogram/pageage/educations-details/index.wxml
 create mode 100644 miniprogram/pageage/educations-details/index.wxss
 create mode 100644 miniprogram/pageage/educations-list/index.js
 create mode 100644 miniprogram/pageage/educations-list/index.json
 create mode 100644 miniprogram/pageage/educations-list/index.wxml
 create mode 100644 miniprogram/pageage/educations-list/index.wxss
 create mode 100644 miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.js
 create mode 100644 miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.json
 create mode 100644 miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml
 create mode 100644 miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxss
 create mode 100644 miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.js
 create mode 100644 miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.json
 create mode 100644 miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml
 create mode 100644 miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxss
 create mode 100644 miniprogram/pageage/lw-index/lw-index.js
 create mode 100644 miniprogram/pageage/lw-index/lw-index.json
 create mode 100644 miniprogram/pageage/lw-index/lw-index.wxml
 create mode 100644 miniprogram/pageage/lw-index/lw-index.wxss
 create mode 100644 miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.js
 create mode 100644 miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.json
 create mode 100644 miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml
 create mode 100644 miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxss
 create mode 100644 miniprogram/pageage/safetyManagement/addSafetyInspect/index.js
 create mode 100644 miniprogram/pageage/safetyManagement/addSafetyInspect/index.json
 create mode 100644 miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml
 create mode 100644 miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxss
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectification/index.js
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectification/index.json
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectification/index.wxml
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectification/index.wxss
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectificationGR/index.js
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectificationGR/index.json
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml
 create mode 100644 miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxss
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheck/index.js
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheck/index.json
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheck/index.wxml
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheck/index.wxss
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckGR/index.js
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckGR/index.json
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckGR/index.wxss
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckRectified/index.js
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckRectified/index.json
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxml
 create mode 100644 miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxss
 create mode 100644 miniprogram/pageage/samplingAddRetestingDeliver/index.js
 create mode 100644 miniprogram/pageage/samplingAddRetestingDeliver/index.json
 create mode 100644 miniprogram/pageage/samplingAddRetestingDeliver/index.wxml
 create mode 100644 miniprogram/pageage/samplingAddRetestingDeliver/index.wxss
 create mode 100644 miniprogram/pageage/samplingRetesting/index.js
 create mode 100644 miniprogram/pageage/samplingRetesting/index.json
 create mode 100644 miniprogram/pageage/samplingRetesting/index.wxml
 create mode 100644 miniprogram/pageage/samplingRetesting/index.wxss
 create mode 100644 miniprogram/pageage/samplingRetestingDeliver/index.js
 create mode 100644 miniprogram/pageage/samplingRetestingDeliver/index.json
 create mode 100644 miniprogram/pageage/samplingRetestingDeliver/index.wxml
 create mode 100644 miniprogram/pageage/samplingRetestingDeliver/index.wxss
 create mode 100644 miniprogram/pageage/samplingRetestingDetail/index.js
 create mode 100644 miniprogram/pageage/samplingRetestingDetail/index.json
 create mode 100644 miniprogram/pageage/samplingRetestingDetail/index.wxml
 create mode 100644 miniprogram/pageage/samplingRetestingDetail/index.wxss
 create mode 100644 miniprogram/pageage/samplingRetestingUpload/index.js
 create mode 100644 miniprogram/pageage/samplingRetestingUpload/index.json
 create mode 100644 miniprogram/pageage/samplingRetestingUpload/index.wxml
 create mode 100644 miniprogram/pageage/samplingRetestingUpload/index.wxss
 create mode 100644 miniprogram/pageage/shipinquanping/shipingquanping.js
 create mode 100644 miniprogram/pageage/shipinquanping/shipingquanping.json
 create mode 100644 miniprogram/pageage/shipinquanping/shipingquanping.wxml
 create mode 100644 miniprogram/pageage/shipinquanping/shipingquanping.wxss
 create mode 100644 miniprogram/pageage/suishoupai-psh/suishoupai-psh.js
 create mode 100644 miniprogram/pageage/suishoupai-psh/suishoupai-psh.json
 create mode 100644 miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxml
 create mode 100644 miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxss
 create mode 100644 miniprogram/pageage/suishoupai/suishoupai.js
 create mode 100644 miniprogram/pageage/suishoupai/suishoupai.json
 create mode 100644 miniprogram/pageage/suishoupai/suishoupai.wxml
 create mode 100644 miniprogram/pageage/suishoupai/suishoupai.wxss
 create mode 100644 miniprogram/pageage/technical-management/index.js
 create mode 100644 miniprogram/pageage/technical-management/index.json
 create mode 100644 miniprogram/pageage/technical-management/index.wxml
 create mode 100644 miniprogram/pageage/technical-management/index.wxss
 create mode 100644 miniprogram/pageage/vehicleManage/index.js
 create mode 100644 miniprogram/pageage/vehicleManage/index.json
 create mode 100644 miniprogram/pageage/vehicleManage/index.wxml
 create mode 100644 miniprogram/pageage/vehicleManage/index.wxss
 create mode 100644 miniprogram/pageage/voucherManagement/index.js
 create mode 100644 miniprogram/pageage/voucherManagement/index.json
 create mode 100644 miniprogram/pageage/voucherManagement/index.wxml
 create mode 100644 miniprogram/pageage/voucherManagement/index.wxss
 create mode 100644 miniprogram/pageage/voucherManagementAddto/index.js
 create mode 100644 miniprogram/pageage/voucherManagementAddto/index.json
 create mode 100644 miniprogram/pageage/voucherManagementAddto/index.wxml
 create mode 100644 miniprogram/pageage/voucherManagementAddto/index.wxss
 create mode 100644 miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js
 create mode 100644 miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.json
 create mode 100644 miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml
 create mode 100644 miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxss
 create mode 100644 miniprogram/pageage/xiangmushipin/xiangmushipin.js
 create mode 100644 miniprogram/pageage/xiangmushipin/xiangmushipin.json
 create mode 100644 miniprogram/pageage/xiangmushipin/xiangmushipin.wxml
 create mode 100644 miniprogram/pageage/xiangmushipin/xiangmushipin.wxss
 create mode 100644 miniprogram/pageage/xiangmuyujing/xiangmuyujing.js
 create mode 100644 miniprogram/pageage/xiangmuyujing/xiangmuyujing.json
 create mode 100644 miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxml
 create mode 100644 miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxss
 create mode 100644 miniprogram/pageage/yujingxinxi/yujingxinxi.js
 create mode 100644 miniprogram/pageage/yujingxinxi/yujingxinxi.json
 create mode 100644 miniprogram/pageage/yujingxinxi/yujingxinxi.wxml
 create mode 100644 miniprogram/pageage/yujingxinxi/yujingxinxi.wxss
 create mode 100644 miniprogram/pages/Concrete-usage/index.js
 create mode 100644 miniprogram/pages/Concrete-usage/index.json
 create mode 100644 miniprogram/pages/Concrete-usage/index.wxml
 create mode 100644 miniprogram/pages/Concrete-usage/index.wxss
 create mode 100644 miniprogram/pages/Construction-Log/index.js
 create mode 100644 miniprogram/pages/Construction-Log/index.json
 create mode 100644 miniprogram/pages/Construction-Log/index.wxml
 create mode 100644 miniprogram/pages/Construction-Log/index.wxss
 create mode 100644 miniprogram/pages/Highlight-photos/index.js
 create mode 100644 miniprogram/pages/Highlight-photos/index.json
 create mode 100644 miniprogram/pages/Highlight-photos/index.wxml
 create mode 100644 miniprogram/pages/Highlight-photos/index.wxss
 create mode 100644 miniprogram/pages/Information-review/index.js
 create mode 100644 miniprogram/pages/Information-review/index.json
 create mode 100644 miniprogram/pages/Information-review/index.wxml
 create mode 100644 miniprogram/pages/Information-review/index.wxss
 create mode 100644 miniprogram/pages/Personnel-information-binding/index.js
 create mode 100644 miniprogram/pages/Personnel-information-binding/index.json
 create mode 100644 miniprogram/pages/Personnel-information-binding/index.wxml
 create mode 100644 miniprogram/pages/Personnel-information-binding/index.wxss
 create mode 100644 miniprogram/pages/Quality-Assurance/index.js
 create mode 100644 miniprogram/pages/Quality-Assurance/index.json
 create mode 100644 miniprogram/pages/Quality-Assurance/index.wxml
 create mode 100644 miniprogram/pages/Quality-Assurance/index.wxss
 create mode 100644 miniprogram/pages/Security-control-echarts/index.js
 create mode 100644 miniprogram/pages/Security-control-echarts/index.json
 create mode 100644 miniprogram/pages/Security-control-echarts/index.wxml
 create mode 100644 miniprogram/pages/Security-control-echarts/index.wxss
 create mode 100644 miniprogram/pages/Standard-maintenance-room-monitoring/index.js
 create mode 100644 miniprogram/pages/Standard-maintenance-room-monitoring/index.json
 create mode 100644 miniprogram/pages/Standard-maintenance-room-monitoring/index.wxml
 create mode 100644 miniprogram/pages/Standard-maintenance-room-monitoring/index.wxss
 create mode 100644 miniprogram/pages/components/bar-chart-warning/index.js
 create mode 100644 miniprogram/pages/components/bar-chart-warning/index.json
 create mode 100644 miniprogram/pages/components/bar-chart-warning/index.wxml
 create mode 100644 miniprogram/pages/components/bar-chart-warning/index.wxss
 create mode 100644 miniprogram/pages/components/bar-chart/index.js
 create mode 100644 miniprogram/pages/components/bar-chart/index.json
 create mode 100644 miniprogram/pages/components/bar-chart/index.wxml
 create mode 100644 miniprogram/pages/components/bar-chart/index.wxss
 create mode 100644 miniprogram/pages/components/curve-echarts-copy/index.js
 create mode 100644 miniprogram/pages/components/curve-echarts-copy/index.json
 create mode 100644 miniprogram/pages/components/curve-echarts-copy/index.wxml
 create mode 100644 miniprogram/pages/components/curve-echarts-copy/index.wxss
 create mode 100644 miniprogram/pages/components/curve-echarts/index.js
 create mode 100644 miniprogram/pages/components/curve-echarts/index.json
 create mode 100644 miniprogram/pages/components/curve-echarts/index.wxml
 create mode 100644 miniprogram/pages/components/curve-echarts/index.wxss
 create mode 100644 miniprogram/pages/components/deep-select/index.js
 create mode 100644 miniprogram/pages/components/deep-select/index.json
 create mode 100644 miniprogram/pages/components/deep-select/index.wxml
 create mode 100644 miniprogram/pages/components/deep-select/index.wxss
 create mode 100644 miniprogram/pages/components/file-uploader-copy/index.js
 create mode 100644 miniprogram/pages/components/file-uploader-copy/index.json
 create mode 100644 miniprogram/pages/components/file-uploader-copy/index.wxml
 create mode 100644 miniprogram/pages/components/file-uploader-copy/index.wxss
 create mode 100644 miniprogram/pages/components/file-uploader/index.js
 create mode 100644 miniprogram/pages/components/file-uploader/index.json
 create mode 100644 miniprogram/pages/components/file-uploader/index.wxml
 create mode 100644 miniprogram/pages/components/file-uploader/index.wxss
 create mode 100644 miniprogram/pages/components/pie-chart/index.js
 create mode 100644 miniprogram/pages/components/pie-chart/index.json
 create mode 100644 miniprogram/pages/components/pie-chart/index.wxml
 create mode 100644 miniprogram/pages/components/pie-chart/index.wxss
 create mode 100644 miniprogram/pages/components/project-select/index.js
 create mode 100644 miniprogram/pages/components/project-select/index.json
 create mode 100644 miniprogram/pages/components/project-select/index.wxml
 create mode 100644 miniprogram/pages/components/project-select/index.wxss
 create mode 100644 miniprogram/pages/components/pz-screen-training-index/index.js
 create mode 100644 miniprogram/pages/components/pz-screen-training-index/index.json
 create mode 100644 miniprogram/pages/components/pz-screen-training-index/index.wxml
 create mode 100644 miniprogram/pages/components/pz-screen-training-index/index.wxss
 create mode 100644 miniprogram/pages/components/pz-screen-training/index.js
 create mode 100644 miniprogram/pages/components/pz-screen-training/index.json
 create mode 100644 miniprogram/pages/components/pz-screen-training/index.wxml
 create mode 100644 miniprogram/pages/components/pz-screen-training/index.wxss
 create mode 100644 miniprogram/pages/components/pz-screen/index.js
 create mode 100644 miniprogram/pages/components/pz-screen/index.json
 create mode 100644 miniprogram/pages/components/pz-screen/index.wxml
 create mode 100644 miniprogram/pages/components/pz-screen/index.wxss
 create mode 100644 miniprogram/pages/components/select-btn/index.js
 create mode 100644 miniprogram/pages/components/select-btn/index.json
 create mode 100644 miniprogram/pages/components/select-btn/index.wxml
 create mode 100644 miniprogram/pages/components/select-btn/index.wxss
 create mode 100644 miniprogram/pages/components/select-date/index.js
 create mode 100644 miniprogram/pages/components/select-date/index.json
 create mode 100644 miniprogram/pages/components/select-date/index.wxml
 create mode 100644 miniprogram/pages/components/select-date/index.wxss
 create mode 100644 miniprogram/pages/components/sign/sign.js
 create mode 100644 miniprogram/pages/components/sign/sign.json
 create mode 100644 miniprogram/pages/components/sign/sign.wxml
 create mode 100644 miniprogram/pages/components/sign/sign.wxss
 create mode 100644 miniprogram/pages/components/voucher-date-copy/index.js
 create mode 100644 miniprogram/pages/components/voucher-date-copy/index.json
 create mode 100644 miniprogram/pages/components/voucher-date-copy/index.wxml
 create mode 100644 miniprogram/pages/components/voucher-date-copy/index.wxss
 create mode 100644 miniprogram/pages/components/voucher-date/index.js
 create mode 100644 miniprogram/pages/components/voucher-date/index.json
 create mode 100644 miniprogram/pages/components/voucher-date/index.wxml
 create mode 100644 miniprogram/pages/components/voucher-date/index.wxss
 create mode 100644 miniprogram/pages/components/voucher-many-select/index.js
 create mode 100644 miniprogram/pages/components/voucher-many-select/index.json
 create mode 100644 miniprogram/pages/components/voucher-many-select/index.wxml
 create mode 100644 miniprogram/pages/components/voucher-many-select/index.wxss
 create mode 100644 miniprogram/pages/components/voucher-select/index.js
 create mode 100644 miniprogram/pages/components/voucher-select/index.json
 create mode 100644 miniprogram/pages/components/voucher-select/index.wxml
 create mode 100644 miniprogram/pages/components/voucher-select/index.wxss
 create mode 100644 miniprogram/pages/components/voucher-selected/index.js
 create mode 100644 miniprogram/pages/components/voucher-selected/index.json
 create mode 100644 miniprogram/pages/components/voucher-selected/index.wxml
 create mode 100644 miniprogram/pages/components/voucher-selected/index.wxss
 create mode 100644 miniprogram/pages/components/voucher-selects/index.js
 create mode 100644 miniprogram/pages/components/voucher-selects/index.json
 create mode 100644 miniprogram/pages/components/voucher-selects/index.wxml
 create mode 100644 miniprogram/pages/components/voucher-selects/index.wxss
 create mode 100644 miniprogram/pages/construction-details/index.js
 create mode 100644 miniprogram/pages/construction-details/index.json
 create mode 100644 miniprogram/pages/construction-details/index.wxml
 create mode 100644 miniprogram/pages/construction-details/index.wxss
 create mode 100644 miniprogram/pages/construction/index.js
 create mode 100644 miniprogram/pages/construction/index.json
 create mode 100644 miniprogram/pages/construction/index.wxml
 create mode 100644 miniprogram/pages/construction/index.wxss
 create mode 100644 miniprogram/pages/deepExcavation/index.js
 create mode 100644 miniprogram/pages/deepExcavation/index.json
 create mode 100644 miniprogram/pages/deepExcavation/index.wxml
 create mode 100644 miniprogram/pages/deepExcavation/index.wxss
 create mode 100644 miniprogram/pages/gengduogongneng/gengduogongneng.js
 create mode 100644 miniprogram/pages/gengduogongneng/gengduogongneng.json
 create mode 100644 miniprogram/pages/gengduogongneng/gengduogongneng.wxml
 create mode 100644 miniprogram/pages/gengduogongneng/gengduogongneng.wxss
 create mode 100644 miniprogram/pages/gongchengliebiao/gongchengliebiao.js
 create mode 100644 miniprogram/pages/gongchengliebiao/gongchengliebiao.json
 create mode 100644 miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml
 create mode 100644 miniprogram/pages/gongchengliebiao/gongchengliebiao.wxss
 create mode 100644 miniprogram/pages/hnt-strong/index.js
 create mode 100644 miniprogram/pages/hnt-strong/index.json
 create mode 100644 miniprogram/pages/hnt-strong/index.wxml
 create mode 100644 miniprogram/pages/hnt-strong/index.wxss
 create mode 100644 miniprogram/pages/learn-page/index.js
 create mode 100644 miniprogram/pages/learn-page/index.json
 create mode 100644 miniprogram/pages/learn-page/index.wxml
 create mode 100644 miniprogram/pages/learn-page/index.wxss
 create mode 100644 miniprogram/pages/login/login.js
 create mode 100644 miniprogram/pages/login/login.json
 create mode 100644 miniprogram/pages/login/login.wxml
 create mode 100644 miniprogram/pages/login/login.wxss
 create mode 100644 miniprogram/pages/map/map.js
 create mode 100644 miniprogram/pages/map/map.json
 create mode 100644 miniprogram/pages/map/map.wxml
 create mode 100644 miniprogram/pages/map/map.wxss
 create mode 100644 miniprogram/pages/measures-Chakan/index.js
 create mode 100644 miniprogram/pages/measures-Chakan/index.json
 create mode 100644 miniprogram/pages/measures-Chakan/index.wxml
 create mode 100644 miniprogram/pages/measures-Chakan/index.wxss
 create mode 100644 miniprogram/pages/measures/index.js
 create mode 100644 miniprogram/pages/measures/index.json
 create mode 100644 miniprogram/pages/measures/index.wxml
 create mode 100644 miniprogram/pages/measures/index.wxss
 create mode 100644 miniprogram/pages/newAddPage/letterCommitment/index.js
 create mode 100644 miniprogram/pages/newAddPage/letterCommitment/index.json
 create mode 100644 miniprogram/pages/newAddPage/letterCommitment/index.wxml
 create mode 100644 miniprogram/pages/newAddPage/letterCommitment/index.wxss
 create mode 100644 miniprogram/pages/newAddPage/safetyBriefingLearning/index.js
 create mode 100644 miniprogram/pages/newAddPage/safetyBriefingLearning/index.json
 create mode 100644 miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxml
 create mode 100644 miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxss
 create mode 100644 miniprogram/pages/newAddPage/safetyManagement/index.js
 create mode 100644 miniprogram/pages/newAddPage/safetyManagement/index.json
 create mode 100644 miniprogram/pages/newAddPage/safetyManagement/index.wxml
 create mode 100644 miniprogram/pages/newAddPage/safetyManagement/index.wxss
 create mode 100644 miniprogram/pages/newAddPage2/letterCommitment/index.js
 create mode 100644 miniprogram/pages/newAddPage2/letterCommitment/index.json
 create mode 100644 miniprogram/pages/newAddPage2/letterCommitment/index.wxml
 create mode 100644 miniprogram/pages/newAddPage2/letterCommitment/index.wxss
 create mode 100644 miniprogram/pages/newAddPage2/safetyBriefingLearning/index.js
 create mode 100644 miniprogram/pages/newAddPage2/safetyBriefingLearning/index.json
 create mode 100644 miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxml
 create mode 100644 miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxss
 create mode 100644 miniprogram/pages/ranyuanguanli-map/map.js
 create mode 100644 miniprogram/pages/ranyuanguanli-map/map.json
 create mode 100644 miniprogram/pages/ranyuanguanli-map/map.wxml
 create mode 100644 miniprogram/pages/ranyuanguanli-map/map.wxss
 create mode 100644 miniprogram/pages/renyuanguanli/renyuanguanli.js
 create mode 100644 miniprogram/pages/renyuanguanli/renyuanguanli.json
 create mode 100644 miniprogram/pages/renyuanguanli/renyuanguanli.wxml
 create mode 100644 miniprogram/pages/renyuanguanli/renyuanguanli.wxss
 create mode 100644 miniprogram/pages/saft-education-user-bind/index.js
 create mode 100644 miniprogram/pages/saft-education-user-bind/index.json
 create mode 100644 miniprogram/pages/saft-education-user-bind/index.wxml
 create mode 100644 miniprogram/pages/saft-education-user-bind/index.wxss
 create mode 100644 miniprogram/pages/saft-qr-view/index.js
 create mode 100644 miniprogram/pages/saft-qr-view/index.json
 create mode 100644 miniprogram/pages/saft-qr-view/index.wxml
 create mode 100644 miniprogram/pages/saft-qr-view/index.wxss
 create mode 100644 miniprogram/pages/shebeiguanli-map/jixiedingwei.js
 create mode 100644 miniprogram/pages/shebeiguanli-map/jixiedingwei.json
 create mode 100644 miniprogram/pages/shebeiguanli-map/jixiedingwei.wxml
 create mode 100644 miniprogram/pages/shebeiguanli-map/jixiedingwei.wxss
 create mode 100644 miniprogram/pages/shebieguanli-jxsb/shajiangguan.js
 create mode 100644 miniprogram/pages/shebieguanli-jxsb/shajiangguan.json
 create mode 100644 miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxml
 create mode 100644 miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxss
 create mode 100644 miniprogram/pages/shebieguanli-tzsb/taji.js
 create mode 100644 miniprogram/pages/shebieguanli-tzsb/taji.json
 create mode 100644 miniprogram/pages/shebieguanli-tzsb/taji.wxml
 create mode 100644 miniprogram/pages/shebieguanli-tzsb/taji.wxss
 create mode 100644 miniprogram/pages/tempRegistration/index.js
 create mode 100644 miniprogram/pages/tempRegistration/index.json
 create mode 100644 miniprogram/pages/tempRegistration/index.wxml
 create mode 100644 miniprogram/pages/tempRegistration/index.wxss
 create mode 100644 miniprogram/pages/temporaryToExamine/index.js
 create mode 100644 miniprogram/pages/temporaryToExamine/index.json
 create mode 100644 miniprogram/pages/temporaryToExamine/index.wxml
 create mode 100644 miniprogram/pages/temporaryToExamine/index.wxss
 create mode 100644 miniprogram/pages/updatePassword/updatePassword.js
 create mode 100644 miniprogram/pages/updatePassword/updatePassword.json
 create mode 100644 miniprogram/pages/updatePassword/updatePassword.wxml
 create mode 100644 miniprogram/pages/updatePassword/updatePassword.wxss
 create mode 100644 miniprogram/pages/winter-training/index.js
 create mode 100644 miniprogram/pages/winter-training/index.json
 create mode 100644 miniprogram/pages/winter-training/index.wxml
 create mode 100644 miniprogram/pages/winter-training/index.wxss
 create mode 100644 miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
 create mode 100644 miniprogram/pages/xiangmugaikuang/xiangmugaikuang.json
 create mode 100644 miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml
 create mode 100644 miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxss
 create mode 100644 miniprogram/sitemap.json
 create mode 100644 miniprogram/style/guide.wxss
 create mode 100644 project.config.json
 create mode 100644 project.private.config.json

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/construction.iml b/.idea/construction.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/construction.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..22b3b03
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/construction.iml" filepath="$PROJECT_DIR$/.idea/construction.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/cloudfunctions/callback/config.json b/cloudfunctions/callback/config.json
new file mode 100644
index 0000000..43aa5fc
--- /dev/null
+++ b/cloudfunctions/callback/config.json
@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "openapi": [
+      "customerServiceMessage.send"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/cloudfunctions/callback/index.js b/cloudfunctions/callback/index.js
new file mode 100644
index 0000000..c80f887
--- /dev/null
+++ b/cloudfunctions/callback/index.js
@@ -0,0 +1,26 @@
+const cloud = require('wx-server-sdk')
+
+cloud.init({
+  // API 调用都保持和云函数当前所在环境一致
+  env: cloud.DYNAMIC_CURRENT_ENV
+})
+
+// 云函数入口函数
+exports.main = async (event, context) => {
+
+  console.log(event)
+
+  const { OPENID } = cloud.getWXContext()
+
+  const result = await cloud.openapi.customerServiceMessage.send({
+    touser: OPENID,
+    msgtype: 'text',
+    text: {
+      content: '收到：' + event.Content,
+    }
+  })
+
+  console.log(result)
+
+  return result
+}
diff --git a/cloudfunctions/callback/package.json b/cloudfunctions/callback/package.json
new file mode 100644
index 0000000..dd8f14a
--- /dev/null
+++ b/cloudfunctions/callback/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "callback",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "wx-server-sdk": "~2.1.2"
+  }
+}
\ No newline at end of file
diff --git a/cloudfunctions/echo/config.json b/cloudfunctions/echo/config.json
new file mode 100644
index 0000000..16348ce
--- /dev/null
+++ b/cloudfunctions/echo/config.json
@@ -0,0 +1,5 @@
+{
+  "permissions": {
+    "openapi": []
+  }
+}
diff --git a/cloudfunctions/echo/index.js b/cloudfunctions/echo/index.js
new file mode 100644
index 0000000..4f83878
--- /dev/null
+++ b/cloudfunctions/echo/index.js
@@ -0,0 +1,8 @@
+const cloud = require('wx-server-sdk')
+
+exports.main = async (event, context) => {
+  // event.userInfo 是已废弃的保留字段，在此不做展示
+  // 获取 OPENID 等微信上下文请使用 cloud.getWXContext()
+  delete event.userInfo
+  return event
+}
diff --git a/cloudfunctions/echo/package.json b/cloudfunctions/echo/package.json
new file mode 100644
index 0000000..1e62da3
--- /dev/null
+++ b/cloudfunctions/echo/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "echo",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "wx-server-sdk": "~2.1.2"
+  }
+}
\ No newline at end of file
diff --git a/cloudfunctions/login/config.json b/cloudfunctions/login/config.json
new file mode 100644
index 0000000..16348ce
--- /dev/null
+++ b/cloudfunctions/login/config.json
@@ -0,0 +1,5 @@
+{
+  "permissions": {
+    "openapi": []
+  }
+}
diff --git a/cloudfunctions/login/index.js b/cloudfunctions/login/index.js
new file mode 100644
index 0000000..46c44aa
--- /dev/null
+++ b/cloudfunctions/login/index.js
@@ -0,0 +1,36 @@
+// 云函数模板
+// 部署：在 cloud-functions/login 文件夹右击选择 “上传并部署”
+
+const cloud = require('wx-server-sdk')
+
+// 初始化 cloud
+cloud.init({
+  // API 调用都保持和云函数当前所在环境一致
+  env: cloud.DYNAMIC_CURRENT_ENV
+})
+
+/**
+ * 这个示例将经自动鉴权过的小程序用户 openid 返回给小程序端
+ * 
+ * event 参数包含小程序端调用传入的 data
+ * 
+ */
+exports.main = async (event, context) => {
+  console.log(event)
+  console.log(context)
+
+  // 可执行其他自定义逻辑
+  // console.log 的内容可以在云开发云函数调用日志查看
+
+  // 获取 WX Context (微信调用上下文)，包括 OPENID、APPID、及 UNIONID（需满足 UNIONID 获取条件）等信息
+  const wxContext = cloud.getWXContext()
+
+  return {
+    event,
+    openid: wxContext.OPENID,
+    appid: wxContext.APPID,
+    unionid: wxContext.UNIONID,
+    env: wxContext.ENV,
+  }
+}
+
diff --git a/cloudfunctions/login/package.json b/cloudfunctions/login/package.json
new file mode 100644
index 0000000..3c5d61a
--- /dev/null
+++ b/cloudfunctions/login/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "login",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "wx-server-sdk": "~2.1.2"
+  }
+}
diff --git a/cloudfunctions/openapi/config.json b/cloudfunctions/openapi/config.json
new file mode 100644
index 0000000..0074569
--- /dev/null
+++ b/cloudfunctions/openapi/config.json
@@ -0,0 +1,15 @@
+{
+  "permissions": {
+    "openapi": [
+      "wxacode.get",
+      "subscribeMessage.send",
+      "subscribeMessage.addTemplate",
+      "templateMessage.send",
+      "templateMessage.addTemplate",
+      "templateMessage.deleteTemplate",
+      "templateMessage.getTemplateList",
+      "templateMessage.getTemplateLibraryById",
+      "templateMessage.getTemplateLibraryList"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/cloudfunctions/openapi/index.js b/cloudfunctions/openapi/index.js
new file mode 100644
index 0000000..1ae21a4
--- /dev/null
+++ b/cloudfunctions/openapi/index.js
@@ -0,0 +1,87 @@
+// 云函数入口文件
+const cloud = require('wx-server-sdk')
+
+cloud.init()
+
+// 云函数入口函数
+exports.main = async (event, context) => {
+  console.log(event)
+  switch (event.action) {
+    case 'requestSubscribeMessage': {
+      return requestSubscribeMessage(event)
+    }
+    case 'sendSubscribeMessage': {
+      return sendSubscribeMessage(event)
+    }
+    case 'getWXACode': {
+      return getWXACode(event)
+    }
+    case 'getOpenData': {
+      return getOpenData(event)
+    }
+    default: {
+      return
+    }
+  }
+}
+
+async function requestSubscribeMessage(event) {
+  // 此处为模板 ID，开发者需要到小程序管理后台 - 订阅消息 - 公共模板库中添加模板，
+  // 然后在我的模板中找到对应模板的 ID，填入此处
+  return '请到管理后台申请模板 ID 然后在此替换' // 如 'N_J6F05_bjhqd6zh2h1LHJ9TAv9IpkCiAJEpSw0PrmQ'
+}
+
+async function sendSubscribeMessage(event) {
+  const { OPENID } = cloud.getWXContext()
+
+  const { templateId } = event
+
+  const sendResult = await cloud.openapi.subscribeMessage.send({
+    touser: OPENID,
+    templateId,
+    miniprogram_state: 'developer',
+    page: 'pages/openapi/openapi',
+    // 此处字段应修改为所申请模板所要求的字段
+    data: {
+      thing1: {
+        value: '咖啡',
+      },
+      time3: {
+        value: '2020-01-01 00:00',
+      },
+    }
+  })
+
+  return sendResult
+}
+
+async function getWXACode(event) {
+
+  // 此处将获取永久有效的小程序码，并将其保存在云文件存储中，最后返回云文件 ID 给前端使用
+
+  const wxacodeResult = await cloud.openapi.wxacode.get({
+    path: 'pages/openapi/openapi',
+  })
+
+  const fileExtensionMatches = wxacodeResult.contentType.match(/\/([^\/]+)/)
+  const fileExtension = (fileExtensionMatches && fileExtensionMatches[1]) || 'jpg'
+
+  const uploadResult = await cloud.uploadFile({
+    // 云文件路径，此处为演示采用一个固定名称
+    cloudPath: `wxacode_default_openapi_page.${fileExtension}`,
+    // 要上传的文件内容可直接传入图片 Buffer
+    fileContent: wxacodeResult.buffer,
+  })
+
+  if (!uploadResult.fileID) {
+    throw new Error(`upload failed with empty fileID and storage server status code ${uploadResult.statusCode}`)
+  }
+
+  return uploadResult.fileID
+}
+
+async function getOpenData(event) {
+  return cloud.getOpenData({
+    list: event.openData.list,
+  })
+}
diff --git a/cloudfunctions/openapi/package.json b/cloudfunctions/openapi/package.json
new file mode 100644
index 0000000..fc486e1
--- /dev/null
+++ b/cloudfunctions/openapi/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "openapi",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "wx-server-sdk": "~2.1.2"
+  }
+}
diff --git a/miniprogram/app.js b/miniprogram/app.js
new file mode 100644
index 0000000..5db79b0
--- /dev/null
+++ b/miniprogram/app.js
@@ -0,0 +1,152 @@
+//app.js
+
+//全局分享
+!function(){
+  var PageTmp = Page;
+  Page =function (pageConfig) {
+    // 设置全局默认分享
+    pageConfig = Object.assign({
+            //右上角分享功能
+            onShareAppMessage () {
+                return {
+                    title: '智慧工地优管',//分享标题
+                    path: '/pages/login/login',//分享用户点开后页面
+                    success (res) {
+                        console.log('分享成功！')
+                    }
+                }
+            }
+    },pageConfig);
+    PageTmp(pageConfig);
+  };
+}();
+
+App({
+  globalData: {
+    paramDeptId:'',
+    userProjectId:'',
+    appId: "wxc44b5d588f599758",
+    // 智慧工地后台接口访问域名
+    // reqUrl:"http://wxw.ngrok.makalu.cc",
+    //reqUrl:'https://jaapplets.makalu.cc',
+    //reqUrl:'https://sxyanzhu.com/jhwxapp',
+    //reqUrl:'https://cf.makalu.cc',
+    reqUrl:'http://127.0.0.1:8091',
+
+    //御景路数字化集成管控平台接口访问域名
+    szhUrl:'https://szh.makalu.cc',
+    // szhUrl:'http://127.0.0.1:9004',
+    // szhUrl:'http://192.168.31.49:9004',
+    
+    //劳务实名制平台接口访问域名
+    smzUrl:'https://smz.makalu.cc',
+  
+    //安全智管平台接口访问域名
+    aqzgUrl:'https://aqzg.makalu.cc',
+
+    //地图相关参数
+
+    
+    scale:'',
+    initialLon:'',
+    initialLat:'',
+    markers:[],
+    //页面跳转参数
+    type:'',
+    value1:'省',
+    value2:'市/区',
+    value3:'公司',
+    projectInfoList:{},
+    projectId:'',
+    projectName:'',
+    companyName:'',
+    deptId:'',
+  },
+
+  onLaunch: function () {
+    if (!wx.cloud) {
+      console.error('请使用 2.2.3 或以上的基础库以使用云能力')
+    } else {
+      wx.cloud.init({
+        // env 参数说明：
+        //   env 参数决定接下来小程序发起的云开发调用（wx.cloud.xxx）会默认请求到哪个云环境的资源
+        //   此处请填入环境 ID, 环境 ID 可打开云控制台查看
+        //   如不填则使用默认环境（第一个创建的环境）
+        // env: 'my-env-id',
+        traceUser: true,
+      })
+    }
+    this.update();
+  },
+  onLoad(){
+
+  },
+  /**
+   * 获取用户openid
+   */
+  getOPenId:function () {
+    wx.login({
+      success :res=>{
+          console.log(res)
+          wx.request({
+              url: this.globalData.reqUrl+'/weixin/userLogin/getOpenId', 
+              data:{
+                  "code": res.code,
+                  "appId":"wxc44b5d588f599758",
+              },
+              success:(res)=>{
+                  wx.setStorageSync('openId', res.data.openid)
+              }
+          })
+      }
+    })
+},
+  //页面弹窗
+  toast: function (msg) {
+    wx.showToast({
+      title: msg,
+      icon: 'none',
+      duration: 2000,
+      mask: true
+    });
+  },
+
+ //版本更新
+  update(){
+    //使用更新对象之前判断是否可用
+    if (wx.canIUse('getUpdateManager')){
+      const updateManager = wx.getUpdateManager()
+      updateManager.onCheckForUpdate(function (res) {
+        // 请求完新版本信息的回调
+        console.log(res.hasUpdate)//res.hasUpdate返回boolean类型
+        if (res.hasUpdate) {
+          updateManager.onUpdateReady(function () {
+            wx.showModal({
+              title: '更新提示',
+              content: '新版本已经准备好，是否重启当前应用？',
+              success(res) {
+                if (res.confirm) {
+                  // 新的版本已经下载好，调用applyUpdate应用新版本并重启
+                  updateManager.applyUpdate()
+                }
+              }
+            })
+          })
+          // 新版本下载失败时执行
+          updateManager.onUpdateFailed(function () {
+            wx.showModal({
+              title: '发现新版本',
+              content: '请删除当前小程序，重新搜索打开...',
+            })
+          })
+        }
+      })
+    }else{
+      //如果小程序需要在最新的微信版本体验，如下提示
+      wx.showModal({
+        title: '更新提示',
+        content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+      })
+    }
+  }
+})
diff --git a/miniprogram/app.js.mine b/miniprogram/app.js.mine
new file mode 100644
index 0000000..9aefa08
--- /dev/null
+++ b/miniprogram/app.js.mine
@@ -0,0 +1,71 @@
+//app.js
+
+//全局分享
+!function(){
+  var PageTmp = Page;
+  Page =function (pageConfig) {
+    // 设置全局默认分享
+    pageConfig = Object.assign({
+            //右上角分享功能
+            onShareAppMessage () {
+                return {
+                    title: '智能工地+',//分享标题
+                    path: '/pages/login/login',//分享用户点开后页面
+                    success (res) {
+                        console.log('分享成功！')
+                    }
+                }
+            }
+    },pageConfig);
+    PageTmp(pageConfig);
+  };
+}();
+
+App({
+  globalData: {
+    paramDeptId:'',
+    //请求地址参数
+    //reqUrl:"http://192.168.31.126:9981",
+    //reqUrl:'https://zngdtest.makalu.cc/',
+    reqUrl:'https://zngd.makalu.cc',
+    //地图相关参数
+    scale:'',
+    initialLon:'',
+    initialLat:'',
+    markers:[],
+    //页面跳转参数
+    type:'',
+    value1:'省',
+    value2:'市/区',
+    value3:'公司',
+    projectInfoList:{},
+    projectId:'',
+    projectName:'',
+  },
+
+  onLaunch: function () {
+    if (!wx.cloud) {
+      console.error('请使用 2.2.3 或以上的基础库以使用云能力')
+    } else {
+      wx.cloud.init({
+        // env 参数说明：
+        //   env 参数决定接下来小程序发起的云开发调用（wx.cloud.xxx）会默认请求到哪个云环境的资源
+        //   此处请填入环境 ID, 环境 ID 可打开云控制台查看
+        //   如不填则使用默认环境（第一个创建的环境）
+        // env: 'my-env-id',
+        traceUser: true,
+      })
+    }
+  },
+
+  //页面弹窗
+  toast: function (msg) {
+    wx.showToast({
+      title: msg,
+      icon: 'none',
+      duration: 2000,
+      mask: true
+    });
+  }
+  
+})
\ No newline at end of file
diff --git a/miniprogram/app.json b/miniprogram/app.json
new file mode 100644
index 0000000..e37697a
--- /dev/null
+++ b/miniprogram/app.json
@@ -0,0 +1,147 @@
+{
+    "pages": [
+        "pages/login/login",
+        "pages/gongchengliebiao/gongchengliebiao",
+        "pages/gengduogongneng/gengduogongneng",
+        "pages/xiangmugaikuang/xiangmugaikuang",
+        "pages/renyuanguanli/renyuanguanli",
+        "pages/shebieguanli-tzsb/taji",
+        "pages/shebieguanli-jxsb/shajiangguan",
+        "pages/ranyuanguanli-map/map",
+        "pages/map/map",
+        "pages/shebeiguanli-map/jixiedingwei",
+        "pages/deepExcavation/index",
+        "pages/Information-review/index",
+        "pages/newAddPage/safetyManagement/index",
+        "pages/learn-page/index",
+        "pages/Personnel-information-binding/index",
+        "pages/winter-training/index",
+        "pages/saft-qr-view/index",
+        "pages/saft-education-user-bind/index",
+        "pages/temporaryToExamine/index",
+        "pages/tempRegistration/index",
+        "pages/newAddPage/safetyBriefingLearning/index",
+        "pages/newAddPage2/safetyBriefingLearning/index",
+        "pages/Highlight-photos/index",
+        "pages/newAddPage/letterCommitment/index",
+        "pages/newAddPage2/letterCommitment/index",
+        "pages/Security-control-echarts/index",
+        "pages/Concrete-usage/index",
+        "pages/Quality-Assurance/index",
+        "pages/Standard-maintenance-room-monitoring/index",
+        "pages/hnt-strong/index",
+        "pages/construction/index",
+        "pages/Construction-Log/index",
+        "pages/construction-details/index",
+        "pages/measures/index",
+        "pages/measures-Chakan/index",
+        "pages/updatePassword/updatePassword"
+    ],
+    "subpackages": [
+        {
+            "root": "pageage",
+            "name": "pageage",
+            "pages": [
+                "educations-add/index",
+                "educations-details/index",
+                "educations-list/index",
+                "xiangmuhuanjing/xiangmuhuanjing",
+                "xiangmuyujing/xiangmuyujing",
+                "yujingxinxi/yujingxinxi",
+                "xiangmushipin/xiangmushipin",
+                "AIvideoAnalysis/index",
+                "AIWarningList/index",
+                "vehicleManage/index",
+                "shipinquanping/shipingquanping",
+                "voucherManagement/index",
+                "voucherManagementAddto/index",
+                "biangeng/index",
+                "suishoupai/suishoupai",
+                "suishoupai-psh/suishoupai-psh",
+                
+                "lw-index/lw-index",
+                "lw-baobiaochaxun/lw-baobiaochaxun",
+                "lw-gerenxinxi/lw-gerenxinxi",
+                "lw-jibenxinxi/lw-jibenxinxi",
+                "safetyManagement/securityCheckGR/index",
+                "safetyManagement/securityCheck/index",
+                "safetyManagement/problemRectificationGR/index",
+                "safetyManagement/problemRectification/index",
+                "safetyManagement/securityCheckRectified/index",
+                "safetyManagement/addSafetyInspect/index",
+                "Security-control-echarts/index",
+                "dangerousProject/index",
+                "samplingRetesting/index",
+                "samplingRetestingDeliver/index",
+                "samplingRetestingUpload/index",
+                "samplingAddRetestingDeliver/index",
+                "samplingRetestingDetail/index",
+                "Progress-management/index",
+                "Material-Management/index",
+                "technical-management/index"
+            ],
+            "independent": false
+        }
+    ],
+    "usingComponents": {
+        "van-row": "@vant/weapp/row",
+        "van-col": "@vant/weapp/col",
+        "van-popup": "@vant/weapp/popup/index",
+        "van-picker": "@vant/weapp/picker/index",
+        "van-uploader": "@vant/weapp/uploader/index",
+        "van-datetime-picker": "@vant/weapp/datetime-picker/index",
+        "van-radio": "@vant/weapp/radio/index",
+        "van-radio-group": "@vant/weapp/radio-group/index",
+        "van-toast": "@vant/weapp/toast/index",
+        "ec-canvas": "ec-canvas/ec-canvas",
+        "van-sticky": "@vant/weapp/sticky",
+        "van-calendar": "@vant/weapp/calendar/index",
+        "van-icon": "@vant/weapp/icon/index",
+        "van-image": "@vant/weapp/image/index",
+        "pie-chart": "pages/components/pie-chart/index",
+        "deep-select": "pages/components/deep-select/index",
+        "select-btn": "pages/components/select-btn/index",
+        "bar-chart": "pages/components/bar-chart/index",
+        "bar-chart-warning": "pages/components/bar-chart-warning/index",
+        "pz-screen": "pages/components/pz-screen/index",
+        "pz-screen-training": "pages/components/pz-screen-training/index",
+        "pz-screen-training-index": "pages/components/pz-screen-training-index/index",
+        "select-date": "pages/components/select-date/index",
+        "voucher-select": "pages/components/voucher-select/index",
+        "voucher-selects": "pages/components/voucher-selects/index",
+        "voucher-selected": "pages/components/voucher-selected/index",
+        "voucher-date": "pages/components/voucher-date/index",
+        "voucher-date-copy": "pages/components/voucher-date-copy/index",
+        "file-uploader": "pages/components/file-uploader/index",
+        "project-select": "pages/components/project-select/index",
+        "safety-pie-chart": "./newComponents/safety-pie-chart/index",
+        "safety-pie-charts": "./newComponents/safety-pie-charts/index",
+        "safety-bar-chart": "./newComponents/safety-bar-chart/index",
+        "safety-bar-charts": "./newComponents/safety-bar-charts/index",
+        "safety-bar-chartss": "./newComponents/safety-bar-chartss/index",
+        "file-uploader-copy": "pages/components/file-uploader-copy/index",
+        "voucher-many-select": "pages/components/voucher-many-select/index",
+        "sign": "pages/components/sign/sign",
+        "safety-number": "./newComponents/number/index",
+        "select-person": "./newComponents/select-person/index",
+        "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+        "van-dropdown-item": "@vant/weapp/dropdown-item/index",
+        "curve-echarts": "pages/components/curve-echarts/index",
+        "curve-echarts-copy": "pages/components/curve-echarts-copy/index"
+    },
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#191d28",
+        "navigationBarTextStyle": "white"
+    },
+    "style": "v2",
+    "sitemapLocation": "sitemap.json",
+    "permission": {
+        "scope.userLocation": {
+            "desc": "你的位置信息将用于小程序位置接口的效果展示"
+        }
+    },
+    "requiredPrivateInfos": [
+        "getLocation"
+    ]
+}
\ No newline at end of file
diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
new file mode 100644
index 0000000..1c21a07
--- /dev/null
+++ b/miniprogram/app.wxss
@@ -0,0 +1,1525 @@
+/**app.wxss**/
+.container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  padding: 200rpx 0;
+  box-sizing: border-box;
+  
+} 
+page{
+  background: #191d28;
+  color: #ffffff;
+  font-size: 30rpx;
+}
+
+/* 自定义顶部样式 */
+.header_title{
+  position: fixed;
+  width:100%;
+  z-index: 5;
+  margin: 0;
+  padding: 85rpx 0 30rpx; 
+  background: #191d28;
+}
+/* 自定义顶部样式 */
+.header_title_saft{
+  width:100%;
+  z-index: 5;
+  margin: 0;
+  padding: 85rpx 0 30rpx; 
+  background: #191d28;
+}
+.header_name{
+  text-align: center;
+}
+.header_img{
+  padding-left: 30rpx;
+  padding-top: 10rpx;
+}
+.header_fh{
+  font-size: 28rpx;
+  position: relative;
+  top: -5rpx;
+}
+.header_img image{
+  width: 30rpx;
+  height:30rpx;
+}
+
+/* 中间内容用含有max_content 的 view  包起来 */
+.max_content{
+  padding: 166rpx 0 180rpx;
+}
+.min_content{
+  padding: 166rpx 0 20rpx;
+}
+.max_new_content{
+  padding: 0 0 120rpx;
+}
+
+/* 左侧菜单 */
+.left_max{
+  padding-top: 180rpx;
+} 
+.left_head{
+  width: 140rpx;
+  height: 140rpx;
+  margin: auto;
+  background: #2b345b;
+  border-radius: 50%;
+}
+.left_head image{
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 50%;
+}
+.left_info{
+  font-size: 28rpx;
+  padding-top: 10rpx;
+}
+.left_info_name{
+  padding: 10rpx;
+}
+.left_info_dept{
+  text-align: center;
+  margin-bottom: 40rpx;
+}
+.left_manage_max{
+  padding: 50rpx 0;
+}
+.left_manage_min{
+  padding: 0 5%;
+  margin-top: 40rpx;
+}
+.left_manage{
+  padding: 20rpx 20rpx 15rpx;
+  background: #2b345b;
+  border-radius: 100rpx;
+  font-size: 28rpx;
+}
+.left_manage:active{
+  background: #232a4a;
+}
+.left_pro{
+  position: relative;
+  top: -10rpx;
+  padding-left: 20rpx;
+}
+.left_icon{
+  width: 40rpx;
+  height: 40rpx;
+}
+.left_flaot{
+  width: 40rpx;
+  height: 40rpx;
+  float: right;
+}
+.left_password{
+  text-align: center;
+  padding-bottom: 5rpx;
+}
+.left_sign{
+  text-align: center;
+  padding-bottom: 5rpx;
+  color: #F56C6C;
+}
+
+/* 底部导航 */
+.van-tabbar.van-tabbar--fixed{
+  background-image: linear-gradient(#33426b, #202b47);
+}
+.van-tabbar.van-tabbar--fixed:after {
+  border-width: 0px 0;
+}
+
+/* 页面公用部分样式 */
+.video_add{
+  padding: 20rpx 30rpx;
+}
+.video_address{
+  background:#30343f;
+  padding:0 20rpx; 
+  border-radius:50rpx;
+  font-size: 28rpx;
+}
+.video_address_min{
+  background:url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/40rpx;
+  height: 80rpx; 
+  line-height: 80rpx;
+  padding-left: 50rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+}
+/* 清除上浮 */
+.clearfix:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+.gif{
+  margin:400rpx auto 0;
+  text-align: center;
+}
+.gif image{
+  width: 60rpx;
+  height: 60rpx;
+}
+.gif view{
+  padding-top: 20rpx;
+}
+
+/* 建安公司新页面 */
+.modify_video_nav{
+  background: #32416a;
+  margin-top: 20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-evenly;
+  padding: 25rpx 0;
+  color: #7c95d7;
+}
+.modify_video_nav .active{
+  color: #ffffff;
+}
+.modify_video_nav .active text{
+  padding: 15rpx 0;
+  border-bottom: 3px solid #5c9efe;
+}
+.modify_echarts_max{
+  margin-top: 30rpx;
+  padding:0 20rpx;
+}
+.modify_echarts_min{
+  background:#1e2336 ;
+  font-size: 28rpx;
+  padding: 30rpx;
+}
+.modify_echarts_title_min{
+  padding: 10rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.modify_eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.modify_list_btn{
+  font-size: 28rpx;
+  color: #7a8fce;
+}
+.modify_video_work_area{
+  margin-top: 20rpx;
+  padding:10rpx 30rpx;
+}
+.modify_video_work_area{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  font-size: 28rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+
+.video_ai_survey{
+  padding: 15rpx ;
+}
+.ai_video_con{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding:  30rpx 0 30rpx 30rpx;
+  color: #ffffff;
+}
+.ai_video_con_title{
+  display: flex;
+  align-items: center;
+}
+.ai_video_con_title image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.ai_video_con_title text{
+  padding-left: 15rpx;
+}
+.ai_video_con_number text{
+  font-size: 35rpx;
+  font-weight: bold;
+  color: #00ecfe;
+}
+
+.video_list_max{
+  padding: 15rpx;
+}
+.ai_warning_list{
+  padding: 30rpx 0;
+  border-bottom: 1px solid #404a74;
+  display: flex;
+  align-items: center;
+}
+.ai_warning_list_img{
+  width: 220rpx;
+  height: 180rpx;
+  border-radius: 8rpx;
+}
+.ai_warning_list_con{
+  padding-left: 20rpx;
+  font-size: 30rpx;
+  width: calc(100% - 240rpx);
+}
+.ai_warning_list_con .ai_warning_list_project{
+  padding: 5rpx 0;
+  color: #ffffff;
+  font-weight: bold;
+}
+.ai_warning_list_con view{
+  padding: 7rpx 0;
+
+}
+.ai_warning_list_reason text{
+  color: #ff8909;
+}
+.ai_warning_list_position text{
+  color: #00a8ff;
+}
+.ai_warning_list_time{
+  font-size: 26rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.ai_warning_list_time_date{
+  color: #89a3ed;
+}
+.ai_warning_list_video_btn{
+  background: #404a74;
+  font-size: 22rpx;
+  border-radius: 5rpx;
+  color: #ffffff;
+  padding: 5rpx 10rpx !important;
+  display: flex;
+  align-items: center;
+}
+.ai_warning_list_video_btn image{
+  width: 22rpx;
+  height: 22rpx;
+  margin-right: 10rpx;
+}
+
+.video_icon text{
+  font-size: 36rpx;
+  color: #00a8ff;
+}
+.video_num{
+  padding:0 30rpx;
+  height: 120rpx;
+}
+.video_icon {
+  font-size: 28rpx;
+  text-align: center;
+  padding: 30rpx 0;
+}
+.video_icon image{
+  width: 40rpx;
+  height: 40rpx;
+  position: relative;
+  top: 10rpx;
+}
+
+.vehicle_video_nav_max{
+  padding:10rpx 20rpx;
+}
+.vehicle_video_nav_min{
+  background: #1c2232;
+  display: flex;
+  align-items: center;
+}
+.vehicle_video_nav{
+  padding: 20rpx;
+  font-size: 28rpx;
+}
+.vehicle_video_nav.active{
+  background: #2b345b;
+  border-radius: 10rpx;
+}
+.modify_vehicle_video{
+  padding: 30rpx 10rpx 0;
+}
+.modify_vehicle_video video{
+  width: 100%;
+  height: 350rpx;
+  border-radius: 10rpx;
+}
+
+.modify_list_license_plate_max{
+  padding:30rpx 5rpx;
+}
+.modify_list_license_plate{
+  border: 2px solid #2b4169;
+  text-align: center;
+  padding: 10rpx 0;
+  background: #1f253b;
+}
+.modify_list_license_direction{
+  padding: 30rpx 10rpx 10rpx;
+  font-size: 28rpx;
+  color:#8ba3ed;
+}
+.modify_list_photos_max{
+  padding: 20rpx 10rpx;
+}
+.modify_list_photos_min{
+  width: 100%;
+  height: 220rpx;
+  background: #232943 url("http://fileimg.makalu.cc/WEB_6F3E3915E1A44AF6BE55F4B1BE0E277F.png") no-repeat center/130rpx 130rpx;
+  border-radius: 10rpx;
+}
+.modify_list_photos_min image{
+  width: 100%;
+  height: 100%;
+  border-radius: 10rpx;
+}
+.modify_list_photos_time{
+  padding: 20rpx 0 0;
+  font-size: 28rpx;
+  text-align: center;
+}
+
+/* 安全管控 */
+.deep_select{
+  padding: 15rpx;
+}
+.deep_select_padding{
+  padding: 15rpx;
+}
+.deep_point_position{
+  display: flex;
+  justify-content: space-evenly;
+  align-items: center;
+  font-size: 28rpx;
+  color: #737478;
+  padding: 20rpx 0;
+  margin-bottom: 30rpx;
+}
+.deep_point_position .active{
+  color: #88a2ec;
+}
+.deep_point_position .active text{
+  color: #08d6eb;
+}
+.deep_modular_max{
+  padding:50rpx 30rpx;
+}
+.deep_modular_min{
+  background: #1e2336;
+  margin-bottom: 30rpx;
+}
+.deep_modular_title{
+  padding:20rpx 20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 28rpx;
+}
+.deep_qingxie{
+  background: url("http://fileimg.makalu.cc/WEB_EE67AE44D92E4894AEF2AAD8A511CFE1.png") no-repeat left/30rpx 30rpx;
+  padding-left: 40rpx;
+}
+.deep_weiyi{
+  background: url("http://fileimg.makalu.cc/WEB_80265DAD5962462DA855FE1E6E735650.png") no-repeat left/30rpx 30rpx;
+  padding-left: 40rpx;
+}
+.modify_video_nav_af{
+  margin: 0;
+}
+
+.modify_video_add{
+  margin-bottom: 30rpx;
+}
+.dangerous_node{
+  display: flex;
+  align-items: center;
+  justify-content: space-evenly;
+  padding: 40rpx 0;
+}
+.dangerous_node_min{
+  text-align: center;
+}
+.dangerous_node_number{
+  font-size: 38rpx;
+  padding: 15rpx 0;
+}
+.cyan{
+  color: #08d6ed;
+}
+.blue{
+  color: #1879da;
+}
+.orange{
+  color: #fd9729;
+}
+.dangerous_node_title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-top: 15rpx;
+}
+.dangerous_node_title image{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 15rpx;
+}
+
+.timeline_max{
+  padding: 30rpx 30rpx 30rpx 40rpx;
+}
+.timeline_for{
+  padding-bottom: 50rpx;
+  border-left: 1px solid #1d2b52;
+}
+.timeline_for_title{
+  padding-bottom: 20rpx;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.timeline_for_dot{
+  width: 20rpx;
+  height: 20rpx;
+  background: #ff0000;
+  position: absolute;
+  left: -10rpx;
+  border-radius: 50%;
+}
+.timeline_for_text{
+  padding-left: 40rpx;
+}
+.timeline_for_list{
+  padding: 10rpx 0 10rpx 40rpx;
+  display: flex;
+  align-items: center;
+  color: #d4d9ec;
+}
+
+.timeline_for_time{
+  color: #43aeff;
+}
+.timeline_for_state_1{
+  height: 40rpx;
+  width: 160rpx;
+  text-align: center;
+  line-height: 40rpx;
+  font-size: 24rpx;
+  background: url("http://fileimg.makalu.cc/WEB_F5E44186F6C44161B99491284E33EEE6.png") no-repeat center/100% 100%;
+}
+.timeline_for_state_2{
+  height: 40rpx;
+  width: 160rpx;
+  text-align: center;
+  line-height: 40rpx;
+  font-size: 24rpx;
+  background: url("http://fileimg.makalu.cc/WEB_345B9059DAD1492EB37EC4814EB340F0.png") no-repeat center/100% 100%;
+}
+.timeline_for_file{
+  padding: 10rpx 0 10rpx 40rpx;
+  font-size: 28rpx;
+  color: #d4d9ec;
+  display: flex;
+}
+.timeline_for_list_title{
+  width: 140rpx;
+  padding-top: 10rpx;
+}
+
+.timeline_for_list_file{
+  padding-top: 10rpx;
+  width: calc(100% - 140rpx);
+}
+.zs_level_list_label{
+  padding:0 10rpx;
+}
+.zs_level_list_label view{
+  padding: 10rpx 0;
+  color: #7f91f5;
+  text-decoration: underline;
+}
+.zs_level_list_label view:active{
+  color: #4f6aff;
+}
+
+.pz_list_max{
+  padding: 30rpx 10rpx;
+}
+.pz_list_for{
+  padding: 30rpx;
+  background: #1e2336;
+  margin-bottom: 30rpx;
+}
+.pz_list_for_list{
+  padding: 10rpx 0 ;
+}
+
+
+.modify_video_add{
+  margin-bottom: 30rpx;
+}
+.dangerous_node{
+  display: flex;
+  align-items: center;
+  justify-content: space-evenly;
+  padding: 40rpx 0;
+}
+.dangerous_node_min{
+  text-align: center;
+}
+.dangerous_node_number{
+  font-size: 38rpx;
+  padding: 15rpx 0;
+}
+.cyan{
+  color: #08d6ed;
+}
+.blue{
+  color: #1879da;
+}
+.orange{
+  color: #fd9729;
+}
+.dangerous_node_title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-top: 15rpx;
+}
+.dangerous_node_title image{
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 15rpx;
+}
+
+.timeline_max{
+  padding: 30rpx 30rpx 30rpx 40rpx;
+}
+.timeline_for{
+  padding-bottom: 50rpx;
+  border-left: 2px solid #3c59a8;
+}
+.timeline_for_title{
+  padding-bottom: 20rpx;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+
+.timeline_for_dot{
+  width: 20rpx;
+  height: 20rpx;
+  border: 1px solid #b2badf;
+  background: #191d28;
+  position: absolute;
+  left: -14rpx;
+  border-radius: 50%;
+}
+.dot_blue{
+  border: 1px solid #1680d6;
+  background: #1680d6;
+}
+.dot_red{
+  border: 1px solid #ff0000;
+  background: #ff0000;
+}
+
+.timeline_for_time{
+  color: #43aeff;
+}
+.timeline_for_state_1{
+  height: 40rpx;
+  width: 160rpx;
+  text-align: center;
+  line-height: 40rpx;
+  font-size: 24rpx;
+  background: url("http://fileimg.makalu.cc/WEB_F5E44186F6C44161B99491284E33EEE6.png") no-repeat center/100% 100%;
+}
+.timeline_for_state_2{
+  height: 40rpx;
+  width: 160rpx;
+  text-align: center;
+  line-height: 40rpx;
+  font-size: 24rpx;
+  background: url("http://fileimg.makalu.cc/WEB_345B9059DAD1492EB37EC4814EB340F0.png") no-repeat center/100% 100%;
+}
+.timeline_for_file{
+  padding: 10rpx 0 10rpx 40rpx;
+  font-size: 28rpx;
+  color: #d4d9ec;
+  display: flex;
+}
+.timeline_for_list_title{
+  width: 140rpx;
+  padding-top: 10rpx;
+}
+
+.timeline_for_list_file{
+  padding-top: 10rpx;
+  width: calc(100% - 140rpx);
+}
+.zs_level_list_label{
+  padding:0 10rpx;
+}
+.zs_level_list_label view{
+  padding: 10rpx 0;
+  color: #7f91f5;
+  text-decoration: underline;
+}
+.zs_level_list_label view:active{
+  color: #4f6aff;
+}
+
+
+
+
+.timeline_for_text{
+  padding-left: 40rpx;
+}
+.timeline_for_list{
+  padding: 10rpx 0 10rpx 40rpx;
+  display: flex;
+  align-items: center;
+  font-size: 28rpx;
+  color: #d4d9ec;
+}
+
+
+
+.pz_list_max{
+  padding: 30rpx 10rpx;
+}
+.pz_list_for{
+  padding: 30rpx;
+  background: #1e2336;
+  margin-bottom: 30rpx;
+}
+.pz_list_for_list{
+  padding: 10rpx 0 ;
+}
+
+
+
+
+
+
+/* 2022-12-22  新增样式 */
+.add_to_btn{
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  bottom: 0;
+  left: 0;
+  background: #212737;
+  height: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+}
+.add_to_btn image{
+  width: 36rpx;
+  height: 36rpx;
+  margin-right: 15rpx;
+}
+.add_to_btn:active{
+  background: #1e2336;
+}
+
+.ai_video_popup video{
+  height: 500rpx;
+  width: 100%;
+}
+/* 凭证管理新增 */
+.add_max{
+  padding: 30rpx 40rpx;
+}
+.add_title{
+  color: #8ca0e7;
+  padding:0 15rpx 30rpx;
+}
+.add_textarea{
+  height: 150rpx ;
+  width:calc(100% - 40rpx);
+  background: #212737;
+  border-radius: 10rpx;
+  padding: 20rpx;
+}
+.add_btn{
+  padding-top: 100rpx;
+  display: flex;
+  justify-content: space-evenly;
+  align-items: center;
+}
+.add_btn_qx{
+  background: #3f424b;
+  height:80rpx;
+  width: 250rpx;
+  text-align: center;
+  line-height: 80rpx;
+  border-radius: 10rpx;
+}
+.add_btn_qx:active{
+  background: #3a3e49;
+}
+.add_btn_bc{
+  background: #523fa8;
+  height:80rpx;
+  width: 250rpx;
+  text-align: center;
+  line-height: 80rpx;
+  border-radius: 10rpx;
+}
+.add_btn_bc:active{
+  background: #4a35aa;
+}
+
+
+.van-picker__mask  {
+  background-image: none !important;
+}
+.van-hairline--top-bottom:after {
+  border-top: 1px solid #3a4c8b !important;
+  border-bottom: 1px solid #3a4c8b !important;
+}
+
+
+
+.van-picker {
+  background: none !important;
+}
+
+
+
+
+
+/* 2023-5-4 新样式 */
+.module_max{
+  margin-top: 30rpx;
+  padding:0 30rpx;
+}
+
+.module_min{
+  background:#1e2336 ;
+  font-size: 30rpx;
+  padding: 30rpx 20rpx;
+  border-radius: 15rpx;
+}
+.module_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.safety_inspect{
+  padding:30rpx 20rpx;
+}
+.safety_inspect_title{
+  color: #e9fbf9;
+  font-size: 26rpx;
+  padding: 20rpx;
+  background: url("http://fileimg.makalu.cc/WEB_F9046A91C12646ECAEB6024455C35F15.png") no-repeat left/15rpx 30rpx;
+}
+.safety_prop{
+  display: flex;
+  align-items: center;
+  padding: 20rpx 0 20rpx 20rpx;
+  color: #cbdaff;
+  background: url("http://fileimg.makalu.cc/WEB_23ADD5DCCD3C42BA9FF57BE9838766B4.png") no-repeat left/15rpx 25rpx;
+}
+.safety_prop_val{
+  color: #687a92;
+}
+.safety_prop_val text{
+  color: #ffffff;
+  font-size: 32rpx;
+}
+.safety_issue{
+  padding-top: 20rpx;
+}
+.safety_issue_number{
+  padding:0 20rpx;
+  height: 50rpx;
+  display: flex;
+  align-items: center;
+  background: url("http://fileimg.makalu.cc/WEB_FD18DB06491847FA913067FF7B812FBA.png") no-repeat left/100% 100%;
+}
+.safety_deep{
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.safety_deep_row{
+  display: flex;
+  align-items: center;
+  padding: 40rpx 0;
+}
+.safety_deep_img{
+  height: 110rpx;
+  width: 110rpx;
+  text-align: center;
+  line-height: 140rpx;
+}
+.safety_deep_img_1{
+  background: url("http://fileimg.makalu.cc/WEB_F2CA2559EEB9456791461DBC9F8026C8.png") no-repeat center/100rpx 100rpx;
+}
+.safety_deep_img_2{
+  background: url("http://fileimg.makalu.cc/WEB_93D3C5384E774B77AA5B105BE448F2D8.png") no-repeat center/100rpx 100rpx;
+}
+.safety_deep_img image{
+  width: 50rpx;
+  height: 50rpx;
+}
+.safety_deep_col{
+  padding-left: 10rpx;
+  color: #cbdaff;
+}
+.safety_deep_col_text{
+  padding: 10rpx 0;
+}
+.safety_deep_col_number text{
+  font-size: 34rpx;
+  color: #80cefc;
+  font-weight: bold;
+}
+.safety_deep_col_green text{
+  color: #62efbb;
+}
+
+
+.safety_electric{
+  color: #cbdaff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20rpx 0;
+  font-size: 26rpx;
+}
+.safety_electric_threshold{
+  color: #ff0000;
+  font-size: 26rpx;
+}
+.safety_electric_row{
+  display: flex;
+  align-items: center;
+  padding: 30rpx 0 30rpx 10rpx;
+}
+.safety_electric_threshold text{
+  padding-right: 5rpx;
+  font-size: 32rpx;
+}
+.safety_electric_img{
+  height: 110rpx;
+  width: 110rpx;
+  text-align: center;
+  line-height: 140rpx;
+  background: url("http://fileimg.makalu.cc/WEB_2FECA878591045B39AEBB41FE248C97B.png") no-repeat center/100rpx 100rpx;
+}
+.safety_electric_img image{
+  height: 50rpx;
+  width: 50rpx;
+}
+.safety_electric_col{
+  padding-left: 15rpx;
+  color: #cbdaff;
+}
+.safety_electric_number text{
+  font-size: 34rpx;
+  color: #80cefc;
+  font-weight: bold;
+}
+.safety_deep_col_blue text{
+  color: #028ffb;
+}
+
+.module_title_flex{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.module_see_info{
+  font-size: 26rpx;
+  color: #028ffb;
+  display: flex;
+  align-items: center;
+}
+.module_see_info:active{
+  color: #39a6fa;
+}
+.safety_highlights{
+  padding: 30rpx 0;
+}
+.safety_highlights_img{
+  padding: 20rpx 10rpx;
+  text-align: center;
+}
+.safety_highlights_img image{
+  width: 270rpx;
+  height: 270rpx;
+}
+
+
+/* 施工安全交底学习 */
+.study_min{
+  font-size: 30rpx;
+  padding: 30rpx;
+
+}
+.study_video {
+  width: 100%;
+}
+swiper-item video{
+  width: 100%;
+  height: 100%;
+}
+.study_examination_questions{
+  padding: 15rpx 30rpx;
+}
+.study_examination_questions_con{
+  display:inline-table;
+  width: 100% ;
+  
+}
+.study_examination_questions_topic{
+  white-space: normal;
+}
+.study_examination_questions_radio{
+  padding:30rpx 15rpx;
+}
+.study_examination_questions_list{
+  padding: 20rpx 0;
+  display: flex;
+  color: #69709a;
+}
+.study_examination_questions_list.active{
+  color: #899ef1;
+}
+.study_examination_questions_list.error{
+  color: #ff0000;
+}
+.study_radio{
+  width: 30rpx;
+  height: 30rpx;
+  border: 1px solid #69709a;
+  border-radius: 3rpx;
+  color: #171e28;
+  position: relative;
+  top: 7rpx;
+}
+.study_examination_questions_list.active .study_radio{
+  border: 1px solid #899ef1;
+  color: #899ef1;
+}
+.study_examination_questions_list.error .study_radio{
+  border: 1px solid #ff0000;
+  color: #ff0000;
+}
+
+.study_radio_subject{
+  width: calc(100% - 50rpx);
+  padding-left: 20rpx;
+  white-space: normal;
+}
+.study_video_tips{
+  padding: 30rpx;
+  font-size: 28rpx;
+  color: #028ffb;
+}
+.answer_result{
+  background: #232e49;
+  padding: 30rpx;
+  font-size: 35rpx;
+  border-radius: 10rpx
+}
+.switch_button{
+  padding:50rpx 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.switch_button button{
+  width: 250rpx !important;
+  font-weight: 400 !important;
+  background: #3f424b;
+  color: #ffffff;
+}
+.switch_button_to{
+  background: #5140a6 !important;
+}
+
+/* 承诺书 */
+.cns_rich_text_title{
+  padding: 30rpx 50rpx;
+  color: #00a8ff;
+}
+.cns_rich_content{
+  padding: 30rpx 30rpx 0;
+}
+.cns_rich_text{
+  padding: 0 20rpx;
+  background: #1e2336;
+  color: #cdd9ff;
+}
+.cns_confirm{
+  padding: 30rpx;
+}
+.cns_confirm_title{
+  padding: 20rpx;
+  color: #00a8ff;
+}
+.cns_confirm_text{
+  padding: 20rpx;
+}
+.cns_confirm_sign{
+  padding: 20rpx 0;
+}
+.cns_confirm_sign_case{
+  height: 300rpx;
+  background: rgba(255,255,255,0.1);
+}
+
+
+/* 安全管理  安全检查 */
+.inspect_max{
+  padding: 30rpx;
+}
+.inspect_list{
+  padding: 20rpx 0;
+}
+.inspect_for{
+  padding: 20rpx 0;
+  font-size: 30rpx;
+}
+.inspect_for_bgd{
+  background: #1e2336;
+  padding:0 30rpx;
+  border-radius: 10rpx 10rpx 0 0;
+}
+.inspect_list_title{
+  border-bottom: 1px solid #323b86;
+  height: 80rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.inspect_list_title_label{
+  display: flex;
+  align-items: center;
+  width: calc(100% - 150rpx);
+}
+.inspect_list_title_width{
+  width: 100%;
+}
+
+.module_title_text{
+  width: calc(100% - 150rpx);
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.inspect_list_title_state{
+  width: 150rpx;
+  font-size: 26rpx;
+  text-align: right;
+}
+.inspect_list_title_state text{
+  padding:5rpx 10rpx;
+  border-radius: 20rpx 0 20rpx 0;
+}
+.state_colour_0{
+  background: #f3642a;
+}
+.state_colour_1{
+  background: #359a00;
+}
+.state_colour_2{
+  background: #404a6d;
+  color: #8aa4ee;
+}
+.inspect_list_title_number{
+  width: 80rpx;
+  height: 80rpx;
+  border-bottom: 1px solid #6879fd;
+  text-align: center;
+  line-height: 80rpx;
+  color: #6879fd;
+}
+.inspect_list_title_text{
+  width: calc(100% - 80rpx);
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.inspect_list_info{
+  padding: 30rpx 5rpx;
+  color: #d5dbeb;
+}
+.inspect_list_info_details{
+  display: flex;
+  align-items: center;
+}
+.inspect_list_info_img{
+  width: 150rpx;
+}
+.inspect_list_info_img_text{
+  text-align: center;
+  color: #89a3ee;
+  padding-top: 5rpx;
+  padding-right: 20rpx;
+}
+.inspect_list_info_data{
+  width: calc(100% - 150rpx);
+}
+.inspect_list_info_data_num{
+  display: flex;
+  align-items: center;
+  padding: 10rpx 0;
+}
+.inspect_list_info_data_rec{
+  width: calc(100% - 300rpx);
+}
+.inspect_list_info_data_prop_rec{
+  padding: 5rpx 0;
+  color: #d5dbeb;
+}
+.inspect_list_info_padding{
+  padding: 6px 0;
+  color: #d5dbeb;
+}
+.inspect_list_info_flex{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.inspect_list_info_upload{
+  background-image: linear-gradient(to right, #884cf9 , #7457ff);
+  padding: 2rpx 15rpx;
+  border-radius: 30rpx;
+}
+
+
+.inspect_list_info_data_num_option {
+  width: 50%;
+}
+.inspect_list_info_data_prop{
+  padding: 10rpx 0;
+}
+.color_orange{
+  color: #fd8401;
+}
+.color_green{
+  color: #1ab400  ;
+}
+.color_blue {
+  color: #45affb;
+}
+.color_purple{
+  color: #89a3ee;
+}
+.color_type{
+  color: #65779b;
+}
+.inspect_list_info_position{
+  padding-top: 20rpx;
+}
+.inspect_list_info_data_bgd{
+  padding:20rpx 30rpx;
+  background: #313a57;
+  border-radius: 0 0 10rpx 10rpx;
+  color: #d5dbeb;
+}
+.inspect_add_to{
+  position: fixed;
+  right: 30rpx;
+  bottom: 50rpx;
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 50%;
+  background: #273252;
+  text-align: center;
+  font-size: 26rpx;
+  color: #b0ccf5
+}
+.inspect_add_to image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.add_to_font_size{
+  font-size: 50rpx !important;
+}
+/* 问题整改 */
+.inspect_overview_max{
+  background: #191d28;
+  padding-bottom: 30rpx;
+}
+.inspect_overview{
+  background: #1e222e;
+  padding:0 30rpx;
+}
+.module_title_padding{
+  padding: 30rpx 0 30rpx 40rpx;
+  border-bottom: 1px solid #303c84;
+}
+.inspect_overview_list_max{
+  padding: 20rpx 0 20rpx 20rpx;
+}
+.inspect_overview_list{
+  padding: 20rpx 0;
+}
+.problem_list_max{
+  padding-bottom: 50rpx;
+}
+.problem_list_for{
+  margin-bottom: 25rpx;
+}
+.problem_list_title{
+  padding: 30rpx;
+  background: #313b56;
+}
+.problem_list_title:active{
+  background: #29375e
+}
+.problem_list_content{
+  padding:0 30rpx;
+  background: #1d212d;
+}
+.problem_list_content_title{
+  background: url("http://fileimg.makalu.cc/WEB_80CDF4BF20E1432EAB6469D9E0252224.png") no-repeat left/7rpx 30rpx;
+  padding:30rpx 20rpx;
+}
+.problem_list_info{
+  padding:10rpx 20rpx;
+}
+.problem_list_info_title{
+  color: #83a5ef
+}
+.problem_list_info_con{
+  padding: 20rpx 10rpx;
+}
+.problem_list_img{
+  padding: 15rpx 0;
+}
+
+.problem_list_module_border{
+  border-top: 1px solid #343a86;
+}
+.problem_list_btn_max{
+  padding: 30rpx;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+.problem_list_btn{
+  background: #30384b;
+  padding: 13rpx 40rpx;
+  margin: 0 10rpx;
+  border-radius: 6rpx;
+  color: #879ff9;
+}
+.problem_list_btn:active{
+  background: #384461;
+}
+.problem_list_btn_confirm{
+  color: #ffffff;
+  background: #495679;
+}
+.problem_list_btn_confirm:active{
+  background: rgb(61, 76, 124);
+}
+.problem_list_info_input{
+  padding: 20rpx 0;
+}
+.problem_submit_to{
+  padding: 40rpx ;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.problem_submit_to_btn{
+  padding: 20rpx 0;
+  width: 220rpx;
+  text-align: center;
+  border-radius: 10rpx;
+  background: #3e4148;
+}
+.problem_submit_to_btn:active{
+  background: #292d35;
+}
+.problem_submit_to_save{
+  background: #513ea7;
+}
+.problem_submit_to_save:active{
+  background: #372a70;
+}
+
+/* 新增安全检查 */
+.inspect_info{
+  padding: 30rpx;
+  background: #1e222e;
+  margin-bottom: 30rpx;
+}
+.inspect_info_list{
+  padding: 10rpx 0;
+}
+.inspect_info_title{
+  padding: 10rpx 0;
+  color: #83a5ef
+}
+.inspect_info_type{
+  padding: 20rpx 0;
+  display: flex;
+  justify-content: space-around;
+}
+.inspect_info_type view{
+  width: 30%;
+  padding: 18rpx 0;
+  background: #262c3c;
+  text-align: center;
+  border-radius: 10rpx;
+  color: #6a77a3;
+}
+.inspect_info_type .active{
+  color: #ffffff;
+  background: #576691;
+}
+.inspect_input_fill_in{
+  height: 90rpx;
+  background: #212737;
+  border-radius: 10rpx;
+  padding: 0 30rpx;
+}
+.inspect_info_content{
+  padding: 20rpx 0;
+}
+.module_see_info_delete{
+  font-size: 26rpx;
+  color: #ff0000;
+  display: flex;
+  align-items: center;
+}
+
+.inspect_new_issues_max{
+  padding: 30rpx 0;
+}
+.inspect_new_issues{
+  width: 300rpx;
+  border-radius: 100rpx;
+  padding: 20rpx 0;
+  background: #252d41;
+  margin: auto;
+  text-align: center;
+  color: #89a3ed;
+  font-size: 34rpx;
+}
+
+.check_issue_finish_btn{
+  position: relative;
+  top:10rpx;
+  right: 0rpx;
+  text-align: center;
+  line-height: 100rpx;
+  width: 230rpx;
+  color: #fff;
+  height: 100rpx;
+  background-color: #495679;
+}
+.voucher_select_max{
+  padding:0 25rpx;
+  display: flex;
+  align-items: center;
+  background: #212737;
+  height: 90rpx;
+  border-radius: 10rpx;
+}
+
+.voucher_select_min{
+  width: calc(100% - 30rpx);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.result_project_name{
+  padding: 50rpx 0;
+  text-align: center;
+}
+/* 全部下拉选择器 */
+.hj_float{
+	float: right;
+	padding: 5rpx 50rpx 5rpx 20rpx;
+	background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+	border-radius: 40rpx;
+  }
+  .hj_float:active{
+	background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+  }
+  .van-popup--bottom.van-popup--round{
+	border-radius: 0 !important
+  }
+  .van-popup{
+	background-color: var(--popup-background-color,#232a44) !important
+  }
+  .van-action-sheet__cancel,.van-action-sheet__item{
+	background-color: var(--popup-background-color,#232a44) !important;
+	color: #0ad7ec;
+  }
+  .password-icon{
+    width: 40rpx;
+    height: 40rpx;
+    position: absolute;
+    right: 60rpx;
+    margin-top: -45rpx;
+  }
+  .pass{
+    padding-right: 25rpx;
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/components/@mkl/cell/index.d.ts b/miniprogram/components/@mkl/cell/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/cell/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/cell/index.js b/miniprogram/components/@mkl/cell/index.js
new file mode 100644
index 0000000..b55b75c
--- /dev/null
+++ b/miniprogram/components/@mkl/cell/index.js
@@ -0,0 +1,37 @@
+import { link } from '../mixins/link';
+import { VantComponent } from '../common/component';
+VantComponent({
+  classes: [
+    'title-class',
+    'label-class',
+    'value-class',
+    'right-icon-class',
+    'hover-class',
+  ],
+  mixins: [link],
+  props: {
+    title: null,
+    value: null,
+    icon: String,
+    size: String,
+    label: String,
+    center: Boolean,
+    isLink: Boolean,
+    required: Boolean,
+    clickable: Boolean,
+    titleWidth: String,
+    customStyle: String,
+    arrowDirection: String,
+    useLabelSlot: Boolean,
+    border: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    onClick(event) {
+      this.$emit('click', event.detail);
+      this.jumpLink();
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/cell/index.json b/miniprogram/components/@mkl/cell/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/components/@mkl/cell/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/components/@mkl/cell/index.wxml b/miniprogram/components/@mkl/cell/index.wxml
new file mode 100644
index 0000000..afaaaf8
--- /dev/null
+++ b/miniprogram/components/@mkl/cell/index.wxml
@@ -0,0 +1,45 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('cell', [size, { center, required, borderless: !border, clickable: isLink || clickable }]) }}"
+  hover-class="van-cell--hover hover-class"
+  hover-stay-time="70"
+  style="{{ customStyle }}"
+  bind:tap="onClick"
+>
+  <van-icon
+    wx:if="{{ icon }}"
+    name="{{ icon }}"
+    class="van-cell__left-icon-wrap"
+    custom-class="van-cell__left-icon"
+  />
+  <slot wx:else name="icon" />
+
+  <view
+    style="{{ titleWidth ? 'max-width:' + titleWidth + ';min-width:' + titleWidth : '' }}"
+    class="van-cell__title title-class"
+  >
+    <block wx:if="{{ title }}">{{ title }}</block>
+    <slot wx:else name="title" />
+
+    <view wx:if="{{ label || useLabelSlot }}" class="van-cell__label label-class">
+      <slot wx:if="{{ useLabelSlot }}" name="label" />
+      <block wx:elif="{{ label }}">{{ label }}</block>
+    </view>
+  </view>
+
+  <view class="van-cell__value value-class">
+    <block wx:if="{{ value || value === 0 }}">{{ value }}</block>
+    <slot wx:else />
+  </view>
+
+  <van-icon
+    wx:if="{{ isLink }}"
+    name="{{ arrowDirection ? 'arrow' + '-' + arrowDirection : 'arrow' }}"
+    class="van-cell__right-icon-wrap right-icon-class"
+    custom-class="van-cell__right-icon"
+  />
+  <slot wx:else name="right-icon" />
+
+  <slot name="extra" />
+</view>
diff --git a/miniprogram/components/@mkl/cell/index.wxss b/miniprogram/components/@mkl/cell/index.wxss
new file mode 100644
index 0000000..7afd1c4
--- /dev/null
+++ b/miniprogram/components/@mkl/cell/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-cell{position:relative;display:-webkit-flex;display:flex;box-sizing:border-box;width:100%;padding:10px 16px;padding:var(--cell-vertical-padding,10px) var(--cell-horizontal-padding,16px);font-size:14px;font-size:var(--cell-font-size,14px);line-height:24px;line-height:var(--cell-line-height,24px);color:#323233;color:var(--cell-text-color,#323233);background-color:#fff;background-color:var(--cell-background-color,#fff)}.van-cell:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:auto;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-cell--borderless:after{display:none}.van-cell-group{background-color:#fff;background-color:var(--cell-background-color,#fff)}.van-cell__label{margin-top:3px;margin-top:var(--cell-label-margin-top,3px);font-size:12px;font-size:var(--cell-label-font-size,12px);line-height:18px;line-height:var(--cell-label-line-height,18px);color:#969799;color:var(--cell-label-color,#969799)}.van-cell__value{overflow:hidden;text-align:right;vertical-align:middle;color:#969799;color:var(--cell-value-color,#969799)}.van-cell__title,.van-cell__value{-webkit-flex:1;flex:1}.van-cell__title:empty,.van-cell__value:empty{display:none}.van-cell__left-icon-wrap,.van-cell__right-icon-wrap{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:24px;height:var(--cell-line-height,24px);font-size:16px;font-size:var(--cell-icon-size,16px)}.van-cell__left-icon-wrap{margin-right:5px}.van-cell__right-icon-wrap{margin-left:5px;color:#969799;color:var(--cell-right-icon-color,#969799)}.van-cell__left-icon{vertical-align:middle}.van-cell__left-icon,.van-cell__right-icon{line-height:24px;line-height:var(--cell-line-height,24px)}.van-cell--clickable.van-cell--hover{background-color:#f2f3f5;background-color:var(--cell-active-color,#f2f3f5)}.van-cell--required{overflow:visible}.van-cell--required:before{position:absolute;content:"*";left:8px;left:var(--padding-xs,8px);font-size:14px;font-size:var(--cell-font-size,14px);color:#ee0a24;color:var(--cell-required-color,#ee0a24)}.van-cell--center{-webkit-align-items:center;align-items:center}.van-cell--large{padding-top:12px;padding-top:var(--cell-large-vertical-padding,12px);padding-bottom:12px;padding-bottom:var(--cell-large-vertical-padding,12px)}.van-cell--large .van-cell__title{font-size:16px;font-size:var(--cell-large-title-font-size,16px)}.van-cell--large .van-cell__value{font-size:16px;font-size:var(--cell-large-value-font-size,16px)}.van-cell--large .van-cell__label{font-size:14px;font-size:var(--cell-large-label-font-size,14px)}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/collapse-item/index.d.ts b/miniprogram/components/@mkl/collapse-item/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse-item/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/collapse-item/index.js b/miniprogram/components/@mkl/collapse-item/index.js
new file mode 100644
index 0000000..6f7de46
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse-item/index.js
@@ -0,0 +1,92 @@
+import { VantComponent } from "../common/component";
+const nextTick = () => new Promise((resolve) => setTimeout(resolve, 20));
+VantComponent({
+    classes: ["title-class", "content-class"],
+    relation: {
+        name: "collapse",
+        type: "ancestor",
+        current: "collapse-item",
+    },
+    props: {
+        name: null,
+        title: null,
+        value: null,
+        icon: String,
+        label: String,
+        disabled: Boolean,
+        clickable: Boolean,
+        border: {
+            type: Boolean,
+            value: true,
+        },
+        isLink: {
+            type: Boolean,
+            value: true,
+        },
+    },
+    data: {
+        contentHeight: 0,
+        expanded: false,
+        transition: false,
+    },
+    mounted() {
+        this.updateExpanded()
+            .then(nextTick)
+            .then(() => {
+                const data = { transition: true };
+                if (this.data.expanded) {
+                    data.contentHeight = "auto";
+                }
+                this.setData(data);
+            });
+    },
+    methods: {
+        updateExpanded() {
+            if (!this.parent) {
+                return Promise.resolve();
+            }
+            const { value, accordion } = this.parent.data;
+            const { children = [] } = this.parent;
+            const { name } = this.data;
+            const index = children.indexOf(this);
+            const currentName = name == null ? index : name;
+            const expanded = accordion ? value === currentName : (value || []).some((name) => name === currentName);
+            const stack = [];
+            if (expanded !== this.data.expanded) {
+                stack.push(this.updateStyle(expanded));
+            }
+            stack.push(this.set({ index, expanded }));
+            return Promise.all(stack);
+        },
+        updateStyle(expanded) {
+            return this.getRect(".van-collapse-item__content")
+                .then((rect) => rect.height)
+                .then((height) => {
+                    if (expanded) {
+                        return this.set({
+                            contentHeight: height ? `${height}px` : "auto",
+                        });
+                    }
+                    return this.set({ contentHeight: `${height}px` })
+                        .then(nextTick)
+                        .then(() => this.set({ contentHeight: 0 }));
+                });
+        },
+        onClick() {
+            if (this.data.disabled) {
+                return;
+            }
+            const { name, expanded } = this.data;
+            const index = this.parent.children.indexOf(this);
+            const currentName = name == null ? index : name;
+            this.parent.switch(currentName, !expanded);
+        },
+        onTransitionEnd() {
+            if (this.data.expanded) {
+                this.setData({
+                    contentHeight: "auto",
+                });
+            }
+        },
+    },
+});
diff --git a/miniprogram/components/@mkl/collapse-item/index.json b/miniprogram/components/@mkl/collapse-item/index.json
new file mode 100644
index 0000000..0e5425c
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse-item/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "../cell/index"
+  }
+}
diff --git a/miniprogram/components/@mkl/collapse-item/index.wxml b/miniprogram/components/@mkl/collapse-item/index.wxml
new file mode 100644
index 0000000..9d813f5
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse-item/index.wxml
@@ -0,0 +1,15 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<view class="van-collapse-item custom-class mkl-collapse {{ index !== 0 ? 'van-hairline--top' : '' }}">
+    <van-cell custom-class="van-cell mkl-cell {{expanded?'mkl-cell__expanded':''}}" title="{{ title }}" title-class="title-class" icon="{{ icon }}" value="{{ value }}" label="{{ label }}" is-link="{{ isLink }}" clickable="{{ clickable }}" border="{{ border && expanded }}" class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}" right-icon-class="van-cell__right-icon" hover-class="van-cell--hover" bind:click="onClick">
+        <slot name="title" slot="title" />
+        <slot name="icon" slot="icon" />
+        <slot name="value" />
+        <slot name="right-icon" slot="right-icon" />
+    </van-cell>
+    <view class="mkl-collapse-container {{ utils.bem('collapse-item__wrapper', { transition }) }}" style="height: {{ contentHeight }};" bind:transitionend="onTransitionEnd">
+        <!-- <view class="mkl-cell__bottom"></view> -->
+        <view class="van-collapse-item__content content-class">
+            <slot />
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/collapse-item/index.wxss b/miniprogram/components/@mkl/collapse-item/index.wxss
new file mode 100644
index 0000000..bdcf6c2
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse-item/index.wxss
@@ -0,0 +1,60 @@
+@import "../common/index.wxss";
+.van-collapse-item__title .van-cell__right-icon {
+    -webkit-transform: rotate(90deg);
+    transform: rotate(90deg);
+    transition: -webkit-transform 0.3s;
+    transition: transform 0.3s;
+    transition: transform 0.3s, -webkit-transform 0.3s;
+}
+.van-collapse-item__title--expanded .van-cell__right-icon {
+    -webkit-transform: rotate(-90deg);
+    transform: rotate(-90deg);
+}
+.van-collapse-item__title--disabled .van-cell,
+.van-collapse-item__title--disabled .van-cell__right-icon {
+    color: #c8c9cc !important;
+}
+.van-collapse-item__title--disabled .van-cell--hover {
+    background-color: #fff !important;
+}
+.van-collapse-item__wrapper {
+    overflow: hidden;
+}
+.van-collapse-item__wrapper--transition {
+    transition: height 0.3s ease-in-out;
+}
+.van-collapse-item__content {
+    padding: 0 25rpx;
+    color: #969799;
+    font-size: 13px;
+    line-height: 1.5;
+}
+
+.mkl-collapse {
+    padding: 0 25rpx;
+    margin-bottom: 40rpx;
+}
+
+.mkl-cell {
+    background: #fff;
+    padding: 25rpx;
+    border-radius: 20rpx;
+    /* border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx; */
+    box-shadow: 0px 0px 10px #ddd;
+    /* margin-bottom: 40rpx; */
+}
+
+.mkl-cell__expanded {
+    border-radius: 20rpx 20rpx 0 0;
+}
+
+.mkl-cell__bottom {
+    height: 40rpx;
+}
+.mkl-collapse-container {
+    box-shadow: 0px 0px 10px #ddd;
+    transition: height 0.2s;
+    border-radius: 0 0 20rpx 20rpx;
+    background: #f5f5f5;
+}
diff --git a/miniprogram/components/@mkl/collapse/index.d.ts b/miniprogram/components/@mkl/collapse/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/collapse/index.js b/miniprogram/components/@mkl/collapse/index.js
new file mode 100644
index 0000000..33dae31
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse/index.js
@@ -0,0 +1,47 @@
+import { VantComponent } from '../common/component';
+VantComponent({
+  relation: {
+    name: 'collapse-item',
+    type: 'descendant',
+    current: 'collapse',
+  },
+  props: {
+    value: {
+      type: null,
+      observer: 'updateExpanded',
+    },
+    accordion: {
+      type: Boolean,
+      observer: 'updateExpanded',
+    },
+    border: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    updateExpanded() {
+      this.children.forEach((child) => {
+        child.updateExpanded();
+      });
+    },
+    switch(name, expanded) {
+      const { accordion, value } = this.data;
+      const changeItem = name;
+      if (!accordion) {
+        name = expanded
+          ? (value || []).concat(name)
+          : (value || []).filter((activeName) => activeName !== name);
+      } else {
+        name = expanded ? name : '';
+      }
+      if (expanded) {
+        this.$emit('open', changeItem);
+      } else {
+        this.$emit('close', changeItem);
+      }
+      this.$emit('change', name);
+      this.$emit('input', name);
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/collapse/index.json b/miniprogram/components/@mkl/collapse/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/components/@mkl/collapse/index.wxml b/miniprogram/components/@mkl/collapse/index.wxml
new file mode 100644
index 0000000..7ea46bc
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse/index.wxml
@@ -0,0 +1,3 @@
+<view class="custom-class van-collapse {{ border ? 'van-hairline--top-bottom' : '' }} ">
+    <slot />
+</view>
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/collapse/index.wxss b/miniprogram/components/@mkl/collapse/index.wxss
new file mode 100644
index 0000000..1bd831f
--- /dev/null
+++ b/miniprogram/components/@mkl/collapse/index.wxss
@@ -0,0 +1 @@
+@import "../common/index.wxss";
diff --git a/miniprogram/components/@mkl/common/color.d.ts b/miniprogram/components/@mkl/common/color.d.ts
new file mode 100644
index 0000000..386f307
--- /dev/null
+++ b/miniprogram/components/@mkl/common/color.d.ts
@@ -0,0 +1,7 @@
+export declare const RED = "#ee0a24";
+export declare const BLUE = "#1989fa";
+export declare const WHITE = "#fff";
+export declare const GREEN = "#07c160";
+export declare const ORANGE = "#ff976a";
+export declare const GRAY = "#323233";
+export declare const GRAY_DARK = "#969799";
diff --git a/miniprogram/components/@mkl/common/color.js b/miniprogram/components/@mkl/common/color.js
new file mode 100644
index 0000000..6b285bd
--- /dev/null
+++ b/miniprogram/components/@mkl/common/color.js
@@ -0,0 +1,7 @@
+export const RED = '#ee0a24';
+export const BLUE = '#1989fa';
+export const WHITE = '#fff';
+export const GREEN = '#07c160';
+export const ORANGE = '#ff976a';
+export const GRAY = '#323233';
+export const GRAY_DARK = '#969799';
diff --git a/miniprogram/components/@mkl/common/component.d.ts b/miniprogram/components/@mkl/common/component.d.ts
new file mode 100644
index 0000000..307a96c
--- /dev/null
+++ b/miniprogram/components/@mkl/common/component.d.ts
@@ -0,0 +1,3 @@
+import { VantComponentOptions, CombinedComponentInstance } from '../definitions/index';
+declare function VantComponent<Data, Props, Methods>(vantOptions?: VantComponentOptions<Data, Props, Methods, CombinedComponentInstance<Data, Props, Methods>>): void;
+export { VantComponent };
diff --git a/miniprogram/components/@mkl/common/component.js b/miniprogram/components/@mkl/common/component.js
new file mode 100644
index 0000000..4868a06
--- /dev/null
+++ b/miniprogram/components/@mkl/common/component.js
@@ -0,0 +1,101 @@
+import { basic } from '../mixins/basic';
+const relationFunctions = {
+  ancestor: {
+    linked(parent) {
+      this.parent = parent;
+    },
+    unlinked() {
+      this.parent = null;
+    },
+  },
+  descendant: {
+    linked(child) {
+      this.children = this.children || [];
+      this.children.push(child);
+    },
+    unlinked(child) {
+      this.children = (this.children || []).filter((it) => it !== child);
+    },
+  },
+};
+function mapKeys(source, target, map) {
+  Object.keys(map).forEach((key) => {
+    if (source[key]) {
+      target[map[key]] = source[key];
+    }
+  });
+}
+function makeRelation(options, vantOptions, relation) {
+  const { type, name, linked, unlinked, linkChanged } = relation;
+  const { beforeCreate, destroyed } = vantOptions;
+  if (type === 'descendant') {
+    options.created = function () {
+      beforeCreate && beforeCreate.bind(this)();
+      this.children = this.children || [];
+    };
+    options.detached = function () {
+      this.children = [];
+      destroyed && destroyed.bind(this)();
+    };
+  }
+  options.relations = Object.assign(options.relations || {}, {
+    [`../${name}/index`]: {
+      type,
+      linked(node) {
+        relationFunctions[type].linked.bind(this)(node);
+        linked && linked.bind(this)(node);
+      },
+      linkChanged(node) {
+        linkChanged && linkChanged.bind(this)(node);
+      },
+      unlinked(node) {
+        relationFunctions[type].unlinked.bind(this)(node);
+        unlinked && unlinked.bind(this)(node);
+      },
+    },
+  });
+}
+function VantComponent(vantOptions = {}) {
+  const options = {};
+  mapKeys(vantOptions, options, {
+    data: 'data',
+    props: 'properties',
+    mixins: 'behaviors',
+    methods: 'methods',
+    beforeCreate: 'created',
+    created: 'attached',
+    mounted: 'ready',
+    relations: 'relations',
+    destroyed: 'detached',
+    classes: 'externalClasses',
+  });
+  const { relation } = vantOptions;
+  if (relation) {
+    makeRelation(options, vantOptions, relation);
+  }
+  // add default externalClasses
+  options.externalClasses = options.externalClasses || [];
+  options.externalClasses.push('custom-class');
+  // add default behaviors
+  options.behaviors = options.behaviors || [];
+  options.behaviors.push(basic);
+  // map field to form-field behavior
+  if (vantOptions.field) {
+    options.behaviors.push('wx://form-field');
+  }
+  if (options.properties) {
+    Object.keys(options.properties).forEach((name) => {
+      if (Array.isArray(options.properties[name])) {
+        // miniprogram do not allow multi type
+        options.properties[name] = null;
+      }
+    });
+  }
+  // add default options
+  options.options = {
+    multipleSlots: true,
+    addGlobalClass: true,
+  };
+  Component(options);
+}
+export { VantComponent };
diff --git a/miniprogram/components/@mkl/common/index.wxss b/miniprogram/components/@mkl/common/index.wxss
new file mode 100644
index 0000000..6e6891f
--- /dev/null
+++ b/miniprogram/components/@mkl/common/index.wxss
@@ -0,0 +1 @@
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}.van-clearfix:after{display:table;clear:both;content:""}.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/common/style/clearfix.wxss b/miniprogram/components/@mkl/common/style/clearfix.wxss
new file mode 100644
index 0000000..a0ca838
--- /dev/null
+++ b/miniprogram/components/@mkl/common/style/clearfix.wxss
@@ -0,0 +1 @@
+.van-clearfix:after{display:table;clear:both;content:""}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/common/style/ellipsis.wxss b/miniprogram/components/@mkl/common/style/ellipsis.wxss
new file mode 100644
index 0000000..1e9dbc9
--- /dev/null
+++ b/miniprogram/components/@mkl/common/style/ellipsis.wxss
@@ -0,0 +1 @@
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/common/style/hairline.wxss b/miniprogram/components/@mkl/common/style/hairline.wxss
new file mode 100644
index 0000000..f64e2f8
--- /dev/null
+++ b/miniprogram/components/@mkl/common/style/hairline.wxss
@@ -0,0 +1 @@
+.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/common/style/mixins/clearfix.wxss b/miniprogram/components/@mkl/common/style/mixins/clearfix.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/components/@mkl/common/style/mixins/ellipsis.wxss b/miniprogram/components/@mkl/common/style/mixins/ellipsis.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/components/@mkl/common/style/mixins/hairline.wxss b/miniprogram/components/@mkl/common/style/mixins/hairline.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/components/@mkl/common/style/theme.wxss b/miniprogram/components/@mkl/common/style/theme.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/components/@mkl/common/style/var.wxss b/miniprogram/components/@mkl/common/style/var.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/components/@mkl/common/utils.d.ts b/miniprogram/components/@mkl/common/utils.d.ts
new file mode 100644
index 0000000..411e4aa
--- /dev/null
+++ b/miniprogram/components/@mkl/common/utils.d.ts
@@ -0,0 +1,8 @@
+/// <reference types="miniprogram-api-typings" />
+export declare function isDef(value: any): boolean;
+export declare function isObj(x: any): boolean;
+export declare function isNumber(value: any): boolean;
+export declare function range(num: number, min: number, max: number): number;
+export declare function nextTick(fn: Function): void;
+export declare function getSystemInfoSync(): WechatMiniprogram.GetSystemInfoSyncResult;
+export declare function addUnit(value?: string | number): string | undefined;
diff --git a/miniprogram/components/@mkl/common/utils.js b/miniprogram/components/@mkl/common/utils.js
new file mode 100644
index 0000000..cc0f8f1
--- /dev/null
+++ b/miniprogram/components/@mkl/common/utils.js
@@ -0,0 +1,32 @@
+export function isDef(value) {
+    return value !== undefined && value !== null;
+}
+export function isObj(x) {
+    const type = typeof x;
+    return x !== null && (type === 'object' || type === 'function');
+}
+export function isNumber(value) {
+    return /^\d+(\.\d+)?$/.test(value);
+}
+export function range(num, min, max) {
+    return Math.min(Math.max(num, min), max);
+}
+export function nextTick(fn) {
+    setTimeout(() => {
+        fn();
+    }, 1000 / 30);
+}
+let systemInfo = null;
+export function getSystemInfoSync() {
+    if (systemInfo == null) {
+        systemInfo = wx.getSystemInfoSync();
+    }
+    return systemInfo;
+}
+export function addUnit(value) {
+    if (!isDef(value)) {
+        return undefined;
+    }
+    value = String(value);
+    return isNumber(value) ? `${value}px` : value;
+}
diff --git a/miniprogram/components/@mkl/common/version.d.ts b/miniprogram/components/@mkl/common/version.d.ts
new file mode 100644
index 0000000..d4c6fe2
--- /dev/null
+++ b/miniprogram/components/@mkl/common/version.d.ts
@@ -0,0 +1,2 @@
+export declare function canIUseModel(): boolean;
+export declare function canIUseFormFieldButton(): boolean;
diff --git a/miniprogram/components/@mkl/common/version.js b/miniprogram/components/@mkl/common/version.js
new file mode 100644
index 0000000..01f24f8
--- /dev/null
+++ b/miniprogram/components/@mkl/common/version.js
@@ -0,0 +1,31 @@
+import { getSystemInfoSync } from './utils';
+function compareVersion(v1, v2) {
+  v1 = v1.split('.');
+  v2 = v2.split('.');
+  const len = Math.max(v1.length, v2.length);
+  while (v1.length < len) {
+    v1.push('0');
+  }
+  while (v2.length < len) {
+    v2.push('0');
+  }
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i], 10);
+    const num2 = parseInt(v2[i], 10);
+    if (num1 > num2) {
+      return 1;
+    }
+    if (num1 < num2) {
+      return -1;
+    }
+  }
+  return 0;
+}
+export function canIUseModel() {
+  const system = getSystemInfoSync();
+  return compareVersion(system.SDKVersion, '2.9.3') >= 0;
+}
+export function canIUseFormFieldButton() {
+  const system = getSystemInfoSync();
+  return compareVersion(system.SDKVersion, '2.10.3') >= 0;
+}
diff --git a/miniprogram/components/@mkl/icon/index.d.ts b/miniprogram/components/@mkl/icon/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/icon/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/icon/index.js b/miniprogram/components/@mkl/icon/index.js
new file mode 100644
index 0000000..bee576c
--- /dev/null
+++ b/miniprogram/components/@mkl/icon/index.js
@@ -0,0 +1,27 @@
+import { VantComponent } from '../common/component';
+VantComponent({
+  props: {
+    dot: Boolean,
+    info: null,
+    size: null,
+    color: String,
+    customStyle: String,
+    classPrefix: {
+      type: String,
+      value: 'van-icon',
+    },
+    name: {
+      type: String,
+      observer(val) {
+        this.setData({
+          isImageName: val.indexOf('/') !== -1,
+        });
+      },
+    },
+  },
+  methods: {
+    onClick() {
+      this.$emit('click');
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/icon/index.json b/miniprogram/components/@mkl/icon/index.json
new file mode 100644
index 0000000..bf0ebe0
--- /dev/null
+++ b/miniprogram/components/@mkl/icon/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index"
+  }
+}
diff --git a/miniprogram/components/@mkl/icon/index.wxml b/miniprogram/components/@mkl/icon/index.wxml
new file mode 100644
index 0000000..fe4065a
--- /dev/null
+++ b/miniprogram/components/@mkl/icon/index.wxml
@@ -0,0 +1,20 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
+  style="color: {{ color }};font-size: {{ utils.addUnit(size) }};{{ customStyle }}"
+  bind:tap="onClick"
+>
+  <van-info
+    wx:if="{{ info !== null || dot }}"
+    dot="{{ dot }}"
+    info="{{ info }}"
+    custom-class="van-icon__info"
+  />
+  <image
+    wx:if="{{ isImageName }}"
+    src="{{ name }}"
+    mode="aspectFit"
+    class="van-icon__image"
+  />
+</view>
diff --git a/miniprogram/components/@mkl/icon/index.wxss b/miniprogram/components/@mkl/icon/index.wxss
new file mode 100644
index 0000000..cf2c506
--- /dev/null
+++ b/miniprogram/components/@mkl/icon/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';@font-face{font-weight:400;font-family:vant-icon;font-style:normal;font-display:auto;src:url(https://img.yzcdn.cn/vant/vant-icon-d3825a.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-d3825a.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-d3825a.ttf) format("truetype")}.van-icon{position:relative;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.van-icon,.van-icon:before{display:inline-block}.van-icon-add-o:before{content:"\F000"}.van-icon-add-square:before{content:"\F001"}.van-icon-add:before{content:"\F002"}.van-icon-after-sale:before{content:"\F003"}.van-icon-aim:before{content:"\F004"}.van-icon-alipay:before{content:"\F005"}.van-icon-apps-o:before{content:"\F006"}.van-icon-arrow-down:before{content:"\F007"}.van-icon-arrow-left:before{content:"\F008"}.van-icon-arrow-up:before{content:"\F009"}.van-icon-arrow:before{content:"\F00A"}.van-icon-ascending:before{content:"\F00B"}.van-icon-audio:before{content:"\F00C"}.van-icon-award-o:before{content:"\F00D"}.van-icon-award:before{content:"\F00E"}.van-icon-bag-o:before{content:"\F00F"}.van-icon-bag:before{content:"\F010"}.van-icon-balance-list-o:before{content:"\F011"}.van-icon-balance-list:before{content:"\F012"}.van-icon-balance-o:before{content:"\F013"}.van-icon-balance-pay:before{content:"\F014"}.van-icon-bar-chart-o:before{content:"\F015"}.van-icon-bars:before{content:"\F016"}.van-icon-bell:before{content:"\F017"}.van-icon-bill-o:before{content:"\F018"}.van-icon-bill:before{content:"\F019"}.van-icon-birthday-cake-o:before{content:"\F01A"}.van-icon-bookmark-o:before{content:"\F01B"}.van-icon-bookmark:before{content:"\F01C"}.van-icon-browsing-history-o:before{content:"\F01D"}.van-icon-browsing-history:before{content:"\F01E"}.van-icon-brush-o:before{content:"\F01F"}.van-icon-bulb-o:before{content:"\F020"}.van-icon-bullhorn-o:before{content:"\F021"}.van-icon-calender-o:before{content:"\F022"}.van-icon-card:before{content:"\F023"}.van-icon-cart-circle-o:before{content:"\F024"}.van-icon-cart-circle:before{content:"\F025"}.van-icon-cart-o:before{content:"\F026"}.van-icon-cart:before{content:"\F027"}.van-icon-cash-back-record:before{content:"\F028"}.van-icon-cash-on-deliver:before{content:"\F029"}.van-icon-cashier-o:before{content:"\F02A"}.van-icon-certificate:before{content:"\F02B"}.van-icon-chart-trending-o:before{content:"\F02C"}.van-icon-chat-o:before{content:"\F02D"}.van-icon-chat:before{content:"\F02E"}.van-icon-checked:before{content:"\F02F"}.van-icon-circle:before{content:"\F030"}.van-icon-clear:before{content:"\F031"}.van-icon-clock-o:before{content:"\F032"}.van-icon-clock:before{content:"\F033"}.van-icon-close:before{content:"\F034"}.van-icon-closed-eye:before{content:"\F035"}.van-icon-cluster-o:before{content:"\F036"}.van-icon-cluster:before{content:"\F037"}.van-icon-column:before{content:"\F038"}.van-icon-comment-circle-o:before{content:"\F039"}.van-icon-comment-circle:before{content:"\F03A"}.van-icon-comment-o:before{content:"\F03B"}.van-icon-comment:before{content:"\F03C"}.van-icon-completed:before{content:"\F03D"}.van-icon-contact:before{content:"\F03E"}.van-icon-coupon-o:before{content:"\F03F"}.van-icon-coupon:before{content:"\F040"}.van-icon-credit-pay:before{content:"\F041"}.van-icon-cross:before{content:"\F042"}.van-icon-debit-pay:before{content:"\F043"}.van-icon-delete:before{content:"\F044"}.van-icon-descending:before{content:"\F045"}.van-icon-description:before{content:"\F046"}.van-icon-desktop-o:before{content:"\F047"}.van-icon-diamond-o:before{content:"\F048"}.van-icon-diamond:before{content:"\F049"}.van-icon-discount:before{content:"\F04A"}.van-icon-down:before{content:"\F04B"}.van-icon-ecard-pay:before{content:"\F04C"}.van-icon-edit:before{content:"\F04D"}.van-icon-ellipsis:before{content:"\F04E"}.van-icon-empty:before{content:"\F04F"}.van-icon-envelop-o:before{content:"\F050"}.van-icon-exchange:before{content:"\F051"}.van-icon-expand-o:before{content:"\F052"}.van-icon-expand:before{content:"\F053"}.van-icon-eye-o:before{content:"\F054"}.van-icon-eye:before{content:"\F055"}.van-icon-fail:before{content:"\F056"}.van-icon-failure:before{content:"\F057"}.van-icon-filter-o:before{content:"\F058"}.van-icon-fire-o:before{content:"\F059"}.van-icon-fire:before{content:"\F05A"}.van-icon-flag-o:before{content:"\F05B"}.van-icon-flower-o:before{content:"\F05C"}.van-icon-free-postage:before{content:"\F05D"}.van-icon-friends-o:before{content:"\F05E"}.van-icon-friends:before{content:"\F05F"}.van-icon-gem-o:before{content:"\F060"}.van-icon-gem:before{content:"\F061"}.van-icon-gift-card-o:before{content:"\F062"}.van-icon-gift-card:before{content:"\F063"}.van-icon-gift-o:before{content:"\F064"}.van-icon-gift:before{content:"\F065"}.van-icon-gold-coin-o:before{content:"\F066"}.van-icon-gold-coin:before{content:"\F067"}.van-icon-good-job-o:before{content:"\F068"}.van-icon-good-job:before{content:"\F069"}.van-icon-goods-collect-o:before{content:"\F06A"}.van-icon-goods-collect:before{content:"\F06B"}.van-icon-graphic:before{content:"\F06C"}.van-icon-home-o:before{content:"\F06D"}.van-icon-hot-o:before{content:"\F06E"}.van-icon-hot-sale-o:before{content:"\F06F"}.van-icon-hot-sale:before{content:"\F070"}.van-icon-hot:before{content:"\F071"}.van-icon-hotel-o:before{content:"\F072"}.van-icon-idcard:before{content:"\F073"}.van-icon-info-o:before{content:"\F074"}.van-icon-info:before{content:"\F075"}.van-icon-invition:before{content:"\F076"}.van-icon-label-o:before{content:"\F077"}.van-icon-label:before{content:"\F078"}.van-icon-like-o:before{content:"\F079"}.van-icon-like:before{content:"\F07A"}.van-icon-live:before{content:"\F07B"}.van-icon-location-o:before{content:"\F07C"}.van-icon-location:before{content:"\F07D"}.van-icon-lock:before{content:"\F07E"}.van-icon-logistics:before{content:"\F07F"}.van-icon-manager-o:before{content:"\F080"}.van-icon-manager:before{content:"\F081"}.van-icon-map-marked:before{content:"\F082"}.van-icon-medal-o:before{content:"\F083"}.van-icon-medal:before{content:"\F084"}.van-icon-more-o:before{content:"\F085"}.van-icon-more:before{content:"\F086"}.van-icon-music-o:before{content:"\F087"}.van-icon-music:before{content:"\F088"}.van-icon-new-arrival-o:before{content:"\F089"}.van-icon-new-arrival:before{content:"\F08A"}.van-icon-new-o:before{content:"\F08B"}.van-icon-new:before{content:"\F08C"}.van-icon-newspaper-o:before{content:"\F08D"}.van-icon-notes-o:before{content:"\F08E"}.van-icon-orders-o:before{content:"\F08F"}.van-icon-other-pay:before{content:"\F090"}.van-icon-paid:before{content:"\F091"}.van-icon-passed:before{content:"\F092"}.van-icon-pause-circle-o:before{content:"\F093"}.van-icon-pause-circle:before{content:"\F094"}.van-icon-pause:before{content:"\F095"}.van-icon-peer-pay:before{content:"\F096"}.van-icon-pending-payment:before{content:"\F097"}.van-icon-phone-circle-o:before{content:"\F098"}.van-icon-phone-circle:before{content:"\F099"}.van-icon-phone-o:before{content:"\F09A"}.van-icon-phone:before{content:"\F09B"}.van-icon-photo-o:before{content:"\F09C"}.van-icon-photo:before{content:"\F09D"}.van-icon-photograph:before{content:"\F09E"}.van-icon-play-circle-o:before{content:"\F09F"}.van-icon-play-circle:before{content:"\F0A0"}.van-icon-play:before{content:"\F0A1"}.van-icon-plus:before{content:"\F0A2"}.van-icon-point-gift-o:before{content:"\F0A3"}.van-icon-point-gift:before{content:"\F0A4"}.van-icon-points:before{content:"\F0A5"}.van-icon-printer:before{content:"\F0A6"}.van-icon-qr-invalid:before{content:"\F0A7"}.van-icon-qr:before{content:"\F0A8"}.van-icon-question-o:before{content:"\F0A9"}.van-icon-question:before{content:"\F0AA"}.van-icon-records:before{content:"\F0AB"}.van-icon-refund-o:before{content:"\F0AC"}.van-icon-replay:before{content:"\F0AD"}.van-icon-scan:before{content:"\F0AE"}.van-icon-search:before{content:"\F0AF"}.van-icon-send-gift-o:before{content:"\F0B0"}.van-icon-send-gift:before{content:"\F0B1"}.van-icon-service-o:before{content:"\F0B2"}.van-icon-service:before{content:"\F0B3"}.van-icon-setting-o:before{content:"\F0B4"}.van-icon-setting:before{content:"\F0B5"}.van-icon-share:before{content:"\F0B6"}.van-icon-shop-collect-o:before{content:"\F0B7"}.van-icon-shop-collect:before{content:"\F0B8"}.van-icon-shop-o:before{content:"\F0B9"}.van-icon-shop:before{content:"\F0BA"}.van-icon-shopping-cart-o:before{content:"\F0BB"}.van-icon-shopping-cart:before{content:"\F0BC"}.van-icon-shrink:before{content:"\F0BD"}.van-icon-sign:before{content:"\F0BE"}.van-icon-smile-comment-o:before{content:"\F0BF"}.van-icon-smile-comment:before{content:"\F0C0"}.van-icon-smile-o:before{content:"\F0C1"}.van-icon-smile:before{content:"\F0C2"}.van-icon-star-o:before{content:"\F0C3"}.van-icon-star:before{content:"\F0C4"}.van-icon-stop-circle-o:before{content:"\F0C5"}.van-icon-stop-circle:before{content:"\F0C6"}.van-icon-stop:before{content:"\F0C7"}.van-icon-success:before{content:"\F0C8"}.van-icon-thumb-circle-o:before{content:"\F0C9"}.van-icon-thumb-circle:before{content:"\F0CA"}.van-icon-todo-list-o:before{content:"\F0CB"}.van-icon-todo-list:before{content:"\F0CC"}.van-icon-tosend:before{content:"\F0CD"}.van-icon-tv-o:before{content:"\F0CE"}.van-icon-umbrella-circle:before{content:"\F0CF"}.van-icon-underway-o:before{content:"\F0D0"}.van-icon-underway:before{content:"\F0D1"}.van-icon-upgrade:before{content:"\F0D2"}.van-icon-user-circle-o:before{content:"\F0D3"}.van-icon-user-o:before{content:"\F0D4"}.van-icon-video-o:before{content:"\F0D5"}.van-icon-video:before{content:"\F0D6"}.van-icon-vip-card-o:before{content:"\F0D7"}.van-icon-vip-card:before{content:"\F0D8"}.van-icon-volume-o:before{content:"\F0D9"}.van-icon-volume:before{content:"\F0DA"}.van-icon-wap-home-o:before{content:"\F0DB"}.van-icon-wap-home:before{content:"\F0DC"}.van-icon-wap-nav:before{content:"\F0DD"}.van-icon-warn-o:before{content:"\F0DE"}.van-icon-warning-o:before{content:"\F0DF"}.van-icon-warning:before{content:"\F0E0"}.van-icon-weapp-nav:before{content:"\F0E1"}.van-icon-wechat:before{content:"\F0E2"}.van-icon-youzan-shield:before{content:"\F0E3"}:host{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-icon--image{width:1em;height:1em}.van-icon__image{width:100%;height:100%}.van-icon__info{z-index:1}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/info/index.d.ts b/miniprogram/components/@mkl/info/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/info/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/info/index.js b/miniprogram/components/@mkl/info/index.js
new file mode 100644
index 0000000..489f39c
--- /dev/null
+++ b/miniprogram/components/@mkl/info/index.js
@@ -0,0 +1,8 @@
+import { VantComponent } from '../common/component';
+VantComponent({
+  props: {
+    dot: Boolean,
+    info: null,
+    customStyle: String,
+  },
+});
diff --git a/miniprogram/components/@mkl/info/index.json b/miniprogram/components/@mkl/info/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/components/@mkl/info/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/components/@mkl/info/index.wxml b/miniprogram/components/@mkl/info/index.wxml
new file mode 100644
index 0000000..3112dfc
--- /dev/null
+++ b/miniprogram/components/@mkl/info/index.wxml
@@ -0,0 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ info !== null && info !== '' || dot }}"
+  class="custom-class van-info {{ utils.bem('info', { dot }) }}"
+  style="{{ customStyle }}"
+>{{ dot ? '' : info }}</view>
diff --git a/miniprogram/components/@mkl/info/index.wxss b/miniprogram/components/@mkl/info/index.wxss
new file mode 100644
index 0000000..6d44b8e
--- /dev/null
+++ b/miniprogram/components/@mkl/info/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif);line-height:14px;line-height:calc(var(--info-size, 16px) - var(--info-border-width, 1px)*2);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/loading/index.d.ts b/miniprogram/components/@mkl/loading/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/loading/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/loading/index.js b/miniprogram/components/@mkl/loading/index.js
new file mode 100644
index 0000000..2049447
--- /dev/null
+++ b/miniprogram/components/@mkl/loading/index.js
@@ -0,0 +1,16 @@
+import { VantComponent } from '../common/component';
+VantComponent({
+  props: {
+    color: String,
+    vertical: Boolean,
+    type: {
+      type: String,
+      value: 'circular',
+    },
+    size: String,
+    textSize: String,
+  },
+  data: {
+    array12: Array.from({ length: 12 }),
+  },
+});
diff --git a/miniprogram/components/@mkl/loading/index.json b/miniprogram/components/@mkl/loading/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/components/@mkl/loading/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/components/@mkl/loading/index.wxml b/miniprogram/components/@mkl/loading/index.wxml
new file mode 100644
index 0000000..e934288
--- /dev/null
+++ b/miniprogram/components/@mkl/loading/index.wxml
@@ -0,0 +1,18 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class van-loading {{ vertical ? 'van-loading--vertical' : '' }}">
+  <view
+    class="van-loading__spinner van-loading__spinner--{{ type }}"
+    style="color: {{ color }}; width: {{ utils.addUnit(size) }}; height: {{ utils.addUnit(size) }}"
+  >
+    <view
+      wx:if="{{ type === 'spinner' }}"
+      wx:for="{{ array12 }}"
+      wx:key="index"
+      class="van-loading__dot"
+    />
+  </view>
+  <view class="van-loading__text" style="font-size: {{ utils.addUnit(textSize) }};">
+    <slot />
+  </view>
+</view>
diff --git a/miniprogram/components/@mkl/loading/index.wxss b/miniprogram/components/@mkl/loading/index.wxss
new file mode 100644
index 0000000..f28a6b4
--- /dev/null
+++ b/miniprogram/components/@mkl/loading/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';:host{font-size:0;line-height:1}.van-loading{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#c8c9cc;color:var(--loading-spinner-color,#c8c9cc)}.van-loading__spinner{position:relative;box-sizing:border-box;width:30px;width:var(--loading-spinner-size,30px);max-width:100%;max-height:100%;height:30px;height:var(--loading-spinner-size,30px);-webkit-animation:van-rotate .8s linear infinite;animation:van-rotate .8s linear infinite;-webkit-animation:van-rotate var(--loading-spinner-animation-duration,.8s) linear infinite;animation:van-rotate var(--loading-spinner-animation-duration,.8s) linear infinite}.van-loading__spinner--spinner{-webkit-animation-timing-function:steps(12);animation-timing-function:steps(12)}.van-loading__spinner--circular{border:1px solid transparent;border-top-color:initial;border-radius:100%}.van-loading__text{margin-left:8px;margin-left:var(--padding-xs,8px);color:#969799;color:var(--loading-text-color,#969799);font-size:14px;font-size:var(--loading-text-font-size,14px);line-height:20px;line-height:var(--loading-text-line-height,20px)}.van-loading__text:empty{display:none}.van-loading--vertical{-webkit-flex-direction:column;flex-direction:column}.van-loading--vertical .van-loading__text{margin:8px 0 0;margin:var(--padding-xs,8px) 0 0}.van-loading__dot{position:absolute;top:0;left:0;width:100%;height:100%}.van-loading__dot:before{display:block;width:2px;height:25%;margin:0 auto;background-color:currentColor;border-radius:40%;content:" "}.van-loading__dot:first-of-type{-webkit-transform:rotate(30deg);transform:rotate(30deg);opacity:1}.van-loading__dot:nth-of-type(2){-webkit-transform:rotate(60deg);transform:rotate(60deg);opacity:.9375}.van-loading__dot:nth-of-type(3){-webkit-transform:rotate(90deg);transform:rotate(90deg);opacity:.875}.van-loading__dot:nth-of-type(4){-webkit-transform:rotate(120deg);transform:rotate(120deg);opacity:.8125}.van-loading__dot:nth-of-type(5){-webkit-transform:rotate(150deg);transform:rotate(150deg);opacity:.75}.van-loading__dot:nth-of-type(6){-webkit-transform:rotate(180deg);transform:rotate(180deg);opacity:.6875}.van-loading__dot:nth-of-type(7){-webkit-transform:rotate(210deg);transform:rotate(210deg);opacity:.625}.van-loading__dot:nth-of-type(8){-webkit-transform:rotate(240deg);transform:rotate(240deg);opacity:.5625}.van-loading__dot:nth-of-type(9){-webkit-transform:rotate(270deg);transform:rotate(270deg);opacity:.5}.van-loading__dot:nth-of-type(10){-webkit-transform:rotate(300deg);transform:rotate(300deg);opacity:.4375}.van-loading__dot:nth-of-type(11){-webkit-transform:rotate(330deg);transform:rotate(330deg);opacity:.375}.van-loading__dot:nth-of-type(12){-webkit-transform:rotate(1turn);transform:rotate(1turn);opacity:.3125}@-webkit-keyframes van-rotate{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes van-rotate{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/mixins/basic.d.ts b/miniprogram/components/@mkl/mixins/basic.d.ts
new file mode 100644
index 0000000..b273369
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/basic.d.ts
@@ -0,0 +1 @@
+export declare const basic: string;
diff --git a/miniprogram/components/@mkl/mixins/basic.js b/miniprogram/components/@mkl/mixins/basic.js
new file mode 100644
index 0000000..8a25f16
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/basic.js
@@ -0,0 +1,27 @@
+export const basic = Behavior({
+  methods: {
+    $emit(...args) {
+      this.triggerEvent(...args);
+    },
+    set(data, callback) {
+      this.setData(data, callback);
+      return new Promise((resolve) => wx.nextTick(resolve));
+    },
+    getRect(selector, all) {
+      return new Promise((resolve) => {
+        wx.createSelectorQuery()
+          .in(this)
+          [all ? 'selectAll' : 'select'](selector)
+          .boundingClientRect((rect) => {
+            if (all && Array.isArray(rect) && rect.length) {
+              resolve(rect);
+            }
+            if (!all && rect) {
+              resolve(rect);
+            }
+          })
+          .exec();
+      });
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/mixins/button.d.ts b/miniprogram/components/@mkl/mixins/button.d.ts
new file mode 100644
index 0000000..b51db87
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/button.d.ts
@@ -0,0 +1 @@
+export declare const button: string;
diff --git a/miniprogram/components/@mkl/mixins/button.js b/miniprogram/components/@mkl/mixins/button.js
new file mode 100644
index 0000000..732fa5c
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/button.js
@@ -0,0 +1,15 @@
+export const button = Behavior({
+  externalClasses: ['hover-class'],
+  properties: {
+    id: String,
+    lang: String,
+    businessId: Number,
+    sessionFrom: String,
+    sendMessageTitle: String,
+    sendMessagePath: String,
+    sendMessageImg: String,
+    showMessageCard: Boolean,
+    appParameter: String,
+    ariaLabel: String,
+  },
+});
diff --git a/miniprogram/components/@mkl/mixins/link.d.ts b/miniprogram/components/@mkl/mixins/link.d.ts
new file mode 100644
index 0000000..d58043b
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/link.d.ts
@@ -0,0 +1 @@
+export declare const link: string;
diff --git a/miniprogram/components/@mkl/mixins/link.js b/miniprogram/components/@mkl/mixins/link.js
new file mode 100644
index 0000000..f215742
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/link.js
@@ -0,0 +1,17 @@
+export const link = Behavior({
+  properties: {
+    url: String,
+    linkType: {
+      type: String,
+      value: 'navigateTo',
+    },
+  },
+  methods: {
+    jumpLink(urlKey = 'url') {
+      const url = this.data[urlKey];
+      if (url) {
+        wx[this.data.linkType]({ url });
+      }
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/mixins/open-type.d.ts b/miniprogram/components/@mkl/mixins/open-type.d.ts
new file mode 100644
index 0000000..64b023d
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/open-type.d.ts
@@ -0,0 +1 @@
+export declare const openType: string;
diff --git a/miniprogram/components/@mkl/mixins/open-type.js b/miniprogram/components/@mkl/mixins/open-type.js
new file mode 100644
index 0000000..454c937
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/open-type.js
@@ -0,0 +1,25 @@
+export const openType = Behavior({
+  properties: {
+    openType: String,
+  },
+  methods: {
+    bindGetUserInfo(event) {
+      this.$emit('getuserinfo', event.detail);
+    },
+    bindContact(event) {
+      this.$emit('contact', event.detail);
+    },
+    bindGetPhoneNumber(event) {
+      this.$emit('getphonenumber', event.detail);
+    },
+    bindError(event) {
+      this.$emit('error', event.detail);
+    },
+    bindLaunchApp(event) {
+      this.$emit('launchapp', event.detail);
+    },
+    bindOpenSetting(event) {
+      this.$emit('opensetting', event.detail);
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/mixins/page-scroll.d.ts b/miniprogram/components/@mkl/mixins/page-scroll.d.ts
new file mode 100644
index 0000000..7e9a80f
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/page-scroll.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="miniprogram-api-typings" />
+declare type IPageScrollOption = WechatMiniprogram.Page.IPageScrollOption;
+declare type Scroller = (event: IPageScrollOption) => void;
+export declare const pageScrollMixin: (scroller: Scroller) => string;
+export {};
diff --git a/miniprogram/components/@mkl/mixins/page-scroll.js b/miniprogram/components/@mkl/mixins/page-scroll.js
new file mode 100644
index 0000000..d4e9199
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/page-scroll.js
@@ -0,0 +1,33 @@
+function getCurrentPage() {
+  const pages = getCurrentPages();
+  return pages[pages.length - 1] || {};
+}
+function onPageScroll(event) {
+  const { vanPageScroller = [] } = getCurrentPage();
+  vanPageScroller.forEach((scroller) => {
+    if (typeof scroller === 'function') {
+      scroller(event);
+    }
+  });
+}
+export const pageScrollMixin = (scroller) =>
+  Behavior({
+    attached() {
+      const page = getCurrentPage();
+      if (Array.isArray(page.vanPageScroller)) {
+        page.vanPageScroller.push(scroller.bind(this));
+      } else {
+        page.vanPageScroller =
+          typeof page.onPageScroll === 'function'
+            ? [page.onPageScroll.bind(page), scroller.bind(this)]
+            : [scroller.bind(this)];
+      }
+      page.onPageScroll = onPageScroll;
+    },
+    detached() {
+      const page = getCurrentPage();
+      page.vanPageScroller = (page.vanPageScroller || []).filter(
+        (item) => item !== scroller
+      );
+    },
+  });
diff --git a/miniprogram/components/@mkl/mixins/touch.d.ts b/miniprogram/components/@mkl/mixins/touch.d.ts
new file mode 100644
index 0000000..35ee831
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/touch.d.ts
@@ -0,0 +1 @@
+export declare const touch: string;
diff --git a/miniprogram/components/@mkl/mixins/touch.js b/miniprogram/components/@mkl/mixins/touch.js
new file mode 100644
index 0000000..f29a92d
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/touch.js
@@ -0,0 +1,36 @@
+const MIN_DISTANCE = 10;
+function getDirection(x, y) {
+  if (x > y && x > MIN_DISTANCE) {
+    return 'horizontal';
+  }
+  if (y > x && y > MIN_DISTANCE) {
+    return 'vertical';
+  }
+  return '';
+}
+export const touch = Behavior({
+  methods: {
+    resetTouchStatus() {
+      this.direction = '';
+      this.deltaX = 0;
+      this.deltaY = 0;
+      this.offsetX = 0;
+      this.offsetY = 0;
+    },
+    touchStart(event) {
+      this.resetTouchStatus();
+      const touch = event.touches[0];
+      this.startX = touch.clientX;
+      this.startY = touch.clientY;
+    },
+    touchMove(event) {
+      const touch = event.touches[0];
+      this.deltaX = touch.clientX - this.startX;
+      this.deltaY = touch.clientY - this.startY;
+      this.offsetX = Math.abs(this.deltaX);
+      this.offsetY = Math.abs(this.deltaY);
+      this.direction =
+        this.direction || getDirection(this.offsetX, this.offsetY);
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/mixins/transition.d.ts b/miniprogram/components/@mkl/mixins/transition.d.ts
new file mode 100644
index 0000000..d735ac9
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/transition.d.ts
@@ -0,0 +1 @@
+export declare const transition: (showDefaultValue: boolean) => string;
diff --git a/miniprogram/components/@mkl/mixins/transition.js b/miniprogram/components/@mkl/mixins/transition.js
new file mode 100644
index 0000000..0285058
--- /dev/null
+++ b/miniprogram/components/@mkl/mixins/transition.js
@@ -0,0 +1,118 @@
+import { isObj } from '../common/utils';
+const getClassNames = (name) => ({
+  enter: `van-${name}-enter van-${name}-enter-active enter-class enter-active-class`,
+  'enter-to': `van-${name}-enter-to van-${name}-enter-active enter-to-class enter-active-class`,
+  leave: `van-${name}-leave van-${name}-leave-active leave-class leave-active-class`,
+  'leave-to': `van-${name}-leave-to van-${name}-leave-active leave-to-class leave-active-class`,
+});
+const nextTick = () => new Promise((resolve) => setTimeout(resolve, 1000 / 30));
+export const transition = function (showDefaultValue) {
+  return Behavior({
+    properties: {
+      customStyle: String,
+      // @ts-ignore
+      show: {
+        type: Boolean,
+        value: showDefaultValue,
+        observer: 'observeShow',
+      },
+      // @ts-ignore
+      duration: {
+        type: null,
+        value: 300,
+        observer: 'observeDuration',
+      },
+      name: {
+        type: String,
+        value: 'fade',
+      },
+    },
+    data: {
+      type: '',
+      inited: false,
+      display: false,
+    },
+    methods: {
+      observeShow(value, old) {
+        if (value === old) {
+          return;
+        }
+        value ? this.enter() : this.leave();
+      },
+      enter() {
+        const { duration, name } = this.data;
+        const classNames = getClassNames(name);
+        const currentDuration = isObj(duration) ? duration.enter : duration;
+        this.status = 'enter';
+        this.$emit('before-enter');
+        Promise.resolve()
+          .then(nextTick)
+          .then(() => {
+            this.checkStatus('enter');
+            this.$emit('enter');
+            this.setData({
+              inited: true,
+              display: true,
+              classes: classNames.enter,
+              currentDuration,
+            });
+          })
+          .then(nextTick)
+          .then(() => {
+            this.checkStatus('enter');
+            this.transitionEnded = false;
+            this.setData({
+              classes: classNames['enter-to'],
+            });
+          })
+          .catch(() => {});
+      },
+      leave() {
+        if (!this.data.display) {
+          return;
+        }
+        const { duration, name } = this.data;
+        const classNames = getClassNames(name);
+        const currentDuration = isObj(duration) ? duration.leave : duration;
+        this.status = 'leave';
+        this.$emit('before-leave');
+        Promise.resolve()
+          .then(nextTick)
+          .then(() => {
+            this.checkStatus('leave');
+            this.$emit('leave');
+            this.setData({
+              classes: classNames.leave,
+              currentDuration,
+            });
+          })
+          .then(nextTick)
+          .then(() => {
+            this.checkStatus('leave');
+            this.transitionEnded = false;
+            setTimeout(() => this.onTransitionEnd(), currentDuration);
+            this.setData({
+              classes: classNames['leave-to'],
+            });
+          })
+          .catch(() => {});
+      },
+      checkStatus(status) {
+        if (status !== this.status) {
+          throw new Error(`incongruent status: ${status}`);
+        }
+      },
+      onTransitionEnd() {
+        if (this.transitionEnded) {
+          return;
+        }
+        this.transitionEnded = true;
+        this.$emit(`after-${this.status}`);
+        const { show, display } = this.data;
+        if (!show && display) {
+          this.setData({ display: false });
+        }
+      },
+    },
+  });
+};
diff --git a/miniprogram/components/@mkl/multi-select/index.d.ts b/miniprogram/components/@mkl/multi-select/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/multi-select/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/multi-select/index.js b/miniprogram/components/@mkl/multi-select/index.js
new file mode 100644
index 0000000..55b7c32
--- /dev/null
+++ b/miniprogram/components/@mkl/multi-select/index.js
@@ -0,0 +1,145 @@
+import { VantComponent } from "../common/component";
+import { pickerProps } from "../picker/shared";
+const COLUMNSPLACEHOLDERCODE = "000000";
+VantComponent({
+    classes: ["active-class", "toolbar-class", "column-class"],
+    props: Object.assign(Object.assign({}, pickerProps), {
+        value: {
+            type: Array,
+            observer(value) {
+                this.value = value;
+                this.getSelect();
+                this.setValues();
+            },
+        },
+        columns: {
+            type: Array,
+            value: [],
+            observer(value) {
+                this.getSelect();
+                this.setValues();
+            },
+        },
+    }),
+
+    data: {
+        displayColumns: [],
+        typeToColumnsPlaceholder: {},
+    },
+    mounted() {
+        // setTimeout(() => {
+        //     this.setValues();
+        // }, 0);
+    },
+    methods: {
+        getPicker() {
+            if (this.picker == null) {
+                this.picker = this.selectComponent(".van-multi-select__picker");
+            }
+            return this.picker;
+        },
+        onCancel(event) {
+            this.emit("cancel", event.detail);
+        },
+        onConfirm(event) {
+            const detail = event.detail;
+            const values = this.parseOutputValues(detail.value);
+            this.emit("confirm", {text:values.map((x) => x.text),value: values.map((x) => x.key), index:detail.index });
+        },
+        emit(type, detail) {
+            detail.values = detail.value;
+            delete detail.value;
+            this.$emit(type, detail);
+        },
+        // parse output columns data
+        parseOutputValues(values) {
+            return values.map((value, index) => {
+                return {
+                    key: value.key,
+                    text: value.text,
+                };
+            });
+        },
+        onChange(event) {
+            const { index, picker, value } = event.detail;
+            this.select = { value, index };
+            this.setValues();
+            const values = this.parseOutputValues(value);
+            this.$emit("change", {
+                picker,
+                values: values,
+                value: values.map((x) => x.key),
+                text: values.map((x) => x.text),
+                index,
+            });
+        },
+        //初始化赋值核心方法
+        getSelect(columns = this.data.columns, index = 0, displayColumns = []) {
+            if (this.value && this.value.length > 0) {
+                const key = this.value[index];
+
+                if (columns && columns.length > 0) {
+                    let selectColumn = columns.find((x) => key == x.key);
+                    if (selectColumn) {
+                        displayColumns.push(selectColumn);
+                        if (selectColumn.childs && selectColumn.childs.length > 0) {
+                            this.getSelect(selectColumn.childs, index + 1, displayColumns);
+                        }
+                    }
+                }
+                this.select = {
+                    index: this.value.length - 1,
+                    value: displayColumns,
+                };
+        
+            }
+        },
+        getColumns(columns = this.data.columns, index = 0, displayColumns = [], select) {
+            if (columns && columns.length > 0) {
+                let defaultIndex = 0;
+                if (select) {
+                    if (index <= select.index) {
+                        const val = select.value[index];
+                        if(val&&val.key){
+                            columns.forEach((x, i) => {
+                                if (x.key == val.key) {
+                                    defaultIndex = i;
+                                }
+                            });
+                        }
+                    }
+                }
+                displayColumns.push({
+                    values: columns,
+                    defaultIndex: defaultIndex,
+                });
+                let firstColumn = columns[defaultIndex];
+                if (firstColumn.childs && firstColumn.childs.length > 0) {
+                    index++;
+                    this.getColumns(firstColumn.childs, index, displayColumns, select);
+                }
+            }
+            return displayColumns;
+        },
+        setValues() {
+            // const picker = this.getPicker();
+            // if (!picker) {
+            //     return;
+            // }
+
+            let { select } = this;
+            const stack = this.getColumns(undefined, undefined, undefined, select);
+            this.setData({
+                displayColumns: stack,
+            });
+        },
+        getValues() {
+            const picker = this.getPicker();
+            return picker ? picker.getValues().filter((value) => !!value) : [];
+        },
+        reset(value) {
+            this.value = value || [];
+            return this.setValues();
+        },
+    },
+});
diff --git a/miniprogram/components/@mkl/multi-select/index.json b/miniprogram/components/@mkl/multi-select/index.json
new file mode 100644
index 0000000..a778e91
--- /dev/null
+++ b/miniprogram/components/@mkl/multi-select/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-picker": "../picker/index"
+  }
+}
diff --git a/miniprogram/components/@mkl/multi-select/index.wxml b/miniprogram/components/@mkl/multi-select/index.wxml
new file mode 100644
index 0000000..c27f388
--- /dev/null
+++ b/miniprogram/components/@mkl/multi-select/index.wxml
@@ -0,0 +1 @@
+<van-picker class="van-multi-select__picker" active-class="active-class" toolbar-class="toolbar-class" column-class="column-class" show-toolbar value-key="text" title="{{ title }}" loading="{{ loading }}" columns="{{ displayColumns }}" item-height="{{ itemHeight }}" visible-item-count="{{ visibleItemCount }}" cancel-button-text="{{ cancelButtonText }}" confirm-button-text="{{ confirmButtonText }}" bind:change="onChange" bind:confirm="onConfirm" bind:cancel="onCancel" />
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/multi-select/index.wxss b/miniprogram/components/@mkl/multi-select/index.wxss
new file mode 100644
index 0000000..99694d6
--- /dev/null
+++ b/miniprogram/components/@mkl/multi-select/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/picker-column/index.d.ts b/miniprogram/components/@mkl/picker-column/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/picker-column/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/picker-column/index.js b/miniprogram/components/@mkl/picker-column/index.js
new file mode 100644
index 0000000..5ea335f
--- /dev/null
+++ b/miniprogram/components/@mkl/picker-column/index.js
@@ -0,0 +1,123 @@
+import { VantComponent } from '../common/component';
+import { isObj, range } from '../common/utils';
+const DEFAULT_DURATION = 200;
+VantComponent({
+  classes: ['active-class'],
+  props: {
+    valueKey: String,
+    className: String,
+    itemHeight: Number,
+    visibleItemCount: Number,
+    initialOptions: {
+      type: Array,
+      value: [],
+    },
+    defaultIndex: {
+      type: Number,
+      value: 0,
+      observer(value) {
+        this.setIndex(value);
+      },
+    },
+  },
+  data: {
+    startY: 0,
+    offset: 0,
+    duration: 0,
+    startOffset: 0,
+    options: [],
+    currentIndex: 0,
+  },
+  created() {
+    const { defaultIndex, initialOptions } = this.data;
+    this.set({
+      currentIndex: defaultIndex,
+      options: initialOptions,
+    }).then(() => {
+      this.setIndex(defaultIndex);
+    });
+  },
+  methods: {
+    getCount() {
+      return this.data.options.length;
+    },
+    onTouchStart(event) {
+      this.setData({
+        startY: event.touches[0].clientY,
+        startOffset: this.data.offset,
+        duration: 0,
+      });
+    },
+    onTouchMove(event) {
+      const { data } = this;
+      const deltaY = event.touches[0].clientY - data.startY;
+      this.setData({
+        offset: range(
+          data.startOffset + deltaY,
+          -(this.getCount() * data.itemHeight),
+          data.itemHeight
+        ),
+      });
+    },
+    onTouchEnd() {
+      const { data } = this;
+      if (data.offset !== data.startOffset) {
+        this.setData({ duration: DEFAULT_DURATION });
+        const index = range(
+          Math.round(-data.offset / data.itemHeight),
+          0,
+          this.getCount() - 1
+        );
+        this.setIndex(index, true);
+      }
+    },
+    onClickItem(event) {
+      const { index } = event.currentTarget.dataset;
+      this.setIndex(index, true);
+    },
+    adjustIndex(index) {
+      const { data } = this;
+      const count = this.getCount();
+      index = range(index, 0, count);
+      for (let i = index; i < count; i++) {
+        if (!this.isDisabled(data.options[i])) return i;
+      }
+      for (let i = index - 1; i >= 0; i--) {
+        if (!this.isDisabled(data.options[i])) return i;
+      }
+    },
+    isDisabled(option) {
+      return isObj(option) && option.disabled;
+    },
+    getOptionText(option) {
+      const { data } = this;
+      return isObj(option) && data.valueKey in option
+        ? option[data.valueKey]
+        : option;
+    },
+    setIndex(index, userAction) {
+      const { data } = this;
+      index = this.adjustIndex(index) || 0;
+      const offset = -index * data.itemHeight;
+      if (index !== data.currentIndex) {
+        return this.set({ offset, currentIndex: index }).then(() => {
+          userAction && this.$emit('change', index);
+        });
+      }
+      return this.set({ offset });
+    },
+    setValue(value) {
+      const { options } = this.data;
+      for (let i = 0; i < options.length; i++) {
+        if (this.getOptionText(options[i]) === value) {
+          return this.setIndex(i);
+        }
+      }
+      return Promise.resolve();
+    },
+    getValue() {
+      const { data } = this;
+      return data.options[data.currentIndex];
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/picker-column/index.json b/miniprogram/components/@mkl/picker-column/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/components/@mkl/picker-column/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/components/@mkl/picker-column/index.wxml b/miniprogram/components/@mkl/picker-column/index.wxml
new file mode 100644
index 0000000..f052ed9
--- /dev/null
+++ b/miniprogram/components/@mkl/picker-column/index.wxml
@@ -0,0 +1,22 @@
+<wxs src="./index.wxs" module="getOptionText" />
+
+<view
+  class="van-picker-column custom-class"
+  style="height: {{ itemHeight * visibleItemCount }}px"
+  bind:touchstart="onTouchStart"
+  catch:touchmove="onTouchMove"
+  bind:touchend="onTouchEnd"
+  bind:touchcancel="onTouchEnd"
+>
+  <view style="transition: transform {{ duration }}ms; line-height: {{ itemHeight }}px; transform: translate3d(0, {{ offset + (itemHeight * (visibleItemCount - 1)) / 2 }}px, 0)">
+    <view
+      wx:for="{{ options }}"
+      wx:for-item="option"
+      wx:key="index"
+      data-index="{{ index }}"
+      style="height: {{ itemHeight }}px"
+      class="van-ellipsis van-picker-column__item {{ option && option.disabled ? 'van-picker-column__item--disabled' : '' }} {{ index === currentIndex ? 'van-picker-column__item--selected active-class' : '' }}"
+      bindtap="onClickItem"
+    >{{ getOptionText(option, valueKey) }}</view>
+  </view>
+</view>
diff --git a/miniprogram/components/@mkl/picker-column/index.wxs b/miniprogram/components/@mkl/picker-column/index.wxs
new file mode 100644
index 0000000..3c8fc68
--- /dev/null
+++ b/miniprogram/components/@mkl/picker-column/index.wxs
@@ -0,0 +1,8 @@
+function isObj(x) {
+  var type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+
+module.exports = function (option, valueKey) {
+  return isObj(option) && option[valueKey] != null ? option[valueKey] : option;
+}
diff --git a/miniprogram/components/@mkl/picker-column/index.wxss b/miniprogram/components/@mkl/picker-column/index.wxss
new file mode 100644
index 0000000..c5c6910
--- /dev/null
+++ b/miniprogram/components/@mkl/picker-column/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-picker-column{overflow:hidden;text-align:center;color:#000;color:var(--picker-option-text-color,#000);font-size:16px;font-size:var(--picker-option-font-size,16px)}.van-picker-column__item{padding:0 5px}.van-picker-column__item--selected{font-weight:500;font-weight:var(--font-weight-bold,500);color:#323233;color:var(--picker-option-selected-text-color,#323233)}.van-picker-column__item--disabled{opacity:.3;opacity:var(--picker-option-disabled-opacity,.3)}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/picker/index.d.ts b/miniprogram/components/@mkl/picker/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/picker/index.js b/miniprogram/components/@mkl/picker/index.js
new file mode 100644
index 0000000..e1b3541
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/index.js
@@ -0,0 +1,145 @@
+import { VantComponent } from '../common/component';
+import { pickerProps } from './shared';
+VantComponent({
+  classes: ['active-class', 'toolbar-class', 'column-class'],
+  props: Object.assign(Object.assign({}, pickerProps), {
+    valueKey: {
+      type: String,
+      value: 'text',
+    },
+    toolbarPosition: {
+      type: String,
+      value: 'top',
+    },
+    defaultIndex: {
+      type: Number,
+      value: 0,
+    },
+    columns: {
+      type: Array,
+      value: [],
+      observer(columns = []) {
+        this.simple = columns.length && !columns[0].values;
+        this.children = this.selectAllComponents('.van-picker__column');
+        if (Array.isArray(this.children) && this.children.length) {
+          this.setColumns().catch(() => {});
+        }
+      },
+    },
+  }),
+  beforeCreate() {
+    this.children = [];
+  },
+  methods: {
+    noop() {},
+    setColumns() {
+      const { data } = this;
+      const columns = this.simple ? [{ values: data.columns }] : data.columns;
+      const stack = columns.map((column, index) =>
+        this.setColumnValues(index, column.values)
+      );
+      return Promise.all(stack);
+    },
+    emit(event) {
+      const { type } = event.currentTarget.dataset;
+      if (this.simple) {
+        this.$emit(type, {
+          value: this.getColumnValue(0),
+          index: this.getColumnIndex(0),
+        });
+      } else {
+        this.$emit(type, {
+          value: this.getValues(),
+          index: this.getIndexes(),
+        });
+      }
+    },
+    onChange(event) {
+      if (this.simple) {
+        this.$emit('change', {
+          picker: this,
+          value: this.getColumnValue(0),
+          index: this.getColumnIndex(0),
+        });
+      } else {
+        this.$emit('change', {
+          picker: this,
+          value: this.getValues(),
+          index: event.currentTarget.dataset.index,
+        });
+      }
+    },
+    // get column instance by index
+    getColumn(index) {
+      return this.children[index];
+    },
+    // get column value by index
+    getColumnValue(index) {
+      const column = this.getColumn(index);
+      return column && column.getValue();
+    },
+    // set column value by index
+    setColumnValue(index, value) {
+      const column = this.getColumn(index);
+      if (column == null) {
+        return Promise.reject(new Error('setColumnValue: 对应列不存在'));
+      }
+      return column.setValue(value);
+    },
+    // get column option index by column index
+    getColumnIndex(columnIndex) {
+      return (this.getColumn(columnIndex) || {}).data.currentIndex;
+    },
+    // set column option index by column index
+    setColumnIndex(columnIndex, optionIndex) {
+      const column = this.getColumn(columnIndex);
+      if (column == null) {
+        return Promise.reject(new Error('setColumnIndex: 对应列不存在'));
+      }
+      return column.setIndex(optionIndex);
+    },
+    // get options of column by index
+    getColumnValues(index) {
+      return (this.children[index] || {}).data.options;
+    },
+    // set options of column by index
+    setColumnValues(index, options, needReset = true) {
+      const column = this.children[index];
+      if (column == null) {
+        return Promise.reject(new Error('setColumnValues: 对应列不存在'));
+      }
+      const isSame =
+        JSON.stringify(column.data.options) === JSON.stringify(options);
+      if (isSame) {
+        return Promise.resolve();
+      }
+      return column.set({ options }).then(() => {
+        if (needReset) {
+          column.setIndex(0);
+        }
+      });
+    },
+    // get values of all columns
+    getValues() {
+      return this.children.map((child) => child.getValue());
+    },
+    // set values of all columns
+    setValues(values) {
+      const stack = values.map((value, index) =>
+        this.setColumnValue(index, value)
+      );
+      return Promise.all(stack);
+    },
+    // get indexes of all columns
+    getIndexes() {
+      return this.children.map((child) => child.data.currentIndex);
+    },
+    // set indexes of all columns
+    setIndexes(indexes) {
+      const stack = indexes.map((optionIndex, columnIndex) =>
+        this.setColumnIndex(columnIndex, optionIndex)
+      );
+      return Promise.all(stack);
+    },
+  },
+});
diff --git a/miniprogram/components/@mkl/picker/index.json b/miniprogram/components/@mkl/picker/index.json
new file mode 100644
index 0000000..2fcec89
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "picker-column": "../picker-column/index",
+    "loading": "../loading/index"
+  }
+}
diff --git a/miniprogram/components/@mkl/picker/index.wxml b/miniprogram/components/@mkl/picker/index.wxml
new file mode 100644
index 0000000..21b6999
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/index.wxml
@@ -0,0 +1,19 @@
+<import src="./toolbar.wxml" />
+<view class="van-picker custom-class">
+    <template is="toolbar" wx:if="{{ toolbarPosition === 'top' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
+    <view wx:if="{{ loading }}" class="van-picker__loading">
+        <loading color="#1989fa" />
+    </view>
+    <view class="van-picker__columns" style="height: {{ itemHeight * visibleItemCount }}px" catch:touchmove="noop">
+        <picker-column class="van-picker__column" wx:for="{{ isSimple(columns) ? [columns] : columns }}" wx:key="index" data-index="{{ index }}" custom-class="column-class" value-key="{{ valueKey }}" initial-options="{{ isSimple(columns) ? item : item.values }}" default-index="{{ item.defaultIndex || defaultIndex }}" item-height="{{ itemHeight }}" visible-item-count="{{ visibleItemCount }}" active-class="active-class" bind:change="onChange" />
+        <view class="van-picker__mask" style="background-size: 100% {{ (itemHeight * visibleItemCount - itemHeight) / 2 }}px" />
+        <view class="van-picker__frame van-hairline--top-bottom" style="height: {{ itemHeight }}px" />
+    </view>
+    <template is="toolbar" wx:if="{{ toolbarPosition === 'bottom' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
+</view>
+<wxs module="isSimple">
+  function isSimple(columns) {
+    return columns.length && !columns[0].values;
+  }
+  module.exports = isSimple;
+</wxs>
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/picker/index.wxss b/miniprogram/components/@mkl/picker/index.wxss
new file mode 100644
index 0000000..784c2b0
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-picker{position:relative;overflow:hidden;-webkit-text-size-adjust:100%;-webkit-user-select:none;user-select:none;background-color:#fff;background-color:var(--picker-background-color,#fff)}.van-picker__toolbar{display:-webkit-flex;display:flex;-webkit-justify-content:space-between;justify-content:space-between;height:44px;height:var(--picker-toolbar-height,44px);line-height:44px;line-height:var(--picker-toolbar-height,44px)}.van-picker__cancel,.van-picker__confirm{padding:0 16px;padding:var(--picker-action-padding,0 16px);font-size:14px;font-size:var(--picker-action-font-size,14px);color:#1989fa;color:var(--picker-action-text-color,#1989fa)}.van-picker__cancel--hover,.van-picker__confirm--hover{background-color:#f2f3f5;background-color:var(--picker-action-active-color,#f2f3f5)}.van-picker__title{max-width:50%;text-align:center;font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--picker-option-font-size,16px)}.van-picker__columns{position:relative;display:-webkit-flex;display:flex}.van-picker__column{-webkit-flex:1 1;flex:1 1;width:0}.van-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:4;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;background-color:hsla(0,0%,100%,.9);background-color:var(--picker-loading-mask-color,hsla(0,0%,100%,.9))}.van-picker__mask{position:absolute;top:0;left:0;z-index:2;width:100%;height:100%;background-image:linear-gradient(180deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),linear-gradient(0deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-repeat:no-repeat;background-position:top,bottom;-webkit-backface-visibility:hidden;backface-visibility:hidden;pointer-events:none}.van-picker__frame,.van-picker__loading .van-loading{position:absolute;top:50%;left:0;z-index:1;width:100%;-webkit-transform:translateY(-50%);transform:translateY(-50%);pointer-events:none}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/picker/shared.d.ts b/miniprogram/components/@mkl/picker/shared.d.ts
new file mode 100644
index 0000000..c548045
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/shared.d.ts
@@ -0,0 +1,21 @@
+export declare const pickerProps: {
+    title: StringConstructor;
+    loading: BooleanConstructor;
+    showToolbar: BooleanConstructor;
+    cancelButtonText: {
+        type: StringConstructor;
+        value: string;
+    };
+    confirmButtonText: {
+        type: StringConstructor;
+        value: string;
+    };
+    visibleItemCount: {
+        type: NumberConstructor;
+        value: number;
+    };
+    itemHeight: {
+        type: NumberConstructor;
+        value: number;
+    };
+};
diff --git a/miniprogram/components/@mkl/picker/shared.js b/miniprogram/components/@mkl/picker/shared.js
new file mode 100644
index 0000000..a8c96a8
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/shared.js
@@ -0,0 +1,21 @@
+export const pickerProps = {
+  title: String,
+  loading: Boolean,
+  showToolbar: Boolean,
+  cancelButtonText: {
+    type: String,
+    value: '取消',
+  },
+  confirmButtonText: {
+    type: String,
+    value: '确认',
+  },
+  visibleItemCount: {
+    type: Number,
+    value: 5,
+  },
+  itemHeight: {
+    type: Number,
+    value: 44,
+  },
+};
diff --git a/miniprogram/components/@mkl/picker/toolbar.wxml b/miniprogram/components/@mkl/picker/toolbar.wxml
new file mode 100644
index 0000000..4fa9db5
--- /dev/null
+++ b/miniprogram/components/@mkl/picker/toolbar.wxml
@@ -0,0 +1,28 @@
+<template name="toolbar">
+  <view
+    wx:if="{{ showToolbar }}"
+    class="van-picker__toolbar van-hairline--top-bottom toolbar-class"
+  >
+    <view
+      class="van-picker__cancel"
+      hover-class="van-picker__cancel--hover"
+      hover-stay-time="70"
+      data-type="cancel"
+      bindtap="emit"
+    >
+      {{ cancelButtonText }}
+    </view>
+    <view wx:if="{{ title }}" class="van-picker__title van-ellipsis">{{
+      title
+    }}</view>
+    <view
+      class="van-picker__confirm"
+      hover-class="van-picker__confirm--hover"
+      hover-stay-time="70"
+      data-type="confirm"
+      bindtap="emit"
+    >
+      {{ confirmButtonText }}
+    </view>
+  </view>
+</template>
diff --git a/miniprogram/components/@mkl/sticky/index.d.ts b/miniprogram/components/@mkl/sticky/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/sticky/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/sticky/index.js b/miniprogram/components/@mkl/sticky/index.js
new file mode 100644
index 0000000..7333995
--- /dev/null
+++ b/miniprogram/components/@mkl/sticky/index.js
@@ -0,0 +1,105 @@
+import { VantComponent } from "../common/component";
+import { pageScrollMixin } from "../mixins/page-scroll";
+const ROOT_ELEMENT = ".van-sticky";
+VantComponent({
+    props: {
+        zIndex: {
+            type: Number,
+            value: 99,
+        },
+        offsetTop: {
+            type: Number,
+            value: 0,
+            observer: "onScroll",
+        },
+        disabled: {
+            type: Boolean,
+            observer: "onScroll",
+        },
+        container: {
+            type: null,
+            observer: "onScroll",
+        },
+        scrollTop: {
+            type: null,
+            observer(val) {
+                this.onScroll({ scrollTop: val });
+            },
+        },
+    },
+    mixins: [
+        pageScrollMixin(function (event) {
+            if (this.data.scrollTop != null) {
+                return;
+            }
+            this.onScroll(event);
+        }),
+    ],
+    data: {
+        height: 0,
+        fixed: false,
+        transform: 0,
+    },
+    mounted() {
+        this.onScroll();
+    },
+    methods: {
+        onScroll({ scrollTop } = {}) {
+            const { container, offsetTop, disabled } = this.data;
+            if (disabled) {
+                this.setDataAfterDiff({
+                    fixed: false,
+                    transform: 0,
+                });
+                return;
+            }
+            this.scrollTop = scrollTop || this.scrollTop;
+            if (typeof container === "function") {
+                Promise.all([this.getRect(ROOT_ELEMENT), this.getContainerRect()]).then(([root, container]) => {
+                    if (offsetTop + root.height > container.height + container.top) {
+                        this.setDataAfterDiff({
+                            fixed: false,
+                            transform: container.height - root.height,
+                        });
+                    } else if (offsetTop >= root.top) {
+                        this.setDataAfterDiff({
+                            fixed: true,
+                            height: root.height,
+                            transform: 0,
+                        });
+                    } else {
+                        this.setDataAfterDiff({ fixed: false, transform: 0 });
+                    }
+                });
+                return;
+            }
+            this.getRect(ROOT_ELEMENT).then((root) => {
+                if (offsetTop >= root.top) {
+                    this.setDataAfterDiff({ fixed: true, height: root.height });
+                    this.transform = 0;
+                } else {
+                    this.setDataAfterDiff({ fixed: false });
+                }
+            });
+        },
+        setDataAfterDiff(data) {
+            wx.nextTick(() => {
+                const diff = Object.keys(data).reduce((prev, key) => {
+                    if (data[key] !== this.data[key]) {
+                        prev[key] = data[key];
+                    }
+                    return prev;
+                }, {});
+                this.setData(diff);
+                this.$emit("scroll", {
+                    scrollTop: this.scrollTop,
+                    isFixed: data.fixed || this.data.fixed,
+                });
+            });
+        },
+        getContainerRect() {
+            const nodesRef = this.data.container();
+            return new Promise((resolve) => nodesRef.boundingClientRect(resolve).exec());
+        },
+    },
+});
diff --git a/miniprogram/components/@mkl/sticky/index.json b/miniprogram/components/@mkl/sticky/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/components/@mkl/sticky/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/components/@mkl/sticky/index.wxml b/miniprogram/components/@mkl/sticky/index.wxml
new file mode 100644
index 0000000..0a26c7c
--- /dev/null
+++ b/miniprogram/components/@mkl/sticky/index.wxml
@@ -0,0 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+<view class="custom-class van-sticky" style="{{ computed.containerStyle({ fixed, height, zIndex }) }}">
+    <view class="{{ utils.bem('sticky-wrap', { fixed }) }}" style="{{ computed.wrapStyle({ fixed, offsetTop, transform, zIndex }) }}">
+        <slot />
+    </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/sticky/index.wxs b/miniprogram/components/@mkl/sticky/index.wxs
new file mode 100644
index 0000000..18efe14
--- /dev/null
+++ b/miniprogram/components/@mkl/sticky/index.wxs
@@ -0,0 +1,37 @@
+/* eslint-disable */
+function wrapStyle(data) {
+  var style = '';
+
+  if (data.transform) {
+    style += 'transform: translate3d(0, ' + data.transform + 'px, 0);';
+  }
+
+  if (data.fixed) {
+    style += 'top: ' + data.offsetTop + 'px;';
+  }
+
+  if (data.zIndex) {
+    style += 'z-index: ' + data.zIndex + ';';
+  }
+
+  return style;
+}
+
+function containerStyle(data) {
+  var style = '';
+
+  if (data.fixed) {
+    style += 'height: ' + data.height + 'px;';
+  }
+
+  if (data.zIndex) {
+    style += 'z-index: ' + data.zIndex + ';';
+  }
+
+  return style;
+}
+
+module.exports = {
+  wrapStyle: wrapStyle,
+  containerStyle: containerStyle
+};
diff --git a/miniprogram/components/@mkl/sticky/index.wxss b/miniprogram/components/@mkl/sticky/index.wxss
new file mode 100644
index 0000000..5269387
--- /dev/null
+++ b/miniprogram/components/@mkl/sticky/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-sticky{position:relative}.van-sticky-wrap--fixed{position:fixed;right:0;left:0}
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/tab/index.d.ts b/miniprogram/components/@mkl/tab/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/tab/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/tab/index.js b/miniprogram/components/@mkl/tab/index.js
new file mode 100644
index 0000000..ed8fffb
--- /dev/null
+++ b/miniprogram/components/@mkl/tab/index.js
@@ -0,0 +1,59 @@
+import { VantComponent } from "../common/component";
+VantComponent({
+    relation: {
+        name: "tabs",
+        type: "ancestor",
+        current: "tab",
+    },
+    props: {
+        dot: {
+            type: Boolean,
+            observer: "update",
+        },
+        info: {
+            type: null,
+            observer: "update",
+        },
+        title: {
+            type: String,
+            observer: "update",
+        },
+        disabled: {
+            type: Boolean,
+            observer: "update",
+        },
+        titleStyle: {
+            type: String,
+            observer: "update",
+        },
+        name: {
+            type: [Number, String],
+            value: "",
+        },
+    },
+    data: {
+        active: false,
+    },
+    methods: {
+        getComputedName() {
+            if (this.data.name !== "") {
+                return this.data.name;
+            }
+            return this.index;
+        },
+        updateRender(active, parent) {
+            const { data: parentData } = parent;
+            this.inited = this.inited || active;
+            this.setData({
+                active,
+                shouldRender: this.inited || !parentData.lazyRender,
+                shouldShow: active || parentData.animated,
+            });
+        },
+        update() {
+            if (this.parent) {
+                this.parent.updateTabs();
+            }
+        },
+    },
+});
diff --git a/miniprogram/components/@mkl/tab/index.json b/miniprogram/components/@mkl/tab/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/components/@mkl/tab/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/components/@mkl/tab/index.wxml b/miniprogram/components/@mkl/tab/index.wxml
new file mode 100644
index 0000000..71e56c9
--- /dev/null
+++ b/miniprogram/components/@mkl/tab/index.wxml
@@ -0,0 +1,4 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<view class="custom-class {{ utils.bem('tab__pane', { active, inactive: !active }) }}" style="{{ shouldShow ? '' : 'display: none;' }}">
+    <slot wx:if="{{ shouldRender }}" />
+</view>
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/tab/index.wxss b/miniprogram/components/@mkl/tab/index.wxss
new file mode 100644
index 0000000..55af244
--- /dev/null
+++ b/miniprogram/components/@mkl/tab/index.wxss
@@ -0,0 +1,21 @@
+/* @import "../common/index.wxss"; */
+:host {
+    -webkit-flex-shrink: 0;
+    flex-shrink: 0;
+    width: 100%;
+}
+.van-tab__pane,
+:host {
+    box-sizing: border-box;
+}
+.van-tab__pane {
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+}
+.van-tab__pane--active {
+    height: auto;
+}
+.van-tab__pane--inactive {
+    height: 0;
+    overflow: visible;
+}
diff --git a/miniprogram/components/@mkl/tabs/index.d.ts b/miniprogram/components/@mkl/tabs/index.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/miniprogram/components/@mkl/tabs/index.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/miniprogram/components/@mkl/tabs/index.js b/miniprogram/components/@mkl/tabs/index.js
new file mode 100644
index 0000000..2e58fae
--- /dev/null
+++ b/miniprogram/components/@mkl/tabs/index.js
@@ -0,0 +1,255 @@
+import { VantComponent } from "../common/component";
+import { touch } from "../mixins/touch";
+import { isDef, addUnit } from "../common/utils";
+VantComponent({
+    mixins: [touch],
+    classes: ["nav-class", "tab-class", "tab-active-class", "line-class"],
+    relation: {
+        name: "tab",
+        type: "descendant",
+        current: "tabs",
+        linked(target) {
+            target.index = this.children.length - 1;
+            this.updateTabs();
+        },
+        unlinked() {
+            this.children = this.children.map((child, index) => {
+                child.index = index;
+                return child;
+            });
+            this.updateTabs();
+        },
+    },
+    props: {
+        color: {
+            type: String,
+            observer: "setLine",
+        },
+        sticky: Boolean,
+        animated: {
+            type: Boolean,
+            observer() {
+                this.children.forEach((child, index) => child.updateRender(index === this.data.currentIndex, this));
+            },
+        },
+        swipeable: Boolean,
+        lineWidth: {
+            type: [String, Number],
+            value: -1,
+            observer: "setLine",
+        },
+        lineHeight: {
+            type: [String, Number],
+            value: -1,
+            observer: "setLine",
+        },
+        titleActiveColor: String,
+        titleInactiveColor: String,
+        active: {
+            type: [String, Number],
+            value: 0,
+            observer(name) {
+                if (name !== this.getCurrentName()) {
+                    this.setCurrentIndexByName(name);
+                }
+            },
+        },
+        type: {
+            type: String,
+            value: "line",
+        },
+        border: {
+            type: Boolean,
+            value: true,
+        },
+        ellipsis: {
+            type: Boolean,
+            value: true,
+        },
+        duration: {
+            type: Number,
+            value: 0.3,
+        },
+        zIndex: {
+            type: Number,
+            value: 1,
+        },
+        swipeThreshold: {
+            type: Number,
+            value: 4,
+            observer(value) {
+                this.setData({
+                    scrollable: this.children.length > value || !this.data.ellipsis,
+                });
+            },
+        },
+        offsetTop: {
+            type: Number,
+            value: 0,
+        },
+        lazyRender: {
+            type: Boolean,
+            value: true,
+        },
+    },
+    data: {
+        tabs: [],
+        lineStyle: "",
+        scrollLeft: 0,
+        scrollable: false,
+        trackStyle: "",
+        currentIndex: null,
+        container: null,
+    },
+    mounted() {
+        wx.nextTick(() => {
+            this.setLine(true);
+            this.scrollIntoView();
+        });
+    },
+    methods: {
+        updateContainer() {
+            this.setData({
+                container: () => this.createSelectorQuery().select(".van-tabs"),
+            });
+        },
+        updateTabs() {
+            const { children = [], data } = this;
+            this.setData({
+                tabs: children.map((child) => child.data),
+                scrollable: this.children.length > data.swipeThreshold || !data.ellipsis,
+            });
+            this.setCurrentIndexByName(this.getCurrentName() || data.active);
+        },
+        trigger(eventName, child) {
+            const { currentIndex } = this.data;
+            const currentChild = child || this.children[currentIndex];
+            if (!isDef(currentChild)) {
+                return;
+            }
+            this.$emit(eventName, {
+                index: currentChild.index,
+                name: currentChild.getComputedName(),
+                title: currentChild.data.title,
+            });
+        },
+        onTap(event) {
+            const { index } = event.currentTarget.dataset;
+            const child = this.children[index];
+            if (child.data.disabled) {
+                this.trigger("disabled", child);
+            } else {
+                this.setCurrentIndex(index);
+                wx.nextTick(() => {
+                    this.trigger("click");
+                });
+            }
+        },
+        // correct the index of active tab
+        setCurrentIndexByName(name) {
+            const { children = [] } = this;
+            const matched = children.filter((child) => child.getComputedName() === name);
+            if (matched.length) {
+                this.setCurrentIndex(matched[0].index);
+            }
+        },
+        setCurrentIndex(currentIndex) {
+            const { data, children = [] } = this;
+            if (!isDef(currentIndex) || currentIndex >= children.length || currentIndex < 0) {
+                return;
+            }
+            children.forEach((item, index) => {
+                const active = index === currentIndex;
+                if (active !== item.data.active || !item.inited) {
+                    item.updateRender(active, this);
+                }
+            });
+            if (currentIndex === data.currentIndex) {
+                return;
+            }
+            const shouldEmitChange = data.currentIndex !== null;
+            this.setData({ currentIndex });
+            wx.nextTick(() => {
+                this.setLine();
+                this.scrollIntoView();
+                this.updateContainer();
+                this.trigger("input");
+                if (shouldEmitChange) {
+                    this.trigger("change");
+                }
+            });
+        },
+        getCurrentName() {
+            const activeTab = this.children[this.data.currentIndex];
+            if (activeTab) {
+                return activeTab.getComputedName();
+            }
+        },
+        setLine(skipTransition) {
+            if (this.data.type !== "line") {
+                return;
+            }
+            const { color, duration, currentIndex, lineWidth, lineHeight } = this.data;
+            this.getRect(".van-tab", true).then((rects = []) => {
+                const rect = rects[currentIndex];
+                if (rect == null) {
+                    return;
+                }
+                const width = lineWidth !== -1 ? lineWidth : rect.width / 2;
+                const height = lineHeight !== -1 ? `height: ${addUnit(lineHeight)}; border-radius: ${addUnit(lineHeight)};` : "";
+                let left = rects.slice(0, currentIndex).reduce((prev, curr) => prev + curr.width, 0);
+                left += (rect.width - width) / 2;
+                const transition = skipTransition ? "" : `transition-duration: ${duration}s; -webkit-transition-duration: ${duration}s;`;
+                this.setData({
+                    lineStyle: `
+            ${height}
+            width: ${addUnit(width)};
+            background-color: ${color};
+            -webkit-transform: translateX(${left}px);
+            transform: translateX(${left}px);
+            ${transition}
+          `,
+                });
+            });
+        },
+        // scroll active tab into view
+        scrollIntoView() {
+            const { currentIndex, scrollable } = this.data;
+            if (!scrollable) {
+                return;
+            }
+            Promise.all([this.getRect(".van-tab", true), this.getRect(".van-tabs__nav")]).then(([tabRects, navRect]) => {
+                const tabRect = tabRects[currentIndex];
+                const offsetLeft = tabRects.slice(0, currentIndex).reduce((prev, curr) => prev + curr.width, 0);
+                this.setData({
+                    scrollLeft: offsetLeft - (navRect.width - tabRect.width) / 2,
+                });
+            });
+        },
+        onTouchScroll(event) {
+            this.$emit("scroll", event.detail);
+        },
+        onTouchStart(event) {
+            if (!this.data.swipeable) return;
+            this.touchStart(event);
+        },
+        onTouchMove(event) {
+            if (!this.data.swipeable) return;
+            this.touchMove(event);
+        },
+        // watch swipe touch end
+        onTouchEnd() {
+            if (!this.data.swipeable) return;
+            const { tabs, currentIndex } = this.data;
+            const { direction, deltaX, offsetX } = this;
+            const minSwipeDistance = 50;
+            if (direction === "horizontal" && offsetX >= minSwipeDistance) {
+                if (deltaX > 0 && currentIndex !== 0) {
+                    this.setCurrentIndex(currentIndex - 1);
+                } else if (deltaX < 0 && currentIndex !== tabs.length - 1) {
+                    this.setCurrentIndex(currentIndex + 1);
+                }
+            }
+        },
+    },
+});
diff --git a/miniprogram/components/@mkl/tabs/index.json b/miniprogram/components/@mkl/tabs/index.json
new file mode 100644
index 0000000..19c0bc3
--- /dev/null
+++ b/miniprogram/components/@mkl/tabs/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index",
+    "van-sticky": "../sticky/index"
+  }
+}
diff --git a/miniprogram/components/@mkl/tabs/index.wxml b/miniprogram/components/@mkl/tabs/index.wxml
new file mode 100644
index 0000000..150c9dd
--- /dev/null
+++ b/miniprogram/components/@mkl/tabs/index.wxml
@@ -0,0 +1,26 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="getters" />
+<view class="custom-class {{ utils.bem('tabs', [type]) }}">
+    <van-sticky disabled="{{ !sticky }}" z-index="{{ zIndex }}" offset-top="{{ offsetTop }}" container="{{ container }}" bind:scroll="onTouchScroll">
+        <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
+            <slot name="nav-left" />
+            <scroll-view scroll-x="{{ scrollable }}" scroll-with-animation scroll-left="{{ scrollLeft }}" class="{{ utils.bem('tabs__scroll', [type]) }}" style="{{ color ? 'border-color: ' + color : '' }}">
+                <view class="{{ utils.bem('tabs__nav', [type]) }} nav-class" style="{{ getters.tabCardTypeBorderStyle(color, type) }}">
+                    <!-- <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" /> -->
+                    <view wx:for="{{ tabs }}" wx:key="index" data-index="{{ index }}" class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}" style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}" bind:tap="onTap">
+                        <view class="{{ ellipsis ? 'mkl-ellipsis' : '' }}" style="{{ item.titleStyle }}">
+                            <text class="mkl-active">{{ item.title }}</text>
+                            <van-info wx:if="{{ item.info !== null || item.dot }}" info="{{ item.info }}" dot="{{ item.dot }}" custom-class="van-tab__title__info" />
+                        </view>
+                    </view>
+                </view>
+            </scroll-view>
+            <slot name="nav-right" />
+        </view>
+    </van-sticky>
+    <view class="van-tabs__content" bind:touchstart="onTouchStart" bind:touchmove="onTouchMove" bind:touchend="onTouchEnd" bind:touchcancel="onTouchEnd">
+        <view class="{{ utils.bem('tabs__track', [{ animated }]) }} van-tabs__track" style="{{ getters.trackStyle({ duration, currentIndex, animated }) }}">
+            <slot />
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/components/@mkl/tabs/index.wxs b/miniprogram/components/@mkl/tabs/index.wxs
new file mode 100644
index 0000000..eeed7fc
--- /dev/null
+++ b/miniprogram/components/@mkl/tabs/index.wxs
@@ -0,0 +1,64 @@
+/* eslint-disable */
+function tabClass(active, ellipsis) {
+    var classes = ["tab-class"];
+
+    if (active) {
+        classes.push("tab-active-class");
+    }
+
+    if (ellipsis) {
+        classes.push("van-ellipsis");
+    }
+
+    return classes.join(" ");
+}
+
+function tabStyle(active, ellipsis, color, type, disabled, activeColor, inactiveColor, swipeThreshold, scrollable) {
+    var styles = [];
+    var isCard = type === "card";
+    // card theme color
+    if (color && isCard) {
+        styles.push("border-color:" + color);
+
+        if (!disabled) {
+            if (active) {
+                styles.push("background-color:" + color);
+            } else {
+                styles.push("color:" + color);
+            }
+        }
+    }
+
+    var titleColor = active ? activeColor : inactiveColor;
+    if (titleColor) {
+        styles.push("color:" + titleColor);
+    }
+
+    if (scrollable && ellipsis) {
+        styles.push("flex-basis:" + 88 / swipeThreshold + "%");
+    }
+
+    return styles.join(";");
+}
+
+function tabCardTypeBorderStyle(color, type) {
+    var isCard = type === "card";
+    var styles = [];
+    if (isCard && color) {
+        styles.push("border-color:" + color);
+    }
+    return styles.join(";");
+}
+
+function trackStyle(data) {
+    if (!data.animated) {
+        return "";
+    }
+
+    return ["transform: translate3d(" + -100 * data.currentIndex + "%, 0, 0)", "-webkit-transition-duration: " + data.duration + "s", "transition-duration: " + data.duration + "s"].join(";");
+}
+
+module.exports.tabClass = tabClass;
+module.exports.tabStyle = tabStyle;
+module.exports.trackStyle = trackStyle;
+module.exports.tabCardTypeBorderStyle = tabCardTypeBorderStyle;
diff --git a/miniprogram/components/@mkl/tabs/index.wxss b/miniprogram/components/@mkl/tabs/index.wxss
new file mode 100644
index 0000000..9de5325
--- /dev/null
+++ b/miniprogram/components/@mkl/tabs/index.wxss
@@ -0,0 +1,134 @@
+/* @import "../common/index.wxss"; */
+.van-tabs {
+    position: relative;
+    -webkit-tap-highlight-color: transparent;
+}
+.van-tabs__wrap {
+    display: -webkit-flex;
+    display: flex;
+    overflow: hidden;
+}
+.van-tabs__wrap--scrollable .van-tab {
+    -webkit-flex: 0 0 22%;
+    flex: 0 0 22%;
+}
+.van-tabs__scroll {
+    background-color: #fff;
+}
+.van-tabs__scroll--line {
+    box-sizing: initial;
+    height: calc(100% + 15px);
+}
+.van-tabs__scroll--card {
+    margin: 0 16px;
+}
+.van-tabs__scroll::-webkit-scrollbar {
+    display: none;
+}
+.van-tabs__nav {
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-user-select: none;
+    user-select: none;
+}
+.van-tabs__nav--card {
+    box-sizing: border-box;
+    height: 30px;
+    border: 1px solid #ee0a24;
+    border-radius: 2px;
+}
+.van-tabs__nav--card .van-tab {
+    color: #ee0a24;
+    line-height: 28px;
+    border-right: 1px solid #ee0a24;
+}
+.van-tabs__nav--card .van-tab:last-child {
+    border-right: none;
+}
+.van-tabs__nav--card .van-tab.van-tab--active {
+    color: #fff;
+    background-color: #ee0a24;
+}
+.van-tabs__nav--card .van-tab--disabled {
+    color: #c8c9cc;
+}
+.van-tabs__line {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 1;
+    height: 3px;
+    border-radius: 3px;
+    background-color: #ee0a24;
+}
+.van-tabs__track {
+    position: relative;
+    width: 100%;
+    height: 100%;
+}
+.van-tabs__track--animated {
+    display: -webkit-flex;
+    display: flex;
+    transition-property: -webkit-transform;
+    transition-property: transform;
+    transition-property: transform, -webkit-transform;
+}
+.van-tabs__content {
+    overflow: hidden;
+}
+.van-tabs--line .van-tabs__wrap {
+    height: 44px;
+}
+.van-tabs--card .van-tabs__wrap {
+    height: 30px;
+}
+.van-tab {
+    position: relative;
+    -webkit-flex: 1;
+    flex: 1;
+    box-sizing: border-box;
+    min-width: 0;
+    padding: 0 5px;
+    text-align: center;
+    cursor: pointer;
+    /* color: #646566;
+    font-size: 14px;
+    line-height: 44px; */
+}
+/* .van-tab--active  {
+    font-weight: 500;
+    color: #323233;
+} */
+.mkl-ellipsis {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    font-size: 30rpx;
+    color: #999;
+    background: #ffffff;
+    height: 100rpx;
+    line-height: 100rpx;
+}
+.van-tab--active .mkl-ellipsis .mkl-active {
+    /* font-weight: 500;
+    color: #323233; */
+    background: url("http://fileimg.makalu.cc/CORE_38D582DD840F4816B1F14D964F0046E9.png") no-repeat bottom/100% 15rpx;
+    font-size: 30rpx;
+    color: #000;
+    font-weight: bold;
+}
+.van-tab--disabled {
+    color: #c8c9cc;
+}
+.van-tab--complete {
+    -webkit-flex: 1 0 auto !important;
+    flex: 1 0 auto !important;
+}
+.van-tab__title__info {
+    position: relative !important;
+    top: -1px !important;
+    display: inline-block;
+    -webkit-transform: translateX(0) !important;
+    transform: translateX(0) !important;
+}
diff --git a/miniprogram/components/@mkl/wxs/add-unit.wxs b/miniprogram/components/@mkl/wxs/add-unit.wxs
new file mode 100644
index 0000000..27a22d8
--- /dev/null
+++ b/miniprogram/components/@mkl/wxs/add-unit.wxs
@@ -0,0 +1,14 @@
+/* eslint-disable */
+var REGEXP = getRegExp('^\d+(\.\d+)?$');
+
+function addUnit(value) {
+  if (value == null) {
+    return undefined;
+  }
+
+  return REGEXP.test('' + value) ? value + 'px' : value;
+}
+
+module.exports = {
+  addUnit: addUnit
+};
diff --git a/miniprogram/components/@mkl/wxs/array.wxs b/miniprogram/components/@mkl/wxs/array.wxs
new file mode 100644
index 0000000..610089c
--- /dev/null
+++ b/miniprogram/components/@mkl/wxs/array.wxs
@@ -0,0 +1,5 @@
+function isArray(array) {
+  return array && array.constructor === 'Array';
+}
+
+module.exports.isArray = isArray;
diff --git a/miniprogram/components/@mkl/wxs/bem.wxs b/miniprogram/components/@mkl/wxs/bem.wxs
new file mode 100644
index 0000000..93b2777
--- /dev/null
+++ b/miniprogram/components/@mkl/wxs/bem.wxs
@@ -0,0 +1,38 @@
+var array = require('./array.wxs');
+var object = require('./object.wxs');
+var PREFIX = 'van-';
+
+function join(name, mods) {
+  name = PREFIX + name;
+  mods = mods.map(function(mod) {
+    return name + '--' + mod;
+  });
+  mods.unshift(name);
+  return mods.join(' ');
+}
+
+function traversing(mods, conf) {
+  if (!conf) {
+    return;
+  }
+
+  if (typeof conf === 'string' || typeof conf === 'number') {
+    mods.push(conf);
+  } else if (array.isArray(conf)) {
+    conf.forEach(function(item) {
+      traversing(mods, item);
+    });
+  } else if (typeof conf === 'object') {
+    object.keys(conf).forEach(function(key) {
+      conf[key] && mods.push(key);
+    });
+  }
+}
+
+function bem(name, conf) {
+  var mods = [];
+  traversing(mods, conf);
+  return join(name, mods);
+}
+
+module.exports.bem = bem;
diff --git a/miniprogram/components/@mkl/wxs/memoize.wxs b/miniprogram/components/@mkl/wxs/memoize.wxs
new file mode 100644
index 0000000..261ae67
--- /dev/null
+++ b/miniprogram/components/@mkl/wxs/memoize.wxs
@@ -0,0 +1,54 @@
+/**
+ * Simple memoize
+ * wxs doesn't support fn.apply, so this memoize only support up to 2 args
+ */
+
+function isPrimitive(value) {
+  var type = typeof value;
+  return (
+    type === 'boolean' ||
+    type === 'number' ||
+    type === 'string' ||
+    type === 'undefined' ||
+    value === null
+  );
+}
+
+// mock simple fn.call in wxs
+function call(fn, args) {
+  if (args.length === 2) {
+    return fn(args[0], args[1]);
+  }
+
+  if (args.length === 1) {
+    return fn(args[0]);
+  }
+
+  return fn();
+}
+
+function serializer(args) {
+  if (args.length === 1 && isPrimitive(args[0])) {
+    return args[0];
+  }
+  var obj = {};
+  for (var i = 0; i < args.length; i++) {
+    obj['key' + i] = args[i];
+  }
+  return JSON.stringify(obj);
+}
+
+function memoize(fn) {
+  var cache = {};
+
+  return function() {
+    var key = serializer(arguments);
+    if (cache[key] === undefined) {
+      cache[key] = call(fn, arguments);
+    }
+
+    return cache[key];
+  };
+}
+
+module.exports.memoize = memoize;
diff --git a/miniprogram/components/@mkl/wxs/object.wxs b/miniprogram/components/@mkl/wxs/object.wxs
new file mode 100644
index 0000000..e077107
--- /dev/null
+++ b/miniprogram/components/@mkl/wxs/object.wxs
@@ -0,0 +1,13 @@
+/* eslint-disable */
+var REGEXP = getRegExp('{|}|"', 'g');
+
+function keys(obj) {
+  return JSON.stringify(obj)
+    .replace(REGEXP, '')
+    .split(',')
+    .map(function(item) {
+      return item.split(':')[0];
+    });
+}
+
+module.exports.keys = keys;
diff --git a/miniprogram/components/@mkl/wxs/utils.wxs b/miniprogram/components/@mkl/wxs/utils.wxs
new file mode 100644
index 0000000..d5c9d8c
--- /dev/null
+++ b/miniprogram/components/@mkl/wxs/utils.wxs
@@ -0,0 +1,10 @@
+/* eslint-disable */
+var bem = require('./bem.wxs').bem;
+var memoize = require('./memoize.wxs').memoize;
+var addUnit = require('./add-unit.wxs').addUnit;
+
+module.exports = {
+  bem: memoize(bem),
+  memoize: memoize,
+  addUnit: addUnit
+};
diff --git a/miniprogram/components/chatroom/chatroom.js b/miniprogram/components/chatroom/chatroom.js
new file mode 100644
index 0000000..5e716b0
--- /dev/null
+++ b/miniprogram/components/chatroom/chatroom.js
@@ -0,0 +1,336 @@
+const FATAL_REBUILD_TOLERANCE = 10
+const SETDATA_SCROLL_TO_BOTTOM = {
+  scrollTop: 100000,
+  scrollWithAnimation: true,
+}
+
+Component({
+  properties: {
+    envId: String,
+    collection: String,
+    groupId: String,
+    groupName: String,
+    userInfo: Object,
+    onGetUserInfo: {
+      type: Function,
+    },
+    getOpenID: {
+      type: Function,
+    },
+  },
+
+  data: {
+    chats: [],
+    textInputValue: '',
+    openId: '',
+    scrollTop: 0,
+    scrollToMessage: '',
+    hasKeyboard: false,
+  },
+
+  methods: {
+    onGetUserInfo(e) {
+      this.properties.onGetUserInfo(e)
+    },
+
+    getOpenID() { 
+      return this.properties.getOpenID() 
+    },
+
+    mergeCommonCriteria(criteria) {
+      return {
+        groupId: this.data.groupId,
+        ...criteria,
+      }
+    },
+
+    async initRoom() {
+      this.try(async () => {
+        await this.initOpenID()
+
+        const { envId, collection } = this.properties
+        const db = this.db = wx.cloud.database({
+          env: envId,
+        })
+        const _ = db.command
+
+        const { data: initList } = await db.collection(collection).where(this.mergeCommonCriteria()).orderBy('sendTimeTS', 'desc').get()
+
+        console.log('init query chats', initList)
+
+        this.setData({
+          chats: initList.reverse(),
+          scrollTop: 10000,
+        })
+
+        this.initWatch(initList.length ? {
+          sendTimeTS: _.gt(initList[initList.length - 1].sendTimeTS),
+        } : {})
+      }, '初始化失败')
+    },
+
+    async initOpenID() {
+      return this.try(async () => {
+        const openId = await this.getOpenID()
+
+        this.setData({
+          openId,
+        })
+      }, '初始化 openId 失败')
+    },
+
+    async initWatch(criteria) {
+      this.try(() => {
+        const { collection } = this.properties
+        const db = this.db
+        const _ = db.command
+
+        console.warn(`开始监听`, criteria)
+        this.messageListener = db.collection(collection).where(this.mergeCommonCriteria(criteria)).watch({
+          onChange: this.onRealtimeMessageSnapshot.bind(this),
+          onError: e => {
+            if (!this.inited || this.fatalRebuildCount >= FATAL_REBUILD_TOLERANCE) {
+              this.showError(this.inited ? '监听错误，已断开' : '初始化监听失败', e, '重连', () => {
+                this.initWatch(this.data.chats.length ? {
+                  sendTimeTS: _.gt(this.data.chats[this.data.chats.length - 1].sendTimeTS),
+                } : {})
+              })
+            } else {
+              this.initWatch(this.data.chats.length ? {
+                sendTimeTS: _.gt(this.data.chats[this.data.chats.length - 1].sendTimeTS),
+              } : {})
+            }
+          },
+        })
+      }, '初始化监听失败')
+    },
+
+    onRealtimeMessageSnapshot(snapshot) {
+      console.warn(`收到消息`, snapshot)
+
+      if (snapshot.type === 'init') {
+        this.setData({
+          chats: [
+            ...this.data.chats,
+            ...[...snapshot.docs].sort((x, y) => x.sendTimeTS - y.sendTimeTS),
+          ],
+        })
+        this.scrollToBottom()
+        this.inited = true
+      } else {
+        let hasNewMessage = false
+        let hasOthersMessage = false
+        const chats = [...this.data.chats]
+        for (const docChange of snapshot.docChanges) {
+          switch (docChange.queueType) {
+            case 'enqueue': {
+              hasOthersMessage = docChange.doc._openid !== this.data.openId
+              const ind = chats.findIndex(chat => chat._id === docChange.doc._id)
+              if (ind > -1) {
+                if (chats[ind].msgType === 'image' && chats[ind].tempFilePath) {
+                  chats.splice(ind, 1, {
+                    ...docChange.doc,
+                    tempFilePath: chats[ind].tempFilePath,
+                  })
+                } else chats.splice(ind, 1, docChange.doc)
+              } else {
+                hasNewMessage = true
+                chats.push(docChange.doc)
+              }
+              break
+            }
+          }
+        }
+        this.setData({
+          chats: chats.sort((x, y) => x.sendTimeTS - y.sendTimeTS),
+        })
+        if (hasOthersMessage || hasNewMessage) {
+          this.scrollToBottom()
+        }
+      }
+    },
+
+    async onConfirmSendText(e) {
+      this.try(async () => {
+        if (!e.detail.value) {
+          return
+        }
+
+        const { collection } = this.properties
+        const db = this.db
+        const _ = db.command
+
+        const doc = {
+          _id: `${Math.random()}_${Date.now()}`,
+          groupId: this.data.groupId,
+          avatar: this.data.userInfo.avatarUrl,
+          nickName: this.data.userInfo.nickName,
+          msgType: 'text',
+          textContent: e.detail.value,
+          sendTime: new Date(),
+          sendTimeTS: Date.now(), // fallback
+        }
+
+        this.setData({
+          textInputValue: '',
+          chats: [
+            ...this.data.chats,
+            {
+              ...doc,
+              _openid: this.data.openId,
+              writeStatus: 'pending',
+            },
+          ],
+        })
+        this.scrollToBottom(true)
+
+        await db.collection(collection).add({
+          data: doc,
+        })
+
+        this.setData({
+          chats: this.data.chats.map(chat => {
+            if (chat._id === doc._id) {
+              return {
+                ...chat,
+                writeStatus: 'written',
+              }
+            } else return chat
+          }),
+        })
+      }, '发送文字失败')
+    },
+
+    async onChooseImage(e) {
+      wx.chooseImage({
+        count: 1,
+        sourceType: ['album', 'camera'],
+        success: async res => {
+          const { envId, collection } = this.properties
+          const doc = {
+            _id: `${Math.random()}_${Date.now()}`,
+            groupId: this.data.groupId,
+            avatar: this.data.userInfo.avatarUrl,
+            nickName: this.data.userInfo.nickName,
+            msgType: 'image',
+            sendTime: new Date(),
+            sendTimeTS: Date.now(), // fallback
+          }
+
+          this.setData({
+            chats: [
+              ...this.data.chats,
+              {
+                ...doc,
+                _openid: this.data.openId,
+                tempFilePath: res.tempFilePaths[0],
+                writeStatus: 0,
+              },
+            ]
+          })
+          this.scrollToBottom(true)
+
+          const uploadTask = wx.cloud.uploadFile({
+            cloudPath: `${this.data.openId}/${Math.random()}_${Date.now()}.${res.tempFilePaths[0].match(/\.(\w+)$/)[1]}`,
+            filePath: res.tempFilePaths[0],
+            config: {
+              env: envId,
+            },
+            success: res => {
+              this.try(async () => {
+                await this.db.collection(collection).add({
+                  data: {
+                    ...doc,
+                    imgFileID: res.fileID,
+                  },
+                })
+              }, '发送图片失败')
+            },
+            fail: e => {
+              this.showError('发送图片失败', e)
+            },
+          })
+
+          uploadTask.onProgressUpdate(({ progress }) => {
+            this.setData({
+              chats: this.data.chats.map(chat => {
+                if (chat._id === doc._id) {
+                  return {
+                    ...chat,
+                    writeStatus: progress,
+                  }
+                } else return chat
+              })
+            })
+          })
+        },
+      })
+    },
+
+    onMessageImageTap(e) {
+      wx.previewImage({
+        urls: [e.target.dataset.fileid],
+      })
+    },
+
+    scrollToBottom(force) {
+      if (force) {
+        console.log('force scroll to bottom')
+        this.setData(SETDATA_SCROLL_TO_BOTTOM)
+        return
+      }
+
+      this.createSelectorQuery().select('.body').boundingClientRect(bodyRect => {
+        this.createSelectorQuery().select(`.body`).scrollOffset(scroll => {
+          if (scroll.scrollTop + bodyRect.height * 3 > scroll.scrollHeight) {
+            console.log('should scroll to bottom')
+            this.setData(SETDATA_SCROLL_TO_BOTTOM)
+          }
+        }).exec()
+      }).exec()
+    },
+
+    async onScrollToUpper() {
+      if (this.db && this.data.chats.length) {
+        const { collection } = this.properties
+        const _ = this.db.command
+        const { data } = await this.db.collection(collection).where(this.mergeCommonCriteria({
+          sendTimeTS: _.lt(this.data.chats[0].sendTimeTS),
+        })).orderBy('sendTimeTS', 'desc').get()
+        this.data.chats.unshift(...data.reverse())
+        this.setData({
+          chats: this.data.chats,
+          scrollToMessage: `item-${data.length}`,
+          scrollWithAnimation: false,
+        })
+      }
+    },
+
+    async try(fn, title) {
+      try {
+        await fn()
+      } catch (e) {
+        this.showError(title, e)
+      }
+    },
+
+    showError(title, content, confirmText, confirmCallback) {
+      console.error(title, content)
+      wx.showModal({
+        title,
+        content: content.toString(),
+        showCancel: confirmText ? true : false,
+        confirmText,
+        success: res => {
+          res.confirm && confirmCallback()
+        },
+      })
+    },
+  },
+
+  ready() {
+    global.chatroom = this
+    this.initRoom()
+    this.fatalRebuildCount = 0
+  },
+})
diff --git a/miniprogram/components/chatroom/chatroom.json b/miniprogram/components/chatroom/chatroom.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/components/chatroom/chatroom.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/components/chatroom/chatroom.wxml b/miniprogram/components/chatroom/chatroom.wxml
new file mode 100644
index 0000000..056a44c
--- /dev/null
+++ b/miniprogram/components/chatroom/chatroom.wxml
@@ -0,0 +1,85 @@
+<view class="chatroom">
+  <view class="header">
+    <!-- display number of people in the room -->
+    <view class="left"></view>
+    <!-- room name -->
+    <view class="middle">{{groupName}}</view>
+    <!-- reserved -->
+    <view class="right"></view>
+  </view>
+
+  <!-- chats -->
+  <scroll-view 
+    class="body" 
+    scroll-y 
+    scroll-with-animation="{{scrollWithAnimation}}"
+    scroll-top="{{scrollTop}}" 
+    scroll-into-view="{{scrollToMessage}}"
+    bindscrolltoupper="onScrollToUpper"
+  >
+    <view 
+      wx:for="{{chats}}"
+      wx:key="{{item._id}}"
+      id="item-{{index}}"
+      class="message {{openId == item._openid ? 'message__self' : ''}}"
+    >
+      <image 
+        class="avatar"
+        src="{{item.avatar}}"
+        mode="scaleToFill"
+      ></image> 
+      <view class="main">
+        <view class="nickname">{{item.nickName}}</view>
+        <block wx:if="{{item.msgType === 'image'}}">
+          <view class="image-wrapper">
+            <view class="loading" wx:if="{{item.writeStatus > -1}}">{{item.writeStatus}}%</view>
+            <image 
+              src="{{item.tempFilePath || item.imgFileID}}" 
+              data-fileid="{{item.tempFilePath || item.imgFileID}}" 
+              class="image-content" 
+              style="{{item.imgStyle}}"
+              mode="scallToFill" 
+              bindtap="onMessageImageTap"></image>
+          </view>
+        </block>
+        <block wx:else>
+          <view class="text-wrapper">
+            <view class="loading" wx:if="{{item.writeStatus === 'pending'}}">···</view>
+            <view class="text-content">{{item.textContent}}</view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </scroll-view>
+
+  <!-- message sender -->
+  <view class="footer">
+    <view class="message-sender" wx:if="{{userInfo}}">
+      <input 
+        class="text-input"
+        type="text"
+        confirm-type="send"
+        bindconfirm="onConfirmSendText"
+        cursor-spacing="20"
+        value="{{textInputValue}}"
+      ></input>
+
+      <image 
+        src="./photo.png" 
+        class="btn-send-image" 
+        mode="scaleToFill"
+        bindtap="onChooseImage"
+      ></image>
+    </view>
+
+    <view class="message-sender" wx:if="{{!userInfo}}">
+      <button 
+        open-type="getUserInfo" 
+        bindgetuserinfo="onGetUserInfo"
+        class="userinfo"
+      >请先登录后参与聊天</button>
+    </view>
+  </view>
+
+</view>
+
diff --git a/miniprogram/components/chatroom/chatroom.wxss b/miniprogram/components/chatroom/chatroom.wxss
new file mode 100644
index 0000000..d726127
--- /dev/null
+++ b/miniprogram/components/chatroom/chatroom.wxss
@@ -0,0 +1,161 @@
+.chatroom {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.chatroom .header {
+  flex-basis: fit-content;
+  display: flex;
+  flex-direction: row;
+  border-bottom: 1px solid #ddd;
+  padding: 20rpx 0 30rpx;
+  font-size: 30rpx;
+  /* background: rgb(34, 187, 47);
+  color: rgba(255, 255, 255, 1) */
+  /* font-family: 'Microsoft YaHei' */
+}
+
+.chatroom .header .left {
+  flex: 1;
+}
+
+.chatroom .header .middle {
+  flex: 2;
+  text-align: center;
+}
+
+.chatroom .header .right {
+  flex: 1;
+}
+
+.chatroom .body {
+  flex: 2;
+  display: flex;
+  flex-direction: column;
+  background: rgb(237,237,237);
+  padding-bottom: 16rpx;
+}
+
+.body .message {
+  display: flex;
+  flex-direction: row;
+  position: relative;
+  margin: 12rpx 0;
+}
+
+.body .message.message__self {
+  flex-direction: row-reverse;
+}
+
+.body .message .avatar {
+  position: relative;
+  top: 5rpx;
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 5rpx;
+  margin: 15rpx;
+}
+
+.body .message .main {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.body .message.message__self .main {
+  align-items: flex-end;
+}
+
+.body .message .nickname {
+  font-size: 24rpx;
+  color: #444;
+}
+
+.body .message .text-content {
+  border: 1px solid transparent;
+  border-radius: 3px;
+  background-color: #fff;
+  margin: 2px 0 0 0;
+  padding: 4px 10px;
+  font-size: 30rpx;
+  display: inline-block;
+}
+
+.body .message.message__self .text-content {
+  background-color: paleturquoise;
+}
+
+.body .message .text-wrapper {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  max-width: 80%;
+}
+
+.body .message.message__self .text-wrapper .loading{
+  font-size: 16rpx;
+  margin-right: 18rpx;
+}
+
+.body .message .image-wrapper {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.body .message .image-content {
+  max-width: 240rpx;
+  max-height: 240rpx;
+}
+
+.body .message.message__self .image-wrapper .loading {
+  font-size: 20rpx;
+  margin-right: 18rpx;
+}
+
+.chatroom .footer {
+  flex-basis: fit-content;
+  display: flex;
+  flex-direction: row;
+  border-top: 1px solid #ddd;
+  font-size: 10rpx;
+  padding: 20rpx 30rpx;
+  background: rgb(246,246,246);
+}
+
+.chatroom .footer .message-sender {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+}
+
+.message-sender .text-input {
+  flex: 1;
+  font-size: 16px;
+  border: 1px solid transparent;
+  border-radius: 5px;
+  padding: 3px 6px;
+  margin: 0 10px 0 5px;
+  background: #fff;
+}
+
+.message-sender .btn-send-image {
+  width: 50rpx;
+  height: 50rpx;
+  align-self: center;
+}
+
+button {
+  font-size: 30rpx;
+}
+
+button.userinfo {
+  background: darkturquoise;
+  color: aliceblue;
+  padding: 0 100rpx;
+  border: 1px solid #ddd;
+  border-radius: 20px;
+}
diff --git a/miniprogram/components/chatroom/photo.png b/miniprogram/components/chatroom/photo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddc4f34e37a9ce66476da8f57d3e97fdc4ec7136
GIT binary patch
literal 3692
zcmdtlYgiLk8UWy#@t{M3I-?LSQcVI1BA0jt6qX?&AgB=KE~ub_)(b>IK}9&EhzO{7
zs~13GwN@=+L|mkD8EQ4HVoe`y)hZ+k3R)DjA}Ar*lkWc6Kl^OE|28LizB%Xp&Y7Gq
zlX;R|ve2NB96Jt%VIza*1}wrb0v!?<IShqsryajXVOW|tID#a}M^D0ZsB12t8=HpG
z@0(t@*ts+l4cewlW75M@lhZR2Hzr{j85!=MrmRg{ktk1cPu;kx^tF#2N_rrhA0agw
zjp*?I?{UL#Iv?#SD1A|AIEI@I=WuB&Tl+~)E>qk@vpl_h{g{Bcp|Z%>gk*Wz=8XKE
zyNXK=A1ynsJbg}esfqpehFbIUFZUm6pFMy1>i53>4<GeIhQaXtM=;FdQgDEOMCPxr
z%6E&yqwS<8ES*Iqvz<$(<t-NIEk6?;<rJT8!8(VutJhujD-7Ac?Z^ICJ&!MsXHPx;
z`I2X8N83@`KUr;&lmFNL82IZA&IY<soK0FIj#Jowe8LF=0$pzZMPskDc=)xowfb$@
zFx75Jz0X5!Yj(BIUTl5hGj()Ee@<^kXIM0)+?qVWciYgj2?h_p?S4g=)uj#cKFuBD
z%Y<RLOVUtQ{h(L*1qWtF<?%f^Q!d<%1ZRrBY=0D-@_h5Q`aI0)qAJ7p#gM+LpGPTq
zv$UaU^VGGaq-;b(>5G(?Tkc9A=g6F6hQ_L(G?FU6erZz1d*8SK_@HvhtgE%ZKeHnO
zlGomQ_qy$*8z8fWQo~oI)KdKJ4}KxGHs=M5#*lHeT3%Ox337~c<{kAal|X3!<vM!-
z!wz|L9?0HGQoC=LmJyHF2^m*j+v&>sB@C2xf7#M4U>rZMO5@5K@~~X5(1+fE(5tfT
zxwUSy75=UK7)M@+EsP11#soor*<o5|k1tp4<6O+e1YXV)S)2$+cz^C77JaFYt9fYd
z!JdpL4nl{<9>0^^-pVrU&N*vcspktnt(moMlQ+IJ+JotDos&7!`s2q7rxca<+*w_1
zt=wiY{A!|E=Hfc6$T&FUo9C|RoM`5CAs&vNaI!ESboPXB<etlFv1_AKg>pJRR2o~g
z82(t%BTS*Q;-jEbBs$}7>+{?ckCMzDRK>#7HvOyZ0d9(`sCzyZzSe4k?g_6fi-JSP
z%xtpW1uA&W2das(2v>F|&CjH>7DmCtR$O_{)d)e6P8y55yYLb+dl~{<6(_5S;+Iy+
zG^43QmL!6Lc(4oFJ1{!oT=SNx1aMdA?T#dYf;eEScw3Am7V*R7r)mBgx?`_@T_99S
zOZ-N3+TjYG|KF(n>p?**_%Ju7k>)4U9g-6t0%3`?Wbcku_PCJe-)OUc10YetnwT3j
ze>vT8>x6d@gwm1=J6C;zKeh5tq4s5ff@m;0#9a2mZTWbcKL*Df`eU$eL3|s{kEc5V
z_Z<y_a%oB2_2lvR7ibo*d<!6>LEVz9=QMvY-H}Vz1;N$QlAs$M<8g(R|9HDY+W{E`
zwycYP{YOIczJDdCd4pQVK)U0}PY;7&g0w`fUNr&DXuj;~$+bCuJ7Nlx^RgnOSa{`7
z;+V$PV`rn_52lsnU%#;x9qaz69;1Au8!>hz9l!R$F!%e(sH&Qdps^ic*NS#$TYJTo
zosEGn0^#Z$yW?wBBkUI#Dr|z`>A2W~cgXjr<9DQP4X=-J#Pb($7om}q(7wYbYD=eY
z;%YwKI@F#OyD~BL>75brJ#H-#?o87~EVprHeY($2j`D5wGoEp;)5;%6>O5(<@e)*6
z`YtK|nDms?EbuN!A3V}GwaG)?*rt;{B}Ly0naV*j#olM2q5132b_aUUfiT~JsTU3$
ze;9P9aib9~%l?@C_b1#un*V4-^3zt?R&-0Ks5@}4^~2pm7RF2)JiiW*A6D-B@J#*a
z>Y$T{d*I2U!%l-&ABBD1`MdtsLeO<8>$~h<<jG%<nmf)+_o|V#;n3BAxhE{Z&=tZ;
zRj&w(w;XC9_S!2;{(X|6EnFCnq@6-kjKpl*S&@rYAY`DO)OZLmsi+v+5`+~dc;Vli
zr7W9m2#XMNG)2G|XehJ^flFORNJS94ra)8r%(_l}(ancfu%T+Arh&Z4m8}6vayYFl
z4Y~VT=<LBNuVAm-6)y=(dvqciblJumqpbZm;rTqGrj9J+YJz9g)S9B_7-fT076+d?
zV5U&@urGBzeUF!r;KalgDQmDv4$Li6Y*=|yKoppZYOIupq_SAJ=S^Q~5*@))rn)iX
zij*o06}QL~TRT_*@jWT(rIeebvS{oPt-OpPT>ADzk|~}zfVoXkR1@j@$L%Efd`24v
zqpbWRai2gK#Y6F%9}e(L{oz$a%^9+gqnkn0s8H0*YePH!3X^2uzb*nZ&AJ?O<`?Q}
z{frP>?f{c$y}IdcsT64JaEl^cQ}*_Lmpe4G4yardT7%vYnayAqY4$YPILDxEA4e1t
zSN38&X>WhK(HG^d2hK}@(aSI-VHUy@d$1jax(anu4oPw}!6DrTeGRP=Mg|)XVjqfh
zYIRcv*=5e3Mp#Z!RM;Ea1WG5ybJxCFvTcr`T*8FG++&z`k*;%3j+QDJ%d7&<GT^sO
zKbQ~8FyDsXD$bMHPX;nZ;@)_^g6Np6SoSxAuY_3uL-#vMX#LGMJ+{Oe;@wQM)k{Is
zR{flOcm!MHz*GqbG;eyWiRDCk<b|9|!U5esdloCrRxbi-FGH)CnTMgT#|GNIXP}>h
zyWv}dk6zoaZi*&Xn~M(e63z*|-oNRwBo-0rH5ZJQQu+RNtrIu}x{A1>4Rl%8K)*RY
z5l;_-lZ$kD>ZW<5v$<x$NBhrx48CF}82V%Q4G%@Qy>YyN?+D+Kra3PMGDuv2Z=DQQ
zST%pTH)oKd#w6HC;D$ooJ$2J|vWwINFZ6QF)R*prd$1u9;Ufd3pBR4;@EsUPC)5ic
z^bXXH!fo+yCR58MD|YYAX{So)1S%MM@S5$_P3y@sB((x$o*|RH4eKS06fWi52(4?^
z&Hxd>CUC4Sn{LU_$K}HUtlV->SW&`_cI`9}0J_v;bq9n;`UX5L@R7K1H&)@MsN0)!
zmC{hkQgL;7_dqQd!SJbO11CwIm*KXU5yRCEtXisSd6Q~Ij3M4FifFTH7OR^g$+@J+
zVhS_cb+dll4yeG&L5e`hXDV)WTN4EFoju-?xwHXW;$FQ1{oEDl?9d0+ge3;S*<yAX
z93TB)I?$WhY|QnQuuHH&OiRhFA<cS%db0!|ABCslHh7tYjYHH)$$5z8fHFkAqwrOT
z>LqM6qJFB^3Xv~}H_>Q38j)VYMj|p&y_S$>_`nAdMdD$IfS6r~Xa^-XkpSpH0w^JI
zKSYjVHVn}&N<J2m19*%`L*kx@W{BB&i1tyvV-PulGDI?S+zC;Hm<>jBi0Y*gO#)e_
z1<mmZh*pYODWY;pZXze(gNWkbqY>qaSqY*Ol$=5|8Q7Z^<lrL^9Tc-m5uK$}s2Yq5
zXhCmY!@<)K)ri@6MCU0Lss`f<Doy+1;%gCoCuU<1U8Y1Pas%rSm2mMmL>*!_3Q-*;
zLWN>Hz<kq!Ts$1nJ2ATmQ8T47RYL?U5XmfX2_j1gD?@ahQkkkT4Ro9KWr5E@<S1e1
zBf3qAOf(%-n)WpkpMoer!iFIFi4vI#H4_w@_B9fBKolWi0}(x>RHkao0`n1RM&e@;
zrAycVM6Hy{R1GiSYFcm<&P9|bVHrfvD3OW0!A&kp@;@P-nYK47_bnkJ=I&%Rpu`#p
zy0I5yzY1ig61}2SHVVcDFxdb2WUzm4t9N2DPZDB(y-|`s`S$@6bsC-heUeql;gd~M
NgQcMXRpJE2KL9|q)@=X)

literal 0
HcmV?d00001

diff --git a/miniprogram/ec-canvas/ec-canvas.js b/miniprogram/ec-canvas/ec-canvas.js
new file mode 100644
index 0000000..37ff834
--- /dev/null
+++ b/miniprogram/ec-canvas/ec-canvas.js
@@ -0,0 +1,250 @@
+import WxCanvas from './wx-canvas';
+import * as echarts from './echarts';
+
+let ctx;
+
+function compareVersion(v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+  return 0
+}
+
+Component({
+  properties: {
+    canvasId: {
+      type: String,
+      value: 'ec-canvas'
+    },
+
+    ec: {
+      type: Object
+    },
+
+    forceUseOldCanvas: {
+      type: Boolean,
+      value: false
+    }
+  },
+
+  data: {
+    isUseNewCanvas: false
+  },
+
+  ready: function () {
+    // Disable prograssive because drawImage doesn't support DOM as parameter
+    // See https://developers.weixin.qq.com/miniprogram/dev/api/canvas/CanvasContext.drawImage.html
+    echarts.registerPreprocessor(option => {
+      if (option && option.series) {
+        if (option.series.length > 0) {
+          option.series.forEach(series => {
+            series.progressive = 0;
+          });
+        }
+        else if (typeof option.series === 'object') {
+          option.series.progressive = 0;
+        }
+      }
+    });
+
+    if (!this.data.ec) {
+      console.warn('组件需绑定 ec 变量，例：<ec-canvas id="mychart-dom-bar" '
+        + 'canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>');
+      return;
+    }
+
+    if (!this.data.ec.lazyLoad) {
+      this.init();
+    }
+  },
+
+  methods: {
+    init: function (callback) {
+      const version = wx.getSystemInfoSync().SDKVersion
+
+      const canUseNewCanvas = compareVersion(version, '2.9.0') >= 0;
+      const forceUseOldCanvas = this.data.forceUseOldCanvas;
+      const isUseNewCanvas = canUseNewCanvas && !forceUseOldCanvas;
+      this.setData({ isUseNewCanvas });
+
+      if (forceUseOldCanvas && canUseNewCanvas) {
+        console.warn('开发者强制使用旧canvas,建议关闭');
+      }
+
+      if (isUseNewCanvas) {
+        // console.log('微信基础库版本大于2.9.0，开始使用<canvas type="2d"/>');
+        // 2.9.0 可以使用 <canvas type="2d"></canvas>
+        this.initByNewWay(callback);
+      } else {
+        const isValid = compareVersion(version, '1.9.91') >= 0
+        if (!isValid) {
+          console.error('微信基础库版本过低，需大于等于 1.9.91。'
+            + '参见：https://github.com/ecomfe/echarts-for-weixin'
+            + '#%E5%BE%AE%E4%BF%A1%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82');
+          return;
+        } else {
+          console.warn('建议将微信基础库调整大于等于2.9.0版本。升级后绘图将有更好性能');
+          this.initByOldWay(callback);
+        }
+      }
+    },
+
+    initByOldWay(callback) {
+      // 1.9.91 <= version < 2.9.0：原来的方式初始化
+      ctx = wx.createCanvasContext(this.data.canvasId, this);
+      const canvas = new WxCanvas(ctx, this.data.canvasId, false);
+
+      echarts.setCanvasCreator(() => {
+        return canvas;
+      });
+      // const canvasDpr = wx.getSystemInfoSync().pixelRatio // 微信旧的canvas不能传入dpr
+      const canvasDpr = 1
+      var query = wx.createSelectorQuery().in(this);
+      query.select('.ec-canvas').boundingClientRect(res => {
+        if (typeof callback === 'function') {
+          this.chart = callback(canvas, res.width, res.height, canvasDpr);
+        }
+        else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
+          this.chart = this.data.ec.onInit(canvas, res.width, res.height, canvasDpr);
+        }
+        else {
+          this.triggerEvent('init', {
+            canvas: canvas,
+            width: res.width,
+            height: res.height,
+            canvasDpr: canvasDpr // 增加了dpr，可方便外面echarts.init
+          });
+        }
+      }).exec();
+    },
+
+    initByNewWay(callback) {
+      // version >= 2.9.0：使用新的方式初始化
+      const query = wx.createSelectorQuery().in(this)
+      query
+        .select('.ec-canvas')
+        .fields({ node: true, size: true })
+        .exec(res => {
+          const canvasNode = res[0].node
+          this.canvasNode = canvasNode
+
+          const canvasDpr = wx.getSystemInfoSync().pixelRatio
+          const canvasWidth = res[0].width
+          const canvasHeight = res[0].height
+
+          const ctx = canvasNode.getContext('2d')
+
+          const canvas = new WxCanvas(ctx, this.data.canvasId, true, canvasNode)
+          echarts.setCanvasCreator(() => {
+            return canvas
+          })
+
+          if (typeof callback === 'function') {
+            this.chart = callback(canvas, canvasWidth, canvasHeight, canvasDpr)
+          } else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
+            this.chart = this.data.ec.onInit(canvas, canvasWidth, canvasHeight, canvasDpr)
+          } else {
+            this.triggerEvent('init', {
+              canvas: canvas,
+              width: canvasWidth,
+              height: canvasHeight,
+              dpr: canvasDpr
+            })
+          }
+        })
+    },
+    canvasToTempFilePath(opt) {
+      if (this.data.isUseNewCanvas) {
+        // 新版
+        const query = wx.createSelectorQuery().in(this)
+        query
+          .select('.ec-canvas')
+          .fields({ node: true, size: true })
+          .exec(res => {
+            const canvasNode = res[0].node
+            opt.canvas = canvasNode
+            wx.canvasToTempFilePath(opt)
+          })
+      } else {
+        // 旧的
+        if (!opt.canvasId) {
+          opt.canvasId = this.data.canvasId;
+        }
+        ctx.draw(true, () => {
+          wx.canvasToTempFilePath(opt, this);
+        });
+      }
+    },
+
+    touchStart(e) {
+      if (this.chart && e.touches.length > 0) {
+        var touch = e.touches[0];
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mousedown', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.dispatch('mousemove', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.processGesture(wrapTouch(e), 'start');
+      }
+    },
+
+    touchMove(e) {
+      if (this.chart && e.touches.length > 0) {
+        var touch = e.touches[0];
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mousemove', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.processGesture(wrapTouch(e), 'change');
+      }
+    },
+
+    touchEnd(e) {
+      if (this.chart) {
+        const touch = e.changedTouches ? e.changedTouches[0] : {};
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mouseup', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.dispatch('click', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.processGesture(wrapTouch(e), 'end');
+      }
+    }
+  }
+});
+
+function wrapTouch(event) {
+  for (let i = 0; i < event.touches.length; ++i) {
+    const touch = event.touches[i];
+    touch.offsetX = touch.x;
+    touch.offsetY = touch.y;
+  }
+  return event;
+}
diff --git a/miniprogram/ec-canvas/ec-canvas.json b/miniprogram/ec-canvas/ec-canvas.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/ec-canvas/ec-canvas.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/ec-canvas/ec-canvas.wxml b/miniprogram/ec-canvas/ec-canvas.wxml
new file mode 100644
index 0000000..88826d9
--- /dev/null
+++ b/miniprogram/ec-canvas/ec-canvas.wxml
@@ -0,0 +1,4 @@
+<!-- 新的：接口对其了H5 -->
+<canvas wx:if="{{isUseNewCanvas}}" type="2d" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
+<!-- 旧的 -->
+<canvas wx:else class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
diff --git a/miniprogram/ec-canvas/ec-canvas.wxss b/miniprogram/ec-canvas/ec-canvas.wxss
new file mode 100644
index 0000000..0d64b10
--- /dev/null
+++ b/miniprogram/ec-canvas/ec-canvas.wxss
@@ -0,0 +1,4 @@
+.ec-canvas {
+  width: 100%;
+  height: 100%;
+}
diff --git a/miniprogram/ec-canvas/echarts.js b/miniprogram/ec-canvas/echarts.js
new file mode 100644
index 0000000..68264a5
--- /dev/null
+++ b/miniprogram/ec-canvas/echarts.js
@@ -0,0 +1,22 @@
+
+/*
+* 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.
+*/
+
+
+!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";var e=2311,n=function(){return e++},v="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0,domSupported:!1}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasSupported:!0,domSupported:!1}:"undefined"==typeof navigator?{browser:{},os:{},node:!0,worker:!1,canvasSupported:!0,svgSupported:!0,domSupported:!1}:function(t){var e={},i=t.match(/Firefox\/([\d.]+)/),n=t.match(/MSIE\s([\d.]+)/)||t.match(/Trident\/.+?rv:(([\d.]+))/),o=t.match(/Edge\/([\d.]+)/),a=/micromessenger/i.test(t);i&&(e.firefox=!0,e.version=i[1]);n&&(e.ie=!0,e.version=n[1]);o&&(e.edge=!0,e.version=o[1]);a&&(e.weChat=!0);return{browser:e,os:{},node:!1,canvasSupported:!!document.createElement("canvas").getContext,svgSupported:"undefined"!=typeof SVGRect,touchEventsSupported:"ontouchstart"in window&&!e.ie&&!e.edge,pointerEventsSupported:"onpointerdown"in window&&(e.edge||e.ie&&11<=e.version),domSupported:"undefined"!=typeof document}}(navigator.userAgent);var s={"[object Function]":1,"[object RegExp]":1,"[object Date]":1,"[object Error]":1,"[object CanvasGradient]":1,"[object CanvasPattern]":1,"[object Image]":1,"[object Canvas]":1},l={"[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},u=Object.prototype.toString,i=Array.prototype,r=i.forEach,h=i.filter,o=i.slice,c=i.map,d=i.reduce,a={};function f(t,e){"createCanvas"===t&&(y=null),a[t]=e}function D(t){if(null==t||"object"!=typeof t)return t;var e=t,i=u.call(t);if("[object Array]"===i){if(!$(t)){e=[];for(var n=0,o=t.length;n<o;n++)e[n]=D(t[n])}}else if(l[i]){if(!$(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a(t.length);for(n=0,o=t.length;n<o;n++)e[n]=D(t[n])}}}else if(!s[i]&&!$(t)&&!G(t))for(var r in e={},t)t.hasOwnProperty(r)&&(e[r]=D(t[r]));return e}function m(t,e,i){if(!R(e)||!R(t))return i?D(e):t;for(var n in e)if(e.hasOwnProperty(n)){var o=t[n],a=e[n];!R(a)||!R(o)||k(a)||k(o)||G(a)||G(o)||B(a)||B(o)||$(a)||$(o)?!i&&n in t||(t[n]=D(e[n])):m(o,a,i)}return t}function p(t,e){for(var i=t[0],n=1,o=t.length;n<o;n++)i=m(i,t[n],e);return i}function L(t,e){for(var i in e)e.hasOwnProperty(i)&&(t[i]=e[i]);return t}function C(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 g(){return a.createCanvas()}var y;function x(){return y=y||g().getContext("2d")}function _(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 w(t,e){var i=t.prototype;function n(){}for(var o in n.prototype=e.prototype,t.prototype=new n,i)i.hasOwnProperty(o)&&(t.prototype[o]=i[o]);(t.prototype.constructor=t).superClass=e}function b(t,e,i){C(t="prototype"in t?t.prototype:t,e="prototype"in e?e.prototype:e,i)}function P(t){if(t)return"string"!=typeof t&&"number"==typeof t.length}function E(t,e,i){if(t&&e)if(t.forEach&&t.forEach===r)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 N(t,e,i){if(t&&e){if(t.map&&t.map===c)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 S(t,e,i,n){if(t&&e){if(t.reduce&&t.reduce===d)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 M(t,e,i){if(t&&e){if(t.filter&&t.filter===h)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 I(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]}function A(t,e){var i=o.call(arguments,2);return function(){return t.apply(e,i.concat(o.call(arguments)))}}function T(t){var e=o.call(arguments,1);return function(){return t.apply(this,e.concat(o.call(arguments)))}}function k(t){return"[object Array]"===u.call(t)}function O(t){return"function"==typeof t}function z(t){return"[object String]"===u.call(t)}function R(t){var e=typeof t;return"function"==e||!!t&&"object"==e}function B(t){return!!s[u.call(t)]}function V(t){return!!l[u.call(t)]}function G(t){return"object"==typeof t&&"number"==typeof t.nodeType&&"object"==typeof t.ownerDocument}function F(t){return t!=t}function W(t){for(var e=0,i=arguments.length;e<i;e++)if(null!=arguments[e])return arguments[e]}function H(t,e){return null!=t?t:e}function Z(t,e,i){return null!=t?t:null!=e?e:i}function U(){return Function.call.apply(o,arguments)}function X(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 Y(t,e){if(!t)throw new Error(e)}function j(t){return null==t?null:"function"==typeof t.trim?t.trim():t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}a.createCanvas=function(){return document.createElement("canvas")};var q="__ec_primitive__";function K(t){t[q]=!0}function $(t){return t[q]}function J(t){var i=k(t);this.data={};var n=this;function e(t,e){i?n.set(t,e):n.set(e,t)}t instanceof J?t.each(e):t&&E(t,e)}function Q(t){return new J(t)}function tt(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 et(){}J.prototype={constructor:J,get:function(t){return this.data.hasOwnProperty(t)?this.data[t]:null},set:function(t,e){return this.data[t]=e},each:function(t,e){for(var i in void 0!==e&&(t=A(t,e)),this.data)this.data.hasOwnProperty(i)&&t(this.data[i],i)},removeKey:function(t){delete this.data[t]}};var it=(Object.freeze||Object)({$override:f,clone:D,merge:m,mergeAll:p,extend:L,defaults:C,createCanvas:g,getContext:x,indexOf:_,inherits:w,mixin:b,isArrayLike:P,each:E,map:N,reduce:S,filter:M,find:I,bind:A,curry:T,isArray:k,isFunction:O,isString:z,isObject:R,isBuiltInObject:B,isTypedArray:V,isDom:G,eqNaN:F,retrieve:W,retrieve2:H,retrieve3:Z,slice:U,normalizeCssArray:X,assert:Y,trim:j,setAsPrimitive:K,isPrimitive:$,createHashMap:Q,concatArray:tt,noop:et}),nt="undefined"==typeof Float32Array?Array:Float32Array;function ot(t,e){var i=new nt(2);return null==t&&(t=0),null==e&&(e=0),i[0]=t,i[1]=e,i}function at(t,e){return t[0]=e[0],t[1]=e[1],t}function rt(t){var e=new nt(2);return e[0]=t[0],e[1]=t[1],e}function st(t,e,i){return t[0]=e,t[1]=i,t}function lt(t,e,i){return t[0]=e[0]+i[0],t[1]=e[1]+i[1],t}function ut(t,e,i,n){return t[0]=e[0]+i[0]*n,t[1]=e[1]+i[1]*n,t}function ht(t,e,i){return t[0]=e[0]-i[0],t[1]=e[1]-i[1],t}function ct(t){return Math.sqrt(ft(t))}var dt=ct;function ft(t){return t[0]*t[0]+t[1]*t[1]}var pt=ft;function gt(t,e,i){return t[0]=e[0]*i,t[1]=e[1]*i,t}function mt(t,e){var i=ct(e);return 0===i?(t[0]=0,t[1]=0):(t[0]=e[0]/i,t[1]=e[1]/i),t}function vt(t,e){return Math.sqrt((t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1]))}var yt=vt;function xt(t,e){return(t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1])}var _t=xt;function wt(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 bt(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 St(t,e,i){return t[0]=Math.min(e[0],i[0]),t[1]=Math.min(e[1],i[1]),t}function Mt(t,e,i){return t[0]=Math.max(e[0],i[0]),t[1]=Math.max(e[1],i[1]),t}var It=(Object.freeze||Object)({create:ot,copy:at,clone:rt,set:st,add:lt,scaleAndAdd:ut,sub:ht,len:ct,length:dt,lenSquare:ft,lengthSquare:pt,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:gt,normalize:mt,distance:vt,dist:yt,distanceSquare:xt,distSquare:_t,negate:function(t,e){return t[0]=-e[0],t[1]=-e[1],t},lerp:wt,applyTransform:bt,min:St,max:Mt});function Tt(){this.on("mousedown",this._dragStart,this),this.on("mousemove",this._drag,this),this.on("mouseup",this._dragEnd,this)}function At(t,e){return{target:t,topTarget:e&&e.topTarget}}Tt.prototype={constructor:Tt,_dragStart:function(t){var e=t.target;e&&e.draggable&&((this._draggingTarget=e).dragging=!0,this._x=t.offsetX,this._y=t.offsetY,this.dispatchToElement(At(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(At(e,t),"drag",t.event);var r=this.findHover(i,n,e).target,s=this._dropTarget;e!==(this._dropTarget=r)&&(s&&r!==s&&this.dispatchToElement(At(s,t),"dragleave",t.event),r&&r!==s&&this.dispatchToElement(At(r,t),"dragenter",t.event))}},_dragEnd:function(t){var e=this._draggingTarget;e&&(e.dragging=!1),this.dispatchToElement(At(e,t),"dragend",t.event),this._dropTarget&&this.dispatchToElement(At(this._dropTarget,t),"drop",t.event),this._draggingTarget=null,this._dropTarget=null}};var Dt=Array.prototype.slice,Ct=function(t){this._$handlers={},this._$eventProcessor=t};function Lt(t,e,i,n,o,a){var r=t._$handlers;if("function"==typeof i&&(o=n,n=i,i=null),!n||!e)return t;i=function(t,e){var i=t._$eventProcessor;return null!=e&&i&&i.normalizeQuery&&(e=i.normalizeQuery(e)),e}(t,i),r[e]||(r[e]=[]);for(var s=0;s<r[e].length;s++)if(r[e][s].h===n)return t;var l={h:n,one:a,query:i,ctx:o||t,callAtLast:n.zrEventfulCallAtLast},u=r[e].length-1,h=r[e][u];return h&&h.callAtLast?r[e].splice(u,0,l):r[e].push(l),t}Ct.prototype={constructor:Ct,one:function(t,e,i,n){return Lt(this,t,e,i,n,!0)},on:function(t,e,i,n){return Lt(this,t,e,i,n,!1)},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){var e=this._$handlers[t],i=this._$eventProcessor;if(e){var n=arguments,o=n.length;3<o&&(n=Dt.call(n,1));for(var a=e.length,r=0;r<a;){var s=e[r];if(i&&i.filter&&null!=s.query&&!i.filter(t,s.query))r++;else{switch(o){case 1:s.h.call(s.ctx);break;case 2:s.h.call(s.ctx,n[1]);break;case 3:s.h.call(s.ctx,n[1],n[2]);break;default:s.h.apply(s.ctx,n)}s.one?(e.splice(r,1),a--):r++}}}return i&&i.afterTrigger&&i.afterTrigger(t),this},triggerWithContext:function(t){var e=this._$handlers[t],i=this._$eventProcessor;if(e){var n=arguments,o=n.length;4<o&&(n=Dt.call(n,1,n.length-1));for(var a=n[n.length-1],r=e.length,s=0;s<r;){var l=e[s];if(i&&i.filter&&null!=l.query&&!i.filter(t,l.query))s++;else{switch(o){case 1:l.h.call(a);break;case 2:l.h.call(a,n[1]);break;case 3:l.h.call(a,n[1],n[2]);break;default:l.h.apply(a,n)}l.one?(e.splice(s,1),r--):s++}}}return i&&i.afterTrigger&&i.afterTrigger(t),this}};var kt=Math.log(2);function Pt(t,e,i,n,o,a){var r=n+"-"+o,s=t.length;if(a.hasOwnProperty(r))return a[r];if(1===e){var l=Math.round(Math.log((1<<s)-1&~o)/kt);return t[i][l]}for(var u=n|1<<i,h=i+1;n&1<<h;)h++;for(var c=0,d=0,f=0;d<s;d++){var p=1<<d;p&o||(c+=(f%2?-1:1)*t[i][d]*Pt(t,e-1,h,u,o|p,a),f++)}return a[r]=c}var Nt="undefined"!=typeof window&&!!window.addEventListener,Ot=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Et="___zrEVENTSAVED",zt=[];function Rt(t,e,i,n){return i=i||{},n||!v.canvasSupported?Bt(t,e,i):v.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):Bt(t,e,i),i}function Bt(t,e,i){if(t.getBoundingClientRect&&v.domSupported){var n=e.clientX,o=e.clientY;if("CANVAS"===t.nodeName.toUpperCase()){var a=t.getBoundingClientRect();return i.zrX=n-a.left,void(i.zrY=o-a.top)}var r=t[Et]||(t[Et]={}),s=function(t,e){for(var i=e.transformer,n=e.srcCoords,o=!0,a=[],r=[],s=0;s<4;s++){var l=t[s].getBoundingClientRect(),u=2*s,h=l.left,c=l.top;a.push(h,c),o&=n&&h===n[u]&&c===n[1+u],r.push(t[s].offsetLeft,t[s].offsetTop)}return o?i:(e.srcCoords=a,e.transformer=function(t,e){var i=[[t[0],t[1],1,0,0,0,-e[0]*t[0],-e[0]*t[1]],[0,0,0,t[0],t[1],1,-e[1]*t[0],-e[1]*t[1]],[t[2],t[3],1,0,0,0,-e[2]*t[2],-e[2]*t[3]],[0,0,0,t[2],t[3],1,-e[3]*t[2],-e[3]*t[3]],[t[4],t[5],1,0,0,0,-e[4]*t[4],-e[4]*t[5]],[0,0,0,t[4],t[5],1,-e[5]*t[4],-e[5]*t[5]],[t[6],t[7],1,0,0,0,-e[6]*t[6],-e[6]*t[7]],[0,0,0,t[6],t[7],1,-e[7]*t[6],-e[7]*t[7]]],n={},o=Pt(i,8,0,0,0,n);if(0!==o){for(var a=[],r=0;r<8;r++)for(var s=0;s<8;s++)null==a[s]&&(a[s]=0),a[s]+=((r+s)%2?-1:1)*Pt(i,7,0===r?1:0,1<<r,1<<s,n)/o*e[r];return function(t,e,i){var n=e*a[6]+i*a[7]+1;t[0]=(e*a[0]+i*a[1]+a[2])/n,t[1]=(e*a[3]+i*a[4]+a[5])/n}}}(a,r))}(function(t,e){var i=e.markers;if(i)return i;i=e.markers=[];for(var n=["left","right"],o=["top","bottom"],a=0;a<4;a++){var r=document.createElement("div"),s=r.style,l=a%2,u=(a>>1)%2;s.cssText=["position:absolute","visibility: hidden","padding: 0","margin: 0","border-width: 0","width:0","height:0",n[l]+":0",o[u]+":0",n[1-l]+":auto",o[1-u]+":auto",""].join("!important;"),t.appendChild(r),i.push(r)}return i}(t,r),r);if(s)return s(zt,n,o),i.zrX=zt[0],void(i.zrY=zt[1])}i.zrX=i.zrY=0}function Vt(t){return t||window.event}function Gt(t,e,i){if(null!=(e=Vt(e)).zrX)return e;var n=e.type;if(n&&0<=n.indexOf("touch")){var o="touchend"!==n?e.targetTouches[0]:e.changedTouches[0];o&&Rt(t,o,e,i)}else Rt(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&&Ot.test(e.type)&&(e.which=1&a?1:2&a?3:4&a?2:0),e}function Ft(t,e,i,n){Nt?t.addEventListener(e,i,n):t.attachEvent("on"+e,i)}var Wt=Nt?function(t){t.preventDefault(),t.stopPropagation(),t.cancelBubble=!0}:function(t){t.returnValue=!1,t.cancelBubble=!0};function Ht(t){return 2===t.which||3===t.which}function Zt(){this._track=[]}function Ut(t){var e=t[1][0]-t[0][0],i=t[1][1]-t[0][1];return Math.sqrt(e*e+i*i)}Zt.prototype={constructor:Zt,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=Rt(i,s,{});o.points.push([l.zrX,l.zrY]),o.touches.push(s)}this._track.push(o)}},_recognize:function(t){for(var e in Xt)if(Xt.hasOwnProperty(e)){var i=Xt[e](this._track,t);if(i)return i}}};var Xt={pinch:function(t,e){var i=t.length;if(i){var n=(t[i-1]||{}).points,o=(t[i-2]||{}).points||n;if(o&&1<o.length&&n&&1<n.length){var a=Ut(n)/Ut(o);isFinite(a)||(a=1),e.pinchScale=a;var r=function(t){return[(t[0][0]+t[1][0])/2,(t[0][1]+t[1][1])/2]}(n);return e.pinchX=r[0],e.pinchY=r[1],{type:"pinch",target:t[0].target,event:e}}}}},Yt="silent";function jt(){Wt(this.event)}function qt(){}qt.prototype.dispose=function(){};function Kt(t,e,i,n){Ct.call(this),this.storage=t,this.painter=e,this.painterRoot=n,i=i||new qt,this.proxy=null,this._hovered={},this._lastTouchMoment,this._lastX,this._lastY,this._gestureMgr,Tt.call(this),this.setHandlerProxy(i)}var $t=["click","dblclick","mousewheel","mouseout","mouseup","mousedown","mousemove","contextmenu"];function Jt(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||Yt}return!1}function Qt(t,e,i){var n=t.painter;return e<0||e>n.getWidth()||i<0||i>n.getHeight()}Kt.prototype={constructor:Kt,setHandlerProxy:function(e){this.proxy&&this.proxy.dispose(),e&&(E($t,function(t){e.on&&e.on(t,this[t],this)},this),e.handler=this),this.proxy=e},mousemove:function(t){var e=t.zrX,i=t.zrY,n=Qt(this,e,i),o=this._hovered,a=o.target;a&&!a.__zr&&(a=(o=this.findHover(o.x,o.y)).target);var r=this._hovered=n?{x:e,y:i}:this.findHover(e,i),s=r.target,l=this.proxy;l.setCursor&&l.setCursor(s?s.cursor:"default"),a&&s!==a&&this.dispatchToElement(o,"mouseout",t),this.dispatchToElement(r,"mousemove",t),s&&s!==a&&this.dispatchToElement(r,"mouseover",t)},mouseout:function(t){var e=t.zrEventControl,i=t.zrIsToLocalDOM;"only_globalout"!==e&&this.dispatchToElement(this._hovered,"mouseout",t),"no_globalout"!==e&&(i||this.trigger("globalout",{type:"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=function(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,stop:jt}}(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;0<=a;a--){var r;if(n[a]!==i&&!n[a].ignore&&(r=Jt(n[a],t,e))&&(o.topTarget||(o.topTarget=n[a]),r!==Yt)){o.target=n[a];break}}return o},processGesture:function(t,e){this._gestureMgr||(this._gestureMgr=new Zt);var i=this._gestureMgr;"start"===e&&i.clear();var n=i.recognize(t,this.findHover(t.zrX,t.zrY,null).target,this.proxy.dom);if("end"===e&&i.clear(),n){var o=n.type;t.gestureEvent=o,this.dispatchToElement({target:n.target},o,n.event)}}},E(["click","mousedown","mouseup","mousewheel","dblclick","contextmenu"],function(r){Kt.prototype[r]=function(t){var e,i,n=t.zrX,o=t.zrY,a=Qt(this,n,o);if("mouseup"===r&&a||(i=(e=this.findHover(n,o)).target),"mousedown"===r)this._downEl=i,this._downPoint=[t.zrX,t.zrY],this._upEl=i;else if("mouseup"===r)this._upEl=i;else if("click"===r){if(this._downEl!==this._upEl||!this._downPoint||4<yt(this._downPoint,[t.zrX,t.zrY]))return;this._downPoint=null}this.dispatchToElement(e,r,t)}}),b(Kt,Ct),b(Kt,Tt);var te="undefined"==typeof Float32Array?Array:Float32Array;function ee(){var t=new te(6);return ie(t),t}function ie(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t}function ne(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 oe(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 ae(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 re(t,e,i){var n=e[0],o=e[2],a=e[4],r=e[1],s=e[3],l=e[5],u=Math.sin(i),h=Math.cos(i);return t[0]=n*h+r*u,t[1]=-n*u+r*h,t[2]=o*h+s*u,t[3]=-o*u+h*s,t[4]=h*a+u*l,t[5]=h*l-u*a,t}function se(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 le(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 ue(t){var e=ee();return ne(e,t),e}var he=(Object.freeze||Object)({create:ee,identity:ie,copy:ne,mul:oe,translate:ae,rotate:re,scale:se,invert:le,clone:ue}),ce=ie;function de(t){return 5e-5<t||t<-5e-5}var fe=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},pe=fe.prototype;pe.transform=null,pe.needLocalTransform=function(){return de(this.rotation)||de(this.position[0])||de(this.position[1])||de(this.scale[0]-1)||de(this.scale[1]-1)};var ge=[];pe.updateTransform=function(){var t=this.parent,e=t&&t.transform,i=this.needLocalTransform(),n=this.transform;if(i||e){n=n||ee(),i?this.getLocalTransform(n):ce(n),e&&(i?oe(n,t.transform,n):ne(n,t.transform)),this.transform=n;var o=this.globalScaleRatio;if(null!=o&&1!==o){this.getGlobalScale(ge);var a=ge[0]<0?-1:1,r=ge[1]<0?-1:1,s=((ge[0]-a)*o+a)/ge[0]||0,l=((ge[1]-r)*o+r)/ge[1]||0;n[0]*=s,n[1]*=s,n[2]*=l,n[3]*=l}this.invTransform=this.invTransform||ee(),le(this.invTransform,n)}else n&&ce(n)},pe.getLocalTransform=function(t){return fe.getLocalTransform(this,t)},pe.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)},pe.restoreTransform=function(t){var e=t.dpr||1;t.setTransform(e,0,0,e,0,0)};var me=[],ve=ee();pe.setLocalTransform=function(t){if(t){var e=t[0]*t[0]+t[1]*t[1],i=t[2]*t[2]+t[3]*t[3],n=this.position,o=this.scale;de(e-1)&&(e=Math.sqrt(e)),de(i-1)&&(i=Math.sqrt(i)),t[0]<0&&(e=-e),t[3]<0&&(i=-i),n[0]=t[4],n[1]=t[5],o[0]=e,o[1]=i,this.rotation=Math.atan2(-t[1]/i,t[0]/e)}},pe.decomposeTransform=function(){if(this.transform){var t=this.parent,e=this.transform;t&&t.transform&&(oe(me,t.invTransform,e),e=me);var i=this.origin;i&&(i[0]||i[1])&&(ve[4]=i[0],ve[5]=i[1],oe(me,e,ve),me[4]-=i[0],me[5]-=i[1],e=me),this.setLocalTransform(e)}},pe.getGlobalScale=function(t){var e=this.transform;return t=t||[],e?(t[0]=Math.sqrt(e[0]*e[0]+e[1]*e[1]),t[1]=Math.sqrt(e[2]*e[2]+e[3]*e[3]),e[0]<0&&(t[0]=-t[0]),e[3]<0&&(t[1]=-t[1])):(t[0]=1,t[1]=1),t},pe.transformCoordToLocal=function(t,e){var i=[t,e],n=this.invTransform;return n&&bt(i,i,n),i},pe.transformCoordToGlobal=function(t,e){var i=[t,e],n=this.transform;return n&&bt(i,i,n),i},fe.getLocalTransform=function(t,e){ce(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]),se(e,e,n),o&&re(e,e,o),i&&(e[4]+=i[0],e[5]+=i[1]),e[4]+=a[0],e[5]+=a[1],e};var ye={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:(e=!i||i<1?(i=1,.1):.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:(e=!i||i<1?(i=1,.1):.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:(e=!i||i<1?(i=1,.1):.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){return t*t*(2.70158*t-1.70158)},backOut:function(t){return--t*t*(2.70158*t+1.70158)+1},backInOut:function(t){var e=2.5949095;return(t*=2)<1?t*t*((1+e)*t-e)*.5:.5*((t-=2)*t*((1+e)*t+e)+2)},bounceIn:function(t){return 1-ye.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*ye.bounceIn(2*t):.5*ye.bounceOut(2*t-1)+.5}};function xe(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}xe.prototype={constructor:xe,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?ye[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}};function _e(){this.head=null,this.tail=null,this._len=0}var we=_e.prototype;we.insert=function(t){var e=new Se(t);return this.insertEntry(e),e},we.insertEntry=function(t){this.head?((this.tail.next=t).prev=this.tail,t.next=null,this.tail=t):this.head=this.tail=t,this._len++},we.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--},we.len=function(){return this._len},we.clear=function(){this.head=this.tail=null,this._len=0};function be(t){this._list=new _e,this._map={},this._maxSize=t||10,this._lastRemovedEntry=null}var Se=function(t){this.value=t,this.next,this.prev},Me=be.prototype;Me.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&&0<a){var s=i.head;i.remove(s),delete n[s.key],o=s.value,this._lastRemovedEntry=s}r?r.value=e:r=new Se(e),r.key=t,i.insertEntry(r),n[t]=r}return o},Me.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},Me.clear=function(){this._list.clear(),this._map={}};var Ie={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]};function Te(t){return(t=Math.round(t))<0?0:255<t?255:t}function Ae(t){return t<0?0:1<t?1:t}function De(t){return t.length&&"%"===t.charAt(t.length-1)?Te(parseFloat(t)/100*255):Te(parseInt(t,10))}function Ce(t){return t.length&&"%"===t.charAt(t.length-1)?Ae(parseFloat(t)/100):Ae(parseFloat(t))}function Le(t,e,i){return i<0?i+=1:1<i&&(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 ke(t,e,i){return t+(e-t)*i}function Pe(t,e,i,n,o){return t[0]=e,t[1]=i,t[2]=n,t[3]=o,t}function Ne(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t}var Oe=new be(20),Ee=null;function ze(t,e){Ee&&Ne(Ee,e),Ee=Oe.put(t,Ee||e.slice())}function Re(t,e){if(t){e=e||[];var i=Oe.get(t);if(i)return Ne(e,i);var n,o=(t+="").replace(/ /g,"").toLowerCase();if(o in Ie)return Ne(e,Ie[o]),ze(t,e),e;if("#"===o.charAt(0))return 4===o.length?0<=(n=parseInt(o.substr(1),16))&&n<=4095?(Pe(e,(3840&n)>>4|(3840&n)>>8,240&n|(240&n)>>4,15&n|(15&n)<<4,1),ze(t,e),e):void Pe(e,0,0,0,1):7===o.length?0<=(n=parseInt(o.substr(1),16))&&n<=16777215?(Pe(e,(16711680&n)>>16,(65280&n)>>8,255&n,1),ze(t,e),e):void Pe(e,0,0,0,1):void 0;var a=o.indexOf("("),r=o.indexOf(")");if(-1!==a&&r+1===o.length){var s=o.substr(0,a),l=o.substr(a+1,r-(a+1)).split(","),u=1;switch(s){case"rgba":if(4!==l.length)return void Pe(e,0,0,0,1);u=Ce(l.pop());case"rgb":return 3!==l.length?void Pe(e,0,0,0,1):(Pe(e,De(l[0]),De(l[1]),De(l[2]),u),ze(t,e),e);case"hsla":return 4!==l.length?void Pe(e,0,0,0,1):(l[3]=Ce(l[3]),Be(l,e),ze(t,e),e);case"hsl":return 3!==l.length?void Pe(e,0,0,0,1):(Be(l,e),ze(t,e),e);default:return}}Pe(e,0,0,0,1)}}function Be(t,e){var i=(parseFloat(t[0])%360+360)%360/360,n=Ce(t[1]),o=Ce(t[2]),a=o<=.5?o*(n+1):o+n-o*n,r=2*o-a;return Pe(e=e||[],Te(255*Le(r,a,i+1/3)),Te(255*Le(r,a,i)),Te(255*Le(r,a,i-1/3)),1),4===t.length&&(e[3]=t[3]),e}function Ve(t,e){var i=Re(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,255<i[n]?i[n]=255:t[n]<0&&(i[n]=0);return Ye(i,4===i.length?"rgba":"rgb")}}function Ge(t){var e=Re(t);if(e)return((1<<24)+(e[0]<<16)+(e[1]<<8)+ +e[2]).toString(16).slice(1)}function Fe(t,e,i){if(e&&e.length&&0<=t&&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]=Te(ke(r[0],s[0],l)),i[1]=Te(ke(r[1],s[1],l)),i[2]=Te(ke(r[2],s[2],l)),i[3]=Ae(ke(r[3],s[3],l)),i}}var We=Fe;function He(t,e,i){if(e&&e.length&&0<=t&&t<=1){var n=t*(e.length-1),o=Math.floor(n),a=Math.ceil(n),r=Re(e[o]),s=Re(e[a]),l=n-o,u=Ye([Te(ke(r[0],s[0],l)),Te(ke(r[1],s[1],l)),Te(ke(r[2],s[2],l)),Ae(ke(r[3],s[3],l))],"rgba");return i?{color:u,leftIndex:o,rightIndex:a,value:n}:u}}var Ze=He;function Ue(t,e,i,n){if(t=Re(t))return t=function(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,u=(s+r)/2;if(0==l)i=e=0;else{i=u<.5?l/(s+r):l/(2-s-r);var h=((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+h-d:a===s&&(e=2/3+c-h),e<0&&(e+=1),1<e&&(e-=1)}var f=[360*e,i,u];return null!=t[3]&&f.push(t[3]),f}}(t),null!=e&&(t[0]=function(t){return(t=Math.round(t))<0?0:360<t?360:t}(e)),null!=i&&(t[1]=Ce(i)),null!=n&&(t[2]=Ce(n)),Ye(Be(t),"rgba")}function Xe(t,e){if((t=Re(t))&&null!=e)return t[3]=Ae(e),Ye(t,"rgba")}function Ye(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+")"}}var je=(Object.freeze||Object)({parse:Re,lift:Ve,toHex:Ge,fastLerp:Fe,fastMapToColor:We,lerp:He,mapToColor:Ze,modifyHSL:Ue,modifyAlpha:Xe,stringify:Ye}),qe=Array.prototype.slice;function Ke(t,e){return t[e]}function $e(t,e,i){t[e]=i}function Je(t,e,i){return(e-t)*i+t}function Qe(t,e,i){return.5<i?e:t}function ti(t,e,i,n,o){var a=t.length;if(1===o)for(var r=0;r<a;r++)n[r]=Je(t[r],e[r],i);else{var s=a&&t[0].length;for(r=0;r<a;r++)for(var l=0;l<s;l++)n[r][l]=Je(t[r][l],e[r][l],i)}}function ei(t,e,i){var n=t.length,o=e.length;if(n!==o)if(o<n)t.length=o;else for(var a=n;a<o;a++)t.push(1===i?e[a]:qe.call(e[a]));var r=t[0]&&t[0].length;for(a=0;a<t.length;a++)if(1===i)isNaN(t[a])&&(t[a]=e[a]);else for(var s=0;s<r;s++)isNaN(t[a][s])&&(t[a][s]=e[a][s])}function ii(t,e,i){if(t===e)return!0;var n=t.length;if(n!==e.length)return!1;if(1===i){for(var o=0;o<n;o++)if(t[o]!==e[o])return!1}else{var a=t[0].length;for(o=0;o<n;o++)for(var r=0;r<a;r++)if(t[o][r]!==e[o][r])return!1}return!0}function ni(t,e,i,n,o,a,r,s,l){var u=t.length;if(1===l)for(var h=0;h<u;h++)s[h]=oi(t[h],e[h],i[h],n[h],o,a,r);else{var c=t[0].length;for(h=0;h<u;h++)for(var d=0;d<c;d++)s[h][d]=oi(t[h][d],e[h][d],i[h][d],n[h][d],o,a,r)}}function oi(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 ai(t){if(P(t)){var e=t.length;if(P(t[0])){for(var i=[],n=0;n<e;n++)i.push(qe.call(t[n]));return i}return qe.call(t)}return t}function ri(t){return t[0]=Math.floor(t[0]),t[1]=Math.floor(t[1]),t[2]=Math.floor(t[2]),"rgba("+t.join(",")+")"}function si(t,e,i,n,a,o){var r=t._getter,s=t._setter,l="spline"===e,u=n.length;if(u){var h,c=P(n[0].value),d=!1,f=!1,p=c?function(t){var e=t[t.length-1].value;return P(e&&e[0])?2:1}(n):0;n.sort(function(t,e){return t.time-e.time}),h=n[u-1].time;for(var g=[],m=[],v=n[0].value,y=!0,x=0;x<u;x++){g.push(n[x].time/h);var _=n[x].value;if(c&&ii(_,v,p)||!c&&_===v||(y=!1),"string"==typeof(v=_)){var w=Re(_);w?(_=w,d=!0):f=!0}m.push(_)}if(o||!y){var b=m[u-1];for(x=0;x<u-1;x++)c?ei(m[x],b,p):!isNaN(m[x])||isNaN(b)||f||d||(m[x]=b);c&&ei(r(t._target,a),b,p);var S,M,I,T,A,D=0,C=0;if(d)var L=[0,0,0,0];var k=new xe({target:t._target,life:h,loop:t._loop,delay:t._delay,onframe:function(t,e){var i;if(e<0)i=0;else if(e<C){for(i=Math.min(D+1,u-1);0<=i&&!(g[i]<=e);i--);i=Math.min(i,u-2)}else{for(i=D;i<u&&!(g[i]>e);i++);i=Math.min(i-1,u-2)}C=e;var n=g[(D=i)+1]-g[i];if(0!=n)if(S=(e-g[i])/n,l)if(I=m[i],M=m[0===i?i:i-1],T=m[u-2<i?u-1:i+1],A=m[u-3<i?u-1:i+2],c)ni(M,I,T,A,S,S*S,S*S*S,r(t,a),p);else{if(d)o=ni(M,I,T,A,S,S*S,S*S*S,L,1),o=ri(L);else{if(f)return Qe(I,T,S);o=oi(M,I,T,A,S,S*S,S*S*S)}s(t,a,o)}else if(c)ti(m[i],m[i+1],S,r(t,a),p);else{var o;if(d)ti(m[i],m[i+1],S,L,1),o=ri(L);else{if(f)return Qe(m[i],m[i+1],S);o=Je(m[i],m[i+1],S)}s(t,a,o)}},ondestroy:i});return e&&"spline"!==e&&(k.easing=e),k}}}function li(t,e,i,n){this._tracks={},this._target=t,this._loop=e||!1,this._getter=i||Ke,this._setter=n||$e,this._clipCount=0,this._delay=0,this._doneList=[],this._onframeList=[],this._clipList=[]}li.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:ai(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){function i(){--a||o._doneCallback()}var n,o=this,a=0;for(var r in this._tracks)if(this._tracks.hasOwnProperty(r)){var s=si(this,t,i,this._tracks[r],r,e);s&&(this._clipList.push(s),a++,this.animation&&this.animation.addClip(s),n=s)}if(n){var l=n.onframe;n.onframe=function(t,e){l(t,e);for(var i=0;i<o._onframeList.length;i++)o._onframeList[i](t,e)}}return a||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 ui=1;"undefined"!=typeof window&&(ui=Math.max(window.devicePixelRatio||1,1));var hi=ui,ci=function(){};function di(){this.animators=[]}var fi=ci;function pi(t,e,i,n,o,a,r,s){z(n)?(a=o,o=n,n=0):O(o)?(a=o,o="linear",n=0):O(n)?(a=n,n=0):i=O(i)?(a=i,500):i||500,t.stopAnimation(),function t(e,i,n,o,a,r,s){var l={};var u=0;for(var h in o)o.hasOwnProperty(h)&&(null!=n[h]?R(o[h])&&!P(o[h])?t(e,i?i+"."+h:h,n[h],o[h],a,r,s):(s?(l[h]=n[h],gi(e,i,h,o[h])):l[h]=o[h],u++):null==o[h]||s||gi(e,i,h,o[h]));0<u&&e.animate(i,!1).when(null==a?500:a,l).delay(r||0)}(t,"",t,e,i,n,s);var l=t.animators.slice(),u=l.length;function h(){--u||a&&a()}u||a&&a();for(var c=0;c<l.length;c++)l[c].done(h).start(o,r)}function gi(t,e,i,n){if(e){var o={};o[e]={},o[e][i]=n,t.attr(o)}else t.attr(i,n)}di.prototype={constructor:di,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 l=0,u=r.length;l<u;l++)s=s&&s[r[l]];s&&(i=s)}else i=o;if(i){var h=o.animators,c=new li(i,e);return c.during(function(t){o.dirty(n)}).done(function(){h.splice(_(h,c),1)}),h.push(c),a&&a.animation.addAnimator(c),c}fi('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){pi(this,t,e,i,n,o,a)},animateFrom:function(t,e,i,n,o,a){pi(this,t,e,i,n,o,a,!0)}};var mi=function(t){fe.call(this,t),Ct.call(this,t),di.call(this,t),this.id=t.id||n()};mi.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]))[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]=[]))[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(R(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).__zr=e,(t.__clipTarget=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)}},b(mi,di),b(mi,fe),b(mi,Ct);var vi,yi,xi,_i,wi=bt,bi=Math.min,Si=Math.max;function Mi(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}Mi.prototype={constructor:Mi,union:function(t){var e=bi(t.x,this.x),i=bi(t.y,this.y);this.width=Si(t.x+t.width,this.x+this.width)-e,this.height=Si(t.y+t.height,this.y+this.height)-i,this.x=e,this.y=i},applyTransform:(vi=[],yi=[],xi=[],_i=[],function(t){if(t){vi[0]=xi[0]=this.x,vi[1]=_i[1]=this.y,yi[0]=_i[0]=this.x+this.width,yi[1]=xi[1]=this.y+this.height,wi(vi,vi,t),wi(yi,yi,t),wi(xi,xi,t),wi(_i,_i,t),this.x=bi(vi[0],yi[0],xi[0],_i[0]),this.y=bi(vi[1],yi[1],xi[1],_i[1]);var e=Si(vi[0],yi[0],xi[0],_i[0]),i=Si(vi[1],yi[1],xi[1],_i[1]);this.width=e-this.x,this.height=i-this.y}}),calculateTransform:function(t){var e=t.width/this.width,i=t.height/this.height,n=ee();return ae(n,n,[-this.x,-this.y]),se(n,n,[e,i]),ae(n,n,[t.x,t.y]),n},intersect:function(t){if(!t)return!1;t instanceof Mi||(t=Mi.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,u=t.y+t.height;return!(n<r||s<i||a<l||u<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 Mi(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}}},Mi.create=function(t){return new Mi(t.x,t.y,t.width,t.height)};var Ii=function(t){for(var e in t=t||{},mi.call(this,t),t)t.hasOwnProperty(e)&&(this[e]=t[e]);this._children=[],this.__storage=null,this.__dirty=!0};Ii.prototype={constructor:Ii,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);0<=n&&(i.splice(n,0,t),this._doAdd(t))}return this},_doAdd:function(t){t.parent&&t.parent.remove(t);var e=(t.parent=this).__storage,i=this.__zr;e&&e!==t.__storage&&(e.addToStorage(t),t instanceof Ii&&t.addChildrenToStorage(e)),i&&i.refresh()},remove:function(t){var e=this.__zr,i=this.__storage,n=this._children,o=_(n,t);return o<0||(n.splice(o,1),t.parent=null,i&&(i.delFromStorage(t),t instanceof Ii&&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 Ii&&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 Ii&&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 Ii&&i.delChildrenFromStorage(t)}},dirty:function(){return this.__dirty=!0,this.__zr&&this.__zr.refresh(),this},getBoundingRect:function(t){for(var e=null,i=new Mi(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}},w(Ii,mi);var Ti=32,Ai=7;function Di(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++;!function(t,e,i){i--;for(;e<i;){var n=t[e];t[e++]=t[i],t[i--]=n}}(t,e,o)}else for(;o<i&&0<=n(t[o],t[o-1]);)o++;return o-e}function Ci(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=1+a;var u=n-s;switch(u){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(;0<u;)t[s+u]=t[s+u-1],u--}t[s]=r}}function Li(t,e,i,n,o,a){var r=0,s=0,l=1;if(0<a(t,e[i+o])){for(s=n-o;l<s&&0<a(t,e[i+o+l]);)(l=1+((r=l)<<1))<=0&&(l=s);s<l&&(l=s),r+=o,l+=o}else{for(s=o+1;l<s&&a(t,e[i+o-l])<=0;)(l=1+((r=l)<<1))<=0&&(l=s);s<l&&(l=s);var u=r;r=o-l,l=o-u}for(r++;r<l;){var h=r+(l-r>>>1);0<a(t,e[i+h])?r=h+1:l=h}return l}function ki(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;)(l=1+((r=l)<<1))<=0&&(l=s);s<l&&(l=s);var u=r;r=o-l,l=o-u}else{for(s=n-o;l<s&&0<=a(t,e[i+o+l]);)(l=1+((r=l)<<1))<=0&&(l=s);s<l&&(l=s),r+=o,l+=o}for(r++;r<l;){var h=r+(l-r>>>1);a(t,e[i+h])<0?l=h:r=h+1}return l}function Pi(p,g){var r,s,m=Ai,l=0,v=[];function e(t){var e=r[t],i=s[t],n=r[t+1],o=s[t+1];s[t]=i+o,t===l-3&&(r[t+1]=r[t+2],s[t+1]=s[t+2]),l--;var a=ki(p[n],p,e,i,0,g);e+=a,0!==(i-=a)&&0!==(o=Li(p[e+i-1],p,n,o,o-1,g))&&(i<=o?function(t,e,i,n){var o=0;for(o=0;o<e;o++)v[o]=p[t+o];var a=0,r=i,s=t;if(p[s++]=p[r++],0==--n){for(o=0;o<e;o++)p[s+o]=v[a+o];return}if(1===e){for(o=0;o<n;o++)p[s+o]=p[r+o];return p[s+n]=v[a]}var l,u,h,c=m;for(;;){u=l=0,h=!1;do{if(g(p[r],v[a])<0){if(p[s++]=p[r++],u++,(l=0)==--n){h=!0;break}}else if(p[s++]=v[a++],l++,u=0,1==--e){h=!0;break}}while((l|u)<c);if(h)break;do{if(0!==(l=ki(p[r],v,a,e,0,g))){for(o=0;o<l;o++)p[s+o]=v[a+o];if(s+=l,a+=l,(e-=l)<=1){h=!0;break}}if(p[s++]=p[r++],0==--n){h=!0;break}if(0!==(u=Li(v[a],p,r,n,0,g))){for(o=0;o<u;o++)p[s+o]=p[r+o];if(s+=u,r+=u,0===(n-=u)){h=!0;break}}if(p[s++]=v[a++],1==--e){h=!0;break}c--}while(Ai<=l||Ai<=u);if(h)break;c<0&&(c=0),c+=2}if((m=c)<1&&(m=1),1===e){for(o=0;o<n;o++)p[s+o]=p[r+o];p[s+n]=v[a]}else{if(0===e)throw new Error;for(o=0;o<e;o++)p[s+o]=v[a+o]}}(e,i,n,o):function(t,e,i,n){var o=0;for(o=0;o<n;o++)v[o]=p[i+o];var a=t+e-1,r=n-1,s=i+n-1,l=0,u=0;if(p[s--]=p[a--],0==--e){for(l=s-(n-1),o=0;o<n;o++)p[l+o]=v[o];return}if(1===n){for(u=(s-=e)+1,l=(a-=e)+1,o=e-1;0<=o;o--)p[u+o]=p[l+o];return p[s]=v[r]}var h=m;for(;;){var c=0,d=0,f=!1;do{if(g(v[r],p[a])<0){if(p[s--]=p[a--],c++,(d=0)==--e){f=!0;break}}else if(p[s--]=v[r--],d++,c=0,1==--n){f=!0;break}}while((c|d)<h);if(f)break;do{if(0!==(c=e-ki(v[r],p,t,e,e-1,g))){for(e-=c,u=(s-=c)+1,l=(a-=c)+1,o=c-1;0<=o;o--)p[u+o]=p[l+o];if(0===e){f=!0;break}}if(p[s--]=v[r--],1==--n){f=!0;break}if(0!==(d=n-Li(p[a],v,0,n,n-1,g))){for(n-=d,u=(s-=d)+1,l=(r-=d)+1,o=0;o<d;o++)p[u+o]=v[l+o];if(n<=1){f=!0;break}}if(p[s--]=p[a--],0==--e){f=!0;break}h--}while(Ai<=c||Ai<=d);if(f)break;h<0&&(h=0),h+=2}(m=h)<1&&(m=1);if(1===n){for(u=(s-=e)+1,l=(a-=e)+1,o=e-1;0<=o;o--)p[u+o]=p[l+o];p[s]=v[r]}else{if(0===n)throw new Error;for(l=s-(n-1),o=0;o<n;o++)p[l+o]=v[o]}}(e,i,n,o))}r=[],s=[],this.mergeRuns=function(){for(;1<l;){var t=l-2;if(1<=t&&s[t-1]<=s[t]+s[t+1]||2<=t&&s[t-2]<=s[t]+s[t-1])s[t-1]<s[t+1]&&t--;else if(s[t]>s[t+1])break;e(t)}},this.forceMergeRuns=function(){for(;1<l;){var t=l-2;0<t&&s[t-1]<s[t+1]&&t--,e(t)}},this.pushRun=function(t,e){r[l]=t,s[l]=e,l+=1}}function Ni(t,e,i,n){i=i||0;var o=(n=n||t.length)-i;if(!(o<2)){var a=0;if(o<Ti)Ci(t,i,n,i+(a=Di(t,i,n,e)),e);else{var r=new Pi(t,e),s=function(t){for(var e=0;Ti<=t;)e|=1&t,t>>=1;return t+e}(o);do{if((a=Di(t,i,n,e))<s){var l=o;s<l&&(l=s),Ci(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 Oi(t,e){return t.zlevel===e.zlevel?t.z===e.z?t.z2-e.z2:t.z-e.z:t.zlevel-e.zlevel}function Ei(){this._roots=[],this._displayList=[],this._displayListLen=0}Ei.prototype={constructor:Ei,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,v.canvasSupported&&Ni(i,Oi)},_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),o=(a=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 Ii&&t.addChildrenToStorage(this),this.addToStorage(t),this._roots.push(t))},delRoot:function(t){if(null==t){for(var e=0;e<this._roots.length;e++){var i=this._roots[e];i instanceof Ii&&i.delChildrenFromStorage(this)}return this._roots=[],this._displayList=[],void(this._displayListLen=0)}if(t instanceof Array){e=0;for(var n=t.length;e<n;e++)this.delRoot(t[e])}else{var o=_(this._roots,t);0<=o&&(this.delFromStorage(t),this._roots.splice(o,1),t instanceof Ii&&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:Oi};var zi={shadowBlur:1,shadowOffsetX:1,shadowOffsetY:1,textShadowBlur:1,textShadowOffsetX:1,textShadowOffsetY:1,textBoxShadowBlur:1,textBoxShadowOffsetX:1,textBoxShadowOffsetY:1},Ri=function(t,e,i){return zi.hasOwnProperty(e)?i*t.dpr:i},Bi={NONE:0,STYLE_BIND:1,PLAIN_TEXT:2},Vi=9,Gi=[["shadowBlur",0],["shadowOffsetX",0],["shadowOffsetY",0],["shadowColor","#000"],["lineCap","butt"],["lineJoin","miter"],["miterLimit",10]],Fi=function(t){this.extendFrom(t,!1)};function Wi(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),n=isNaN(n)?0:n,o=isNaN(o)?1:o,a=isNaN(a)?0:a,r=isNaN(r)?0:r,t.createLinearGradient(n,a,o,r)}function Hi(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)}Fi.prototype={constructor:Fi,fill:"#000",stroke:null,opacity:1,fillOpacity:null,strokeOpacity:null,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){var n=this,o=i&&i.style,a=!o||t.__attrCachedBy!==Bi.STYLE_BIND;t.__attrCachedBy=Bi.STYLE_BIND;for(var r=0;r<Gi.length;r++){var s=Gi[r],l=s[0];!a&&n[l]===o[l]||(t[l]=Ri(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 u=n.lineWidth;t.lineWidth=u/(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&&0<this.lineWidth},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?Hi:Wi)(t,e,i),o=e.colorStops,a=0;a<o.length;a++)n.addColorStop(o[a].offset,o[a].color);return n}};for(var Zi=Fi.prototype,Ui=0;Ui<Gi.length;Ui++){var Xi=Gi[Ui];Xi[0]in Zi||(Zi[Xi[0]]=Xi[1])}Fi.getGradient=Zi.getGradient;function Yi(t,e){this.image=t,this.repeat=e,this.type="pattern"}function ji(){return!1}function qi(t,e,i){var n=g(),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 Ki(t,e,i){var n;i=i||hi,"string"==typeof t?n=qi(t,e,i):R(t)&&(t=(n=t).id),this.id=t;var o=(this.dom=n).style;o&&(n.onselectstart=ji,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}Ki.prototype={constructor:Ki,__dirty:!0,__used:!(Yi.prototype.getCanvasPattern=function(t){return t.createPattern(this.image,this.repeat||"repeat")}),__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=qi("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&&(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,e){var i,n=this.dom,o=this.ctx,a=n.width,r=n.height,s=(e=e||this.clearColor,this.motionBlur&&!t),l=this.lastFrameAlpha,u=this.dpr;s&&(this.domBack||this.createBackBuffer(),this.ctxBack.globalCompositeOperation="copy",this.ctxBack.drawImage(n,0,0,a/u,r/u)),o.clearRect(0,0,a,r),e&&"transparent"!==e&&(e.colorStops?(i=e.__canvasGradient||Fi.getGradient(o,e,{x:0,y:0,width:a,height:r}),e.__canvasGradient=i):e.image&&(i=Yi.prototype.getCanvasPattern.call(e,o)),o.save(),o.fillStyle=i||e,o.fillRect(0,0,a,r),o.restore());if(s){var h=this.domBack;o.save(),o.globalAlpha=l,o.drawImage(h,0,0,a,r),o.restore()}}};var $i="undefined"!=typeof window&&(window.requestAnimationFrame&&window.requestAnimationFrame.bind(window)||window.msRequestAnimationFrame&&window.msRequestAnimationFrame.bind(window)||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame)||function(t){setTimeout(t,16)},Ji=new be(50);function Qi(t){if("string"!=typeof t)return t;var e=Ji.get(t);return e&&e.image}function tn(t,e,i,n,o){if(t){if("string"!=typeof t)return t;if(e&&e.__zrImageSrc===t||!i)return e;var a=Ji.get(t),r={hostEl:i,cb:n,cbPayload:o};return a?nn(e=a.image)||a.pending.push(r):((e=new Image).onload=e.onerror=en,Ji.put(t,e.__cachedImgObj={image:e,pending:[r]}),e.src=e.__zrImageSrc=t),e}return e}function en(){var t=this.__cachedImgObj;this.onload=this.onerror=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 nn(t){return t&&t.width&&t.height}var on={},an=0,rn=5e3,sn=/\{([a-zA-Z0-9_]+)\|([^}]*)\}/g,ln="12px sans-serif",un={};function hn(t,e){var i=t+":"+(e=e||ln);if(on[i])return on[i];for(var n,o,a=(t+"").split("\n"),r=0,s=0,l=a.length;s<l;s++)r=Math.max((n=a[s],o=e,un.measureText(n,o)).width,r);return rn<an&&(an=0,on={}),an++,on[i]=r}function cn(t,e,i,n,o,a,r,s){return r?function(t,e,i,n,o,a,r,s){var l=wn(t,{rich:r,truncate:s,font:e,textAlign:i,textPadding:o,textLineHeight:a}),u=l.outerWidth,h=l.outerHeight,c=dn(0,u,i),d=fn(0,h,n);return new Mi(c,d,u,h)}(t,e,i,n,o,a,r,s):function(t,e,i,n,o,a,r){var s=_n(t,e,o,a,r),l=hn(t,e);o&&(l+=o[1]+o[3]);var u=s.outerHeight,h=dn(0,l,i),c=fn(0,u,n),d=new Mi(h,c,l,u);return d.lineHeight=s.lineHeight,d}(t,e,i,n,o,a,s)}function dn(t,e,i){return"right"===i?t-=e:"center"===i&&(t-=e/2),t}function fn(t,e,i){return"middle"===i?t-=e/2:"bottom"===i&&(t-=e),t}function pn(t,e,i){var n=e.textPosition,o=e.textDistance,a=i.x,r=i.y;o=o||0;var s=i.height,l=i.width,u=s/2,h="left",c="top";switch(n){case"left":a-=o,r+=u,h="right",c="middle";break;case"right":a+=o+l,r+=u,c="middle";break;case"top":a+=l/2,r-=o,h="center",c="bottom";break;case"bottom":a+=l/2,r+=s+o,h="center";break;case"inside":a+=l/2,r+=u,h="center",c="middle";break;case"insideLeft":a+=o,r+=u,c="middle";break;case"insideRight":a+=l-o,r+=u,h="right",c="middle";break;case"insideTop":a+=l/2,r+=o,h="center";break;case"insideBottom":a+=l/2,r+=s-o,h="center",c="bottom";break;case"insideTopLeft":a+=o,r+=o;break;case"insideTopRight":a+=l-o,r+=o,h="right";break;case"insideBottomLeft":a+=o,r+=s-o,c="bottom";break;case"insideBottomRight":a+=l-o,r+=s-o,h="right",c="bottom"}return(t=t||{}).x=a,t.y=r,t.textAlign=h,t.textVerticalAlign=c,t}function gn(t,e,i,n,o){if(!e)return"";var a=(t+"").split("\n");o=mn(e,i,n,o);for(var r=0,s=a.length;r<s;r++)a[r]=vn(a[r],o);return a.join("\n")}function mn(t,e,i,n){(n=L({},n)).font=e;i=H(i,"...");n.maxIterations=H(n.maxIterations,2);var o=n.minChar=H(n.minChar,0);n.cnCharWidth=hn("国",e);var a=n.ascCharWidth=hn("a",e);n.placeholder=H(n.placeholder,"");for(var r=t=Math.max(0,t-1),s=0;s<o&&a<=r;s++)r-=a;var l=hn(i,e);return r<l&&(i="",l=0),r=t-l,n.ellipsis=i,n.ellipsisWidth=l,n.contentWidth=r,n.containerWidth=t,n}function vn(t,e){var i=e.containerWidth,n=e.font,o=e.contentWidth;if(!i)return"";var a=hn(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?yn(t,o,e.ascCharWidth,e.cnCharWidth):0<a?Math.floor(t.length*o/a):0;a=hn(t=t.substr(0,s),n)}return""===t&&(t=e.placeholder),t}function yn(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 xn(t){return hn("国",t)}function _n(t,e,i,n,o){null!=t&&(t+="");var a=H(n,xn(e)),r=t?t.split("\n"):[],s=r.length*a,l=s,u=!0;if(i&&(l+=i[0]+i[2]),t&&o){u=!1;var h=o.outerHeight,c=o.outerWidth;if(null!=h&&h<l)t="",r=[];else if(null!=c)for(var d=mn(c-(i?i[1]+i[3]:0),e,o.ellipsis,{minChar:o.minChar,placeholder:o.placeholder}),f=0,p=r.length;f<p;f++)r[f]=vn(r[f],d)}return{lines:r,height:s,outerHeight:l,lineHeight:a,canCacheByTextString:u}}function wn(t,e){var i={lines:[],width:0,height:0};if(null!=t&&(t+=""),!t)return i;for(var n,o=sn.lastIndex=0;null!=(n=sn.exec(t));){var a=n.index;o<a&&bn(i,t.substring(o,a)),bn(i,n[2],n[1]),o=sn.lastIndex}o<t.length&&bn(i,t.substring(o,t.length));var r=i.lines,s=0,l=0,u=[],h=e.textPadding,c=e.truncate,d=c&&c.outerWidth,f=c&&c.outerHeight;h&&(null!=d&&(d-=h[1]+h[3]),null!=f&&(f-=h[0]+h[2]));for(var p=0;p<r.length;p++){for(var g=r[p],m=0,v=0,y=0;y<g.tokens.length;y++){var x=(C=g.tokens[y]).styleName&&e.rich[C.styleName]||{},_=C.textPadding=x.textPadding,w=C.font=x.font||e.font,b=C.textHeight=H(x.textHeight,xn(w));if(_&&(b+=_[0]+_[2]),C.height=b,C.lineHeight=Z(x.textLineHeight,e.textLineHeight,b),C.textAlign=x&&x.textAlign||e.textAlign,C.textVerticalAlign=x&&x.textVerticalAlign||"middle",null!=f&&s+C.lineHeight>f)return{lines:[],width:0,height:0};C.textWidth=hn(C.text,w);var S=x.textWidth,M=null==S||"auto"===S;if("string"==typeof S&&"%"===S.charAt(S.length-1))C.percentWidth=S,u.push(C),S=0;else{if(M){S=C.textWidth;var I=x.textBackgroundColor,T=I&&I.image;T&&nn(T=Qi(T))&&(S=Math.max(S,T.width*b/T.height))}var A=_?_[1]+_[3]:0;S+=A;var D=null!=d?d-v:null;null!=D&&D<S&&(!M||D<A?(C.text="",C.textWidth=S=0):(C.text=gn(C.text,D-A,w,c.ellipsis,{minChar:c.minChar}),C.textWidth=hn(C.text,w),S=C.textWidth+A))}v+=C.width=S,x&&(m=Math.max(m,C.lineHeight))}g.width=v,s+=g.lineHeight=m,l=Math.max(l,v)}i.outerWidth=i.width=H(e.textWidth,l),i.outerHeight=i.height=H(e.textHeight,s),h&&(i.outerWidth+=h[1]+h[3],i.outerHeight+=h[0]+h[2]);for(p=0;p<u.length;p++){var C,L=(C=u[p]).percentWidth;C.width=parseInt(L,10)/100*l}return i}function bn(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 u=(a[a.length-1]||(a[0]={tokens:[]})).tokens,h=u.length;1===h&&u[0].isLineHolder?u[0]=l:!s&&h&&!n||u.push(l)}}}function Sn(t){var e=(t.fontSize||t.fontFamily)&&[t.fontStyle,t.fontWeight,(t.fontSize||12)+"px",t.fontFamily||"sans-serif"].join(" ");return e&&j(e)||t.textFont||t.font}function Mn(t,e){var i,n,o,a,r,s=e.x,l=e.y,u=e.width,h=e.height,c=e.r;u<0&&(s+=u,u=-u),h<0&&(l+=h,h=-h),"number"==typeof c?i=n=o=a=c:c instanceof Array?1===c.length?i=n=o=a=c[0]:2===c.length?(i=o=c[0],n=a=c[1]):3===c.length?(i=c[0],n=a=c[1],o=c[2]):(i=c[0],n=c[1],o=c[2],a=c[3]):i=n=o=a=0,u<i+n&&(i*=u/(r=i+n),n*=u/r),u<o+a&&(o*=u/(r=o+a),a*=u/r),h<n+o&&(n*=h/(r=n+o),o*=h/r),h<i+a&&(i*=h/(r=i+a),a*=h/r),t.moveTo(s+i,l),t.lineTo(s+u-n,l),0!==n&&t.arc(s+u-n,l+n,n,-Math.PI/2,0),t.lineTo(s+u,l+h-o),0!==o&&t.arc(s+u-o,l+h-o,o,0,Math.PI/2),t.lineTo(s+a,l+h),0!==a&&t.arc(s+a,l+h-a,a,Math.PI/2,Math.PI),t.lineTo(s,l+i),0!==i&&t.arc(s+i,l+i,i,Math.PI,1.5*Math.PI)}un.measureText=function(t,e){var i=x();return i.font=e||ln,i.measureText(t)};var In=ln,Tn={left:1,right:1,center:1},An={top:1,bottom:1,middle:1},Dn=[["textShadowBlur","shadowBlur",0],["textShadowOffsetX","shadowOffsetX",0],["textShadowOffsetY","shadowOffsetY",0],["textShadowColor","shadowColor","transparent"]],Cn={},Ln={};function kn(t){return Pn(t),E(t.rich,Pn),t}function Pn(t){if(t){t.font=Sn(t);var e=t.textAlign;"middle"===e&&(e="center"),t.textAlign=null==e||Tn[e]?e:"left";var i=t.textVerticalAlign||t.textBaseline;"center"===i&&(i="middle"),t.textVerticalAlign=null==i||An[i]?i:"top",t.textPadding&&(t.textPadding=X(t.textPadding))}}function Nn(t,e,i,n,o,a){n.rich?function(t,e,i,n,o,a){a!==Vi&&(e.__attrCachedBy=Bi.NONE);var r=t.__textCotentBlock;r&&!t.__dirtyText||(r=t.__textCotentBlock=wn(i,n));!function(t,e,i,n,o){var a=i.width,r=i.outerWidth,s=i.outerHeight,l=n.textPadding,u=Vn(Ln,t,n,o),h=u.baseX,c=u.baseY,d=u.textAlign,f=u.textVerticalAlign;On(e,n,o,h,c);var p=dn(h,r,d),g=fn(c,s,f),m=p,v=g;l&&(m+=l[3],v+=l[0]);var y=m+a;zn(n)&&Rn(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);)En(t,e,_,n,M,v,A,"left"),I-=_.width,A+=_.width,T++;for(;0<=C&&"right"===(_=b[C]).textAlign;)En(t,e,_,n,M,v,D,"right"),I-=_.width,D-=_.width,C--;for(A+=(a-(A-m)-(y-D)-I)/2;T<=C;)_=b[T],En(t,e,_,n,M,v,A+_.width/2,"center"),A+=_.width,T++;v+=M}}(t,e,r,n,o)}(t,e,i,n,o,a):function(t,e,i,n,o,a){var r,s=zn(n),l=!1,u=e.__attrCachedBy===Bi.PLAIN_TEXT;a!==Vi?(a&&(r=a.style,l=!s&&u&&r),e.__attrCachedBy=s?Bi.NONE:Bi.PLAIN_TEXT):u&&(e.__attrCachedBy=Bi.NONE);var h=n.font||In;l&&h===(r.font||In)||(e.font=h);var c=t.__computedFont;t.__styleFont!==h&&(t.__styleFont=h,c=t.__computedFont=e.font);var d=n.textPadding,f=n.textLineHeight,p=t.__textCotentBlock;p&&!t.__dirtyText||(p=t.__textCotentBlock=_n(i,c,d,f,n.truncate));var g=p.outerHeight,m=p.lines,v=p.lineHeight,y=Vn(Ln,t,n,o),x=y.baseX,_=y.baseY,w=y.textAlign||"left",b=y.textVerticalAlign;On(e,n,o,x,_);var S=fn(_,g,b),M=x,I=S;if(s||d){var T=hn(i,c);d&&(T+=d[1]+d[3]);var A=dn(x,T,w);s&&Rn(t,e,n,A,S,T,g),d&&(M=Zn(x,w,d),I+=d[0])}e.textAlign=w,e.textBaseline="middle",e.globalAlpha=n.opacity||1;for(var D=0;D<Dn.length;D++){var C=Dn[D],L=C[0],k=C[1],P=n[L];l&&P===r[L]||(e[k]=Ri(e,k,P||C[2]))}I+=v/2;var N=n.textStrokeWidth,O=l?r.textStrokeWidth:null,E=!l||N!==O,z=!l||E||n.textStroke!==r.textStroke,R=Fn(n.textStroke,N),B=Wn(n.textFill);R&&(E&&(e.lineWidth=N),z&&(e.strokeStyle=R));B&&(l&&n.textFill===r.textFill||(e.fillStyle=B));if(1===m.length)R&&e.strokeText(m[0],M,I),B&&e.fillText(m[0],M,I);else for(D=0;D<m.length;D++)R&&e.strokeText(m[D],M,I),B&&e.fillText(m[D],M,I),I+=v}(t,e,i,n,o,a)}function On(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 En(t,e,i,n,o,a,r,s){var l=n.rich[i.styleName]||{};l.text=i.text;var u=i.textVerticalAlign,h=a+o/2;"top"===u?h=a+i.height/2:"bottom"===u&&(h=a+o-i.height/2),!i.isLineHolder&&zn(l)&&Rn(t,e,l,"right"===s?r-i.width:"center"===s?r-i.width/2:r,h-i.height/2,i.width,i.height);var c=i.textPadding;c&&(r=Zn(r,s,c),h-=i.height/2-c[2]-i.textHeight/2),Gn(e,"shadowBlur",Z(l.textShadowBlur,n.textShadowBlur,0)),Gn(e,"shadowColor",l.textShadowColor||n.textShadowColor||"transparent"),Gn(e,"shadowOffsetX",Z(l.textShadowOffsetX,n.textShadowOffsetX,0)),Gn(e,"shadowOffsetY",Z(l.textShadowOffsetY,n.textShadowOffsetY,0)),Gn(e,"textAlign",s),Gn(e,"textBaseline","middle"),Gn(e,"font",i.font||In);var d=Fn(l.textStroke||n.textStroke,p),f=Wn(l.textFill||n.textFill),p=H(l.textStrokeWidth,n.textStrokeWidth);d&&(Gn(e,"lineWidth",p),Gn(e,"strokeStyle",d),e.strokeText(i.text,r,h)),f&&(Gn(e,"fillStyle",f),e.fillText(i.text,r,h))}function zn(t){return!!(t.textBackgroundColor||t.textBorderWidth&&t.textBorderColor)}function Rn(t,e,i,n,o,a,r){var s=i.textBackgroundColor,l=i.textBorderWidth,u=i.textBorderColor,h=z(s);if(Gn(e,"shadowBlur",i.textBoxShadowBlur||0),Gn(e,"shadowColor",i.textBoxShadowColor||"transparent"),Gn(e,"shadowOffsetX",i.textBoxShadowOffsetX||0),Gn(e,"shadowOffsetY",i.textBoxShadowOffsetY||0),h||l&&u){e.beginPath();var c=i.textBorderRadius;c?Mn(e,{x:n,y:o,width:a,height:r,r:c}):e.rect(n,o,a,r),e.closePath()}if(h)if(Gn(e,"fillStyle",s),null!=i.fillOpacity){var d=e.globalAlpha;e.globalAlpha=i.fillOpacity*i.opacity,e.fill(),e.globalAlpha=d}else e.fill();else if(R(s)){var f=s.image;(f=tn(f,null,t,Bn,s))&&nn(f)&&e.drawImage(f,n,o,a,r)}if(l&&u)if(Gn(e,"lineWidth",l),Gn(e,"strokeStyle",u),null!=i.strokeOpacity){d=e.globalAlpha;e.globalAlpha=i.strokeOpacity*i.opacity,e.stroke(),e.globalAlpha=d}else e.stroke()}function Bn(t,e){e.image=t}function Vn(t,e,i,n){var o=i.x||0,a=i.y||0,r=i.textAlign,s=i.textVerticalAlign;if(n){var l=i.textPosition;if(l instanceof Array)o=n.x+Hn(l[0],n.width),a=n.y+Hn(l[1],n.height);else{var u=e&&e.calculateTextPosition?e.calculateTextPosition(Cn,i,n):pn(Cn,i,n);o=u.x,a=u.y,r=r||u.textAlign,s=s||u.textVerticalAlign}var h=i.textOffset;h&&(o+=h[0],a+=h[1])}return(t=t||{}).baseX=o,t.baseY=a,t.textAlign=r,t.textVerticalAlign=s,t}function Gn(t,e,i){return t[e]=Ri(t,e,i),t[e]}function Fn(t,e){return null==t||e<=0||"transparent"===t||"none"===t?null:t.image||t.colorStops?"#000":t}function Wn(t){return null==t||"none"===t?null:t.image||t.colorStops?"#000":t}function Hn(t,e){return"string"==typeof t?0<=t.lastIndexOf("%")?parseFloat(t)/100*e:parseFloat(t):t}function Zn(t,e,i){return"right"===e?t-i[1]:"center"===e?t+i[3]/2-i[1]/2:t+i[3]}function Un(t,e){return null!=t&&(t||e.textBackgroundColor||e.textBorderWidth&&e.textBorderColor||e.textPadding)}function Xn(){}var Yn=new Mi;function jn(t){for(var e in t=t||{},mi.call(this,t),t)t.hasOwnProperty(e)&&"style"!==e&&(this[e]=t[e]);this.style=new Fi(t.style,this),this._rect=null,this.__clipPaths=null}function qn(t){jn.call(this,t)}jn.prototype={constructor:jn,type:"displayable",__dirty:!0,invisible:!(Xn.prototype={constructor:Xn,drawRectText:function(t,e){var i=this.style;e=i.textRect||e,this.__dirty&&kn(i);var n=i.text;if(null!=n&&(n+=""),Un(n,i)){t.save();var o=this.transform;i.transformText?this.setTransform(t):o&&(Yn.copy(e),Yn.applyTransform(o),e=Yn),Nn(this,t,n,i,e,Vi),t.restore()}}}),z:0,z2:0,zlevel:0,draggable:!1,dragging:!1,silent:!1,culling:!1,cursor:"pointer",rectHover:!1,progressive:!1,incremental:!1,globalScaleRatio: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=this.__dirtyText=!0,this._rect=null,this.__zr&&this.__zr.refresh()},animateStyle:function(t){return this.animate("style",t)},attrKV:function(t,e){"style"!==t?mi.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 Fi(t,this),this.dirty(!1),this},calculateTextPosition:null},w(jn,mi),b(jn,Xn),qn.prototype={constructor:qn,type:"image",brush:function(t,e){var i=this.style,n=i.image;i.bind(t,this,e);var o=this._image=tn(n,this._image,this,this.onload);if(o&&nn(o)){var a=i.x||0,r=i.y||0,s=i.width,l=i.height,u=o.width/o.height;if(null==s&&null!=l?s=l*u:null==l&&null!=s?l=s/u:null==s&&null==l&&(s=o.width,l=o.height),this.setTransform(t),i.sWidth&&i.sHeight){var h=i.sx||0,c=i.sy||0;t.drawImage(o,h,c,i.sWidth,i.sHeight,a,r,s,l)}else if(i.sx&&i.sy){var d=s-(h=i.sx),f=l-(c=i.sy);t.drawImage(o,h,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 Mi(t.x||0,t.y||0,t.width||0,t.height||0)),this._rect}},w(qn,jn);var Kn=314159;function $n(t){return parseInt(t,10)}var Jn=new Mi(0,0,0,0),Qn=new Mi(0,0,0,0);function to(t,e,i){this.type="canvas";var n=!t.nodeName||"CANVAS"===t.nodeName.toUpperCase();this._opts=i=L({},i||{}),this.dpr=i.devicePixelRatio||hi,this._singleCanvas=n;var o=(this.root=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 a=this._zlevelList=[],r=this._layers={};if(this._layerConfig={},this._needsManuallyCompositing=!1,n){var s=t.width,l=t.height;null!=i.width&&(s=i.width),null!=i.height&&(l=i.height),this.dpr=i.devicePixelRatio||1,t.width=s*this.dpr,t.height=l*this.dpr,this._width=s,this._height=l;var u=new Ki(t,this,this.dpr);u.__builtin__=!0,u.initContext(),(r[Kn]=u).zlevel=Kn,a.push(Kn),this._domRoot=t}else{this._width=this._getSize(0),this._height=this._getSize(1);var h=this._domRoot=function(t,e){var i=document.createElement("div");return i.style.cssText=["position:relative","width:"+t+"px","height:"+e+"px","padding:0","margin:0","border-width:0"].join(";")+";",i}(this._width,this._height);t.appendChild(h)}this._hoverlayer=null,this._hoverElements=[]}to.prototype={constructor:to,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];if(!a.__builtin__&&a.refresh){var r=0===n?this._backgroundColor:null;a.refresh(r)}}return this.refreshHover(),this},addHover:function(t,e){if(!t.__hoverMir){var i=new t.constructor({style:t.style,shape:t.shape,z:t.z,z2:t.z2,silent:t.silent});return(i.__from=t).__hoverMir=i,e&&i.setStyle(e),this._hoverElements.push(i),i}},removeHover:function(t){var e=t.__hoverMir,i=this._hoverElements,n=_(i,e);0<=n&&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){Ni(t,this.storage.displayableSortFunc);var n={};(i=i||(this._hoverlayer=this.getLayer(1e5))).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;$i(function(){o._paintList(t,e,i)})}}},_compositeManually:function(){var e=this.getLayer(Kn).ctx,i=this._domRoot.width,n=this._domRoot.height;e.clearRect(0,0,i,n),this.eachBuiltinLayer(function(t){t.virtual&&e.drawImage(t.dom,0,0,i,n)})},_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,l=(s=i[r]).ctx,u={};l.save();var h=e?s.__startIndex:s.__drawIndex,c=!e&&s.incremental&&Date.now,d=c&&Date.now(),f=s.zlevel===this._zlevelList[0]?this._backgroundColor:null;if(s.__startIndex===s.__endIndex)s.clear(!1,f);else if(h===s.__startIndex){var p=t[h];p.incremental&&p.notClear&&!e||s.clear(!1,f)}-1===h&&(console.error("For some unknown reason. drawIndex is -1"),h=s.__startIndex);for(var g=h;g<s.__endIndex;g++){var m=t[g];if(this._doPaintEl(m,s,e,u),m.__dirty=m.__dirtyText=!1,c)if(15<Date.now()-d)break}s.__drawIndex=g,s.__drawIndex<s.__endIndex&&(a=!1),u.prevElClipPaths&&l.restore(),l.restore()}return v.wxa&&E(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||!function(t,e,i){return Jn.copy(t.getBoundingRect()),t.transform&&Jn.applyTransform(t.transform),Qn.width=e,Qn.height=i,!Jn.intersect(Qn)}(t,this._width,this._height))){var r=t.__clipPaths,s=n.prevElClipPaths;s&&!function(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;return!1}(r,s)||(s&&(o.restore(),n.prevElClipPaths=null,n.prevEl=null),r&&(o.save(),function(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)}}(r,o),n.prevElClipPaths=r)),t.beforeBrush&&t.beforeBrush(o),t.brush(o,n.prevEl||null),(n.prevEl=t).afterBrush&&t.afterBrush(o)}},getLayer:function(t,e){this._singleCanvas&&!this._needsManuallyCompositing&&(t=Kn);var i=this._layers[t];return i||((i=new Ki("zr_"+t,this,this.dpr)).zlevel=t,i.__builtin__=!0,this._layerConfig[t]&&m(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])fi("ZLevel "+t+" has been used already");else if(function(t){return!!t&&(!!t.__builtin__||"function"==typeof t.resize&&"function"==typeof t.refresh)}(e)){if(0<o&&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).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 fi("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){n&&(n.__endIndex!==t&&(n.__dirty=!0),n.__endIndex=t)}if(this.eachBuiltinLayer(function(t,e){t.__dirty=t.__used=!1}),this._singleCanvas)for(var i=1;i<t.length;i++){if((a=t[i]).zlevel!==t[i-1].zlevel||a.incremental){this._needsManuallyCompositing=!0;break}}var n=null,o=0;for(i=0;i<t.length;i++){var a,r,s=(a=t[i]).zlevel;a.incremental?((r=this.getLayer(s+.001,this._needsManuallyCompositing)).incremental=!0,o=1):r=this.getLayer(s+(0<o?.01:0),this._needsManuallyCompositing),r.__builtin__||fi("ZLevel "+s+" has been used by unkown layer "+r.id),r!==n&&(r.__used=!0,r.__startIndex!==i&&(r.__dirty=!0),r.__startIndex=i,r.incremental?r.__drawIndex=-1:r.__drawIndex=i,e(i),n=r),a.__dirty&&(r.__dirty=!0,r.incremental&&r.__drawIndex<0&&(r.__drawIndex=i))}e(i),this.eachBuiltinLayer(function(t,e){!t.__used&&0<t.getElementCount()&&(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()},setBackgroundColor:function(t){this._backgroundColor=t},configLayer:function(t,e){if(e){var i=this._layerConfig;i[t]?m(i[t],e,!0):i[t]=e;for(var n=0;n<this._zlevelList.length;n++){var o=this._zlevelList[n];if(o===t||o===t+.01)m(this._layers[o],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(_(i,t),1))},resize:function(e,i){if(this._domRoot.style){var t=this._domRoot;t.style.display="none";var n=this._opts;if(null!=e&&(n.width=e),null!=i&&(n.height=i),e=this._getSize(0),i=this._getSize(1),t.style.display="",this._width!==e||i!==this._height){for(var o in t.style.width=e+"px",t.style.height=i+"px",this._layers)this._layers.hasOwnProperty(o)&&this._layers[o].resize(e,i);E(this._progressiveLayers,function(t){t.resize(e,i)}),this.refresh(!0)}this._width=e,this._height=i}else{if(null==e||null==i)return;this._width=e,this._height=i,this.getLayer(Kn).resize(e,i)}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[Kn].dom;var e=new Ki("image",this,t.pixelRatio||this.dpr);if(e.initContext(),e.clear(!1,t.backgroundColor||this._backgroundColor),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]||$n(s[i])||$n(r.style[i]))-($n(s[o])||0)-($n(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,u=a.hasStroke()?a.lineWidth:0,h=Math.max(u/2,r-s),c=Math.max(u/2,s+r),d=Math.max(u/2,r-l),f=Math.max(u/2,l+r),p=o.width+h+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=[h-o.x,d-o.y],t.rotation=0,t.scale=[1,1],t.updateTransform(),t&&t.brush(n);var v=new qn({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}};function eo(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,Ct.call(this)}eo.prototype={constructor:eo,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=_(this._clips,t);0<=e&&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(){var e=this;this._running=!0,$i(function t(){e._running&&($i(t),e._paused||e._update())})},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=[]},isFinished:function(){return!this._clips.length},animate:function(t,e){var i=new li(t,(e=e||{}).loop,e.getter,e.setter);return this.addAnimator(i),i}},b(eo,Ct);var io,no,oo=v.domSupported,ao=(no={pointerdown:1,pointerup:1,pointermove:1,pointerout:1},{mouse:io=["click","dblclick","mousewheel","mouseout","mouseup","mousedown","mousemove","contextmenu"],touch:["touchstart","touchend","touchmove"],pointer:N(io,function(t){var e=t.replace("mouse","pointer");return no.hasOwnProperty(e)?e:t})}),ro={mouse:["mousemove","mouseup"],pointer:["pointermove","pointerup"]};function so(t){return"mousewheel"===t&&v.browser.firefox?"DOMMouseScroll":t}function lo(t){var e=t.pointerType;return"pen"===e||"touch"===e}function uo(t){t&&(t.zrByTouch=!0)}function ho(t,e){for(var i=!1;(e=e&&e.parentNode)&&9!==e.nodeType&&!(i=e===t.painterRoot););return i}function co(t,e){this.type=e.type,this.target=this.currentTarget=t.dom,this.pointerType=e.pointerType,this.clientX=e.clientX,this.clientY=e.clientY}var fo=co.prototype;fo.stopPropagation=fo.stopImmediatePropagation=fo.preventDefault=et;var po={mousedown:function(t){t=Gt(this.dom,t),this._mayPointerCapture=[t.zrX,t.zrY],this.trigger("mousedown",t)},mousemove:function(t){t=Gt(this.dom,t);var e=this._mayPointerCapture;!e||t.zrX===e[0]&&t.zrY===e[1]||_o(this,!0),this.trigger("mousemove",t)},mouseup:function(t){t=Gt(this.dom,t),_o(this,!1),this.trigger("mouseup",t)},mouseout:function(t){t=Gt(this.dom,t),this._pointerCapturing&&(t.zrEventControl="no_globalout");var e=t.toElement||t.relatedTarget;t.zrIsToLocalDOM=ho(this,e),this.trigger("mouseout",t)},touchstart:function(t){uo(t=Gt(this.dom,t)),this._lastTouchMoment=new Date,this.handler.processGesture(t,"start"),po.mousemove.call(this,t),po.mousedown.call(this,t)},touchmove:function(t){uo(t=Gt(this.dom,t)),this.handler.processGesture(t,"change"),po.mousemove.call(this,t)},touchend:function(t){uo(t=Gt(this.dom,t)),this.handler.processGesture(t,"end"),po.mouseup.call(this,t),+new Date-this._lastTouchMoment<300&&po.click.call(this,t)},pointerdown:function(t){po.mousedown.call(this,t)},pointermove:function(t){lo(t)||po.mousemove.call(this,t)},pointerup:function(t){po.mouseup.call(this,t)},pointerout:function(t){lo(t)||po.mouseout.call(this,t)}};E(["click","mousewheel","dblclick","contextmenu"],function(e){po[e]=function(t){t=Gt(this.dom,t),this.trigger(e,t)}});var go={pointermove:function(t){lo(t)||go.mousemove.call(this,t)},pointerup:function(t){go.mouseup.call(this,t)},mousemove:function(t){this.trigger("mousemove",t)},mouseup:function(t){var e=this._pointerCapturing;_o(this,!1),this.trigger("mouseup",t),e&&(t.zrEventControl="only_globalout",this.trigger("mouseout",t))}};function mo(i,n){var o=n.domHandlers;v.pointerEventsSupported?E(ao.pointer,function(e){yo(n,e,function(t){o[e].call(i,t)})}):(v.touchEventsSupported&&E(ao.touch,function(e){yo(n,e,function(t){o[e].call(i,t),function(t){t.touching=!0,null!=t.touchTimer&&(clearTimeout(t.touchTimer),t.touchTimer=null),t.touchTimer=setTimeout(function(){t.touching=!1,t.touchTimer=null},700)}(n)})}),E(ao.mouse,function(e){yo(n,e,function(t){t=Vt(t),n.touching||o[e].call(i,t)})}))}function vo(i,n){function t(e){yo(n,e,function(t){t=Vt(t),ho(i,t.target)||(t=function(t,e){return Gt(t.dom,new co(t,e),!0)}(i,t),n.domHandlers[e].call(i,t))},{capture:!0})}v.pointerEventsSupported?E(ro.pointer,t):v.touchEventsSupported||E(ro.mouse,t)}function yo(t,e,i,n){t.mounted[e]=i,t.listenerOpts[e]=n,Ft(t.domTarget,so(e),i,n)}function xo(t){var e,i,n,o,a=t.mounted;for(var r in a)a.hasOwnProperty(r)&&(e=t.domTarget,i=so(r),n=a[r],o=t.listenerOpts[r],Nt?e.removeEventListener(i,n,o):e.detachEvent("on"+i,n));t.mounted={}}function _o(t,e){if(t._mayPointerCapture=null,oo&&t._pointerCapturing^e){t._pointerCapturing=e;var i=t._globalHandlerScope;e?vo(t,i):xo(i)}}function wo(t,e){this.domTarget=t,this.domHandlers=e,this.mounted={},this.listenerOpts={},this.touchTimer=null,this.touching=!1}function bo(t,e){Ct.call(this),this.dom=t,this.painterRoot=e,this._localHandlerScope=new wo(t,po),oo&&(this._globalHandlerScope=new wo(document,go)),this._pointerCapturing=!1,this._mayPointerCapture=null,mo(this,this._localHandlerScope)}var So=bo.prototype;So.dispose=function(){xo(this._localHandlerScope),oo&&xo(this._globalHandlerScope)},So.setCursor=function(t){this.dom.style&&(this.dom.style.cursor=t||"default")},b(bo,Ct);var Mo=!v.canvasSupported,Io={canvas:to},To={};function Ao(t,e){var i=new Co(n(),t,e);return To[i.id]=i}function Do(t,e){Io[t]=e}var Co=function(t,e,i){i=i||{},this.dom=e,this.id=t;var n=this,o=new Ei,a=i.renderer;if(Mo){if(!Io.vml)throw new Error("You need to require 'zrender/vml/vml' to support IE8");a="vml"}else a&&Io[a]||(a="canvas");var r=new Io[a](e,o,i,t);this.storage=o,this.painter=r;var s=v.node||v.worker?null:new bo(r.getViewportRoot(),r.root);this.handler=new Kt(o,r,s,r.root),this.animation=new eo({stage:{update:A(this.flush,this)}}),this.animation.start(),this._needsRefresh;var l=o.delFromStorage,u=o.addToStorage;o.delFromStorage=function(t){l.call(o,t),t&&t.removeSelfFromZr(n)},o.addToStorage=function(t){u.call(o,t),t.addSelfToZr(n)}};Co.prototype={constructor:Co,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&&this.painter.configLayer(t,e),this._needsRefresh=!0},setBackgroundColor:function(t){this.painter.setBackgroundColor&&this.painter.setBackgroundColor(t),this._needsRefresh=!0},refreshImmediately:function(){this._needsRefresh=this._needsRefreshHover=!1,this.painter.refresh(),this._needsRefresh=this._needsRefreshHover=!1},refresh:function(){this._needsRefresh=!0},flush:function(){var t;this._needsRefresh&&(t=!0,this.refreshImmediately()),this._needsRefreshHover&&(t=!0,this.refreshHoverImmediately()),t&&this.trigger("rendered")},addHover:function(t,e){if(this.painter.addHover){var i=this.painter.addHover(t,e);return this.refreshHover(),i}},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,function(t){delete To[t]}(this.id)}};var Lo=(Object.freeze||Object)({version:"4.2.0",init:Ao,dispose:function(t){if(t)t.dispose();else{for(var e in To)To.hasOwnProperty(e)&&To[e].dispose();To={}}return this},getInstance:function(t){return To[t]},registerPainter:Do}),ko=E,Po=R,No=k,Oo="series\0";function Eo(t){return t instanceof Array?t:null==t?[]:[t]}function zo(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])}}}var Ro=["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"];function Bo(t){return!Po(t)||No(t)||t instanceof Date?t:t.value}function Vo(t,o){o=(o||[]).slice();var a=N(t||[],function(t,e){return{exist:t}});return ko(o,function(t,e){if(Po(t)){for(var i=0;i<a.length;i++)if(!a[i].option&&null!=t.id&&a[i].exist.id===t.id+"")return a[i].option=t,void(o[e]=null);for(i=0;i<a.length;i++){var n=a[i].exist;if(!(a[i].option||null!=n.id&&null!=t.id||null==t.name||Wo(t)||Wo(n)||n.name!==t.name+""))return a[i].option=t,void(o[e]=null)}}}),ko(o,function(t,e){if(Po(t)){for(var i=0;i<a.length;i++){var n=a[i].exist;if(!a[i].option&&!Wo(n)&&null==t.id){a[i].option=t;break}}i>=a.length&&a.push({option:t})}}),a}function Go(t){var r=Q();ko(t,function(t,e){var i=t.exist;i&&r.set(i.id,t)}),ko(t,function(t,e){var i=t.option;Y(!i||null==i.id||!r.get(i.id)||r.get(i.id)===t,"id duplicates: "+(i&&i.id)),i&&null!=i.id&&r.set(i.id,t),t.keyInfo||(t.keyInfo={})}),ko(t,function(t,e){var i=t.exist,n=t.option,o=t.keyInfo;if(Po(n)){if(o.name=null!=n.name?n.name+"":i?i.name:Oo+e,i)o.id=i.id;else if(null!=n.id)o.id=n.id+"";else for(var a=0;o.id="\0"+o.name+"\0"+a++,r.get(o.id););r.set(o.id,t)}})}function Fo(t){var e=t.name;return!(!e||!e.indexOf(Oo))}function Wo(t){return Po(t)&&t.id&&0===(t.id+"").indexOf("\0_ec_\0")}function Ho(e,t){return null!=t.dataIndexInside?t.dataIndexInside:null!=t.dataIndex?k(t.dataIndex)?N(t.dataIndex,function(t){return e.indexOfRawIndex(t)}):e.indexOfRawIndex(t.dataIndex):null!=t.name?k(t.name)?N(t.name,function(t){return e.indexOfName(t)}):e.indexOfName(t.name):void 0}function Zo(){var e="__\0ec_inner_"+Uo+++"_"+Math.random().toFixed(5);return function(t){return t[e]||(t[e]={})}}var Uo=0;function Xo(s,l,u){if(z(l)){var t={};t[l+"Index"]=0,l=t}var e=u&&u.defaultMainType;!e||Yo(l,e+"Index")||Yo(l,e+"Id")||Yo(l,e+"Name")||(l[e+"Index"]=0);var h={};return ko(l,function(t,e){t=l[e];if("dataIndex"!==e&&"dataIndexInside"!==e){var i=e.match(/^(\w+)(Index|Id|Name)$/)||[],n=i[1],o=(i[2]||"").toLowerCase();if(!(!n||!o||null==t||"index"===o&&"none"===t||u&&u.includeMainTypes&&_(u.includeMainTypes,n)<0)){var a={mainType:n};"index"===o&&"all"===t||(a[o]=t);var r=s.queryComponents(a);h[n+"Models"]=r,h[n+"Model"]=r[0]}}else h[e]=t}),h}function Yo(t,e){return t&&t.hasOwnProperty(e)}function jo(t,e,i){t.setAttribute?t.setAttribute(e,i):t[e]=i}function qo(t){return"auto"===t?v.domSupported?"html":"richText":t||"html"}function Ko(t,i){var n=Q(),o=[];return E(t,function(t){var e=i(t);(n.get(e)||(o.push(e),n.set(e,[]))).push(t)}),{keys:o,buckets:n}}var $o=".",Jo="___EC__COMPONENT__CONTAINER___";function Qo(t){var e={main:"",sub:""};return t&&(t=t.split($o),e.main=t[0]||"",e.sub=t[1]||""),e}function ta(t){(t.$constructor=t).extend=function(t){function e(){t.$constructor?t.$constructor.apply(this,arguments):i.apply(this,arguments)}var i=this;return L(e.prototype,t),e.extend=this.extend,e.superCall=na,e.superApply=oa,w(e,this),e.superClass=i,e}}var ea=0;function ia(t){var e=["__\0is_clz",ea++,Math.random().toFixed(3)].join("_");t.prototype[e]=!0,t.isInstance=function(t){return!(!t||!t[e])}}function na(t,e){var i=U(arguments,2);return this.superClass.prototype[e].apply(t,i)}function oa(t,e,i){return this.superClass.prototype[e].apply(t,i)}function aa(i,t){t=t||{};var o={};if(i.registerClass=function(t,e){if(e)if(function(t){Y(/^[a-zA-Z0-9_]+([.][a-zA-Z0-9_]+)?$/.test(t),'componentType "'+t+'" illegal')}(e),(e=Qo(e)).sub){if(e.sub!==Jo){(function(t){var e=o[t.main];e&&e[Jo]||((e=o[t.main]={})[Jo]=!0);return e})(e)[e.sub]=t}}else o[e.main]=t;return t},i.getClass=function(t,e,i){var n=o[t];if(n&&n[Jo]&&(n=e?n[e]:null),i&&!n)throw new Error(e?"Component "+t+"."+(e||"")+" not exists. Load it first.":t+".type should be specified.");return n},i.getClassesByMainType=function(t){t=Qo(t);var i=[],e=o[t.main];return e&&e[Jo]?E(e,function(t,e){e!==Jo&&i.push(t)}):i.push(e),i},i.hasClass=function(t){return t=Qo(t),!!o[t.main]},i.getAllClassMainTypes=function(){var i=[];return E(o,function(t,e){i.push(e)}),i},i.hasSubTypes=function(t){t=Qo(t);var e=o[t.main];return e&&e[Jo]},i.parseClassType=Qo,t.registerWhenExtend){var n=i.extend;n&&(i.extend=function(t){var e=n.call(this,t);return i.registerClass(e,t.type)})}return i}function ra(s){for(var t=0;t<s.length;t++)s[t][1]||(s[t][1]=s[t][0]);return function(t,e,i){for(var n={},o=0;o<s.length;o++){var a=s[o][1];if(!(e&&0<=_(e,a)||i&&_(i,a)<0)){var r=t.getShallow(a);null!=r&&(n[s[o][0]]=r)}}return n}}var sa=ra([["lineWidth","width"],["stroke","color"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),la={getLineStyle:function(t){var e=sa(this,t);return e.lineDash=this.getLineDash(e.lineWidth),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&&("dashed"===e?[n,n]:[i,i])}},ua=ra([["fill","color"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["opacity"],["shadowColor"]]),ha={getAreaStyle:function(t,e){return ua(this,t,e)}},ca=Math.pow,da=Math.sqrt,fa=1e-8,pa=1e-4,ga=da(3),ma=1/3,va=ot(),ya=ot(),xa=ot();function _a(t){return-fa<t&&t<fa}function wa(t){return fa<t||t<-fa}function ba(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 Sa(t,e,i,n,o){var a=1-o;return 3*(((e-t)*a+2*(i-e)*o)*a+(n-i)*o*o)}function Ma(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(_a(r)){if(wa(a))0<=(h=-s/a)&&h<=1&&(o[l++]=h)}else{var u=a*a-4*r*s;if(_a(u))o[0]=-a/(2*r);else if(0<u){var h,c=da(u),d=(-a-c)/(2*r);0<=(h=(-a+c)/(2*r))&&h<=1&&(o[l++]=h),0<=d&&d<=1&&(o[l++]=d)}}return l}function Ia(t,e,i,n,o,a){var r=(e-t)*o+t,s=(i-e)*o+e,l=(n-i)*o+i,u=(s-r)*o+r,h=(l-s)*o+s,c=(h-u)*o+u;a[0]=t,a[1]=r,a[2]=u,a[3]=c,a[4]=c,a[5]=h,a[6]=l,a[7]=n}function Ta(t,e,i,n){var o=1-n;return o*(o*t+2*n*e)+n*n*i}function Aa(t,e,i,n){return 2*((1-n)*(e-t)+n*(i-e))}function Da(t,e,i){var n=t+i-2*e;return 0==n?.5:(t-e)/n}function Ca(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}var La=Math.min,ka=Math.max,Pa=Math.sin,Na=Math.cos,Oa=2*Math.PI,Ea=ot(),za=ot(),Ra=ot();function Ba(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=La(a,o[0]),r=ka(r,o[0]),s=La(s,o[1]),l=ka(l,o[1]);e[0]=a,e[1]=s,i[0]=r,i[1]=l}}function Va(t,e,i,n,o,a){o[0]=La(t,i),o[1]=La(e,n),a[0]=ka(t,i),a[1]=ka(e,n)}var Ga=[],Fa=[];function Wa(t,e,i,n,o,a,r,s,l,u){var h,c=Ma,d=ba,f=c(t,i,o,r,Ga);for(l[0]=1/0,l[1]=1/0,u[0]=-1/0,u[1]=-1/0,h=0;h<f;h++){var p=d(t,i,o,r,Ga[h]);l[0]=La(p,l[0]),u[0]=ka(p,u[0])}for(f=c(e,n,a,s,Fa),h=0;h<f;h++){var g=d(e,n,a,s,Fa[h]);l[1]=La(g,l[1]),u[1]=ka(g,u[1])}l[0]=La(t,l[0]),u[0]=ka(t,u[0]),l[0]=La(r,l[0]),u[0]=ka(r,u[0]),l[1]=La(e,l[1]),u[1]=ka(e,u[1]),l[1]=La(s,l[1]),u[1]=ka(s,u[1])}function Ha(t,e,i,n,o,a,r,s,l){var u=St,h=Mt,c=Math.abs(o-a);if(c%Oa<1e-4&&1e-4<c)return s[0]=t-i,s[1]=e-n,l[0]=t+i,void(l[1]=e+n);if(Ea[0]=Na(o)*i+t,Ea[1]=Pa(o)*n+e,za[0]=Na(a)*i+t,za[1]=Pa(a)*n+e,u(s,Ea,za),h(l,Ea,za),(o%=Oa)<0&&(o+=Oa),(a%=Oa)<0&&(a+=Oa),a<o&&!r?a+=Oa:o<a&&r&&(o+=Oa),r){var d=a;a=o,o=d}for(var f=0;f<a;f+=Math.PI/2)o<f&&(Ra[0]=Na(f)*i+t,Ra[1]=Pa(f)*n+e,u(s,Ra,s),h(l,Ra,l))}var Za={M:1,L:2,C:3,Q:4,A:5,Z:6,R:7},Ua=[],Xa=[],Ya=[],ja=[],qa=Math.min,Ka=Math.max,$a=Math.cos,Ja=Math.sin,Qa=Math.sqrt,tr=Math.abs,er="undefined"!=typeof Float32Array,ir=function(t){this._saveData=!t,this._saveData&&(this.data=[]),this._ctx=null};function nr(t,e,i,n,o,a,r){if(0===o)return!1;var s=o,l=0;if(e+s<r&&n+s<r||r<e-s&&r<n-s||t+s<a&&i+s<a||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+(t*n-i*e)/(t-i);return u*u/(l*l+1)<=s/2*s/2}function or(t,e,i,n,o,a,r,s,l,u,h){if(0===l)return!1;var c=l;return!(e+c<h&&n+c<h&&a+c<h&&s+c<h||h<e-c&&h<n-c&&h<a-c&&h<s-c||t+c<u&&i+c<u&&o+c<u&&r+c<u||u<t-c&&u<i-c&&u<o-c&&u<r-c)&&function(t,e,i,n,o,a,r,s,l,u,h){var c,d,f,p,g,m=.005,v=1/0;va[0]=l,va[1]=u;for(var y=0;y<1;y+=.05)ya[0]=ba(t,i,o,r,y),ya[1]=ba(e,n,a,s,y),(p=_t(va,ya))<v&&(c=y,v=p);v=1/0;for(var x=0;x<32&&!(m<pa);x++)d=c-m,f=c+m,ya[0]=ba(t,i,o,r,d),ya[1]=ba(e,n,a,s,d),p=_t(ya,va),0<=d&&p<v?(c=d,v=p):(xa[0]=ba(t,i,o,r,f),xa[1]=ba(e,n,a,s,f),g=_t(xa,va),f<=1&&g<v?(c=f,v=g):m*=.5);return h&&(h[0]=ba(t,i,o,r,c),h[1]=ba(e,n,a,s,c)),da(v)}(t,e,i,n,o,a,r,s,u,h,null)<=c/2}function ar(t,e,i,n,o,a,r,s,l){if(0===r)return!1;var u=r;return!(e+u<l&&n+u<l&&a+u<l||l<e-u&&l<n-u&&l<a-u||t+u<s&&i+u<s&&o+u<s||s<t-u&&s<i-u&&s<o-u)&&function(t,e,i,n,o,a,r,s,l){var u,h=.005,c=1/0;va[0]=r,va[1]=s;for(var d=0;d<1;d+=.05){ya[0]=Ta(t,i,o,d),ya[1]=Ta(e,n,a,d),(m=_t(va,ya))<c&&(u=d,c=m)}c=1/0;for(var f=0;f<32&&!(h<pa);f++){var p=u-h,g=u+h;ya[0]=Ta(t,i,o,p),ya[1]=Ta(e,n,a,p);var m=_t(ya,va);if(0<=p&&m<c)u=p,c=m;else{xa[0]=Ta(t,i,o,g),xa[1]=Ta(e,n,a,g);var v=_t(xa,va);g<=1&&v<c?(u=g,c=v):h*=.5}}return l&&(l[0]=Ta(t,i,o,u),l[1]=Ta(e,n,a,u)),da(c)}(t,e,i,n,o,a,s,l,null)<=u/2}ir.prototype={constructor:ir,_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,i){i=i||0,this._ux=tr(i/hi/t)||0,this._uy=tr(i/hi/e)||0},getContext:function(){return this._ctx},beginPath:function(t){return(this._ctx=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(Za.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=tr(t-this._xi)>this._ux||tr(e-this._yi)>this._uy||this._len<5;return this.addData(Za.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(Za.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(Za.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(Za.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=$a(o)*i+t,this._yi=Ja(o)*i+e,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(Za.R,t,e,i,n),this},closePath:function(){this.addData(Za.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;for(var e=this._dashIdx=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||!er||(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();er&&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,u=this._yi,h=t-l,c=e-u,d=Qa(h*h+c*c),f=l,p=u,g=r.length;for(a<0&&(a=o+a),f-=(a%=o)*(h/=d),p-=a*(c/=d);0<h&&f<=t||h<0&&t<=f||0===h&&(0<c&&p<=e||c<0&&e<=p);)f+=h*(i=r[n=this._dashIdx]),p+=c*i,this._dashIdx=(n+1)%g,0<h&&f<l||h<0&&l<f||0<c&&p<u||c<0&&u<p||s[n%2?"moveTo":"lineTo"](0<=h?qa(f,t):Ka(f,t),0<=c?qa(p,e):Ka(p,e));h=f-t,c=p-e,this._dashOffset=-Qa(h*h+c*c)},_dashedBezierTo:function(t,e,i,n,o,a){var r,s,l,u,h,c=this._dashSum,d=this._dashOffset,f=this._lineDash,p=this._ctx,g=this._xi,m=this._yi,v=ba,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+=Qa(s*s+l*l);for(;x<_&&!(d<(w+=f[x]));x++);for(r=(w-d)/y;r<=1;)u=v(g,t,i,o,r),h=v(m,e,n,a,r),x%2?p.moveTo(u,h):p.lineTo(u,h),r+=f[x]/y,x=(x+1)%_;x%2!=0&&p.lineTo(o,a),s=o-u,l=a-h,this._dashOffset=-Qa(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,er&&(this.data=new Float32Array(t)))},getBoundingRect:function(){Ua[0]=Ua[1]=Ya[0]=Ya[1]=Number.MAX_VALUE,Xa[0]=Xa[1]=ja[0]=ja[1]=-Number.MAX_VALUE;for(var t,e,i,n,o,a,r,s,l,u,h,c,d,f,p=this.data,g=0,m=0,v=0,y=0,x=0;x<p.length;){var _=p[x++];switch(1===x&&(v=g=p[x],y=m=p[x+1]),_){case Za.M:g=v=p[x++],m=y=p[x++],Ya[0]=v,Ya[1]=y,ja[0]=v,ja[1]=y;break;case Za.L:Va(g,m,p[x],p[x+1],Ya,ja),g=p[x++],m=p[x++];break;case Za.C:Wa(g,m,p[x++],p[x++],p[x++],p[x++],p[x],p[x+1],Ya,ja),g=p[x++],m=p[x++];break;case Za.Q:t=g,e=m,i=p[x++],n=p[x++],o=p[x],a=p[x+1],r=Ya,s=ja,u=l=void 0,u=Ta,h=ka(La((l=Da)(t,i,o),1),0),c=ka(La(l(e,n,a),1),0),d=u(t,i,o,h),f=u(e,n,a,c),r[0]=La(t,o,d),r[1]=La(e,a,f),s[0]=ka(t,o,d),s[1]=ka(e,a,f),g=p[x++],m=p[x++];break;case Za.A:var w=p[x++],b=p[x++],S=p[x++],M=p[x++],I=p[x++],T=p[x++]+I;x+=1;var A=1-p[x++];1===x&&(v=$a(I)*S+w,y=Ja(I)*M+b),Ha(w,b,S,M,I,T,A,Ya,ja),g=$a(T)*S+w,m=Ja(T)*M+b;break;case Za.R:Va(v=g=p[x++],y=m=p[x++],v+p[x++],y+p[x++],Ya,ja);break;case Za.Z:g=v,m=y}St(Ua,Ua,Ya),Mt(Xa,Xa,ja)}return 0===x&&(Ua[0]=Ua[1]=Xa[0]=Xa[1]=0),new Mi(Ua[0],Ua[1],Xa[0]-Ua[0],Xa[1]-Ua[1])},rebuildPath:function(t){for(var e,i,n,o,a,r,s=this.data,l=this._ux,u=this._uy,h=this._len,c=0;c<h;){var d=s[c++];switch(1===c&&(e=n=s[c],i=o=s[c+1]),d){case Za.M:e=n=s[c++],i=o=s[c++],t.moveTo(n,o);break;case Za.L:a=s[c++],r=s[c++],(tr(a-n)>l||tr(r-o)>u||c===h-1)&&(t.lineTo(a,r),n=a,o=r);break;case Za.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 Za.Q:t.quadraticCurveTo(s[c++],s[c++],s[c++],s[c++]),n=s[c-2],o=s[c-1];break;case Za.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=m<g?g:m,b=m<g?1:g/m,S=m<g?m/g:1,M=v+y;.001<Math.abs(g-m)?(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=$a(v)*g+f,i=Ja(v)*m+p),n=$a(M)*g+f,o=Ja(M)*m+p;break;case Za.R:e=n=s[c],i=o=s[c+1],t.rect(s[c++],s[c++],s[c++],s[c++]);break;case Za.Z:t.closePath(),n=e,o=i}}}},ir.CMD=Za;var rr=2*Math.PI;function sr(t){return(t%=rr)<0&&(t+=rr),t}var lr=2*Math.PI;function ur(t,e,i,n,o,a,r,s,l){if(0===r)return!1;var u=r;s-=t,l-=e;var h=Math.sqrt(s*s+l*l);if(i<h-u||h+u<i)return!1;if(Math.abs(n-o)%lr<1e-4)return!0;if(a){var c=n;n=sr(o),o=sr(c)}else n=sr(n),o=sr(o);o<n&&(o+=lr);var d=Math.atan2(l,s);return d<0&&(d+=lr),n<=d&&d<=o||n<=d+lr&&d+lr<=o}function hr(t,e,i,n,o,a){if(e<a&&n<a||a<e&&a<n)return 0;if(n===e)return 0;var r=n<e?1:-1,s=(a-e)/(n-e);1!=s&&0!=s||(r=n<e?.5:-.5);var l=s*(i-t)+t;return l===o?1/0:o<l?r:0}var cr=ir.CMD,dr=2*Math.PI,fr=1e-4;var pr=[-1,-1,-1],gr=[-1,-1];function mr(t,e,i,n,o,a,r,s,l,u){if(e<u&&n<u&&a<u&&s<u||u<e&&u<n&&u<a&&u<s)return 0;var h,c=function(t,e,i,n,o,a){var r=n+3*(e-i)-t,s=3*(i-2*e+t),l=3*(e-t),u=t-o,h=s*s-3*r*l,c=s*l-9*r*u,d=l*l-3*s*u,f=0;if(_a(h)&&_a(c)){if(_a(s))a[0]=0;else 0<=(M=-l/s)&&M<=1&&(a[f++]=M)}else{var p=c*c-4*h*d;if(_a(p)){var g=c/h,m=-g/2;0<=(M=-s/r+g)&&M<=1&&(a[f++]=M),0<=m&&m<=1&&(a[f++]=m)}else if(0<p){var v=da(p),y=h*s+1.5*r*(-c+v),x=h*s+1.5*r*(-c-v);0<=(M=(-s-((y=y<0?-ca(-y,ma):ca(y,ma))+(x=x<0?-ca(-x,ma):ca(x,ma))))/(3*r))&&M<=1&&(a[f++]=M)}else{var _=(2*h*s-3*r*c)/(2*da(h*h*h)),w=Math.acos(_)/3,b=da(h),S=Math.cos(w),M=(-s-2*b*S)/(3*r),I=(m=(-s+b*(S+ga*Math.sin(w)))/(3*r),(-s+b*(S-ga*Math.sin(w)))/(3*r));0<=M&&M<=1&&(a[f++]=M),0<=m&&m<=1&&(a[f++]=m),0<=I&&I<=1&&(a[f++]=I)}}return f}(e,n,a,s,u,pr);if(0===c)return 0;for(var d,f,p=0,g=-1,m=0;m<c;m++){var v=pr[m],y=0===v||1===v?.5:1;ba(t,i,o,r,v)<l||(g<0&&(g=Ma(e,n,a,s,gr),gr[1]<gr[0]&&1<g&&(void 0,h=gr[0],gr[0]=gr[1],gr[1]=h),d=ba(e,n,a,s,gr[0]),1<g&&(f=ba(e,n,a,s,gr[1]))),2===g?v<gr[0]?p+=d<e?y:-y:v<gr[1]?p+=f<d?y:-y:p+=s<f?y:-y:v<gr[0]?p+=d<e?y:-y:p+=s<d?y:-y)}return p}function vr(t,e,i,n,o,a,r,s){if(e<s&&n<s&&a<s||s<e&&s<n&&s<a)return 0;var l=function(t,e,i,n,o){var a=t-2*e+i,r=2*(e-t),s=t-n,l=0;if(_a(a)){if(wa(r))0<=(h=-s/r)&&h<=1&&(o[l++]=h)}else{var u=r*r-4*a*s;if(_a(u))0<=(h=-r/(2*a))&&h<=1&&(o[l++]=h);else if(0<u){var h,c=da(u),d=(-r-c)/(2*a);0<=(h=(-r+c)/(2*a))&&h<=1&&(o[l++]=h),0<=d&&d<=1&&(o[l++]=d)}}return l}(e,n,a,s,pr);if(0===l)return 0;var u=Da(e,n,a);if(0<=u&&u<=1){for(var h=0,c=Ta(e,n,a,u),d=0;d<l;d++){var f=0===pr[d]||1===pr[d]?.5:1;Ta(t,i,o,pr[d])<r||(pr[d]<u?h+=c<e?f:-f:h+=a<c?f:-f)}return h}f=0===pr[0]||1===pr[0]?.5:1;return Ta(t,i,o,pr[0])<r?0:a<e?f:-f}function yr(t,e,i,n,o,a,r,s){if(i<(s-=e)||s<-i)return 0;var l=Math.sqrt(i*i-s*s);pr[0]=-l,pr[1]=l;var u=Math.abs(n-o);if(u<1e-4)return 0;if(u%dr<1e-4){o=dr;var h=a?1:-1;return r>=pr[n=0]+t&&r<=pr[1]+t?h:0}if(a){l=n;n=sr(o),o=sr(l)}else n=sr(n),o=sr(o);o<n&&(o+=dr);for(var c=0,d=0;d<2;d++){var f=pr[d];if(r<f+t){var p=Math.atan2(s,f);h=a?1:-1;p<0&&(p=dr+p),(n<=p&&p<=o||n<=p+dr&&p+dr<=o)&&(p>Math.PI/2&&p<1.5*Math.PI&&(h=-h),c+=h)}}return c}function xr(t,e,i,n,o){for(var a=0,r=0,s=0,l=0,u=0,h=0;h<t.length;){var c=t[h++];switch(c===cr.M&&1<h&&(i||(a+=hr(r,s,l,u,n,o))),1===h&&(l=r=t[h],u=s=t[h+1]),c){case cr.M:r=l=t[h++],s=u=t[h++];break;case cr.L:if(i){if(nr(r,s,t[h],t[h+1],e,n,o))return!0}else a+=hr(r,s,t[h],t[h+1],n,o)||0;r=t[h++],s=t[h++];break;case cr.C:if(i){if(or(r,s,t[h++],t[h++],t[h++],t[h++],t[h],t[h+1],e,n,o))return!0}else a+=mr(r,s,t[h++],t[h++],t[h++],t[h++],t[h],t[h+1],n,o)||0;r=t[h++],s=t[h++];break;case cr.Q:if(i){if(ar(r,s,t[h++],t[h++],t[h],t[h+1],e,n,o))return!0}else a+=vr(r,s,t[h++],t[h++],t[h],t[h+1],n,o)||0;r=t[h++],s=t[h++];break;case cr.A:var d=t[h++],f=t[h++],p=t[h++],g=t[h++],m=t[h++],v=t[h++];h+=1;var y=1-t[h++],x=Math.cos(m)*p+d,_=Math.sin(m)*g+f;1<h?a+=hr(r,s,x,_,n,o):(l=x,u=_);var w=(n-d)*g/p+d;if(i){if(ur(d,f,g,m,m+v,y,e,w,o))return!0}else a+=yr(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 cr.R:l=r=t[h++],u=s=t[h++];x=l+t[h++],_=u+t[h++];if(i){if(nr(l,u,x,u,e,n,o)||nr(x,u,x,_,e,n,o)||nr(x,_,l,_,e,n,o)||nr(l,_,l,u,e,n,o))return!0}else a+=hr(x,u,x,_,n,o),a+=hr(l,_,l,u,n,o);break;case cr.Z:if(i){if(nr(r,s,l,u,e,n,o))return!0}else a+=hr(r,s,l,u,n,o);r=l,s=u}}return i||function(t,e){return Math.abs(t-e)<fr}(s,u)||(a+=hr(r,s,l,u,n,o)||0),0!==a}var _r=Yi.prototype.getCanvasPattern,wr=Math.abs,br=new ir(!0);function Sr(t){jn.call(this,t),this.path=null}Sr.prototype={constructor:Sr,type:"path",__dirtyPath:!0,strokeContainThreshold:5,segmentIgnoreThreshold:0,subPixelOptimize:!1,brush:function(t,e){var i,n=this.style,o=this.path||br,a=n.hasStroke(),r=n.hasFill(),s=n.fill,l=n.stroke,u=r&&!!s.colorStops,h=a&&!!l.colorStops,c=r&&!!s.image,d=a&&!!l.image;n.bind(t,this,e),this.setTransform(t),this.__dirty&&(u&&(i=i||this.getBoundingRect(),this._fillGradient=n.getGradient(t,s,i)),h&&(i=i||this.getBoundingRect(),this._strokeGradient=n.getGradient(t,l,i)));u?t.fillStyle=this._fillGradient:c&&(t.fillStyle=_r.call(s,t)),h?t.strokeStyle=this._strokeGradient:d&&(t.strokeStyle=_r.call(l,t));var f=n.lineDash,p=n.lineDashOffset,g=!!t.setLineDash,m=this.getGlobalScale();if(o.setScale(m[0],m[1],this.segmentIgnoreThreshold),this.__dirtyPath||f&&!g&&a?(o.beginPath(t),f&&!g&&(o.setLineDash(f),o.setLineDashOffset(p)),this.buildPath(o,this.shape,!1),this.path&&(this.__dirtyPath=!1)):(t.beginPath(),this.path.rebuildPath(t)),r)if(null!=n.fillOpacity){var v=t.globalAlpha;t.globalAlpha=n.fillOpacity*n.opacity,o.fill(t),t.globalAlpha=v}else o.fill(t);if(f&&g&&(t.setLineDash(f),t.lineDashOffset=p),a)if(null!=n.strokeOpacity){v=t.globalAlpha;t.globalAlpha=n.strokeOpacity*n.opacity,o.stroke(t),t.globalAlpha=v}else o.stroke(t);f&&g&&t.setLineDash([]),null!=n.text&&(this.restoreTransform(t),this.drawRectText(t,this.getBoundingRect()))},buildPath:function(t,e,i){},createPathProxy:function(){this.path=new ir},getBoundingRect:function(){var t=this._rect,e=this.style,i=!t;if(i){var n=this.path;n=n||(this.path=new ir),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)),1e-10<r&&(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(1e-10<s&&(o.hasFill()||(r=Math.max(r,this.strokeContainThreshold)),function(t,e,i,n){return xr(t,e,!0,i,n)}(a,r/s,t,e)))return!0}if(o.hasFill())return function(t,e,i){return xr(t,0,!1,e,i)}(a,t,e)}return!1},dirty:function(t){null==t&&(t=!0),t&&(this.__dirtyPath=t,this._rect=null),this.__dirty=this.__dirtyText=!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):jn.prototype.attrKV.call(this,t,e)},setShape:function(t,e){var i=this.shape;if(i){if(R(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&&1e-10<wr(t[0]-1)&&1e-10<wr(t[3]-1)?Math.sqrt(wr(t[0]*t[3]-t[2]*t[1])):1}},Sr.extend=function(o){function t(t){Sr.call(this,t),o.style&&this.style.extendFrom(o.style,!1);var e=o.shape;if(e){this.shape=this.shape||{};var i=this.shape;for(var n in e)!i.hasOwnProperty(n)&&e.hasOwnProperty(n)&&(i[n]=e[n])}o.init&&o.init.call(this,t)}for(var e in w(t,Sr),o)"style"!==e&&"shape"!==e&&(t.prototype[e]=o[e]);return t},w(Sr,jn);function Mr(t){return Math.sqrt(t[0]*t[0]+t[1]*t[1])}var Ir=ir.CMD,Tr=[[],[],[]],Ar=Math.sqrt,Dr=Math.atan2,Cr=function(t,e){var i,n,o,a,r,s=t.data,l=Ir.M,u=Ir.C,h=Ir.L,c=Ir.R,d=Ir.A,f=Ir.Q;for(a=o=0;o<s.length;){switch(i=s[o++],a=o,n=0,i){case l:case h:n=1;break;case u:n=3;break;case f:n=2;break;case d:var p=e[4],g=e[5],m=Ar(e[0]*e[0]+e[1]*e[1]),v=Ar(e[2]*e[2]+e[3]*e[3]),y=Dr(-e[1]/v,e[0]/m);s[o]*=m,s[o++]+=p,s[o]*=v,s[o++]+=g,s[o++]*=m,s[o++]*=v,s[o++]+=y,s[o++]+=y,a=o+=2;break;case c:x[0]=s[o++],x[1]=s[o++],bt(x,x,e),s[a++]=x[0],s[a++]=x[1],x[0]+=s[o++],x[1]+=s[o++],bt(x,x,e),s[a++]=x[0],s[a++]=x[1]}for(r=0;r<n;r++){var x;(x=Tr[r])[0]=s[o++],x[1]=s[o++],bt(x,x,e),s[a++]=x[0],s[a++]=x[1]}}},Lr=Math.sqrt,kr=Math.sin,Pr=Math.cos,Nr=Math.PI,Or=function(t,e){return(t[0]*e[0]+t[1]*e[1])/(Mr(t)*Mr(e))},Er=function(t,e){return(t[0]*e[1]<t[1]*e[0]?-1:1)*Math.acos(Or(t,e))};function zr(t,e,i,n,o,a,r,s,l,u,h){var c=l*(Nr/180),d=Pr(c)*(t-i)/2+kr(c)*(e-n)/2,f=-1*kr(c)*(t-i)/2+Pr(c)*(e-n)/2,p=d*d/(r*r)+f*f/(s*s);1<p&&(r*=Lr(p),s*=Lr(p));var g=(o===a?-1:1)*Lr((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+Pr(c)*m-kr(c)*v,x=(e+n)/2+kr(c)*m+Pr(c)*v,_=Er([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=Er(w,b);Or(w,b)<=-1&&(S=Nr),1<=Or(w,b)&&(S=0),0===a&&0<S&&(S-=2*Nr),1===a&&S<0&&(S+=2*Nr),h.addData(u,y,x,r,s,_,S,c,a)}var Rr=/([mlvhzcqtsa])([^mlvhzcqtsa]*)/gi,Br=/-?([0-9]*\.)?[0-9]+([eE]-?[0-9]+)?/g;function Vr(t,e){var i=function(t){if(!t)return new ir;for(var e,i=0,n=0,o=i,a=n,r=new ir,s=ir.CMD,l=t.match(Rr),u=0;u<l.length;u++){for(var h,c=l[u],d=c.charAt(0),f=c.match(Br)||[],p=f.length,g=0;g<p;g++)f[g]=parseFloat(f[g]);for(var m=0;m<p;){var v,y,x,_,w,b,S,M=i,I=n;switch(d){case"l":i+=f[m++],n+=f[m++],h=s.L,r.addData(h,i,n);break;case"L":i=f[m++],n=f[m++],h=s.L,r.addData(h,i,n);break;case"m":i+=f[m++],n+=f[m++],h=s.M,r.addData(h,i,n),o=i,a=n,d="l";break;case"M":i=f[m++],n=f[m++],h=s.M,r.addData(h,i,n),o=i,a=n,d="L";break;case"h":i+=f[m++],h=s.L,r.addData(h,i,n);break;case"H":i=f[m++],h=s.L,r.addData(h,i,n);break;case"v":n+=f[m++],h=s.L,r.addData(h,i,n);break;case"V":n=f[m++],h=s.L,r.addData(h,i,n);break;case"C":h=s.C,r.addData(h,f[m++],f[m++],f[m++],f[m++],f[m++],f[m++]),i=f[m-2],n=f[m-1];break;case"c":h=s.C,r.addData(h,f[m++]+i,f[m++]+n,f[m++]+i,f[m++]+n,f[m++]+i,f[m++]+n),i+=f[m-2],n+=f[m-1];break;case"S":v=i,y=n;var T=r.len(),A=r.data;e===s.C&&(v+=i-A[T-4],y+=n-A[T-3]),h=s.C,M=f[m++],I=f[m++],i=f[m++],n=f[m++],r.addData(h,v,y,M,I,i,n);break;case"s":v=i,y=n;T=r.len(),A=r.data;e===s.C&&(v+=i-A[T-4],y+=n-A[T-3]),h=s.C,M=i+f[m++],I=n+f[m++],i+=f[m++],n+=f[m++],r.addData(h,v,y,M,I,i,n);break;case"Q":M=f[m++],I=f[m++],i=f[m++],n=f[m++],h=s.Q,r.addData(h,M,I,i,n);break;case"q":M=f[m++]+i,I=f[m++]+n,i+=f[m++],n+=f[m++],h=s.Q,r.addData(h,M,I,i,n);break;case"T":v=i,y=n;T=r.len(),A=r.data;e===s.Q&&(v+=i-A[T-4],y+=n-A[T-3]),i=f[m++],n=f[m++],h=s.Q,r.addData(h,v,y,i,n);break;case"t":v=i,y=n;T=r.len(),A=r.data;e===s.Q&&(v+=i-A[T-4],y+=n-A[T-3]),i+=f[m++],n+=f[m++],h=s.Q,r.addData(h,v,y,i,n);break;case"A":x=f[m++],_=f[m++],w=f[m++],b=f[m++],S=f[m++],zr(M=i,I=n,i=f[m++],n=f[m++],b,S,x,_,w,h=s.A,r);break;case"a":x=f[m++],_=f[m++],w=f[m++],b=f[m++],S=f[m++],zr(M=i,I=n,i+=f[m++],n+=f[m++],b,S,x,_,w,h=s.A,r)}}"z"!==d&&"Z"!==d||(h=s.Z,r.addData(h),i=o,n=a),e=h}return r.toStatic(),r}(t);return(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){Cr(i,t),this.dirty(!0)},e}function Gr(t,e){return new Sr(Vr(t,e))}var Fr=function(t){jn.call(this,t)};Fr.prototype={constructor:Fr,type:"text",brush:function(t,e){var i=this.style;this.__dirty&&kn(i),i.fill=i.stroke=i.shadowBlur=i.shadowColor=i.shadowOffsetX=i.shadowOffsetY=null;var n=i.text;null!=n&&(n+=""),Un(n,i)?(this.setTransform(t),Nn(this,t,n,i,null,e),this.restoreTransform(t)):t.__attrCachedBy=Bi.NONE},getBoundingRect:function(){var t=this.style;if(this.__dirty&&kn(t),!this._rect){var e=t.text;null!=e?e+="":e="";var i=cn(t.text+"",t.font,t.textAlign,t.textVerticalAlign,t.textPadding,t.textLineHeight,t.rich);if(i.x+=t.x||0,i.y+=t.y||0,Fn(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}},w(Fr,jn);function Wr(l){return v.browser.ie&&11<=v.browser.version?function(){var t,e=this.__clipPaths,i=this.style;if(e)for(var n=0;n<e.length;n++){var o=e[n],a=o&&o.shape,r=o&&o.type;if(a&&("sector"===r&&a.startAngle===a.endAngle||"rect"===r&&(!a.width||!a.height))){for(var s=0;s<Zr.length;s++)Zr[s][2]=i[Zr[s][0]],i[Zr[s][0]]=Zr[s][1];t=!0;break}}if(l.apply(this,arguments),t)for(s=0;s<Zr.length;s++)i[Zr[s][0]]=Zr[s][2]}:l}var Hr=Sr.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)}}),Zr=[["shadowBlur",0],["shadowColor","#000"],["shadowOffsetX",0],["shadowOffsetY",0]],Ur=Sr.extend({type:"sector",shape:{cx:0,cy:0,r0:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},brush:Wr(Sr.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,u=Math.cos(r),h=Math.sin(r);t.moveTo(u*o+i,h*o+n),t.lineTo(u*a+i,h*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()}}),Xr=Sr.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)}});function Yr(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 jr(t,e,i){var n=e.points,o=e.smooth;if(n&&2<=n.length){if(o&&"spline"!==o){var a=function(t,e,i,n){var o,a,r,s,l=[],u=[],h=[],c=[];if(n){r=[1/0,1/0],s=[-1/0,-1/0];for(var d=0,f=t.length;d<f;d++)St(r,r,t[d]),Mt(s,s,t[d]);St(r,r,n[0]),Mt(s,s,n[1])}for(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(rt(t[d]));continue}o=t[d-1],a=t[d+1]}ht(u,a,o),gt(u,u,e);var g=vt(p,o),m=vt(p,a),v=g+m;0!==v&&(g/=v,m/=v),gt(h,u,-g),gt(c,u,m);var y=lt([],p,h),x=lt([],p,c);n&&(Mt(y,y,r),St(y,y,s),Mt(x,x,r),St(x,x,s)),l.push(y),l.push(x)}return i&&l.push(l.shift()),l}(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],u=a[2*s+1],h=n[(s+1)%r];t.bezierCurveTo(l[0],l[1],u[0],u[1],h[0],h[1])}}else{"spline"===o&&(n=function(t,e){for(var i=t.length,n=[],o=0,a=1;a<i;a++)o+=vt(t[a-1],t[a]);var r=o/2;r=r<i?i:r;for(a=0;a<r;a++){var s,l,u,h=a/(r-1)*(e?i:i-1),c=Math.floor(h),d=h-c,f=t[c%i];u=e?(s=t[(c-1+i)%i],l=t[(c+1)%i],t[(c+2)%i]):(s=t[0===c?c:c-1],l=t[i-2<c?i-1:c+1],t[i-3<c?i-1:c+2]);var p=d*d,g=d*p;n.push([Yr(s[0],f[0],l[0],u[0],d,p,g),Yr(s[1],f[1],l[1],u[1],d,p,g)])}return n}(n,i)),t.moveTo(n[0][0],n[0][1]);s=1;for(var c=n.length;s<c;s++)t.lineTo(n[s][0],n[s][1])}i&&t.closePath()}}var qr=Sr.extend({type:"polygon",shape:{points:null,smooth:!1,smoothConstraint:null},buildPath:function(t,e){jr(t,e,!0)}}),Kr=Sr.extend({type:"polyline",shape:{points:null,smooth:!1,smoothConstraint:null},style:{stroke:"#000",fill:null},buildPath:function(t,e){jr(t,e,!1)}}),$r=Math.round;function Jr(t,e,i){var n=i&&i.lineWidth;if(e&&n){var o=e.x1,a=e.x2,r=e.y1,s=e.y2;$r(2*o)===$r(2*a)?t.x1=t.x2=ts(o,n,!0):(t.x1=o,t.x2=a),$r(2*r)===$r(2*s)?t.y1=t.y2=ts(r,n,!0):(t.y1=r,t.y2=s)}}function Qr(t,e,i){var n=i&&i.lineWidth;if(e&&n){var o=e.x,a=e.y,r=e.width,s=e.height;t.x=ts(o,n,!0),t.y=ts(a,n,!0),t.width=Math.max(ts(o+r,n,!1)-t.x,0===r?0:1),t.height=Math.max(ts(a+s,n,!1)-t.y,0===s?0:1)}}function ts(t,e,i){var n=$r(2*t);return(n+$r(e))%2==0?n/2:(n+(i?1:-1))/2}var es={},is=Sr.extend({type:"rect",shape:{r:0,x:0,y:0,width:0,height:0},buildPath:function(t,e){var i,n,o,a;this.subPixelOptimize?(Qr(es,e,this.style),i=es.x,n=es.y,o=es.width,a=es.height,es.r=e.r,e=es):(i=e.x,n=e.y,o=e.width,a=e.height),e.r?Mn(t,e):t.rect(i,n,o,a),t.closePath()}}),ns={},os=Sr.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,n,o,a;a=this.subPixelOptimize?(Jr(ns,e,this.style),i=ns.x1,n=ns.y1,o=ns.x2,ns.y2):(i=e.x1,n=e.y1,o=e.x2,e.y2);var 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]}}),as=[];function rs(t,e,i){var n=t.cpx2,o=t.cpy2;return null===n||null===o?[(i?Sa:ba)(t.x1,t.cpx1,t.cpx2,t.x2,e),(i?Sa:ba)(t.y1,t.cpy1,t.cpy2,t.y2,e)]:[(i?Aa:Ta)(t.x1,t.cpx1,t.x2,e),(i?Aa:Ta)(t.y1,t.cpy1,t.y2,e)]}function ss(t){this.colorStops=t||[]}var ls=Sr.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,u=e.cpy2,h=e.percent;0!==h&&(t.moveTo(i,n),null==l||null==u?(h<1&&(Ca(i,r,o,h,as),r=as[1],o=as[2],Ca(n,s,a,h,as),s=as[1],a=as[2]),t.quadraticCurveTo(r,s,o,a)):(h<1&&(Ia(i,r,l,o,h,as),r=as[1],l=as[2],o=as[3],Ia(n,s,u,a,h,as),s=as[1],u=as[2],a=as[3]),t.bezierCurveTo(r,s,l,u,o,a)))},pointAt:function(t){return rs(this.shape,t,!1)},tangentAt:function(t){var e=rs(this.shape,t,!0);return mt(e,e)}}),us=Sr.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),u=Math.sin(a);t.moveTo(l*o+i,u*o+n),t.arc(i,n,o,a,r,!s)}}),hs=Sr.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],t[i].segmentIgnoreThreshold)},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(),Sr.prototype.getBoundingRect.call(this)}});ss.prototype={constructor:ss,addColorStop:function(t,e){this.colorStops.push({offset:t,color:e})}};function cs(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,ss.call(this,o)}cs.prototype={constructor:cs},w(cs,ss);function ds(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,ss.call(this,n)}function fs(t){jn.call(this,t),this._displayables=[],this._temporaryDisplayables=[],this._cursor=0,this.notClear=!0}ds.prototype={constructor:ds},w(ds,ss),fs.prototype.incremental=!0,fs.prototype.clearDisplaybles=function(){this._displayables=[],this._temporaryDisplayables=[],this._cursor=0,this.dirty(),this.notClear=!1},fs.prototype.addDisplayable=function(t,e){e?this._temporaryDisplayables.push(t):this._displayables.push(t),this.dirty()},fs.prototype.addDisplayables=function(t,e){e=e||!1;for(var i=0;i<t.length;i++)this.addDisplayable(t[i],e)},fs.prototype.eachPendingDisplayable=function(t){for(var e=this._cursor;e<this._displayables.length;e++)t&&t(this._displayables[e]);for(e=0;e<this._temporaryDisplayables.length;e++)t&&t(this._temporaryDisplayables[e])},fs.prototype.update=function(){this.updateTransform();for(var t=this._cursor;t<this._displayables.length;t++){(e=this._displayables[t]).parent=this,e.update(),e.parent=null}for(t=0;t<this._temporaryDisplayables.length;t++){var e;(e=this._temporaryDisplayables[t]).parent=this,e.update(),e.parent=null}},fs.prototype.brush=function(t,e){for(var i=this._cursor;i<this._displayables.length;i++){(n=this._displayables[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(i=0;i<this._temporaryDisplayables.length;i++){var n;(n=this._temporaryDisplayables[i]).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 ps=[];fs.prototype.getBoundingRect=function(){if(!this._rect){for(var t=new Mi(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(ps)),t.union(n)}this._rect=t}return this._rect},fs.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},w(fs,jn);var gs=Math.max,ms=Math.min,vs={},ys=1,xs={color:"textFill",textBorderColor:"textStroke",textBorderWidth:"textStrokeWidth"},_s="emphasis",ws="normal",bs=1,Ss={},Ms={};function Is(t){return Sr.extend(t)}function Ts(t,e){Ms[t]=e}function As(t){if(Ms.hasOwnProperty(t))return Ms[t]}function Ds(t,e,i,n){var o=Gr(t,e);return i&&("center"===n&&(i=Ls(i,o.getBoundingRect())),Ps(o,i)),o}function Cs(t,i,n){var o=new qn({style:{image:t,x:i.x,y:i.y,width:i.width,height:i.height},onload:function(t){if("center"===n){var e={width:t.width,height:t.height};o.setStyle(Ls(i,e))}}});return o}function Ls(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}}var ks=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 Sr(e);return r.createPathProxy(),r.buildPath=function(t){t.appendPath(i);var e=t.getContext();e&&t.rebuildPath(e)},r};function Ps(t,e){if(t.applyTransform){var i=t.getBoundingRect().calculateTransform(e);t.applyTransform(i)}}var Ns=ts;function Os(t){return null!=t&&"none"!==t}var Es=Q(),zs=0;function Rs(t){var e=t.__hoverStl;if(e&&!t.__highlighted){var i=t.__zr,n=t.useHoverLayer&&i&&"canvas"===i.painter.type;if(t.__highlighted=n?"layer":"plain",!(t.isGroup||!i&&t.useHoverLayer)){var o=t,a=t.style;n&&(a=(o=i.addHover(t)).style),ol(a),n||function(t){if(t.__hoverStlDirty){t.__hoverStlDirty=!1;var e=t.__hoverStl;if(e){var i=t.__cachedNormalStl={};t.__cachedNormalZ2=t.z2;var n=t.style;for(var o in e)null!=e[o]&&(i[o]=n[o]);i.fill=n.fill,i.stroke=n.stroke}else t.__cachedNormalStl=t.__cachedNormalZ2=null}}(o),a.extendFrom(e),Bs(a,e,"fill"),Bs(a,e,"stroke"),nl(a),n||(t.dirty(!1),t.z2+=ys)}}}function Bs(t,e,i){!Os(e[i])&&Os(t[i])&&(t[i]=function(t){if("string"!=typeof t)return t;var e=Es.get(t);return e||(e=Ve(t,-.1),zs<1e4&&(Es.set(t,e),zs++)),e}(t[i]))}function Vs(t){var e=t.__highlighted;if(e&&(t.__highlighted=!1,!t.isGroup))if("layer"===e)t.__zr&&t.__zr.removeHover(t);else{var i=t.style,n=t.__cachedNormalStl;n&&(ol(i),t.setStyle(n),nl(i));var o=t.__cachedNormalZ2;null!=o&&t.z2-o===ys&&(t.z2=o)}}function Gs(t,e,i){var n,o=ws,a=ws;t.__highlighted&&(o=_s,n=!0),e(t,i),t.__highlighted&&(a=_s,n=!0),t.isGroup&&t.traverse(function(t){t.isGroup||e(t,i)}),n&&t.__highDownOnUpdate&&t.__highDownOnUpdate(o,a)}function Fs(t,e){e=t.__hoverStl=!1!==e&&(t.hoverStyle||e||{}),t.__hoverStlDirty=!0,t.__highlighted&&(t.__cachedNormalStl=null,Vs(t),Rs(t))}function Ws(t){Xs(this,t)||this.__highByOuter||Gs(this,Rs)}function Hs(t){Xs(this,t)||this.__highByOuter||Gs(this,Vs)}function Zs(t){this.__highByOuter|=1<<(t||0),Gs(this,Rs)}function Us(t){(this.__highByOuter&=~(1<<(t||0)))||Gs(this,Vs)}function Xs(t,e){return t.__highDownSilentOnTouch&&e.zrByTouch}function Ys(t,e){js(t,!0),Gs(t,Fs,e)}function js(t,e){var i=!1===e;if(t.__highDownSilentOnTouch=t.highDownSilentOnTouch,t.__highDownOnUpdate=t.highDownOnUpdate,!i||t.__highDownDispatcher){var n=i?"off":"on";t[n]("mouseover",Ws)[n]("mouseout",Hs),t[n]("emphasis",Zs)[n]("normal",Us),t.__highByOuter=t.__highByOuter||0,t.__highDownDispatcher=!i}}function qs(t){return!(!t||!t.__highDownDispatcher)}function Ks(t){var e=Ss[t];return null==e&&bs<=32&&(e=Ss[t]=bs++),e}function $s(t,e,i,n,o,a,r){var s,l=(o=o||vs).labelFetcher,u=o.labelDataIndex,h=o.labelDimIndex,c=i.getShallow("show"),d=n.getShallow("show");(c||d)&&(l&&(s=l.getFormattedLabel(u,"normal",null,h)),null==s&&(s=O(o.defaultText)?o.defaultText(u,o):o.defaultText));var f=c?s:null,p=d?H(l?l.getFormattedLabel(u,"emphasis",null,h):null,s):null;null==f&&null==p||(Qs(t,i,a,o),Qs(e,n,r,o,!0)),t.text=f,e.text=p}function Js(t,e,i){var n=t.style;e&&(ol(n),t.setStyle(e),nl(n)),n=t.__hoverStl,i&&n&&(ol(n),L(n,i),nl(n))}function Qs(t,e,i,n,o){return tl(t,e,n,o),i&&L(t,i),t}function tl(t,e,i,n){if((i=i||vs).isRectText){var o;i.getTextPosition?o=i.getTextPosition(e,n):"outside"===(o=e.getShallow("position")||(n?null:"inside"))&&(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=H(e.getShallow("distance"),n?null:5)}var r,s=e.ecModel,l=s&&s.option.textStyle,u=function(t){var e;for(;t&&t!==t.ecModel;){var i=(t.option||vs).rich;if(i)for(var n in e=e||{},i)i.hasOwnProperty(n)&&(e[n]=1);t=t.parentModel}return e}(e);if(u)for(var h in r={},u)if(u.hasOwnProperty(h)){var c=e.getModel(["rich",h]);el(r[h]={},c,l,i,n)}return t.rich=r,el(t,e,l,i,n,!0),i.forceRich&&!i.textStyle&&(i.textStyle={}),t}function el(t,e,i,n,o,a){i=!o&&i||vs,t.textFill=il(e.getShallow("color"),n)||i.color,t.textStroke=il(e.getShallow("textBorderColor"),n)||i.textBorderColor,t.textStrokeWidth=H(e.getShallow("textBorderWidth"),i.textBorderWidth),o||(a&&(t.insideRollbackOpt=n,nl(t)),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=il(e.getShallow("backgroundColor"),n),t.textPadding=e.getShallow("padding"),t.textBorderColor=il(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 il(t,e){return"auto"!==t?t:e&&e.autoColor?e.autoColor:null}function nl(t){var e,i=t.textPosition,n=t.insideRollbackOpt;if(n&&null==t.textFill){var o=n.autoColor,a=n.isRectText,r=n.useInsideStyle,s=!1!==r&&(!0===r||a&&i&&"string"==typeof i&&0<=i.indexOf("inside")),l=!s&&null!=o;(s||l)&&(e={textFill:t.textFill,textStroke:t.textStroke,textStrokeWidth:t.textStrokeWidth}),s&&(t.textFill="#fff",null==t.textStroke&&(t.textStroke=o,null==t.textStrokeWidth&&(t.textStrokeWidth=2))),l&&(t.textFill=o)}t.insideRollback=e}function ol(t){var e=t.insideRollback;e&&(t.textFill=e.textFill,t.textStroke=e.textStroke,t.textStrokeWidth=e.textStrokeWidth,t.insideRollback=null)}function al(t,e){var i=e&&e.getModel("textStyle");return j([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 rl(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),u=n.getShallow("animationDelay"+r);"function"==typeof u&&(u=u(o,n.getAnimationDelayParams?n.getAnimationDelayParams(e,o):null)),"function"==typeof s&&(s=s(o)),0<s?e.animateTo(i,s,u||0,l,a,!!a):(e.stopAnimation(),e.attr(i),a&&a())}else e.stopAnimation(),e.attr(i),a&&a()}function sl(t,e,i,n,o){rl(!0,t,e,i,n,o)}function ll(t,e,i,n,o){rl(!1,t,e,i,n,o)}function ul(t,e){for(var i=ie([]);t&&t!==e;)oe(i,t.getLocalTransform(),i),t=t.parent;return i}function hl(t,e,i){return e&&!P(e)&&(e=fe.getLocalTransform(e)),i&&(e=le([],e)),bt([],t,e)}function cl(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=hl(a,e,i),Math.abs(a[0])>Math.abs(a[1])?0<a[0]?"right":"left":0<a[1]?"bottom":"top"}function dl(t,e,n,i){if(t&&e){var o,a=(o={},t.traverse(function(t){!t.isGroup&&t.anid&&(o[t.anid]=t)}),o);e.traverse(function(t){if(!t.isGroup&&t.anid){var e=a[t.anid];if(e){var i=r(t);t.attr(r(e)),sl(t,i,n,t.dataIndex)}}})}function r(t){var e={position:rt(t.position),rotation:t.rotation};return t.shape&&(e.shape=L({},t.shape)),e}}function fl(t,n){return N(t,function(t){var e=t[0];e=gs(e,n.x),e=ms(e,n.x+n.width);var i=t[1];return i=gs(i,n.y),[e,i=ms(i,n.y+n.height)]})}function pl(t,e,i){var n=(e=L({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),C(n,i),new qn(e)):Ds(t.replace("path://",""),e,i,"center")}function gl(t,e,i,n,o){for(var a=0,r=o[o.length-1];a<o.length;a++){var s=o[a];if(ml(t,e,i,n,s[0],s[1],r[0],r[1]))return!0;r=s}}function ml(t,e,i,n,o,a,r,s){var l=i-t,u=n-e,h=r-o,c=s-a,d=vl(h,c,l,u);if(function(t){return t<=1e-6&&-1e-6<=t}(d))return!1;var f=t-o,p=e-a,g=vl(f,p,l,u)/d;if(g<0||1<g)return!1;var m=vl(f,p,h,c)/d;return!(m<0||1<m)}function vl(t,e,i,n){return t*n-i*e}Ts("circle",Hr),Ts("sector",Ur),Ts("ring",Xr),Ts("polygon",qr),Ts("polyline",Kr),Ts("rect",is),Ts("line",os),Ts("bezierCurve",ls),Ts("arc",us);var yl=(Object.freeze||Object)({Z2_EMPHASIS_LIFT:ys,CACHED_LABEL_STYLE_PROPERTIES:xs,extendShape:Is,extendPath:function(t,e){return function(t,e){return Sr.extend(Vr(t,e))}(t,e)},registerShape:Ts,getShapeClass:As,makePath:Ds,makeImage:Cs,mergePath:ks,resizePath:Ps,subPixelOptimizeLine:function(t){return Jr(t.shape,t.shape,t.style),t},subPixelOptimizeRect:function(t){return Qr(t.shape,t.shape,t.style),t},subPixelOptimize:Ns,setElementHoverStyle:Fs,setHoverStyle:Ys,setAsHighDownDispatcher:js,isHighDownDispatcher:qs,getHighlightDigit:Ks,setLabelStyle:$s,modifyLabelStyle:Js,setTextStyle:Qs,setText:function(t,e,i){var n,o={isRectText:!0};!1===i?n=!0:o.autoColor=i,tl(t,e,o,n)},getFont:al,updateProps:sl,initProps:ll,getTransform:ul,applyTransform:hl,transformDirection:cl,groupTransition:dl,clipPointsByRect:fl,clipRectByRect:function(t,e){var i=gs(t.x,e.x),n=ms(t.x+t.width,e.x+e.width),o=gs(t.y,e.y),a=ms(t.y+t.height,e.y+e.height);if(i<=n&&o<=a)return{x:i,y:o,width:n-i,height:a-o}},createIcon:pl,linePolygonIntersect:gl,lineLineIntersect:ml,Group:Ii,Image:qn,Text:Fr,Circle:Hr,Sector:Ur,Ring:Xr,Polygon:qr,Polyline:Kr,Rect:is,Line:os,BezierCurve:ls,Arc:us,IncrementalDisplayable:fs,CompoundPath:hs,LinearGradient:cs,RadialGradient:ds,BoundingRect:Mi}),xl=["textStyle","color"],_l={getTextColor:function(t){var e=this.ecModel;return this.getShallow("color")||(!t&&e?e.get(xl):null)},getFont:function(){return al({fontStyle:this.getShallow("fontStyle"),fontWeight:this.getShallow("fontWeight"),fontSize:this.getShallow("fontSize"),fontFamily:this.getShallow("fontFamily")},this.ecModel)},getTextRect:function(t){return cn(t,this.getFont(),this.getShallow("align"),this.getShallow("verticalAlign")||this.getShallow("baseline"),this.getShallow("padding"),this.getShallow("lineHeight"),this.getShallow("rich"),this.getShallow("truncateText"))}},wl=ra([["fill","color"],["stroke","borderColor"],["lineWidth","borderWidth"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"],["textPosition"],["textAlign"]]),bl={getItemStyle:function(t,e){var i=wl(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]}},Sl=b,Ml=Zo();function Il(t,e,i){this.parentModel=e,this.ecModel=i,this.option=t}function Tl(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 Al(t,e){var i=Ml(t).getParent;return i?i.call(t,e):t.parentModel}Il.prototype={constructor:Il,init:null,mergeOption:function(t){m(this.option,t,!0)},get:function(t,e){return null==t?this.option:Tl(this.option,this.parsePath(t),!e&&Al(this,t))},getShallow:function(t,e){var i=this.option,n=null==i?i:i[t],o=!e&&Al(this,t);return null==n&&o&&(n=o.getShallow(t)),n},getModel:function(t,e){var i;return new Il(null==t?this.option:Tl(this.option,t=this.parsePath(t)),e=e||(i=Al(this,t))&&i.getModel(t),this.ecModel)},isEmpty:function(){return null==this.option},restoreData:function(){},clone:function(){return new this.constructor(D(this.option))},setReadOnly:function(t){},parsePath:function(t){return"string"==typeof t&&(t=t.split(".")),t},customizeGetParent:function(t){Ml(this).getParent=t},isAnimationEnabled:function(){if(!v.node){if(null!=this.option.animation)return!!this.option.animation;if(this.parentModel)return this.parentModel.isAnimationEnabled()}}},ta(Il),ia(Il),Sl(Il,la),Sl(Il,ha),Sl(Il,_l),Sl(Il,bl);var Dl=0;function Cl(t){return[t||"",Dl++,Math.random().toFixed(5)].join("_")}var Ll=1e-4;function kl(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(0<o){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 Pl(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?function(t){return t.replace(/^\s+|\s+$/g,"")}(t).match(/%$/)?parseFloat(t)/100*e:parseFloat(t):null==t?NaN:+t}function Nl(t,e,i){return null==e&&(e=10),e=Math.min(Math.max(0,e),20),t=(+t).toFixed(e),i?t:+t}function Ol(t){return t.sort(function(t,e){return t-e}),t}function El(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 zl(t){var e=t.toString(),i=e.indexOf("e");if(0<i){var n=+e.slice(i+1);return n<0?-n:0}var o=e.indexOf(".");return o<0?0:e.length-1-o}function Rl(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 Bl(t,e,i){if(!t[e])return 0;var n=S(t,function(t,e){return t+(isNaN(e)?0:e)},0);if(0===n)return 0;for(var o=Math.pow(10,i),a=N(t,function(t){return(isNaN(t)?0:t)/n*o*100}),r=100*o,s=N(a,function(t){return Math.floor(t)}),l=S(s,function(t,e){return t+e},0),u=N(a,function(t,e){return t-s[e]});l<r;){for(var h=Number.NEGATIVE_INFINITY,c=null,d=0,f=u.length;d<f;++d)u[d]>h&&(h=u[d],c=d);++s[c],u[c]=0,++l}return s[e]/o}var Vl=9007199254740991;function Gl(t){var e=2*Math.PI;return(t%e+e)%e}function Fl(t){return-Ll<t&&t<Ll}var Wl=/^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T ](\d{1,2})(?::(\d\d)(?::(\d\d)(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/;function Hl(t){if(t instanceof Date)return t;if("string"!=typeof t)return null==t?new Date(NaN):new Date(Math.round(t));var e=Wl.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)}function Zl(t){return Math.pow(10,Ul(t))}function Ul(t){if(0===t)return 0;var e=Math.floor(Math.log(t)/Math.LN10);return 10<=t/Math.pow(10,e)&&e++,e}function Xl(t,e){var i=Ul(t),n=Math.pow(10,i),o=t/n;return t=(e?o<1.5?1:o<2.5?2:o<4?3:o<7?5:10:o<1?1:o<2?2:o<3?3:o<5?5:10)*n,-20<=i?+t.toFixed(i<0?-i:0):t}function Yl(t){t.sort(function(t,e){return function t(e,i,n){return e.interval[n]<i.interval[n]||e.interval[n]===i.interval[n]&&(e.close[n]-i.close[n]==(n?-1:1)||!n&&t(e,i,1))}(t,e,0)?-1:1});for(var e=-1/0,i=1,n=0;n<t.length;){for(var o=t[n].interval,a=t[n].close,r=0;r<2;r++)o[r]<=e&&(o[r]=e,a[r]=r?1:1-i),e=o[r],i=a[r];o[0]===o[1]&&a[0]*a[1]!=1?t.splice(n,1):n++}return t}function jl(t){return 0<=t-parseFloat(t)}var ql=(Object.freeze||Object)({linearMap:kl,parsePercent:Pl,round:Nl,asc:Ol,getPrecision:El,getPrecisionSafe:zl,getPixelPrecision:Rl,getPercentWithPrecision:Bl,MAX_SAFE_INTEGER:Vl,remRadian:Gl,isRadianAroundZero:Fl,parseDate:Hl,quantity:Zl,quantityExponent:Ul,nice:Xl,quantile:function(t,e){var i=(t.length-1)*e+1,n=Math.floor(i),o=+t[n-1],a=i-n;return a?o+a*(t[n]-o):o},reformIntervals:Yl,isNumeric:jl});function Kl(t){return isNaN(t)?"-":(t=(t+"").split("."))[0].replace(/(\d{1,3})(?=(?:\d{3})+(?!\d))/g,"$1,")+(1<t.length?"."+t[1]:"")}function $l(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}var Jl=X,Ql=/([&<>"'])/g,tu={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"};function eu(t){return null==t?"":(t+"").replace(Ql,function(t,e){return tu[e]})}function iu(t,e){return"{"+t+(null==e?"":e)+"}"}var nu=["a","b","c","d","e","f","g"];function ou(t,e,i){k(e)||(e=[e]);var n=e.length;if(!n)return"";for(var o=e[0].$vars||[],a=0;a<o.length;a++){var r=nu[a];t=t.replace(iu(r),iu(r,0))}for(var s=0;s<n;s++)for(var l=0;l<o.length;l++){var u=e[s][o[l]];t=t.replace(iu(nu[l],s),i?eu(u):u)}return t}function au(i,t,n){return E(t,function(t,e){i=i.replace("{"+e+"}",n?eu(t):t)}),i}function ru(t,e){var i=(t=z(t)?{color:t,extraCssText:e}:t||{}).color,n=t.type,o=(e=t.extraCssText,t.renderMode||"html"),a=t.markerId||"X";return i?"html"===o?"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:'+eu(i)+";"+(e||"")+'"></span>':'<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:'+eu(i)+";"+(e||"")+'"></span>':{renderMode:o,content:"{marker"+a+"|}  ",style:{color:i}}:""}function su(t,e){return"0000".substr(0,e-(t+="").length)+t}function lu(t,e,i){"week"!==t&&"month"!==t&&"quarter"!==t&&"half-year"!==t&&"year"!==t||(t="MM-dd\nyyyy");var n=Hl(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"](),u=n["get"+o+"Minutes"](),h=n["get"+o+"Seconds"](),c=n["get"+o+"Milliseconds"]();return t=t.replace("MM",su(r,2)).replace("M",r).replace("yyyy",a).replace("yy",a%100).replace("dd",su(s,2)).replace("d",s).replace("hh",su(l,2)).replace("h",l).replace("mm",su(u,2)).replace("m",u).replace("ss",su(h,2)).replace("s",h).replace("SSS",su(c,3))}function uu(t){return t?t.charAt(0).toUpperCase()+t.substr(1):t}var hu=gn;var cu=(Object.freeze||Object)({addCommas:Kl,toCamelCase:$l,normalizeCssArray:Jl,encodeHTML:eu,formatTpl:ou,formatTplSimple:au,getTooltipMarker:ru,formatTime:lu,capitalFirst:uu,truncateText:hu,getTextBoundingRect:function(t){return cn(t.text,t.font,t.textAlign,t.textVerticalAlign,t.textPadding,t.textLineHeight,t.rich,t.truncate)},getTextRect:function(t,e,i,n,o,a,r,s){return cn(t,e,i,n,o,s,a,r)}}),du=E,fu=["left","right","top","bottom","width","height"],pu=[["width","left","right"],["height","top","bottom"]];function gu(h,c,d,f,p){var g=0,m=0;null==f&&(f=1/0),null==p&&(p=1/0);var v=0;c.eachChild(function(t,e){var i,n,o=t.position,a=t.getBoundingRect(),r=c.childAt(e+1),s=r&&r.getBoundingRect();if("horizontal"===h){var l=a.width+(s?-s.x+a.x:0);v=f<(i=g+l)||t.newline?(g=0,i=l,m+=v+d,a.height):Math.max(v,a.height)}else{var u=a.height+(s?-s.y+a.y:0);v=p<(n=m+u)||t.newline?(g+=v+d,m=0,n=u,a.width):Math.max(v,a.width)}t.newline||(o[0]=g,o[1]=m,"horizontal"===h?g=i+d:m=n+d)})}var mu=gu;T(gu,"vertical"),T(gu,"horizontal");function vu(t,e,i){i=Jl(i||0);var n=e.width,o=e.height,a=Pl(t.left,n),r=Pl(t.top,o),s=Pl(t.right,n),l=Pl(t.bottom,o),u=Pl(t.width,n),h=Pl(t.height,o),c=i[2]+i[0],d=i[1]+i[3],f=t.aspect;switch(isNaN(u)&&(u=n-s-d-a),isNaN(h)&&(h=o-l-c-r),null!=f&&(isNaN(u)&&isNaN(h)&&(n/o<f?u=.8*n:h=.8*o),isNaN(u)&&(u=f*h),isNaN(h)&&(h=u/f)),isNaN(a)&&(a=n-s-u-d),isNaN(r)&&(r=o-l-h-c),t.left||t.right){case"center":a=n/2-u/2-i[3];break;case"right":a=n-u-d}switch(t.top||t.bottom){case"middle":case"center":r=o/2-h/2-i[0];break;case"bottom":r=o-h-c}a=a||0,r=r||0,isNaN(u)&&(u=n-d-a-(s||0)),isNaN(h)&&(h=o-c-r-(l||0));var p=new Mi(a+i[3],r+i[0],u,h);return p.margin=i,p}function yu(t,e,i,n,o){var a=!o||!o.hv||o.hv[0],r=!o||!o.hv||o.hv[1],s=o&&o.boundingMode||"all";if(a||r){var l;if("raw"===s)l="group"===t.type?new Mi(0,0,+e.width||0,+e.height||0):t.getBoundingRect();else if(l=t.getBoundingRect(),t.needLocalTransform()){var u=t.getLocalTransform();(l=l.clone()).applyTransform(u)}e=vu(C({width:l.width,height:l.height},e),i,n);var h=t.position,c=a?e.x-l.x:0,d=r?e.y-l.y:0;t.attr("position","raw"===s?[c,d]:[h[0]+c,h[1]+d])}}function xu(l,u,t){R(t)||(t={});var h=t.ignoreSize;k(h)||(h=[h,h]);var e=n(pu[0],0),i=n(pu[1],1);function n(t,e){var i={},n=0,o={},a=0;if(du(t,function(t){o[t]=l[t]}),du(t,function(t){c(u,t)&&(i[t]=o[t]=u[t]),d(i,t)&&n++,d(o,t)&&a++}),h[e])return d(u,t[1])?o[t[2]]=null:d(u,t[2])&&(o[t[1]]=null),o;if(2!==a&&n){if(2<=n)return i;for(var r=0;r<t.length;r++){var s=t[r];if(!c(i,s)&&c(l,s)){i[s]=l[s];break}}return i}return o}function c(t,e){return t.hasOwnProperty(e)}function d(t,e){return null!=t[e]&&"auto"!==t[e]}function o(t,e,i){du(t,function(t){e[t]=i[t]})}o(pu[0],l,e),o(pu[1],l,i)}function _u(t){return wu({},t)}function wu(e,i){return i&&e&&du(fu,function(t){i.hasOwnProperty(t)&&(e[t]=i[t])}),e}var bu,Su,Mu,Iu=Zo(),Tu=Il.extend({type:"component",id:"",name:"",mainType:"",subType:"",componentIndex:0,defaultOption:null,ecModel:null,dependentModels:[],uid:null,layoutMode:null,$constructor:function(t,e,i,n){Il.call(this,t,e,i,n),this.uid=Cl("ec_cpt_model")},init:function(t,e,i,n){this.mergeDefaultAndTheme(t,i)},mergeDefaultAndTheme:function(t,e){var i=this.layoutMode,n=i?_u(t):{};m(t,e.getTheme().get(this.mainType)),m(t,this.getDefaultOption()),i&&xu(t,n,i)},mergeOption:function(t,e){m(this.option,t,!0);var i=this.layoutMode;i&&xu(this.option,t,i)},optionUpdated:function(t,e){},getDefaultOption:function(){var t=Iu(this);if(!t.defaultOption){for(var e=[],i=this.constructor;i;){var n=i.prototype.defaultOption;n&&e.push(n),i=i.superClass}for(var o={},a=e.length-1;0<=a;a--)o=m(o,e[a],!0);t.defaultOption=o}return t.defaultOption},getReferringComponents:function(t){return this.ecModel.queryComponents({mainType:t,index:this.get(t+"Index",!0),id:this.get(t+"Id",!0)})}});function Au(t,e){return t[e]||(t[e]={predecessor:[],successor:[]}),t[e]}aa(Tu,{registerWhenExtend:!0}),Su={},(bu=Tu).registerSubTypeDefaulter=function(t,e){t=Qo(t),Su[t.main]=e},bu.determineSubType=function(t,e){var i=e.type;if(!i){var n=Qo(t).main;bu.hasSubTypes(t)&&Su[n]&&(i=Su[n](e))}return i},Mu=function(t){var e=[];E(Tu.getClassesByMainType(t),function(t){e=e.concat(t.prototype.dependencies||[])}),e=N(e,function(t){return Qo(t).main}),"dataset"!==t&&_(e,"dataset")<=0&&e.unshift("dataset");return e},Tu.topologicalTravel=function(t,e,i,n){if(t.length){var o=function(e){var o={},a=[];return E(e,function(i){var n=Au(o,i),t=function(t,e){var i=[];return E(t,function(t){0<=_(e,t)&&i.push(t)}),i}(n.originalDeps=Mu(i),e);n.entryCount=t.length,0===n.entryCount&&a.push(i),E(t,function(t){_(n.predecessor,t)<0&&n.predecessor.push(t);var e=Au(o,t);_(e.successor,t)<0&&e.successor.push(i)})}),{graph:o,noEntryList:a}}(e),a=o.graph,r=o.noEntryList,s={};for(E(t,function(t){s[t]=!0});r.length;){var l=r.pop(),u=a[l],h=!!s[l];h&&(i.call(n,l,u.originalDeps.slice()),delete s[l]),E(u.successor,h?d:c)}E(s,function(){throw new Error("Circle dependency may exists")})}function c(t){a[t].entryCount--,0===a[t].entryCount&&r.push(t)}function d(t){s[t]=!0,c(t)}},b(Tu,{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")}}});var Du="";"undefined"!=typeof navigator&&(Du=navigator.platform||"");var Cu={color:["#c23531","#2f4554","#61a0a8","#d48265","#91c7ae","#749f83","#ca8622","#bda29a","#6e7074","#546570","#c4ccd3"],gradientColor:["#f6efa6","#d88273","#bf444c"],textStyle:{fontFamily:Du.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},Lu=Zo();var ku={clearColorPalette:function(){Lu(this).colorIdx=0,Lu(this).colorNameMap={}},getColorFromPalette:function(t,e,i){var n=Lu(e=e||this),o=n.colorIdx||0,a=n.colorNameMap=n.colorNameMap||{};if(a.hasOwnProperty(t))return a[t];var r=Eo(this.get("color",!0)),s=this.get("colorLayer",!0),l=null!=i&&s?function(t,e){for(var i=t.length,n=0;n<i;n++)if(t[n].length>e)return t[n];return t[i-1]}(s,i):r;if((l=l||r)&&l.length){var u=l[o];return t&&(a[t]=u),n.colorIdx=(o+1)%l.length,u}}},Pu="original",Nu="arrayRows",Ou="objectRows",Eu="keyedColumns",zu="unknown",Ru="typedArray",Bu="column",Vu="row";function Gu(t){this.fromDataset=t.fromDataset,this.data=t.data||(t.sourceFormat===Eu?{}:[]),this.sourceFormat=t.sourceFormat||zu,this.seriesLayoutBy=t.seriesLayoutBy||Bu,this.dimensionsDefine=t.dimensionsDefine,this.encodeDefine=t.encodeDefine&&Q(t.encodeDefine),this.startIndex=t.startIndex||0,this.dimensionsDetectCount=t.dimensionsDetectCount}Gu.seriesDataToSource=function(t){return new Gu({data:t,sourceFormat:V(t)?Ru:Pu,fromDataset:!1})},ia(Gu);var Fu={Must:1,Might:2,Not:3},Wu=Zo();function Hu(t){var e=t.option,i=e.data,n=V(i)?Ru:Pu,o=!1,a=e.seriesLayoutBy,r=e.sourceHeader,s=e.dimensions,l=ju(t);if(l){var u=l.option;i=u.source,n=Wu(l).sourceFormat,o=!0,a=a||u.seriesLayoutBy,null==r&&(r=u.sourceHeader),s=s||u.dimensions}var h=function(t,e,i,n,o){if(!t)return{dimensionsDefine:Zu(o)};var a,r;if(e===Nu)"auto"===n||null==n?Uu(function(t){null!=t&&"-"!==t&&(z(t)?null==r&&(r=1):r=0)},i,t,10):r=n?1:0,o||1!==r||(o=[],Uu(function(t,e){o[e]=null!=t?t:""},i,t)),a=o?o.length:i===Vu?t.length:t[0]?t[0].length:null;else if(e===Ou)o=o||function(t){var e,i=0;for(;i<t.length&&!(e=t[i++]););if(e){var n=[];return E(e,function(t,e){n.push(e)}),n}}(t);else if(e===Eu)o||(o=[],E(t,function(t,e){o.push(e)}));else if(e===Pu){var s=Bo(t[0]);a=k(s)&&s.length||1}return{startIndex:r,dimensionsDefine:Zu(o),dimensionsDetectCount:a}}(i,n,a,r,s);Wu(t).source=new Gu({data:i,fromDataset:o,seriesLayoutBy:a,sourceFormat:n,dimensionsDefine:h.dimensionsDefine,startIndex:h.startIndex,dimensionsDetectCount:h.dimensionsDetectCount,encodeDefine:e.encode})}function Zu(t){if(t){var n=Q();return N(t,function(t,e){if(null==(t=L({},R(t)?t:{name:t})).name)return t;t.name+="",null==t.displayName&&(t.displayName=t.name);var i=n.get(t.name);return i?t.name+="-"+i.count++:n.set(t.name,{count:1}),t})}}function Uu(t,e,i,n){if(null==n&&(n=1/0),e===Vu)for(var o=0;o<i.length&&o<n;o++)t(i[o]?i[o][0]:null,o);else{var a=i[0]||[];for(o=0;o<a.length&&o<n;o++)t(a[o],o)}}function Xu(i,t,e){var a={},n=ju(t);if(!n||!i)return a;var r,o,s=[],l=[],u=t.ecModel,h=Wu(u).datasetMap,c=n.uid+"_"+e.seriesLayoutBy;E(i=i.slice(),function(t,e){R(t)||(i[e]={name:t}),"ordinal"===t.type&&null==r&&(o=p(i[r=e])),a[t.name]=[]});var d=h.get(c)||h.set(c,{categoryWayDim:o,valueWayDim:0});function f(t,e,i){for(var n=0;n<i;n++)t.push(e+n)}function p(t){var e=t.dimsDef;return e?e.length:1}return E(i,function(t,e){var i=t.name,n=p(t);if(null==r){var o=d.valueWayDim;f(a[i],o,n),f(l,o,n),d.valueWayDim+=n}else if(r===e)f(a[i],0,n),f(s,0,n);else{o=d.categoryWayDim;f(a[i],o,n),f(l,o,n),d.categoryWayDim+=n}}),s.length&&(a.itemName=s),l.length&&(a.seriesName=l),a}function Yu(t,l,u){var e={};if(!ju(t))return e;var h,c=l.sourceFormat,d=l.dimensionsDefine;c!==Ou&&c!==Eu||E(d,function(t,e){"name"===(R(t)?t.name:t)&&(h=e)});var i=function(){for(var t={},e={},i=[],n=0,o=Math.min(5,u);n<o;n++){var a=qu(l.data,c,l.seriesLayoutBy,d,l.startIndex,n);i.push(a);var r=a===Fu.Not;if(r&&null==t.v&&n!==h&&(t.v=n),null!=t.n&&t.n!==t.v&&(r||i[t.n]!==Fu.Not)||(t.n=n),s(t)&&i[t.n]!==Fu.Not)return t;r||(a===Fu.Might&&null==e.v&&n!==h&&(e.v=n),null!=e.n&&e.n!==e.v||(e.n=n))}function s(t){return null!=t.v&&null!=t.n}return s(t)?t:s(e)?e:null}();if(i){e.value=i.v;var n=null!=h?h:i.n;e.itemName=[n],e.seriesName=[n]}return e}function ju(t){var e=t.option;if(!e.data)return t.ecModel.getComponent("dataset",e.datasetIndex||0)}function qu(t,e,i,n,o,a){var r,s,l;if(V(t))return Fu.Not;if(n){var u=n[a];R(u)?(s=u.name,l=u.type):z(u)&&(s=u)}if(null!=l)return"ordinal"===l?Fu.Must:Fu.Not;if(e===Nu)if(i===Vu){for(var h=t[a],c=0;c<(h||[]).length&&c<5;c++)if(null!=(r=g(h[o+c])))return r}else for(c=0;c<t.length&&c<5;c++){var d=t[o+c];if(d&&null!=(r=g(d[a])))return r}else if(e===Ou){if(!s)return Fu.Not;for(c=0;c<t.length&&c<5;c++){if((f=t[c])&&null!=(r=g(f[s])))return r}}else if(e===Eu){if(!s)return Fu.Not;if(!(h=t[s])||V(h))return Fu.Not;for(c=0;c<h.length&&c<5;c++)if(null!=(r=g(h[c])))return r}else if(e===Pu)for(c=0;c<t.length&&c<5;c++){var f,p=Bo(f=t[c]);if(!k(p))return Fu.Not;if(null!=(r=g(p[a])))return r}function g(t){var e=z(t);return null!=t&&isFinite(t)&&""!==t?e?Fu.Might:Fu.Not:e&&"-"!==t?Fu.Must:void 0}return Fu.Not}var Ku="\0_ec_inner",$u=Il.extend({init:function(t,e,i,n){i=i||{},this.option=null,this._theme=new Il(i),this._optionManager=n},setOption:function(t,e){Y(!(Ku 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)):function(t){t=t,this.option={},this.option[Ku]=1,this._componentsMap=Q({series:[]}),this._seriesIndices,this._seriesIndicesMap,function(i,t){var n=i.color&&!i.colorLayer;E(t,function(t,e){"colorLayer"===e&&n||Tu.hasClass(e)||("object"==typeof t?i[e]=i[e]?m(i[e],t,!1):D(t):null==i[e]&&(i[e]=t))})}(t,this._theme.option),m(t,Cu,!1),this.mergeOption(t)}.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&&E(a,function(t){this.mergeOption(t,e=!0)},this)}return e},mergeOption:function(n){var l=this.option,u=this._componentsMap,i=[];!function(t){Wu(t).datasetMap=Q()}(this),E(n,function(t,e){null!=t&&(Tu.hasClass(e)?e&&i.push(e):l[e]=null==l[e]?D(t):m(l[e],t,!0))}),Tu.topologicalTravel(i,Tu.getAllClassMainTypes(),function(r,t){var e=Eo(n[r]),i=Vo(u.get(r),e);Go(i),E(i,function(t,e){var i=t.option;R(i)&&(t.keyInfo.mainType=r,t.keyInfo.subType=function(t,e,i){return e.type?e.type:i?i.subType:Tu.determineSubType(t,e)}(r,i,t.exist))});var s=function(e,t){k(t)||(t=t?[t]:[]);var i={};return E(t,function(t){i[t]=(e.get(t)||[]).slice()}),i}(u,t);l[r]=[],u.set(r,[]),E(i,function(t,e){var i=t.exist,n=t.option;if(Y(R(n)||i,"Empty component definition"),n){var o=Tu.getClass(r,t.keyInfo.subType,!0);if(i&&i.constructor===o)i.name=t.keyInfo.name,i.mergeOption(n,this),i.optionUpdated(n,!1);else{var a=L({dependentModels:s,componentIndex:e},t.keyInfo);L(i=new o(n,this,this,a),a),i.init(n,this,this,a),i.optionUpdated(null,!0)}}else i.mergeOption({},this),i.optionUpdated({},!1);u.get(r)[e]=i,l[r][e]=i.option},this),"series"===r&&Ju(this,u.get("series"))},this),this._seriesIndicesMap=Q(this._seriesIndices=this._seriesIndices||[])},getOption:function(){var n=D(this.option);return E(n,function(t,e){if(Tu.hasClass(e)){for(var i=(t=Eo(t)).length-1;0<=i;i--)Wo(t[i])&&t.splice(i,1);n[e]=t}}),delete n[Ku],n},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,n=t.index,o=t.id,a=t.name,r=this._componentsMap.get(e);if(!r||!r.length)return[];if(null!=n)k(n)||(n=[n]),i=M(N(n,function(t){return r[t]}),function(t){return!!t});else if(null!=o){var s=k(o);i=M(r,function(t){return s&&0<=_(o,t.id)||!s&&t.id===o})}else if(null!=a){var l=k(a);i=M(r,function(t){return l&&0<=_(a,t.name)||!l&&t.name===a})}else i=r.slice();return Qu(i,t)},findComponents:function(t){var e,i,n,o,a,r=t.query,s=t.mainType,l=(i=s+"Index",n=s+"Id",o=s+"Name",!(e=r)||null==e[i]&&null==e[n]&&null==e[o]?null:{mainType:s,index:e[i],id:e[n],name:e[o]}),u=l?this.queryComponents(l):this._componentsMap.get(s);return a=Qu(u,t),t.filter?M(a,t.filter):a},eachComponent:function(t,n,o){var e=this._componentsMap;if("function"==typeof t)o=n,n=t,e.each(function(t,i){E(t,function(t,e){n.call(o,i,t,e)})});else if(z(t))E(e.get(t),n,o);else if(R(t)){E(this.findComponents(t),n,o)}},getSeriesByName:function(e){return M(this._componentsMap.get("series"),function(t){return t.name===e})},getSeriesByIndex:function(t){return this._componentsMap.get("series")[t]},getSeriesByType:function(e){return M(this._componentsMap.get("series"),function(t){return t.subType===e})},getSeries:function(){return this._componentsMap.get("series").slice()},getSeriesCount:function(){return this._componentsMap.get("series").length},eachSeries:function(i,n){E(this._seriesIndices,function(t){var e=this._componentsMap.get("series")[t];i.call(n,e,t)},this)},eachRawSeries:function(t,e){E(this._componentsMap.get("series"),t,e)},eachSeriesByType:function(i,n,o){E(this._seriesIndices,function(t){var e=this._componentsMap.get("series")[t];e.subType===i&&n.call(o,e,t)},this)},eachRawSeriesByType:function(t,e,i){return E(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){var i=M(this._componentsMap.get("series"),t,e);Ju(this,i)},restoreData:function(i){var n=this._componentsMap;Ju(this,n.get("series"));var o=[];n.each(function(t,e){o.push(e)}),Tu.topologicalTravel(o,Tu.getAllClassMainTypes(),function(e,t){E(n.get(e),function(t){"series"===e&&function(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}}(t,i)||t.restoreData()})})}});function Ju(t,e){t._seriesIndicesMap=Q(t._seriesIndices=N(e,function(t){return t.componentIndex})||[])}function Qu(t,e){return e.hasOwnProperty("subType")?M(t,function(t){return t.subType===e.subType}):t}b($u,ku);var th=["getDom","getZr","getWidth","getHeight","getDevicePixelRatio","dispatchAction","isDisposed","on","off","getDataURL","getConnectedDataURL","getModel","getOption","getViewOfComponentModel","getViewOfSeriesModel"];function eh(e){E(th,function(t){this[t]=A(e[t],e)},this)}var ih={};function nh(){this._coordinateSystems=[]}nh.prototype={constructor:nh,create:function(n,o){var a=[];E(ih,function(t,e){var i=t.create(n,o);a=a.concat(i||[])}),this._coordinateSystems=a},update:function(e,i){E(this._coordinateSystems,function(t){t.update&&t.update(e,i)})},getCoordinateSystems:function(){return this._coordinateSystems.slice()}},nh.register=function(t,e){ih[t]=e},nh.get=function(t){return ih[t]};var oh=E,ah=D,rh=N,sh=m,lh=/^(min|max)?(.+)$/;function uh(t){this._api=t,this._timelineOptions=[],this._mediaList=[],this._mediaDefault,this._currentMediaIndices=[],this._optionBackup,this._newBaseOption}function hh(t,e,i){var a={width:e,height:i,aspectratio:e/i},r=!0;return E(t,function(t,e){var i=e.match(lh);if(i&&i[1]&&i[2]){var n=i[1],o=i[2].toLowerCase();!function(t,e,i){return"min"===i?e<=t:"max"===i?t<=e:t===e}(a[o],t,n)&&(r=!1)}}),r}uh.prototype={constructor:uh,setOption:function(t,e){t&&E(Eo(t.series),function(t){t&&t.data&&V(t.data)&&K(t.data)}),t=ah(t);var i=this._optionBackup,n=function(t,i,n){var e,o,a=[],r=[],s=t.timeline;t.baseOption&&(o=t.baseOption);(s||t.options)&&(o=o||{},a=(t.options||[]).slice());if(t.media){o=o||{};var l=t.media;oh(l,function(t){t&&t.option&&(t.query?r.push(t):e=e||t)})}o=o||t;o.timeline||(o.timeline=s);return oh([o].concat(a).concat(N(r,function(t){return t.option})),function(e){oh(i,function(t){t(e,n)})}),{baseOption:o,timelineOptions:a,mediaDefault:e,mediaList:r}}.call(this,t,e,!i);this._newBaseOption=n.baseOption,i?(function(o,t){oh(t=t||{},function(t,e){if(null!=t){var i=o[e];if(Tu.hasClass(e)){t=Eo(t);var n=Vo(i=Eo(i),t);o[e]=rh(n,function(t){return t.option&&t.exist?sh(t.exist,t.option,!0):t.exist||t.option})}else o[e]=sh(i,t,!0)}})}(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=rh(e.timelineOptions,ah),this._mediaList=rh(e.mediaList,ah),this._mediaDefault=ah(e.mediaDefault),this._currentMediaIndices=[],ah(t?e.baseOption:this._newBaseOption)},getTimelineOption:function(t){var e,i=this._timelineOptions;if(i.length){var n=t.getComponent("timeline");n&&(e=ah(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++)hh(n[s].query,e,i)&&a.push(s);return!a.length&&o&&(a=[-1]),a.length&&!function(t,e){return t.join(",")===e.join(",")}(a,this._currentMediaIndices)&&(r=rh(a,function(t){return ah(-1===t?o.option:n[t].option)})),this._currentMediaIndices=a,r}};var ch=E,dh=R,fh=["areaStyle","lineStyle","nodeStyle","linkStyle","chordStyle","label","labelLine"];function ph(t){var e=t&&t.itemStyle;if(e)for(var i=0,n=fh.length;i<n;i++){var o=fh[i],a=e.normal,r=e.emphasis;a&&a[o]&&(t[o]=t[o]||{},t[o].normal?m(t[o].normal,a[o]):t[o].normal=a[o],a[o]=null),r&&r[o]&&(t[o]=t[o]||{},t[o].emphasis?m(t[o].emphasis,r[o]):t[o].emphasis=r[o],r[o]=null)}}function gh(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,C(t[e],n)):t[e]=n),o&&(t.emphasis=t.emphasis||{},t.emphasis[e]=o)}}function mh(t){gh(t,"itemStyle"),gh(t,"lineStyle"),gh(t,"areaStyle"),gh(t,"label"),gh(t,"labelLine"),gh(t,"upperLabel"),gh(t,"edgeLabel")}function vh(t,e){var i=dh(t)&&t[e],n=dh(i)&&i.textStyle;if(n)for(var o=0,a=Ro.length;o<a;o++){e=Ro[o];n.hasOwnProperty(e)&&(i[e]=n[e])}}function yh(t){t&&(mh(t),vh(t,"label"),t.emphasis&&vh(t.emphasis,"label"))}function xh(t){return k(t)?t:t?[t]:[]}function _h(t){return(k(t)?t[0]:t)||{}}function wh(e,t){ch(xh(e.series),function(t){dh(t)&&function(t){if(dh(t)){ph(t),mh(t),vh(t,"label"),vh(t,"upperLabel"),vh(t,"edgeLabel"),t.emphasis&&(vh(t.emphasis,"label"),vh(t.emphasis,"upperLabel"),vh(t.emphasis,"edgeLabel")),(i=t.markPoint)&&(ph(i),yh(i)),(n=t.markLine)&&(ph(n),yh(n));var e=t.markArea;e&&yh(e);var i,n,o=t.data;if("graph"===t.type){o=o||t.nodes;var a=t.links||t.edges;if(a&&!V(a))for(var r=0;r<a.length;r++)yh(a[r]);E(t.categories,function(t){mh(t)})}if(o&&!V(o))for(r=0;r<o.length;r++)yh(o[r]);if((i=t.markPoint)&&i.data){var s=i.data;for(r=0;r<s.length;r++)yh(s[r])}if((n=t.markLine)&&n.data){var l=n.data;for(r=0;r<l.length;r++)k(l[r])?(yh(l[r][0]),yh(l[r][1])):yh(l[r])}"gauge"===t.type?(vh(t,"axisLabel"),vh(t,"title"),vh(t,"detail")):"treemap"===t.type?(gh(t.breadcrumb,"itemStyle"),E(t.levels,function(t){mh(t)})):"tree"===t.type&&mh(t.leaves)}}(t)});var i=["xAxis","yAxis","radiusAxis","angleAxis","singleAxis","parallelAxis","radar"];t&&i.push("valueAxis","categoryAxis","logAxis","timeAxis"),ch(i,function(t){ch(xh(e[t]),function(t){t&&(vh(t,"axisLabel"),vh(t.axisPointer,"label"))})}),ch(xh(e.parallel),function(t){var e=t&&t.parallelAxisDefault;vh(e,"axisLabel"),vh(e&&e.axisPointer,"label")}),ch(xh(e.calendar),function(t){gh(t,"itemStyle"),vh(t,"dayLabel"),vh(t,"monthLabel"),vh(t,"yearLabel")}),ch(xh(e.radar),function(t){vh(t,"name")}),ch(xh(e.geo),function(t){dh(t)&&(yh(t),ch(xh(t.regions),function(t){yh(t)}))}),ch(xh(e.timeline),function(t){yh(t),gh(t,"label"),gh(t,"itemStyle"),gh(t,"controlStyle",!0);var e=t.data;k(e)&&E(e,function(t){R(t)&&(gh(t,"label"),gh(t,"itemStyle"))})}),ch(xh(e.toolbox),function(t){gh(t,"iconStyle"),ch(t.feature,function(t){gh(t,"iconStyle")})}),vh(_h(e.axisPointer),"label"),vh(_h(e.tooltip).axisPointer,"label")}function bh(e){E(Sh,function(t){t[0]in e&&!(t[1]in e)&&(e[t[1]]=e[t[0]])})}var Sh=[["x","left"],["y","top"],["x2","right"],["y2","bottom"]],Mh=["grid","geo","parallel","legend","toolbox","title","visualMap","dataZoom","timeline"],Ih=function(i,t){wh(i,t),i.series=Eo(i.series),E(i.series,function(t){if(R(t)){var e=t.type;if("line"===e)null!=t.clipOverflow&&(t.clip=t.clipOverflow);else if("pie"===e||"gauge"===e)null!=t.clockWise&&(t.clockwise=t.clockWise);else if("gauge"===e){var i=function(t,e){e=e.split(",");for(var i=t,n=0;n<e.length&&null!=(i=i&&i[e[n]]);n++);return i}(t,"pointer.color");null!=i&&function(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)}(t,"itemStyle.color",i)}bh(t)}}),i.dataRange&&(i.visualMap=i.dataRange),E(Mh,function(t){var e=i[t];e&&(k(e)||(e=[e]),E(e,function(t){bh(t)}))})};function Th(m){E(m,function(h,c){var d=[],f=[NaN,NaN],t=[h.stackResultDimension,h.stackedOverDimension],p=h.data,g=h.isStackedByIndex,e=p.map(t,function(t,e,i){var n,o,a=p.get(h.stackedDimension,i);if(isNaN(a))return f;g?o=p.getRawIndex(i):n=p.get(h.stackedByDimension,i);for(var r=NaN,s=c-1;0<=s;s--){var l=m[s];if(g||(o=l.data.rawIndexOf(l.stackedByDimension,n)),0<=o){var u=l.data.getByRawIndex(l.stackResultDimension,o);if(0<=a&&0<u||a<=0&&u<0){a+=u,r=u;break}}}return d[0]=a,d[1]=r,d});p.hostModel.setData(e),h.data=e})}function Ah(t,e){Gu.isInstance(t)||(t=Gu.seriesDataToSource(t)),this._source=t;var i=this._data=t.data,n=t.sourceFormat;n===Ru&&(this._offset=0,this._dimSize=e,this._data=i),L(this,Ch[n===Nu?n+"_"+t.seriesLayoutBy:n])}var Dh=Ah.prototype;Dh.pure=!1;var Ch={arrayRows_column:{pure:Dh.persistent=!0,count:function(){return Math.max(0,this._data.length-this._source.startIndex)},getItem:function(t){return this._data[t+this._source.startIndex]},appendData:Ph},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:Lh,getItem:kh,appendData:Ph},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 o=this._data;E(t,function(t,e){for(var i=o[e]||(o[e]=[]),n=0;n<(t||[]).length;n++)i.push(t[n])})}},original:{count:Lh,getItem:kh,appendData:Ph},typedArray:{persistent:!(Dh.getSource=function(){return this._source}),pure:!0,count:function(){return this._data?this._data.length/this._dimSize:0},getItem:function(t,e){t-=this._offset,e=e||[];for(var 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}}};function Lh(){return this._data.length}function kh(t){return this._data[t]}function Ph(t){for(var e=0;e<t.length;e++)this._data.push(t[e])}var Nh={arrayRows:Oh,objectRows:function(t,e,i,n){return null!=i?t[n]:t},keyedColumns:Oh,original:function(t,e,i,n){var o=Bo(t);return null!=i&&o instanceof Array?o[i]:o},typedArray:Oh};function Oh(t,e,i,n){return null!=i?t[i]:t}var Eh={arrayRows:zh,objectRows:function(t,e,i,n){return Rh(t[e],this._dimensionInfos[e])},keyedColumns:zh,original:function(t,e,i,n){var o=t&&(null==t.value?t:t.value);return!this._rawData.pure&&function(t){return Po(t)&&!(t instanceof Array)}(t)&&(this.hasItemOption=!0),Rh(o instanceof Array?o[n]:o,this._dimensionInfos[e])},typedArray:function(t,e,i,n){return t[n]}};function zh(t,e,i,n){return Rh(t[n],this._dimensionInfos[e])}function Rh(t,e){var i=e&&e.type;if("ordinal"!==i)return"time"===i&&"number"!=typeof t&&null!=t&&"-"!==t&&(t=+Hl(t)),null==t||""===t?NaN:+t;var n=e&&e.ordinalMeta;return n?n.parseAndCollect(t):t}function Bh(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),Nh[r](n,e,a,o)}}}function Vh(t,e,i){if(t){var n=t.getProvider().getSource().sourceFormat;if(n===Pu||n===Ou){var o=t.getRawDataItem(e);return n!==Pu||R(o)||(o=null),o?o[i]:void 0}}}var Gh=/\{@(.+?)\}/g,Fh={getDataParams:function(t,e){var i=this.getData(e),n=this.getRawValue(t,e),o=i.getRawIndex(t),a=i.getName(t),r=i.getRawDataItem(t),s=i.getItemVisual(t,"color"),l=i.getItemVisual(t,"borderColor"),u=this.ecModel.getComponent("tooltip"),h=qo(u&&u.get("renderMode")),c=this.mainType,d="series"===c,f=i.userOutput;return{componentType:c,componentSubType:this.subType,componentIndex:this.componentIndex,seriesType:d?this.subType:null,seriesIndex:this.seriesIndex,seriesId:d?this.id:null,seriesName:d?this.name:null,name:a,dataIndex:o,data:r,dataType:e,value:n,color:s,borderColor:l,dimensionNames:f?f.dimensionNames:null,encode:f?f.encode:null,marker:ru({color:s,renderMode:h}),$vars:["seriesName","name","value"]}},getFormattedLabel:function(n,t,e,i,o){t=t||"normal";var a=this.getData(e),r=a.getItemModel(n),s=this.getDataParams(n,e);null!=i&&s.value instanceof Array&&(s.value=s.value[i]);var l=r.get("normal"===t?[o||"label","formatter"]:[t,o||"label","formatter"]);return"function"==typeof l?(s.status=t,s.dimensionIndex=i,l(s)):"string"==typeof l?ou(l,s).replace(Gh,function(t,e){var i=e.length;return"["===e.charAt(0)&&"]"===e.charAt(i-1)&&(e=+e.slice(1,i-1)),Bh(a,n,e)}):void 0},getRawValue:function(t,e){return Bh(this.getData(e),t)},formatTooltip:function(){}};function Wh(t){return new Hh(t)}function Hh(t){t=t||{},this._reset=t.reset,this._plan=t.plan,this._count=t.count,this._onDirty=t.onDirty,this._dirty=!0,this.context}var Zh=Hh.prototype;Zh.perform=function(t){var e,i=this._upstream,n=t&&t.skip;if(this._dirty&&i){var o=this.context;o.data=o.outputData=i.context.outputData}this.__pipeline&&(this.__pipeline.currentTask=this),this._plan&&!n&&(e=this._plan(this.context));var a,r=h(this._modBy),s=this._modDataCount||0,l=h(t&&t.modBy),u=t&&t.modDataCount||0;function h(t){return 1<=t||(t=1),t}r===l&&s===u||(e="reset"),!this._dirty&&"reset"!==e||(this._dirty=!1,a=function(t,e){var i,n;t._dueIndex=t._outputDueEnd=t._dueEnd=0,t._settedOutputEnd=null,!e&&t._reset&&((i=t._reset(t.context))&&i.progress&&(n=i.forceFirstProgress,i=i.progress),k(i)&&!i.length&&(i=null));t._progress=i,t._modBy=t._modDataCount=null;var o=t._downstream;return o&&o.dirty(),n}(this,n)),this._modBy=l,this._modDataCount=u;var c=t&&t.step;if(this._dueEnd=i?i._outputDueEnd:this._count?this._count(this.context):1/0,this._progress){var d=this._dueIndex,f=Math.min(null!=c?this._dueIndex+c:1/0,this._dueEnd);if(!n&&(a||d<f)){var p=this._progress;if(k(p))for(var g=0;g<p.length;g++)tc(this,p[g],d,f,l,u);else tc(this,p,d,f,l,u)}this._dueIndex=f;var m=null!=this._settedOutputEnd?this._settedOutputEnd:f;this._outputDueEnd=m}else this._dueIndex=this._outputDueEnd=null!=this._settedOutputEnd?this._settedOutputEnd:this._dueEnd;return this.unfinished()};var Uh,Xh,Yh,jh,qh,Kh,$h=Kh={reset:function(t,e,i,n){Xh=t,Uh=e,Yh=i,jh=n,qh=Math.ceil(jh/Yh),Kh.next=1<Yh&&0<jh?Qh:Jh}};function Jh(){return Xh<Uh?Xh++:null}function Qh(){var t=Xh%qh*Yh+Math.ceil(Xh/qh),e=Uh<=Xh?null:t<jh?t:Xh;return Xh++,e}function tc(t,e,i,n,o,a){$h.reset(i,n,o,a),t._callingProgress=e,t._callingProgress({start:i,end:n,count:n-i,next:$h.next},t.context)}Zh.dirty=function(){this._dirty=!0,this._onDirty&&this._onDirty(this.context)},Zh.unfinished=function(){return this._progress&&this._dueIndex<this._dueEnd},Zh.pipe=function(t){this._downstream===t&&!this._dirty||((this._downstream=t)._upstream=this,t.dirty())},Zh.dispose=function(){this._disposed||(this._upstream&&(this._upstream._downstream=null),this._downstream&&(this._downstream._upstream=null),this._dirty=!1,this._disposed=!0)},Zh.getUpstream=function(){return this._upstream},Zh.getDownstream=function(){return this._downstream},Zh.setOutputEnd=function(t){this._outputDueEnd=this._settedOutputEnd=t};var ec=Zo(),ic=Tu.extend({type:"series.__base__",seriesIndex:0,coordinateSystem:null,defaultOption:null,legendVisualProvider:null,visualColorAccessPath:"itemStyle.color",visualBorderColorAccessPath:"itemStyle.borderColor",layoutMode:null,init:function(t,e,i,n){this.seriesIndex=this.componentIndex,this.dataTask=Wh({count:oc,reset:ac}),this.dataTask.context={model:this},this.mergeDefaultAndTheme(t,i),Hu(this);var o=this.getInitialData(t,i);sc(o,this),this.dataTask.context.data=o,ec(this).dataBeforeProcessed=o,nc(this)},mergeDefaultAndTheme:function(t,e){var i=this.layoutMode,n=i?_u(t):{},o=this.subType;Tu.hasClass(o)&&(o+="Series"),m(t,e.getTheme().get(this.subType)),m(t,this.getDefaultOption()),zo(t,"label",["show"]),this.fillDataTextStyle(t.data),i&&xu(t,n,i)},mergeOption:function(t,e){t=m(this.option,t,!0),this.fillDataTextStyle(t.data);var i=this.layoutMode;i&&xu(this.option,t,i),Hu(this);var n=this.getInitialData(t,e);sc(n,this),this.dataTask.dirty(),this.dataTask.context.data=n,ec(this).dataBeforeProcessed=n,nc(this)},fillDataTextStyle:function(t){if(t&&!V(t))for(var e=["show"],i=0;i<t.length;i++)t[i]&&t[i].label&&zo(t[i],"label",e)},getInitialData:function(){},appendData:function(t){this.getRawData().appendData(t.data)},getData:function(t){var e=uc(this);if(e){var i=e.context.data;return null==t?i:i.getLinkedData(t)}return ec(this).data},setData:function(t){var e=uc(this);if(e){var i=e.context;i.data!==t&&e.modifyOutputEnd&&e.setOutputEnd(t.count()),i.outputData=t,e!==this.dataTask&&(i.data=t)}ec(this).data=t},getSource:function(){return function(t){return Wu(t).source}(this)},getRawData:function(){return ec(this).dataBeforeProcessed},getBaseAxis:function(){var t=this.coordinateSystem;return t&&t.getBaseAxis&&t.getBaseAxis()},formatTooltip:function(o,h,t,c){var d=this,e="html"===(c=c||"html")?"<br/>":"\n",f="richText"===c,p={},g=0;function i(t){return{renderMode:c,content:eu(Kl(t)),style:p}}var m=this.getData(),a=m.mapDimension("defaultedTooltip",!0),n=a.length,r=this.getRawValue(o),s=k(r),v=m.getItemVisual(o,"color");R(v)&&v.colorStops&&(v=(v.colorStops[0]||{}).color),v=v||"transparent";var l=(1<n||s&&!n?function(t){var l=S(t,function(t,e,i){var n=m.getDimensionInfo(i);return t|(n&&!1!==n.tooltip&&null!=n.displayName)},0),u=[];function e(t,e){var i=m.getDimensionInfo(e);if(i&&!1!==i.otherDims.tooltip){var n=i.type,o="sub"+d.seriesIndex+"at"+g,a=ru({color:v,type:"subItem",renderMode:c,markerId:o}),r="string"==typeof a?a:a.content,s=(l?r+eu(i.displayName||"-")+": ":"")+eu("ordinal"===n?t+"":"time"===n?h?"":lu("yyyy/MM/dd hh:mm:ss",t):Kl(t));s&&u.push(s),f&&(p[o]=v,++g)}}a.length?E(a,function(t){e(Bh(m,o,t),t)}):E(t,e);var i=l?f?"\n":"<br/>":"",n=i+u.join(i||", ");return{renderMode:c,content:n,style:p}}(r):i(n?Bh(m,o,a[0]):s?r[0]:r)).content,u=d.seriesIndex+"at"+g,y=ru({color:v,type:"item",renderMode:c,markerId:u});p[u]=v,++g;var x=m.getName(o),_=this.name;Fo(this)||(_=""),_=_?eu(_)+(h?": ":e):"";var w="string"==typeof y?y:y.content;return{html:h?w+_+l:_+w+(x?eu(x)+": "+l:l),markers:p}},isAnimationEnabled:function(){if(v.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=ku.getColorFromPalette.call(this,t,e,i);return o=o||n.getColorFromPalette(t,e,i)},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});function nc(t){var e=t.name;Fo(t)||(t.name=function(t){var i=t.getRawData(),e=i.mapDimension("seriesName",!0),n=[];return E(e,function(t){var e=i.getDimensionInfo(t);e.displayName&&n.push(e.displayName)}),n.join(" ")}(t)||e)}function oc(t){return t.model.getRawData().count()}function ac(t){var e=t.model;return e.setData(e.getRawData().cloneShallow()),rc}function rc(t,e){t.end>e.outputData.count()&&e.model.getRawData().cloneShallow(e.outputData)}function sc(e,i){E(e.CHANGABLE_METHODS,function(t){e.wrapMethod(t,T(lc,i))})}function lc(t){var e=uc(t);e&&e.setOutputEnd(this.count())}function uc(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}}b(ic,Fh),b(ic,ku);var hc=function(){this.group=new Ii,this.uid=Cl("viewComponent")};hc.prototype={constructor:hc,init:function(t,e){},render:function(t,e,i,n){},dispose:function(){},filterForExposedEvent:null};var cc=hc.prototype;cc.updateView=cc.updateLayout=cc.updateVisual=function(t,e,i,n){},ta(hc),aa(hc,{registerWhenExtend:!0});function dc(){var s=Zo();return function(t){var e=s(t),i=t.pipelineContext,n=e.large,o=e.progressiveRender,a=e.large=i.large,r=e.progressiveRender=i.progressiveRender;return!!(n^a||o^r)&&"reset"}}var fc=Zo(),pc=dc();function gc(){this.group=new Ii,this.uid=Cl("viewChart"),this.renderTask=Wh({plan:xc,reset:_c}),this.renderTask.context={view:this}}var mc=gc.prototype={type:"chart",init:function(t,e){},render:function(t,e,i,n){},highlight:function(t,e,i,n){yc(t.getData(),n,"emphasis")},downplay:function(t,e,i,n){yc(t.getData(),n,"normal")},remove:function(t,e){this.group.removeAll()},dispose:function(){},incrementalPrepareRender:null,incrementalRender:null,updateTransform:null,filterForExposedEvent:null};function vc(t,e,i){if(t&&(t.trigger(e,i),t.isGroup&&!qs(t)))for(var n=0,o=t.childCount();n<o;n++)vc(t.childAt(n),e,i)}function yc(e,t,i){var n=Ho(e,t),o=t&&null!=t.highlightKey?Ks(t.highlightKey):null;null!=n?E(Eo(n),function(t){vc(e.getItemGraphicEl(t),i,o)}):e.eachItemGraphicEl(function(t){vc(t,i,o)})}function xc(t){return pc(t.model)}function _c(t){var e=t.model,i=t.ecModel,n=t.api,o=t.payload,a=e.pipelineContext.progressiveRender,r=t.view,s=o&&fc(o).updateMethod,l=a?"incrementalPrepareRender":s&&r[s]?s:"render";return"render"!==l&&r[l](e,i,n,o),wc[l]}mc.updateView=mc.updateLayout=mc.updateVisual=function(t,e,i,n){this.render(t,e,i,n)},ta(gc),aa(gc,{registerWhenExtend:!0}),gc.markUpdateMethod=function(t,e){fc(t).updateMethod=e};var wc={incrementalPrepareRender:{progress:function(t,e){e.view.incrementalRender(t,e.model,e.ecModel,e.api,e.payload)}},render:{forceFirstProgress:!0,progress:function(t,e){e.view.render(e.model,e.ecModel,e.api,e.payload)}}},bc="\0__throttleOriginMethod",Sc="\0__throttleRate",Mc="\0__throttleType";function Ic(t,i,n){var o,a,r,s,l,u=0,h=0,c=null;function d(){h=(new Date).getTime(),c=null,t.apply(r,s||[])}i=i||0;function e(){o=(new Date).getTime(),r=this,s=arguments;var t=l||i,e=l||n;l=null,a=o-(e?u:h)-t,clearTimeout(c),e?c=setTimeout(d,t):0<=a?d():c=setTimeout(d,-a),u=o}return e.clear=function(){c&&(clearTimeout(c),c=null)},e.debounceNextCall=function(t){l=t},e}function Tc(t,e,i,n){var o=t[e];if(o){var a=o[bc]||o,r=o[Mc];if(o[Sc]!==i||r!==n){if(null==i||!n)return t[e]=a;(o=t[e]=Ic(a,i,"debounce"===n))[bc]=a,o[Mc]=n,o[Sc]=i}return o}}function Ac(t,e){var i=t[e];i&&i[bc]&&(t[e]=i[bc])}var Dc={createOnAllSeries:!0,performRawSeries:!0,reset:function(e,t){var i=e.getData(),a=(e.visualColorAccessPath||"itemStyle.color").split("."),n=e.get(a),o=!O(n)||n instanceof ss?null:n;n&&!o||(n=e.getColorFromPalette(e.name,null,t.getSeriesCount())),i.setVisual("color",n);var r=(e.visualBorderColorAccessPath||"itemStyle.borderColor").split("."),s=e.get(r);if(i.setVisual("borderColor",s),!t.isSeriesFiltered(e)){o&&i.each(function(t){i.setItemVisual(t,"color",o(e.getDataParams(t)))});return{dataEach:i.hasItemOption?function(t,e){var i=t.getItemModel(e),n=i.get(a,!0),o=i.get(r,!0);null!=n&&t.setItemVisual(e,"color",n),null!=o&&t.setItemVisual(e,"borderColor",o)}:null}}}},Cc={legend:{selector:{all:"全选",inverse:"反选"}},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:""}}}},Lc=function(t,e){var a=e.getModel("aria");if(a.get("show"))if(a.get("description"))t.setAttribute("aria-label",a.get("description"));else{var h=0;e.eachSeries(function(t,e){++h},this);var i,c=a.get("data.maxCount")||10,n=a.get("series.maxCount")||10,d=Math.min(h,n);if(!(h<1)){var o=function(){var t=e.getModel("title").option;t&&t.length&&(t=t[0]);return t&&t.text}();i=o?p(g("general.withTitle"),{title:o}):g("general.withoutTitle");var f=[];i+=p(g(1<h?"series.multiple.prefix":"series.single.prefix"),{seriesCount:h}),e.eachSeries(function(t,e){if(e<d){var i,n=t.get("name"),o="series."+(1<h?"multiple":"single")+".";i=p(i=g(n?o+"withName":o+"withoutName"),{seriesId:t.seriesIndex,seriesName:t.get("name"),seriesType:function(t){return Cc.series.typeNames[t]||"自定义图"}(t.subType)});var a=t.getData();(window.data=a).count()>c?i+=p(g("data.partialData"),{displayCnt:c}):i+=g("data.allData");for(var r=[],s=0;s<a.count();s++)if(s<c){var l=a.getName(s),u=Bh(a,s);r.push(p(g(l?"data.withName":"data.withoutName"),{name:l,value:u}))}i+=r.join(g("data.separator.middle"))+g("data.separator.end"),f.push(i)}}),i+=f.join(g("series.multiple.separator.middle"))+g("series.multiple.separator.end"),t.setAttribute("aria-label",i)}}function p(t,e){if("string"!=typeof t)return t;var i=t;return E(e,function(t,e){i=i.replace(new RegExp("\\{\\s*"+e+"\\s*\\}","g"),t)}),i}function g(t){var e=a.get(t);if(null!=e)return e;for(var i=t.split("."),n=Cc.aria,o=0;o<i.length;++o)n=n[i[o]];return n}},kc=Math.PI;function Pc(t,e,i,n){this.ecInstance=t,this.api=e,this.unfinished;i=this._dataProcessorHandlers=i.slice(),n=this._visualHandlers=n.slice();this._allHandlers=i.concat(n),this._stageTaskMap=Q()}var Nc=Pc.prototype;function Oc(l,t,u,h,c){var d;function f(t,e){return t.setDirty&&(!t.dirtyMap||t.dirtyMap.get(e.__pipeline.id))}c=c||{},E(t,function(n,t){if(!c.visualType||c.visualType===n.visualType){var e=l._stageTaskMap.get(n.uid),i=e.seriesTaskMap,o=e.overallTask;if(o){var a,r=o.agentStubMap;r.each(function(t){f(c,t)&&(t.dirty(),a=!0)}),a&&o.dirty(),Ec(o,h);var s=l.getPerformArgs(o,c.block);r.each(function(t){t.perform(s)}),d|=o.perform(s)}else i&&i.each(function(t,e){f(c,t)&&t.dirty();var i=l.getPerformArgs(t,c.block);i.skip=!n.performRawSeries&&u.isSeriesFiltered(t.context.model),Ec(t,h),d|=t.perform(i)})}}),l.unfinished|=d}Nc.restoreData=function(t,e){t.restoreData(e),this._stageTaskMap.each(function(t){var e=t.overallTask;e&&e.dirty()})},Nc.getPerformArgs=function(t,e){if(t.__pipeline){var i=this._pipelineMap.get(t.__pipeline.id),n=i.context,o=!e&&i.progressiveEnabled&&(!n||n.progressiveRender)&&t.__idxInPipeline>i.blockIndex?i.step:null,a=n&&n.modDataCount;return{step:o,modBy:null!=a?Math.ceil(a/o):null,modDataCount:a}}},Nc.getPipeline=function(t){return this._pipelineMap.get(t)},Nc.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"),r="mod"===t.get("progressiveChunkMode")?n:null;t.pipelineContext=i.context={progressiveRender:o,modDataCount:r,large:a}},Nc.restorePipelines=function(t){var n=this,o=n._pipelineMap=Q();t.eachSeries(function(t){var e=t.getProgressive(),i=t.uid;o.set(i,{id:i,head:null,tail:null,threshold:t.getProgressiveThreshold(),progressiveEnabled:e&&!(t.preventIncremental&&t.preventIncremental()),blockIndex:-1,step:Math.round(e||700),count:0}),Uc(n,t,t.dataTask)})},Nc.prepareStageTasks=function(){var i=this._stageTaskMap,n=this.ecInstance.getModel(),o=this.api;E(this._allHandlers,function(t){var e=i.get(t.uid)||i.set(t.uid,[]);t.reset&&function(n,o,t,a,r){var s=t.seriesTaskMap||(t.seriesTaskMap=Q()),e=o.seriesType,i=o.getTargetSeries;o.createOnAllSeries?a.eachRawSeries(l):e?a.eachRawSeriesByType(e,l):i&&i(a,r).each(l);function l(t){var e=t.uid,i=s.get(e)||s.set(e,Wh({plan:Gc,reset:Fc,count:Zc}));i.context={model:t,ecModel:a,api:r,useClearVisual:o.isVisual&&!o.isLayout,plan:o.plan,reset:o.reset,scheduler:n},Uc(n,t,i)}var u=n._pipelineMap;s.each(function(t,e){u.get(e)||(t.dispose(),s.removeKey(e))})}(this,t,e,n,o),t.overallReset&&function(n,t,e,i,o){var a=e.overallTask=e.overallTask||Wh({reset:zc});a.context={ecModel:i,api:o,overallReset:t.overallReset,scheduler:n};var r=a.agentStubMap=a.agentStubMap||Q(),s=t.seriesType,l=t.getTargetSeries,u=!0,h=t.modifyOutputEnd;s?i.eachRawSeriesByType(s,c):l?l(i,o).each(c):(u=!1,E(i.getSeries(),c));function c(t){var e=t.uid,i=r.get(e);i||(i=r.set(e,Wh({reset:Rc,onDirty:Vc})),a.dirty()),i.context={model:t,overallProgress:u,modifyOutputEnd:h},i.agent=a,i.__block=u,Uc(n,t,i)}var d=n._pipelineMap;r.each(function(t,e){d.get(e)||(t.dispose(),a.dirty(),r.removeKey(e))})}(this,t,e,n,o)},this)},Nc.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,Uc(this,e,o)},Nc.performDataProcessorTasks=function(t,e){Oc(this,this._dataProcessorHandlers,t,e,{block:!0})},Nc.performVisualTasks=function(t,e,i){Oc(this,this._visualHandlers,t,e,i)},Nc.performSeriesTasks=function(t){var e;t.eachSeries(function(t){e|=t.dataTask.perform()}),this.unfinished|=e},Nc.plan=function(){this._pipelineMap.each(function(t){var e=t.tail;do{if(e.__block){t.blockIndex=e.__idxInPipeline;break}e=e.getUpstream()}while(e)})};var Ec=Nc.updatePayload=function(t,e){"remain"!==e&&(t.context.payload=e)};function zc(t){t.overallReset(t.ecModel,t.api,t.payload)}function Rc(t,e){return t.overallProgress&&Bc}function Bc(){this.agent.dirty(),this.getDownstream().dirty()}function Vc(){this.agent&&this.agent.dirty()}function Gc(t){return t.plan&&t.plan(t.model,t.ecModel,t.api,t.payload)}function Fc(t){t.useClearVisual&&t.data.clearAllVisual();var e=t.resetDefines=Eo(t.reset(t.model,t.ecModel,t.api,t.payload));return 1<e.length?N(e,function(t,e){return Hc(e)}):Wc}var Wc=Hc(0);function Hc(a){return function(t,e){var i=e.data,n=e.resetDefines[a];if(n&&n.dataEach)for(var o=t.start;o<t.end;o++)n.dataEach(i,o);else n&&n.progress&&n.progress(t,i)}}function Zc(t){return t.data.count()}function Uc(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).__idxInPipeline=o.count++,i.__pipeline=o}Pc.wrapStageHandler=function(t,e){return O(t)&&(t={overallReset:t,seriesType:function(t){Xc=null;try{t(Yc,jc)}catch(t){}return Xc}(t)}),t.uid=Cl("stageHandler"),e&&(t.visualType=e),t};var Xc,Yc={},jc={};function qc(t,e){for(var i in e.prototype)t[i]=et}qc(Yc,$u),qc(jc,eh),Yc.eachSeriesByType=Yc.eachRawSeriesByType=function(t){Xc=t},Yc.eachComponent=function(t){"series"===t.mainType&&t.subType&&(Xc=t.subType)};function Kc(){return{axisLine:{lineStyle:{color:Qc}},axisTick:{lineStyle:{color:Qc}},axisLabel:{textStyle:{color:Qc}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:Qc}}}}var $c=["#37A2DA","#32C5E9","#67E0E3","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#E062AE","#E690D1","#e7bcf3","#9d96f5","#8378EA","#96BFFF"],Jc={color:$c,colorLayer:[["#37A2DA","#ffd85c","#fd7b5f"],["#37A2DA","#67E0E3","#FFDB5C","#ff9f7f","#E062AE","#9d96f5"],["#37A2DA","#32C5E9","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#e7bcf3","#8378EA","#96BFFF"],$c]},Qc="#eee",td=["#dd6b66","#759aa0","#e69d87","#8dc1a9","#ea7e53","#eedd78","#73a373","#73b9bc","#7289ab","#91ca8c","#f49f42"],ed={color:td,backgroundColor:"#333",tooltip:{axisPointer:{lineStyle:{color:Qc},crossStyle:{color:Qc},label:{color:"#000"}}},legend:{textStyle:{color:Qc}},textStyle:{color:Qc},title:{textStyle:{color:Qc}},toolbox:{iconStyle:{normal:{borderColor:Qc}}},dataZoom:{textStyle:{color:Qc}},visualMap:{textStyle:{color:Qc}},timeline:{lineStyle:{color:Qc},itemStyle:{normal:{color:td[1]}},label:{normal:{textStyle:{color:Qc}}},controlStyle:{normal:{color:Qc,borderColor:Qc}}},timeAxis:Kc(),logAxis:Kc(),valueAxis:Kc(),categoryAxis:Kc(),line:{symbol:"circle"},graph:{color:td},gauge:{title:{textStyle:{color:Qc}}},candlestick:{itemStyle:{normal:{color:"#FD1050",color0:"#0CF49B",borderColor:"#FD1050",borderColor0:"#0CF49B"}}}};ed.categoryAxis.splitLine.show=!1,Tu.extend({type:"dataset",defaultOption:{seriesLayoutBy:Bu,sourceHeader:null,dimensions:null,source:null},optionUpdated:function(){!function(t){var e=t.option.source,i=zu;if(V(e))i=Ru;else if(k(e)){0===e.length&&(i=Nu);for(var n=0,o=e.length;n<o;n++){var a=e[n];if(null!=a){if(k(a)){i=Nu;break}if(R(a)){i=Ou;break}}}}else if(R(e)){for(var r in e)if(e.hasOwnProperty(r)&&P(e[r])){i=Eu;break}}else if(null!=e)throw new Error("Invalid data");Wu(t).sourceFormat=i}(this)}}),hc.extend({type:"dataset"});var id=Sr.extend({type:"ellipse",shape:{cx:0,cy:0,rx:0,ry:0},buildPath:function(t,e){var i=e.cx,n=e.cy,o=e.rx,a=e.ry,r=.5522848*o,s=.5522848*a;t.moveTo(i-o,n),t.bezierCurveTo(i-o,n-s,i-r,n-a,i,n-a),t.bezierCurveTo(i+r,n-a,i+o,n-s,i+o,n),t.bezierCurveTo(i+o,n+s,i+r,n+a,i,n+a),t.bezierCurveTo(i-r,n+a,i-o,n+s,i-o,n),t.closePath()}}),nd=/[\s,]+/;function od(t){z(t)&&(t=(new DOMParser).parseFromString(t,"text/xml"));for(9===t.nodeType&&(t=t.firstChild);"svg"!==t.nodeName.toLowerCase()||1!==t.nodeType;)t=t.nextSibling;return t}function ad(){this._defs={},this._root=null,this._isDefine=!1,this._isText=!1}ad.prototype.parse=function(t,e){e=e||{};var i=od(t);if(!i)throw new Error("Illegal svg");var n=new Ii;this._root=n;var o=i.getAttribute("viewBox")||"",a=parseFloat(i.getAttribute("width")||e.width),r=parseFloat(i.getAttribute("height")||e.height);isNaN(a)&&(a=null),isNaN(r)&&(r=null),cd(i,n,null,!0);for(var s,l,u=i.firstChild;u;)this._parseNode(u,n),u=u.nextSibling;if(o){var h=j(o).split(nd);4<=h.length&&(s={x:parseFloat(h[0]||0),y:parseFloat(h[1]||0),width:parseFloat(h[2]),height:parseFloat(h[3])})}if(s&&null!=a&&null!=r&&(l=md(s,a,r),!e.ignoreViewBox)){var c=n;(n=new Ii).add(c),c.scale=l.scale.slice(),c.position=l.position.slice()}return e.ignoreRootClip||null==a||null==r||n.setClipPath(new is({shape:{x:0,y:0,width:a,height:r}})),{root:n,width:a,height:r,viewBoxRect:s,viewBoxTransform:l}},ad.prototype._parseNode=function(t,e){var i,n,o=t.nodeName.toLowerCase();if("defs"===o?this._isDefine=!0:"text"===o&&(this._isText=!0),this._isDefine){if(n=sd[o]){var a=n.call(this,t),r=t.getAttribute("id");r&&(this._defs[r]=a)}}else(n=rd[o])&&(i=n.call(this,t,e),e.add(i));for(var s=t.firstChild;s;)1===s.nodeType&&this._parseNode(s,i),3===s.nodeType&&this._isText&&this._parseText(s,i),s=s.nextSibling;"defs"===o?this._isDefine=!1:"text"===o&&(this._isText=!1)},ad.prototype._parseText=function(t,e){if(1===t.nodeType){var i=t.getAttribute("dx")||0,n=t.getAttribute("dy")||0;this._textX+=parseFloat(i),this._textY+=parseFloat(n)}var o=new Fr({style:{text:t.textContent,transformText:!0},position:[this._textX||0,this._textY||0]});ld(e,o),cd(t,o,this._defs);var a=o.style.fontSize;a&&a<9&&(o.style.fontSize=9,o.scale=o.scale||[1,1],o.scale[0]*=a/9,o.scale[1]*=a/9);var r=o.getBoundingRect();return this._textX+=r.width,e.add(o),o};var rd={g:function(t,e){var i=new Ii;return ld(e,i),cd(t,i,this._defs),i},rect:function(t,e){var i=new is;return ld(e,i),cd(t,i,this._defs),i.setShape({x:parseFloat(t.getAttribute("x")||0),y:parseFloat(t.getAttribute("y")||0),width:parseFloat(t.getAttribute("width")||0),height:parseFloat(t.getAttribute("height")||0)}),i},circle:function(t,e){var i=new Hr;return ld(e,i),cd(t,i,this._defs),i.setShape({cx:parseFloat(t.getAttribute("cx")||0),cy:parseFloat(t.getAttribute("cy")||0),r:parseFloat(t.getAttribute("r")||0)}),i},line:function(t,e){var i=new os;return ld(e,i),cd(t,i,this._defs),i.setShape({x1:parseFloat(t.getAttribute("x1")||0),y1:parseFloat(t.getAttribute("y1")||0),x2:parseFloat(t.getAttribute("x2")||0),y2:parseFloat(t.getAttribute("y2")||0)}),i},ellipse:function(t,e){var i=new id;return ld(e,i),cd(t,i,this._defs),i.setShape({cx:parseFloat(t.getAttribute("cx")||0),cy:parseFloat(t.getAttribute("cy")||0),rx:parseFloat(t.getAttribute("rx")||0),ry:parseFloat(t.getAttribute("ry")||0)}),i},polygon:function(t,e){var i=t.getAttribute("points");i=i&&ud(i);var n=new qr({shape:{points:i||[]}});return ld(e,n),cd(t,n,this._defs),n},polyline:function(t,e){var i=new Sr;ld(e,i),cd(t,i,this._defs);var n=t.getAttribute("points");return n=n&&ud(n),new Kr({shape:{points:n||[]}})},image:function(t,e){var i=new qn;return ld(e,i),cd(t,i,this._defs),i.setStyle({image:t.getAttribute("xlink:href"),x:t.getAttribute("x"),y:t.getAttribute("y"),width:t.getAttribute("width"),height:t.getAttribute("height")}),i},text:function(t,e){var i=t.getAttribute("x")||0,n=t.getAttribute("y")||0,o=t.getAttribute("dx")||0,a=t.getAttribute("dy")||0;this._textX=parseFloat(i)+parseFloat(o),this._textY=parseFloat(n)+parseFloat(a);var r=new Ii;return ld(e,r),cd(t,r,this._defs),r},tspan:function(t,e){var i=t.getAttribute("x"),n=t.getAttribute("y");null!=i&&(this._textX=parseFloat(i)),null!=n&&(this._textY=parseFloat(n));var o=t.getAttribute("dx")||0,a=t.getAttribute("dy")||0,r=new Ii;return ld(e,r),cd(t,r,this._defs),this._textX+=o,this._textY+=a,r},path:function(t,e){var i=Gr(t.getAttribute("d")||"");return ld(e,i),cd(t,i,this._defs),i}},sd={lineargradient:function(t){var e=parseInt(t.getAttribute("x1")||0,10),i=parseInt(t.getAttribute("y1")||0,10),n=parseInt(t.getAttribute("x2")||10,10),o=parseInt(t.getAttribute("y2")||0,10),a=new cs(e,i,n,o);return function(t,e){var i=t.firstChild;for(;i;){if(1===i.nodeType){var n=i.getAttribute("offset");n=0<n.indexOf("%")?parseInt(n,10)/100:n?parseFloat(n):0;var o=i.getAttribute("stop-color")||"#000000";e.addColorStop(n,o)}i=i.nextSibling}}(t,a),a},radialgradient:function(t){}};function ld(t,e){t&&t.__inheritedStyle&&(e.__inheritedStyle||(e.__inheritedStyle={}),C(e.__inheritedStyle,t.__inheritedStyle))}function ud(t){for(var e=j(t).split(nd),i=[],n=0;n<e.length;n+=2){var o=parseFloat(e[n]),a=parseFloat(e[n+1]);i.push([o,a])}return i}var hd={fill:"fill",stroke:"stroke","stroke-width":"lineWidth",opacity:"opacity","fill-opacity":"fillOpacity","stroke-opacity":"strokeOpacity","stroke-dasharray":"lineDash","stroke-dashoffset":"lineDashOffset","stroke-linecap":"lineCap","stroke-linejoin":"lineJoin","stroke-miterlimit":"miterLimit","font-family":"fontFamily","font-size":"fontSize","font-style":"fontStyle","font-weight":"fontWeight","text-align":"textAlign","alignment-baseline":"textBaseline"};function cd(t,e,i,n){var o=e.__inheritedStyle||{},a="text"===e.type;if(1===t.nodeType&&(function(t,e){var i=t.getAttribute("transform");if(i){i=i.replace(/,/g," ");var n=null,o=[];i.replace(pd,function(t,e,i){o.push(e,i)});for(var a=o.length-1;0<a;a-=2){var r=o[a],s=o[a-1];switch(n=n||ee(),s){case"translate":r=j(r).split(nd),ae(n,n,[parseFloat(r[0]),parseFloat(r[1]||0)]);break;case"scale":r=j(r).split(nd),se(n,n,[parseFloat(r[0]),parseFloat(r[1]||r[0])]);break;case"rotate":r=j(r).split(nd),re(n,n,parseFloat(r[0]));break;case"skew":r=j(r).split(nd),console.warn("Skew transform is not supported yet");break;case"matrix":r=j(r).split(nd);n[0]=parseFloat(r[0]),n[1]=parseFloat(r[1]),n[2]=parseFloat(r[2]),n[3]=parseFloat(r[3]),n[4]=parseFloat(r[4]),n[5]=parseFloat(r[5])}}e.setLocalTransform(n)}}(t,e),L(o,function(t){var e=t.getAttribute("style"),i={};if(!e)return i;var n,o={};gd.lastIndex=0;for(;null!=(n=gd.exec(e));)o[n[1]]=n[2];for(var a in hd)hd.hasOwnProperty(a)&&null!=o[a]&&(i[hd[a]]=o[a]);return i}(t)),!n))for(var r in hd)if(hd.hasOwnProperty(r)){var s=t.getAttribute(r);null!=s&&(o[hd[r]]=s)}var l=a?"textFill":"fill",u=a?"textStroke":"stroke";e.style=e.style||new Fi;var h=e.style;null!=o.fill&&h.set(l,fd(o.fill,i)),null!=o.stroke&&h.set(u,fd(o.stroke,i)),E(["lineWidth","opacity","fillOpacity","strokeOpacity","miterLimit","fontSize"],function(t){var e="lineWidth"===t&&a?"textStrokeWidth":t;null!=o[t]&&h.set(e,parseFloat(o[t]))}),o.textBaseline&&"auto"!==o.textBaseline||(o.textBaseline="alphabetic"),"alphabetic"===o.textBaseline&&(o.textBaseline="bottom"),"start"===o.textAlign&&(o.textAlign="left"),"end"===o.textAlign&&(o.textAlign="right"),E(["lineDashOffset","lineCap","lineJoin","fontWeight","fontFamily","fontStyle","textAlign","textBaseline"],function(t){null!=o[t]&&h.set(t,o[t])}),o.lineDash&&(e.style.lineDash=j(o.lineDash).split(nd)),h[u]&&"none"!==h[u]&&(e[u]=!0),e.__inheritedStyle=o}var dd=/url\(\s*#(.*?)\)/;function fd(t,e){var i=e&&t&&t.match(dd);return i?e[j(i[1])]:t}var pd=/(translate|scale|rotate|skewX|skewY|matrix)\(([\-\s0-9\.e,]*)\)/g;var gd=/([^\s:;]+)\s*:\s*([^:;]+)/g;function md(t,e,i){var n=e/t.width,o=i/t.height,a=Math.min(n,o);return{scale:[a,a],position:[-(t.x+t.width/2)*a+e/2,-(t.y+t.height/2)*a+i/2]}}var vd=Q(),yd={registerMap:function(t,e,i){var n;return E(n=k(e)?e:e.svg?[{type:"svg",source:e.svg,specialAreas:e.specialAreas}]:(e.geoJson&&!e.features&&(i=e.specialAreas,e=e.geoJson),[{type:"geoJSON",source:e,specialAreas:i}]),function(t){var e=t.type;"geoJson"===e&&(e=t.type="geoJSON"),(0,xd[e])(t)}),vd.set(t,n)},retrieveMap:function(t){return vd.get(t)}},xd={geoJSON:function(t){var e=t.source;t.geoJSON=z(e)?"undefined"!=typeof JSON&&JSON.parse?JSON.parse(e):new Function("return ("+e+");")():e},svg:function(t){t.svgXML=od(t.source)}},_d=Y,wd=E,bd=O,Sd=R,Md=Tu.parseClassType,Id={PROCESSOR:{FILTER:1e3,SERIES_FILTER:800,STATISTIC:5e3},VISUAL:{LAYOUT:1e3,PROGRESSIVE_LAYOUT:1100,GLOBAL:2e3,CHART:3e3,POST_CHART_LAYOUT:3500,COMPONENT:4e3,BRUSH:5e3}},Td="__flagInMainProcess",Ad="__optionUpdated",Dd=/^[a-zA-Z0-9_]+$/;function Cd(n,o){return function(t,e,i){!o&&this._disposed||(t=t&&t.toLowerCase(),Ct.prototype[n].call(this,t,e,i))}}function Ld(){Ct.call(this)}function kd(t,e,i){i=i||{},"string"==typeof e&&(e=ef[e]),this.id,this.group,this._dom=t;var n=this._zr=Ao(t,{renderer:i.renderer||"canvas",devicePixelRatio:i.devicePixelRatio,width:i.width,height:i.height});this._throttledZrFlush=Ic(A(n.flush,n),17),(e=D(e))&&Ih(e,!0),this._theme=e,this._chartsViews=[],this._chartsMap={},this._componentsViews=[],this._componentsMap={},this._coordSysMgr=new nh;var o=this._api=function(i){var t=i._coordSysMgr;return L(new eh(i),{getCoordinateSystems:A(t.getCoordinateSystems,t),getComponentByElement:function(t){for(;t;){var e=t.__ecComponentInfo;if(null!=e)return i._model.getComponent(e.mainType,e.index);t=t.parent}}})}(this);function a(t,e){return t.__prio-e.__prio}Ni(tf,a),Ni($d,a),this._scheduler=new Pc(this,o,$d,tf),Ct.call(this,this._ecEventProcessor=new jd),this._messageCenter=new Ld,this._initEvents(),this.resize=A(this.resize,this),this._pendingActions=[],n.animation.on("frame",this._onframe,this),function(t,e){t.on("rendered",function(){e.trigger("rendered"),!t.animation.isFinished()||e[Ad]||e._scheduler.unfinished||e._pendingActions.length||e.trigger("finished")})}(n,this),K(this)}Ld.prototype.on=Cd("on",!0),Ld.prototype.off=Cd("off",!0),Ld.prototype.one=Cd("one",!0),b(Ld,Ct);var Pd=kd.prototype;function Nd(t,e,i){if(!this._disposed){var n,o=this._model,a=this._coordSysMgr.getCoordinateSystems();e=Xo(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}}}Pd._onframe=function(){if(!this._disposed){var t=this._scheduler;if(this[Ad]){var e=this[Ad].silent;this[Td]=!0,Ed(this),Od.update.call(this),this[Td]=!1,this[Ad]=!1,Vd.call(this,e),Gd.call(this,e)}else if(t.unfinished){var i=1,n=this._model,o=this._api;t.unfinished=!1;do{var a=+new Date;t.performSeriesTasks(n),t.performDataProcessorTasks(n),Rd(this,n),t.performVisualTasks(n),Zd(this,this._model,o,"remain"),i-=+new Date-a}while(0<i&&t.unfinished);t.unfinished||this._zr.flush()}}},Pd.getDom=function(){return this._dom},Pd.getZr=function(){return this._zr},Pd.setOption=function(t,e,i){if(!this._disposed){var n;if(Sd(e)&&(i=e.lazyUpdate,n=e.silent,e=e.notMerge),this[Td]=!0,!this._model||e){var o=new uh(this._api),a=this._theme,r=this._model=new $u;r.scheduler=this._scheduler,r.init(null,null,a,o)}this._model.setOption(t,Jd),i?(this[Ad]={silent:n},this[Td]=!1):(Ed(this),Od.update.call(this),this._zr.flush(),this[Ad]=!1,this[Td]=!1,Vd.call(this,n),Gd.call(this,n))}},Pd.setTheme=function(){console.error("ECharts#setTheme() is DEPRECATED in ECharts 3.0")},Pd.getModel=function(){return this._model},Pd.getOption=function(){return this._model&&this._model.getOption()},Pd.getWidth=function(){return this._zr.getWidth()},Pd.getHeight=function(){return this._zr.getHeight()},Pd.getDevicePixelRatio=function(){return this._zr.painter.dpr||window.devicePixelRatio||1},Pd.getRenderedCanvas=function(t){if(v.canvasSupported)return(t=t||{}).pixelRatio=t.pixelRatio||1,t.backgroundColor=t.backgroundColor||this._model.get("backgroundColor"),this._zr.painter.getRenderedCanvas(t)},Pd.getSvgDataUrl=function(){if(v.svgSupported){var t=this._zr;return E(t.storage.getDisplayList(),function(t){t.stopAnimation(!0)}),t.painter.pathToDataUrl()}},Pd.getDataURL=function(t){if(!this._disposed){var e=(t=t||{}).excludeComponents,i=this._model,n=[],o=this;wd(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 wd(n,function(t){t.group.ignore=!1}),a}},Pd.getConnectedDataURL=function(o){if(!this._disposed&&v.canvasSupported){var a=this.group,r=Math.min,s=Math.max;if(af[a]){var l=1/0,u=1/0,h=-1/0,c=-1/0,d=[],i=o&&o.pixelRatio||1;E(of,function(t,e){if(t.group===a){var i=t.getRenderedCanvas(D(o)),n=t.getDom().getBoundingClientRect();l=r(n.left,l),u=r(n.top,u),h=s(n.right,h),c=s(n.bottom,c),d.push({dom:i,left:n.left,top:n.top})}});var t=(h*=i)-(l*=i),e=(c*=i)-(u*=i),n=g();n.width=t,n.height=e;var f=Ao(n);return o.connectedBackgroundColor&&f.add(new is({shape:{x:0,y:0,width:t,height:e},style:{fill:o.connectedBackgroundColor}})),wd(d,function(t){var e=new qn({style:{x:t.left*i-l,y:t.top*i-u,image:t.dom}});f.add(e)}),f.refreshImmediately(),n.toDataURL("image/"+(o&&o.type||"png"))}return this.getDataURL(o)}},Pd.convertToPixel=T(Nd,"convertToPixel"),Pd.convertFromPixel=T(Nd,"convertFromPixel"),Pd.containPixel=function(t,o){var a;if(!this._disposed)return E(t=Xo(this._model,t),function(t,n){0<=n.indexOf("Models")&&E(t,function(t){var e=t.coordinateSystem;if(e&&e.containPoint)a|=!!e.containPoint(o);else if("seriesModels"===n){var i=this._chartsMap[t.__viewId];i&&i.containPoint&&(a|=i.containPoint(o,t))}},this)},this),!!a},Pd.getVisual=function(t,e){var i=(t=Xo(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)},Pd.getViewOfComponentModel=function(t){return this._componentsMap[t.__viewId]},Pd.getViewOfSeriesModel=function(t){return this._chartsMap[t.__viewId]};var Od={prepareAndUpdate:function(t){Ed(this),Od.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){a.restoreData(e,t),a.performSeriesTasks(e),o.create(e,i),a.performDataProcessorTasks(e,t),Rd(this,e),o.update(e,i),Wd(e),a.performVisualTasks(e,t),Hd(this,e,i,t);var r=e.get("backgroundColor")||"transparent";if(v.canvasSupported)n.setBackgroundColor(r);else{var s=Re(r);r=Ye(s,"rgb"),0===s[3]&&(r="transparent")}Ud(e,i)}},updateTransform:function(o){var a=this._model,r=this,s=this._api;if(a){var l=[];a.eachComponent(function(t,e){var i=r.getViewOfComponentModel(e);if(i&&i.__alive)if(i.updateTransform){var n=i.updateTransform(e,a,s,o);n&&n.update&&l.push(i)}else l.push(i)});var n=Q();a.eachSeries(function(t){var e=r._chartsMap[t.__viewId];if(e.updateTransform){var i=e.updateTransform(t,a,s,o);i&&i.update&&n.set(t.uid,1)}else n.set(t.uid,1)}),Wd(a),this._scheduler.performVisualTasks(a,o,{setDirty:!0,dirtyMap:n}),Zd(r,a,s,o,n),Ud(a,this._api)}},updateView:function(t){var e=this._model;e&&(gc.markUpdateMethod(t,"updateView"),Wd(e),this._scheduler.performVisualTasks(e,t,{setDirty:!0}),Hd(this,this._model,this._api,t),Ud(e,this._api))},updateVisual:function(t){Od.update.call(this,t)},updateLayout:function(t){Od.update.call(this,t)}};function Ed(t){var e=t._model,i=t._scheduler;i.restorePipelines(e),i.prepareStageTasks(),Fd(t,"component",e,i),Fd(t,"chart",e,i),i.plan()}function zd(e,i,n,o,t){var a=e._model;if(o){var r={};r[o+"Id"]=n[o+"Id"],r[o+"Index"]=n[o+"Index"],r[o+"Name"]=n[o+"Name"];var s={mainType:o,query:r};t&&(s.subType=t);var l=n.excludeSeriesId;null!=l&&(l=Q(Eo(l))),a&&a.eachComponent(s,function(t){l&&null!=l.get(t.id)||u(e["series"===o?"_chartsMap":"_componentsMap"][t.__viewId])},e)}else wd(e._componentsViews.concat(e._chartsViews),u);function u(t){t&&t.__alive&&t[i]&&t[i](t.__model,a,e._api,n)}}function Rd(t,e){var i=t._chartsMap,n=t._scheduler;e.eachSeries(function(t){n.updateStreamModes(t,i[t.__viewId])})}function Bd(e,t){var i=e.type,n=e.escapeConnect,o=qd[i],a=o.actionInfo,r=(a.update||"update").split(":"),s=r.pop();r=null!=r[0]&&Md(r[0]),this[Td]=!0;var l=[e],u=!1;e.batch&&(u=!0,l=N(e.batch,function(t){return(t=C(L({},t),e)).batch=null,t}));var h,c=[],d="highlight"===i||"downplay"===i;wd(l,function(t){(h=(h=o.action(t,this._model,this._api))||L({},t)).type=a.event||h.type,c.push(h),d?zd(this,s,t,"series"):r&&zd(this,s,t,r.main,r.sub)},this),"none"===s||d||r||(this[Ad]?(Ed(this),Od.update.call(this,e),this[Ad]=!1):Od[s].call(this,e)),h=u?{type:a.event||i,escapeConnect:n,batch:c}:c[0],this[Td]=!1,t||this._messageCenter.trigger(h.type,h)}function Vd(t){for(var e=this._pendingActions;e.length;){var i=e.shift();Bd.call(this,i,t)}}function Gd(t){t||this.trigger("updated")}function Fd(t,e,o,a){for(var r="component"===e,s=r?t._componentsViews:t._chartsViews,l=r?t._componentsMap:t._chartsMap,u=t._zr,h=t._api,i=0;i<s.length;i++)s[i].__alive=!1;function n(t){var e="_ec_"+t.id+"_"+t.type,i=l[e];if(!i){var n=Md(t.type);(i=new(r?hc.getClass(n.main,n.sub):gc.getClass(n.sub))).init(o,h),l[e]=i,s.push(i),u.add(i.group)}t.__viewId=i.__id=e,i.__alive=!0,i.__model=t,i.group.__ecComponentInfo={mainType:t.mainType,index:t.componentIndex},r||a.prepareView(i,t,o,h)}r?o.eachComponent(function(t,e){"series"!==t&&n(e)}):o.eachSeries(n);for(i=0;i<s.length;){var c=s[i];c.__alive?i++:(r||c.renderTask.dispose(),u.remove(c.group),c.dispose(o,h),s.splice(i,1),delete l[c.__id],c.__id=c.group.__ecComponentInfo=null)}}function Wd(t){t.clearColorPalette(),t.eachSeries(function(t){t.clearColorPalette()})}function Hd(t,e,i,n){!function(t,i,n,o,e){wd(e||t._componentsViews,function(t){var e=t.__model;t.render(e,i,n,o),Yd(e,t)})}(t,e,i,n),wd(t._chartsViews,function(t){t.__alive=!1}),Zd(t,e,i,n),wd(t._chartsViews,function(t){t.__alive||t.remove(e,i)})}function Zd(n,t,e,o,a){var r,s=n._scheduler;t.eachSeries(function(t){var e=n._chartsMap[t.__viewId];e.__alive=!0;var i=e.renderTask;s.updatePayload(i,o),a&&a.get(t.uid)&&i.dirty(),r|=i.perform(s.getPerformArgs(i)),e.group.silent=!!t.get("silent"),Yd(t,e),function(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)})})}(t,e)}),s.unfinished|=r,function(i,t){var e=i._zr.storage,n=0;e.traverse(function(t){n++}),n>t.get("hoverLayerThreshold")&&!v.node&&t.eachSeries(function(t){if(!t.preventUsingHoverLayer){var e=i._chartsMap[t.__viewId];e.__alive&&e.group.traverse(function(t){t.useHoverLayer=!0})}})}(n,t),Lc(n._zr.dom,t)}function Ud(e,i){wd(Qd,function(t){t(e,i)})}Pd.resize=function(t){if(!this._disposed){this._zr.resize(t);var e=this._model;if(this._loadingFX&&this._loadingFX.resize(),e){var i=e.resetOption("media"),n=t&&t.silent;this[Td]=!0,i&&Ed(this),Od.update.call(this),this[Td]=!1,Vd.call(this,n),Gd.call(this,n)}}},Pd.showLoading=function(t,e){if(!this._disposed&&(Sd(t)&&(e=t,t=""),t=t||"default",this.hideLoading(),nf[t])){var i=nf[t](this._api,e),n=this._zr;this._loadingFX=i,n.add(i)}},Pd.hideLoading=function(){this._disposed||(this._loadingFX&&this._zr.remove(this._loadingFX),this._loadingFX=null)},Pd.makeActionFromEvent=function(t){var e=L({},t);return e.type=Kd[t.type],e},Pd.dispatchAction=function(t,e){this._disposed||(Sd(e)||(e={silent:!!e}),qd[t.type]&&this._model&&(this[Td]?this._pendingActions.push(t):(Bd.call(this,t,e.silent),e.flush?this._zr.flush(!0):!1!==e.flush&&v.browser.weChat&&this._throttledZrFlush(),Vd.call(this,e.silent),Gd.call(this,e.silent))))},Pd.appendData=function(t){if(!this._disposed){var e=t.seriesIndex;this.getModel().getSeriesByIndex(e).appendData(t),this._scheduler.unfinished=!0}},Pd.on=Cd("on",!1),Pd.off=Cd("off",!1),Pd.one=Cd("one",!1);var Xd=["click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","globalout","contextmenu"];function Yd(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 jd(){this.eventInfo}Pd._initEvents=function(){wd(Xd,function(u){function t(t){var e,i=this.getModel(),n=t.target;if("globalout"===u)e={};else if(n&&null!=n.dataIndex){var o=n.dataModel||i.getSeriesByIndex(n.seriesIndex);e=o&&o.getDataParams(n.dataIndex,n.dataType,n)||{}}else n&&n.eventData&&(e=L({},n.eventData));if(e){var a=e.componentType,r=e.componentIndex;"markLine"!==a&&"markPoint"!==a&&"markArea"!==a||(a="series",r=e.seriesIndex);var s=a&&null!=r&&i.getComponent(a,r),l=s&&this["series"===s.mainType?"_chartsMap":"_componentsMap"][s.__viewId];e.event=t,e.type=u,this._ecEventProcessor.eventInfo={targetEl:n,packedEvent:e,model:s,view:l},this.trigger(u,e)}}t.zrEventfulCallAtLast=!0,this._zr.on(u,t,this)},this),wd(Kd,function(t,e){this._messageCenter.on(e,function(t){this.trigger(e,t)},this)},this)},Pd.isDisposed=function(){return this._disposed},Pd.clear=function(){this._disposed||this.setOption({series:[]},!0)},Pd.dispose=function(){if(!this._disposed){this._disposed=!0,jo(this.getDom(),lf,"");var e=this._api,i=this._model;wd(this._componentsViews,function(t){t.dispose(i,e)}),wd(this._chartsViews,function(t){t.dispose(i,e)}),this._zr.dispose(),delete of[this.id]}},b(kd,Ct),jd.prototype={constructor:jd,normalizeQuery:function(t){var s={},l={},u={};if(z(t)){var e=Md(t);s.mainType=e.main||null,s.subType=e.sub||null}else{var h=["Index","Name","Id"],c={name:1,dataIndex:1,dataType:1};E(t,function(t,e){for(var i=!1,n=0;n<h.length;n++){var o=h[n],a=e.lastIndexOf(o);if(0<a&&a===e.length-o.length){var r=e.slice(0,a);"data"!==r&&(s.mainType=r,s[o.toLowerCase()]=t,i=!0)}}c.hasOwnProperty(e)&&(l[e]=t,i=!0),i||(u[e]=t)})}return{cptQuery:s,dataQuery:l,otherQuery:u}},filter:function(t,e,i){var n=this.eventInfo;if(!n)return!0;var o=n.targetEl,a=n.packedEvent,r=n.model,s=n.view;if(!r||!s)return!0;var l=e.cptQuery,u=e.dataQuery;return h(l,r,"mainType")&&h(l,r,"subType")&&h(l,r,"index","componentIndex")&&h(l,r,"name")&&h(l,r,"id")&&h(u,a,"name")&&h(u,a,"dataIndex")&&h(u,a,"dataType")&&(!s.filterForExposedEvent||s.filterForExposedEvent(t,e.otherQuery,o,a));function h(t,e,i,n){return null==t[i]||e[n||i]===t[i]}},afterTrigger:function(){this.eventInfo=null}};var qd={},Kd={},$d=[],Jd=[],Qd=[],tf=[],ef={},nf={},of={},af={},rf=new Date-0,sf=new Date-0,lf="_echarts_instance_";function uf(t){af[t]=!1}var hf=uf;function cf(t){return of[function(t,e){return t.getAttribute?t.getAttribute(e):t[e]}(t,lf)]}function df(t,e){ef[t]=e}function ff(t){Jd.push(t)}function pf(t,e){xf($d,t,e,1e3)}function gf(t,e,i){"function"==typeof e&&(i=e,e="");var n=Sd(t)?t.type:[t,t={event:e}][0];t.event=(t.event||n).toLowerCase(),e=t.event,_d(Dd.test(n)&&Dd.test(e)),qd[n]||(qd[n]={action:i,actionInfo:t}),Kd[e]=n}function mf(t,e){nh.register(t,e)}function vf(t,e){xf(tf,t,e,1e3,"layout")}function yf(t,e){xf(tf,t,e,3e3,"visual")}function xf(t,e,i,n,o){(bd(e)||Sd(e))&&(i=e,e=n);var a=Pc.wrapStageHandler(i,o);return a.__prio=e,a.__raw=i,t.push(a),a}function _f(t,e){nf[t]=e}function wf(t){return Tu.extend(t)}function bf(t){return hc.extend(t)}function Sf(t){return ic.extend(t)}function Mf(t){return gc.extend(t)}yf(2e3,Dc),ff(Ih),pf(900,function(t){var a=Q();t.eachSeries(function(t){var e=t.get("stack");if(e){var i=a.get(e)||a.set(e,[]),n=t.getData(),o={stackResultDimension:n.getCalculationInfo("stackResultDimension"),stackedOverDimension:n.getCalculationInfo("stackedOverDimension"),stackedDimension:n.getCalculationInfo("stackedDimension"),stackedByDimension:n.getCalculationInfo("stackedByDimension"),isStackedByIndex:n.getCalculationInfo("isStackedByIndex"),data:n,seriesModel:t};if(!o.stackedDimension||!o.isStackedByIndex&&!o.stackedByDimension)return;i.length&&n.setCalculationInfo("stackedOnSeries",i[i.length-1].seriesModel),i.push(o)}}),a.each(Th)}),_f("default",function(n,t){C(t=t||{},{text:"loading",color:"#c23531",textColor:"#000",maskColor:"rgba(255, 255, 255, 0.8)",zlevel:0});var o=new is({style:{fill:t.maskColor},zlevel:t.zlevel,z:1e4}),a=new us({shape:{startAngle:-kc/2,endAngle:-kc/2+.1,r:10},style:{stroke:t.color,lineCap:"round",lineWidth:5},zlevel:t.zlevel,z:10001}),r=new is({style:{fill:"none",text:t.text,textPosition:"right",textDistance:10,textFill:t.textColor},zlevel:t.zlevel,z:10001});a.animateShape(!0).when(1e3,{endAngle:3*kc/2}).start("circularInOut"),a.animateShape(!0).when(1e3,{startAngle:3*kc/2}).delay(300).start("circularInOut");var e=new Ii;return e.add(a),e.add(r),e.add(o),e.resize=function(){var t=n.getWidth()/2,e=n.getHeight()/2;a.setShape({cx:t,cy:e});var i=a.shape.r;r.setShape({x:t-i,y:e-i,width:2*i,height:2*i}),o.setShape({x:0,y:0,width:n.getWidth(),height:n.getHeight()})},e.resize(),e}),gf({type:"highlight",event:"highlight",update:"highlight"},et),gf({type:"downplay",event:"downplay",update:"downplay"},et),df("light",Jc),df("dark",ed);function If(t){return t}function Tf(t,e,i,n,o){this._old=t,this._new=e,this._oldKeyGetter=i||If,this._newKeyGetter=n||If,this.context=o}function Af(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))}}Tf.prototype={constructor:Tf,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(Af(t,{},n,"_oldKeyGetter",this),Af(e,i,o,"_newKeyGetter",this),a=0;a<t.length;a++){if(null!=(s=i[r=n[a]]))(u=s.length)?(1===u&&(i[r]=null),s=s.shift()):i[r]=null,this._update&&this._update(s,a);else this._remove&&this._remove(a)}for(var a=0;a<o.length;a++){var r=o[a];if(i.hasOwnProperty(r)){var s;if(null==(s=i[r]))continue;if(s.length)for(var l=0,u=s.length;l<u;l++)this._add&&this._add(s[l]);else this._add&&this._add(s)}}}};var Df=Q(["tooltip","label","itemName","itemId","seriesName"]);function Cf(t,e){return t.hasOwnProperty(e)||(t[e]=[]),t[e]}function Lf(t){return"category"===t?"ordinal":"time"===t?"time":"float"}function kf(t){null!=t&&L(this,t),this.otherDims={}}var Pf=R,Nf="undefined",Of={float:typeof Float64Array==Nf?Array:Float64Array,int:typeof Int32Array==Nf?Array:Int32Array,ordinal:Array,number:Array,time:Array},Ef=typeof Uint32Array==Nf?Array:Uint32Array,zf=typeof Int32Array==Nf?Array:Int32Array,Rf=typeof Uint16Array==Nf?Array:Uint16Array;function Bf(t){return 65535<t._rawCount?Ef:Rf}var Vf=["hasItemOption","_nameList","_idList","_invertedIndicesMap","_rawData","_chunkSize","_chunkCount","_dimValueGetter","_count","_rawCount","_nameDimIdx","_idDimIdx"],Gf=["_extent","_approximateExtent","_rawExtent"];function Ff(e,i){E(Vf.concat(i.__wrappedMethods||[]),function(t){i.hasOwnProperty(t)&&(e[t]=i[t])}),e.__wrappedMethods=i.__wrappedMethods,E(Gf,function(t){e[t]=D(i[t])}),e._calculationInfo=L(i._calculationInfo)}var Wf=function(t,e){t=t||["x","y"];for(var i={},n=[],o={},a=0;a<t.length;a++){var r=t[a];z(r)?r=new kf({name:r}):r instanceof kf||(r=new kf(r));var s=r.name;r.type=r.type||"float",r.coordDim||(r.coordDim=s,r.coordDimIndex=0),r.otherDims=r.otherDims||{},n.push(s),(i[s]=r).index=a,r.createInvertedIndices&&(o[s]=[])}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._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=function(n){var t={},a=t.encode={},r=Q(),s=[],l=[],u=t.userOutput={dimensionNames:n.dimensions.slice(),encode:{}};E(n.dimensions,function(t){var o=n.getDimensionInfo(t),e=o.coordDim;if(e){var i=o.coordDimIndex;Cf(a,e)[i]=t,o.isExtraCoord||(r.set(e,1),function(t){return!("ordinal"===t||"time"===t)}(o.type)&&(s[0]=t),Cf(u.encode,e)[i]=o.index),o.defaultTooltip&&l.push(t)}Df.each(function(t,e){var i=Cf(a,e),n=o.otherDims[e];null!=n&&!1!==n&&(i[n]=o.name)})});var o=[],h={};r.each(function(t,e){var i=a[e];h[e]=i[0],o=o.concat(i)}),t.dataDimsOnCoord=o,t.encodeFirstDimNotExtra=h;var e=a.label;e&&e.length&&(s=e.slice());var i=a.tooltip;return i&&i.length?l=i.slice():l.length||(l=s.slice()),a.defaultedLabel=s,a.defaultedTooltip=l,t}(this),this._invertedIndicesMap=o,this._calculationInfo={},this.userOutput=this._dimensionsSummary.userOutput},Hf=Wf.prototype;function Zf(t,e,i,n,o){var a=Of[e.type],r=n-1,s=e.name,l=t[s][r];if(l&&l.length<i){for(var u=new a(Math.min(o-r*i,i)),h=0;h<l.length;h++)u[h]=l[h];t[s][r]=u}for(var c=n*i;c<o;c+=i)t[s].push(new a(Math.min(o-c,i)))}function Uf(o){var a=o._invertedIndicesMap;E(a,function(t,e){var i=o._dimensionInfos[e].ordinalMeta;if(i){t=a[e]=new zf(i.categories.length);for(var n=0;n<t.length;n++)t[n]=-1;for(n=0;n<o._count;n++)t[o.get(e,n)]=n}})}function Xf(t,e,i){var n;if(null!=e){var o=t._chunkSize,a=Math.floor(i/o),r=i%o,s=t.dimensions[e],l=t._storage[s][a];if(l){n=l[r];var u=t._dimensionInfos[s].ordinalMeta;u&&u.categories.length&&(n=u.categories[n])}}return n}function Yf(t){return t}function jf(t){return t<this._count&&0<=t?this._indices[t]:-1}function qf(t,e){var i=t._idList[e];return null==i&&(i=Xf(t,t._idDimIdx,e)),null==i&&(i="e\0\0"+e),i}function Kf(t){return k(t)||(t=[t]),t}function $f(t,e){var i=t.dimensions,n=new Wf(N(i,t.getDimensionInfo,t),t.hostModel);Ff(n,t);for(var o=n._storage={},a=t._storage,r=0;r<i.length;r++){var s=i[r];a[s]&&(0<=_(e,s)?(o[s]=Jf(a[s]),n._rawExtent[s]=Qf(),n._extent[s]=null):o[s]=a[s])}return n}function Jf(t){for(var e,i,n=new Array(t.length),o=0;o<t.length;o++)n[o]=(e=t[o],i=void 0,(i=e.constructor)===Array?e.slice():new i(e));return n}function Qf(){return[1/0,-1/0]}Hf.type="list",Hf.hasItemOption=!0,Hf.getDimension=function(t){return"number"!=typeof t&&(isNaN(t)||this._dimensionInfos.hasOwnProperty(t))||(t=this.dimensions[t]),t},Hf.getDimensionInfo=function(t){return this._dimensionInfos[this.getDimension(t)]},Hf.getDimensionsOnCoord=function(){return this._dimensionsSummary.dataDimsOnCoord.slice()},Hf.mapDimension=function(t,e){var i=this._dimensionsSummary;if(null==e)return i.encodeFirstDimNotExtra[t];var n=i.encode[t];return!0===e?(n||[]).slice():n&&n[e]},Hf.initData=function(t,e,i){(Gu.isInstance(t)||P(t))&&(t=new Ah(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=Eh[this._rawData.getSource().sourceFormat],this._dimValueGetter=i=i||this.defaultDimValueGetter,this._dimValueGetterArrayRows=Eh.arrayRows,this._rawExtent={},this._initDataFromProvider(0,t.count()),t.pure&&(this.hasItemOption=!1)},Hf.getProvider=function(){return this._rawData},Hf.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)},Hf.appendValues=function(t,e){for(var i=this._chunkSize,n=this._storage,o=this.dimensions,a=o.length,r=this._rawExtent,s=this.count(),l=s+Math.max(t.length,e?e.length:0),u=this._chunkCount,h=0;h<a;h++){r[v=o[h]]||(r[v]=Qf()),n[v]||(n[v]=[]),Zf(n,this._dimensionInfos[v],i,u,l),this._chunkCount=n[v].length}for(var c=new Array(a),d=s;d<l;d++){for(var f=d-s,p=Math.floor(d/i),g=d%i,m=0;m<a;m++){var v=o[m],y=this._dimValueGetterArrayRows(t[f]||c,v,f,m);n[v][p][g]=y;var x=r[v];y<x[0]&&(x[0]=y),y>x[1]&&(x[1]=y)}e&&(this._nameList[d]=e[f])}this._rawCount=this._count=l,this._extent={},Uf(this)},Hf._initDataFromProvider=function(t,e){if(!(e<=t)){for(var i,n=this._chunkSize,o=this._rawData,a=this._storage,r=this.dimensions,s=r.length,l=this._dimensionInfos,u=this._nameList,h=this._idList,c=this._rawExtent,d=this._nameRepeatCount={},f=this._chunkCount,p=0;p<s;p++){c[w=r[p]]||(c[w]=Qf());var g=l[w];0===g.otherDims.itemName&&(i=this._nameDimIdx=p),0===g.otherDims.itemId&&(this._idDimIdx=p),a[w]||(a[w]=[]),Zf(a,g,n,f,e),this._chunkCount=a[w].length}for(var m=new Array(s),v=t;v<e;v++){m=o.getItem(v,m);for(var y=Math.floor(v/n),x=v%n,_=0;_<s;_++){var w,b=a[w=r[_]][y],S=this._dimValueGetter(m,w,v,_);b[x]=S;var M=c[w];S<M[0]&&(M[0]=S),S>M[1]&&(M[1]=S)}if(!o.pure){var I=u[v];if(m&&null==I)if(null!=m.name)u[v]=I=m.name;else if(null!=i){var T=r[i],A=a[T][y];if(A){I=A[x];var D=l[T].ordinalMeta;D&&D.categories.length&&(I=D.categories[I])}}var C=null==m?null:m.id;null==C&&null!=I&&(d[I]=d[I]||0,0<d[C=I]&&(C+="__ec__"+d[I]),d[I]++),null!=C&&(h[v]=C)}}!o.persistent&&o.clean&&o.clean(),this._rawCount=this._count=e,this._extent={},Uf(this)}},Hf.count=function(){return this._count},Hf.getIndices=function(){var t=this._indices;if(t){var e=t.constructor,i=this._count;if(e===Array){o=new e(i);for(var n=0;n<i;n++)o[n]=t[n]}else o=new e(t.buffer,0,i)}else{var o=new(e=Bf(this))(this.count());for(n=0;n<o.length;n++)o[n]=n}return o},Hf.get=function(t,e){if(!(0<=e&&e<this._count))return NaN;var i=this._storage;if(!i[t])return NaN;e=this.getRawIndex(e);var n=Math.floor(e/this._chunkSize),o=e%this._chunkSize;return i[t][n][o]},Hf.getByRawIndex=function(t,e){if(!(0<=e&&e<this._rawCount))return NaN;var i=this._storage[t];if(!i)return NaN;var n=Math.floor(e/this._chunkSize),o=e%this._chunkSize;return i[n][o]},Hf._getFast=function(t,e){var i=Math.floor(e/this._chunkSize),n=e%this._chunkSize;return this._storage[t][i][n]},Hf.getValues=function(t,e){var i=[];k(t)||(e=t,t=this.dimensions);for(var n=0,o=t.length;n<o;n++)i.push(this.get(t[n],e));return i},Hf.hasValue=function(t){for(var e=this._dimensionsSummary.dataDimsOnCoord,i=0,n=e.length;i<n;i++)if(isNaN(this.get(e[i],t)))return!1;return!0},Hf.getDataExtent=function(t){t=this.getDimension(t);var e=this._storage[t],i=Qf();if(!e)return i;var n,o=this.count();if(!this._indices)return this._rawExtent[t].slice();if(n=this._extent[t])return n.slice();for(var a=(n=i)[0],r=n[1],s=0;s<o;s++){var l=this._getFast(t,this.getRawIndex(s));l<a&&(a=l),r<l&&(r=l)}return n=[a,r],this._extent[t]=n},Hf.getApproximateExtent=function(t){return t=this.getDimension(t),this._approximateExtent[t]||this.getDataExtent(t)},Hf.setApproximateExtent=function(t,e){e=this.getDimension(e),this._approximateExtent[e]=t.slice()},Hf.getCalculationInfo=function(t){return this._calculationInfo[t]},Hf.setCalculationInfo=function(t,e){Pf(t)?L(this._calculationInfo,t):this._calculationInfo[t]=e},Hf.getSum=function(t){var e=0;if(this._storage[t])for(var i=0,n=this.count();i<n;i++){var o=this.get(t,i);isNaN(o)||(e+=o)}return e},Hf.getMedian=function(t){var i=[];this.each(t,function(t,e){isNaN(t)||i.push(t)});var e=[].concat(i).sort(function(t,e){return t-e}),n=this.count();return 0===n?0:n%2==1?e[(n-1)/2]:(e[n/2]+e[n/2-1])/2},Hf.rawIndexOf=function(t,e){var i=(t&&this._invertedIndicesMap[t])[e];return null==i||isNaN(i)?-1:i},Hf.indexOfName=function(t){for(var e=0,i=this.count();e<i;e++)if(this.getName(e)===t)return e;return-1},Hf.indexOfRawIndex=function(t){if(t>=this._rawCount||t<0)return-1;if(!this._indices)return t;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=1+a;else{if(!(e[a]>t))return a;o=a-1}}return-1},Hf.indicesOfNearest=function(t,e,i){var n=[];if(!this._storage[t])return n;null==i&&(i=1/0);for(var o=1/0,a=-1,r=0,s=0,l=this.count();s<l;s++){var u=e-this.get(t,s),h=Math.abs(u);h<=i&&((h<o||h===o&&0<=u&&a<0)&&(o=h,a=u,r=0),u===a&&(n[r++]=s))}return n.length=r,n},Hf.getRawIndex=Yf,Hf.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},Hf.getName=function(t){var e=this.getRawIndex(t);return this._nameList[e]||Xf(this,this._nameDimIdx,e)||""},Hf.getId=function(t){return qf(this,this.getRawIndex(t))},Hf.each=function(t,e,i,n){if(this._count){"function"==typeof t&&(n=i,i=e,e=t,t=[]),i=i||n||this;for(var o=(t=N(Kf(t),this.getDimension,this)).length,a=0;a<this.count();a++)switch(o){case 0:e.call(i,a);break;case 1:e.call(i,this.get(t[0],a),a);break;case 2:e.call(i,this.get(t[0],a),this.get(t[1],a),a);break;default:for(var r=0,s=[];r<o;r++)s[r]=this.get(t[r],a);s[r]=a,e.apply(i,s)}}},Hf.filterSelf=function(t,e,i,n){if(this._count){"function"==typeof t&&(n=i,i=e,e=t,t=[]),i=i||n||this,t=N(Kf(t),this.getDimension,this);for(var o=this.count(),a=new(Bf(this))(o),r=[],s=t.length,l=0,u=t[0],h=0;h<o;h++){var c,d=this.getRawIndex(h);if(0===s)c=e.call(i,h);else if(1===s){var f=this._getFast(u,d);c=e.call(i,f,h)}else{for(var p=0;p<s;p++)r[p]=this._getFast(u,d);r[p]=h,c=e.apply(i,r)}c&&(a[l++]=d)}return l<o&&(this._indices=a),this._count=l,this._extent={},this.getRawIndex=this._indices?jf:Yf,this}},Hf.selectRange=function(t){if(this._count){var e=[];for(var i in t)t.hasOwnProperty(i)&&e.push(i);var n=e.length;if(n){var o=this.count(),a=new(Bf(this))(o),r=0,s=e[0],l=t[s][0],u=t[s][1],h=!1;if(!this._indices){var c=0;if(1===n){for(var d=this._storage[e[0]],f=0;f<this._chunkCount;f++)for(var p=d[f],g=Math.min(this._count-f*this._chunkSize,this._chunkSize),m=0;m<g;m++){(l<=(w=p[m])&&w<=u||isNaN(w))&&(a[r++]=c),c++}h=!0}else if(2===n){d=this._storage[s];var v=this._storage[e[1]],y=t[e[1]][0],x=t[e[1]][1];for(f=0;f<this._chunkCount;f++){p=d[f];var _=v[f];for(g=Math.min(this._count-f*this._chunkSize,this._chunkSize),m=0;m<g;m++){var w=p[m],b=_[m];(l<=w&&w<=u||isNaN(w))&&(y<=b&&b<=x||isNaN(b))&&(a[r++]=c),c++}}h=!0}}if(!h)if(1===n)for(m=0;m<o;m++){var S=this.getRawIndex(m);(l<=(w=this._getFast(s,S))&&w<=u||isNaN(w))&&(a[r++]=S)}else for(m=0;m<o;m++){var M=!0;for(S=this.getRawIndex(m),f=0;f<n;f++){var I=e[f];((w=this._getFast(i,S))<t[I][0]||w>t[I][1])&&(M=!1)}M&&(a[r++]=this.getRawIndex(m))}return r<o&&(this._indices=a),this._count=r,this._extent={},this.getRawIndex=this._indices?jf:Yf,this}}},Hf.mapArray=function(t,e,i,n){"function"==typeof t&&(n=i,i=e,e=t,t=[]),i=i||n||this;var o=[];return this.each(t,function(){o.push(e&&e.apply(this,arguments))},i),o},Hf.map=function(t,e,i,n){i=i||n||this;var o=$f(this,t=N(Kf(t),this.getDimension,this));o._indices=this._indices,o.getRawIndex=o._indices?jf:Yf;for(var a=o._storage,r=[],s=this._chunkSize,l=t.length,u=this.count(),h=[],c=o._rawExtent,d=0;d<u;d++){for(var f=0;f<l;f++)h[f]=this.get(t[f],d);h[l]=d;var p=e&&e.apply(i,h);if(null!=p){"object"!=typeof p&&(r[0]=p,p=r);for(var g=this.getRawIndex(d),m=Math.floor(g/s),v=g%s,y=0;y<p.length;y++){var x=t[y],_=p[y],w=c[x],b=a[x];b&&(b[m][v]=_),_<w[0]&&(w[0]=_),_>w[1]&&(w[1]=_)}}}return o},Hf.downSample=function(t,e,i,n){for(var o=$f(this,[t]),a=o._storage,r=[],s=Math.floor(1/e),l=a[t],u=this.count(),h=this._chunkSize,c=o._rawExtent[t],d=new(Bf(this))(u),f=0,p=0;p<u;p+=s){u-p<s&&(s=u-p,r.length=s);for(var g=0;g<s;g++){var m=this.getRawIndex(p+g),v=Math.floor(m/h),y=m%h;r[g]=l[v][y]}var x=i(r),_=this.getRawIndex(Math.min(p+n(r,x)||0,u-1)),w=_%h;(l[Math.floor(_/h)][w]=x)<c[0]&&(c[0]=x),x>c[1]&&(c[1]=x),d[f++]=_}return o._count=f,o._indices=d,o.getRawIndex=jf,o},Hf.getItemModel=function(t){var e=this.hostModel;return new Il(this.getRawDataItem(t),e,e&&e.ecModel)},Hf.diff=function(e){var i=this;return new Tf(e?e.getIndices():[],this.getIndices(),function(t){return qf(e,t)},function(t){return qf(i,t)})},Hf.getVisual=function(t){var e=this._visual;return e&&e[t]},Hf.setVisual=function(t,e){if(Pf(t))for(var i in t)t.hasOwnProperty(i)&&this.setVisual(i,t[i]);else this._visual=this._visual||{},this._visual[t]=e},Hf.setLayout=function(t,e){if(Pf(t))for(var i in t)t.hasOwnProperty(i)&&this.setLayout(i,t[i]);else this._layout[t]=e},Hf.getLayout=function(t){return this._layout[t]},Hf.getItemLayout=function(t){return this._itemLayouts[t]},Hf.setItemLayout=function(t,e,i){this._itemLayouts[t]=i?L(this._itemLayouts[t]||{},e):e},Hf.clearItemLayouts=function(){this._itemLayouts.length=0},Hf.getItemVisual=function(t,e,i){var n=this._itemVisuals[t],o=n&&n[e];return null!=o||i?o:this.getVisual(e)},Hf.setItemVisual=function(t,e,i){var n=this._itemVisuals[t]||{},o=this.hasItemVisual;if(this._itemVisuals[t]=n,Pf(e))for(var a in e)e.hasOwnProperty(a)&&(n[a]=e[a],o[a]=!0);else n[e]=i,o[e]=!0},Hf.clearAllVisual=function(){this._visual={},this._itemVisuals=[],this.hasItemVisual={}};function tp(t){t.seriesIndex=this.seriesIndex,t.dataIndex=this.dataIndex,t.dataType=this.dataType}function ep(t,e,i){Gu.isInstance(e)||(e=Gu.seriesDataToSource(e)),i=i||{},t=(t||[]).slice();for(var n=(i.dimsDef||[]).slice(),o=Q(),a=Q(),l=[],r=function(t,e,i,n){var o=Math.max(t.dimensionsDetectCount||1,e.length,i.length,n||0);return E(e,function(t){var e=t.dimsDef;e&&(o=Math.max(o,e.length))}),o}(e,t,n,i.dimCount),s=0;s<r;s++){var u=n[s]=L({},R(n[s])?n[s]:{name:n[s]}),h=u.name,c=l[s]=new kf;null!=h&&null==o.get(h)&&(c.name=c.displayName=h,o.set(h,s)),null!=u.type&&(c.type=u.type),null!=u.displayName&&(c.displayName=u.displayName)}var d=i.encodeDef;!d&&i.encodeDefaulter&&(d=i.encodeDefaulter(e,r)),(d=Q(d)).each(function(t,i){if(1===(t=Eo(t).slice()).length&&!z(t[0])&&t[0]<0)d.set(i,!1);else{var n=d.set(i,[]);E(t,function(t,e){z(t)&&(t=o.get(t)),null!=t&&t<r&&(n[e]=t,p(l[t],i,e))})}});var f=0;function p(t,e,i){null!=Df.get(e)?t.otherDims[e]=i:(t.coordDim=e,t.coordDimIndex=i,a.set(e,!0))}E(t,function(o,t){var a,r,s;if(z(o))a=o,o={};else{a=o.name;var e=o.ordinalMeta;o.ordinalMeta=null,(o=D(o)).ordinalMeta=e,r=o.dimsDef,s=o.otherDims,o.name=o.coordDim=o.coordDimIndex=o.dimsDef=o.otherDims=null}if(!1!==(i=d.get(a))){var i;if(!(i=Eo(i)).length)for(var n=0;n<(r&&r.length||1);n++){for(;f<l.length&&null!=l[f].coordDim;)f++;f<l.length&&i.push(f++)}E(i,function(t,e){var i=l[t];if(p(C(i,o),a,e),null==i.name&&r){var n=r[e];R(n)||(n={name:n}),i.name=i.displayName=n.name,i.defaultTooltip=n.defaultTooltip}s&&C(i.otherDims,s)})}});var g=i.generateCoord,m=i.generateCoordCount,v=null!=m;m=g?m||1:0;for(var y,x,_=g||"value",w=0;w<r;w++){null==(c=l[w]=l[w]||new kf).coordDim&&(c.coordDim=ip(_,a,v),c.coordDimIndex=0,(!g||m<=0)&&(c.isExtraCoord=!0),m--),null==c.name&&(c.name=ip(c.coordDim,o)),null==c.type&&(y=e,x=w,c.name,qu(y.data,y.sourceFormat,y.seriesLayoutBy,y.dimensionsDefine,y.startIndex,x)===Fu.Must||c.isExtraCoord&&(null!=c.otherDims.itemName||null!=c.otherDims.seriesName))&&(c.type="ordinal")}return l}function ip(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}Hf.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(tp,e)),this._graphicEls[t]=e},Hf.getItemGraphicEl=function(t){return this._graphicEls[t]},Hf.eachItemGraphicEl=function(i,n){E(this._graphicEls,function(t,e){t&&i&&i.call(n,t,e)})},Hf.cloneShallow=function(t){if(!t){var e=N(this.dimensions,this.getDimensionInfo,this);t=new Wf(e,this.hostModel)}if(t._storage=this._storage,Ff(t,this),this._indices){var i=this._indices.constructor;t._indices=new i(this._indices)}else t._indices=null;return t.getRawIndex=t._indices?jf:Yf,t},Hf.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(U(arguments)))})},Hf.TRANSFERABLE_METHODS=["cloneShallow","downSample","map"],Hf.CHANGABLE_METHODS=["filterSelf","selectRange"];var np=function(t,e){return ep((e=e||{}).coordDimensions||[],t,{dimsDef:e.dimensionsDefine||t.dimensionsDefine,encodeDef:e.encodeDefine||t.encodeDefine,dimCount:e.dimensionsCount,encodeDefaulter:e.encodeDefaulter,generateCoord:e.generateCoord,generateCoordCount:e.generateCoordCount})};function op(t){this.coordSysName=t,this.coordSysDims=[],this.axisMap=Q(),this.categoryAxisMap=Q(),this.firstCategoryDimIndex=null}var ap={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),rp(o)&&(n.set("x",o),e.firstCategoryDimIndex=0),rp(a)&&(n.set("y",a),e.firstCategoryDimIndex,e.firstCategoryDimIndex=1)},singleAxis:function(t,e,i,n){var o=t.getReferringComponents("singleAxis")[0];e.coordSysDims=["single"],i.set("single",o),rp(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),rp(a)&&(n.set("radius",a),e.firstCategoryDimIndex=0),rp(r)&&(n.set("angle",r),null==e.firstCategoryDimIndex&&(e.firstCategoryDimIndex=1))},geo:function(t,e,i,n){e.coordSysDims=["lng","lat"]},parallel:function(t,o,a,r){var s=t.ecModel,e=s.getComponent("parallel",t.get("parallelIndex")),l=o.coordSysDims=e.dimensions.slice();E(e.parallelAxisIndex,function(t,e){var i=s.getComponent("parallelAxis",t),n=l[e];a.set(n,i),rp(i)&&null==o.firstCategoryDimIndex&&(r.set(n,i),o.firstCategoryDimIndex=e)})}};function rp(t){return"category"===t.get("type")}function sp(t,i,e){var n,o,a,r,s=(e=e||{}).byIndex,l=e.stackedCoordDimension,u=!(!t||!t.get("stack"));if(E(i,function(t,e){z(t)&&(i[e]=t={name:t}),u&&!t.isExtraCoord&&(s||n||!t.ordinalMeta||(n=t),o||"ordinal"===t.type||"time"===t.type||l&&l!==t.coordDim||(o=t))}),!o||s||n||(s=!0),o){a="__\0ecstackresult",r="__\0ecstackedover",n&&(n.createInvertedIndices=!0);var h=o.coordDim,c=o.type,d=0;E(i,function(t){t.coordDim===h&&d++}),i.push({name:a,coordDim:h,coordDimIndex:d,type:c,isExtraCoord:!0,isCalculationCoord:!0}),d++,i.push({name:r,coordDim:r,coordDimIndex:d,type:c,isExtraCoord:!0,isCalculationCoord:!0})}return{stackedDimension:o&&o.name,stackedByDimension:n&&n.name,isStackedByIndex:s,stackedOverDimension:r,stackResultDimension:a}}function lp(t,e){return!!e&&e===t.getCalculationInfo("stackedDimension")}function up(t,e){return lp(t,e)?t.getCalculationInfo("stackResultDimension"):e}function hp(t,e,i){i=i||{},Gu.isInstance(t)||(t=Gu.seriesDataToSource(t));var n,o=e.get("coordinateSystem"),a=nh.get(o),r=function(t){var e=t.get("coordinateSystem"),i=new op(e),n=ap[e];if(n)return n(t,i,i.axisMap,i.categoryAxisMap),i}(e);r&&(n=N(r.coordSysDims,function(t){var e={name:t},i=r.axisMap.get(t);if(i){var n=i.get("type");e.type=Lf(n)}return e})),n=n||(a&&(a.getDimensionsInfo?a.getDimensionsInfo():a.dimensions.slice())||["x","y"]);var s,l,u=np(t,{coordDimensions:n,generateCoord:i.generateCoord,encodeDefaulter:i.useEncodeDefaulter?T(Xu,n,e):null});r&&E(u,function(t,e){var i=t.coordDim,n=r.categoryAxisMap.get(i);n&&(null==s&&(s=e),t.ordinalMeta=n.getOrdinalMeta()),null!=t.otherDims.itemName&&(l=!0)}),l||null==s||(u[s].otherDims.itemName=0);var h=sp(e,u),c=new Wf(u,e);c.setCalculationInfo(h);var d=null!=s&&function(t){if(t.sourceFormat===Pu){var e=function(t){var e=0;for(;e<t.length&&null==t[e];)e++;return t[e]}(t.data||[]);return null!=e&&!k(Bo(e))}}(t)?function(t,e,i,n){return n===s?i:this.defaultDimValueGetter(t,e,i,n)}:null;return c.hasItemOption=!1,c.initData(t,null,d),c}function cp(t){this._setting=t||{},this._extent=[1/0,-1/0],this._interval=0,this.init&&this.init.apply(this,arguments)}function dp(t){this.categories=t.categories||[],this._needCollect=t.needCollect,this._deduplication=t.deduplication,this._map}cp.prototype.parse=function(t){return t},cp.prototype.getSetting=function(t){return this._setting[t]},cp.prototype.contain=function(t){var e=this._extent;return t>=e[0]&&t<=e[1]},cp.prototype.normalize=function(t){var e=this._extent;return e[1]===e[0]?.5:(t-e[0])/(e[1]-e[0])},cp.prototype.scale=function(t){var e=this._extent;return t*(e[1]-e[0])+e[0]},cp.prototype.unionExtent=function(t){var e=this._extent;t[0]<e[0]&&(e[0]=t[0]),t[1]>e[1]&&(e[1]=t[1])},cp.prototype.unionExtentFromData=function(t,e){this.unionExtent(t.getApproximateExtent(e))},cp.prototype.getExtent=function(){return this._extent.slice()},cp.prototype.setExtent=function(t,e){var i=this._extent;isNaN(t)||(i[0]=t),isNaN(e)||(i[1]=e)},cp.prototype.isBlank=function(){return this._isBlank},cp.prototype.setBlank=function(t){this._isBlank=t},cp.prototype.getLabel=null,ta(cp),aa(cp,{registerWhenExtend:!0}),dp.createByAxisModel=function(t){var e=t.option,i=e.data,n=i&&N(i,gp);return new dp({categories:n,needCollect:!n,deduplication:!1!==e.dedplication})};var fp=dp.prototype;function pp(t){return t._map||(t._map=Q(t.categories))}function gp(t){return R(t)&&null!=t.value?t.value:t+""}fp.getOrdinal=function(t){return pp(this).get(t)},fp.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=pp(this);return null==(e=n.get(t))&&(i?(e=this.categories.length,this.categories[e]=t,n.set(t,e)):e=NaN),e};var mp=cp.prototype,vp=cp.extend({type:"ordinal",init:function(t,e){t&&!k(t)||(t=new dp({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),mp.contain.call(this,t)&&null!=this._ordinalMeta.categories[t]},normalize:function(t){return mp.normalize.call(this,this.parse(t))},scale:function(t){return Math.round(mp.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){if(!this.isBlank())return this._ordinalMeta.categories[t]},count:function(){return this._extent[1]-this._extent[0]+1},unionExtentFromData:function(t,e){this.unionExtent(t.getApproximateExtent(e))},getOrdinalMeta:function(){return this._ordinalMeta},niceTicks:et,niceExtent:et});vp.create=function(){return new vp};var yp=Nl;function xp(t){return zl(t)+2}function _p(t,e,i){t[e]=Math.max(Math.min(t[e],i[1]),i[0])}function wp(t,e){isFinite(t[0])||(t[0]=e[0]),isFinite(t[1])||(t[1]=e[1]),_p(t,0,e),_p(t,1,e),t[0]>t[1]&&(t[0]=t[1])}var bp=Nl,Sp=cp.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]),Sp.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=xp(t)},getTicks:function(t){var e=this._interval,i=this._extent,n=this._niceExtent,o=this._intervalPrecision,a=[];if(!e)return a;i[0]<n[0]&&(t?a.push(bp(n[0]-e)):a.push(i[0]));for(var r=n[0];r<=n[1]&&(a.push(r),(r=bp(r+e,o))!==a[a.length-1]);)if(1e4<a.length)return[];var s=a.length?a[a.length-1]:n[1];return i[1]>s&&(t?a.push(s+e):a.push(i[1])),a},getMinorTicks:function(t){for(var e=this.getTicks(!0),i=[],n=this.getExtent(),o=1;o<e.length;o++){for(var a=e[o],r=e[o-1],s=0,l=[],u=(a-r)/t;s<t-1;){var h=Nl(r+(s+1)*u);h>n[0]&&h<n[1]&&l.push(h),s++}i.push(l)}return i},getLabel:function(t,e){if(null==t)return"";var i=e&&e.precision;return null==i?i=zl(t)||0:"auto"===i&&(i=this._intervalPrecision),Kl(t=bp(t,i,!0))},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=function(t,e,i,n){var o={},a=t[1]-t[0],r=o.interval=Xl(a/e,!0);null!=i&&r<i&&(r=o.interval=i),null!=n&&n<r&&(r=o.interval=n);var s=o.intervalPrecision=xp(r);return wp(o.niceTickExtent=[yp(Math.ceil(t[0]/r)*r,s),yp(Math.floor(t[1]/r)*r,s)],t),o}(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[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]=bp(Math.floor(e[0]/o)*o)),t.fixMax||(e[1]=bp(Math.ceil(e[1]/o)*o))}});Sp.create=function(){return new Sp};var Mp="__ec_stack_",Ip="undefined"!=typeof Float32Array?Float32Array:Array;function Tp(t){return t.get("stack")||Mp+t.seriesIndex}function Ap(t){return t.dim+t.index}function Dp(t,e){var i=[];return e.eachSeriesByType(t,function(t){Op(t)&&!Ep(t)&&i.push(t)}),i}function Cp(t){var g=function(t){var l={};E(t,function(t){var e=t.coordinateSystem.getBaseAxis();if("time"===e.type||"value"===e.type)for(var i=t.getData(),n=e.dim+"_"+e.index,o=i.mapDimension(e.dim),a=0,r=i.count();a<r;++a){var s=i.get(o,a);l[n]?l[n].push(s):l[n]=[s]}});var e=[];for(var i in l)if(l.hasOwnProperty(i)){var n=l[i];if(n){n.sort(function(t,e){return t-e});for(var o=null,a=1;a<n.length;++a){var r=n[a]-n[a-1];0<r&&(o=null===o?r:Math.min(o,r))}e[i]=o}}return e}(t),m=[];return E(t,function(t){var e,i=t.coordinateSystem.getBaseAxis(),n=i.getExtent();if("category"===i.type)e=i.getBandWidth();else if("value"===i.type||"time"===i.type){var o=i.dim+"_"+i.index,a=g[o],r=Math.abs(n[1]-n[0]),s=i.scale.getExtent(),l=Math.abs(s[1]-s[0]);e=a?r/l*a:r}else{var u=t.getData();e=Math.abs(n[1]-n[0])/u.count()}var h=Pl(t.get("barWidth"),e),c=Pl(t.get("barMaxWidth"),e),d=Pl(t.get("barMinWidth")||1,e),f=t.get("barGap"),p=t.get("barCategoryGap");m.push({bandWidth:e,barWidth:h,barMaxWidth:c,barMinWidth:d,barGap:f,barCategoryGap:p,axisKey:Ap(i),stackId:Tp(t)})}),Lp(m)}function Lp(t){var d={};E(t,function(t,e){var i=t.axisKey,n=t.bandWidth,o=d[i]||{bandWidth:n,remainedWidth:n,autoWidthCount:0,categoryGap:"20%",gap:"30%",stacks:{}},a=o.stacks;d[i]=o;var r=t.stackId;a[r]||o.autoWidthCount++,a[r]=a[r]||{width:0,maxWidth:0};var s=t.barWidth;s&&!a[r].width&&(a[r].width=s,s=Math.min(o.remainedWidth,s),o.remainedWidth-=s);var l=t.barMaxWidth;l&&(a[r].maxWidth=l);var u=t.barMinWidth;u&&(a[r].minWidth=u);var h=t.barGap;null!=h&&(o.gap=h);var c=t.barCategoryGap;null!=c&&(o.categoryGap=c)});var f={};return E(d,function(t,i){f[i]={};var e=t.stacks,n=t.bandWidth,o=Pl(t.categoryGap,n),a=Pl(t.gap,1),r=t.remainedWidth,s=t.autoWidthCount,l=(r-o)/(s+(s-1)*a);l=Math.max(l,0),E(e,function(t){var e=t.maxWidth,i=t.minWidth;if(t.width){n=t.width;e&&(n=Math.min(n,e)),i&&(n=Math.max(n,i)),t.width=n,r-=n+a*n,s--}else{var n=l;e&&e<n&&(n=Math.min(e,r)),i&&n<i&&(n=i),n!==l&&(t.width=n,r-=n+a*n,s--)}}),l=(r-o)/(s+(s-1)*a),l=Math.max(l,0);var u,h=0;E(e,function(t,e){t.width||(t.width=l),h+=(u=t).width*(1+a)}),u&&(h-=u.width*a);var c=-h/2;E(e,function(t,e){f[i][e]=f[i][e]||{bandWidth:n,offset:c,width:t.width},c+=t.width*(1+a)})}),f}function kp(t,e,i){if(t&&e){var n=t[Ap(e)];return null!=n&&null!=i&&(n=n[Tp(i)]),n}}function Pp(t,e){var i=Dp(t,e),T=Cp(i),A={};E(i,function(t){var e=t.getData(),i=t.coordinateSystem,n=i.getBaseAxis(),o=Tp(t),a=T[Ap(n)][o],r=a.offset,s=a.width,l=i.getOtherAxis(n),u=t.get("barMinHeight")||0;A[o]=A[o]||[],e.setLayout({bandWidth:a.bandWidth,offset:r,size:s});for(var h=e.mapDimension(l.dim),c=e.mapDimension(n.dim),d=lp(e,h),f=l.isHorizontal(),p=zp(n,l,d),g=0,m=e.count();g<m;g++){var v=e.get(h,g),y=e.get(c,g);if(!isNaN(v)&&!isNaN(y)){var x,_,w,b,S,M=0<=v?"p":"n",I=p;if(d&&(A[o][y]||(A[o][y]={p:p,n:p}),I=A[o][y][M]),f)x=I,_=(S=i.dataToPoint([v,y]))[1]+r,w=S[0]-p,b=s,Math.abs(w)<u&&(w=(w<0?-1:1)*u),d&&(A[o][y][M]+=w);else x=(S=i.dataToPoint([y,v]))[0]+r,_=I,w=s,b=S[1]-p,Math.abs(b)<u&&(b=(b<=0?-1:1)*u),d&&(A[o][y][M]+=b);e.setItemLayout(g,{x:x,y:_,width:w,height:b})}}},this)}var Np={seriesType:"bar",plan:dc(),reset:function(t){if(Op(t)&&Ep(t)){var e=t.getData(),h=t.coordinateSystem,c=h.getBaseAxis(),d=h.getOtherAxis(c),f=e.mapDimension(d.dim),p=e.mapDimension(c.dim),g=d.isHorizontal(),m=g?0:1,v=kp(Cp([t]),c,t).width;return.5<v||(v=.5),{progress:function(t,e){var i,n=t.count,o=new Ip(2*n),a=new Ip(n),r=[],s=[],l=0,u=0;for(;null!=(i=t.next());)s[m]=e.get(f,i),s[1-m]=e.get(p,i),r=h.dataToPoint(s,null,r),o[l++]=r[0],o[l++]=r[1],a[u++]=i;e.setLayout({largePoints:o,largeDataIndices:a,barWidth:v,valueAxisStart:zp(c,d,!1),valueAxisHorizontal:g})}}}}};function Op(t){return t.coordinateSystem&&"cartesian2d"===t.coordinateSystem.type}function Ep(t){return t.pipelineContext&&t.pipelineContext.large}function zp(t,e){return e.toGlobalCoord(e.dataToCoord("log"===e.type?1:0))}var Rp=Sp.prototype,Bp=Math.ceil,Vp=Math.floor,Gp=36e5,Fp=864e5,Wp=Sp.extend({type:"time",getLabel:function(t){var e=this._stepLvl,i=new Date(t);return lu(e[0],i,this.getSetting("useUTC"))},niceExtent:function(t){var e=this._extent;if(e[0]===e[1]&&(e[0]-=Fp,e[1]+=Fp),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]-Fp}this.niceTicks(t.splitNumber,t.minInterval,t.maxInterval);var n=this._interval;t.fixMin||(e[0]=Nl(Vp(e[0]/n)*n)),t.fixMax||(e[1]=Nl(Bp(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&&i<a&&(a=i);var r=Hp.length,s=function(t,e,i,n){for(;i<n;){var o=i+n>>>1;t[o][1]<e?i=1+o:n=o}return i}(Hp,a,0,r),l=Hp[Math.min(s,r-1)],u=l[1];"year"===l[0]&&(u*=Xl(o/u/t,!0));var h=this.getSetting("useUTC")?0:60*new Date(+n[0]||+n[1]).getTimezoneOffset()*1e3,c=[Math.round(Bp((n[0]-h)/u)*u+h),Math.round(Vp((n[1]-h)/u)*u+h)];wp(c,n),this._stepLvl=l,this._interval=u,this._niceExtent=c},parse:function(t){return+Hl(t)}});E(["contain","normalize"],function(e){Wp.prototype[e]=function(t){return Rp[e].call(this,this.parse(t))}});var Hp=[["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",Gp],["hh:mm\nMM-dd",72e5],["hh:mm\nMM-dd",6*Gp],["hh:mm\nMM-dd",432e5],["MM-dd\nyyyy",Fp],["MM-dd\nyyyy",2*Fp],["MM-dd\nyyyy",3*Fp],["MM-dd\nyyyy",4*Fp],["MM-dd\nyyyy",5*Fp],["MM-dd\nyyyy",6*Fp],["week",7*Fp],["MM-dd\nyyyy",864e6],["week",14*Fp],["week",21*Fp],["month",31*Fp],["week",42*Fp],["month",62*Fp],["week",70*Fp],["quarter",95*Fp],["month",31*Fp*4],["month",13392e6],["half-year",16416e6],["month",31*Fp*8],["month",26784e6],["year",380*Fp]];Wp.create=function(t){return new Wp({useUTC:t.ecModel.get("useUTC")})};var Zp=cp.prototype,Up=Sp.prototype,Xp=zl,Yp=Nl,jp=Math.floor,qp=Math.ceil,Kp=Math.pow,$p=Math.log,Jp=cp.extend({type:"log",base:10,$constructor:function(){cp.apply(this,arguments),this._originalScale=new Sp},getTicks:function(t){var i=this._originalScale,n=this._extent,o=i.getExtent();return N(Up.getTicks.call(this,t),function(t){var e=Nl(Kp(this.base,t));return e=t===n[0]&&i.__fixMin?Qp(e,o[0]):e,e=t===n[1]&&i.__fixMax?Qp(e,o[1]):e},this)},getMinorTicks:Up.getMinorTicks,getLabel:Up.getLabel,scale:function(t){return t=Zp.scale.call(this,t),Kp(this.base,t)},setExtent:function(t,e){var i=this.base;t=$p(t)/$p(i),e=$p(e)/$p(i),Up.setExtent.call(this,t,e)},getExtent:function(){var t=this.base,e=Zp.getExtent.call(this);e[0]=Kp(t,e[0]),e[1]=Kp(t,e[1]);var i=this._originalScale,n=i.getExtent();return i.__fixMin&&(e[0]=Qp(e[0],n[0])),i.__fixMax&&(e[1]=Qp(e[1],n[1])),e},unionExtent:function(t){this._originalScale.unionExtent(t);var e=this.base;t[0]=$p(t[0])/$p(e),t[1]=$p(t[1])/$p(e),Zp.unionExtent.call(this,t)},unionExtentFromData:function(t,e){this.unionExtent(t.getApproximateExtent(e))},niceTicks:function(t){t=t||10;var e=this._extent,i=e[1]-e[0];if(!(i==1/0||i<=0)){var n=Zl(i);for(t/i*n<=.5&&(n*=10);!isNaN(n)&&Math.abs(n)<1&&0<Math.abs(n);)n*=10;var o=[Nl(qp(e[0]/n)*n),Nl(jp(e[1]/n)*n)];this._interval=n,this._niceExtent=o}},niceExtent:function(t){Up.niceExtent.call(this,t);var e=this._originalScale;e.__fixMin=t.fixMin,e.__fixMax=t.fixMax}});function Qp(t,e){return Yp(t,Xp(e))}function tg(t,e){var i,n,o,a=t.type,r=e.getMin(),s=e.getMax(),l=null!=r,u=null!=s,h=t.getExtent();"ordinal"===a?i=e.getCategories().length:(k(n=e.get("boundaryGap"))||(n=[n||0,n||0]),"boolean"==typeof n[0]&&(n=[0,0]),n[0]=Pl(n[0],1),n[1]=Pl(n[1],1),o=h[1]-h[0]||Math.abs(h[0])),null==r&&(r="ordinal"===a?i?0:NaN:h[0]-n[0]*o),null==s&&(s="ordinal"===a?i?i-1:NaN:h[1]+n[1]*o),"dataMin"===r?r=h[0]:"function"==typeof r&&(r=r({min:h[0],max:h[1]})),"dataMax"===s?s=h[1]:"function"==typeof s&&(s=s({min:h[0],max:h[1]})),null!=r&&isFinite(r)||(r=NaN),null!=s&&isFinite(s)||(s=NaN),t.setBlank(F(r)||F(s)||"ordinal"===a&&!t.getOrdinalMeta().categories.length),e.getNeedCrossZero()&&(0<r&&0<s&&!l&&(r=0),r<0&&s<0&&!u&&(s=0));var c=e.ecModel;if(c&&"time"===a){var d,f=Dp("bar",c);if(E(f,function(t){d|=t.getBaseAxis()===e.axis}),d){var p=Cp(f),g=function(t,e,i,n){var o=i.axis.getExtent(),a=o[1]-o[0],r=kp(n,i.axis);if(void 0===r)return{min:t,max:e};var s=1/0;E(r,function(t){s=Math.min(t.offset,s)});var l=-1/0;E(r,function(t){l=Math.max(t.offset+t.width,l)}),s=Math.abs(s),l=Math.abs(l);var u=s+l,h=e-t,c=h/(1-(s+l)/a)-h;return{min:t-=s/u*c,max:e+=l/u*c}}(r,s,e,p);r=g.min,s=g.max}}return[r,s]}function eg(t,e){var i=tg(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 ig(t,e){if(e=e||t.get("type"))switch(e){case"category":return new vp(t.getOrdinalMeta?t.getOrdinalMeta():t.getCategories(),[1/0,-1/0]);case"value":return new Sp;default:return(cp.getClass(e)||Sp).create(t)}}function ng(i){var e,n=i.getLabelModel().get("formatter"),o="category"===i.type?i.scale.getExtent()[0]:null;return"string"==typeof n?(e=n,n=function(t){return t=i.scale.getLabel(t),e.replace("{value}",null!=t?t:"")}):"function"==typeof n?function(t,e){return null!=o&&(e=t-o),n(og(i,t),e)}:function(t){return i.scale.getLabel(t)}}function og(t,e){return"category"===t.type?t.scale.getLabel(e):e}function ag(t){var e=t.get("interval");return null==e?"auto":e}function rg(t){return"category"===t.type&&0===ag(t.getLabelModel())}E(["contain","normalize"],function(e){Jp.prototype[e]=function(t){return t=$p(t)/$p(this.base),Zp[e].call(this,t)}}),Jp.create=function(){return new Jp};var sg={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&&!F(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&&!F(i)&&(i=this.axis.scale.parse(i)),i},getNeedCrossZero:function(){var t=this.option;return null==t.rangeStart&&null==t.rangeEnd&&!t.scale},getCoordSysModel:et,setRange:function(t,e){this.option.rangeStart=t,this.option.rangeEnd=e},resetRange:function(){this.option.rangeStart=this.option.rangeEnd=null}},lg=Is({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()}}),ug=Is({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()}}),hg=Is({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,u=Math.asin(s/r),h=Math.cos(u)*r,c=Math.sin(u),d=Math.cos(u),f=.6*r,p=.7*r;t.moveTo(i-h,l+s),t.arc(i,l,r,Math.PI-u,2*Math.PI+u),t.bezierCurveTo(i+h-c*f,l+s+d*f,i,n-p,i,n),t.bezierCurveTo(i,n-p,i-h+c*f,l+s+d*f,i-h,l+s),t.closePath()}}),cg=Is({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()}}),dg={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}},fg={};E({line:os,rect:is,roundRect:is,square:is,circle:Hr,diamond:ug,pin:hg,arrow:cg,triangle:lg},function(t,e){fg[e]=new t});var pg=Is({type:"symbol",shape:{symbolType:"",x:0,y:0,width:0,height:0},calculateTextPosition:function(t,e,i){var n=pn(t,e,i),o=this.shape;return o&&"pin"===o.symbolType&&"inside"===e.textPosition&&(n.y=i.y+.4*i.height),n},buildPath:function(t,e,i){var n=e.symbolType;if("none"!==n){var o=fg[n];o=o||fg[n="rect"],dg[n](e.x,e.y,e.width,e.height,o.shape),o.buildPath(t,o.shape,i)}}});function gg(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 mg(t,e,i,n,o,a,r){var s,l=0===t.indexOf("empty");return l&&(t=t.substr(5,1).toLowerCase()+t.substr(6)),(s=0===t.indexOf("image://")?Cs(t.slice(8),new Mi(e,i,n,o),r?"center":"cover"):0===t.indexOf("path://")?Ds(t.slice(7),{},new Mi(e,i,n,o),r?"center":"cover"):new pg({shape:{symbolType:t,x:e,y:i,width:n,height:o}})).__isEmptyBrush=l,s.setColor=gg,s.setColor(a),s}var vg={isDimensionStacked:lp,enableDataStack:sp,getStackedDimension:up};var yg=(Object.freeze||Object)({createList:function(t){return hp(t.getSource(),t)},getLayoutRect:vu,dataStack:vg,createScale:function(t,e){var i=e;Il.isInstance(e)||b(i=new Il(e),sg);var n=ig(i);return n.setExtent(t[0],t[1]),eg(n,i),n},mixinAxisModelCommonMethods:function(t){b(t,sg)},completeDimensions:ep,createDimensions:np,createSymbol:mg}),xg=1e-8;function _g(t,e){return Math.abs(t-e)<xg}function wg(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+=hr(o[0],o[1],r[0],r[1],e,i),o=r}var s=t[0];return _g(o[0],s[0])&&_g(o[1],s[1])||(n+=hr(o[0],o[1],s[0],s[1],e,i)),0!==n}function bg(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 Sg(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}bg.prototype={constructor:bg,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++){if("polygon"===r[s].type)Ba(r[s].exterior,o,a),St(i,i,o),Mt(n,n,a)}return 0===s&&(i[0]=i[1]=n[0]=n[1]=0),this._rect=new Mi(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(wg(a,t[0],t[1])){for(var s=0;s<(r?r.length:0);s++)if(wg(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 Mi(t,e,i,n),s=o.calculateTransform(r),l=this.geometries,u=0;u<l.length;u++)if("polygon"===l[u].type){for(var h=l[u].exterior,c=l[u].interiors,d=0;d<h.length;d++)bt(h[d],h[d],s);for(var f=0;f<(c?c.length:0);f++)for(d=0;d<c[f].length;d++)bt(c[f][d],c[f][d],s)}(o=this._rect).copy(r),this.center=[o.x+o.width/2,o.y+o.height/2]},cloneShallow:function(t){null==t&&(t=this.name);var e=new bg(t,this.geometries,this.center);return e._rect=this._rect,e.transformTo=null,e}};function Mg(t){return function(t){if(!t.UTF8Encoding)return;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]=Sg(l,r[s],e);else if("MultiPolygon"===o.type)for(var u=0;u<l.length;u++){var h=l[u];l[u]=Sg(h,r[s][u],e)}}t.UTF8Encoding=!1}(t),N(M(t.features,function(t){return t.geometry&&t.properties&&0<t.geometry.coordinates.length}),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&&E(n,function(t){t[0]&&o.push({type:"polygon",exterior:t[0],interiors:t.slice(1)})});var a=new bg(e.name,o,e.cp);return a.properties=e,a})}var Ig=Zo();function Tg(t){return"category"===t.type?function(t){var e=t.getLabelModel(),i=Dg(t,e);return!e.get("show")||t.scale.isBlank()?{labels:[],labelCategoryInterval:i.labelCategoryInterval}:i}(t):function(i){var t=i.scale.getTicks(),n=ng(i);return{labels:N(t,function(t,e){return{formattedLabel:n(t,e),rawLabel:i.scale.getLabel(t),tickValue:t}})}}(t)}function Ag(t,e){return"category"===t.type?function(t,e){var i,n,o=Cg(t,"ticks"),a=ag(e),r=Lg(o,a);if(r)return r;e.get("show")&&!t.scale.isBlank()||(i=[]);if(O(a))i=Ng(t,a,!0);else if("auto"===a){var s=Dg(t,t.getLabelModel());n=s.labelCategoryInterval,i=N(s.labels,function(t){return t.tickValue})}else i=Pg(t,n=a,!0);return kg(o,a,{ticks:i,tickCategoryInterval:n})}(t,e):{ticks:t.scale.getTicks()}}function Dg(t,e){var i,n=Cg(t,"labels"),o=ag(e),a=Lg(n,o);return a||kg(n,o,{labels:O(o)?Ng(t,o):Pg(t,i="auto"===o?function(t){var e=Ig(t).autoInterval;return null!=e?e:Ig(t).autoInterval=t.calculateCategoryInterval()}(t):o),labelCategoryInterval:i})}function Cg(t,e){return Ig(t)[e]||(Ig(t)[e]=[])}function Lg(t,e){for(var i=0;i<t.length;i++)if(t[i].key===e)return t[i].value}function kg(t,e,i){return t.push({key:e,value:i}),i}function Pg(t,e,i){var n=ng(t),o=t.scale,a=o.getExtent(),r=t.getLabelModel(),s=[],l=Math.max((e||0)+1,1),u=a[0],h=o.count();0!==u&&1<l&&2<h/l&&(u=Math.round(Math.ceil(u/l)*l));var c=rg(t),d=r.get("showMinLabel")||c,f=r.get("showMaxLabel")||c;d&&u!==a[0]&&g(a[0]);for(var p=u;p<=a[1];p+=l)g(p);function g(t){s.push(i?t:{formattedLabel:n(t),rawLabel:o.getLabel(t),tickValue:t})}return f&&p-l!==a[1]&&g(a[1]),s}function Ng(t,i,n){var o=t.scale,a=ng(t),r=[];return E(o.getTicks(),function(t){var e=o.getLabel(t);i(t,e)&&r.push(n?t:{formattedLabel:a(t),rawLabel:e,tickValue:t})}),r}var Og=[0,1],Eg=function(t,e,i){this.dim=t,this.scale=e,this._extent=i||[0,0],this.inverse=!1,this.onBand=!1};function zg(t,e){var i=(t[1]-t[0])/e/2;t[0]+=i,t[1]-=i}Eg.prototype={constructor:Eg,contain:function(t){var e=this._extent,i=Math.min(e[0],e[1]),n=Math.max(e[0],e[1]);return i<=t&&t<=n},containData:function(t){return this.scale.contain(t)},getExtent:function(){return this._extent.slice()},getPixelPrecision:function(t){return Rl(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&&zg(i=i.slice(),n.count()),kl(t,Og,i,e)},coordToData:function(t,e){var i=this._extent,n=this.scale;this.onBand&&"ordinal"===n.type&&zg(i=i.slice(),n.count());var o=kl(t,i,Og,e);return this.scale.scale(o)},pointToData:function(t,e){},getTicksCoords:function(t){var e=(t=t||{}).tickModel||this.getTickModel(),i=N(Ag(this,e).ticks,function(t){return{coord:this.dataToCoord(t),tickValue:t}},this);return function(t,e,i,n){var o=e.length;if(!t.onBand||i||!o)return;var a,r,s=t.getExtent();if(1===o)e[0].coord=s[0],a=e[1]={coord:s[0]};else{var l=e[o-1].tickValue-e[0].tickValue,u=(e[o-1].coord-e[0].coord)/l;E(e,function(t){t.coord-=u/2});var h=t.scale.getExtent();r=1+h[1]-e[o-1].tickValue,a={coord:e[o-1].coord+u*r},e.push(a)}var c=s[0]>s[1];d(e[0].coord,s[0])&&(n?e[0].coord=s[0]:e.shift());n&&d(s[0],e[0].coord)&&e.unshift({coord:s[0]});d(s[1],a.coord)&&(n?a.coord=s[1]:e.pop());n&&d(a.coord,s[1])&&e.push({coord:s[1]});function d(t,e){return t=Nl(t),e=Nl(e),c?e<t:t<e}}(this,i,e.get("alignWithLabel"),t.clamp),i},getMinorTicksCoords:function(){if("ordinal"===this.scale.type)return[];var t=this.model.getModel("minorTick").get("splitNumber");return 0<t&&t<100||(t=5),N(this.scale.getMinorTicks(t),function(t){return N(t,function(t){return{coord:this.dataToCoord(t),tickValue:t}},this)},this)},getViewLabels:function(){return Tg(this).labels},getLabelModel:function(){return this.model.getModel("axisLabel")},getTickModel:function(){return this.model.getModel("axisTick")},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,calculateCategoryInterval:function(){return function(t){var e=function(t){var e=t.getLabelModel();return{axisRotate:t.getRotate?t.getRotate():t.isHorizontal&&!t.isHorizontal()?90:0,labelRotate:e.get("rotate")||0,font:e.getFont()}}(t),i=ng(t),n=(e.axisRotate-e.labelRotate)/180*Math.PI,o=t.scale,a=o.getExtent(),r=o.count();if(a[1]-a[0]<1)return 0;var s=1;40<r&&(s=Math.max(1,Math.floor(r/40)));for(var l=a[0],u=t.dataToCoord(l+1)-t.dataToCoord(l),h=Math.abs(u*Math.cos(n)),c=Math.abs(u*Math.sin(n)),d=0,f=0;l<=a[1];l+=s){var p,g,m=cn(i(l),e.font,"center","top");p=1.3*m.width,g=1.3*m.height,d=Math.max(d,p,7),f=Math.max(f,g,7)}var v=d/h,y=f/c;isNaN(v)&&(v=1/0),isNaN(y)&&(y=1/0);var x=Math.max(0,Math.floor(Math.min(v,y))),_=Ig(t.model),w=t.getExtent(),b=_.lastAutoInterval,S=_.lastTickCount;return null!=b&&null!=S&&Math.abs(b-x)<=1&&Math.abs(S-r)<=1&&x<b&&_.axisExtend0===w[0]&&_.axisExtend1===w[1]?x=b:(_.lastTickCount=r,_.lastAutoInterval=x,_.axisExtend0=w[0],_.axisExtend1=w[1]),x}(this)}};var Rg=Mg,Bg={};E(["map","each","filter","indexOf","inherits","reduce","filter","bind","curry","isArray","isString","isObject","isFunction","extend","defaults","clone","merge"],function(t){Bg[t]=it[t]});var Vg={};function Gg(t,e){var i=t.mapDimension("defaultedLabel",!0),n=i.length;if(1===n)return Bh(t,e,i[0]);if(n){for(var o=[],a=0;a<i.length;a++){var r=Bh(t,e,i[a]);o.push(r)}return o.join(" ")}}function Fg(t,e,i){Ii.call(this),this.updateData(t,e,i)}E(["extendShape","extendPath","makePath","makeImage","mergePath","resizePath","createIcon","setHoverStyle","setLabelStyle","setTextStyle","setText","getFont","updateProps","initProps","getTransform","clipPointsByRect","clipRectByRect","registerShape","getShapeClass","Group","Image","Text","Circle","Sector","Ring","Polygon","Polyline","Rect","Line","BezierCurve","Arc","IncrementalDisplayable","CompoundPath","LinearGradient","RadialGradient","BoundingRect"],function(t){Vg[t]=yl[t]}),ic.extend({type:"series.line",dependencies:["grid","polar"],getInitialData:function(t,e){return hp(this.getSource(),this,{useEncodeDefaulter:!0})},defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,hoverAnimation:!0,clip:!0,label:{position:"top"},lineStyle:{width:2,type:"solid"},step:!1,smooth:!1,smoothMonotone:null,symbol:"emptyCircle",symbolSize:4,symbolRotate:null,showSymbol:!0,showAllSymbol:"auto",connectNulls:!1,sampling:"none",animationEasing:"linear",progressive:0,hoverLayerThreshold:1/0}});var Wg=Fg.prototype,Hg=Fg.getSymbolSize=function(t,e){var i=t.getItemVisual(e,"symbolSize");return i instanceof Array?i.slice():[+i,+i]};function Zg(t){return[t[0]/2,t[1]/2]}function Ug(t,e){this.parent.drift(t,e)}Wg._createSymbol=function(t,e,i,n,o){this.removeAll();var a=mg(t,-1,-1,2,2,e.getItemVisual(i,"color"),o);a.attr({z2:100,culling:!0,scale:Zg(n)}),a.drift=Ug,this._symbolType=t,this.add(a)},Wg.stopSymbolAnimation=function(t){this.childAt(0).stopAnimation(t)},Wg.getSymbolPath=function(){return this.childAt(0)},Wg.getScale=function(){return this.childAt(0).scale},Wg.highlight=function(){this.childAt(0).trigger("emphasis")},Wg.downplay=function(){this.childAt(0).trigger("normal")},Wg.setZ=function(t,e){var i=this.childAt(0);i.zlevel=t,i.z=e},Wg.setDraggable=function(t){var e=this.childAt(0);e.draggable=t,e.cursor=t?"move":e.cursor},Wg.updateData=function(t,e,i){this.silent=!1;var n=t.getItemVisual(e,"symbol")||"circle",o=t.hostModel,a=Hg(t,e),r=n!==this._symbolType;if(r){var s=t.getItemVisual(e,"symbolKeepAspect");this._createSymbol(n,t,e,a,s)}else{(l=this.childAt(0)).silent=!1,sl(l,{scale:Zg(a)},o,e)}if(this._updateCommon(t,e,a,i),r){var l=this.childAt(0),u=i&&i.fadeIn,h={scale:l.scale.slice()};u&&(h.style={opacity:l.style.opacity}),l.scale=[0,0],u&&(l.style.opacity=0),ll(l,h,o,e)}this._seriesModel=o};var Xg=["itemStyle"],Yg=["emphasis","itemStyle"],jg=["label"],qg=["emphasis","label"];function Kg(t,e){if(!this.incremental&&!this.useHoverLayer)if("emphasis"===e){var i=this.__symbolOriginalScale,n=i[1]/i[0],o={scale:[Math.max(1.1*i[0],i[0]+3),Math.max(1.1*i[1],i[1]+3*n)]};this.animateTo(o,400,"elasticOut")}else"normal"===e&&this.animateTo({scale:this.__symbolOriginalScale},400,"elasticOut")}function $g(t){this.group=new Ii,this._symbolCtor=t||Fg}Wg._updateCommon=function(i,t,e,n){var o=this.childAt(0),a=i.hostModel,r=i.getItemVisual(t,"color");"image"!==o.type?o.useStyle({strokeNoScale:!0}):o.setStyle({opacity:null,shadowBlur:null,shadowOffsetX:null,shadowOffsetY:null,shadowColor:null});var s=n&&n.itemStyle,l=n&&n.hoverItemStyle,u=n&&n.symbolRotate,h=n&&n.symbolOffset,c=n&&n.labelModel,d=n&&n.hoverLabelModel,f=n&&n.hoverAnimation,p=n&&n.cursorStyle;if(!n||i.hasItemOption){var g=n&&n.itemModel?n.itemModel:i.getItemModel(t);s=g.getModel(Xg).getItemStyle(["color"]),l=g.getModel(Yg).getItemStyle(),u=g.getShallow("symbolRotate"),h=g.getShallow("symbolOffset"),c=g.getModel(jg),d=g.getModel(qg),f=g.getShallow("hoverAnimation"),p=g.getShallow("cursor")}else l=L({},l);var m=o.style;o.attr("rotation",(u||0)*Math.PI/180||0),h&&o.attr("position",[Pl(h[0],e[0]),Pl(h[1],e[1])]),p&&o.attr("cursor",p),o.setColor(r,n&&n.symbolInnerColor),o.setStyle(s);var v=i.getItemVisual(t,"opacity");null!=v&&(m.opacity=v);var y=i.getItemVisual(t,"liftZ"),x=o.__z2Origin;null!=y?null==x&&(o.__z2Origin=o.z2,o.z2+=y):null!=x&&(o.z2=x,o.__z2Origin=null);var _=n&&n.useNameLabel;$s(m,l,c,d,{labelFetcher:a,labelDataIndex:t,defaultText:function(t,e){return _?i.getName(t):Gg(i,t)},isRectText:!0,autoColor:r}),o.__symbolOriginalScale=Zg(e),o.hoverStyle=l,o.highDownOnUpdate=f&&a.isAnimationEnabled()?Kg:null,Ys(o)},Wg.fadeOut=function(t,e){var i=this.childAt(0);this.silent=i.silent=!0,e&&e.keepLabel||(i.style.text=null),sl(i,{style:{opacity:0},scale:[0,0]},this._seriesModel,this.dataIndex,t)},w(Fg,Ii);var Jg=$g.prototype;function Qg(t,e,i,n){return e&&!isNaN(e[0])&&!isNaN(e[1])&&!(n.isIgnore&&n.isIgnore(i))&&!(n.clipShape&&!n.clipShape.contain(e[0],e[1]))&&"none"!==t.getItemVisual(i,"symbol")}function tm(t){return null==t||R(t)||(t={isIgnore:t}),t||{}}function em(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 im(t,e,i){var n,o=t.getBaseAxis(),a=t.getOtherAxis(o),r=function(t,e){var i=0,n=t.scale.getExtent();"start"===e?i=n[0]:"end"===e?i=n[1]:0<n[0]?i=n[0]:n[1]<0&&(i=n[1]);return i}(a,i),s=o.dim,l=a.dim,u=e.mapDimension(l),h=e.mapDimension(s),c="x"===l||"radius"===l?1:0,d=N(t.dimensions,function(t){return e.mapDimension(t)}),f=e.getCalculationInfo("stackResultDimension");return(n|=lp(e,d[0]))&&(d[0]=f),(n|=lp(e,d[1]))&&(d[1]=f),{dataDimsForPoint:d,valueStart:r,valueAxisDim:l,baseAxisDim:s,stacked:!!n,valueDim:u,baseDim:h,baseDataOffset:c,stackedOverDimension:e.getCalculationInfo("stackedOverDimension")}}function nm(t,e,i,n){var o=NaN;t.stacked&&(o=i.get(i.getCalculationInfo("stackedOverDimension"),n)),isNaN(o)&&(o=t.valueStart);var a=t.baseDataOffset,r=[];return r[a]=i.get(t.baseDim,n),r[1-a]=o,e.dataToPoint(r)}Jg.updateData=function(o,a){a=tm(a);var r=this.group,s=o.hostModel,l=this._data,u=this._symbolCtor,h=em(o);l||r.removeAll(),o.diff(l).add(function(t){var e=o.getItemLayout(t);if(Qg(o,e,t,a)){var i=new u(o,t,h);i.attr("position",e),o.setItemGraphicEl(t,i),r.add(i)}}).update(function(t,e){var i=l.getItemGraphicEl(e),n=o.getItemLayout(t);Qg(o,n,t,a)?(i?(i.updateData(o,t,h),sl(i,{position:n},s)):(i=new u(o,t)).attr("position",n),r.add(i),o.setItemGraphicEl(t,i)):r.remove(i)}).remove(function(t){var e=l.getItemGraphicEl(t);e&&e.fadeOut(function(){r.remove(e)})}).execute(),this._data=o},Jg.isPersistent=function(){return!0},Jg.updateLayout=function(){var n=this._data;n&&n.eachItemGraphicEl(function(t,e){var i=n.getItemLayout(e);t.attr("position",i)})},Jg.incrementalPrepareUpdate=function(t){this._seriesScope=em(t),this._data=null,this.group.removeAll()},Jg.incrementalUpdate=function(t,e,i){function n(t){t.isGroup||(t.incremental=t.useHoverLayer=!0)}i=tm(i);for(var o=t.start;o<t.end;o++){var a=e.getItemLayout(o);if(Qg(e,a,o,i)){var r=new this._symbolCtor(e,o,this._seriesScope);r.traverse(n),r.attr("position",a),this.group.add(r),e.setItemGraphicEl(o,r)}}},Jg.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 om=St,am=Mt,rm=ut,sm=at,lm=[],um=[],hm=[];function cm(t){return isNaN(t[0])||isNaN(t[1])}function dm(t,e,i,n,o,a,r,s,l,u){return"none"!==u&&u?function(t,e,i,n,o,a,r,s,l,u,h){for(var c=0,d=i,f=0;f<n;f++){var p=e[d];if(o<=d||d<0)break;if(cm(p)){if(h){d+=a;continue}break}if(d===i)t[0<a?"moveTo":"lineTo"](p[0],p[1]);else if(0<l){var g=e[c],m="y"===u?1:0,v=(p[m]-g[m])*l;sm(um,g),um[m]=g[m]+v,sm(hm,p),hm[m]=p[m]-v,t.bezierCurveTo(um[0],um[1],hm[0],hm[1],p[0],p[1])}else t.lineTo(p[0],p[1]);c=d,d+=a}return f}.apply(this,arguments):function(t,e,i,n,o,a,r,s,l,u,h){for(var c=0,d=i,f=0;f<n;f++){var p=e[d];if(o<=d||d<0)break;if(cm(p)){if(h){d+=a;continue}break}if(d===i)t[0<a?"moveTo":"lineTo"](p[0],p[1]),sm(um,p);else if(0<l){var g=d+a,m=e[g];if(h)for(;m&&cm(e[g]);)m=e[g+=a];var v=.5,y=e[c];if(!(m=e[g])||cm(m))sm(hm,p);else{var x,_;if(cm(m)&&!h&&(m=p),ht(lm,m,y),"x"===u||"y"===u){var w="x"===u?0:1;x=Math.abs(p[w]-y[w]),_=Math.abs(p[w]-m[w])}else x=yt(p,y),_=yt(p,m);rm(hm,p,lm,-l*(1-(v=_/(_+x))))}om(um,um,s),am(um,um,r),om(hm,hm,s),am(hm,hm,r),t.bezierCurveTo(um[0],um[1],hm[0],hm[1],p[0],p[1]),rm(um,p,lm,l*v)}else t.lineTo(p[0],p[1]);c=d,d+=a}return f}.apply(this,arguments)}function fm(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}}var pm=Sr.extend({type:"ec-polyline",shape:{points:[],smooth:0,smoothConstraint:!0,smoothMonotone:null,connectNulls:!1},style:{fill:null,stroke:"#000"},brush:Wr(Sr.prototype.brush),buildPath:function(t,e){var i=e.points,n=0,o=i.length,a=fm(i,e.smoothConstraint);if(e.connectNulls){for(;0<o&&cm(i[o-1]);o--);for(;n<o&&cm(i[n]);n++);}for(;n<o;)n+=dm(t,i,n,o,o,1,a.min,a.max,e.smooth,e.smoothMonotone,e.connectNulls)+1}}),gm=Sr.extend({type:"ec-polygon",shape:{points:[],stackedOnPoints:[],smooth:0,stackedOnSmooth:0,smoothConstraint:!0,smoothMonotone:null,connectNulls:!1},brush:Wr(Sr.prototype.brush),buildPath:function(t,e){var i=e.points,n=e.stackedOnPoints,o=0,a=i.length,r=e.smoothMonotone,s=fm(i,e.smoothConstraint),l=fm(n,e.smoothConstraint);if(e.connectNulls){for(;0<a&&cm(i[a-1]);a--);for(;o<a&&cm(i[o]);o++);}for(;o<a;){var u=dm(t,i,o,a,a,1,s.min,s.max,e.smooth,r,e.connectNulls);dm(t,n,o+u-1,u,a,-1,l.min,l.max,e.stackedOnSmooth,r,e.connectNulls),o+=u+1,t.closePath()}}});function mm(t,e,i){var n=t.getArea(),o=t.getBaseAxis().isHorizontal(),a=n.x,r=n.y,s=n.width,l=n.height,u=i.get("lineStyle.width")||2,h=new is({shape:{x:a-=u/2,y:r-=u/2,width:s+=u,height:l+=u}});return e&&(h.shape[o?"width":"height"]=0,ll(h,{shape:{width:s,height:l}},i)),h}function vm(t,e,i){var n=t.getArea(),o=new Ur({shape:{cx:Nl(t.cx,1),cy:Nl(t.cy,1),r0:Nl(n.r0,1),r:Nl(n.r,1),startAngle:n.startAngle,endAngle:n.endAngle,clockwise:n.clockwise}});return e&&(o.shape.endAngle=n.startAngle,ll(o,{shape:{endAngle:n.endAngle}},i)),o}function ym(t,e,i){return t?"polar"===t.type?vm(t,e,i):"cartesian2d"===t.type?mm(t,e,i):null:null}function xm(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 _m(t){return"number"==typeof t?t:t?.5:0}function wm(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 u=[];switch(i){case"end":u[o]=s[o],u[1-o]=l[1-o],a.push(u);break;case"middle":var h=(l[o]+s[o])/2,c=[];u[o]=c[o]=h,u[1-o]=l[1-o],c[1-o]=s[1-o],a.push(u),a.push(c);break;default:u[o]=l[o],u[1-o]=s[1-o],a.push(u)}}return t[r]&&a.push(t[r]),a}function bm(t,e,i){var n=t.get("showAllSymbol"),o="auto"===n;if(!n||o){var a=i.getAxesByScale("ordinal")[0];if(a&&(!o||!function(t,e){var i=t.getExtent(),n=Math.abs(i[1]-i[0])/t.scale.count();isNaN(n)&&(n=0);for(var o=e.count(),a=Math.max(1,Math.round(o/5)),r=0;r<o;r+=a)if(1.5*Fg.getSymbolSize(e,r)[t.isHorizontal()?1:0]>n)return!1;return!0}(a,e))){var r=e.mapDimension(a.dim),s={};return E(a.getViewLabels(),function(t){s[t.tickValue]=1}),function(t){return!s.hasOwnProperty(e.get(r,t))}}}}function Sm(t,e,i){if("cartesian2d"!==t.type)return vm(t,e,i);var n=t.getBaseAxis().isHorizontal(),o=mm(t,e,i);if(!i.get("clip",!0)){var a=o.shape,r=Math.max(a.width,a.height);n?(a.y-=r,a.height+=2*r):(a.x-=r,a.width+=2*r)}return o}gc.extend({type:"line",init:function(){var t=new Ii,e=new $g;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(),r=t.getModel("lineStyle"),s=t.getModel("areaStyle"),l=a.mapArray(a.getItemLayout),u="polar"===n.type,h=this._coordSys,c=this._symbolDraw,d=this._polyline,f=this._polygon,p=this._lineGroup,g=t.get("animation"),m=!s.isEmpty(),v=s.get("origin"),y=function(t,e,i){if(!i.valueDim)return[];for(var n=[],o=0,a=e.count();o<a;o++)n.push(nm(i,t,e,o));return n}(n,a,im(n,a,v)),x=t.get("showSymbol"),_=x&&!u&&bm(t,a,n),w=this._data;w&&w.eachItemGraphicEl(function(t,e){t.__temp&&(o.remove(t),w.setItemGraphicEl(e,null))}),x||c.remove(),o.add(p);var b,S=!u&&t.get("step");n&&n.getArea&&t.get("clip",!0)&&(null!=(b=n.getArea()).width?(b.x-=.1,b.y-=.1,b.width+=.2,b.height+=.2):b.r0&&(b.r0-=.5,b.r1+=.5)),this._clipShapeForSymbol=b,d&&h.type===n.type&&S===this._step?(m&&!f?f=this._newPolygon(l,y,n,g):f&&!m&&(p.remove(f),f=this._polygon=null),p.setClipPath(Sm(n,!1,t)),x&&c.updateData(a,{isIgnore:_,clipShape:b}),a.eachItemGraphicEl(function(t){t.stopAnimation(!0)}),xm(this._stackedOnPoints,y)&&xm(this._points,l)||(g?this._updateAnimation(a,y,n,i,S,v):(S&&(l=wm(l,n,S),y=wm(y,n,S)),d.setShape({points:l}),f&&f.setShape({points:l,stackedOnPoints:y})))):(x&&c.updateData(a,{isIgnore:_,clipShape:b}),S&&(l=wm(l,n,S),y=wm(y,n,S)),d=this._newPolyline(l,n,g),m&&(f=this._newPolygon(l,y,n,g)),p.setClipPath(Sm(n,!0,t)));var M=function(t,e){var i=t.getVisual("visualMeta");if(i&&i.length&&t.count()&&"cartesian2d"===e.type){for(var n,o,a=i.length-1;0<=a;a--){var r=i[a].dimension,s=t.dimensions[r],l=t.getDimensionInfo(s);if("x"===(n=l&&l.coordDim)||"y"===n){o=i[a];break}}if(o){var u=e.getAxis(n),h=N(o.stops,function(t){return{coord:u.toGlobalCoord(u.dataToCoord(t.value)),color:t.color}}),c=h.length,d=o.outerColors.slice();c&&h[0].coord>h[c-1].coord&&(h.reverse(),d.reverse());var f=h[0].coord-10,p=h[c-1].coord+10,g=p-f;if(g<.001)return"transparent";E(h,function(t){t.offset=(t.coord-f)/g}),h.push({offset:c?h[c-1].offset:.5,color:d[1]||"transparent"}),h.unshift({offset:c?h[0].offset:.5,color:d[0]||"transparent"});var m=new cs(0,0,0,0,h,!0);return m[n]=f,m[n+"2"]=p,m}}}(a,n)||a.getVisual("color");d.useStyle(C(r.getLineStyle(),{fill:"none",stroke:M,lineJoin:"bevel"}));var I=t.get("smooth");if(I=_m(t.get("smooth")),d.setShape({smooth:I,smoothMonotone:t.get("smoothMonotone"),connectNulls:t.get("connectNulls")}),f){var T=a.getCalculationInfo("stackedOnSeries"),A=0;f.useStyle(C(s.getAreaStyle(),{fill:M,opacity:.7,lineJoin:"bevel"})),T&&(A=_m(T.get("smooth"))),f.setShape({smooth:I,stackedOnSmooth:A,smoothMonotone:t.get("smoothMonotone"),connectNulls:t.get("connectNulls")})}this._data=a,this._coordSys=n,this._stackedOnPoints=y,this._points=l,this._step=S,this._valueOrigin=v},dispose:function(){},highlight:function(t,e,i,n){var o=t.getData(),a=Ho(o,n);if(!(a instanceof Array)&&null!=a&&0<=a){var r=o.getItemGraphicEl(a);if(!r){var s=o.getItemLayout(a);if(!s)return;if(this._clipShapeForSymbol&&!this._clipShapeForSymbol.contain(s[0],s[1]))return;(r=new Fg(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 gc.prototype.highlight.call(this,t,e,i,n)},downplay:function(t,e,i,n){var o=t.getData(),a=Ho(o,n);if(null!=a&&0<=a){var r=o.getItemGraphicEl(a);r&&(r.__temp?(o.setItemGraphicEl(a,null),this.group.remove(r)):r.downplay())}else gc.prototype.downplay.call(this,t,e,i,n)},_newPolyline:function(t){var e=this._polyline;return e&&this._lineGroup.remove(e),e=new pm({shape:{points:t},silent:!0,z2:10}),this._lineGroup.add(e),this._polyline=e},_newPolygon:function(t,e){var i=this._polygon;return i&&this._lineGroup.remove(i),i=new gm({shape:{points:t,stackedOnPoints:e},silent:!0}),this._lineGroup.add(i),this._polygon=i},_updateAnimation:function(t,e,i,n,o,a){var r=this._polyline,s=this._polygon,l=t.hostModel,u=function(t,e,i,n,o,a,r,s){for(var l=function(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}(t,e),u=[],h=[],c=[],d=[],f=[],p=[],g=[],m=im(o,e,r),v=im(a,t,s),y=0;y<l.length;y++){var x=l[y],_=!0;switch(x.cmd){case"=":var w=t.getItemLayout(x.idx),b=e.getItemLayout(x.idx1);(isNaN(w[0])||isNaN(w[1]))&&(w=b.slice()),u.push(w),h.push(b),c.push(i[x.idx]),d.push(n[x.idx1]),g.push(e.getRawIndex(x.idx1));break;case"+":var S=x.idx;u.push(o.dataToPoint([e.get(m.dataDimsForPoint[0],S),e.get(m.dataDimsForPoint[1],S)])),h.push(e.getItemLayout(S).slice()),c.push(nm(m,o,e,S)),d.push(n[S]),g.push(e.getRawIndex(S));break;case"-":S=x.idx;var M=t.getRawIndex(S);M!==S?(u.push(t.getItemLayout(S)),h.push(a.dataToPoint([t.get(v.dataDimsForPoint[0],S),t.get(v.dataDimsForPoint[1],S)])),c.push(i[S]),d.push(nm(v,a,t,S)),g.push(M)):_=!1}_&&(f.push(x),p.push(p.length))}p.sort(function(t,e){return g[t]-g[e]});var I=[],T=[],A=[],D=[],C=[];for(y=0;y<p.length;y++){S=p[y];I[y]=u[S],T[y]=h[S],A[y]=c[S],D[y]=d[S],C[y]=f[S]}return{current:I,next:T,stackedOnCurrent:A,stackedOnNext:D,status:C}}(this._data,t,this._stackedOnPoints,e,this._coordSys,i,this._valueOrigin,a),h=u.current,c=u.stackedOnCurrent,d=u.next,f=u.stackedOnNext;o&&(h=wm(u.current,i,o),c=wm(u.stackedOnCurrent,i,o),d=wm(u.next,i,o),f=wm(u.stackedOnNext,i,o)),r.shape.__points=u.current,r.shape.points=h,sl(r,{shape:{points:d}},l),s&&(s.setShape({points:h,stackedOnPoints:c}),sl(s,{shape:{points:d,stackedOnPoints:f}},l));for(var p=[],g=u.status,m=0;m<g.length;m++){if("="===g[m].cmd){var v=t.getItemGraphicEl(g[m].idx1);v&&p.push({el:v,ptIdx:m})}}r.animators&&r.animators.length&&r.animators[0].during(function(){for(var t=0;t<p.length;t++){p[t].el.attr("position",r.shape.__points[p[t].ptIdx])}})},remove:function(t){var i=this.group,n=this._data;this._lineGroup.removeAll(),this._symbolDraw.remove(!0),n&&n.eachItemGraphicEl(function(t,e){t.__temp&&(i.remove(t),n.setItemGraphicEl(e,null))}),this._polyline=this._polygon=this._coordSys=this._points=this._stackedOnPoints=this._data=null}});function Mm(t,r,s){return{seriesType:t,performRawSeries:!0,reset:function(l,t,e){var i=l.getData(),u=l.get("symbol"),h=l.get("symbolSize"),n=l.get("symbolKeepAspect"),c=O(u),d=O(h),f=c||d,o=!c&&u?u:r,a=d?null:h;if(i.setVisual({legendSymbol:s||o,symbol:o,symbolSize:a,symbolKeepAspect:n}),!t.isSeriesFiltered(l))return{dataEach:i.hasItemOption||f?function(t,e){if(f){var i=l.getRawValue(e),n=l.getDataParams(e);c&&t.setItemVisual(e,"symbol",u(i,n)),d&&t.setItemVisual(e,"symbolSize",h(i,n))}if(t.hasItemOption){var o=t.getItemModel(e),a=o.getShallow("symbol",!0),r=o.getShallow("symbolSize",!0),s=o.getShallow("symbolKeepAspect",!0);null!=a&&t.setItemVisual(e,"symbol",a),null!=r&&t.setItemVisual(e,"symbolSize",r),null!=s&&t.setItemVisual(e,"symbolKeepAspect",s)}}:null}}}}function Im(t){return{seriesType:t,plan:dc(),reset:function(t){var e=t.getData(),c=t.coordinateSystem,d=t.pipelineContext.large;if(c){var f=N(c.dimensions,function(t){return e.mapDimension(t)}).slice(0,2),p=f.length,i=e.getCalculationInfo("stackResultDimension");return lp(e,f[0])&&(f[0]=i),lp(e,f[1])&&(f[1]=i),p&&{progress:function(t,e){for(var i=t.end-t.start,n=d&&new Float32Array(i*p),o=t.start,a=0,r=[],s=[];o<t.end;o++){var l;if(1===p){var u=e.get(f[0],o);l=!isNaN(u)&&c.dataToPoint(u,null,s)}else{u=r[0]=e.get(f[0],o);var h=r[1]=e.get(f[1],o);l=!isNaN(u)&&!isNaN(h)&&c.dataToPoint(r,null,s)}d?(n[a++]=l?l[0]:NaN,n[a++]=l?l[1]:NaN):e.setItemLayout(o,l&&l.slice()||[NaN,NaN])}d&&e.setLayout("symbolPoints",n)}}}}}}function Tm(t,e){return Math.round(t.length/2)}var Am={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 isFinite(e)?e:NaN},min:function(t){for(var e=1/0,i=0;i<t.length;i++)t[i]<e&&(e=t[i]);return isFinite(e)?e:NaN},nearest:function(t){return t[0]}};function Dm(t){return this._axes[t]}function Cm(t){this._axes={},this._dimList=[],this.name=t||""}function Lm(t){Cm.call(this,t)}Cm.prototype={constructor:Cm,type:"cartesian",getAxis:function(t){return this._axes[t]},getAxes:function(){return N(this._dimList,Dm,this)},getAxesByScale:function(e){return e=e.toLowerCase(),M(this.getAxes(),function(t){return t.scale.type===e})},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}},Lm.prototype={constructor:Lm,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||[])[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,n=this.getAxis("y").scale,o=i.getExtent(),a=n.getExtent(),r=i.parse(t[0]),s=n.parse(t[1]);return(e=e||[])[0]=Math.min(Math.max(Math.min(o[0],o[1]),r),Math.max(o[0],o[1])),e[1]=Math.min(Math.max(Math.min(a[0],a[1]),s),Math.max(a[0],a[1])),e},pointToData:function(t,e){var i=this.getAxis("x"),n=this.getAxis("y");return(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")},getArea:function(){var t=this.getAxis("x").getGlobalExtent(),e=this.getAxis("y").getGlobalExtent(),i=Math.min(t[0],t[1]),n=Math.min(e[0],e[1]);return new Mi(i,n,Math.max(t[0],t[1])-i,Math.max(e[0],e[1])-n)}},w(Lm,Cm);function km(t,e,i,n,o){Eg.call(this,t,e,i),this.type=n||"value",this.position=o||"bottom"}km.prototype={constructor:km,index:0,getAxesOnZeroOf:null,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()},pointToData:function(t,e){return this.coordToData(this.toLocalCoord(t["x"===this.dim?0:1]),e)},toLocalCoord:null,toGlobalCoord:null},w(km,Eg);var Pm={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)"]}}},Nm={};Nm.categoryAxis=m({boundaryGap:!0,deduplication:null,splitLine:{show:!1},axisTick:{alignWithLabel:!1,interval:"auto"},axisLabel:{interval:"auto"}},Pm),Nm.valueAxis=m({boundaryGap:[0,0],splitNumber:5,minorTick:{show:!1,splitNumber:5,length:3,lineStyle:{}},minorSplitLine:{show:!1,lineStyle:{color:"#eee",width:1}}},Pm),Nm.timeAxis=C({scale:!0,min:"dataMin",max:"dataMax"},Nm.valueAxis),Nm.logAxis=C({scale:!0,logBase:10},Nm.valueAxis);function Om(a,t,r,e){E(Em,function(o){t.extend({type:a+"Axis."+o,mergeDefaultAndTheme:function(t,e){var i=this.layoutMode,n=i?_u(t):{};m(t,e.getTheme().get(o+"Axis")),m(t,this.getDefaultOption()),t.type=r(a,t),i&&xu(t,n,i)},optionUpdated:function(){"category"===this.option.type&&(this.__ordinalMeta=dp.createByAxisModel(this))},getCategories:function(t){var e=this.option;if("category"===e.type)return t?e.data:this.__ordinalMeta.categories},getOrdinalMeta:function(){return this.__ordinalMeta},defaultOption:p([{},Nm[o+"Axis"],e],!0)})}),Tu.registerSubTypeDefaulter(a+"Axis",T(r,a))}var Em=["value","category","time","log"],zm=Tu.extend({type:"cartesian2dAxis",axis:null,init:function(){zm.superApply(this,"init",arguments),this.resetRange()},mergeOption:function(){zm.superApply(this,"mergeOption",arguments),this.resetRange()},restoreData:function(){zm.superApply(this,"restoreData",arguments),this.resetRange()},getCoordSysModel:function(){return this.ecModel.queryComponents({mainType:"grid",index:this.option.gridIndex,id:this.option.gridId})[0]}});function Rm(t,e){return e.type||(e.data?"category":"value")}m(zm.prototype,sg);var Bm={offset:0};function Vm(t,e){return t.getCoordSysModel()===e}function Gm(t,e,i){this._coordsMap={},this._coordsList=[],this._axesMap={},this._axesList=[],this._initCartesian(t,e,i),this.model=t}Om("x",zm,Rm,Bm),Om("y",zm,Rm,Bm),Tu.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 Fm=Gm.prototype;function Wm(t,e,i,n){i.getAxesOnZeroOf=function(){return o?[o]:[]};var o,a=t[e],r=i.model,s=r.get("axisLine.onZero"),l=r.get("axisLine.onZeroAxisIndex");if(s){if(null!=l)Hm(a[l])&&(o=a[l]);else for(var u in a)if(a.hasOwnProperty(u)&&Hm(a[u])&&!n[h(a[u])]){o=a[u];break}o&&(n[h(o)]=!0)}function h(t){return t.dim+"_"+t.index}}function Hm(t){return t&&"category"!==t.type&&"time"!==t.type&&function(t){var e=t.scale.getExtent(),i=e[0],n=e[1];return!(0<i&&0<n||i<0&&n<0)}(t)}Fm.type="grid",Fm.axisPointerEnabled=!0,Fm.getRect=function(){return this._rect},Fm.update=function(t,e){var i=this._axesMap;this._updateScale(t,this.model),E(i.x,function(t){eg(t.scale,t.model)}),E(i.y,function(t){eg(t.scale,t.model)});var n={};E(i.x,function(t){Wm(i,"y",t,n)}),E(i.y,function(t){Wm(i,"x",t,n)}),this.resize(this.model,e)},Fm.resize=function(t,e,i){var o=vu(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()});this._rect=o;var n=this._axesList;function a(){E(n,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]),function(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}}(t,e?o.x:o.y)})}a(),!i&&t.get("containLabel")&&(E(n,function(t){if(!t.model.get("axisLabel.inside")){var e=function(t){var e=t.model,i=t.scale;if(e.get("axisLabel.show")&&!i.isBlank()){var n,o,a="category"===t.type,r=i.getExtent();o=a?i.count():(n=i.getTicks()).length;var s,l,u,h,c,d,f,p,g,m=t.getLabelModel(),v=ng(t),y=1;40<o&&(y=Math.ceil(o/40));for(var x=0;x<o;x+=y){var _=v(n?n[x]:r[0]+x),w=m.getTextRect(_),b=(l=w,u=m.get("rotate")||0,void 0,h=u*Math.PI/180,c=l.plain(),d=c.width,f=c.height,p=d*Math.cos(h)+f*Math.sin(h),g=d*Math.sin(h)+f*Math.cos(h),new Mi(c.x,c.y,p,g));s?s.union(b):s=b}return s}}(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)}}}),a())},Fm.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]}},Fm.getAxes=function(){return this._axesList.slice()},Fm.getCartesian=function(t,e){if(null!=t&&null!=e){var i="x"+t+"y"+e;return this._coordsMap[i]}R(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]},Fm.getCartesians=function(){return this._coordsList.slice()},Fm.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},Fm.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},Fm._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,l=this._coordsList;if(o)_(l,i=o.coordinateSystem)<0&&(i=null);else if(a&&r)i=this.getCartesian(a.componentIndex,r.componentIndex);else if(a)n=this.getAxis("x",a.componentIndex);else if(r)n=this.getAxis("y",r.componentIndex);else if(s){s.coordinateSystem===this&&(i=this._coordsList[0])}return{cartesian:i,axis:n}},Fm.containPoint=function(t){var e=this._coordsList[0];if(e)return e.containPoint(t)},Fm._initCartesian=function(r,t,e){var s={left:!1,right:!1,top:!1,bottom:!1},l={x:{},y:{}},u={x:0,y:0};if(t.eachComponent("xAxis",i("x"),this),t.eachComponent("yAxis",i("y"),this),!u.x||!u.y)return this._axesMap={},void(this._axesList=[]);function i(a){return function(t,e){if(Vm(t,r)){var i=t.get("position");"x"===a?"top"!==i&&"bottom"!==i&&(i=s.bottom?"top":"bottom"):"left"!==i&&"right"!==i&&(i=s.left?"right":"left"),s[i]=!0;var n=new km(a,ig(t),[0,0],t.get("type"),i),o="category"===n.type;n.onBand=o&&t.get("boundaryGap"),n.inverse=t.get("inverse"),(t.axis=n).model=t,n.grid=this,n.index=e,this._axesList.push(n),l[a][e]=n,u[a]++}}}E((this._axesMap=l).x,function(o,a){E(l.y,function(t,e){var i="x"+a+"y"+e,n=new Lm(i);n.grid=this,n.model=r,this._coordsMap[i]=n,this._coordsList.push(n),n.addAxis(o),n.addAxis(t)},this)},this)},Fm._updateScale=function(l,u){function h(e,i){E(e.mapDimension(i.dim,!0),function(t){i.scale.unionExtentFromData(e,up(e,t))})}E(this._axesList,function(t){t.scale.setExtent(1/0,-1/0)}),l.eachSeries(function(t){if(Xm(t)){var e=Um(t,l),i=e[0],n=e[1];if(!Vm(i,u)||!Vm(n,u))return;var o=this.getCartesian(i.componentIndex,n.componentIndex),a=t.getData(),r=o.getAxis("x"),s=o.getAxis("y");"list"===a.type&&(h(a,r,t),h(a,s,t))}},this)},Fm.getTooltipAxes=function(n){var o=[],a=[];return E(this.getCartesians(),function(t){var e=null!=n&&"auto"!==n?t.getAxis(n):t.getBaseAxis(),i=t.getOtherAxis(e);_(o,e)<0&&o.push(e),_(a,i)<0&&a.push(i)}),{baseAxes:o,otherAxes:a}};var Zm=["xAxis","yAxis"];function Um(e){return N(Zm,function(t){return e.getReferringComponents(t)[0]})}function Xm(t){return"cartesian2d"===t.get("coordinateSystem")}Gm.create=function(n,o){var a=[];return n.eachComponent("grid",function(t,e){var i=new Gm(t,n,o);i.name="grid_"+e,i.resize(t,o,!0),t.coordinateSystem=i,a.push(i)}),n.eachSeries(function(t){if(Xm(t)){var e=Um(t),i=e[0],n=e[1],o=i.getCoordSysModel().coordinateSystem;t.coordinateSystem=o.getCartesian(i.componentIndex,n.componentIndex)}}),a},Gm.dimensions=Gm.prototype.dimensions=Lm.prototype.dimensions,nh.register("cartesian2d",Gm);function Ym(t,e){this.opt=e,this.axisModel=t,C(e,{labelOffset:0,nameDirection:1,tickDirection:1,labelDirection:1,silent:!0}),this.group=new Ii;var i=new Ii({position:e.position.slice(),rotation:e.rotation});i.updateTransform(),this._transform=i.transform,this._dumbGroup=i}var jm=Math.PI;Ym.prototype={constructor:Ym,hasBuilder:function(t){return!!qm[t]},add:function(t){qm[t].call(this)},getGroup:function(){return this.group}};var qm={axisLine:function(){var a=this.opt,t=this.axisModel;if(t.get("axisLine.show")){var e=this.axisModel.axis.getExtent(),i=this._transform,r=[e[0],0],n=[e[1],0];i&&(bt(r,r,i),bt(n,n,i));var s=L({lineCap:"round"},t.getModel("axisLine.lineStyle").getLineStyle());this.group.add(new os({anid:"line",subPixelOptimize:!0,shape:{x1:r[0],y1:r[1],x2:n[0],y2:n[1]},style:s,strokeContainThreshold:a.strokeContainThreshold||5,silent:!0,z2:1}));var l=t.get("axisLine.symbol"),o=t.get("axisLine.symbolSize"),u=t.get("axisLine.symbolOffset")||0;if("number"==typeof u&&(u=[u,u]),null!=l){"string"==typeof l&&(l=[l,l]),"string"!=typeof o&&"number"!=typeof o||(o=[o,o]);var h=o[0],c=o[1];E([{rotate:a.rotation+Math.PI/2,offset:u[0],r:0},{rotate:a.rotation-Math.PI/2,offset:u[1],r:Math.sqrt((r[0]-n[0])*(r[0]-n[0])+(r[1]-n[1])*(r[1]-n[1]))}],function(t,e){if("none"!==l[e]&&null!=l[e]){var i=mg(l[e],-h/2,-c/2,h,c,s.stroke,!0),n=t.r+t.offset,o=[r[0]+n*Math.cos(a.rotation),r[1]-n*Math.sin(a.rotation)];i.attr({rotation:t.rotate,position:o,silent:!0,z2:11}),this.group.add(i)}},this)}}},axisTickLabel:function(){var t=this.axisModel,e=this.opt,i=function(t,e,i){var n=e.axis,o=e.getModel("axisTick");if(!o.get("show")||n.scale.isBlank())return;for(var a=o.getModel("lineStyle"),r=i.tickDirection*o.get("length"),s=iv(n.getTicksCoords(),t._transform,r,C(a.getLineStyle(),{stroke:e.get("axisLine.lineStyle.color")}),"ticks"),l=0;l<s.length;l++)t.group.add(s[l]);return s}(this,t,e);!function(t,e,i){if(rg(t.axis))return;var n=t.get("axisLabel.showMinLabel"),o=t.get("axisLabel.showMaxLabel");i=i||[];var a=(e=e||[])[0],r=e[1],s=e[e.length-1],l=e[e.length-2],u=i[0],h=i[1],c=i[i.length-1],d=i[i.length-2];!1===n?(Qm(a),Qm(u)):tv(a,r)&&(n?(Qm(r),Qm(h)):(Qm(a),Qm(u)));!1===o?(Qm(s),Qm(c)):tv(l,s)&&(o?(Qm(l),Qm(d)):(Qm(s),Qm(c)))}(t,function(u,h,c){var d=h.axis;if(!W(c.axisLabelShow,h.get("axisLabel.show"))||d.scale.isBlank())return;var f=h.getModel("axisLabel"),p=f.get("margin"),t=d.getViewLabels(),e=(W(c.labelRotate,f.get("rotate"))||0)*jm/180,g=$m(c.rotation,e,c.labelDirection),m=h.getCategories&&h.getCategories(!0),v=[],y=Jm(h),x=h.get("triggerEvent");return E(t,function(t,e){var i=t.tickValue,n=t.formattedLabel,o=t.rawLabel,a=f;m&&m[i]&&m[i].textStyle&&(a=new Il(m[i].textStyle,f,h.ecModel));var r=a.getTextColor()||h.get("axisLine.lineStyle.color"),s=[d.dataToCoord(i),c.labelOffset+c.labelDirection*p],l=new Fr({anid:"label_"+i,position:s,rotation:g.rotation,silent:y,z2:10});Qs(l.style,a,{text:n,textAlign:a.getShallow("align",!0)||g.textAlign,textVerticalAlign:a.getShallow("verticalAlign",!0)||a.getShallow("baseline",!0)||g.textVerticalAlign,textFill:"function"==typeof r?r("category"===d.type?o:"value"===d.type?i+"":i,e):r}),x&&(l.eventData=Km(h),l.eventData.targetType="axisLabel",l.eventData.value=o),u._dumbGroup.add(l),l.updateTransform(),v.push(l),u.group.add(l),l.decomposeTransform()}),v}(this,t,e),i),function(t,e,i){var n=e.axis,o=e.getModel("minorTick");if(!o.get("show")||n.scale.isBlank())return;var a=n.getMinorTicksCoords();if(!a.length)return;for(var r=o.getModel("lineStyle"),s=i.tickDirection*o.get("length"),l=C(r.getLineStyle(),C(e.getModel("axisTick").getLineStyle(),{stroke:e.get("axisLine.lineStyle.color")})),u=0;u<a.length;u++)for(var h=iv(a[u],t._transform,s,l,"minorticks_"+u),c=0;c<h.length;c++)t.group.add(h[c])}(this,t,e)},axisName:function(){var t=this.opt,e=this.axisModel,i=W(t.axisName,e.get("name"));if(i){var n,o,a=e.get("nameLocation"),r=t.nameDirection,s=e.getModel("nameTextStyle"),l=e.get("nameGap")||0,u=this.axisModel.axis.getExtent(),h=u[0]>u[1]?-1:1,c=["start"===a?u[0]-h*l:"end"===a?u[1]+h*l:(u[0]+u[1])/2,ev(a)?t.labelOffset+r*l:0],d=e.get("nameRotate");null!=d&&(d=d*jm/180),ev(a)?n=$m(t.rotation,null!=d?d:t.rotation,r):(n=function(t,e,i,n){var o,a,r=Gl(i-t.rotation),s=n[0]>n[1],l="start"===e&&!s||"start"!==e&&s;o=Fl(r-jm/2)?(a=l?"bottom":"top","center"):Fl(r-1.5*jm)?(a=l?"top":"bottom","center"):(a="middle",r<1.5*jm&&jm/2<r?l?"left":"right":l?"right":"left");return{rotation:r,textAlign:o,textVerticalAlign:a}}(t,a,d||0,u),null!=(o=t.axisNameAvailableWidth)&&(o=Math.abs(o/Math.sin(n.rotation)),isFinite(o)||(o=null)));var f=s.getFont(),p=e.get("nameTruncate",!0)||{},g=p.ellipsis,m=W(t.nameTruncateMaxWidth,p.maxWidth,o),v=null!=g&&null!=m?hu(i,m,f,g,{minChar:2,placeholder:p.placeholder}):i,y=e.get("tooltip",!0),x=e.mainType,_={componentType:x,name:i,$vars:["name"]};_[x+"Index"]=e.componentIndex;var w=new Fr({anid:"name",__fullText:i,__truncatedText:v,position:c,rotation:n.rotation,silent:Jm(e),z2:1,tooltip:y&&y.show?L({content:i,formatter:function(){return i},formatterParams:_},y):null});Qs(w.style,s,{text:v,textFont:f,textFill:s.getTextColor()||e.get("axisLine.lineStyle.color"),textAlign:s.get("align")||n.textAlign,textVerticalAlign:s.get("verticalAlign")||n.textVerticalAlign}),e.get("triggerEvent")&&(w.eventData=Km(e),w.eventData.targetType="axisName",w.eventData.name=i),this._dumbGroup.add(w),w.updateTransform(),this.group.add(w),w.decomposeTransform()}}},Km=Ym.makeAxisEventDataBase=function(t){var e={componentType:t.mainType,componentIndex:t.componentIndex};return e[t.mainType+"Index"]=t.componentIndex,e},$m=Ym.innerTextLayout=function(t,e,i){var n,o=Gl(e-t);return{rotation:o,textAlign:Fl(o)?(n=0<i?"top":"bottom","center"):Fl(o-jm)?(n=0<i?"bottom":"top","center"):(n="middle",0<o&&o<jm?0<i?"right":"left":0<i?"left":"right"),textVerticalAlign:n}};var Jm=Ym.isLabelSilent=function(t){var e=t.get("tooltip");return t.get("silent")||!(t.get("triggerEvent")||e&&e.show)};function Qm(t){t&&(t.ignore=!0)}function tv(t,e){var i=t&&t.getBoundingRect().clone(),n=e&&e.getBoundingRect().clone();if(i&&n){var o=ie([]);return re(o,o,-t.rotation),i.applyTransform(oe([],o,t.getLocalTransform())),n.applyTransform(oe([],o,e.getLocalTransform())),i.intersect(n)}}function ev(t){return"middle"===t||"center"===t}function iv(t,e,i,n,o){for(var a=[],r=[],s=[],l=0;l<t.length;l++){var u=t[l].coord;r[0]=u,s[r[1]=0]=u,s[1]=i,e&&(bt(r,r,e),bt(s,s,e));var h=new os({anid:o+"_"+t[l].tickValue,subPixelOptimize:!0,shape:{x1:r[0],y1:r[1],x2:s[0],y2:s[1]},style:n,z2:2,silent:!0});a.push(h)}return a}var nv=E,ov=T;function av(t,e){var i={axesInfo:{},seriesInvolved:!1,coordSysAxesInfo:{},coordSysMap:{}};return function(p,g,t){var a=g.getComponent("tooltip"),m=g.getComponent("axisPointer"),v=m.get("link",!0)||[],y=[];nv(t.getCoordinateSystems(),function(c){if(c.axisPointerEnabled){var t=uv(c.model),d=p.coordSysAxesInfo[t]={},f=(p.coordSysMap[t]=c).model.getModel("tooltip",a);if(nv(c.getAxes(),ov(o,!1,null)),c.getTooltipAxes&&a&&f.get("show")){var e="axis"===f.get("trigger"),i="cross"===f.get("axisPointer.type"),n=c.getTooltipAxes(f.get("axisPointer.axis"));(e||i)&&nv(n.baseAxes,ov(o,!i||"cross",e)),i&&nv(n.otherAxes,ov(o,"cross",!1))}}function o(t,e,i){var n=i.model.getModel("axisPointer",m),o=n.get("show");if(o&&("auto"!==o||t||lv(n))){null==e&&(e=n.get("triggerTooltip"));var a=(n=t?function(t,e,i,n,o,a){var r=e.getModel("axisPointer"),s={};nv(["type","snap","lineStyle","shadowStyle","label","animation","animationDurationUpdate","animationEasingUpdate","z"],function(t){s[t]=D(r.get(t))}),s.snap="category"!==t.type&&!!a,"cross"===r.get("type")&&(s.type="line");var l=s.label||(s.label={});if(null==l.show&&(l.show=!1),"cross"===o){var u=r.get("label.show");if(l.show=null==u||u,!a){var h=s.lineStyle=r.get("crossStyle");h&&C(l,h.textStyle)}}return t.model.getModel("axisPointer",new Il(s,i,n))}(i,f,m,g,t,e):n).get("snap"),r=uv(i.model),s=e||a||"category"===i.type,l=p.axesInfo[r]={key:r,axis:i,coordSys:c,axisPointerModel:n,triggerTooltip:e,involveSeries:s,snap:a,useHandle:lv(n),seriesModels:[]};d[r]=l,p.seriesInvolved|=s;var u=function(t,e){for(var i=e.model,n=e.dim,o=0;o<t.length;o++){var a=t[o]||{};if(rv(a[n+"AxisId"],i.id)||rv(a[n+"AxisIndex"],i.componentIndex)||rv(a[n+"AxisName"],i.name))return o}}(v,i);if(null!=u){var h=y[u]||(y[u]={axesInfo:{}});h.axesInfo[r]=l,h.mapper=v[u].mapper,l.linkGroup=h}}}})}(i,t,e),i.seriesInvolved&&function(o,t){t.eachSeries(function(i){var n=i.coordinateSystem,t=i.get("tooltip.trigger",!0),e=i.get("tooltip.show",!0);n&&"none"!==t&&!1!==t&&"item"!==t&&!1!==e&&!1!==i.get("axisPointer.show",!0)&&nv(o.coordSysAxesInfo[uv(n.model)],function(t){var e=t.axis;n.getAxis(e.dim)===e&&(t.seriesModels.push(i),null==t.seriesDataCount&&(t.seriesDataCount=0),t.seriesDataCount+=i.getData().count())})},this)}(i,t),i}function rv(t,e){return"all"===t||k(t)&&0<=_(t,e)||t===e}function sv(t){var e=(t.ecModel.getComponent("axisPointer")||{}).coordSysAxesInfo;return e&&e.axesInfo[uv(t)]}function lv(t){return!!t.get("handle.show")}function uv(t){return t.type+"||"+t.id}var hv=bf({type:"axis",_axisPointer:null,axisPointerClass:null,render:function(t,e,i,n){this.axisPointerClass&&function(t){var e=sv(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=lv(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")}}(t),hv.superApply(this,"render",arguments),cv(this,t,e,i,n,!0)},updateAxisPointer:function(t,e,i,n,o){cv(this,t,e,i,n,!1)},remove:function(t,e){var i=this._axisPointer;i&&i.remove(e),hv.superApply(this,"remove",arguments)},dispose:function(t,e){dv(this,e),hv.superApply(this,"dispose",arguments)}});function cv(t,e,i,n,o,a){var r=hv.getAxisPointerClass(t.axisPointerClass);if(r){var s=function(t){var e=sv(t);return e&&e.axisPointerModel}(e);s?(t._axisPointer||(t._axisPointer=new r)).render(e,s,n,a):dv(t,n)}}function dv(t,e,i){var n=t._axisPointer;n&&n.dispose(e,i),t._axisPointer=null}var fv=[];function pv(t,e,i){i=i||{};var n=t.coordinateSystem,o=e.axis,a={},r=o.getAxesOnZeroOf()[0],s=o.position,l=r?"onZero":s,u=o.dim,h=n.getRect(),c=[h.x,h.x+h.width,h.y,h.y+h.height],d={left:0,right:1,top:0,bottom:1,onZero:2},f=e.get("offset")||0,p="x"===u?[c[2]-f,c[3]+f]:[c[0]-f,c[1]+f];if(r){var g=r.toGlobalCoord(r.dataToCoord(0));p[d.onZero]=Math.max(Math.min(g,p[1]),p[0])}a.position=["y"===u?p[d[l]]:c[0],"x"===u?p[d[l]]:c[3]],a.rotation=Math.PI/2*("x"===u?0:1);a.labelDirection=a.tickDirection=a.nameDirection={top:-1,bottom:1,left:-1,right:1}[s],a.labelOffset=r?p[d[s]]-p[d.onZero]:0,e.get("axisTick.inside")&&(a.tickDirection=-a.tickDirection),W(i.labelInside,e.get("axisLabel.inside"))&&(a.labelDirection=-a.labelDirection);var m=e.get("axisLabel.rotate");return a.labelRotate="top"===l?-m:m,a.z2=1,a}hv.registerAxisPointerClass=function(t,e){fv[t]=e},hv.getAxisPointerClass=function(t){return t&&fv[t]};var gv=["axisLine","axisTickLabel","axisName"],mv=["splitArea","splitLine","minorSplitLine"],vv=hv.extend({type:"cartesianAxis",axisPointerClass:"CartesianAxisPointer",render:function(e,t,i,n){this.group.removeAll();var o=this._axisGroup;if(this._axisGroup=new Ii,this.group.add(this._axisGroup),e.get("show")){var a=e.getCoordSysModel(),r=pv(a,e),s=new Ym(e,r);E(gv,s.add,s),this._axisGroup.add(s.getGroup()),E(mv,function(t){e.get(t+".show")&&this["_"+t](e,a)},this),dl(o,this._axisGroup,e),vv.superCall(this,"render",e,t,i,n)}},remove:function(){this._splitAreaColors=null},_splitLine:function(t,e){var i=t.axis;if(!i.scale.isBlank()){var n=t.getModel("splitLine"),o=n.getModel("lineStyle"),a=o.get("color");a=k(a)?a:[a];for(var r=e.coordinateSystem.getRect(),s=i.isHorizontal(),l=0,u=i.getTicksCoords({tickModel:n}),h=[],c=[],d=o.getLineStyle(),f=0;f<u.length;f++){var p=i.toGlobalCoord(u[f].coord);s?(h[0]=p,h[1]=r.y,c[0]=p,c[1]=r.y+r.height):(h[0]=r.x,h[1]=p,c[0]=r.x+r.width,c[1]=p);var g=l++%a.length,m=u[f].tickValue;this._axisGroup.add(new os({anid:null!=m?"line_"+u[f].tickValue:null,subPixelOptimize:!0,shape:{x1:h[0],y1:h[1],x2:c[0],y2:c[1]},style:C({stroke:a[g]},d),silent:!0}))}}},_minorSplitLine:function(t,e){var i=t.axis,n=t.getModel("minorSplitLine").getModel("lineStyle"),o=e.coordinateSystem.getRect(),a=i.isHorizontal(),r=i.getMinorTicksCoords();if(r.length)for(var s=[],l=[],u=n.getLineStyle(),h=0;h<r.length;h++)for(var c=0;c<r[h].length;c++){var d=i.toGlobalCoord(r[h][c].coord);a?(s[0]=d,s[1]=o.y,l[0]=d,l[1]=o.y+o.height):(s[0]=o.x,s[1]=d,l[0]=o.x+o.width,l[1]=d),this._axisGroup.add(new os({anid:"minor_line_"+r[h][c].tickValue,subPixelOptimize:!0,shape:{x1:s[0],y1:s[1],x2:l[0],y2:l[1]},style:u,silent:!0}))}},_splitArea:function(t,e){var i=t.axis;if(!i.scale.isBlank()){var n=t.getModel("splitArea"),o=n.getModel("areaStyle"),a=o.get("color"),r=e.coordinateSystem.getRect(),s=i.getTicksCoords({tickModel:n,clamp:!0});if(s.length){var l=a.length,u=this._splitAreaColors,h=Q(),c=0;if(u)for(var d=0;d<s.length;d++){var f=u.get(s[d].tickValue);if(null!=f){c=(f+(l-1)*d)%l;break}}var p=i.toGlobalCoord(s[0].coord),g=o.getAreaStyle();a=k(a)?a:[a];for(d=1;d<s.length;d++){var m,v,y,x,_=i.toGlobalCoord(s[d].coord);p=i.isHorizontal()?(m=p,v=r.y,y=_-m,x=r.height,m+y):(m=r.x,v=p,y=r.width,v+(x=_-v));var w=s[d-1].tickValue;null!=w&&h.set(w,c),this._axisGroup.add(new is({anid:null!=w?"area_"+w:null,shape:{x:m,y:v,width:y,height:x},style:C({fill:a[c]},g),silent:!0})),c=(c+1)%l}this._splitAreaColors=h}}}});vv.extend({type:"xAxis"}),vv.extend({type:"yAxis"}),bf({type:"grid",render:function(t,e){this.group.removeAll(),t.get("show")&&this.group.add(new is({shape:t.coordinateSystem.getRect(),style:C({fill:t.get("backgroundColor")},t.getItemStyle()),silent:!0,z2:-1}))}}),ff(function(t){t.xAxis&&t.yAxis&&!t.grid&&(t.grid={})}),yf(Mm("line","circle","line")),vf(Im("line")),pf(Id.PROCESSOR.STATISTIC,{seriesType:"line",modifyOutputEnd:!0,reset:function(t,e,i){var n=t.getData(),o=t.get("sampling"),a=t.coordinateSystem;if("cartesian2d"===a.type&&o){var r,s=a.getBaseAxis(),l=a.getOtherAxis(s),u=s.getExtent(),h=u[1]-u[0],c=Math.round(n.count()/h);1<c&&("string"==typeof o?r=Am[o]:"function"==typeof o&&(r=o),r&&t.setData(n.downSample(n.mapDimension(l.dim),1/c,r,Tm)))}}});var yv=ic.extend({type:"series.__base_bar__",getInitialData:function(t,e){return hp(this.getSource(),this,{useEncodeDefaulter:!0})},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,large:!1,largeThreshold:400,progressive:3e3,progressiveChunkMode:"mod",itemStyle:{},emphasis:{}}});function xv(t,e,i,n,o,a){$s(t,e,i.getModel("label"),i.getModel("emphasis.label"),{labelFetcher:o,labelDataIndex:a,defaultText:Gg(o.getData(),a),isRectText:!0,autoColor:n}),_v(t),_v(e)}function _v(t,e){"outside"===t.textPosition&&(t.textPosition=e)}yv.extend({type:"series.bar",dependencies:["grid","polar"],brushSelector:"rect",getProgressive:function(){return!!this.get("large")&&this.get("progressive")},getProgressiveThreshold:function(){var t=this.get("progressiveThreshold"),e=this.get("largeThreshold");return t<e&&(t=e),t},defaultOption:{clip:!0,roundCap:!1}});var wv=ra([["fill","color"],["stroke","borderColor"],["lineWidth","borderWidth"],["stroke","barBorderColor"],["lineWidth","barBorderWidth"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),bv={getBarItemStyle:function(t){var e=wv(this,t);if(this.getBorderLineDash){var i=this.getBorderLineDash();i&&(e.lineDash=i)}return e}},Sv=Is({type:"sausage",shape:{cx:0,cy:0,r0:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},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=.5*(a-o),s=o+r,l=e.startAngle,u=e.endAngle,h=e.clockwise,c=Math.cos(l),d=Math.sin(l),f=Math.cos(u),p=Math.sin(u);(h?u-l<2*Math.PI:l-u<2*Math.PI)&&(t.moveTo(c*o+i,d*o+n),t.arc(c*s+i,d*s+n,r,-Math.PI+l,l,!h)),t.arc(i,n,a,l,u,!h),t.moveTo(f*a+i,p*a+n),t.arc(f*s+i,p*s+n,r,u-2*Math.PI,u-Math.PI,!h),0!==o&&(t.arc(i,n,o,u,l,h),t.moveTo(c*o+i,p*o+n)),t.closePath()}}),Mv=["itemStyle","barBorderWidth"],Iv=[0,0];L(Il.prototype,bv),Mf({type:"bar",render:function(t,e,i){this._updateDrawMode(t);var n=t.get("coordinateSystem");return"cartesian2d"!==n&&"polar"!==n||(this._isLargeDraw?this._renderLarge(t,e,i):this._renderNormal(t,e,i)),this.group},incrementalPrepareRender:function(t,e,i){this._clear(),this._updateDrawMode(t)},incrementalRender:function(t,e,i,n){this._incrementalRenderLarge(t,e)},_updateDrawMode:function(t){var e=t.pipelineContext.large;(null==this._isLargeDraw||e^this._isLargeDraw)&&(this._isLargeDraw=e,this._clear())},_renderNormal:function(a,t,e){var r,s=this.group,l=a.getData(),u=this._data,h=a.coordinateSystem,i=h.getBaseAxis();"cartesian2d"===h.type?r=i.isHorizontal():"polar"===h.type&&(r="angle"===i.dim);var c=a.isAnimationEnabled()?a:null,d=a.get("clip",!0),f=function(t,e){var i=t.getArea&&t.getArea();if("cartesian2d"===t.type){var n=t.getBaseAxis();if("category"!==n.type||!n.onBand){var o=e.getLayout("bandWidth");n.isHorizontal()?(i.x-=o,i.width+=2*o):(i.y-=o,i.height+=2*o)}}return i}(h,l);s.removeClipPath();var p=a.get("roundCap",!0);l.diff(u).add(function(t){if(l.hasValue(t)){var e=l.getItemModel(t),i=Pv[h.type](l,t,e);if(d)if(Dv[h.type](f,i))return void s.remove(n);var n=Cv[h.type](t,i,r,c,!1,p);l.setItemGraphicEl(t,n),s.add(n),Ov(n,l,t,e,i,a,r,"polar"===h.type)}}).update(function(t,e){var i=u.getItemGraphicEl(e);if(l.hasValue(t)){var n=l.getItemModel(t),o=Pv[h.type](l,t,n);if(d)if(Dv[h.type](f,o))return void s.remove(i);i?sl(i,{shape:o},c,t):i=Cv[h.type](t,o,r,c,!0,p),l.setItemGraphicEl(t,i),s.add(i),Ov(i,l,t,n,o,a,r,"polar"===h.type)}else s.remove(i)}).remove(function(t){var e=u.getItemGraphicEl(t);"cartesian2d"===h.type?e&&Lv(t,c,e):e&&kv(t,c,e)}).execute(),this._data=l},_renderLarge:function(t,e,i){this._clear(),zv(t,this.group);var n=t.get("clip",!0)?ym(t.coordinateSystem,!1,t):null;n?this.group.setClipPath(n):this.group.removeClipPath()},_incrementalRenderLarge:function(t,e){zv(e,this.group,!0)},dispose:et,remove:function(t){this._clear(t)},_clear:function(e){var t=this.group,i=this._data;e&&e.get("animation")&&i&&!this._isLargeDraw?i.eachItemGraphicEl(function(t){"sector"===t.type?kv(t.dataIndex,e,t):Lv(t.dataIndex,e,t)}):t.removeAll(),this._data=null}});var Tv=Math.max,Av=Math.min,Dv={cartesian2d:function(t,e){var i=e.width<0?-1:1,n=e.height<0?-1:1;i<0&&(e.x+=e.width,e.width=-e.width),n<0&&(e.y+=e.height,e.height=-e.height);var o=Tv(e.x,t.x),a=Av(e.x+e.width,t.x+t.width),r=Tv(e.y,t.y),s=Av(e.y+e.height,t.y+t.height);e.x=o,e.y=r,e.width=a-o,e.height=s-r;var l=e.width<0||e.height<0;return i<0&&(e.x+=e.width,e.width=-e.width),n<0&&(e.y+=e.height,e.height=-e.height),l},polar:function(t){return!1}},Cv={cartesian2d:function(t,e,i,n,o){var a=new is({shape:L({},e)});if(n){var r=i?"height":"width",s={};a.shape[r]=0,s[r]=e[r],yl[o?"updateProps":"initProps"](a,{shape:s},n,t)}return a},polar:function(t,e,i,n,o,a){var r=e.startAngle<e.endAngle,s=new(!i&&a?Sv:Ur)({shape:C({clockwise:r},e)});if(n){var l=i?"r":"endAngle",u={};s.shape[l]=i?0:e.startAngle,u[l]=e[l],yl[o?"updateProps":"initProps"](s,{shape:u},n,t)}return s}};function Lv(t,e,i){i.style.text=null,sl(i,{shape:{width:0}},e,t,function(){i.parent&&i.parent.remove(i)})}function kv(t,e,i){i.style.text=null,sl(i,{shape:{r:i.shape.r0}},e,t,function(){i.parent&&i.parent.remove(i)})}var Pv={cartesian2d:function(t,e,i){var n=t.getItemLayout(e),o=function(t,e){var i=t.get(Mv)||0;return Math.min(i,Math.abs(e.width),Math.abs(e.height))}(i,n),a=0<n.width?1:-1,r=0<n.height?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}}};function Nv(t){return null!=t.startAngle&&null!=t.endAngle&&t.startAngle===t.endAngle}function Ov(t,e,i,n,o,a,r,s){var l=e.getItemVisual(i,"color"),u=e.getItemVisual(i,"opacity"),h=e.getVisual("borderColor"),c=n.getModel("itemStyle"),d=n.getModel("emphasis.itemStyle").getBarItemStyle();s||t.setShape("r",c.get("barBorderRadius")||0),t.useStyle(C({stroke:Nv(o)?"none":h,fill:Nv(o)?"none":l,opacity:u},c.getBarItemStyle()));var f=n.getShallow("cursor");f&&t.attr("cursor",f);r?o.height:o.width;s||xv(t.style,d,n,l,a,i),Nv(o)&&(d.fill=d.stroke="none"),Ys(t,d)}var Ev=Sr.extend({type:"largeBar",shape:{points:[]},buildPath:function(t,e){for(var i=e.points,n=this.__startPoint,o=this.__baseDimIdx,a=0;a<i.length;a+=2)n[o]=i[a+o],t.moveTo(n[0],n[1]),t.lineTo(i[a],i[a+1])}});function zv(t,e,i){var n=t.getData(),o=[],a=n.getLayout("valueAxisHorizontal")?1:0;o[1-a]=n.getLayout("valueAxisStart");var r=new Ev({shape:{points:n.getLayout("largePoints")},incremental:!!i,__startPoint:o,__baseDimIdx:a,__largeDataIndices:n.getLayout("largeDataIndices"),__barWidth:n.getLayout("barWidth")});e.add(r),function(t,e,i){var n=i.getVisual("borderColor")||i.getVisual("color"),o=e.getModel("itemStyle").getItemStyle(["color","borderColor"]);t.useStyle(o),t.style.fill=null,t.style.stroke=n,t.style.lineWidth=i.getLayout("barWidth")}(r,t,n),r.seriesIndex=t.seriesIndex,t.get("silent")||(r.on("mousedown",Rv),r.on("mousemove",Rv))}var Rv=Ic(function(t){var e=function(t,e,i){var n=t.__baseDimIdx,o=1-n,a=t.shape.points,r=t.__largeDataIndices,s=Math.abs(t.__barWidth/2),l=t.__startPoint[o];Iv[0]=e,Iv[1]=i;for(var u=Iv[n],h=Iv[1-n],c=u-s,d=u+s,f=0,p=a.length/2;f<p;f++){var g=2*f,m=a[g+n],v=a[g+o];if(c<=m&&m<=d&&(l<=v?l<=h&&h<=v:v<=h&&h<=l))return r[f]}return-1}(this,t.offsetX,t.offsetY);this.dataIndex=0<=e?e:null},30,!1);vf(Id.VISUAL.LAYOUT,T(Pp,"bar")),vf(Id.VISUAL.PROGRESSIVE_LAYOUT,Np),yf({seriesType:"bar",reset:function(t){t.getData().setVisual("legendSymbol","roundRect")}});function Bv(t,e,i){e=k(e)&&{coordDimensions:e}||L({},e);var n=t.getSource(),o=np(n,e),a=new Wf(o,t);return a.initData(n,i),a}var Vv={updateSelectedMap:function(t){this._targetList=k(t)?t.slice():[],this._selectTargetMap=S(t||[],function(t,e){return t.set(e.name,e),t},Q())},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}};function Gv(i,e){this.getAllNames=function(){var t=e();return t.mapArray(t.getName)},this.containName=function(t){return 0<=e().indexOfName(t)},this.indexOfName=function(t){return i().indexOfName(t)},this.getItemVisual=function(t,e){return i().getItemVisual(t,e)}}var Fv=Sf({type:"series.pie",init:function(t){Fv.superApply(this,"init",arguments),this.legendVisualProvider=new Gv(A(this.getData,this),A(this.getRawData,this)),this.updateSelectedMap(this._createSelectableList()),this._defaultLabelLine(t)},mergeOption:function(t){Fv.superCall(this,"mergeOption",t),this.updateSelectedMap(this._createSelectableList())},getInitialData:function(t,e){return Bv(this,{coordDimensions:["value"],encodeDefaulter:T(Yu,this)})},_createSelectableList:function(){for(var t=this.getRawData(),e=t.mapDimension("value"),i=[],n=0,o=t.count();n<o;n++)i.push({name:t.getName(n),value:t.get(e,n),selected:Vh(t,n,"selected")});return i},getDataParams:function(t){var e=this.getData(),i=Fv.superCall(this,"getDataParams",t),n=[];return e.each(e.mapDimension("value"),function(t){n.push(t)}),i.percent=Bl(n,t,e.hostModel.get("percentPrecision")),i.$vars.push("percent"),i},_defaultLabelLine:function(t){zo(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,minShowLabelAngle:0,selectedOffset:10,hoverOffset:10,avoidLabelOverlap:!0,percentPrecision:2,stillShowZeroSum:!0,left:0,top:0,right:0,bottom:0,width:null,height:null,label:{rotate:!1,show:!0,position:"outer",alignTo:"none",margin:"25%",bleedMargin:10,distanceToLabelLine:5},labelLine:{show:!0,length:15,length2:15,smooth:!1,lineStyle:{width:1,type:"solid"}},itemStyle:{borderWidth:1},animationType:"expansion",animationTypeUpdate:"transition",animationEasing:"cubicOut"}});function Wv(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){Hv(o.getItemGraphicEl(t),o.getItemLayout(t),e.isSelected(o.getName(t)),s,i)})}function Hv(t,e,i,n,o){var a=(e.startAngle+e.endAngle)/2,r=i?n:0,s=[Math.cos(a)*r,Math.sin(a)*r];o?t.animate().when(200,{position:s}).start("bounceOut"):t.attr("position",s)}function Zv(t,e){Ii.call(this);var i=new Ur({z2:2}),n=new Kr,o=new Fr;this.add(i),this.add(n),this.add(o),this.updateData(t,e,!0)}b(Fv,Vv);var Uv=Zv.prototype;Uv.updateData=function(t,e,i){var n=this.childAt(0),o=this.childAt(1),a=this.childAt(2),r=t.hostModel,s=t.getItemModel(e),l=t.getItemLayout(e),u=L({},l);u.label=null;var h=r.getShallow("animationTypeUpdate");i?(n.setShape(u),"scale"===r.getShallow("animationType")?(n.shape.r=l.r0,ll(n,{shape:{r:l.r}},r,e)):(n.shape.endAngle=l.startAngle,sl(n,{shape:{endAngle:l.endAngle}},r,e))):"expansion"===h?n.setShape(u):sl(n,{shape:u},r,e);var c=t.getItemVisual(e,"color");n.useStyle(C({lineJoin:"bevel",fill:c},s.getModel("itemStyle").getItemStyle())),n.hoverStyle=s.getModel("emphasis.itemStyle").getItemStyle();var d=s.getShallow("cursor");d&&n.attr("cursor",d),Hv(this,t.getItemLayout(e),r.isSelected(null,e),r.get("selectedOffset"),r.get("animation"));var f=!i&&"transition"===h;this._updateLabel(t,e,f),this.highDownOnUpdate=s.get("hoverAnimation")&&r.isAnimationEnabled()?function(t,e){"emphasis"===e?(o.ignore=o.hoverIgnore,a.ignore=a.hoverIgnore,n.stopAnimation(!0),n.animateTo({shape:{r:l.r+r.get("hoverOffset")}},300,"elasticOut")):(o.ignore=o.normalIgnore,a.ignore=a.normalIgnore,n.stopAnimation(!0),n.animateTo({shape:{r:l.r}},300,"elasticOut"))}:null,Ys(this)},Uv._updateLabel=function(t,e,i){var n=this.childAt(1),o=this.childAt(2),a=t.hostModel,r=t.getItemModel(e),s=t.getItemLayout(e).label,l=t.getItemVisual(e,"color");if(!s||isNaN(s.x)||isNaN(s.y))o.ignore=o.normalIgnore=o.hoverIgnore=n.ignore=n.normalIgnore=n.hoverIgnore=!0;else{var u={points:s.linePoints||[[s.x,s.y],[s.x,s.y],[s.x,s.y]]},h={x:s.x,y:s.y};i?(sl(n,{shape:u},a,e),sl(o,{style:h},a,e)):(n.attr({shape:u}),o.attr({style:h})),o.attr({rotation:s.rotation,origin:[s.x,s.y],z2:10});var c=r.getModel("label"),d=r.getModel("emphasis.label"),f=r.getModel("labelLine"),p=r.getModel("emphasis.labelLine");l=t.getItemVisual(e,"color");$s(o.style,o.hoverStyle={},c,d,{labelFetcher:t.hostModel,labelDataIndex:e,defaultText:s.text,autoColor:l,useInsideStyle:!!s.inside},{textAlign:s.textAlign,textVerticalAlign:s.verticalAlign,opacity:t.getItemVisual(e,"opacity")}),o.ignore=o.normalIgnore=!c.get("show"),o.hoverIgnore=!d.get("show"),n.ignore=n.normalIgnore=!f.get("show"),n.hoverIgnore=!p.get("show"),n.setStyle({stroke:l,opacity:t.getItemVisual(e,"opacity")}),n.setStyle(f.getModel("lineStyle").getLineStyle()),n.hoverStyle=p.getModel("lineStyle").getLineStyle();var g=f.get("smooth");g&&!0===g&&(g=.4),n.setShape({smooth:g})}},w(Zv,Ii);function Xv(i,t){E(t,function(a){a.update="updateView",gf(a,function(t,e){var o={};return e.eachComponent({mainType:"series",subType:i,query:t},function(i){i[a.method]&&i[a.method](t.name,t.dataIndex);var n=i.getData();n.each(function(t){var e=n.getName(t);o[e]=i.isSelected(e)||!1})}),{name:t.name,selected:o,seriesId:t.seriesId}})})}function Yv(n){return{getTargetSeries:function(t){var e={},i=Q();return t.eachSeriesByType(n,function(t){t.__paletteScope=e,i.set(t.uid,t)}),i},reset:function(s,t){var l=s.getRawData(),u={},h=s.getData();h.each(function(t){var e=h.getRawIndex(t);u[e]=t}),l.each(function(t){var e,i=u[t],n=null!=i&&h.getItemVisual(i,"color",!0),o=null!=i&&h.getItemVisual(i,"borderColor",!0);if(n&&o||(e=l.getItemModel(t)),!n){var a=e.get("itemStyle.color")||s.getColorFromPalette(l.getName(t)||t+"",s.__paletteScope,l.count());null!=i&&h.setItemVisual(i,"color",a)}if(!o){var r=e.get("itemStyle.borderColor");null!=i&&h.setItemVisual(i,"borderColor",r)}})}}}gc.extend({type:"pie",init:function(){var t=new Ii;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,u=t.get("animationType"),h=t.get("animationTypeUpdate"),c=T(Wv,this.uid,t,s,i),d=t.get("selectedMode");if(o.diff(a).add(function(t){var e=new Zv(o,t);l&&"scale"!==u&&e.eachChild(function(t){t.stopAnimation(!0)}),d&&e.on("click",c),o.setItemGraphicEl(t,e),r.add(e)}).update(function(t,e){var i=a.getItemGraphicEl(e);l||"transition"===h||i.eachChild(function(t){t.stopAnimation(!0)}),i.updateData(o,t),i.off("click"),d&&i.on("click",c),r.add(i),o.setItemGraphicEl(t,i)}).remove(function(t){var e=a.getItemGraphicEl(t);r.remove(e)}).execute(),s&&0<o.count()&&(l?"scale"!==u:"transition"!==h)){for(var f=o.getItemLayout(0),p=1;isNaN(f.startAngle)&&p<o.count();++p)f=o.getItemLayout(p);var g=Math.max(i.getWidth(),i.getHeight())/2,m=A(r.removeClipPath,r);r.setClipPath(this._createClipPath(f.cx,f.cy,g,f.startAngle,f.clockwise,m,t,l))}else r.removeClipPath();this._data=o}},dispose:function(){},_createClipPath:function(t,e,i,n,o,a,r,s){var l=new Ur({shape:{cx:t,cy:e,r0:0,r:i,startAngle:n,endAngle:n,clockwise:o}});return(s?ll:sl)(l,{shape:{endAngle:n+(o?1:-1)*Math.PI*2}},r,a),l},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 jv=Math.PI/180;function qv(o,t,e,i,n,a,r,s,l,u){function h(t,e,i){for(var n=t;n<e&&!(o[n].y+i>l+r);n++)if(o[n].y+=i,t<n&&n+1<e&&o[n+1].y>o[n].y+o[n].height)return void c(n,i/2);c(e-1,i/2)}function c(t,e){for(var i=t;0<=i&&!(o[i].y-e<l)&&(o[i].y-=e,!(0<i&&o[i].y>o[i-1].y+o[i-1].height));i--);}function d(t,e,i,n,o,a){for(var r=e?Number.MAX_VALUE:0,s=0,l=t.length;s<l;s++)if("none"===t[s].labelAlignTo){var u=Math.abs(t[s].y-n),h=t[s].len,c=t[s].len2,d=u<o+h?Math.sqrt((o+h+c)*(o+h+c)-u*u):Math.abs(t[s].x-i);e&&r<=d&&(d=r-10),!e&&d<=r&&(d=r+10),t[s].x=i+d*a,r=d}}o.sort(function(t,e){return t.y-e.y});for(var f,p=0,g=o.length,m=[],v=[],y=0;y<g;y++){if("outer"===o[y].position&&"labelLine"===o[y].labelAlignTo){var x=o[y].x-u;o[y].linePoints[1][0]+=x,o[y].x=u}(f=o[y].y-p)<0&&h(y,g,-f),p=o[y].y+o[y].height}r-p<0&&c(g-1,p-r);for(y=0;y<g;y++)o[y].y>=e?v.push(o[y]):m.push(o[y]);d(m,!1,t,e,i,n),d(v,!0,t,e,i,n)}function Kv(t){return"center"===t.position}function $v(L,k,P,t,N,e){var O,E,z=L.getData(),R=[],B=!1,V=(L.get("minShowLabelAngle")||0)*jv;z.each(function(t){var e=z.getItemLayout(t),i=z.getItemModel(t),n=i.getModel("label"),o=n.get("position")||i.get("emphasis.label.position"),a=n.get("distanceToLabelLine"),r=n.get("alignTo"),s=Pl(n.get("margin"),P),l=n.get("bleedMargin"),u=n.getFont(),h=i.getModel("labelLine"),c=h.get("length");c=Pl(c,P);var d=h.get("length2");if(d=Pl(d,P),!(e.angle<V)){var f,p,g,m,v=(e.startAngle+e.endAngle)/2,y=Math.cos(v),x=Math.sin(v);O=e.cx,E=e.cy;var _,w=L.getFormattedLabel(t,"normal")||z.getName(t),b=cn(w,u,m,"top"),S="inside"===o||"inner"===o;if("center"===o)f=e.cx,p=e.cy,m="center";else{var M=(S?(e.r+e.r0)/2*y:e.r*y)+O,I=(S?(e.r+e.r0)/2*x:e.r*x)+E;if(f=M+3*y,p=I+3*x,!S){var T=M+y*(c+k-e.r),A=I+x*(c+k-e.r),D=T+(y<0?-1:1)*d;f="edge"===r?y<0?N+s:N+P-s:D+(y<0?-a:a),g=[[M,I],[T,A],[D,p=A]]}m=S?"center":"edge"===r?0<y?"right":"left":0<y?"left":"right"}var C=n.get("rotate");_="number"==typeof C?C*(Math.PI/180):C?y<0?-v+Math.PI:-v:0,B=!!_,e.label={x:f,y:p,position:o,height:b.height,len:c,len2:d,linePoints:g,textAlign:m,verticalAlign:"middle",rotation:_,inside:S,labelDistance:a,labelAlignTo:r,labelMargin:s,bleedMargin:l,textRect:b,text:w,font:u},S||R.push(e.label)}}),!B&&L.get("avoidLabelOverlap")&&function(t,e,i,n,o,a,r,s){for(var l=[],u=[],h=Number.MAX_VALUE,c=-Number.MAX_VALUE,d=0;d<t.length;d++)Kv(t[d])||(t[d].x<e?(h=Math.min(h,t[d].x),l.push(t[d])):(c=Math.max(c,t[d].x),u.push(t[d])));for(qv(u,e,i,n,1,0,a,0,s,c),qv(l,e,i,n,-1,0,a,0,s,h),d=0;d<t.length;d++){var f=t[d];if(!Kv(f)){var p=f.linePoints;if(p){var g,m="edge"===f.labelAlignTo,v=f.textRect.width;(g=m?f.x<e?p[2][0]-f.labelDistance-r-f.labelMargin:r+o-f.labelMargin-p[2][0]-f.labelDistance:f.x<e?f.x-r-f.bleedMargin:r+o-f.x-f.bleedMargin)<f.textRect.width&&(f.text=gn(f.text,g,f.font),"edge"===f.labelAlignTo&&(v=hn(f.text,f.font)));var y=p[1][0]-p[2][0];m?f.x<e?p[2][0]=r+f.labelMargin+v+f.labelDistance:p[2][0]=r+o-f.labelMargin-v-f.labelDistance:(f.x<e?p[2][0]=f.x+f.labelDistance:p[2][0]=f.x-f.labelDistance,p[1][0]=p[2][0]+y),p[1][1]=p[2][1]=f.y}}}}(R,O,E,k,P,t,N,e)}var Jv=2*Math.PI,Qv=Math.PI/180;function ty(t){return{seriesType:t,reset:function(t,e){var n=e.findComponents({mainType:"legend"});if(n&&n.length){var o=t.getData();o.filterSelf(function(t){for(var e=o.getName(t),i=0;i<n.length;i++)if(!n[i].isSelected(e))return!1;return!0})}}}}Xv("pie",[{type:"pieToggleSelect",event:"pieselectchanged",method:"toggleSelected"},{type:"pieSelect",event:"pieselected",method:"select"},{type:"pieUnSelect",event:"pieunselected",method:"unSelect"}]),yf(Yv("pie")),vf(T(function(t,e,A,i){e.eachSeriesByType(t,function(t){var o=t.getData(),e=o.mapDimension("value"),a=function(t,e){return vu(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}(t,A),i=t.get("center"),n=t.get("radius");k(n)||(n=[0,n]),k(i)||(i=[i,i]);var r=Pl(a.width,A.getWidth()),s=Pl(a.height,A.getHeight()),l=Math.min(r,s),u=Pl(i[0],r)+a.x,h=Pl(i[1],s)+a.y,c=Pl(n[0],l/2),d=Pl(n[1],l/2),f=-t.get("startAngle")*Qv,p=t.get("minAngle")*Qv,g=0;o.each(e,function(t){isNaN(t)||g++});var m=o.getSum(e),v=Math.PI/(m||g)*2,y=t.get("clockwise"),x=t.get("roseType"),_=t.get("stillShowZeroSum"),w=o.getDataExtent(e);w[0]=0;var b=Jv,S=0,M=f,I=y?1:-1;if(o.each(e,function(t,e){var i;if(isNaN(t))o.setItemLayout(e,{angle:NaN,startAngle:NaN,endAngle:NaN,clockwise:y,cx:u,cy:h,r0:c,r:x?NaN:d,viewRect:a});else{(i="area"!==x?0===m&&_?v:t*v:Jv/g)<p?b-=i=p:S+=t;var n=M+I*i;o.setItemLayout(e,{angle:i,startAngle:M,endAngle:n,clockwise:y,cx:u,cy:h,r0:c,r:x?kl(t,w,[c,d]):d,viewRect:a}),M=n}}),b<Jv&&g)if(b<=.001){var T=Jv/g;o.each(e,function(t,e){if(!isNaN(t)){var i=o.getItemLayout(e);i.angle=T,i.startAngle=f+I*e*T,i.endAngle=f+I*(e+1)*T}})}else v=b/S,M=f,o.each(e,function(t,e){if(!isNaN(t)){var i=o.getItemLayout(e),n=i.angle===p?p:t*v;i.startAngle=M,i.endAngle=M+I*n,M+=I*n}});$v(t,d,a.width,a.height,a.x,a.y)})},"pie")),pf(ty("pie")),ic.extend({type:"series.scatter",dependencies:["grid","polar","geo","singleAxis","calendar"],getInitialData:function(t,e){return hp(this.getSource(),this,{useEncodeDefaulter:!0})},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},clip:!0}});var ey=Is({shape:{points:null},symbolProxy:null,softClipShape: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)||this.softClipShape&&!this.softClipShape.contain(s,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)||this.softClipShape&&!this.softClipShape.contain(a,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;0<=s;s--){var l=2*s,u=n[l]-a/2,h=n[1+l]-r/2;if(u<=t&&h<=e&&t<=u+a&&e<=h+r)return s}return-1}});function iy(){this.group=new Ii}var ny=iy.prototype;function oy(t,e,i){Eg.call(this,t,e,i),this.type="value",this.angle=0,this.name="",this.model}function ay(t,e,i){this._model=t,this.dimensions=[],this._indicatorAxes=N(t.getIndicatorModels(),function(t,e){var i="indicator_"+e,n=new oy(i,"log"===t.get("axisType")?new Jp:new Sp);return n.name=t.get("name"),(n.model=t).axis=n,this.dimensions.push(i),n},this),this.resize(t,i),this.cx,this.cy,this.r,this.r0,this.startAngle}ny.isPersistent=function(){return!this._incremental},ny.updateData=function(t,e){this.group.removeAll();var i=new ey({rectHover:!0,cursor:"default"});i.setShape({points:t.getLayout("symbolPoints")}),this._setCommon(i,t,!1,e),this.group.add(i),this._incremental=null},ny.updateLayout=function(t){if(!this._incremental){var n=t.getLayout("symbolPoints");this.group.eachChild(function(t){if(null!=t.startIndex){var e=2*(t.endIndex-t.startIndex),i=4*t.startIndex*2;n=new Float32Array(n.buffer,i,e)}t.setShape("points",n)})}},ny.incrementalPrepareUpdate=function(t){this.group.removeAll(),this._clearIncremental(),2e6<t.count()?(this._incremental||(this._incremental=new fs({silent:!0})),this.group.add(this._incremental)):this._incremental=null},ny.incrementalUpdate=function(t,e,i){var n;this._incremental?(n=new ey,this._incremental.addDisplayable(n,!0)):((n=new ey({rectHover:!0,cursor:"default",startIndex:t.start,endIndex:t.end})).incremental=!0,this.group.add(n)),n.setShape({points:e.getLayout("symbolPoints")}),this._setCommon(n,e,!!this._incremental,i)},ny._setCommon=function(i,t,e,n){var o=t.hostModel;n=n||{};var a=t.getVisual("symbolSize");i.setShape("size",a instanceof Array?a:[a,a]),i.softClipShape=n.clipShape||null,i.symbolProxy=mg(t.getVisual("symbol"),0,0,0,0),i.setColor=i.symbolProxy.setColor;var r=i.shape.size[0]<4;i.useStyle(o.getModel("itemStyle").getItemStyle(r?["color","shadowBlur","shadowColor"]:["color"]));var s=t.getVisual("color");s&&i.setColor(s),e||(i.seriesIndex=o.seriesIndex,i.on("mousemove",function(t){i.dataIndex=null;var e=i.findDataIndex(t.offsetX,t.offsetY);0<=e&&(i.dataIndex=e+(i.startIndex||0))}))},ny.remove=function(){this._clearIncremental(),this._incremental=null,this.group.removeAll()},ny._clearIncremental=function(){var t=this._incremental;t&&t.clearDisplaybles()},Mf({type:"scatter",render:function(t,e,i){var n=t.getData();this._updateSymbolDraw(n,t).updateData(n,{clipShape:this._getClipShape(t)}),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(),{clipShape:this._getClipShape(e)}),this._finished=t.end===e.getData().count()},updateTransform:function(t,e,i){var n=t.getData();if(this.group.dirty(),!this._finished||1e4<n.count()||!this._symbolDraw.isPersistent())return{update:!0};var o=Im().reset(t);o.progress&&o.progress({start:0,end:n.count()},n),this._symbolDraw.updateLayout(n)},_getClipShape:function(t){var e=t.coordinateSystem,i=e&&e.getArea&&e.getArea();return t.get("clip",!0)?i:null},_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 iy:new $g,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(){}}),yf(Mm("scatter","circle")),vf(Im("scatter")),w(oy,Eg),ay.prototype.getIndicatorAxes=function(){return this._indicatorAxes},ay.prototype.dataToPoint=function(t,e){var i=this._indicatorAxes[e];return this.coordToPoint(i.dataToCoord(t),e)},ay.prototype.coordToPoint=function(t,e){var i=this._indicatorAxes[e].angle;return[this.cx+t*Math.cos(i),this.cy-t*Math.sin(i)]},ay.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 u=this._indicatorAxes[l],h=Math.abs(a-u.angle);h<r&&(o=u,s=l,r=h)}return[s,+(o&&o.coordToData(n))]},ay.prototype.resize=function(t,e){var i=t.get("center"),n=e.getWidth(),o=e.getHeight(),a=Math.min(n,o)/2;this.cx=Pl(i[0],n),this.cy=Pl(i[1],o),this.startAngle=t.get("startAngle")*Math.PI/180;var r=t.get("radius");"string"!=typeof r&&"number"!=typeof r||(r=[0,r]),this.r0=Pl(r[0],a),this.r=Pl(r[1],a),E(this._indicatorAxes,function(t,e){t.setExtent(this.r0,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)},ay.prototype.update=function(n,t){var o=this._indicatorAxes,a=this._model;E(o,function(t){t.scale.setExtent(1/0,-1/0)}),n.eachSeriesByType("radar",function(t,e){if("radar"===t.get("coordinateSystem")&&n.getComponent("radar",t.get("radarIndex"))===a){var i=t.getData();E(o,function(t){t.scale.unionExtentFromData(i,i.mapDimension(t.dim))})}},this);var f=a.get("splitNumber");function p(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}E(o,function(t,e){var i=tg(t.scale,t.model);eg(t.scale,t.model);var n=t.model,o=t.scale,a=n.getMin(),r=n.getMax(),s=o.getInterval();if(null!=a&&null!=r)o.setExtent(+a,+r),o.setInterval((r-a)/f);else if(null!=a)for(var l;l=a+s*f,o.setExtent(+a,l),o.setInterval(s),s=p(s),l<i[1]&&isFinite(l)&&isFinite(i[1]););else if(null!=r)for(var u;u=r-s*f,o.setExtent(u,+r),o.setInterval(s),s=p(s),u>i[0]&&isFinite(u)&&isFinite(i[0]););else{var h=o.getTicks().length-1;f<h&&(s=p(s));var c=Math.round((i[0]+i[1])/2/s)*s,d=Math.round(f/2);o.setExtent(Nl(c-d*s),Nl(c+(f-d)*s)),o.setInterval(s)}})},ay.dimensions=[],ay.create=function(i,n){var o=[];return i.eachComponent("radar",function(t){var e=new ay(t,i,n);o.push(e),t.coordinateSystem=e}),i.eachSeriesByType("radar",function(t){"radar"===t.get("coordinateSystem")&&(t.coordinateSystem=o[t.get("radarIndex")||0])}),o},nh.register("radar",ay);var ry=Nm.valueAxis;function sy(t,e){return C({show:e},t)}wf({type:"radar",optionUpdated:function(){var o=this.get("boundaryGap"),a=this.get("splitNumber"),r=this.get("scale"),s=this.get("axisLine"),l=this.get("axisTick"),u=this.get("axisType"),h=this.get("axisLabel"),c=this.get("name"),d=this.get("name.show"),f=this.get("name.formatter"),p=this.get("nameGap"),g=this.get("triggerEvent"),t=N(this.get("indicator")||[],function(t){null!=t.max&&0<t.max&&!t.min?t.min=0:null!=t.min&&t.min<0&&!t.max&&(t.max=0);var e=c;if(null!=t.color&&(e=C({color:t.color},c)),t=m(D(t),{boundaryGap:o,splitNumber:a,scale:r,axisLine:s,axisTick:l,axisType:u,axisLabel:h,name:t.text,nameLocation:"end",nameGap:p,nameTextStyle:e,triggerEvent:g},!1),d||(t.name=""),"string"==typeof f){var i=t.name;t.name=f.replace("{value}",null!=i?i:"")}else"function"==typeof f&&(t.name=f(t.name,t));var n=L(new Il(t,null,this.ecModel),sg);return n.mainType="radar",n.componentIndex=this.componentIndex,n},this);this.getIndicatorModels=function(){return t}},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:m({lineStyle:{color:"#bbb"}},ry.axisLine),axisLabel:sy(ry.axisLabel,!1),axisTick:sy(ry.axisTick,!1),axisType:"interval",splitLine:sy(ry.splitLine,!0),splitArea:sy(ry.splitArea,!0),indicator:[]}});var ly=["axisLine","axisTickLabel","axisName"];bf({type:"radar",render:function(t,e,i){this.group.removeAll(),this._buildAxes(t),this._buildSplitLineAndArea(t)},_buildAxes:function(t){var e=t.coordinateSystem;E(N(e.getIndicatorAxes(),function(t){return new Ym(t.model,{position:[e.cx,e.cy],rotation:t.angle,labelDirection:-1,tickDirection:-1,nameDirection:1})}),function(t){E(ly,t.add,t),this.group.add(t.getGroup())},this)},_buildSplitLineAndArea:function(t){var n=t.coordinateSystem,e=n.getIndicatorAxes();if(e.length){var i=t.get("shape"),o=t.getModel("splitLine"),a=t.getModel("splitArea"),r=o.getModel("lineStyle"),s=a.getModel("areaStyle"),l=o.get("show"),u=a.get("show"),h=r.get("color"),c=s.get("color");h=k(h)?h:[h],c=k(c)?c:[c];var d=[],f=[];if("circle"===i)for(var p=e[0].getTicksCoords(),g=n.cx,m=n.cy,v=0;v<p.length;v++){if(l)d[I(d,h,v)].push(new Hr({shape:{cx:g,cy:m,r:p[v].coord}}));if(u&&v<p.length-1)f[I(f,c,v)].push(new Xr({shape:{cx:g,cy:m,r0:p[v].coord,r:p[v+1].coord}}))}else{var y,x=N(e,function(t,e){var i=t.getTicksCoords();return y=null==y?i.length-1:Math.min(i.length-1,y),N(i,function(t){return n.coordToPoint(t.coord,e)})}),_=[];for(v=0;v<=y;v++){for(var w=[],b=0;b<e.length;b++)w.push(x[b][v]);if(w[0]&&w.push(w[0].slice()),l)d[I(d,h,v)].push(new Kr({shape:{points:w}}));if(u&&_)f[I(f,c,v-1)].push(new qr({shape:{points:w.concat(_)}}));_=w.slice().reverse()}}var S=r.getLineStyle(),M=s.getAreaStyle();E(f,function(t,e){this.group.add(ks(t,{style:C({stroke:"none",fill:c[e%c.length]},M),silent:!0}))},this),E(d,function(t,e){this.group.add(ks(t,{style:C({fill:"none",stroke:h[e%h.length]},S),silent:!0}))},this)}function I(t,e,i){var n=i%e.length;return t[n]=t[n]||[],n}}});var uy=ic.extend({type:"series.radar",dependencies:["radar"],init:function(t){uy.superApply(this,"init",arguments),this.legendVisualProvider=new Gv(A(this.getData,this),A(this.getRawData,this))},getInitialData:function(t,e){return Bv(this,{generateCoord:"indicator_",generateCoordCount:1/0})},formatTooltip:function(n){var o=this.getData(),t=this.coordinateSystem.getIndicatorAxes(),e=this.getData().getName(n);return eu(""===e?this.name:e)+"<br/>"+N(t,function(t,e){var i=o.get(o.mapDimension(t.dim),n);return eu(t.name+" : "+i)}).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}});Mf({type:"radar",render:function(l,t,e){var i=l.coordinateSystem,g=this.group,m=l.getData(),s=this._data;function u(t,e){var i=t.getItemVisual(e,"symbol")||"circle",n=t.getItemVisual(e,"color");if("none"!==i){var o=function(t){return k(t)||(t=[+t,+t]),t}(t.getItemVisual(e,"symbolSize")),a=mg(i,-1,-1,2,2,n);return a.attr({style:{strokeNoScale:!0},z2:100,scale:[o[0]/2,o[1]/2]}),a}}function h(t,e,i,n,o,a){i.removeAll();for(var r=0;r<e.length-1;r++){var s=u(n,o);s&&(t[s.__dimIdx=r]?(s.attr("position",t[r]),yl[a?"initProps":"updateProps"](s,{position:e[r]},l,o)):s.attr("position",e[r]),i.add(s))}}function c(t){return N(t,function(t){return[i.cx,i.cy]})}m.diff(s).add(function(t){var e=m.getItemLayout(t);if(e){var i=new qr,n=new Kr,o={shape:{points:e}};i.shape.points=c(e),n.shape.points=c(e),ll(i,o,l,t),ll(n,o,l,t);var a=new Ii,r=new Ii;a.add(n),a.add(i),a.add(r),h(n.shape.points,e,r,m,t,!0),m.setItemGraphicEl(t,a)}}).update(function(t,e){var i=s.getItemGraphicEl(e),n=i.childAt(0),o=i.childAt(1),a=i.childAt(2),r={shape:{points:m.getItemLayout(t)}};r.shape.points&&(h(n.shape.points,r.shape.points,a,m,t,!1),sl(n,r,l),sl(o,r,l),m.setItemGraphicEl(t,i))}).remove(function(t){g.remove(s.getItemGraphicEl(t))}).execute(),m.eachItemGraphicEl(function(t,i){var e=m.getItemModel(i),n=t.childAt(0),o=t.childAt(1),a=t.childAt(2),r=m.getItemVisual(i,"color");g.add(t),n.useStyle(C(e.getModel("lineStyle").getLineStyle(),{fill:"none",stroke:r})),n.hoverStyle=e.getModel("emphasis.lineStyle").getLineStyle();var s=e.getModel("areaStyle"),l=e.getModel("emphasis.areaStyle"),u=s.isEmpty()&&s.parentModel.isEmpty(),h=l.isEmpty()&&l.parentModel.isEmpty();h=h&&u,o.ignore=u,o.useStyle(C(s.getAreaStyle(),{fill:r,opacity:.7})),o.hoverStyle=l.getAreaStyle();var c=e.getModel("itemStyle").getItemStyle(["color"]),d=e.getModel("emphasis.itemStyle").getItemStyle(),f=e.getModel("label"),p=e.getModel("emphasis.label");a.eachChild(function(t){t.setStyle(c),t.hoverStyle=D(d);var e=m.get(m.dimensions[t.__dimIdx],i);null!=e&&!isNaN(e)||(e=""),$s(t.style,t.hoverStyle,f,p,{labelFetcher:m.hostModel,labelDataIndex:i,labelDimIndex:t.__dimIdx,defaultText:e,autoColor:r,isRectText:!0})}),t.highDownOnUpdate=function(t,e){o.attr("ignore","emphasis"===e?h:u)},Ys(t)}),this._data=m},remove:function(){this.group.removeAll(),this._data=null},dispose:function(){}});function hy(t){return!isNaN(t[0])&&!isNaN(t[1])}function cy(t){return[t.cx,t.cy]}yf(Yv("radar")),yf(Mm("radar","circle")),vf(function(t){t.eachSeriesByType("radar",function(t){var i=t.getData(),o=[],a=t.coordinateSystem;if(a){var e=a.getIndicatorAxes();E(e,function(t,n){i.each(i.mapDimension(e[n].dim),function(t,e){o[e]=o[e]||[];var i=a.dataToPoint(t,n);o[e][n]=hy(i)?i:cy(a)})}),i.each(function(t){var e=I(o[t],function(t){return hy(t)})||cy(a);o[t].push(e.slice()),i.setItemLayout(t,o[t])})}})}),pf(ty("radar")),ff(function(i){var t=i.polar;if(t){k(t)||(t=[t]);var n=[];E(t,function(t,e){t.indicator?(t.type&&!t.shape&&(t.shape=t.type),i.radar=i.radar||[],k(i.radar)||(i.radar=[i.radar]),i.radar.push(t)):n.push(t)}),i.polar=n}E(i.series,function(t){t&&"radar"===t.type&&t.polarIndex&&(t.radarIndex=t.polarIndex)})});for(var dy=[126,25],fy=[[[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]]],py=0;py<fy.length;py++)for(var gy=0;gy<fy[py].length;gy++)fy[py][gy][0]/=10.5,fy[py][gy][1]/=-14,fy[py][gy][0]+=dy[0],fy[py][gy][1]+=dy[1];var my={"南海诸岛":[32,80],"广东":[0,-10],"香港":[10,5],"澳门":[-10,10],"天津":[5,5]},vy={Russia:[100,60],"United States":[-99,38],"United States of America":[-99,38]},yy=[[[123.45165252685547,25.73527164402261],[123.49731445312499,25.73527164402261],[123.49731445312499,25.750734064600884],[123.45165252685547,25.750734064600884],[123.45165252685547,25.73527164402261]]],xy=Zo(),_y={load:function(n,t){var e=xy(t).parsed;if(e)return e;var i,o=t.specialAreas||{},a=t.geoJSON;try{i=a?Mg(a):[]}catch(t){throw new Error("Invalid geoJson format\n"+t.message)}return function(t,e){"china"===t&&e.push(new bg("南海诸岛",N(fy,function(t){return{type:"polygon",exterior:t}}),dy))}(n,i),E(i,function(t){var e=t.name;!function(t,e){if("china"===t){var i=my[e.name];if(i){var n=e.center;n[0]+=i[0]/10.5,n[1]+=-i[1]/14}}}(n,t),function(t,e){if("world"===t){var i=vy[e.name];if(i){var n=e.center;n[0]=i[0],n[1]=i[1]}}}(n,t),function(t,e){"china"===t&&"台湾"===e.name&&e.geometries.push({type:"polygon",exterior:yy[0]})}(n,t);var i=o[e];i&&t.transformTo(i.left,i.top,i.width,i.height)}),xy(t).parsed={regions:i,boundingRect:function(t){for(var e,i=0;i<t.length;i++){var n=t[i].getBoundingRect();(e=e||n.clone()).union(n)}return e}(i)}}};var wy=Zo();function by(t,e){var i,n,o=t.svgXML;try{Y(null!=(n=(i=o&&function(t,e){return(new ad).parse(t,e)}(o,{ignoreViewBox:!0,ignoreRootClip:!0})||{}).root))}catch(t){throw new Error("Invalid svg format\n"+t.message)}var a=i.width,r=i.height,s=i.viewBoxRect;if(e||(e=null==a||null==r?n.getBoundingRect():new Mi(0,0,0,0),null!=a&&(e.width=a),null!=r&&(e.height=r)),s){var l=md(s,e.width,e.height),u=n;(n=new Ii).add(u),u.scale=l.scale,u.position=l.position}return n.setClipPath(new is({shape:e.plain()})),{root:n,boundingRect:e}}var Sy={geoJSON:_y,svg:{load:function(t,e){var i=wy(e).originRoot;if(i)return{root:i,boundingRect:wy(e).boundingRect};var n=by(e);return wy(e).originRoot=n.root,wy(e).boundingRect=n.boundingRect,n},makeGraphic:function(t,e,i){var n=wy(e),o=n.rootMap||(n.rootMap=Q()),a=o.get(i);if(a)return a;var r=n.originRoot,s=n.boundingRect;return a=n.originRootHostKey?by(e,s).root:(n.originRootHostKey=i,r),o.set(i,a)},removeGraphic:function(t,e,i){var n=wy(e),o=n.rootMap;o&&o.removeKey(i),i===n.originRootHostKey&&(n.originRootHostKey=null)}}},My={load:function(n,o){var a,r=[],s=Q(),l=Q();return E(Ty(n),function(t){var e=Sy[t.type].load(n,t);E(e.regions,function(t){var e=t.name;o&&o.hasOwnProperty(e)&&(t=t.cloneShallow(e=o[e])),r.push(t),s.set(e,t),l.set(e,t.center)});var i=e.boundingRect;i&&(a?a.union(i):a=i.clone())}),{regions:r,regionsMap:s,nameCoordMap:l,boundingRect:a||new Mi(0,0,0,0)}},makeGraphic:Iy("makeGraphic"),removeGraphic:Iy("removeGraphic")};function Iy(a){return function(i,n){var t=Ty(i),o=[];return E(t,function(t){var e=Sy[t.type][a];e&&o.push(e(i,t,n))}),o}}function Ty(t){return yd.retrieveMap(t)||[]}b(ic.extend({type:"series.map",dependencies:["geo"],layoutMode:"box",needsDrawMap:!1,seriesGroup:[],getInitialData:function(t){for(var e=Bv(this,{coordDimensions:["value"],encodeDefaulter:T(Yu,this)}),i=e.mapDimension("value"),n=Q(),o=[],a=[],r=0,s=e.count();r<s;r++){var l=e.getName(r);n.set(l,!0),o.push({name:l,value:e.get(i,r),selected:Vh(e,r,"selected")})}return E(My.load(this.getMapType(),this.option.nameMap).regions,function(t){var e=t.name;n.get(e)||(o.push({name:e}),a.push(e))}),this.updateSelectedMap(o),e.appendValues([],a),e},getHostGeoModel:function(){var t=this.option.geoIndex;return null!=t?this.dependentModels.geo[t]:null},getMapType:function(){return(this.getHostGeoModel()||this).option.map},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=Kl(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(eu(o[r].name))}return a.join(", ")+"<br />"+eu(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)"}}}}),Vv);var Ay="\0_ec_interaction_mutex";function Dy(t,e){return!!Cy(t)[e]}function Cy(t){return t[Ay]||(t[Ay]={})}function Ly(i){this.pointerChecker,this._zr=i,this._opt={};var t=A,n=t(ky,this),o=t(Py,this),a=t(Ny,this),r=t(Oy,this),s=t(Ey,this);Ct.call(this),this.setPointerChecker=function(t){this.pointerChecker=t},this.enable=function(t,e){this.disable(),this._opt=C(D(e)||{},{zoomOnMouseWheel:!0,moveOnMouseMove:!0,moveOnMouseWheel:!1,preventDefaultMouseMove:!0}),null==t&&(t=!0),!0!==t&&"move"!==t&&"pan"!==t||(i.on("mousedown",n),i.on("mousemove",o),i.on("mouseup",a)),!0!==t&&"scale"!==t&&"zoom"!==t||(i.on("mousewheel",r),i.on("pinch",s))},this.disable=function(){i.off("mousedown",n),i.off("mousemove",o),i.off("mouseup",a),i.off("mousewheel",r),i.off("pinch",s)},this.dispose=this.disable,this.isDragging=function(){return this._dragging},this.isPinching=function(){return this._pinching}}function ky(t){if(!(Ht(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 Py(t){if(this._dragging&&By("moveOnMouseMove",t,this._opt)&&"pinch"!==t.gestureEvent&&!Dy(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&&Wt(t.event),Ry(this,"pan","moveOnMouseMove",t,{dx:a,dy:r,oldX:n,oldY:o,newX:e,newY:i})}}function Ny(t){Ht(t)||(this._dragging=!1)}function Oy(t){var e=By("zoomOnMouseWheel",t,this._opt),i=By("moveOnMouseWheel",t,this._opt),n=t.wheelDelta,o=Math.abs(n),a=t.offsetX,r=t.offsetY;if(0!==n&&(e||i)){if(e){var s=3<o?1.4:1<o?1.2:1.1;zy(this,"zoom","zoomOnMouseWheel",t,{scale:0<n?s:1/s,originX:a,originY:r})}if(i){var l=Math.abs(n);zy(this,"scrollMove","moveOnMouseWheel",t,{scrollDelta:(0<n?1:-1)*(3<l?.4:1<l?.15:.05),originX:a,originY:r})}}}function Ey(t){Dy(this._zr,"globalPan")||zy(this,"zoom",null,t,{scale:1<t.pinchScale?1.1:1/1.1,originX:t.pinchX,originY:t.pinchY})}function zy(t,e,i,n,o){t.pointerChecker&&t.pointerChecker(n,o.originX,o.originY)&&(Wt(n.event),Ry(t,e,i,n,o))}function Ry(t,e,i,n,o){o.isAvailableBehavior=A(By,null,i,n),t.trigger(e,o)}function By(t,e,i){var n=i[t];return!t||n&&(!z(n)||e.event[n+"Key"])}function Vy(t,e,i){var n=t.target,o=n.position;o[0]+=e,o[1]+=i,n.dirty()}function Gy(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 u=a.min||0,h=a.max||1/0;l=Math.max(Math.min(h,l),u)}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()}gf({type:"takeGlobalCursor",event:"globalCursorTaken",update:"update"},function(){}),b(Ly,Ct);var Fy={axisPointer:1,tooltip:1,brush:1};function Wy(t,e,i){var n=e.getComponentByElement(t.topTarget),o=n&&n.coordinateSystem;return n&&n!==i&&!Fy[n.mainType]&&o&&o.model!==i}function Hy(t){var e=t.getItemStyle(),i=t.get("areaColor");return null!=i&&(e.fill=i),e}function Zy(i,t){t.eachChild(function(e){E(e.__regions,function(t){e.trigger(i.isSelected(t.name)?"emphasis":"normal")})})}function Uy(t,e){var i=new Ii;this.uid=Cl("ec_map_draw"),this._controller=new Ly(t.getZr()),this._controllerHost={target:e?i:null},this.group=i,this._updateGroup=e,this._mouseDownFlag,this._mapName,this._initialized,i.add(this._regionsGroup=new Ii),i.add(this._backgroundGroup=new Ii)}Uy.prototype={constructor:Uy,draw:function(_,t,e,i,n){var w="geo"===_.mainType,b=_.getData&&_.getData();w&&t.eachComponent({mainType:"series",subType:"map"},function(t){b||t.getHostGeoModel()!==_||(b=t.getData())});var o=_.coordinateSystem;this._updateBackground(o);var S=this._regionsGroup,M=this.group;o._roamTransformable.transform&&(M.transform=o._roamTransformable.transform.slice(),M.decomposeTransform());var I=o._rawTransformable.scale,T=o._rawTransformable.position;S.removeAll();var A=["itemStyle"],D=["emphasis","itemStyle"],C=["label"],L=["emphasis","label"],k=Q();E(o.regions,function(t){var e=k.get(t.name)||k.set(t.name,new Ii),a=new hs({segmentIgnoreThreshold:1,shape:{paths:[]}});e.add(a);var i,n=(x=_.getRegionModel(t.name)||_).getModel(A),o=x.getModel(D),r=Hy(n),s=Hy(o),l=x.getModel(C),u=x.getModel(L);if(b){i=b.indexOfName(t.name);var h=b.getItemVisual(i,"color",!0);h&&(r.fill=h)}function c(t){return[t[0]*I[0]+T[0],t[1]*I[1]+T[1]]}E(t.geometries,function(t){if("polygon"===t.type){for(var e=[],i=0;i<t.exterior.length;++i)e.push(c(t.exterior[i]));a.shape.paths.push(new qr({segmentIgnoreThreshold:1,shape:{points:e}}));for(i=0;i<(t.interiors?t.interiors.length:0);++i){for(var n=t.interiors[i],o=(e=[],0);o<n.length;++o)e.push(c(n[o]));a.shape.paths.push(new qr({segmentIgnoreThreshold:1,shape:{points:e}}))}}}),a.setStyle(r),a.style.strokeNoScale=!0,a.culling=!0;var d=l.get("show"),f=u.get("show"),p=b&&isNaN(b.get(b.mapDimension("value"),i)),g=b&&b.getItemLayout(i);if(w||p&&(d||f)||g&&g.showLabel){var m,v=w?t.name:i;(!b||0<=i)&&(m=_);var y=new Fr({position:c(t.center.slice()),scale:[1/M.scale[0],1/M.scale[1]],z2:10,silent:!0});$s(y.style,y.hoverStyle={},l,u,{labelFetcher:m,labelDataIndex:v,defaultText:t.name,useInsideStyle:!1},{textAlign:"center",textVerticalAlign:"middle"}),e.add(y)}if(b)b.setItemGraphicEl(i,e);else{var x=_.getRegionModel(t.name);a.eventData={componentType:"geo",componentIndex:_.componentIndex,geoIndex:_.componentIndex,name:t.name,region:x&&x.option||{}}}(e.__regions||(e.__regions=[])).push(t),e.highDownSilentOnTouch=!!_.get("selectedMode"),Ys(e,s),S.add(e)}),this._updateController(_,t,e),function(n,o,a,r,s){a.off("click"),a.off("mousedown"),o.get("selectedMode")&&(a.on("mousedown",function(){n._mouseDownFlag=!0}),a.on("click",function(t){if(n._mouseDownFlag){n._mouseDownFlag=!1;for(var e=t.target;!e.__regions;)e=e.parent;if(e){var i={type:("geo"===o.mainType?"geo":"map")+"ToggleSelect",batch:N(e.__regions,function(t){return{name:t.name,from:s.uid}})};i[o.mainType+"Id"]=o.id,r.dispatchAction(i),Zy(o,a)}}}))}(this,_,S,e,i),Zy(_,S)},remove:function(){this._regionsGroup.removeAll(),this._backgroundGroup.removeAll(),this._controller.dispose(),this._mapName&&My.removeGraphic(this._mapName,this.uid),this._mapName=null,this._controllerHost={}},_updateBackground:function(t){var e=t.map;this._mapName!==e&&E(My.makeGraphic(e,this.uid),function(t){this._backgroundGroup.add(t)},this),this._mapName=e},_updateController:function(n,t,o){var a=n.coordinateSystem,e=this._controller,i=this._controllerHost;i.zoomLimit=n.get("scaleLimit"),i.zoom=a.getZoom(),e.enable(n.get("roam")||!1);var r=n.mainType;function s(){var t={type:"geoRoam",componentType:r};return t[r+"Id"]=n.id,t}e.off("pan").on("pan",function(t){this._mouseDownFlag=!1,Vy(i,t.dx,t.dy),o.dispatchAction(L(s(),{dx:t.dx,dy:t.dy}))},this),e.off("zoom").on("zoom",function(t){if(this._mouseDownFlag=!1,Gy(i,t.scale,t.originX,t.originY),o.dispatchAction(L(s(),{zoom:t.scale,originX:t.originX,originY:t.originY})),this._updateGroup){var e=this.group.scale;this._regionsGroup.traverse(function(t){"text"===t.type&&t.attr("scale",[1/e[0],1/e[1]])})}},this),e.setPointerChecker(function(t,e,i){return a.getViewRectAfterRoam().contain(e,i)&&!Wy(t,o,n)})}};var Xy="__seriesMapHighDown",Yy="__seriesMapCallKey";function jy(t){var e=this[Xy];e&&e.recordVersion===this[Yy]&&qy(e,t)}function qy(t,e){var i=t.circle,n=t.labelModel,o=t.hoverLabelModel,a=t.emphasisText,r=t.normalText;e?(i.style.extendFrom(Qs({},o,{text:o.get("show")?a:null},{isRectText:!0,useInsideStyle:!1},!0)),i.__mapOriginalZ2=i.z2,i.z2+=ys):(Qs(i.style,n,{text:n.get("show")?r:null,textPosition:n.getShallow("position")||"bottom"},{isRectText:!0,useInsideStyle:!1}),i.dirty(!1),null!=i.__mapOriginalZ2&&(i.z2=i.__mapOriginalZ2,i.__mapOriginalZ2=null))}function Ky(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 u=t.position,h=(e.originX-u[0])*(a-1),c=(e.originY-u[1])*(a-1);u[0]-=h,u[1]-=c,t.updateTransform();o=t.pointToData(r);t.setCenter(o),t.setZoom(a*n)}return{center:t.getCenter(),zoom:t.getZoom()}}Mf({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 Uy(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(x,t,e){var _=x.originalData,w=this.group;_.each(_.mapDimension("value"),function(t,e){if(!isNaN(t)){var i=_.getItemLayout(e);if(i&&i.point){var n=i.point,o=i.offset,a=new Hr({style:{fill:x.getData().getVisual("color")},shape:{cx:n[0]+9*o,cy:n[1],r:3},silent:!0,z2:8+(o?0:ys+1)});if(!o){var r=x.mainSeries.getData(),s=_.getName(e),l=r.indexOfName(s),u=_.getItemModel(e),h=u.getModel("label"),c=u.getModel("emphasis.label"),d=r.getItemGraphicEl(l),f=H(x.getFormattedLabel(l,"normal"),s),p=H(x.getFormattedLabel(l,"emphasis"),f),g=d[Xy],m=Math.random();if(!g){g=d[Xy]={};var v=T(jy,!0),y=T(jy,!1);d.on("mouseover",v).on("mouseout",y).on("emphasis",v).on("normal",y)}L(g,{recordVersion:d[Yy]=m,circle:a,labelModel:h,hoverLabelModel:c,emphasisText:p,normalText:f}),qy(g,!1)}w.add(a)}}})}}),gf({type:"geoRoam",event:"geoRoam",update:"updateTransform"},function(n,t){var o=n.componentType||"series";t.eachComponent({mainType:o,query:n},function(t){var e=t.coordinateSystem;if("geo"===e.type){var i=Ky(e,n,t.get("scaleLimit"));t.setCenter&&t.setCenter(i.center),t.setZoom&&t.setZoom(i.zoom),"series"===o&&E(t.seriesGroup,function(t){t.setCenter(i.center),t.setZoom(i.zoom)})}})});var $y=bt;function Jy(){fe.call(this)}function Qy(t){this.name=t,this.zoomLimit,fe.call(this),this._roamTransformable=new Jy,this._rawTransformable=new Jy,this._center,this._zoom}function tx(t,e,i,n){var o=i.seriesModel,a=o?o.coordinateSystem:null;return a===this?a[t](n):null}function ex(t,e,i,n){Qy.call(this,t),this.map=e;var o=My.load(e,i);this._nameCoordMap=o.nameCoordMap,this._regionsMap=o.regionsMap,this._invertLongitute=null==n||n,this.regions=o.regions,this._rect=o.boundingRect}function ix(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 nx(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"),u=e.getWidth(),h=e.getHeight(),c=r.width/r.height*this.aspectScale,d=!1;if(s&&l&&(s=[Pl(s[0],u),Pl(s[1],h)],l=Pl(l,Math.min(u,h)),isNaN(s[0])||isNaN(s[1])||isNaN(l)||(d=!0)),d){var f={};1<c?(f.width=l,f.height=l/c):(f.height=l,f.width=l*c),f.y=s[1]-f.height/2,f.x=s[0]-f.width/2}else(a=t.getBoxLayoutParams()).aspect=c,f=vu(a,{width:u,height:h});this.setViewRect(f.x,f.y,f.width,f.height),this.setCenter(t.get("center")),this.setZoom(t.get("zoom"))}function ox(i,t){E(t.get("geoCoord"),function(t,e){i.addGeoCoord(e,t)})}b(Jy,fe),Qy.prototype={constructor:Qy,type:"view",dimensions:["x","y"],setBoundingRect:function(t,e,i,n){return this._rect=new Mi(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 Mi(t,e,i,n)},transformTo:function(t,e,i,n){var o=this.getBoundingRect(),a=this._rawTransformable;a.transform=o.calculateTransform(new Mi(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=bt([],n,t),i=bt([],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).updateTransform(),e.updateTransform(),ne(this.transform||(this.transform=[]),e.transform||ee()),this._rawTransform=e.getLocalTransform(),this.invTransform=this.invTransform||[],le(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?$y(i,t,n):at(i,t)},pointToData:function(t){var e=this.invTransform;return e?$y([],t,e):[t[0],t[1]]},convertToPixel:T(tx,"dataToPoint"),convertFromPixel:T(tx,"pointToData"),containPoint:function(t){return this.getViewRectAfterRoam().contain(t[0],t[1])}},b(Qy,fe),ex.prototype={constructor:ex,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},transformTo:function(t,e,i,n){var o=this.getBoundingRect(),a=this._invertLongitute;o=o.clone(),a&&(o.y=-o.y-o.height);var r=this._rawTransformable;if(r.transform=o.calculateTransform(new Mi(t,e,i,n)),r.decomposeTransform(),a){var s=r.scale;s[1]=-s[1]}r.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(){return this._rect},dataToPoint:function(t,e,i){if("string"==typeof t&&(t=this.getGeoCoord(t)),t)return Qy.prototype.dataToPoint.call(this,t,e,i)},convertToPixel:T(ix,"dataToPoint"),convertFromPixel:T(ix,"pointToData")},b(ex,Qy);var ax={dimensions:ex.prototype.dimensions,create:function(t,s){var l=[];t.eachComponent("geo",function(t,e){var i=t.get("map"),n=t.get("aspectScale"),o=!0,a=yd.retrieveMap(i);a&&a[0]&&"svg"===a[0].type?(null==n&&(n=1),o=!1):null==n&&(n=.75);var r=new ex(i+e,i,t.get("nameMap"),o);r.aspectScale=n,r.zoomLimit=t.get("scaleLimit"),l.push(r),ox(r,t),(t.coordinateSystem=r).model=t,r.resize=nx,r.resize(t,s)}),t.eachSeries(function(t){if("geo"===t.get("coordinateSystem")){var e=t.get("geoIndex")||0;t.coordinateSystem=l[e]}});var i={};return t.eachSeriesByType("map",function(t){if(!t.getHostGeoModel()){var e=t.getMapType();i[e]=i[e]||[],i[e].push(t)}}),E(i,function(t,e){var i=new ex(e,e,p(N(t,function(t){return t.get("nameMap")})));i.zoomLimit=W.apply(null,N(t,function(t){return t.get("scaleLimit")})),l.push(i),i.resize=nx,i.aspectScale=t[0].get("aspectScale"),i.resize(t[0],s),E(t,function(t){ox(t.coordinateSystem=i,t)})}),l},getFilledRegions:function(t,e,i){for(var n=(t||[]).slice(),o=Q(),a=0;a<n.length;a++)o.set(n[a].name,n[a]);return E(My.load(e,i).regions,function(t){var e=t.name;o.get(e)||n.push({name:e})}),n}};mf("geo",ax);vf(function(i){var o={};i.eachSeriesByType("map",function(t){var e=t.getMapType();if(!t.getHostGeoModel()&&!o[e]){var l={};E(t.seriesGroup,function(t){var r=t.coordinateSystem,s=t.originalData;t.get("showLegendSymbol")&&i.getComponent("legend")&&s.each(s.mapDimension("value"),function(t,e){var i=s.getName(e),n=r.getRegion(i);if(n&&!isNaN(t)){var o=l[i]||0,a=r.dataToPoint(n.center);l[i]=o+1,s.setItemLayout(e,{point:a,offset:o})}})});var n=t.getData();n.each(function(t){var e=n.getName(t),i=n.getItemLayout(t)||{};i.showLabel=!l[e],n.setItemLayout(t,i)}),o[e]=!0}})}),yf(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})})}),pf(Id.PROCESSOR.STATISTIC,function(t){var n={};t.eachSeriesByType("map",function(t){var e=t.getHostGeoModel(),i=e?"o"+e.id:"i"+t.getMapType();(n[i]=n[i]||[]).push(t)}),E(n,function(t,e){for(var i=function(u,h){var c={};return E(u,function(n){n.each(n.mapDimension("value"),function(t,e){var i="ec-"+n.getName(e);c[i]=c[i]||[],isNaN(t)||c[i].push(t)})}),u[0].map(u[0].mapDimension("value"),function(t,e){for(var i,n="ec-"+u[0].getName(e),o=0,a=1/0,r=-1/0,s=c[n].length,l=0;l<s;l++)a=Math.min(a,c[n][l]),r=Math.max(r,c[n][l]),o+=c[n][l];return i="min"===h?a:"max"===h?r:"average"===h?o/s:o,0===s?NaN:i})}(N(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)[n].needsDrawMap=0===n&&!t[n].getHostGeoModel(),t[n].setData(i.cloneShallow()),t[n].mainSeries=t[0]})}),ff(function(t){var e=[];E(t.series,function(t){t&&"map"===t.type&&(e.push(t),t.map=t.map||t.mapType,C(t,t.mapLocation))})}),Xv("map",[{type:"mapToggleSelect",event:"mapselectchanged",method:"toggleSelected"},{type:"mapSelect",event:"mapselected",method:"select"},{type:"mapUnSelect",event:"mapunselected",method:"unSelect"}]);var rx=E,sx="\0__link_datas",lx="\0__link_mainData";function ux(i){var n=i.mainData,t=i.datas;t||(t={main:n},i.datasAttr={main:"data"}),i.datas=i.mainData=null,px(n,t,i),rx(t,function(e){rx(n.TRANSFERABLE_METHODS,function(t){e.wrapMethod(t,T(hx,i))})}),n.wrapMethod("cloneShallow",T(dx,i)),rx(n.CHANGABLE_METHODS,function(t){n.wrapMethod(t,T(cx,i))}),Y(t[n.dataType]===n)}function hx(t,e){if(function(t){return t[lx]===t}(this)){var i=L({},this[sx]);px(i[this.dataType]=e,i,t)}else gx(e,this.dataType,this[lx],t);return e}function cx(t,e){return t.struct&&t.struct.update(this),e}function dx(i,n){return rx(n[sx],function(t,e){t!==n&&gx(t.cloneShallow(),e,n,i)}),n}function fx(t){var e=this[lx];return null==t||null==e?e:e[sx][t]}function px(i,t,n){i[sx]={},rx(t,function(t,e){gx(t,e,i,n)})}function gx(t,e,i,n){(i[sx][e]=t)[lx]=i,t.dataType=e,n.struct&&(t[n.structAttr]=n.struct,n.struct[n.datasAttr[e]]=t),t.getLinkedData=fx}function mx(t,e){this.name=t||"",this.depth=0,this.height=0,this.parentNode=null,this.dataIndex=-1,this.children=[],this.viewChildren=[],this.hostTree=e}function vx(e,t,i){this.root,this.data,this._nodes=[],this.hostModel=e,this.levelModels=N(t||[],function(t){return new Il(t,e,e.ecModel)}),this.leavesModel=new Il(i||{},e,e.ecModel)}function yx(t,e){var i=e.children;t.parentNode!==e&&(i.push(t),t.parentNode=e)}function xx(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){!function(t){var e=t.children,i=e.length,n=0,o=0;for(;0<=--i;){var a=e[i];a.hierNode.prelim+=n,a.hierNode.modifier+=n,o+=a.hierNode.change,n+=a.hierNode.shift+o}}(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=function(t,e,i,n){if(e){for(var o=t,a=t,r=a.parentNode.children[0],s=e,l=o.hierNode.modifier,u=a.hierNode.modifier,h=r.hierNode.modifier,c=s.hierNode.modifier;s=Mx(s),a=Ix(a),s&&a;){o=Mx(o),r=Ix(r),o.hierNode.ancestor=t;var d=s.hierNode.prelim+c-a.hierNode.prelim-u+n(s,a);0<d&&(Tx((p=t,g=i,(f=s).hierNode.ancestor.parentNode===p.parentNode?f.hierNode.ancestor:g),t,d),u+=d,l+=d),c+=s.hierNode.modifier,u+=a.hierNode.modifier,l+=o.hierNode.modifier,h+=r.hierNode.modifier}s&&!Mx(o)&&(o.hierNode.thread=s,o.hierNode.modifier+=c-l),a&&!Ix(r)&&(r.hierNode.thread=a,r.hierNode.modifier+=u-h,i=t)}var f,p,g;return i}(t,o,t.parentNode.hierNode.defaultAncestor||n[0],e)}function _x(t){var e=t.hierNode.prelim+t.parentNode.hierNode.modifier;t.setLayout({x:e},!0),t.hierNode.modifier+=t.parentNode.hierNode.modifier}function bx(t){return arguments.length?t:Ax}function Sx(t,e){var i={};return t-=Math.PI/2,i.x=e*Math.cos(t),i.y=e*Math.sin(t),i}function Mx(t){var e=t.children;return e.length&&t.isExpand?e[e.length-1]:t.hierNode.thread}function Ix(t){var e=t.children;return e.length&&t.isExpand?e[0]:t.hierNode.thread}function Tx(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 Ax(t,e){return t.parentNode===e.parentNode?1:2}function Dx(t,e){var i=t.getItemLayout(e);return i&&!isNaN(i.x)&&!isNaN(i.y)&&"none"!==t.getItemVisual(e,"symbol")}function Cx(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 Lx(t,e,i,n,o,a){var r=!i,s=t.tree.getNodeByDataIndex(e),l=s.getModel(),u=(a=Cx(s,l,a),t.tree.root),h=s.parentNode===u?s:s.parentNode||s,c=t.getItemGraphicEl(h.dataIndex),d=h.getLayout(),f=c?{x:c.position[0],y:c.position[1],rawX:c.__radialOldRawX,rawY:c.__radialOldRawY}:d,p=s.getLayout();r?(i=new Fg(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),sl(i,{position:[p.x,p.y]},o);var g=i.getSymbolPath();if("radial"===a.layout){var m,v,y=u.children[0],x=y.getLayout(),_=y.children.length;if(p.x===x.x&&!0===s.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===s.children.length||0!==s.children.length&&!1===s.isExpand?(v=p.x<x.x)&&(m-=Math.PI):(v=p.x>x.x)||(m-=Math.PI);var b=v?"left":"right",S=a.labelModel.get("rotate"),M=S*(Math.PI/180);g.setStyle({textPosition:a.labelModel.get("position")||b,textRotation:null==S?-m:M,textOrigin:"center",verticalAlign:"middle"})}if(s.parentNode&&s.parentNode!==u){var I=i.__edge;sl(I=I||(i.__edge=new ls({shape:Px(a,f,f),style:C({opacity:0,strokeNoScale:!0},a.lineStyle)})),{shape:Px(a,d,p),style:{opacity:1}},o),n.add(I)}}function kx(t,e,i,n,o,a){for(var r,s=t.tree.getNodeByDataIndex(e),l=t.tree.root,u=s.getModel(),h=(a=Cx(s,u,a),s.parentNode===l?s:s.parentNode||s);null==(r=h.getLayout());)h=h.parentNode===l?h:h.parentNode||h;sl(i,{position:[r.x+1,r.y+1]},o,function(){n.remove(i),t.setItemGraphicEl(e,null)}),i.fadeOut(null,{keepLabel:!0});var c=i.__edge;c&&sl(c,{shape:Px(a,r,r),style:{opacity:0}},o,function(){n.remove(c)})}function Px(t,e,i){var n,o,a,r,s,l,u,h,c=t.orient;if("radial"!==t.layout)return s=e.x,u=e.y,l=i.x,h=i.y,"LR"!==c&&"RL"!==c||(n=s+(l-s)*t.curvature,o=u,a=l+(s-l)*t.curvature,r=h),"TB"!==c&&"BT"!==c||(n=s,o=u+(h-u)*t.curvature,a=l,r=h+(u-h)*t.curvature),{x1:s,y1:u,x2:l,y2:h,cpx1:n,cpy1:o,cpx2:a,cpy2:r};s=e.rawX,u=e.rawY,l=i.rawX,h=i.rawY;var d=Sx(s,u),f=Sx(s,u+(h-u)*t.curvature),p=Sx(l,h+(u-h)*t.curvature),g=Sx(l,h);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}}function Nx(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;0<=a;a--)n.push(o[a])}}mx.prototype={constructor:mx,isRemoved:function(){return this.dataIndex<0},eachNode:function(t,e,i){"function"==typeof t&&(i=e,e=t,t=null),z(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){0<=this.dataIndex&&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){0<=this.dataIndex&&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)}},vx.prototype={constructor:vx,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(i=0,n=t.count();i<n;i++)e[t.getRawIndex(i)].dataIndex=i},clearLayouts:function(){this.data.clearItemLayouts()}},vx.createTree=function(t,e,i,n){var s=new vx(e,i.levels,i.leaves),l=[],u=1;!function t(e,i){var n=e.value;u=Math.max(u,k(n)?n.length:1);l.push(e);var o=new mx(e.name,s);i?yx(o,i):s.root=o;s._nodes.push(o);var a=e.children;if(a)for(var r=0;r<a.length;r++)t(a[r],o)}(t),s.root.updateDepthAndHeight(0);var o=np(l,{coordDimensions:["value"],dimensionsCount:u}),a=new Wf(o,e);return a.initData(l),ux({mainData:a,struct:s,structAttr:"tree"}),s.update(),n&&n(a),s},ic.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=vx.createTree(e,this,n,function(t){t.wrapMethod("getItemModel",function(t,e){var i=o.getNodeByDataIndex(e),n=i.getLeavesModel();return i.children.length&&i.isExpand||(t.parentModel=n),t})});var a=0;o.eachNode("preorder",function(t){t.depth>a&&(a=t.depth)});var r=t.expandAndCollapse&&0<=t.initialTreeDepth?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},getOrient:function(){var t=this.get("orient");return"horizontal"===t?t="LR":"vertical"===t&&(t="TB"),t},setZoom:function(t){this.option.zoom=t},setCenter:function(t){this.option.center=t},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 eu(a+(isNaN(o)||null==o?"":" : "+o))},defaultOption:{zlevel:0,z:2,coordinateSystem:"view",left:"12%",top:"12%",right:"12%",bottom:"12%",layout:"orthogonal",roam:!1,nodeScaleRatio:.4,center:null,zoom:1,orient:"LR",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}}),Mf({type:"tree",init:function(t,e){this._oldTree,this._mainGroup=new Ii,this._controller=new Ly(e.getZr()),this._controllerHost={target:this.group},this.group.add(this._mainGroup)},render:function(n,t,i,e){var o=n.getData(),a=n.layoutInfo,r=this._mainGroup,s=n.get("layout");"radial"===s?r.attr("position",[a.x+a.width/2,a.y+a.height/2]):r.attr("position",[a.x,a.y]),this._updateViewCoordSys(n,a,s),this._updateController(n,t,i);var l=this._data,u={expandAndCollapse:n.get("expandAndCollapse"),layout:s,orient:n.getOrient(),curvature:n.get("lineStyle.curveness"),symbolRotate:n.get("symbolRotate"),symbolOffset:n.get("symbolOffset"),hoverAnimation:n.get("hoverAnimation"),useNameLabel:!0,fadeIn:!0};o.diff(l).add(function(t){Dx(o,t)&&Lx(o,t,null,r,n,u)}).update(function(t,e){var i=l.getItemGraphicEl(e);Dx(o,t)?Lx(o,t,i,r,n,u):i&&kx(l,e,i,r,n,u)}).remove(function(t){var e=l.getItemGraphicEl(t);e&&kx(l,t,e,r,n,u)}).execute(),this._nodeScaleRatio=n.get("nodeScaleRatio"),this._updateNodeAndLinkScale(n),!0===u.expandAndCollapse&&o.eachItemGraphicEl(function(t,e){t.off("click").on("click",function(){i.dispatchAction({type:"treeExpandAndCollapse",seriesId:n.id,dataIndex:e})})}),this._data=o},_updateViewCoordSys:function(t){var i=t.getData(),n=[];i.each(function(t){var e=i.getItemLayout(t);!e||isNaN(e.x)||isNaN(e.y)||n.push([+e.x,+e.y])});var e=[],o=[];Ba(n,e,o);var a=this._min,r=this._max;o[0]-e[0]==0&&(e[0]=a?a[0]:e[0]-1,o[0]=r?r[0]:o[0]+1),o[1]-e[1]==0&&(e[1]=a?a[1]:e[1]-1,o[1]=r?r[1]:o[1]+1);var s=t.coordinateSystem=new Qy;s.zoomLimit=t.get("scaleLimit"),s.setBoundingRect(e[0],e[1],o[0]-e[0],o[1]-e[1]),s.setCenter(t.get("center")),s.setZoom(t.get("zoom")),this.group.attr({position:s.position,scale:s.scale}),this._viewCoordSys=s,this._min=e,this._max=o},_updateController:function(o,t,a){var e=this._controller,i=this._controllerHost,r=this.group;e.setPointerChecker(function(t,e,i){var n=r.getBoundingRect();return n.applyTransform(r.transform),n.contain(e,i)&&!Wy(t,a,o)}),e.enable(o.get("roam")),i.zoomLimit=o.get("scaleLimit"),i.zoom=o.coordinateSystem.getZoom(),e.off("pan").off("zoom").on("pan",function(t){Vy(i,t.dx,t.dy),a.dispatchAction({seriesId:o.id,type:"treeRoam",dx:t.dx,dy:t.dy})},this).on("zoom",function(t){Gy(i,t.scale,t.originX,t.originY),a.dispatchAction({seriesId:o.id,type:"treeRoam",zoom:t.scale,originX:t.originX,originY:t.originY}),this._updateNodeAndLinkScale(o)},this)},_updateNodeAndLinkScale:function(t){var 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},dispose:function(){this._controller&&this._controller.dispose(),this._controllerHost={}},remove:function(){this._mainGroup.removeAll(),this._data=null}}),gf({type:"treeExpandAndCollapse",event:"treeExpandAndCollapse",update:"update"},function(n,t){t.eachComponent({mainType:"series",subType:"tree",query:n},function(t){var e=n.dataIndex,i=t.getData().tree.getNodeByDataIndex(e);i.isExpand=!i.isExpand})}),gf({type:"treeRoam",event:"treeRoam",update:"none"},function(i,t){t.eachComponent({mainType:"series",subType:"tree",query:i},function(t){var e=Ky(t.coordinateSystem,i);t.setCenter&&t.setCenter(e.center),t.setZoom&&t.setZoom(e.zoom)})});function Ox(t,e,i){if(t&&0<=_(e,t.type)){var n=i.getData().tree.root,o=t.targetNode;if("string"==typeof o&&(o=n.getNodeById(o)),o&&n.contains(o))return{node:o};var a=t.targetNodeId;if(null!=a&&(o=n.getNodeById(a)))return{node:o}}}function Ex(t){for(var e=[];t;)(t=t.parentNode)&&e.push(t);return e.reverse()}function zx(t,e){return 0<=_(Ex(t),e)}function Rx(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}yf(Mm("tree","circle")),vf(function(t,e){t.eachSeriesByType("tree",function(t){!function(t,e){var i=function(t,e){return vu(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}(t,e);t.layoutInfo=i;var n=t.get("layout"),o=0,a=0,r=null;r="radial"===n?(o=2*Math.PI,a=Math.min(i.height,i.width)/2,bx(function(t,e){return(t.parentNode===e.parentNode?1:2)/t.depth})):(o=i.width,a=i.height,bx());var s=t.getData().tree.root,l=s.children[0];if(l){!function(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;0<=o;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)}}(s),function(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)}(l,xx,r),s.hierNode.modifier=-l.hierNode.prelim,Nx(l,_x);var u=l,h=l,c=l;Nx(l,function(t){var e=t.getLayout().x;e<u.getLayout().x&&(u=t),e>h.getLayout().x&&(h=t),t.depth>c.depth&&(c=t)});var d=u===h?1:r(u,h)/2,f=d-u.getLayout().x,p=0,g=0,m=0,v=0;if("radial"===n)p=o/(h.getLayout().x+d+f),g=a/(c.depth-1||1),Nx(l,function(t){m=(t.getLayout().x+f)*p,v=(t.depth-1)*g;var e=Sx(m,v);t.setLayout({x:e.x,y:e.y,rawX:m,rawY:v},!0)});else{var y=t.getOrient();"RL"===y||"LR"===y?(g=a/(h.getLayout().x+d+f),p=o/(c.depth-1||1),Nx(l,function(t){v=(t.getLayout().x+f)*g,m="LR"===y?(t.depth-1)*p:o-(t.depth-1)*p,t.setLayout({x:m,y:v},!0)})):"TB"!==y&&"BT"!==y||(p=o/(h.getLayout().x+d+f),g=a/(c.depth-1||1),Nx(l,function(t){m=(t.getLayout().x+f)*p,v="TB"===y?(t.depth-1)*g:a-(t.depth-1)*g,t.setLayout({x:m,y:v},!0)}))}}}(t,e)})}),ic.extend({type:"series.treemap",layoutMode:"box",dependencies:["grid","polar"],preventUsingHoverLayer:!0,_viewRoot:null,defaultOption:{progressive: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};!function i(t){var n=0;E(t.children,function(t){i(t);var e=t.value;k(e)&&(e=e[0]),n+=e});var e=t.value;k(e)&&(e=e[0]);null!=e&&!isNaN(e)||(e=n);e<0&&(e=0);k(t.value)?t.value[0]=e:t.value=e}(i);var n=t.levels||[];n=t.levels=function(t,e){var n,i=e.get("color");if(!i)return;if(E(t=t||[],function(t){var e=new Il(t),i=e.get("color");(e.get("itemStyle.color")||i&&"none"!==i)&&(n=!0)}),!n){(t[0]||(t[0]={})).color=i.slice()}return t}(n,e);var o={};return o.levels=n,vx.createTree(i,this,o).data},optionUpdated:function(){this.resetViewRoot()},formatTooltip:function(t){var e=this.getData(),i=this.getRawValue(t),n=k(i)?Kl(i[0]):Kl(i);return eu(e.getName(t)+": "+n)},getDataParams:function(t){var e=ic.prototype.getDataParams.apply(this,arguments),i=this.getData().tree.getNodeByDataIndex(t);return e.treePathInfo=Rx(i,this),e},setLayoutInfo:function(t){this.layoutInfo=this.layoutInfo||{},L(this.layoutInfo,t)},mapIdToIndex:function(t){var e=this._idIndexMap;e||(e=this._idIndexMap=Q(),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 Bx=5;function Vx(t){this.group=new Ii,t.add(this.group)}function Gx(t,e,i,n,o,a){var r=[[o?t:t-Bx,e],[t+i,e],[t+i,e+n],[o?t:t-Bx,e+n]];return a||r.splice(2,0,[t+i+Bx,e+n/2]),o||r.push([t,e+n/2]),r}Vx.prototype={constructor:Vx,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),yu(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,r,s=0,l=e.emptyItemWidth,u=t.get("breadcrumb.height"),h=function(t,e,i){var n=e.width,o=e.height,a=Pl(t.x,n),r=Pl(t.y,o),s=Pl(t.x2,n),l=Pl(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=Jl(i||0),{width:Math.max(s-a-i[1]-i[3],0),height:Math.max(l-r-i[0]-i[2],0)}}(e.pos,e.box),c=e.totalWidth,d=e.renderList,f=d.length-1;0<=f;f--){var p=d[f],g=p.node,m=p.width,v=p.text;c>h.width&&(c-=m-l,m=l,v=null);var y=new qr({shape:{points:Gx(s,0,m,u,f===d.length-1,0===f)},style:C(i.getItemStyle(),{lineJoin:"bevel",text:v,textFill:n.getTextColor(),textFont:n.getFont()}),z:10,onclick:T(o,g)});this.group.add(y),a=t,r=g,y.eventData={componentType:"series",componentSubType:"treemap",componentIndex:a.componentIndex,seriesIndex:a.componentIndex,seriesName:a.name,seriesType:"treemap",selfType:"breadcrumb",nodeData:{dataIndex:r&&r.dataIndex,name:r&&r.name},treePathInfo:r&&Rx(r,a)},s+=m+8}},remove:function(){this.group.removeAll()}};function Fx(t){var e=$x(t);return e.stroke=e.fill=e.lineWidth=null,e}var Wx=A,Hx=Ii,Zx=is,Ux=E,Xx=["label"],Yx=["emphasis","label"],jx=["upperLabel"],qx=["emphasis","upperLabel"],Kx=10,$x=ra([["fill","color"],["stroke","strokeColor"],["lineWidth","strokeWidth"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]);function Jx(d,r,s,l,u,i,f,t,e,n){if(f){var p=f.getLayout();if(p&&p.isInView){var h=p.width,c=p.height,g=p.borderWidth,m=p.invisible,v=f.getRawIndex(),y=t&&t.getRawIndex(),o=f.viewChildren,x=p.upperHeight,a=o&&o.length,_=f.getModel("itemStyle"),w=f.getModel("emphasis.itemStyle"),b=A("nodeGroup",Hx);if(b){if(e.add(b),b.attr("position",[p.x||0,p.y||0]),b.__tmNodeWidth=h,b.__tmNodeHeight=c,p.isAboveViewRoot)return b;var S=A("background",Zx,n,1);if(S&&function(t,n,o){n.dataIndex=f.dataIndex,n.seriesIndex=d.seriesIndex,n.setShape({x:0,y:0,width:h,height:c});var a=f.getVisual("borderColor",!0),r=w.get("borderColor");I(n,function(){var t=Fx(_);t.fill=a;var e=$x(w);if(e.fill=r,o){var i=h-2*g;T(t,e,a,i,x,{x:g,y:0,width:i,height:x})}else t.text=e.text=null;n.setStyle(t),Ys(n,e)}),t.add(n)}(b,S,a&&p.upperHeight),!a){var M=A("content",Zx,n,2);M&&function(t,i){i.dataIndex=f.dataIndex,i.seriesIndex=d.seriesIndex;var n=Math.max(h-2*g,0),o=Math.max(c-2*g,0);i.culling=!0,i.setShape({x:g,y:g,width:n,height:o});var a=f.getVisual("color",!0);I(i,function(){var t=Fx(_);t.fill=a;var e=$x(w);T(t,e,a,n,o),i.setStyle(t),Ys(i,e)}),t.add(i)}(b,M)}return b}}}function I(t,e){m?t.invisible||i.push(t):(e(),t.__tmWillVisible||(t.invisible=!1))}function T(t,e,i,n,o,a){var r=f.getModel(),s=W(d.getFormattedLabel(f.dataIndex,"normal",null,null,a?"upperLabel":"label"),r.get("name"));if(!a&&p.isLeafRoot){var l=d.get("drillDownIcon",!0);s=l?l+" "+s:s}var u=r.getModel(a?jx:Xx),h=r.getModel(a?qx:Yx),c=u.getShallow("show");$s(t,e,u,h,{defaultText:c?s:null,autoColor:i,isRectText:!0}),a&&(t.textRect=D(a)),t.truncate=c&&u.get("ellipsis")?{outerWidth:n,outerHeight:o,minChar:2}:null}function A(t,e,i,n){var o=null!=y&&s[t][y],a=u[t];return o?(s[t][y]=null,function(t,e,i){(t[v]={}).old="nodeGroup"===i?e.position.slice():L({},e.shape)}(a,o,t)):m||((o=new e({z:function(t,e){var i=t*Kx+e;return(i-1)/i}(i,n)})).__tmDepth=i,function(t,e,i){var n=t[v]={},o=f.parentNode;if(o&&(!l||"drillDown"===l.direction)){var a=0,r=0,s=u.background[o.getRawIndex()];!l&&s&&s.old&&(a=s.old.width,r=s.old.height),n.old="nodeGroup"===i?[0,r]:{x:a,y:r,width:0,height:0}}n.fadein="nodeGroup"!==i}(a,0,o.__tmStorageName=t)),r[t][v]=o}}Mf({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(!(_(e.findComponents({mainType:"series",subType:"treemap",query:n}),t)<0)){this.seriesModel=t,this.api=i,this.ecModel=e;var o=Ox(n,["treemapZoomToNode","treemapRootToNode"],t),a=n&&n.type,r=t.layoutInfo,s=!this._oldTree,l=this._storage,u="treemapRootToNode"===a&&o&&l?{rootNodeGroup:l.nodeGroup[o.node.getRawIndex()],direction:n.direction}:null,h=this._giveContainerGroup(r),c=this._doRender(h,t,u);s||a&&"treemapZoomToNode"!==a&&"treemapRootToNode"!==a?c.renderFinally():this._doAnimation(h,c,t,u),this._resetController(i),this._renderBreadcrumb(t,i,o)}},_giveContainerGroup:function(t){var e=this._containerGroup;return e||(e=this._containerGroup=new Hx,this._initEvents(e),this.group.add(e)),e.attr("position",[t.x,t.y]),e},_doRender:function(t,e,i){var n=e.getData().tree,o=this._oldTree,a={nodeGroup:[],background:[],content:[]},r={nodeGroup:[],background:[],content:[]},s=this._storage,l=[],c=T(Jx,e,r,s,i,a,l);!function a(r,s,l,u,h){u?Ux(s=r,function(t,e){t.isRemoved()||i(e,e)}):new Tf(s,r,t,t).add(i).update(i).remove(T(i,null)).execute();function t(t){return t.getId()}function i(t,e){var i=null!=t?r[t]:null,n=null!=e?s[e]:null,o=c(i,n,l,h);o&&a(i&&i.viewChildren||[],n&&n.viewChildren||[],o,u,h+1)}}(n.root?[n.root]:[],o&&o.root?[o.root]:[],t,n===o||!o,0);var u,h,d=(h={nodeGroup:[],background:[],content:[]},(u=s)&&Ux(u,function(t,e){var i=h[e];Ux(t,function(t){t&&(i.push(t),t.__tmWillDelete=1)})}),h);return this._oldTree=n,this._storage=r,{lastsForAnimation:a,willDeleteEls:d,renderFinally:function(){Ux(d,function(t){Ux(t,function(t){t.parent&&t.parent.remove(t)})}),Ux(l,function(t){t.invisible=!0,t.dirty()})}}},_doAnimation:function(t,a,e,s){if(e.get("animation")){var l=e.get("animationDurationUpdate"),u=e.get("animationEasing"),h=function(){var a,r=[],s={};return{add:function(t,e,i,n,o){return z(n)&&(o=n,n=0),!s[t.id]&&(s[t.id]=1,r.push({el:t,target:e,time:i,delay:n,easing:o}),!0)},done:function(t){return a=t,this},start:function(){for(var t=r.length,e=0,i=r.length;e<i;e++){var n=r[e];n.el.animateTo(n.target,n.time,n.delay,n.easing,o)}return this;function o(){--t||(r.length=0,s={},a&&a())}}}}();Ux(a.willDeleteEls,function(t,r){Ux(t,function(t,e){if(!t.invisible){var i,n=t.parent;if(s&&"drillDown"===s.direction)i=n===s.rootNodeGroup?{shape:{x:0,y:0,width:n.__tmNodeWidth,height:n.__tmNodeHeight},style:{opacity:0}}:{style:{opacity:0}};else{var o=0,a=0;n.__tmWillDelete||(o=n.__tmNodeWidth/2,a=n.__tmNodeHeight/2),i="nodeGroup"===r?{position:[o,a],style:{opacity:0}}:{shape:{x:o,y:a,width:0,height:0},style:{opacity:0}}}i&&h.add(t,i,l,u)}})}),Ux(this._storage,function(t,o){Ux(t,function(t,e){var i=a.lastsForAnimation[o][e],n={};i&&("nodeGroup"===o?i.old&&(n.position=t.position.slice(),t.attr("position",i.old)):(i.old&&(n.shape=L({},t.shape),t.setShape(i.old)),i.fadein?(t.setStyle("opacity",0),n.style={opacity:1}):1!==t.style.opacity&&(n.style={opacity:1})),h.add(t,n,l,u))})},this),this._state="animating",h.done(Wx(function(){this._state="ready",a.renderFinally()},this)).start()}},_resetController:function(t){var e=this._controller;e||((e=this._controller=new Ly(t.getZr())).enable(this.seriesModel.get("roam")),e.on("pan",Wx(this._onPan,this)),e.on("zoom",Wx(this._onZoom,this)));var n=new Mi(0,0,t.getWidth(),t.getHeight());e.setPointerChecker(function(t,e,i){return n.contain(e,i)})},_clearController:function(){var t=this._controller;t&&(t.dispose(),t=null)},_onPan:function(t){if("animating"!==this._state&&(3<Math.abs(t.dx)||3<Math.abs(t.dy))){var e=this.seriesModel.getData().tree.root;if(!e)return;var i=e.getLayout();if(!i)return;this.api.dispatchAction({type:"treemapMove",from:this.uid,seriesId:this.seriesModel.id,rootRect:{x:i.x+t.dx,y:i.y+t.dy,width:i.width,height:i.height}})}},_onZoom:function(t){var e=t.originX,i=t.originY;if("animating"!==this._state){var n=this.seriesModel.getData().tree.root;if(!n)return;var o=n.getLayout();if(!o)return;var a=new Mi(o.x,o.y,o.width,o.height),r=this.seriesModel.layoutInfo;e-=r.x,i-=r.y;var s=ee();ae(s,s,[-e,-i]),se(s,s,[t.scale,t.scale]),ae(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(e,t,i){i=i||((i=null!=e.get("leafDepth",!0)?{node:e.getViewRoot()}:this.findTarget(t.getWidth()/2,t.getHeight()/2))||{node:e.getData().tree.root}),(this._breadcrumb||(this._breadcrumb=new Vx(this.group))).render(e,t,i.node,Wx(function(t){"animating"!==this._state&&(zx(e.getViewRoot(),t)?this._rootToNode({node:t}):this._zoomToNode({node:t}))},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(o,a){var r;return this.seriesModel.getViewRoot().eachNode({attr:"viewChildren",order:"preorder"},function(t){var e=this._storage.background[t.getRawIndex()];if(e){var i=e.transformCoordToLocal(o,a),n=e.shape;if(!(n.x<=i[0]&&i[0]<=n.x+n.width&&n.y<=i[1]&&i[1]<=n.y+n.height))return!1;r={node:t,offsetX:i[0],offsetY:i[1]}}},this),r}});for(var Qx=function(){},t_=["treemapZoomToNode","treemapRender","treemapMove"],e_=0;e_<t_.length;e_++)gf({type:t_[e_],update:"updateView"},Qx);gf({type:"treemapRootToNode",update:"updateView"},function(o,t){t.eachComponent({mainType:"series",subType:"treemap",query:o},function(t,e){var i=Ox(o,["treemapZoomToNode","treemapRootToNode"],t);if(i){var n=t.getViewRoot();n&&(o.direction=zx(n,i.node)?"rollUp":"drillDown"),t.resetViewRoot(i.node)}})});var i_=E,n_=R,o_=-1,a_=function(t){var e=t.mappingMethod,i=t.type,n=this.option=D(t);this.type=i,this.mappingMethod=e,this._normalizeData=m_[e];var o=r_[i];this.applyVisual=o.applyVisual,this.getColorMapper=o.getColorMapper,this._doMap=o._doMap[e],"piecewise"===e?(s_(n),function(i){var t=i.pieceList;i.hasSpecialVisual=!1,E(t,function(t,e){t.originIndex=e,null!=t.visual&&(i.hasSpecialVisual=!0)})}(n)):"category"===e?n.categories?function(t){var e=t.categories,i=t.visual,n=t.categoryMap={};if(i_(e,function(t,e){n[t]=e}),!k(i)){var o=[];R(i)?i_(i,function(t,e){var i=n[e];o[null!=i?i:o_]=t}):o[o_]=i,i=g_(t,o)}for(var a=e.length-1;0<=a;a--)null==i[a]&&(delete n[e[a]],e.pop())}(n):s_(n,!0):(Y("linear"!==e||n.dataExtent),s_(n))};a_.prototype={constructor:a_,mapValueToVisual:function(t){var e=this._normalizeData(t);return this._doMap(e,t)},getNormalizer:function(){return A(this._normalizeData,this)}};var r_=a_.visualHandlers={color:{applyVisual:h_("color"),getColorMapper:function(){var o=this.option;return A("category"===o.mappingMethod?function(t,e){return e||(t=this._normalizeData(t)),c_.call(this,t)}:function(t,e,i){var n=!!i;return e||(t=this._normalizeData(t)),i=Fe(t,o.parsedVisual,i),n?i:Ye(i,"rgba")},this)},_doMap:{linear:function(t){return Ye(Fe(t,this.option.parsedVisual),"rgba")},category:c_,piecewise:function(t,e){var i=p_.call(this,e);return null==i&&(i=Ye(Fe(t,this.option.parsedVisual),"rgba")),i},fixed:d_}},colorHue:l_(function(t,e){return Ue(t,e)}),colorSaturation:l_(function(t,e){return Ue(t,null,e)}),colorLightness:l_(function(t,e){return Ue(t,null,null,e)}),colorAlpha:l_(function(t,e){return Xe(t,e)}),opacity:{applyVisual:h_("opacity"),_doMap:f_([0,1])},liftZ:{applyVisual:h_("liftZ"),_doMap:{linear:d_,category:d_,piecewise:d_,fixed:d_}},symbol:{applyVisual:function(t,e,i){var n=this.mapValueToVisual(t);if(z(n))i("symbol",n);else if(n_(n))for(var o in n)n.hasOwnProperty(o)&&i(o,n[o])},_doMap:{linear:u_,category:c_,piecewise:function(t,e){var i=p_.call(this,e);return null==i&&(i=u_.call(this,t)),i},fixed:d_}},symbolSize:{applyVisual:h_("symbolSize"),_doMap:f_([0,1])}};function s_(t,e){var i=t.visual,n=[];R(i)?i_(i,function(t){n.push(t)}):null!=i&&n.push(i);e||1!==n.length||{color:1,symbol:1}.hasOwnProperty(t.type)||(n[1]=n[0]),g_(t,n)}function l_(n){return{applyVisual:function(t,e,i){t=this.mapValueToVisual(t),i("color",n(e("color"),t))},_doMap:f_([0,1])}}function u_(t){var e=this.option.visual;return e[Math.round(kl(t,[0,1],[0,e.length-1],!0))]||{}}function h_(n){return function(t,e,i){i(n,this.mapValueToVisual(t))}}function c_(t){var e=this.option.visual;return e[this.option.loop&&t!==o_?t%e.length:t]}function d_(){return this.option.visual[0]}function f_(n){return{linear:function(t){return kl(t,n,this.option.visual,!0)},category:c_,piecewise:function(t,e){var i=p_.call(this,e);return null==i&&(i=kl(t,n,this.option.visual,!0)),i},fixed:d_}}function p_(t){var e=this.option,i=e.pieceList;if(e.hasSpecialVisual){var n=i[a_.findPieceIndex(t,i)];if(n&&n.visual)return n.visual[this.type]}}function g_(t,e){return t.visual=e,"color"===t.type&&(t.parsedVisual=N(e,function(t){return Re(t)})),e}var m_={linear:function(t){return kl(t,this.option.dataExtent,[0,1],!0)},piecewise:function(t){var e=this.option.pieceList,i=a_.findPieceIndex(t,e,!0);if(null!=i)return kl(i,[0,e.length-1],[0,1],!0)},category:function(t){var e=this.option.categories?this.option.categoryMap[t]:t;return null==e?o_:e},fixed:et};function v_(t,e,i){return t?e<=i:e<i}a_.listVisualTypes=function(){var i=[];return E(r_,function(t,e){i.push(e)}),i},a_.addVisualHandler=function(t,e){r_[t]=e},a_.isValidType=function(t){return r_.hasOwnProperty(t)},a_.eachVisual=function(t,e,i){R(t)?E(t,e,i):e.call(i,t)},a_.mapVisual=function(t,n,o){var a,r=k(t)?[]:R(t)?{}:(a=!0,null);return a_.eachVisual(t,function(t,e){var i=n.call(o,t,e);a?r=i:r[e]=i}),r},a_.retrieveVisuals=function(i){var n,o={};return i&&i_(r_,function(t,e){i.hasOwnProperty(e)&&(o[e]=i[e],n=!0)}),n?o:null},a_.prepareVisualTypes=function(t){if(n_(t)){var i=[];i_(t,function(t,e){i.push(e)}),t=i}else{if(!k(t))return[];t=t.slice()}return t.sort(function(t,e){return"color"===e&&"color"!==t&&0===t.indexOf("color")?1:-1}),t},a_.dependsOn=function(t,e){return"color"===e?!(!t||0!==t.indexOf(e)):t===e},a_.findPieceIndex=function(n,t,e){for(var o,a=1/0,i=0,r=t.length;i<r;i++){var s=t[i].value;if(null!=s){if(s===n||"string"==typeof s&&s===n+"")return i;e&&c(s,i)}}for(i=0,r=t.length;i<r;i++){var l=t[i],u=l.interval,h=l.close;if(u){if(u[0]===-1/0){if(v_(h[1],n,u[1]))return i}else if(u[1]===1/0){if(v_(h[0],u[0],n))return i}else if(v_(h[0],u[0],n)&&v_(h[1],n,u[1]))return i;e&&c(u[0],i),e&&c(u[1],i)}}if(e)return n===1/0?t.length-1:n===-1/0?0:o;function c(t,e){var i=Math.abs(t-n);i<a&&(a=i,o=e)}};var y_=k,x_="itemStyle",__={seriesType:"treemap",reset:function(t,e,i,n){var o=t.getData().tree,a=o.root,r=t.getModel(x_);a.isRemoved()||!function n(t,e,o,a,r,s){var l=t.getModel();var i=t.getLayout();if(!i||i.invisible||!i.isInView)return;var u=t.getModel(x_);var h=o[t.depth];var c=w_(u,e,h,a);var d=u.get("borderColor");var f=u.get("borderColorSaturation");var p;null!=f&&(p=b_(c),g=f,d=null!=(m=p)?Ue(m,null,null,g):null);var g,m;t.setVisual("borderColor",d);var v=t.viewChildren;if(v&&v.length){var y=M_(t,l,i,u,c,v);E(v,function(t,e){if(t.depth>=r.length||t===r[t.depth]){var i=T_(l,c,t,e,y,s);n(t,i,o,a,r,s)}})}else p=b_(c),t.setVisual("color",p)}(a,{},N(o.levelModels,function(t){return t?t.get(x_):null}),r,t.getViewRoot().getAncestors(),t)}};function w_(i,n,o,a){var r=L({},n);return E(["color","colorAlpha","colorSaturation"],function(t){var e=i.get(t,!0);null==e&&o&&(e=o[t]),null==e&&(e=n[t]),null==e&&(e=a.get(t)),null!=e&&(r[t]=e)}),r}function b_(t){var e=S_(t,"color");if(e){var i=S_(t,"colorAlpha"),n=S_(t,"colorSaturation");return n&&(e=Ue(e,null,null,n)),i&&(e=Xe(e,i)),e}}function S_(t,e){var i=t[e];if(null!=i&&"none"!==i)return i}function M_(t,e,i,n,o,a){if(a&&a.length){var r=I_(e,"color")||null!=o.color&&"none"!==o.color&&(I_(e,"colorAlpha")||I_(e,"colorSaturation"));if(r){var s=e.get("visualMin"),l=e.get("visualMax"),u=i.dataExtent.slice();null!=s&&s<u[0]&&(u[0]=s),null!=l&&l>u[1]&&(u[1]=l);var h=e.get("colorMappingBy"),c={type:r.name,dataExtent:u,visual:r.range};"color"!==c.type||"index"!==h&&"id"!==h?c.mappingMethod="linear":(c.mappingMethod="category",c.loop=!0);var d=new a_(c);return d.__drColorMappingBy=h,d}}}function I_(t,e){var i=t.get(e);return y_(i)&&i.length?{name:e,range:i}:null}function T_(t,e,i,n,o,a){var r=L({},e);if(o){var s=o.type,l="color"===s&&o.__drColorMappingBy,u="index"===l?n:"id"===l?a.mapIdToIndex(i.getId()):i.getValue(t.get("visualDimension"));r[s]=o.mapValueToVisual(u)}return r}var A_=Math.max,D_=Math.min,C_=W,L_=E,k_=["itemStyle","borderWidth"],P_=["itemStyle","gapWidth"],N_=["upperLabel","show"],O_=["upperLabel","height"],E_={seriesType:"treemap",reset:function(t,e,i,n){var o=i.getWidth(),a=i.getHeight(),r=t.option,s=vu(t.getBoxLayoutParams(),{width:i.getWidth(),height:i.getHeight()}),l=r.size||[],u=Pl(C_(s.width,l[0]),o),h=Pl(C_(s.height,l[1]),a),c=n&&n.type,d=Ox(n,["treemapZoomToNode","treemapRootToNode"],t),f="treemapRender"===c||"treemapMove"===c?n.rootRect:null,p=t.getViewRoot(),g=Ex(p);if("treemapMove"!==c){var m="treemapZoomToNode"===c?function(t,e,i,n,o){var a,r=(e||{}).node,s=[n,o];if(!r||r===i)return s;var l=n*o,u=l*t.option.zoomToNodeRatio;for(;a=r.parentNode;){for(var h=0,c=a.children,d=0,f=c.length;d<f;d++)h+=c[d].getValue();var p=r.getValue();if(0===p)return s;u*=h/p;var g=a.getModel(),m=g.get(k_),v=Math.max(m,V_(g));u+=4*m*m+(3*m+v)*Math.pow(u,.5),Vl<u&&(u=Vl),r=a}u<l&&(u=l);var y=Math.pow(u/l,.5);return[n*y,o*y]}(t,d,p,u,h):f?[f.width,f.height]:[u,h],v=r.sort;v&&"asc"!==v&&"desc"!==v&&(v="desc");var y={squareRatio:r.squareRatio,sort:v,leafDepth:r.leafDepth};p.hostTree.clearLayouts();var x={x:0,y:0,width:m[0],height:m[1],area:m[0]*m[1]};p.setLayout(x),function t(e,i,n,o){var a;var r;if(e.isRemoved())return;var s=e.getLayout();a=s.width;r=s.height;var l=e.getModel();var u=l.get(k_);var h=l.get(P_)/2;var c=V_(l);var d=Math.max(u,c);var f=u-h;var p=d-h;var l=e.getModel();e.setLayout({borderWidth:u,upperHeight:d,upperLabelHeight:c},!0);a=A_(a-2*f,0);r=A_(r-f-p,0);var g=a*r;var m=z_(e,l,g,i,n,o);if(!m.length)return;var v={x:f,y:p,width:a,height:r};var y=D_(a,r);var x=1/0;var _=[];_.area=0;for(var w=0,b=m.length;w<b;){var S=m[w];_.push(S),_.area+=S.getLayout().area;var M=R_(_,y,i.squareRatio);x=M<=x?(w++,M):(_.area-=_.pop().getLayout().area,B_(_,y,v,h,!1),y=D_(v.width,v.height),_.length=_.area=0,1/0)}_.length&&B_(_,y,v,h,!0);if(!n){var I=l.get("childrenVisibleMin");null!=I&&g<I&&(n=!0)}for(var w=0,b=m.length;w<b;w++)t(m[w],i,n,o+1)}(p,y,!1,0);x=p.getLayout();L_(g,function(t,e){var i=(g[e+1]||p).getValue();t.setLayout(L({dataExtent:[i,i],borderWidth:0,upperHeight:0},x))})}var _=t.getData().tree.root;_.setLayout(function(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;var r=[a.width/2,a.height/2],s=o;for(;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]}}(s,f,d),!0),t.setLayoutInfo(s),function e(t,i,n,o,a){var r=t.getLayout();var s=n[a];var l=s&&s===t;if(s&&!l||a===n.length&&t!==o)return;t.setLayout({isInView:!0,invisible:!l&&!i.intersect(r),isAboveViewRoot:l},!0);var u=new Mi(i.x-r.x,i.y-r.y,i.width,i.height);L_(t.viewChildren||[],function(t){e(t,u,n,o,a+1)})}(_,new Mi(-s.x,-s.y,o,a),g,p,0)}};function z_(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=[];!function(t,n){n&&t.sort(function(t,e){var i="asc"===n?t.getValue()-e.getValue():e.getValue()-t.getValue();return 0==i?"asc"===n?t.dataIndex-e.dataIndex:e.dataIndex-t.dataIndex:i})}(r=M(r,function(t){return!t.isRemoved()}),s);var u=function(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];L_(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}}(e,r,s);if(0===u.sum)return t.viewChildren=[];if(u.sum=function(t,e,i,n,o){if(!n)return i;for(var a=t.get("visibleMin"),r=o.length,s=r,l=r-1;0<=l;l--){var u=o["asc"===n?r-l-1:l].getValue();u/i*e<a&&(s=l,i-=u)}return"asc"===n?o.splice(0,r-s):o.splice(s,r-s),i}(e,i,u.sum,s,r),0===u.sum)return t.viewChildren=[];for(var h=0,c=r.length;h<c;h++){var d=r[h].getValue()/u.sum*i;r[h].setLayout({area:d})}return l&&(r.length&&t.setLayout({isLeafRoot:!0},!0),r.length=0),t.viewChildren=r,t.setLayout({dataExtent:u.dataExtent},!0),r}function R_(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),o<n&&(o=n));var l=t.area*t.area,u=e*e*i;return l?A_(u*o/l,l/(u*a)):1/0}function B_(t,e,i,n,o){var a=e===i.width?0:1,r=1-a,s=["x","y"],l=["width","height"],u=i[s[a]],h=e?t.area/e:0;(o||h>i[l[r]])&&(h=i[l[r]]);for(var c=0,d=t.length;c<d;c++){var f=t[c],p={},g=h?f.getLayout().area/h:0,m=p[l[r]]=A_(h-2*n,0),v=i[s[a]]+i[l[a]]-u,y=c===d-1||v<g?v:g,x=p[l[a]]=A_(y-2*n,0);p[s[r]]=i[s[r]]+D_(n,m/2),p[s[a]]=u+D_(n,x/2),u+=y,f.setLayout(p,!0)}i[s[r]]+=h,i[l[r]]-=h}function V_(t){return t.get(N_)?t.get(O_):0}function G_(t){return"_EC_"+t}yf(__),vf(E_);function F_(t){this._directed=t||!1,this.nodes=[],this.edges=[],this._nodesMap={},this._edgesMap={},this.data,this.edgeData}var W_=F_.prototype;function H_(t,e){this.id=null==t?"":t,this.inEdges=[],this.outEdges=[],this.edges=[],this.hostGraph,this.dataIndex=null==e?-1:e}function Z_(t,e,i){this.node1=t,this.node2=e,this.dataIndex=null==i?-1:i}W_.type="graph",W_.isDirected=function(){return this._directed},W_.addNode=function(t,e){t=null==t?""+e:""+t;var i=this._nodesMap;if(!i[G_(t)]){var n=new H_(t,e);return(n.hostGraph=this).nodes.push(n),i[G_(t)]=n}},W_.getNodeByIndex=function(t){var e=this.data.getRawIndex(t);return this.nodes[e]},W_.getNodeById=function(t){return this._nodesMap[G_(t)]},W_.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]),H_.isInstance(t)||(t=n[G_(t)]),H_.isInstance(e)||(e=n[G_(e)]),t&&e){var a=t.id+"-"+e.id;if(!o[a]){var r=new Z_(t,e,i);return(r.hostGraph=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}}},W_.getEdgeByIndex=function(t){var e=this.edgeData.getRawIndex(t);return this.edges[e]},W_.getEdge=function(t,e){H_.isInstance(t)&&(t=t.id),H_.isInstance(e)&&(e=e.id);var i=this._edgesMap;return this._directed?i[t+"-"+e]:i[t+"-"+e]||i[e+"-"+t]},W_.eachNode=function(t,e){for(var i=this.nodes,n=i.length,o=0;o<n;o++)0<=i[o].dataIndex&&t.call(e,i[o],o)},W_.eachEdge=function(t,e){for(var i=this.edges,n=i.length,o=0;o<n;o++)0<=i[o].dataIndex&&0<=i[o].node1.dataIndex&&0<=i[o].node2.dataIndex&&t.call(e,i[o],o)},W_.breadthFirstTraverse=function(t,e,i,n){if(H_.isInstance(e)||(e=this._nodesMap[G_(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;){var s=r.shift(),l=s[o];for(a=0;a<l.length;a++){var u=l[a],h=u.node1===s?u.node2:u.node1;if(!h.__visited){if(t.call(n,h,s))return;r.push(h),h.__visited=!0}}}}},W_.update=function(){for(var t=this.data,i=this.edgeData,e=this.nodes,n=this.edges,o=0,a=e.length;o<a;o++)e[o].dataIndex=-1;for(o=0,a=t.count();o<a;o++)e[t.getRawIndex(o)].dataIndex=o;i.filterSelf(function(t){var e=n[i.getRawIndex(t)];return 0<=e.node1.dataIndex&&0<=e.node2.dataIndex});for(o=0,a=n.length;o<a;o++)n[o].dataIndex=-1;for(o=0,a=i.count();o<a;o++)n[i.getRawIndex(o)].dataIndex=o},W_.clone=function(){for(var t=new F_(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},H_.prototype={constructor:H_,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)}},Z_.prototype.getModel=function(t){if(!(this.dataIndex<0))return this.hostGraph.edgeData.getItemModel(this.dataIndex).getModel(t)};function U_(i,n){return{getValue:function(t){var e=this[i][n];return e.get(e.getDimension(t||"value"),this.dataIndex)},setVisual:function(t,e){0<=this.dataIndex&&this[i][n].setItemVisual(this.dataIndex,t,e)},getVisual:function(t,e){return this[i][n].getItemVisual(this.dataIndex,t,e)},setLayout:function(t,e){0<=this.dataIndex&&this[i][n].setItemLayout(this.dataIndex,t,e)},getLayout:function(){return this[i][n].getItemLayout(this.dataIndex)},getGraphicEl:function(){return this[i][n].getItemGraphicEl(this.dataIndex)},getRawIndex:function(){return this[i][n].getRawIndex(this.dataIndex)}}}b(H_,U_("hostGraph","data")),b(Z_,U_("hostGraph","edgeData")),F_.Node=H_,F_.Edge=Z_,ia(H_),ia(Z_);function X_(t,e,i,n,o){for(var a=new F_(n),r=0;r<t.length;r++)a.addNode(W(t[r].id,t[r].name,r),r);var s=[],l=[],u=0;for(r=0;r<e.length;r++){var h=e[r],c=h.source,d=h.target;a.addEdge(c,d,u)&&(l.push(h),s.push(W(h.id,c+" > "+d)),u++)}var f,p=i.get("coordinateSystem");if("cartesian2d"===p||"polar"===p)f=hp(t,i);else{var g=nh.get(p),m=g&&"view"!==g.type&&g.dimensions||[];_(m,"value")<0&&m.concat(["value"]);var v=np(t,{coordDimensions:m});(f=new Wf(v,i)).initData(t)}var y=new Wf(["value"],i);return y.initData(l,s),o&&o(f,y),ux({mainData:f,struct:a,structAttr:"graph",datas:{node:f,edge:y},datasAttr:{node:"data",edge:"edgeData"}}),a.update(),a}var Y_=Sf({type:"series.graph",init:function(t){Y_.superApply(this,"init",arguments);var e=this;function i(){return e._categoriesData}this.legendVisualProvider=new Gv(i,i),this.fillDataTextStyle(t.edges||t.links),this._updateCategoriesData()},mergeOption:function(t){Y_.superApply(this,"mergeOption",arguments),this.fillDataTextStyle(t.edges||t.links),this._updateCategoriesData()},mergeDefaultAndTheme:function(t){Y_.superApply(this,"mergeDefaultAndTheme",arguments),zo(t,["edgeLabel"],["show"])},getInitialData:function(t,s){var e=t.edges||t.links||[],i=t.data||t.nodes||[],l=this;if(i&&e)return X_(i,e,this,!0,function(t,e){t.wrapMethod("getItemModel",function(t){var e=l._categoriesModels[t.getShallow("category")];return e&&(e.parentModel=t.parentModel,t.parentModel=e),t});var i=l.getModel("edgeLabel"),n=new Il({label:i.option},i.parentModel,s),o=l.getModel("emphasis.edgeLabel"),a=new Il({emphasis:{label:o.option}},o.parentModel,s);function r(t){return(t=this.parsePath(t))&&"label"===t[0]?n:t&&"emphasis"===t[0]&&"label"===t[1]?a:this.parentModel}e.wrapMethod("getItemModel",function(t){return t.customizeGetParent(r),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)return Y_.superApply(this,"formatTooltip",arguments);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=eu(l.join(" > ")),o.value&&(l+=" : "+eu(o.value)),l},_updateCategoriesData:function(){var t=N(this.option.categories||[],function(t){return null!=t.value?t:L({value:0},t)}),e=new Wf(["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 Y_.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,friction:.6,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}}}}),j_=os.prototype,q_=ls.prototype;function K_(t){return isNaN(+t.cpx1)||isNaN(+t.cpy1)}var $_=Is({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){this[K_(e)?"_buildPathLine":"_buildPathCurve"](t,e)},_buildPathLine:j_.buildPath,_buildPathCurve:q_.buildPath,pointAt:function(t){return this[K_(this.shape)?"_pointAtLine":"_pointAtCurve"](t)},_pointAtLine:j_.pointAt,_pointAtCurve:q_.pointAt,tangentAt:function(t){var e=this.shape,i=K_(e)?[e.x2-e.x1,e.y2-e.y1]:this._tangentAtCurve(t);return mt(i,i)},_tangentAtCurve:q_.tangentAt}),J_=["fromSymbol","toSymbol"];function Q_(t){return"_"+t+"Type"}function tw(t,e,i){var n=e.getItemVisual(i,"color"),o=e.getItemVisual(i,t),a=e.getItemVisual(i,t+"Size");if(o&&"none"!==o){k(a)||(a=[a,a]);var r=mg(o,-a[0]/2,-a[1]/2,a[0],a[1],n);return r.name=t,r}}function ew(t,e){t.x1=e[0][0],t.y1=e[0][1],t.x2=e[1][0],t.y2=e[1][1],t.percent=1;var i=e[2];i?(t.cpx1=i[0],t.cpy1=i[1]):(t.cpx1=NaN,t.cpy1=NaN)}function iw(t,e,i){Ii.call(this),this._createLine(t,e,i)}var nw=iw.prototype;function ow(t){this._ctor=t||iw,this.group=new Ii}nw.beforeUpdate=function(){var t=this.childOfName("fromSymbol"),e=this.childOfName("toSymbol"),i=this.childOfName("label");if(t||e||!i.ignore){for(var n=1,o=this.parent;o;)o.scale&&(n/=o.scale[0]),o=o.parent;var a=this.childOfName("line");if(this.__dirty||a.__dirty){var r=a.shape.percent,s=a.pointAt(0),l=a.pointAt(r),u=ht([],l,s);if(mt(u,u),t){t.attr("position",s);var h=a.tangentAt(0);t.attr("rotation",Math.PI/2-Math.atan2(h[1],h[0])),t.attr("scale",[n*r,n*r])}if(e){e.attr("position",l);h=a.tangentAt(1);e.attr("rotation",-Math.PI/2-Math.atan2(h[1],h[0])),e.attr("scale",[n*r,n*r])}if(!i.ignore){var c,d,f;i.attr("position",l);var p=5*n;if("end"===i.__position)c=[u[0]*p+l[0],u[1]*p+l[1]],d=.8<u[0]?"left":u[0]<-.8?"right":"center",f=.8<u[1]?"top":u[1]<-.8?"bottom":"middle";else if("middle"===i.__position){var g=r/2,m=[(h=a.tangentAt(g))[1],-h[0]],v=a.pointAt(g);0<m[1]&&(m[0]=-m[0],m[1]=-m[1]),c=[v[0]+m[0]*p,v[1]+m[1]*p],d="center",f="bottom";var y=-Math.atan2(h[1],h[0]);l[0]<s[0]&&(y=Math.PI+y),i.attr("rotation",y)}else c=[-u[0]*p+s[0],-u[1]*p+s[1]],d=.8<u[0]?"right":u[0]<-.8?"left":"center",f=.8<u[1]?"bottom":u[1]<-.8?"top":"middle";i.attr({style:{textVerticalAlign:i.__verticalAlign||f,textAlign:i.__textAlign||d},position:c,scale:[n,n]})}}}},nw._createLine=function(i,n,t){var e=i.hostModel,o=function(t){var e=new $_({name:"line",subPixelOptimize:!0});return ew(e.shape,t),e}(i.getItemLayout(n));o.shape.percent=0,ll(o,{shape:{percent:1}},e,n),this.add(o);var a=new Fr({name:"label",lineLabelOriginalOpacity:1});this.add(a),E(J_,function(t){var e=tw(t,i,n);this.add(e),this[Q_(t)]=i.getItemVisual(n,t)},this),this._updateCommonStl(i,n,t)},nw.updateData=function(o,a,t){var e=o.hostModel,i=this.childOfName("line"),n=o.getItemLayout(a),r={shape:{}};ew(r.shape,n),sl(i,r,e,a),E(J_,function(t){var e=o.getItemVisual(a,t),i=Q_(t);if(this[i]!==e){this.remove(this.childOfName(t));var n=tw(t,o,a);this.add(n)}this[i]=e},this),this._updateCommonStl(o,a,t)},nw._updateCommonStl=function(t,e,i){var n=t.hostModel,o=this.childOfName("line"),a=i&&i.lineStyle,r=i&&i.hoverLineStyle,s=i&&i.labelModel,l=i&&i.hoverLabelModel;if(!i||t.hasItemOption){var u=t.getItemModel(e);a=u.getModel("lineStyle").getLineStyle(),r=u.getModel("emphasis.lineStyle").getLineStyle(),s=u.getModel("label"),l=u.getModel("emphasis.label")}var h=t.getItemVisual(e,"color"),c=Z(t.getItemVisual(e,"opacity"),a.opacity,1);o.useStyle(C({strokeNoScale:!0,fill:"none",stroke:h,opacity:c},a)),o.hoverStyle=r,E(J_,function(t){var e=this.childOfName(t);e&&(e.setColor(h),e.setStyle({opacity:c}))},this);var d,f,p=s.getShallow("show"),g=l.getShallow("show"),m=this.childOfName("label");if((p||g)&&(d=h||"#000",null==(f=n.getFormattedLabel(e,"normal",t.dataType)))){var v=n.getRawValue(e);f=null==v?t.getName(e):isFinite(v)?Nl(v):v}var y=p?f:null,x=g?H(n.getFormattedLabel(e,"emphasis",t.dataType),f):null,_=m.style;null==y&&null==x||(Qs(m.style,s,{text:y},{autoColor:d}),m.__textAlign=_.textAlign,m.__verticalAlign=_.textVerticalAlign,m.__position=s.get("position")||"middle"),m.hoverStyle=null!=x?{text:x,textFill:l.getTextColor(!0),fontStyle:l.getShallow("fontStyle"),fontWeight:l.getShallow("fontWeight"),fontSize:l.getShallow("fontSize"),fontFamily:l.getShallow("fontFamily")}:{text:null},m.ignore=!p&&!g,Ys(this)},nw.highlight=function(){this.trigger("emphasis")},nw.downplay=function(){this.trigger("normal")},nw.updateLayout=function(t,e){this.setLinePoints(t.getItemLayout(e))},nw.setLinePoints=function(t){var e=this.childOfName("line");ew(e.shape,t),e.dirty()},w(iw,Ii);var aw=ow.prototype;function rw(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 sw(t){return isNaN(t[0])||isNaN(t[1])}function lw(t){return!sw(t[0])&&!sw(t[1])}function uw(t){var e=t.coordinateSystem;if("view"!==e.type)return 1;var i=t.option.nodeScaleRatio,n=e.scale,o=n&&n[0]||1;return((e.getZoom()-1)*i+1)/o}function hw(t){var e=t.getVisual("symbolSize");return e instanceof Array&&(e=(e[0]+e[1])/2),+e}aw.isPersistent=function(){return!0},aw.updateData=function(i){var n=this,e=n.group,o=n._lineData;n._lineData=i,o||e.removeAll();var a=rw(i);i.diff(o).add(function(t){!function(t,e,i,n){if(!lw(e.getItemLayout(i)))return;var o=new t._ctor(e,i,n);e.setItemGraphicEl(i,o),t.group.add(o)}(n,i,t,a)}).update(function(t,e){!function(t,e,i,n,o,a){var r=e.getItemGraphicEl(n);if(!lw(i.getItemLayout(o)))return t.group.remove(r);r?r.updateData(i,o,a):r=new t._ctor(i,o,a);i.setItemGraphicEl(o,r),t.group.add(r)}(n,o,i,e,t,a)}).remove(function(t){e.remove(o.getItemGraphicEl(t))}).execute()},aw.updateLayout=function(){var i=this._lineData;i&&i.eachItemGraphicEl(function(t,e){t.updateLayout(i,e)},this)},aw.incrementalPrepareUpdate=function(t){this._seriesScope=rw(t),this._lineData=null,this.group.removeAll()},aw.incrementalUpdate=function(t,e){function i(t){t.isGroup||(t.incremental=t.useHoverLayer=!0)}for(var n=t.start;n<t.end;n++){if(lw(e.getItemLayout(n))){var o=new this._ctor(e,n,this._seriesScope);o.traverse(i),this.group.add(o),e.setItemGraphicEl(n,o)}}},aw.remove=function(){this._clearIncremental(),this._incremental=null,this.group.removeAll()},aw._clearIncremental=function(){var t=this._incremental;t&&t.clearDisplaybles()};var cw=[],dw=[],fw=[],pw=Ta,gw=_t,mw=Math.abs;function vw(t,e,i){for(var n,o=t[0],a=t[1],r=t[2],s=1/0,l=i*i,u=.1,h=.1;h<=.9;h+=.1){cw[0]=pw(o[0],a[0],r[0],h),cw[1]=pw(o[1],a[1],r[1],h),(f=mw(gw(cw,e)-l))<s&&(s=f,n=h)}for(var c=0;c<32;c++){var d=n+u;dw[0]=pw(o[0],a[0],r[0],n),dw[1]=pw(o[1],a[1],r[1],n),fw[0]=pw(o[0],a[0],r[0],d),fw[1]=pw(o[1],a[1],r[1],d);var f=gw(dw,e)-l;if(mw(f)<.01)break;var p=gw(fw,e)-l;u/=2,f<0?0<=p?n+=u:n-=u:0<=p?n-=u:n+=u}return n}function yw(t,l){var u=[],h=Ca,c=[[],[],[]],d=[[],[]],f=[];l/=2,t.eachEdge(function(t,e){var i=t.getLayout(),n=t.getVisual("fromSymbol"),o=t.getVisual("toSymbol");i.__original||(i.__original=[rt(i[0]),rt(i[1])],i[2]&&i.__original.push(rt(i[2])));var a=i.__original;if(null!=i[2]){if(at(c[0],a[0]),at(c[1],a[2]),at(c[2],a[1]),n&&"none"!==n){var r=hw(t.node1),s=vw(c,a[0],r*l);h(c[0][0],c[1][0],c[2][0],s,u),c[0][0]=u[3],c[1][0]=u[4],h(c[0][1],c[1][1],c[2][1],s,u),c[0][1]=u[3],c[1][1]=u[4]}if(o&&"none"!==o){r=hw(t.node2),s=vw(c,a[1],r*l);h(c[0][0],c[1][0],c[2][0],s,u),c[1][0]=u[1],c[2][0]=u[2],h(c[0][1],c[1][1],c[2][1],s,u),c[1][1]=u[1],c[2][1]=u[2]}at(i[0],c[0]),at(i[1],c[2]),at(i[2],c[1])}else{if(at(d[0],a[0]),at(d[1],a[1]),ht(f,d[1],d[0]),mt(f,f),n&&"none"!==n){r=hw(t.node1);ut(d[0],d[0],f,r*l)}if(o&&"none"!==o){r=hw(t.node2);ut(d[1],d[1],f,-r*l)}at(i[0],d[0]),at(i[1],d[1])}})}var xw="__focusNodeAdjacency",_w="__unfocusNodeAdjacency",ww=["itemStyle","opacity"],bw=["lineStyle","opacity"];function Sw(t,e){var i=t.getVisual("opacity");return null!=i?i:t.getModel().get(e)}function Mw(t,e,i){var n=t.getGraphicEl(),o=Sw(t,e);null!=i&&(null==o&&(o=1),o*=i),n.downplay&&n.downplay(),n.traverse(function(t){if(!t.isGroup){var e=t.lineLabelOriginalOpacity;null!=e&&null==i||(e=o),t.setStyle("opacity",e)}})}function Iw(t,e){var i=Sw(t,e),n=t.getGraphicEl();n.traverse(function(t){t.isGroup||t.setStyle("opacity",i)}),n.highlight&&n.highlight()}Mf({type:"graph",init:function(t,e){var i=new $g,n=new ow,o=this.group;this._controller=new Ly(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(o,t,a){var r=this,e=o.coordinateSystem;this._model=o;var i=this._symbolDraw,n=this._lineDraw,s=this.group;if("view"===e.type){var l={position:e.position,scale:e.scale};this._firstRender?s.attr(l):sl(s,l,o)}yw(o.getGraph(),uw(o));var u=o.getData();i.updateData(u);var h=o.getEdgeData();n.updateData(h),this._updateNodeAndLinkScale(),this._updateController(o,t,a),clearTimeout(this._layoutTimeout);var c=o.forceLayout,d=o.get("force.layoutAnimation");c&&this._startForceLayoutIteration(c,d),u.eachItemGraphicEl(function(t,e){var i=u.getItemModel(e);t.off("drag").off("dragend");var n=i.get("draggable");n&&t.on("drag",function(){c&&(c.warmUp(),this._layouting||this._startForceLayoutIteration(c,d),c.setFixed(e),u.setItemLayout(e,t.position))},this).on("dragend",function(){c&&c.setUnfixed(e)},this),t.setDraggable(n&&c),t[xw]&&t.off("mouseover",t[xw]),t[_w]&&t.off("mouseout",t[_w]),i.get("focusNodeAdjacency")&&(t.on("mouseover",t[xw]=function(){r._clearTimer(),a.dispatchAction({type:"focusNodeAdjacency",seriesId:o.id,dataIndex:t.dataIndex})}),t.on("mouseout",t[_w]=function(){r._dispatchUnfocus(a)}))},this),u.graph.eachEdge(function(t){var e=t.getGraphicEl();e[xw]&&e.off("mouseover",e[xw]),e[_w]&&e.off("mouseout",e[_w]),t.getModel().get("focusNodeAdjacency")&&(e.on("mouseover",e[xw]=function(){r._clearTimer(),a.dispatchAction({type:"focusNodeAdjacency",seriesId:o.id,edgeDataIndex:t.dataIndex})}),e.on("mouseout",e[_w]=function(){r._dispatchUnfocus(a)}))});var f="circular"===o.get("layout")&&o.get("circular.rotateLabel"),p=u.getLayout("cx"),g=u.getLayout("cy");u.eachItemGraphicEl(function(t,e){var i=u.getItemModel(e).get("label.rotate")||0,n=t.getSymbolPath();if(f){var o=u.getItemLayout(e),a=Math.atan2(o[1]-g,o[0]-p);a<0&&(a=2*Math.PI+a);var r=o[0]<p;r&&(a-=Math.PI);var s=r?"left":"right";Js(n,{textRotation:-a,textPosition:s,textOrigin:"center"},{textPosition:s})}else Js(n,{textRotation:i*=Math.PI/180})}),this._firstRender=!1},dispose:function(){this._controller&&this._controller.dispose(),this._controllerHost={},this._clearTimer()},_dispatchUnfocus:function(t,e){var i=this;this._clearTimer(),this._unfocusDelayTimer=setTimeout(function(){i._unfocusDelayTimer=null,t.dispatchAction({type:"unfocusNodeAdjacency",seriesId:i._model.id})},500)},_clearTimer:function(){this._unfocusDelayTimer&&(clearTimeout(this._unfocusDelayTimer),this._unfocusDelayTimer=null)},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){Mw(t,ww,.1)}),o.eachEdge(function(t){Mw(t,bw,.1)}),s&&(Iw(s,ww),E(s.edges,function(t){t.dataIndex<0||(Iw(t,bw),Iw(t.node1,ww),Iw(t.node2,ww))})),l&&(Iw(l,bw),Iw(l.node1,ww),Iw(l.node2,ww)))},unfocusNodeAdjacency:function(t,e,i,n){var o=this._model.getData().graph;o.eachNode(function(t){Mw(t,ww)}),o.eachEdge(function(t){Mw(t,bw)})},_startForceLayoutIteration:function(t,i){var n=this;!function e(){t.step(function(t){n.updateLayout(n._model),(n._layouting=!t)&&(i?n._layoutTimeout=setTimeout(e,16):e())})}()},_updateController:function(o,t,a){var e=this._controller,i=this._controllerHost,r=this.group;e.setPointerChecker(function(t,e,i){var n=r.getBoundingRect();return n.applyTransform(r.transform),n.contain(e,i)&&!Wy(t,a,o)}),"view"===o.coordinateSystem.type?(e.enable(o.get("roam")),i.zoomLimit=o.get("scaleLimit"),i.zoom=o.coordinateSystem.getZoom(),e.off("pan").off("zoom").on("pan",function(t){Vy(i,t.dx,t.dy),a.dispatchAction({seriesId:o.id,type:"graphRoam",dx:t.dx,dy:t.dy})}).on("zoom",function(t){Gy(i,t.scale,t.originX,t.originY),a.dispatchAction({seriesId:o.id,type:"graphRoam",zoom:t.scale,originX:t.originX,originY:t.originY}),this._updateNodeAndLinkScale(),yw(o.getGraph(),uw(o)),this._lineDraw.updateLayout()},this)):e.disable()},_updateNodeAndLinkScale:function(){var t=this._model,e=t.getData(),i=uw(t),n=[i,i];e.eachItemGraphicEl(function(t,e){t.attr("scale",n)})},updateLayout:function(t){yw(t.getGraph(),uw(t)),this._symbolDraw.updateLayout(),this._lineDraw.updateLayout()},remove:function(t,e){this._symbolDraw&&this._symbolDraw.remove(),this._lineDraw&&this._lineDraw.remove()}}),gf({type:"focusNodeAdjacency",event:"focusNodeAdjacency",update:"series:focusNodeAdjacency"},function(){}),gf({type:"unfocusNodeAdjacency",event:"unfocusNodeAdjacency",update:"series:unfocusNodeAdjacency"},function(){});gf({type:"graphRoam",event:"graphRoam",update:"none"},function(i,t){t.eachComponent({mainType:"series",query:i},function(t){var e=Ky(t.coordinateSystem,i);t.setCenter&&t.setCenter(e.center),t.setZoom&&t.setZoom(e.zoom)})});function Tw(t){return t instanceof Array||(t=[t,t]),t}function Aw(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")])}),Dw(i)}}function Dw(t){t.eachEdge(function(t){var e=t.getModel().get("lineStyle.curveness")||0,i=rt(t.node1.getLayout()),n=rt(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)})}var Cw=Math.PI,Lw=[];function kw(t,e){var i=t.coordinateSystem;if(!i||"view"===i.type){var n=i.getBoundingRect(),o=t.getData(),a=o.graph,s=n.width/2+n.x,l=n.height/2+n.y,r=Math.min(n.width,n.height)/2,u=o.count();o.setLayout({cx:s,cy:l}),u&&(Pw[e](t,i,a,o,r,s,l,u),a.eachEdge(function(t){var e,i=t.getModel().get("lineStyle.curveness")||0,n=rt(t.node1.getLayout()),o=rt(t.node2.getLayout()),a=(n[0]+o[0])/2,r=(n[1]+o[1])/2;+i&&(e=[s*(i*=3)+a*(1-i),l*i+r*(1-i)]),t.setLayout([n,o,e])}))}}var Pw={value:function(t,e,i,n,o,a,r,s){var l=0,u=n.getSum("value"),h=2*Math.PI/(u||s);i.eachNode(function(t){var e=t.getValue("value"),i=h*(u?e:1)/2;l+=i,t.setLayout([o*Math.cos(l)+a,o*Math.sin(l)+r]),l+=i})},symbolSize:function(t,e,i,n,o,a,r,s){var l=0;Lw.length=s;var u=uw(t);i.eachNode(function(t){var e=hw(t);isNaN(e)&&(e=2),e<0&&(e=0),e*=u;var i=Math.asin(e/2/o);isNaN(i)&&(i=Cw/2),Lw[t.dataIndex]=i,l+=2*i});var h=(2*Cw-l)/s/2,c=0;i.eachNode(function(t){var e=h+Lw[t.dataIndex];c+=e,t.setLayout([o*Math.cos(c)+a,o*Math.sin(c)+r]),c+=e})}},Nw=ut;pf(function(t){var a=t.findComponents({mainType:"legend"});a&&a.length&&t.eachSeriesByType("graph",function(t){var e=t.getCategoriesData(),n=t.getGraph().data,o=e.mapArray(e.getName);n.filterSelf(function(t){var e=n.getItemModel(t).getShallow("category");if(null!=e){"number"==typeof e&&(e=o[e]);for(var i=0;i<a.length;i++)if(!a[i].isSelected(e))return!1}return!0})},this)}),yf(Mm("graph","circle",null)),yf(function(t){var h={};t.eachSeriesByType("graph",function(s){var l=s.getCategoriesData(),o=s.getData(),u={};l.each(function(t){var e=l.getName(t);u["ec-"+e]=t;var i=l.getItemModel(t),n=i.get("itemStyle.color")||s.getColorFromPalette(e,h);l.setItemVisual(t,"color",n);for(var o=["opacity","symbol","symbolSize","symbolKeepAspect"],a=0;a<o.length;a++){var r=i.getShallow(o[a],!0);null!=r&&l.setItemVisual(t,o[a],r)}}),l.count()&&o.each(function(t){var e=o.getItemModel(t).getShallow("category");if(null!=e){"string"==typeof e&&(e=u["ec-"+e]);for(var i=["color","opacity","symbol","symbolSize","symbolKeepAspect"],n=0;n<i.length;n++)null==o.getItemVisual(t,i[n],!0)&&o.setItemVisual(t,i[n],l.getItemVisual(e,i[n]))}})})}),yf(function(t){t.eachSeriesByType("graph",function(t){var s=t.getGraph(),l=t.getEdgeData(),e=Tw(t.get("edgeSymbol")),i=Tw(t.get("edgeSymbolSize")),u="lineStyle.color".split("."),h="lineStyle.opacity".split(".");l.setVisual("fromSymbol",e&&e[0]),l.setVisual("toSymbol",e&&e[1]),l.setVisual("fromSymbolSize",i&&i[0]),l.setVisual("toSymbolSize",i&&i[1]),l.setVisual("color",t.get(u)),l.setVisual("opacity",t.get(h)),l.each(function(t){var e=l.getItemModel(t),i=s.getEdgeByIndex(t),n=Tw(e.getShallow("symbol",!0)),o=Tw(e.getShallow("symbolSize",!0)),a=e.get(u),r=e.get(h);switch(a){case"source":a=i.node1.getVisual("color");break;case"target":a=i.node2.getVisual("color")}n[0]&&i.setVisual("fromSymbol",n[0]),n[1]&&i.setVisual("toSymbol",n[1]),o[0]&&i.setVisual("fromSymbolSize",o[0]),o[1]&&i.setVisual("toSymbolSize",o[1]),i.setVisual("color",a),i.setVisual("opacity",r)})})}),vf(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=[];E(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 u=n.get(o[l],a);isNaN(u)||(s=!0),r.push(u)}s?n.setItemLayout(a,i.dataToPoint(r)):n.setItemLayout(a,[NaN,NaN])}Dw(n.graph)}else e&&"none"!==e||Aw(t)})}),vf(Id.VISUAL.POST_CHART_LAYOUT,function(t){t.eachSeriesByType("graph",function(t){"circular"===t.get("layout")&&kw(t,"symbolSize")})}),vf(function(t){t.eachSeriesByType("graph",function(t){if(!(l=t.coordinateSystem)||"view"===l.type)if("force"===t.get("layout")){var c=t.preservedPoints||{},d=t.getGraph(),f=d.data,e=d.edgeData,i=t.getModel("force"),n=i.get("initLayout");t.preservedPoints?f.each(function(t){var e=f.getId(t);f.setItemLayout(t,c[e]||[NaN,NaN])}):n&&"none"!==n?"circular"===n&&kw(t,"value"):Aw(t);var o=f.getDataExtent("value"),a=e.getDataExtent("value"),r=i.get("repulsion"),s=i.get("edgeLength");k(r)||(r=[r,r]),k(s)||(s=[s,s]),s=[s[1],s[0]];var l,u=f.mapArray("value",function(t,e){var i=f.getItemLayout(e),n=kl(t,o,r);return isNaN(n)&&(n=(r[0]+r[1])/2),{w:n,rep:n,fixed:f.getItemModel(e).get("fixed"),p:!i||isNaN(i[0])||isNaN(i[1])?null:i}}),h=e.mapArray("value",function(t,e){var i=d.getEdgeByIndex(e),n=kl(t,a,s);isNaN(n)&&(n=(s[0]+s[1])/2);var o=i.getModel();return{n1:u[i.node1.dataIndex],n2:u[i.node2.dataIndex],d:n,curveness:o.get("lineStyle.curveness")||0,ignoreForceLayout:o.get("ignoreForceLayout")}}),p=(l=t.coordinateSystem).getBoundingRect(),g=function(f,p,t){for(var e=t.rect,i=e.width,n=e.height,g=[e.x+i/2,e.y+n/2],m=null==t.gravity?.1:t.gravity,o=0;o<f.length;o++){var a=f[o];a.p||(a.p=ot(i*(Math.random()-.5)+g[0],n*(Math.random()-.5)+g[1])),a.pp=rt(a.p),a.edges=null}var r=null==t.friction?.6:t.friction,v=r;return{warmUp:function(){v=.8*r},setFixed:function(t){f[t].fixed=!0},setUnfixed:function(t){f[t].fixed=!1},step:function(t){for(var e=[],i=f.length,n=0;n<p.length;n++){var o=p[n];if(!o.ignoreForceLayout){var a=o.n1;ht(e,(u=o.n2).p,a.p);var r=ct(e)-o.d,s=u.w/(a.w+u.w);isNaN(s)&&(s=0),mt(e,e),a.fixed||Nw(a.p,a.p,e,s*r*v),u.fixed||Nw(u.p,u.p,e,-(1-s)*r*v)}}for(n=0;n<i;n++){(d=f[n]).fixed||(ht(e,g,d.p),Nw(d.p,d.p,e,m*v))}for(n=0;n<i;n++){a=f[n];for(var l=n+1;l<i;l++){var u;ht(e,(u=f[l]).p,a.p),0===(r=ct(e))&&(st(e,Math.random()-.5,Math.random()-.5),r=1);var h=(a.rep+u.rep)/r/r;a.fixed||Nw(a.pp,a.pp,e,h),u.fixed||Nw(u.pp,u.pp,e,-h)}}var c=[];for(n=0;n<i;n++){var d;(d=f[n]).fixed||(ht(c,d.p,d.pp),Nw(d.p,d.p,c,v),at(d.pp,d.p))}v*=.992,t&&t(f,p,v<.01)}}}(u,h,{rect:p,gravity:i.get("gravity"),friction:i.get("friction")}),m=g.step;g.step=function(h){for(var t=0,e=u.length;t<e;t++)u[t].fixed&&at(u[t].p,d.getNodeByIndex(t).getLayout());m(function(t,e,i){for(var n=0,o=t.length;n<o;n++)t[n].fixed||d.getNodeByIndex(n).setLayout(t[n].p),c[f.getId(n)]=t[n].p;for(n=0,o=e.length;n<o;n++){var a=e[n],r=d.getEdgeByIndex(n),s=a.n1.p,l=a.n2.p,u=r.getLayout();(u=u?u.slice():[])[0]=u[0]||[],u[1]=u[1]||[],at(u[0],s),at(u[1],l),+a.curveness&&(u[2]=[(s[0]+l[0])/2-(s[1]-l[1])*a.curveness,(s[1]+l[1])/2-(l[0]-s[0])*a.curveness]),r.setLayout(u)}h&&h(i)})},t.forceLayout=g,t.preservedPoints=c,g.step()}else t.forceLayout=null})}),mf("graphView",{create:function(t,d){var f=[];return t.eachSeriesByType("graph",function(t){var e=t.get("coordinateSystem");if(!e||"view"===e){var i=t.getData(),n=[],o=[];Ba(i.mapArray(function(t){var e=i.getItemModel(t);return[+e.get("x"),+e.get("y")]}),n,o),o[0]-n[0]==0&&(o[0]+=1,n[0]-=1),o[1]-n[1]==0&&(o[1]+=1,n[1]-=1);var a=(o[0]-n[0])/(o[1]-n[1]),r=function(t,e,i){var n=t.getBoxLayoutParams();return n.aspect=i,vu(n,{width:e.getWidth(),height:e.getHeight()})}(t,d,a);isNaN(a)&&(n=[r.x,r.y],o=[r.x+r.width,r.y+r.height]);var s=o[0]-n[0],l=o[1]-n[1],u=r.width,h=r.height,c=t.coordinateSystem=new Qy;c.zoomLimit=t.get("scaleLimit"),c.setBoundingRect(n[0],n[1],s,l),c.setViewRect(r.x,r.y,u,h),c.setCenter(t.get("center")),c.setZoom(t.get("zoom")),f.push(c)}}),f}});ic.extend({type:"series.gauge",getInitialData:function(t,e){return Bv(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 Ow=Sr.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*(o/3<=a?1:2),l=e.y-n(r)*a*(o/3<=a?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)}});function Ew(t,e){return e&&("string"==typeof e?t=e.replace("{value}",null!=t?t:""):"function"==typeof e&&(t=e(t))),t}var zw=2*Math.PI,Rw=(gc.extend({type:"gauge",render:function(t,e,i){this.group.removeAll();var n=t.get("axisLine.lineStyle.color"),o=function(t,e){var i=t.get("center"),n=e.getWidth(),o=e.getHeight(),a=Math.min(n,o);return{cx:Pl(i[0],e.getWidth()),cy:Pl(i[1],e.getHeight()),r:Pl(t.get("radius"),a/2)}}(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"),s=r.getModel("lineStyle"),l=t.get("clockwise"),u=-t.get("startAngle")/180*Math.PI,h=((g=-t.get("endAngle")/180*Math.PI)-u)%zw,c=u,d=s.get("width"),f=r.get("show"),p=0;f&&p<n.length;p++){var g,m=Math.min(Math.max(n[p][0],0),1),v=new Ur({shape:{startAngle:c,endAngle:g=u+h*m,cx:o.cx,cy:o.cy,clockwise:l,r0:o.r-d,r:o.r},silent:!0});v.setStyle({fill:n[p][1]}),v.setStyle(s.getLineStyle(["color","borderWidth","borderColor"])),a.add(v),c=g}function y(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(!l){var x=u;u=g,g=x}this._renderTicks(t,e,i,y,o,u,g,l),this._renderPointer(t,e,i,y,o,u,g,l),this._renderTitle(t,e,i,y,o),this._renderDetail(t,e,i,y,o)},_renderTicks:function(t,e,i,n,o,a,r,s){for(var l=this.group,u=o.cx,h=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=Pl(p.get("length"),c),_=Pl(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 os({shape:{x1:A*c+u,y1:D*c+h,x2:A*(c-x)+u,y2:D*(c-x)+h},style:M,silent:!0});"auto"===M.stroke&&C.setStyle({stroke:n(T/v)}),l.add(C)}if(m.get("show")){var L=Ew(Nl(T/v*(f-d)+d),m.get("formatter")),k=m.get("distance"),P=n(T/v);l.add(new Fr({style:Qs({},m,{text:L,x:A*(c-x-k)+u,y:D*(c-x-k)+h,textVerticalAlign:D<-.4?"top":.4<D?"bottom":"middle",textAlign:A<-.4?"left":.4<A?"right":"center"},{autoColor:P}),silent:!0}))}if(g.get("show")&&T!==v){for(var N=0;N<=y;N++){A=Math.cos(w),D=Math.sin(w);var O=new os({shape:{x1:A*c+u,y1:D*c+h,x2:A*(c-_)+u,y2:D*(c-_)+h},silent:!0,style:I});"auto"===I.stroke&&O.setStyle({stroke:n((T+N/y)/v)}),l.add(O),w+=S}w-=S}else w+=b}},_renderPointer:function(n,t,e,o,a,i,r,s){var l=this.group,u=this._data;if(n.get("pointer.show")){var h=[+n.get("min"),+n.get("max")],c=[i,r],d=n.getData(),f=d.mapDimension("value");d.diff(u).add(function(t){var e=new Ow({shape:{angle:i}});ll(e,{shape:{angle:kl(d.get(f,t),h,c,!0)}},n),l.add(e),d.setItemGraphicEl(t,e)}).update(function(t,e){var i=u.getItemGraphicEl(e);sl(i,{shape:{angle:kl(d.get(f,t),h,c,!0)}},n),l.add(i),d.setItemGraphicEl(t,i)}).remove(function(t){var e=u.getItemGraphicEl(t);l.remove(e)}).execute(),d.eachItemGraphicEl(function(t,e){var i=d.getItemModel(e),n=i.getModel("pointer");t.setShape({x:a.cx,y:a.cy,width:Pl(n.get("width"),a.r),r:Pl(n.get("length"),a.r)}),t.useStyle(i.getModel("itemStyle").getItemStyle()),"auto"===t.style.fill&&t.setStyle("fill",o(kl(d.get(f,e),h,[0,1],!0))),Ys(t,i.getModel("emphasis.itemStyle").getItemStyle())}),this._data=d}else u&&u.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"),u=o.cx+Pl(l[0],o.r),h=o.cy+Pl(l[1],o.r),c=+t.get("min"),d=+t.get("max"),f=n(kl(t.getData().get(r,0),[c,d],[0,1],!0));this.group.add(new Fr({silent:!0,style:Qs({},s,{x:u,y:h,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"),u=o.cx+Pl(l[0],o.r),h=o.cy+Pl(l[1],o.r),c=Pl(a.get("width"),o.r),d=Pl(a.get("height"),o.r),f=t.getData(),p=f.get(f.mapDimension("value"),0),g=n(kl(p,[r,s],[0,1],!0));this.group.add(new Fr({silent:!0,style:Qs({},a,{x:u,y:h,text:Ew(p,a.get("formatter")),textWidth:isNaN(c)?null:c,textHeight:isNaN(d)?null:d,textAlign:"center",textVerticalAlign:"middle"},{autoColor:g,forceRich:!0})}))}}}),Sf({type:"series.funnel",init:function(t){Rw.superApply(this,"init",arguments),this.legendVisualProvider=new Gv(A(this.getData,this),A(this.getRawData,this)),this._defaultLabelLine(t)},getInitialData:function(t,e){return Bv(this,{coordDimensions:["value"],encodeDefaulter:T(Yu,this)})},_defaultLabelLine:function(t){zo(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=Rw.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}}}}));function Bw(t,e){Ii.call(this);var i=new qr,n=new Kr,o=new Fr;this.add(i),this.add(n),this.add(o),this.highDownOnUpdate=function(t,e){"emphasis"===e?(n.ignore=n.hoverIgnore,o.ignore=o.hoverIgnore):(n.ignore=n.normalIgnore,o.ignore=o.normalIgnore)},this.updateData(t,e,!0)}var Vw=Bw.prototype,Gw=["itemStyle","opacity"];Vw.updateData=function(t,e,i){var n=this.childAt(0),o=t.hostModel,a=t.getItemModel(e),r=t.getItemLayout(e),s=t.getItemModel(e).get(Gw);s=null==s?1:s,n.useStyle({}),i?(n.setShape({points:r.points}),n.setStyle({opacity:0}),ll(n,{style:{opacity:s}},o,e)):sl(n,{style:{opacity:s},shape:{points:r.points}},o,e);var l=a.getModel("itemStyle"),u=t.getItemVisual(e,"color");n.setStyle(C({lineJoin:"round",fill:u},l.getItemStyle(["opacity"]))),n.hoverStyle=l.getModel("emphasis").getItemStyle(),this._updateLabel(t,e),Ys(this)},Vw._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");sl(i,{shape:{points:r.linePoints||r.linePoints}},o,e),sl(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"),u=a.getModel("emphasis.label"),h=a.getModel("labelLine"),c=a.getModel("emphasis.labelLine");s=t.getItemVisual(e,"color");$s(n.style,n.hoverStyle={},l,u,{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=!u.get("show"),i.ignore=i.normalIgnore=!h.get("show"),i.hoverIgnore=!c.get("show"),i.setStyle({stroke:s}),i.setStyle(h.getModel("lineStyle").getLineStyle()),i.hoverStyle=c.getModel("lineStyle").getLineStyle()},w(Bw,Ii);gc.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 Bw(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(){}});yf(Yv("funnel")),vf(function(t,w,e){t.eachSeriesByType("funnel",function(t){var o=t.getData(),a=o.mapDimension("value"),e=t.get("sort"),r=function(t,e){return vu(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}(t,w),i=function(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}(o,e),s=[Pl(t.get("minSize"),r.width),Pl(t.get("maxSize"),r.width)],n=o.getDataExtent(a),l=t.get("min"),u=t.get("max");null==l&&(l=Math.min(n[0],0)),null==u&&(u=n[1]);function h(t,e){var i,n=kl(o.get(a,t)||0,[l,u],s,!0);switch(c){case"left":i=r.x;break;case"center":i=r.x+(r.width-n)/2;break;case"right":i=r.x+r.width-n}return[[i,e],[i+n,e]]}var c=t.get("funnelAlign"),d=t.get("gap"),f=(r.height-d*(o.count()-1))/o.count(),p=r.y;"ascending"===e&&(f=-f,d=-d,p+=r.height,i=i.reverse());for(var g=0;g<i.length;g++){var m=i[g],v=i[g+1],y=o.getItemModel(m).get("itemStyle.height");null==y?y=f:(y=Pl(y,r.height),"ascending"===e&&(y=-y));var x=h(m,p),_=h(v,p+y);p+=y+d,o.setItemLayout(m,{points:x.concat(_.slice().reverse())})}!function(g){g.each(function(t){var e,i,n,o,a=g.getItemModel(t),r=a.getModel("label").get("position"),s=a.getModel("labelLine"),l=g.getItemLayout(t),u=l.points,h="inner"===r||"inside"===r||"center"===r||"insideLeft"===r||"insideRight"===r;if(h)e="insideLeft"===r?(i=(u[0][0]+u[3][0])/2+5,n=(u[0][1]+u[3][1])/2,"left"):"insideRight"===r?(i=(u[1][0]+u[2][0])/2-5,n=(u[1][1]+u[2][1])/2,"right"):(i=(u[0][0]+u[1][0]+u[2][0]+u[3][0])/4,n=(u[0][1]+u[1][1]+u[2][1]+u[3][1])/4,"center"),o=[[i,n],[i,n]];else{var c,d,f,p=s.get("length");e="left"===r?(c=(u[3][0]+u[0][0])/2,d=(u[3][1]+u[0][1])/2,i=(f=c-p)-5,"right"):"right"===r?(c=(u[1][0]+u[2][0])/2,d=(u[1][1]+u[2][1])/2,i=(f=c+p)+5,"left"):"rightTop"===r?(c=u[1][0],d=u[1][1],i=(f=c+p)+5,"top"):"rightBottom"===r?(c=u[2][0],d=u[2][1],i=(f=c+p)+5,"bottom"):"leftTop"===r?(c=u[0][0],d=u[1][1],i=(f=c-p)-5,"right"):"leftBottom"===r?(c=u[3][0],d=u[2][1],i=(f=c-p)-5,"right"):(c=(u[1][0]+u[2][0])/2,d=(u[1][1]+u[2][1])/2,i=(f=c+p)+5,"left");o=[[c,d],[f,d]],n=d}l.label={linePoints:o,x:i,y:n,verticalAlign:"middle",textAlign:e,inside:h}})}(o)})}),pf(ty("funnel"));function Fw(t,e,i,n,o){Eg.call(this,t,e,i),this.type=n||"value",this.axisIndex=o}Fw.prototype={constructor:Fw,model:null,isHorizontal:function(){return"horizontal"!==this.coordinateSystem.getModel().get("layout")}},w(Fw,Eg);function Ww(t,e,i,n,o,a){t=t||0;var r=i[1]-i[0];if(null!=o&&(o=Zw(o,[0,r])),null!=a&&(a=Math.max(a,null!=o?o:0)),"all"===n){var s=Math.abs(e[1]-e[0]);o=a=Zw(s=Zw(s,[0,r]),[o,a]),n=0}e[0]=Zw(e[0],i),e[1]=Zw(e[1],i);var l=Hw(e,n);e[n]+=t;var u=o||0,h=i.slice();l.sign<0?h[0]+=u:h[1]-=u,e[n]=Zw(e[n],h);var c=Hw(e,n);return null!=o&&(c.sign!==l.sign||c.span<o)&&(e[1-n]=e[n]+l.sign*o),c=Hw(e,n),null!=a&&c.span>a&&(e[1-n]=e[n]+c.sign*a),e}function Hw(t,e){var i=t[e]-t[1-e];return{span:Math.abs(i),sign:0<i?-1:i<0?1:e?-1:1}}function Zw(t,e){return Math.min(null!=e[1]?e[1]:1/0,Math.max(null!=e[0]?e[0]:-1/0,t))}var Uw=E,Xw=Math.min,Yw=Math.max,jw=Math.floor,qw=Math.ceil,Kw=Nl,$w=Math.PI;function Jw(t,e,i){this._axesMap=Q(),this._axesLayout={},this.dimensions=t.dimensions,this._rect,this._model=t,this._init(t,e,i)}function Qw(t,e){return Xw(Yw(t,e[0]),e[1])}Jw.prototype={type:"parallel",constructor:Jw,_init:function(t,r,e){var i=t.dimensions,s=t.parallelAxisIndex;Uw(i,function(t,e){var i=s[e],n=r.getComponent("parallelAxis",i),o=this._axesMap.set(t,new Fw(t,ig(n),[0,0],n.get("type"),i)),a="category"===o.type;o.onBand=a&&n.get("boundaryGap"),o.inverse=n.get("inverse"),(n.axis=o).model=n,o.coordinateSystem=n.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 i<=a&&a<=i+e.axisLength&&n<=r&&r<=n+e.layoutLength},getModel:function(){return this._model},_updateAxesFromSeries:function(e,n){n.eachSeries(function(t){if(e.contains(t,n)){var i=t.getData();Uw(this.dimensions,function(t){var e=this._axesMap.get(t);e.scale.unionExtentFromData(i,i.mapDimension(t)),eg(e.scale,e.model)},this)}},this)},resize:function(t,e){this._rect=vu(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],u=this.dimensions.length,h=Qw(e.get("axisExpandWidth"),l),c=Qw(e.get("axisExpandCount")||0,[0,u]),d=e.get("axisExpandable")&&3<u&&c<u&&1<c&&0<h&&0<s,f=e.get("axisExpandWindow");f?(t=Qw(f[1]-f[0],l),f[1]=f[0]+t):(t=Qw(h*(c-1),l),(f=[h*(e.get("axisExpandCenter")||jw(u/2))-t/2])[1]=f[0]+t);var p=(s-t)/(u-c);p<3&&(p=0);var g=[jw(Kw(f[0]/h,1))+1,qw(Kw(f[1]/h,1))-1],m=p/h*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:h,axisCollapseWidth:p,axisExpandWindow:f,axisCount:u,winInnerIndices:g,axisExpandWindow0Pos:m}},_layoutAxes:function(){var l=this._rect,t=this._axesMap,e=this.dimensions,u=this._makeLayoutInfo(),h=u.layout;t.each(function(t){var e=[0,u.axisLength],i=t.inverse?1:0;t.setExtent(e[i],e[1-i])}),Uw(e,function(t,e){var i=(u.axisExpandable?function(t,e){var i,n,o=e.layoutLength,a=e.axisExpandWidth,r=e.axisCount,s=e.axisCollapseWidth,l=e.winInnerIndices,u=s,h=!1;t<l[0]?(i=t*s,n=s):t<=l[1]?(i=e.axisExpandWindow0Pos+t*a-e.axisExpandWindow[0],u=a,h=!0):(i=o-(r-1-t)*s,n=s);return{position:i,axisNameAvailableWidth:u,axisLabelShow:h,nameTruncateMaxWidth:n}}:function(t,e){var i=e.layoutLength/(e.axisCount-1);return{position:i*t,axisNameAvailableWidth:i,axisLabelShow:!0}})(e,u),n={horizontal:{x:i.position,y:u.axisLength},vertical:{x:0,y:i.position}},o={horizontal:$w/2,vertical:0},a=[n[h].x+l.x,n[h].y+l.y],r=o[h],s=ee();re(s,s,r),ae(s,s,a),this._axesLayout[t]={position:a,rotation:r,transform:s,axisNameAvailableWidth:i.axisNameAvailableWidth,axisLabelShow:i.axisLabelShow,nameTruncateMaxWidth:i.nameTruncateMaxWidth,tickDirection:1,labelDirection:1}},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(e,t,i,n){null==i&&(i=0),null==n&&(n=e.count());var o=this._axesMap,a=this.dimensions,r=[],s=[];E(a,function(t){r.push(e.mapDimension(t)),s.push(o.get(t).model)});for(var l=this.hasAxisBrushed(),u=i;u<n;u++){var h;if(l){h="active";for(var c=e.getValues(r,u),d=0,f=a.length;d<f;d++){if("inactive"===s[d].getActiveState(c[d])){h="inactive";break}}}else h="normal";t(h,u)}},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 hl([t,0],this._axesLayout[e].transform)},getAxisLayout:function(t){return D(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",u=e.axisCollapseWidth,h=this._model.get("axisExpandSlideTriggerArea"),c=null!=h[0];if(u)c&&u&&s<o*h[0]?(l="jump",r=s-o*h[2]):c&&u&&s>o*(1-h[0])?(l="jump",r=s-o*(1-h[2])):0<=(r=s-o*h[1])&&(r=s-o*(1-h[1]))<=0&&(r=0),(r*=e.axisExpandWidth/u)?Ww(r,n,a,"all"):l="none";else{o=n[1]-n[0];(n=[Yw(0,a[1]*s/o-o/2)])[1]=Xw(a[1],n[0]+o),n[0]=n[1]-o}return{axisExpandWindow:n,behavior:l}}},nh.register("parallel",{create:function(n,o){var a=[];return n.eachComponent("parallel",function(t,e){var i=new Jw(t,n,o);i.name="parallel_"+e,i.resize(t,o),(t.coordinateSystem=i).model=t,a.push(i)}),n.eachSeries(function(t){if("parallel"===t.get("coordinateSystem")){var e=n.queryComponents({mainType:"parallel",index:t.get("parallelIndex"),id:t.get("parallelId")})[0];t.coordinateSystem=e.coordinateSystem}}),a}});var tb=Tu.extend({type:"baseParallelAxis",axis:null,activeIntervals:[],getAreaSelectStyle:function(){return ra([["fill","color"],["lineWidth","borderWidth"],["stroke","borderColor"],["width","width"],["opacity","opacity"]])(this.getModel("areaSelectStyle"))},setActiveIntervals:function(t){var e=this.activeIntervals=D(t);if(e)for(var i=e.length-1;0<=i;i--)Ol(e[i])},getActiveState:function(t){var e=this.activeIntervals;if(!e.length)return"normal";if(null==t||isNaN(t))return"inactive";if(1===e.length){var i=e[0];if(i[0]<=t&&t<=i[1])return"active"}else for(var n=0,o=e.length;n<o;n++)if(e[n][0]<=t&&t<=e[n][1])return"active";return"inactive"}});m(tb.prototype,sg),Om("parallel",tb,function(t,e){return e.type||(e.data?"category":"value")},{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}),Tu.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(){Tu.prototype.init.apply(this,arguments),this.mergeOption({})},mergeOption:function(t){var e=this.option;t&&m(e,t,!0),this._initDimensions()},contains:function(t,e){var i=t.get("parallelIndex");return null!=i&&e.getComponent("parallel",i)===this},setAxisExpand:function(e){E(["axisExpandable","axisExpandCenter","axisExpandCount","axisExpandWidth","axisExpandWindow"],function(t){e.hasOwnProperty(t)&&(this.option[t]=e[t])},this)},_initDimensions:function(){var e=this.dimensions=[],i=this.parallelAxisIndex=[];E(M(this.dependentModels.parallelAxis,function(t){return(t.get("parallelIndex")||0)===this.componentIndex},this),function(t){e.push("dim"+t.get("dim")),i.push(t.componentIndex)})}});gf({type:"axisAreaSelect",event:"axisAreaSelected"},function(e,t){t.eachComponent({mainType:"parallelAxis",query:e},function(t){t.axis.model.setActiveIntervals(e.intervals)})}),gf("parallelAxisExpand",function(e,t){t.eachComponent({mainType:"parallel",query:e},function(t){t.setAxisExpand(e)})});var eb=T,ib=E,nb=N,ob=Math.min,ab=Math.max,rb=Math.pow,sb=1e4,lb=6,ub=6,hb="globalPan",cb={w:[0,0],e:[0,1],n:[1,0],s:[1,1]},db={w:"ew",e:"ew",n:"ns",s:"ns",ne:"nesw",sw:"nesw",nw:"nwse",se:"nwse"},fb={brushStyle:{lineWidth:2,stroke:"rgba(0,0,0,0.3)",fill:"rgba(0,0,0,0.1)"},transformable:!0,brushMode:"single",removeOnClick:!1},pb=0;function gb(t){Ct.call(this),this._zr=t,this.group=new Ii,this._brushType,this._brushOption,this._panels,this._track=[],this._dragging,this._covers=[],this._creatingCover,this._creatingPanel,this._enableGlobalPan,this._uid="brushController_"+pb++,this._handlers={},ib(Fb,function(t,e){this._handlers[e]=A(t,this)},this)}function mb(t,e){var i=Hb[e.brushType].createCover(t,e);return i.__brushOption=e,xb(i,e),t.group.add(i),i}function vb(t,e){var i=wb(e);return i.endCreating&&(i.endCreating(t,e),xb(e,e.__brushOption)),e}function yb(t,e){var i=e.__brushOption;wb(e).updateCoverShape(t,e,i.range,i)}function xb(t,e){var i=e.z;null==i&&(i=sb),t.traverse(function(t){t.z=i,t.z2=i})}function _b(t,e){wb(e).updateCommon(t,e),yb(t,e)}function wb(t){return Hb[t.__brushOption.brushType]}function bb(t,e,i){var n,o=t._panels;if(!o)return!0;var a=t._transform;return ib(o,function(t){t.isTargetByCursor(e,i,a)&&(n=t)}),n}function Sb(t,e){var i=t._panels;if(!i)return!0;var n=e.__brushOption.panelId;return null==n||i[n]}function Mb(e){var t=e._covers,i=t.length;return ib(t,function(t){e.group.remove(t)},e),t.length=0,!!i}function Ib(t,e){var i=nb(t._covers,function(t){var e=t.__brushOption,i=D(e.range);return{brushType:e.brushType,panelId:e.panelId,range:i}});t.trigger("brush",i,{isEnd:!!e.isEnd,removeOnClick:!!e.removeOnClick})}function Tb(t){var e=t.length-1;return e<0&&(e=0),[t[0],t[e]]}function Ab(e,i,t,n){var o=new Ii;return o.add(new is({name:"main",style:kb(t),silent:!0,draggable:!0,cursor:"move",drift:eb(e,i,o,"nswe"),ondragend:eb(Ib,i,{isEnd:!0})})),ib(n,function(t){o.add(new is({name:t,style:{opacity:0},draggable:!0,silent:!0,invisible:!0,drift:eb(e,i,o,t),ondragend:eb(Ib,i,{isEnd:!0})}))}),o}function Db(t,e,i,n){var o=n.brushStyle.lineWidth||0,a=ab(o,ub),r=i[0][0],s=i[1][0],l=r-o/2,u=s-o/2,h=i[0][1],c=i[1][1],d=h-a+o/2,f=c-a+o/2,p=h-r,g=c-s,m=p+o,v=g+o;Lb(t,e,"main",r,s,p,g),n.transformable&&(Lb(t,e,"w",l,u,a,v),Lb(t,e,"e",d,u,a,v),Lb(t,e,"n",l,u,m,a),Lb(t,e,"s",l,f,m,a),Lb(t,e,"nw",l,u,a,a),Lb(t,e,"ne",d,u,a,a),Lb(t,e,"sw",l,f,a,a),Lb(t,e,"se",d,f,a,a))}function Cb(n,o){var t=o.__brushOption,a=t.transformable,e=o.childAt(0);e.useStyle(kb(t)),e.attr({silent:!a,cursor:a?"move":"default"}),ib(["w","e","n","s","se","sw","ne","nw"],function(t){var e=o.childOfName(t),i=function t(e,i){{if(1<i.length){i=i.split("");var n=[t(e,i[0]),t(e,i[1])];return"e"!==n[0]&&"w"!==n[0]||n.reverse(),n.join("")}var o={w:"left",e:"right",n:"top",s:"bottom"},a={left:"w",right:"e",top:"n",bottom:"s"},n=cl(o[i],ul(e.group));return a[n]}}(n,t);e&&e.attr({silent:!a,invisible:!a,cursor:a?db[i]+"-resize":null})})}function Lb(t,e,i,n,o,a,r){var s=e.childOfName(i);s&&s.setShape(function(t){var e=ob(t[0][0],t[1][0]),i=ob(t[0][1],t[1][1]),n=ab(t[0][0],t[1][0]),o=ab(t[0][1],t[1][1]);return{x:e,y:i,width:n-e,height:o-i}}(zb(t,e,[[n,o],[n+a,o+r]])))}function kb(t){return C({strokeNoScale:!0},t.brushStyle)}function Pb(t,e,i,n){var o=[ob(t,i),ob(e,n)],a=[ab(t,i),ab(e,n)];return[[o[0],a[0]],[o[1],a[1]]]}function Nb(t,e,i,n,o,a,r,s){var l=n.__brushOption,u=t(l.range),h=Eb(i,a,r);ib(o.split(""),function(t){var e=cb[t];u[e[0]][e[1]]+=h[e[0]]}),l.range=e(Pb(u[0][0],u[1][0],u[0][1],u[1][1])),_b(i,n),Ib(i,{isEnd:!1})}function Ob(t,e,i,n,o){var a=e.__brushOption.range,r=Eb(t,i,n);ib(a,function(t){t[0]+=r[0],t[1]+=r[1]}),_b(t,e),Ib(t,{isEnd:!1})}function Eb(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 zb(t,e,i){var n=Sb(t,e);return n&&!0!==n?n.clipPath(i,t._transform):D(i)}function Rb(t){var e=t.event;e.preventDefault&&e.preventDefault()}function Bb(t,e,i){return t.childOfName("main").contain(e,i)}function Vb(t,e,i,n){var o,a=t._creatingCover,r=t._creatingPanel,s=t._brushOption;if(t._track.push(i.slice()),function(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],r=rb(o*o+a*a,.5);return lb<r}(t)||a){if(r&&!a){"single"===s.brushMode&&Mb(t);var l=D(s);l.brushType=Gb(l.brushType,r),l.panelId=!0===r?null:r.panelId,a=t._creatingCover=mb(t,l),t._covers.push(a)}if(a){var u=Hb[Gb(t._brushType,r)];a.__brushOption.range=u.getCreatingRange(zb(t,a,t._track)),n&&(vb(t,a),u.updateCommon(t,a)),yb(t,a),o={isEnd:n}}}else n&&"single"===s.brushMode&&s.removeOnClick&&bb(t,e,i)&&Mb(t)&&(o={isEnd:n,removeOnClick:!0});return o}function Gb(t,e){return"auto"===t?e.defaultBrushType:t}gb.prototype={constructor:gb,enableBrush:function(t){return this._brushType&&function(t){var e=t._zr;(function(t,e,i){var n=Cy(t);n[e]===i&&(n[e]=null)})(e,hb,t._uid),function(i,t){ib(t,function(t,e){i.off(e,t)})}(e,t._handlers),t._brushType=t._brushOption=null}(this),t.brushType&&function(t,e){var i=t._zr;t._enableGlobalPan||function(t,e,i){Cy(t)[e]=i}(i,hb,t._uid);(function(i,t){ib(t,function(t,e){i.on(e,t)})})(i,t._handlers),t._brushType=e.brushType,t._brushOption=m(D(fb),e,!0)}(this,t),this},setPanels:function(t){if(t&&t.length){var e=this._panels={};E(t,function(t){e[t.panelId]=D(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){ib(this._covers,t,e)},updateCovers:function(o){o=N(o,function(t){return m(D(fb),t,!0)});var i="\0-brush-index-",a=this._covers,r=this._covers=[],s=this,l=this._creatingCover;return new Tf(a,o,function(t,e){return n(t.__brushOption,e)},n).add(t).update(t).remove(function(t){a[t]!==l&&s.group.remove(a[t])}).execute(),this;function n(t,e){return(null!=t.id?t.id:i+e)+"-"+t.brushType}function t(t,e){var i=o[t];if(null!=e&&a[e]===l)r[t]=a[e];else{var n=r[t]=null!=e?(a[e].__brushOption=i,a[e]):vb(s,mb(s,i));_b(s,n)}}},unmount:function(){return this.enableBrush(!1),Mb(this),this._zr.remove(this.group),this},dispose:function(){this.unmount(),this.off()}},b(gb,Ct);var Fb={mousedown:function(t){if(this._dragging)Wb(this,t);else if(!t.target||!t.target.draggable){Rb(t);var e=this.group.transformCoordToLocal(t.offsetX,t.offsetY);this._creatingCover=null,(this._creatingPanel=bb(this,t,e))&&(this._dragging=!0,this._track=[e.slice()])}},mousemove:function(t){var e=t.offsetX,i=t.offsetY,n=this.group.transformCoordToLocal(e,i);if(function(t,e,i){if(t._brushType&&!function(t,e,i){var n=t._zr;return e<0||e>n.getWidth()||i<0||i>n.getHeight()}(t,e)){var n=t._zr,o=t._covers,a=bb(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)&&Hb[s.brushType].contain(o[r],i[0],i[1]))return}a&&n.setCursorStyle("crosshair")}}(this,t,n),this._dragging){Rb(t);var o=Vb(this,t,n,!1);o&&Ib(this,o)}},mouseup:function(t){Wb(this,t)}};function Wb(t,e){if(t._dragging){Rb(e);var i=e.offsetX,n=e.offsetY,o=t.group.transformCoordToLocal(i,n),a=Vb(t,e,o,!0);t._dragging=!1,t._track=[],t._creatingCover=null,a&&Ib(t,a)}}var Hb={lineX:Zb(0),lineY:Zb(1),rect:{createCover:function(t,e){return Ab(eb(Nb,function(t){return t},function(t){return t}),t,e,["w","e","n","s","se","sw","ne","nw"])},getCreatingRange:function(t){var e=Tb(t);return Pb(e[1][0],e[1][1],e[0][0],e[0][1])},updateCoverShape:function(t,e,i,n){Db(t,e,i,n)},updateCommon:Cb,contain:Bb},polygon:{createCover:function(t,e){var i=new Ii;return i.add(new Kr({name:"main",style:kb(e),silent:!0})),i},getCreatingRange:function(t){return t},endCreating:function(t,e){e.remove(e.childAt(0)),e.add(new qr({name:"main",draggable:!0,drift:eb(Ob,t,e),ondragend:eb(Ib,t,{isEnd:!0})}))},updateCoverShape:function(t,e,i,n){e.childAt(0).setShape({points:zb(t,e,i)})},updateCommon:Cb,contain:Bb}};function Zb(l){return{createCover:function(t,e){return Ab(eb(Nb,function(t){var e=[t,[0,100]];return l&&e.reverse(),e},function(t){return t[l]}),t,e,[["w","e"],["n","s"]][l])},getCreatingRange:function(t){var e=Tb(t);return[ob(e[0][l],e[1][l]),ab(e[0][l],e[1][l])]},updateCoverShape:function(t,e,i,n){var o,a=Sb(t,e);if(!0!==a&&a.getLinearBrushOtherExtent)o=a.getLinearBrushOtherExtent(l,t._transform);else{var r=t._zr;o=[0,[r.getWidth(),r.getHeight()][1-l]]}var s=[i,o];l&&s.reverse(),Db(t,e,s,n)},updateCommon:Cb,contain:Bb}}function Ub(i){return i=jb(i),function(t,e){return fl(t,i)}}function Xb(o,a){return o=jb(o),function(t){var e=null!=a?a:t,i=e?o.width:o.height,n=e?o.x:o.y;return[n,n+(i||0)]}}function Yb(n,o,a){return n=jb(n),function(t,e,i){return n.contain(e[0],e[1])&&!Wy(t,o,a)}}function jb(t){return Mi.create(t)}var qb=["axisLine","axisTickLabel","axisName"],Kb=bf({type:"parallelAxis",init:function(t,e){Kb.superApply(this,"init",arguments),(this._brushController=new gb(e.getZr())).on("brush",A(this._onBrush,this))},render:function(t,e,i,n){if(!function(t,e,i){return i&&"axisAreaSelect"===i.type&&e.findComponents({mainType:"parallelAxis",query:i})[0]===t}(t,e,n)){this.axisModel=t,this.api=i,this.group.removeAll();var o=this._axisGroup;if(this._axisGroup=new Ii,this.group.add(this._axisGroup),t.get("show")){var a=function(t,e){return e.getComponent("parallel",t.get("parallelIndex"))}(t,e),r=a.coordinateSystem,s=t.getAreaSelectStyle(),l=s.width,u=t.axis.dim,h=L({strokeContainThreshold:l},r.getAxisLayout(u)),c=new Ym(t,h);E(qb,c.add,c),this._axisGroup.add(c.getGroup()),this._refreshBrushController(h,s,t,a,l,i);var d=n&&!1===n.animation?null:t;dl(o,this._axisGroup,d)}}},_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)),u=Mi.create({x:r[0],y:-o/2,width:s,height:o});u.x-=l,u.width+=2*l,this._brushController.mount({enableGlobalPan:!0,rotation:t.rotation,position:t.position}).setPanels([{panelId:"pl",clipPath:Ub(u),isTargetByCursor:Yb(u,a,n),getLinearBrushOtherExtent:Xb(u,0)}]).enableBrush({brushType:"lineX",brushStyle:e,removeOnClick:!0}).updateCovers(function(t){var e=t.axis;return N(t.activeIntervals,function(t){return{brushType:"lineX",panelId:"pl",range:[e.dataToCoord(t[0],!0),e.dataToCoord(t[1],!0)]}})}(i))},_onBrush:function(t,e){var i=this.axisModel,n=i.axis,o=N(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()}});bf({type:"parallel",render:function(t,e,i){this._model=t,this._api=i,this._handlers||(this._handlers={},E($b,function(t,e){i.getZr().on(e,this._handlers[e]=A(t,this))},this)),Tc(this,"_throttledDispatchExpand",t.get("axisExpandRate"),"fixRate")},dispose:function(t,i){E(this._handlers,function(t,e){i.getZr().off(e,t)}),this._handlers=null},_throttledDispatchExpand:function(t){this._dispatchExpand(t)},_dispatchExpand:function(t){t&&this._api.dispatchAction(L({type:"parallelAxisExpand"},t))}});var $b={mousedown:function(t){Jb(this,"click")&&(this._mouseDownPoint=[t.offsetX,t.offsetY])},mouseup:function(t){var e=this._mouseDownPoint;if(Jb(this,"click")&&e){var i=[t.offsetX,t.offsetY];if(5<Math.pow(e[0]-i[0],2)+Math.pow(e[1]-i[1],2))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&&Jb(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})}}};function Jb(t,e){var i=t._model;return i.get("axisExpandable")&&i.get("axisExpandTriggerOn")===e}ff(function(t){!function(t){if(t.parallel)return;var e=!1;E(t.series,function(t){t&&"parallel"===t.type&&(e=!0)}),e&&(t.parallel=[{}])}(t),function(n){E(Eo(n.parallelAxis),function(t){if(R(t)){var e=t.parallelIndex||0,i=Eo(n.parallel)[e];i&&i.parallelAxisDefault&&m(t,i.parallelAxisDefault,!1)}})}(t)}),ic.extend({type:"series.parallel",dependencies:["parallel"],visualColorAccessPath:"lineStyle.color",getInitialData:function(t,e){var i=this.getSource();return function(t,e){if(t.encodeDefine)return;var i=e.ecModel.getComponent("parallel",e.get("parallelIndex"));if(!i)return;var n=t.encodeDefine=Q();E(i.dimensions,function(t){var e=function(t){return+t.replace("dim","")}(t);n.set(t,e)})}(i,this),hp(i,this)},getRawIndicesByActiveState:function(i){var t=this.coordinateSystem,n=this.getData(),o=[];return t.eachActiveState(n,function(t,e){i===t&&o.push(n.getRawIndex(e))}),o},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:500,smooth:!1,animationEasing:"linear"}});gc.extend({type:"parallel",init:function(){this._dataGroup=new Ii,this.group.add(this._dataGroup),this._data,this._initialized},render:function(a,t,e,r){var i=this._dataGroup,s=a.getData(),l=this._data,u=a.coordinateSystem,h=u.dimensions,c=eS(a);if(s.diff(l).add(function(t){iS(tS(s,i,t,h,u),s,t,c)}).update(function(t,e){var i=l.getItemGraphicEl(e),n=Qb(s,t,h,u);s.setItemGraphicEl(t,i);var o=r&&!1===r.animation?null:a;sl(i,{shape:{points:n}},o,t),iS(i,s,t,c)}).remove(function(t){var e=l.getItemGraphicEl(t);i.remove(e)}).execute(),!this._initialized){this._initialized=!0;var n=function(t,e,i){var n=t.model,o=t.getRect(),a=new is({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),ll(a,{shape:{width:o.width,height:o.height}},e,i),a}(u,a,function(){setTimeout(function(){i.removeClipPath()})});i.setClipPath(n)}this._data=s},incrementalPrepareRender:function(t,e,i){this._initialized=!0,this._data=null,this._dataGroup.removeAll()},incrementalRender:function(t,e,i){for(var n=e.getData(),o=e.coordinateSystem,a=o.dimensions,r=eS(e),s=t.start;s<t.end;s++){var l=tS(n,this._dataGroup,s,a,o);l.incremental=!0,iS(l,n,s,r)}},dispose:function(){},remove:function(){this._dataGroup&&this._dataGroup.removeAll(),this._data=null}});function Qb(t,e,i,n){for(var o,a=[],r=0;r<i.length;r++){var s=i[r],l=t.get(t.mapDimension(s),e);o=l,("category"===n.getAxis(s).type?null==o:null==o||isNaN(o))||a.push(n.dataToPoint(l,s))}return a}function tS(t,e,i,n,o){var a=Qb(t,i,n,o),r=new Kr({shape:{points:a},silent:!0,z2:10});return e.add(r),t.setItemGraphicEl(i,r),r}function eS(t){var e=t.get("smooth",!0);return!0===e&&(e=.3),{lineStyle:t.getModel("lineStyle").getLineStyle(),smooth:null!=e?e:.3}}function iS(t,e,i,n){var o=n.lineStyle;e.hasItemOption&&(o=e.getItemModel(i).getModel("lineStyle").getLineStyle());t.useStyle(o);var a=t.style;a.fill=null,a.stroke=e.getItemVisual(i,"color"),a.opacity=e.getItemVisual(i,"opacity"),n.smooth&&(t.shape.smooth=n.smooth)}var nS=["lineStyle","normal","opacity"];yf({seriesType:"parallel",reset:function(t,e,i){var n=t.getModel("itemStyle"),o=t.getModel("lineStyle"),a=e.get("color"),r=o.get("color")||n.get("color")||a[t.seriesIndex%a.length],s=t.get("inactiveOpacity"),l=t.get("activeOpacity"),u=t.getModel("lineStyle").getLineStyle(),h=t.coordinateSystem,c=t.getData(),d={normal:u.opacity,active:l,inactive:s};return c.setVisual("color",r),{progress:function(t,o){h.eachActiveState(o,function(t,e){var i=d[t];if("normal"===t&&o.hasItemOption){var n=o.getItemModel(e).get(nS,!0);null!=n&&(i=n)}o.setItemVisual(e,"opacity",i)},t.start,t.end)}}}});var oS=ic.extend({type:"series.sankey",layoutInfo:null,levelModels:null,getInitialData:function(t,e){for(var i=t.edges||t.links,n=t.data||t.nodes,o=t.levels,a=this.levelModels={},r=0;r<o.length;r++)null!=o[r].depth&&0<=o[r].depth&&(a[o[r].depth]=new Il(o[r],this,e));if(n&&i)return X_(n,i,this,!0,function(t,e){t.wrapMethod("getItemModel",function(t,n){return t.customizeGetParent(function(t){var e=this.parentModel,i=e.getData().getItemLayout(n).depth;return e.levelModels[i]||this.parentModel}),t}),e.wrapMethod("getItemModel",function(t,n){return t.customizeGetParent(function(t){var e=this.parentModel,i=e.getGraph().getEdgeByIndex(n).node1.getLayout().depth;return e.levelModels[i]||this.parentModel}),t})}).data},setNodePosition:function(t,e){var i=this.option.data[t];i.localX=e[0],i.localY=e[1]},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),eu(a)}if("node"!==i)return oS.superCall(this,"formatTooltip",t,e);var r=this.getGraph().getNodeByIndex(t).getLayout().value,s=this.getDataParams(t,i).data.name;if(r)a=s+" : "+r;return eu(a)},optionUpdated:function(){var t=this.option;!0===t.focusNodeAdjacency&&(t.focusNodeAdjacency="allEdges")},defaultOption:{zlevel:0,z:2,coordinateSystem:"view",layout:null,left:"5%",top:"5%",right:"20%",bottom:"5%",orient:"horizontal",nodeWidth:20,nodeGap:8,draggable:!0,focusNodeAdjacency:!1,layoutIterations:32,label:{show:!0,position:"right",color:"#000",fontSize:12},levels:[],nodeAlign:"justify",itemStyle:{borderWidth:1,borderColor:"#333"},lineStyle:{color:"#314656",opacity:.2,curveness:.5},emphasis:{label:{show:!0},lineStyle:{opacity:.6}},animationEasing:"linear",animationDuration:1e3}}),aS=["itemStyle","opacity"],rS=["lineStyle","opacity"];function sS(t,e){return t.getVisual("opacity")||t.getModel().get(e)}function lS(t,e,i){var n=t.getGraphicEl(),o=sS(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 uS(t,e){var i=sS(t,e),n=t.getGraphicEl();n.highlight&&n.highlight(),n.traverse(function(t){"group"!==t.type&&t.setStyle("opacity",i)})}var hS=Is({shape:{x1:0,y1:0,x2:0,y2:0,cpx1:0,cpy1:0,cpx2:0,cpy2:0,extent:0,orient:""},buildPath:function(t,e){var i=e.extent;t.moveTo(e.x1,e.y1),t.bezierCurveTo(e.cpx1,e.cpy1,e.cpx2,e.cpy2,e.x2,e.y2),"vertical"===e.orient?(t.lineTo(e.x2+i,e.y2),t.bezierCurveTo(e.cpx2+i,e.cpy2,e.cpx1+i,e.cpy1,e.x1+i,e.y1)):(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()}});Mf({type:"sankey",_model:null,_focusAdjacencyDisabled:!1,render:function(w,t,n){var o=this,e=w.getGraph(),b=this.group,i=w.layoutInfo,S=i.width,M=i.height,u=w.getData(),I=w.getData("edge"),T=w.get("orient");this._model=w,b.removeAll(),b.attr("position",[i.x,i.y]),e.eachEdge(function(t){var e=new hS;e.dataIndex=t.dataIndex,e.seriesIndex=w.seriesIndex,e.dataType="edge";var i,n,o,a,r,s,l,u,h=t.getModel("lineStyle"),c=h.get("curveness"),d=t.node1.getLayout(),f=t.node1.getModel(),p=f.get("localX"),g=f.get("localY"),m=t.node2.getLayout(),v=t.node2.getModel(),y=v.get("localX"),x=v.get("localY"),_=t.getLayout();switch(e.shape.extent=Math.max(1,_.dy),u="vertical"===(e.shape.orient=T)?(i=(null!=p?p*S:d.x)+_.sy,n=(null!=g?g*M:d.y)+d.dy,o=(null!=y?y*S:m.x)+_.ty,r=i,s=n*(1-c)+(a=null!=x?x*M:m.y)*c,l=o,n*c+a*(1-c)):(i=(null!=p?p*S:d.x)+d.dx,n=(null!=g?g*M:d.y)+_.sy,r=i*(1-c)+(o=null!=y?y*S:m.x)*c,s=n,l=i*c+o*(1-c),a=(null!=x?x*M:m.y)+_.ty),e.setShape({x1:i,y1:n,x2:o,y2:a,cpx1:r,cpy1:s,cpx2:l,cpy2:u}),e.setStyle(h.getItemStyle()),e.style.fill){case"source":e.style.fill=t.node1.getVisual("color");break;case"target":e.style.fill=t.node2.getVisual("color")}Ys(e,t.getModel("emphasis.lineStyle").getItemStyle()),b.add(e),I.setItemGraphicEl(t.dataIndex,e)}),e.eachNode(function(t){var e=t.getLayout(),i=t.getModel(),n=i.get("localX"),o=i.get("localY"),a=i.getModel("label"),r=i.getModel("emphasis.label"),s=new is({shape:{x:null!=n?n*S:e.x,y:null!=o?o*M:e.y,width:e.dx,height:e.dy},style:i.getModel("itemStyle").getItemStyle()}),l=t.getModel("emphasis.itemStyle").getItemStyle();$s(s.style,l,a,r,{labelFetcher:w,labelDataIndex:t.dataIndex,defaultText:t.id,isRectText:!0}),s.setStyle("fill",t.getVisual("color")),Ys(s,l),b.add(s),u.setItemGraphicEl(t.dataIndex,s),s.dataType="node"}),u.eachItemGraphicEl(function(t,i){var e=u.getItemModel(i);e.get("draggable")&&(t.drift=function(t,e){o._focusAdjacencyDisabled=!0,this.shape.x+=t,this.shape.y+=e,this.dirty(),n.dispatchAction({type:"dragNode",seriesId:w.id,dataIndex:u.getRawIndex(i),localX:this.shape.x/S,localY:this.shape.y/M})},t.ondragend=function(){o._focusAdjacencyDisabled=!1},t.draggable=!0,t.cursor="move"),e.get("focusNodeAdjacency")&&(t.off("mouseover").on("mouseover",function(){o._focusAdjacencyDisabled||(o._clearTimer(),n.dispatchAction({type:"focusNodeAdjacency",seriesId:w.id,dataIndex:t.dataIndex}))}),t.off("mouseout").on("mouseout",function(){o._focusAdjacencyDisabled||o._dispatchUnfocus(n)}))}),I.eachItemGraphicEl(function(t,e){I.getItemModel(e).get("focusNodeAdjacency")&&(t.off("mouseover").on("mouseover",function(){o._focusAdjacencyDisabled||(o._clearTimer(),n.dispatchAction({type:"focusNodeAdjacency",seriesId:w.id,edgeDataIndex:t.dataIndex}))}),t.off("mouseout").on("mouseout",function(){o._focusAdjacencyDisabled||o._dispatchUnfocus(n)}))}),!this._data&&w.get("animation")&&b.setClipPath(function(t,e,i){var n=new is({shape:{x:t.x-10,y:t.y-10,width:0,height:t.height+20}});return ll(n,{shape:{width:t.width+20,height:t.height+20}},e,i),n}(b.getBoundingRect(),w,function(){b.removeClipPath()})),this._data=w.getData()},dispose:function(){this._clearTimer()},_dispatchUnfocus:function(t){var e=this;this._clearTimer(),this._unfocusDelayTimer=setTimeout(function(){e._unfocusDelayTimer=null,t.dispatchAction({type:"unfocusNodeAdjacency",seriesId:e._model.id})},500)},_clearTimer:function(){this._unfocusDelayTimer&&(clearTimeout(this._unfocusDelayTimer),this._unfocusDelayTimer=null)},focusNodeAdjacency:function(t,e,i,n){var o=this._model.getData(),a=o.graph,r=n.dataIndex,s=o.getItemModel(r),l=n.edgeDataIndex;if(null!=r||null!=l){var u=a.getNodeByIndex(r),h=a.getEdgeByIndex(l);if(a.eachNode(function(t){lS(t,aS,.1)}),a.eachEdge(function(t){lS(t,rS,.1)}),u){uS(u,aS);var c=s.get("focusNodeAdjacency");"outEdges"===c?E(u.outEdges,function(t){t.dataIndex<0||(uS(t,rS),uS(t.node2,aS))}):"inEdges"===c?E(u.inEdges,function(t){t.dataIndex<0||(uS(t,rS),uS(t.node1,aS))}):"allEdges"===c&&E(u.edges,function(t){t.dataIndex<0||(uS(t,rS),uS(t.node1,aS),uS(t.node2,aS))})}h&&(uS(h,rS),uS(h.node1,aS),uS(h.node2,aS))}},unfocusNodeAdjacency:function(t,e,i,n){var o=this._model.getGraph();o.eachNode(function(t){lS(t,aS)}),o.eachEdge(function(t){lS(t,rS)})}}),gf({type:"dragNode",event:"dragnode",update:"update"},function(e,t){t.eachComponent({mainType:"series",subType:"sankey",query:e},function(t){t.setNodePosition(e.dataIndex,[e.localX,e.localY])})});function cS(t){var e=t.hostGraph.data.getRawDataItem(t.dataIndex);return null!=e.depth&&0<=e.depth}function dS(t,l,u,h,c){var d="vertical"===c?"x":"y";E(t,function(t){var e,i,n;t.sort(function(t,e){return t.getLayout()[d]-e.getLayout()[d]});for(var o=0,a=t.length,r="vertical"===c?"dx":"dy",s=0;s<a;s++)0<(n=o-(i=t[s]).getLayout()[d])&&(e=i.getLayout()[d]+n,"vertical"===c?i.setLayout({x:e},!0):i.setLayout({y:e},!0)),o=i.getLayout()[d]+i.getLayout()[r]+l;if(0<(n=o-l-("vertical"===c?h:u)))for(e=i.getLayout()[d]-n,"vertical"===c?i.setLayout({x:e},!0):i.setLayout({y:e},!0),o=e,s=a-2;0<=s;--s)0<(n=(i=t[s]).getLayout()[d]+i.getLayout()[r]+l-o)&&(e=i.getLayout()[d]-n,"vertical"===c?i.setLayout({x:e},!0):i.setLayout({y:e},!0)),o=i.getLayout()[d]})}function fS(t,o,a){E(t.slice().reverse(),function(t){E(t,function(t){if(t.outEdges.length){var e=yS(t.outEdges,pS,a)/yS(t.outEdges,vS,a);if("vertical"===a){var i=t.getLayout().x+(e-mS(t,a))*o;t.setLayout({x:i},!0)}else{var n=t.getLayout().y+(e-mS(t,a))*o;t.setLayout({y:n},!0)}}})})}function pS(t,e){return mS(t.node2,e)*t.getValue()}function gS(t,e){return mS(t.node1,e)*t.getValue()}function mS(t,e){return"vertical"===e?t.getLayout().x+t.getLayout().dx/2:t.getLayout().y+t.getLayout().dy/2}function vS(t){return t.getValue()}function yS(t,e,i){for(var n=0,o=t.length,a=-1;++a<o;){var r=+e.call(t,t[a],i);isNaN(r)||(n+=r)}return n}function xS(t,o,a){E(t,function(t){E(t,function(t){if(t.inEdges.length){var e=yS(t.inEdges,gS,a)/yS(t.inEdges,vS,a);if("vertical"===a){var i=t.getLayout().x+(e-mS(t,a))*o;t.setLayout({x:i},!0)}else{var n=t.getLayout().y+(e-mS(t,a))*o;t.setLayout({y:n},!0)}}})})}vf(function(t,u,e){t.eachSeriesByType("sankey",function(t){var e=t.get("nodeWidth"),i=t.get("nodeGap"),n=function(t,e){return vu(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}(t,u),o=(t.layoutInfo=n).width,a=n.height,r=t.getGraph(),s=r.nodes,l=r.edges;!function(t){E(t,function(t){var e=yS(t.outEdges,vS),i=yS(t.inEdges,vS),n=Math.max(e,i);t.setLayout({value:n},!0)})}(s),function(t,e,i,n,o,a,r,s,l){(function(t,e,i,n,o,a,r){for(var s=[],l=[],u=[],h=[],c=0,d=0;d<e.length;d++)s[d]=1;for(d=0;d<t.length;d++)l[d]=t[d].inEdges.length,0===l[d]&&u.push(t[d]);var f=-1;for(;u.length;){for(var p=0;p<u.length;p++){var g=u[p],m=g.hostGraph.data.getRawDataItem(g.dataIndex),v=null!=m.depth&&0<=m.depth;v&&m.depth>f&&(f=m.depth),g.setLayout({depth:v?m.depth:c},!0),"vertical"===a?g.setLayout({dy:i},!0):g.setLayout({dx:i},!0);for(var y=0;y<g.outEdges.length;y++){var x=g.outEdges[y],_=e.indexOf(x);s[_]=0;var w=x.node2,b=t.indexOf(w);0==--l[b]&&h.indexOf(w)<0&&h.push(w)}}++c,u=h,h=[]}for(d=0;d<s.length;d++)if(1===s[d])throw new Error("Sankey is a DAG, the original data has cycle!");var S=c-1<f?f:c-1;r&&"left"!==r&&function(t,e,i,n){if("right"===e){for(var o=[],a=t,r=0;a.length;){for(var s=0;s<a.length;s++){var l=a[s];l.setLayout({skNodeHeight:r},!0);for(var u=0;u<l.inEdges.length;u++){var h=l.inEdges[u];o.indexOf(h.node1)<0&&o.push(h.node1)}}a=o,o=[],++r}E(t,function(t){cS(t)||t.setLayout({depth:Math.max(0,n-t.getLayout().skNodeHeight)},!0)})}else"justify"===e&&function(t,e){E(t,function(t){cS(t)||t.outEdges.length||t.setLayout({depth:e},!0)})}(t,n)}(t,r,0,S);!function(t,i,n){E(t,function(t){var e=t.getLayout().depth*i;"vertical"===n?t.setLayout({y:e},!0):t.setLayout({x:e},!0)})}(t,"vertical"===a?(o-i)/S:(n-i)/S,a)})(t,e,i,o,a,s,l),function(t,e,i,n,o,a,r){var s=function(t,e){var i=[],n="vertical"===e?"y":"x",o=Ko(t,function(t){return t.getLayout()[n]});return o.keys.sort(function(t,e){return t-e}),E(o.keys,function(t){i.push(o.buckets.get(t))}),i}(t,r);(function(t,e,o,a,r,s){var l=1/0;E(t,function(t){var e=t.length,i=0;E(t,function(t){i+=t.getLayout().value});var n="vertical"===s?(a-(e-1)*r)/i:(o-(e-1)*r)/i;n<l&&(l=n)}),E(t,function(t){E(t,function(t,e){var i=t.getLayout().value*l;"vertical"===s?(t.setLayout({x:e},!0),t.setLayout({dx:i},!0)):(t.setLayout({y:e},!0),t.setLayout({dy:i},!0))})}),E(e,function(t){var e=+t.getValue()*l;t.setLayout({dy:e},!0)})})(s,e,i,n,o,r),dS(s,o,i,n,r);for(var l=1;0<a;a--)fS(s,l*=.99,r),dS(s,o,i,n,r),xS(s,l,r),dS(s,o,i,n,r)}(t,e,a,o,n,r,s),function(t,e){var i="vertical"===e?"x":"y";E(t,function(t){t.outEdges.sort(function(t,e){return t.node2.getLayout()[i]-e.node2.getLayout()[i]}),t.inEdges.sort(function(t,e){return t.node1.getLayout()[i]-e.node1.getLayout()[i]})}),E(t,function(t){var e=0,i=0;E(t.outEdges,function(t){t.setLayout({sy:e},!0),e+=t.getLayout().dy}),E(t.inEdges,function(t){t.setLayout({ty:i},!0),i+=t.getLayout().dy})})}(t,s)}(s,l,e,i,o,a,0!==M(s,function(t){return 0===t.getLayout().value}).length?0:t.get("layoutIterations"),t.get("orient"),t.get("nodeAlign"))})}),yf(function(t,e){t.eachSeriesByType("sankey",function(n){var t=n.getGraph().nodes;if(t.length){var o=1/0,a=-1/0;E(t,function(t){var e=t.getLayout().value;e<o&&(o=e),a<e&&(a=e)}),E(t,function(t){var e=new a_({type:"color",mappingMethod:"linear",dataExtent:[o,a],visual:n.get("color")}).mapValueToVisual(t.getLayout().value),i=t.getModel().get("itemStyle.color");null!=i?t.setVisual("color",i):t.setVisual("color",e)})}})});var _S={_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"],u="horizontal"===t.layout?0:1,h=this._baseAxisDim=l[u],c=l[1-u],d=[o,a],f=d[u].get("type"),p=d[1-u].get("type"),g=t.data;if(g&&n){var m=[];E(g,function(t,e){var i;t.value&&k(t.value)?(i=t.value.slice(),t.value.unshift(e)):k(t)?(i=t.slice(),t.unshift(e)):i=t,m.push(i)}),t.data=m}var v=this.defaultValueDimensions,y=[{name:h,type:Lf(f),ordinalMeta:i,otherDims:{tooltip:!1,itemName:0},dimsDef:["base"]},{name:c,type:Lf(p),dimsDef:v.slice()}];return Bv(this,{coordDimensions:y,dimensionsCount:v.length+1,encodeDefaulter:T(Xu,y,this)})},getBaseAxis:function(){var t=this._baseAxisDim;return this.ecModel.getComponent(t+"Axis",this.get(t+"AxisIndex")).axis}};b(ic.extend({type:"series.boxplot",dependencies:["xAxis","yAxis","grid"],defaultValueDimensions:[{name:"min",defaultTooltip:!0},{name:"Q1",defaultTooltip:!0},{name:"median",defaultTooltip:!0},{name:"Q3",defaultTooltip:!0},{name:"max",defaultTooltip:!0}],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}}),_S,!0);var wS=["itemStyle"],bS=["emphasis","itemStyle"],SS=(gc.extend({type:"boxplot",render:function(t,e,i){var o=t.getData(),a=this.group,r=this._data;this._data||a.removeAll();var s="horizontal"===t.get("layout")?1:0;o.diff(r).add(function(t){if(o.hasValue(t)){var e=MS(o.getItemLayout(t),o,t,s,!0);o.setItemGraphicEl(t,e),a.add(e)}}).update(function(t,e){var i=r.getItemGraphicEl(e);if(o.hasValue(t)){var n=o.getItemLayout(t);i?IS(n,i,o,t):i=MS(n,o,t,s),a.add(i),o.setItemGraphicEl(t,i)}else a.remove(i)}).remove(function(t){var e=r.getItemGraphicEl(t);e&&a.remove(e)}).execute(),this._data=o},remove:function(t){var e=this.group,i=this._data;this._data=null,i&&i.eachItemGraphicEl(function(t){t&&e.remove(t)})},dispose:et}),Sr.extend({type:"boxplotBoxPath",shape:{},buildPath:function(t,e){var i=e.points,n=0;for(t.moveTo(i[n][0],i[n][1]),n++;n<4;n++)t.lineTo(i[n][0],i[n][1]);for(t.closePath();n<i.length;n++)t.moveTo(i[n][0],i[n][1]),n++,t.lineTo(i[n][0],i[n][1])}}));function MS(t,e,i,n,o){var a=t.ends,r=new SS({shape:{points:o?function(t,e,i){return N(t,function(t){return(t=t.slice())[e]=i.initBaseline,t})}(a,n,t):a}});return IS(t,r,e,i,o),r}function IS(t,e,i,n,o){var a=i.hostModel;(0,yl[o?"initProps":"updateProps"])(e,{shape:{points:t.ends}},a,n);var r=i.getItemModel(n),s=r.getModel(wS),l=i.getItemVisual(n,"color"),u=s.getItemStyle(["borderColor"]);u.stroke=l,u.strokeNoScale=!0,e.useStyle(u),e.z2=100,Ys(e,r.getModel(bS).getItemStyle())}var TS=["itemStyle","borderColor"],AS=E;yf(function(n,t){var o=n.get("color");n.eachRawSeriesByType("boxplot",function(t){var e=o[t.seriesIndex%o.length],i=t.getData();i.setVisual({legendSymbol:"roundRect",color:t.get(TS)||e}),n.isSeriesFiltered(t)||i.each(function(t){var e=i.getItemModel(t);i.setItemVisual(t,{color:e.get(TS,!0)})})})}),vf(function(t){var e=function(t){var n=[],o=[];return t.eachSeriesByType("boxplot",function(t){var e=t.getBaseAxis(),i=_(o,e);i<0&&(i=o.length,o[i]=e,n[i]={axis:e,seriesModels:[]}),n[i].seriesModels.push(t)}),n}(t);AS(e,function(i){var t=i.seriesModels;t.length&&(function(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 u=0;AS(o,function(t){u=Math.max(u,t.getData().count())}),e=n.getExtent(),Math.abs(e[1]-e[0])}AS(o,function(t){var e=t.get("boxWidth");k(e)||(e=[e,e]),l.push([Pl(e[0],i)||0,Pl(e[1],i)||0])});var h=.8*i-2,c=h/a*.3,d=(h-c*(a-1))/a,f=d/2-h/2;AS(o,function(t,e){s.push(f),f+=c+d,r.push(Math.min(Math.max(d,l[e][0]),l[e][1]))})}(i),AS(t,function(t,e){!function(t,r,e){var s=t.coordinateSystem,l=t.getData(),a=e/2,u="horizontal"===t.get("layout")?0:1,h=1-u,i=["x","y"],n=l.mapDimension(i[u]),o=l.mapDimension(i[h],!0);if(null==n||o.length<5)return;for(var c=0;c<l.count();c++){var d=l.get(n,c),f=x(d,o[2],c),p=x(d,o[0],c),g=x(d,o[1],c),m=x(d,o[3],c),v=x(d,o[4],c),y=[];_(y,g,0),_(y,m,1),y.push(p,g,v,m),w(y,p),w(y,v),w(y,f),l.setItemLayout(c,{initBaseline:f[h],ends:y})}function x(t,e,i){var n,o=l.get(e,i),a=[];return a[u]=t,a[h]=o,isNaN(t)||isNaN(o)?n=[NaN,NaN]:(n=s.dataToPoint(a))[u]+=r,n}function _(t,e,i){var n=e.slice(),o=e.slice();n[u]+=a,o[u]-=a,i?t.push(n,o):t.push(o,n)}function w(t,e){var i=e.slice(),n=e.slice();i[u]-=a,n[u]+=a,t.push(i,n)}}(t,i.boxOffsetList[e],i.boxWidthList[e])}))})}),b(ic.extend({type:"series.candlestick",dependencies:["xAxis","yAxis","grid"],defaultValueDimensions:[{name:"open",defaultTooltip:!0},{name:"close",defaultTooltip:!0},{name:"lowest",defaultTooltip:!0},{name:"highest",defaultTooltip:!0}],dimensions:null,defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,hoverAnimation:!0,layout:null,clip:!0,itemStyle:{color:"#c23531",color0:"#314656",borderWidth:1,borderColor:"#c23531",borderColor0:"#314656"},emphasis:{itemStyle:{borderWidth:2}},barMaxWidth:null,barMinWidth:null,barWidth:null,large:!0,largeThreshold:600,progressive:3e3,progressiveThreshold:1e4,progressiveChunkMode:"mod",animationUpdate:!1,animationEasing:"linear",animationDuration:300},getShadowDim:function(){return"open"},brushSelector:function(t,e,i){var n=e.getItemLayout(t);return n&&i.rect(n.brushRect)}}),_S,!0);var DS=["itemStyle"],CS=["emphasis","itemStyle"],LS=["color","color0","borderColor","borderColor0"],kS=(gc.extend({type:"candlestick",render:function(t,e,i){this.group.removeClipPath(),this._updateDrawMode(t),this._isLargeDraw?this._renderLarge(t):this._renderNormal(t)},incrementalPrepareRender:function(t,e,i){this._clear(),this._updateDrawMode(t)},incrementalRender:function(t,e,i,n){this._isLargeDraw?this._incrementalRenderLarge(t,e):this._incrementalRenderNormal(t,e)},_updateDrawMode:function(t){var e=t.pipelineContext.large;(null==this._isLargeDraw||e^this._isLargeDraw)&&(this._isLargeDraw=e,this._clear())},_renderNormal:function(o){var a=o.getData(),r=this._data,s=this.group,l=a.getLayout("isSimpleBox"),u=o.get("clip",!0),t=o.coordinateSystem,h=t.getArea&&t.getArea();this._data||s.removeAll(),a.diff(r).add(function(t){if(a.hasValue(t)){var e,i=a.getItemLayout(t);if(u&&NS(h,i))return;ll(e=PS(i,t,!0),{shape:{points:i.ends}},o,t),OS(e,a,t,l),s.add(e),a.setItemGraphicEl(t,e)}}).update(function(t,e){var i=r.getItemGraphicEl(e);if(a.hasValue(t)){var n=a.getItemLayout(t);u&&NS(h,n)?s.remove(i):(i?sl(i,{shape:{points:n.ends}},o,t):i=PS(n,t),OS(i,a,t,l),s.add(i),a.setItemGraphicEl(t,i))}else s.remove(i)}).remove(function(t){var e=r.getItemGraphicEl(t);e&&s.remove(e)}).execute(),this._data=a},_renderLarge:function(t){this._clear(),zS(t,this.group);var e=t.get("clip",!0)?ym(t.coordinateSystem,!1,t):null;e?this.group.setClipPath(e):this.group.removeClipPath()},_incrementalRenderNormal:function(t,e){for(var i,n=e.getData(),o=n.getLayout("isSimpleBox");null!=(i=t.next());){var a;OS(a=PS(n.getItemLayout(i),i),n,i,o),a.incremental=!0,this.group.add(a)}},_incrementalRenderLarge:function(t,e){zS(e,this.group,!0)},remove:function(t){this._clear()},_clear:function(){this.group.removeAll(),this._data=null},dispose:et}),Sr.extend({type:"normalCandlestickBox",shape:{},buildPath:function(t,e){var i=e.points;this.__simpleBox?(t.moveTo(i[4][0],i[4][1]),t.lineTo(i[6][0],i[6][1])):(t.moveTo(i[0][0],i[0][1]),t.lineTo(i[1][0],i[1][1]),t.lineTo(i[2][0],i[2][1]),t.lineTo(i[3][0],i[3][1]),t.closePath(),t.moveTo(i[4][0],i[4][1]),t.lineTo(i[5][0],i[5][1]),t.moveTo(i[6][0],i[6][1]),t.lineTo(i[7][0],i[7][1]))}}));function PS(t,e,i){var n=t.ends;return new kS({shape:{points:i?function(t,e){return N(t,function(t){return(t=t.slice())[1]=e.initBaseline,t})}(n,t):n},z2:100})}function NS(t,e){for(var i=!0,n=0;n<e.ends.length;n++)if(t.contain(e.ends[n][0],e.ends[n][1])){i=!1;break}return i}function OS(t,e,i,n){var o=e.getItemModel(i),a=o.getModel(DS),r=e.getItemVisual(i,"color"),s=e.getItemVisual(i,"borderColor")||r,l=a.getItemStyle(LS);t.useStyle(l),t.style.strokeNoScale=!0,t.style.fill=r,t.style.stroke=s,t.__simpleBox=n,Ys(t,o.getModel(CS).getItemStyle())}var ES=Sr.extend({type:"largeCandlestickBox",shape:{},buildPath:function(t,e){for(var i=e.points,n=0;n<i.length;)if(this.__sign===i[n++]){var o=i[n++];t.moveTo(o,i[n++]),t.lineTo(o,i[n++])}else n+=3}});function zS(t,e,i){var n=t.getData(),o=n.getLayout("largePoints"),a=new ES({shape:{points:o},__sign:1});e.add(a);var r=new ES({shape:{points:o},__sign:-1});e.add(r),RS(1,a,t,n),RS(-1,r,t,n),i&&(a.incremental=!0,r.incremental=!0)}function RS(t,e,i,n){var o=0<t?"P":"N",a=n.getVisual("borderColor"+o)||n.getVisual("color"+o),r=i.getModel(DS).getItemStyle(LS);e.useStyle(r),e.style.fill=null,e.style.stroke=a}var BS=["itemStyle","borderColor"],VS=["itemStyle","borderColor0"],GS=["itemStyle","color"],FS=["itemStyle","color0"],WS={seriesType:"candlestick",plan:dc(),performRawSeries:!0,reset:function(t,e){var i=t.getData(),n=t.pipelineContext.large;if(i.setVisual({legendSymbol:"roundRect",colorP:a(1,t),colorN:a(-1,t),borderColorP:r(1,t),borderColorN:r(-1,t)}),!e.isSeriesFiltered(t))return!n&&{progress:function(t,e){var i;for(;null!=(i=t.next());){var n=e.getItemModel(i),o=e.getItemLayout(i).sign;e.setItemVisual(i,{color:a(o,n),borderColor:r(o,n)})}}};function a(t,e){return e.get(0<t?GS:FS)}function r(t,e){return e.get(0<t?BS:VS)}}},HS="undefined"!=typeof Float32Array?Float32Array:Array,ZS={seriesType:"candlestick",plan:dc(),reset:function(t){var x=t.coordinateSystem,e=t.getData(),_=function(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=Pl(H(t.get("barMaxWidth"),o),o),r=Pl(H(t.get("barMinWidth"),1),o),s=t.get("barWidth");return null!=s?Pl(s,o):Math.max(Math.min(o/2,a),r)}(t,e),i=["x","y"],w=e.mapDimension(i[0]),n=e.mapDimension(i[1],!0),b=n[0],S=n[1],M=n[2],I=n[3];if(e.setLayout({candleWidth:_,isSimpleBox:_<=1.3}),!(null==w||n.length<4))return{progress:t.pipelineContext.large?function(t,e){var i,n,o=new HS(4*t.count),a=0,r=[],s=[];for(;null!=(n=t.next());){var l=e.get(w,n),u=e.get(b,n),h=e.get(S,n),c=e.get(M,n),d=e.get(I,n);isNaN(l)||isNaN(c)||isNaN(d)?(o[a++]=NaN,a+=3):(o[a++]=US(e,n,u,h,S),r[0]=l,r[1]=c,i=x.dataToPoint(r,null,s),o[a++]=i?i[0]:NaN,o[a++]=i?i[1]:NaN,r[1]=d,i=x.dataToPoint(r,null,s),o[a++]=i?i[1]:NaN)}e.setLayout("largePoints",o)}:function(t,e){var i;for(;null!=(i=t.next());){var n=e.get(w,i),o=e.get(b,i),a=e.get(S,i),r=e.get(M,i),s=e.get(I,i),l=Math.min(o,a),u=Math.max(o,a),h=g(l,n),c=g(u,n),d=g(r,n),f=g(s,n),p=[];m(p,c,0),m(p,h,1),p.push(y(f),y(c),y(d),y(h)),e.setItemLayout(i,{sign:US(e,i,o,a,S),initBaseline:a<o?c[1]:h[1],ends:p,brushRect:v(r,s,n)})}function g(t,e){var i=[];return i[0]=e,i[1]=t,isNaN(e)||isNaN(t)?[NaN,NaN]:x.dataToPoint(i)}function m(t,e,i){var n=e.slice(),o=e.slice();n[0]=Ns(n[0]+_/2,1,!1),o[0]=Ns(o[0]-_/2,1,!0),i?t.push(n,o):t.push(o,n)}function v(t,e,i){var n=g(t,i),o=g(e,i);return n[0]-=_/2,o[0]-=_/2,{x:n[0],y:n[1],width:_,height:o[1]-n[1]}}function y(t){return t[0]=Ns(t[0],1),t}}}}};function US(t,e,i,n,o){return n<i?-1:i<n?1:0<e?t.get(o,e-1)<=n?1:-1:1}ff(function(t){t&&k(t.series)&&E(t.series,function(t){R(t)&&"k"===t.type&&(t.type="candlestick")})}),yf(WS),vf(ZS),ic.extend({type:"series.effectScatter",dependencies:["grid","polar"],getInitialData:function(t,e){return hp(this.getSource(),this,{useEncodeDefaulter:!0})},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}});function XS(t,e){var i=e.rippleEffectColor||e.color;t.eachChild(function(t){t.attr({z:e.z,zlevel:e.zlevel,style:{stroke:"stroke"===e.brushType?i:null,fill:"fill"===e.brushType?i:null}})})}function YS(t,e){Ii.call(this);var i=new Fg(t,e),n=new Ii;this.add(i),this.add(n),n.beforeUpdate=function(){this.attr(i.getScale())},this.updateData(t,e)}var jS=YS.prototype;jS.stopEffectAnimation=function(){this.childAt(1).removeAll()},jS.startEffectAnimation=function(t){for(var e=t.symbolType,i=t.color,n=this.childAt(1),o=0;o<3;o++){var a=mg(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)}XS(n,t)},jS.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)}XS(i,t)},jS.highlight=function(){this.trigger("emphasis")},jS.downplay=function(){this.trigger("normal")},jS.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=function(t){return k(t)||(t=[+t,+t]),t}(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 u=n.position;u[0]=Pl(l[0],r[0]),u[1]=Pl(l[1],r[1])}n.rotation=(o.getShallow("symbolRotate")||0)*Math.PI/180||0;var h={};if(h.showEffectOn=i.get("showEffectOn"),h.rippleScale=o.get("rippleEffect.scale"),h.brushType=o.get("rippleEffect.brushType"),h.period=1e3*o.get("rippleEffect.period"),h.effectOffset=e/t.count(),h.z=o.getShallow("z")||0,h.zlevel=o.getShallow("zlevel")||0,h.symbolType=a,h.color=s,h.rippleEffectColor=o.get("rippleEffect.color"),this.off("mouseover").off("mouseout").off("emphasis").off("normal"),"render"===h.showEffectOn)this._effectCfg?this.updateEffectAnimation(h):this.startEffectAnimation(h),this._effectCfg=h;else{this._effectCfg=null,this.stopEffectAnimation();var c=this.childAt(0),d=function(){c.highlight(),"render"!==h.showEffectOn&&this.startEffectAnimation(h)},f=function(){c.downplay(),"render"!==h.showEffectOn&&this.stopEffectAnimation()};this.on("mouseover",d,this).on("mouseout",f,this).on("emphasis",d,this).on("normal",f,this)}this._effectCfg=h},jS.fadeOut=function(t){this.off("mouseover").off("mouseout").off("emphasis").off("normal"),t&&t()},w(YS,Ii),Mf({type:"effectScatter",init:function(){this._symbolDraw=new $g(YS)},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=Im().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=ue(e.getRoamTransform()),this.group.decomposeTransform())},remove:function(t,e){this._symbolDraw&&this._symbolDraw.remove(e)},dispose:function(){}}),yf(Mm("effectScatter","circle")),vf(Im("effectScatter"));var qS="undefined"==typeof Uint32Array?Array:Uint32Array,KS="undefined"==typeof Float64Array?Array:Float64Array;function $S(t){var e=t.data;e&&e[0]&&e[0][0]&&e[0][0].coord&&(t.data=N(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),p([e,t[0],t[1]])}))}var JS=ic.extend({type:"series.lines",dependencies:["grid","polar"],visualColorAccessPath:"lineStyle.color",init:function(t){t.data=t.data||[],$S(t);var e=this._processFlatCoordsArray(t.data);this._flatCoords=e.flatCoords,this._flatCoordsOffset=e.flatCoordsOffset,e.flatCoords&&(t.data=new Float32Array(e.count)),JS.superApply(this,"init",arguments)},mergeOption:function(t){if(t.data=t.data||[],$S(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))}JS.superApply(this,"mergeOption",arguments)},appendData:function(t){var e=this._processFlatCoordsArray(t.data);e.flatCoords&&(this._flatCoords?(this._flatCoords=tt(this._flatCoords,e.flatCoords),this._flatCoordsOffset=tt(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}var a=this._getCoordsFromItemModel(t);for(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])return{flatCoordsOffset:null,flatCoords:null,count:t.length};for(var i=t.length,n=new qS(i),o=new KS(i),a=0,r=0,s=0,l=0;l<i;){s++;var u=t[l++];n[r++]=a+e,n[r++]=u;for(var h=0;h<u;h++){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}},getInitialData:function(t,e){var a=new Wf(["value"],this);return a.hasItemOption=!1,a.initData(t.data,[],function(t,e,i,n){if(t instanceof Array)return NaN;a.hasItemOption=!0;var o=t.value;return null!=o?o instanceof Array?o[n]:o:void 0}),a},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),eu(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,polyline:!1,clip:!0,label:{show:!1,position:"end"},lineStyle:{opacity:.5}}});function QS(t,e,i){Ii.call(this),this.add(this.createLine(t,e,i)),this._updateEffectSymbol(t,e)}var tM=QS.prototype;function eM(t,e,i){Ii.call(this),this._createPolyline(t,e,i)}tM.createLine=function(t,e,i){return new iw(t,e,i)},tM._updateEffectSymbol=function(t,e){var i=t.getItemModel(e).getModel("effect"),n=i.get("symbolSize"),o=i.get("symbol");k(n)||(n=[n,n]);var a=i.get("color")||t.getItemVisual(e,"color"),r=this.childAt(1);this._symbolType!==o&&(this.remove(r),(r=mg(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))},tM._updateEffectAnimation=function(e,t,i){var n=this.childAt(1);if(n){var o=this,a=e.getItemLayout(i),r=1e3*t.get("period"),s=t.get("loop"),l=t.get("constantSpeed"),u=W(t.get("delay"),function(t){return t/e.count()*r/3}),h="function"==typeof u;if(n.ignore=!0,this.updateAnimationPoints(n,a),0<l&&(r=this.getLineLength(n)/l*1e3),r!==this._period||s!==this._loop){n.stopAnimation();var c=u;h&&(c=u(i)),0<n.__t&&(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}},tM.getLineLength=function(t){return yt(t.__p1,t.__cp1)+yt(t.__cp1,t.__p2)},tM.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]},tM.updateData=function(t,e,i){this.childAt(0).updateData(t,e,i),this._updateEffectSymbol(t,e)},tM.updateSymbolPosition=function(t){var e=t.__p1,i=t.__p2,n=t.__cp1,o=t.__t,a=t.position,r=Ta,s=Aa;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),u=s(e[1],n[1],i[1],o);t.rotation=-Math.atan2(u,l)-Math.PI/2,t.ignore=!1},tM.updateLayout=function(t,e){this.childAt(0).updateLayout(t,e);var i=t.getItemModel(e).getModel("effect");this._updateEffectAnimation(t,i,e)},w(QS,Ii);var iM=eM.prototype;function nM(t,e,i){QS.call(this,t,e,i),this._lastFrame=0,this._lastFramePercent=0}iM._createPolyline=function(t,e,i){var n=t.getItemLayout(e),o=new Kr({shape:{points:n}});this.add(o),this._updateCommonStl(t,e,i)},iM.updateData=function(t,e,i){var n=t.hostModel;sl(this.childAt(0),{shape:{points:t.getItemLayout(e)}},n,e),this._updateCommonStl(t,e,i)},iM._updateCommonStl=function(t,e,i){var n=this.childAt(0),o=t.getItemModel(e),a=t.getItemVisual(e,"color"),r=i&&i.lineStyle,s=i&&i.hoverLineStyle;i&&!t.hasItemOption||(r=o.getModel("lineStyle").getLineStyle(),s=o.getModel("emphasis.lineStyle").getLineStyle()),n.useStyle(C({strokeNoScale:!0,fill:"none",stroke:a},r)),n.hoverStyle=s,Ys(this)},iM.updateLayout=function(t,e){this.childAt(0).setShape("points",t.getItemLayout(e))},w(eM,Ii);var oM=nM.prototype;oM.createLine=function(t,e,i){return new eM(t,e,i)},oM.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+=yt(a,r),i.push(n)}if(0!==n){for(o=0;o<i.length;o++)i[o]/=n;this._offsets=i,this._length=n}},oM.getLineLength=function(t){return this._length},oM.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);0<=r&&!(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)}wt(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}},w(nM,QS);var aM=Is({shape:{polyline:!1,curveness:0,segs:[]},buildPath:function(t,e){var i=e.segs,n=e.curveness;if(e.polyline)for(var o=0;o<i.length;){var a=i[o++];if(0<a){t.moveTo(i[o++],i[o++]);for(var r=1;r<a;r++)t.lineTo(i[o++],i[o++])}}else for(o=0;o<i.length;){var s=i[o++],l=i[o++],u=i[o++],h=i[o++];if(t.moveTo(s,l),0<n){var c=(s+u)/2-(l-h)*n,d=(l+h)/2-(u-s)*n;t.quadraticCurveTo(c,d,u,h)}else t.lineTo(u,h)}},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(0<s)for(var l=n[r++],u=n[r++],h=1;h<s;h++){if(nr(l,u,c=n[r++],d=n[r++]))return a}a++}else for(a=0,r=0;r<n.length;){l=n[r++],u=n[r++];var c=n[r++],d=n[r++];if(0<o){if(ar(l,u,(l+c)/2-(u-d)*o,(u+d)/2-(c-l)*o,c,d))return a}else if(nr(l,u,c,d))return a;a++}return-1}});function rM(){this.group=new Ii}var sM=rM.prototype;sM.isPersistent=function(){return!this._incremental},sM.updateData=function(t){this.group.removeAll();var e=new aM({rectHover:!0,cursor:"default"});e.setShape({segs:t.getLayout("linesPoints")}),this._setCommon(e,t),this.group.add(e),this._incremental=null},sM.incrementalPrepareUpdate=function(t){this.group.removeAll(),this._clearIncremental(),5e5<t.count()?(this._incremental||(this._incremental=new fs({silent:!0})),this.group.add(this._incremental)):this._incremental=null},sM.incrementalUpdate=function(t,e){var i=new aM;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))},sM.remove=function(){this._clearIncremental(),this._incremental=null,this.group.removeAll()},sM._setCommon=function(i,t,e){var n=t.hostModel;i.setShape({polyline:n.get("polyline"),curveness:n.get("lineStyle.curveness")}),i.useStyle(n.getModel("lineStyle").getLineStyle()),i.style.strokeNoScale=!0;var o=t.getVisual("color");o&&i.setStyle("stroke",o),i.setStyle("fill"),e||(i.seriesIndex=n.seriesIndex,i.on("mousemove",function(t){i.dataIndex=null;var e=i.findDataIndex(t.offsetX,t.offsetY);0<e&&(i.dataIndex=e+i.__startIndex)}))},sM._clearIncremental=function(){var t=this._incremental;t&&t.clearDisplaybles()};var lM={seriesType:"lines",plan:dc(),reset:function(g){var m=g.coordinateSystem,v=g.get("polyline"),y=g.pipelineContext.large;return{progress:function(t,e){var i=[];if(y){var n,o=t.end-t.start;if(v){for(var a=0,r=t.start;r<t.end;r++)a+=g.getLineCoordsCount(r);n=new Float32Array(o+2*a)}else n=new Float32Array(4*o);var s=0,l=[];for(r=t.start;r<t.end;r++){var u=g.getLineCoords(r,i);v&&(n[s++]=u);for(var h=0;h<u;h++)l=m.dataToPoint(i[h],!1,l),n[s++]=l[0],n[s++]=l[1]}e.setLayout("linesPoints",n)}else for(r=t.start;r<t.end;r++){var c=e.getItemModel(r),d=(u=g.getLineCoords(r,i),[]);if(v)for(var f=0;f<u;f++)d.push(m.dataToPoint(i[f]));else{d[0]=m.dataToPoint(i[0]),d[1]=m.dataToPoint(i[1]);var p=c.get("lineStyle.curveness");+p&&(d[2]=[(d[0][0]+d[1][0])/2-(d[0][1]-d[1][1])*p,(d[0][1]+d[1][1])/2-(d[1][0]-d[0][0])*p])}e.setItemLayout(r,d)}}}}};function uM(t){return t instanceof Array||(t=[t,t]),t}Mf({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);var u=t.get("clip",!0)&&ym(t.coordinateSystem,!1,t);u?this.group.setClipPath(u):this.group.removeClipPath(),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(),o=t.pipelineContext;if(!this._finished||o.large||o.progressiveRender)return{update:!0};var a=lM.reset(t);a.progress&&a.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 rM:new ow(o?n?nM:eM:n?QS:iw),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 hM="lineStyle.opacity".split("."),cM={seriesType:"lines",reset:function(t,e,i){var n=uM(t.get("symbol")),o=uM(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(hM)),{dataEach:a.hasItemOption?function(t,e){var i=t.getItemModel(e),n=uM(i.getShallow("symbol",!0)),o=uM(i.getShallow("symbolSize",!0)),a=i.get(hM);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}}};vf(lM),yf(cM),ic.extend({type:"series.heatmap",getInitialData:function(t,e){return hp(this.getSource(),this,{generateCoord:"value"})},preventIncremental:function(){var t=nh.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}});function dM(){var t=g();this.canvas=t,this.blurSize=30,this.pointSize=20,this.maxOpacity=1,this.minOpacity=0,this._gradientPixels={}}dM.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"),u=this.pointSize+this.blurSize,h=this.canvas,c=h.getContext("2d"),d=t.length;h.width=e,h.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-u,m-u)}if(!h.width||!h.height)return h;for(var y=c.getImageData(0,0,h.width,h.height),x=y.data,_=0,w=x.length,b=this.minOpacity,S=this.maxOpacity-b;_<w;){v=x[_+3]/256;var M=4*Math.floor(255*v);if(0<v){var I=a(v)?s:l;0<v&&(v=v*S+b),x[_++]=I[M],x[_++]=I[1+M],x[_++]=I[2+M],x[_++]=I[3+M]*v*256}else _+=4}return c.putImageData(y,0,0),h},_getBrush:function(){var t=this._brushCanvas||(this._brushCanvas=g()),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}},Mf({type:"heatmap",render:function(i,t,e){var n;t.eachComponent("visualMap",function(e){e.eachTargetSeries(function(t){t===i&&(n=e)})}),this.group.removeAll(),this._incrementalDisplayable=null;var o=i.coordinateSystem;"cartesian2d"===o.type||"calendar"===o.type?this._renderOnCartesianAndCalendar(i,e,0,i.getData().count()):function(t){var e=t.dimensions;return"lng"===e[0]&&"lat"===e[1]}(o)&&this._renderOnGeo(o,i,n,e)},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 a,r,s=t.coordinateSystem;if("cartesian2d"===s.type){var l=s.getAxis("x"),u=s.getAxis("y");a=l.getBandWidth(),r=u.getBandWidth()}for(var h=this.group,c=t.getData(),d="emphasis.itemStyle",f="emphasis.label",p=t.getModel("itemStyle").getItemStyle(["color"]),g=t.getModel(d).getItemStyle(),m=t.getModel("label"),v=t.getModel(f),y=s.type,x="cartesian2d"===y?[c.mapDimension("x"),c.mapDimension("y"),c.mapDimension("value")]:[c.mapDimension("time"),c.mapDimension("value")],_=i;_<n;_++){var w;if("cartesian2d"===y){if(isNaN(c.get(x[2],_)))continue;var b=s.dataToPoint([c.get(x[0],_),c.get(x[1],_)]);w=new is({shape:{x:Math.floor(b[0]-a/2),y:Math.floor(b[1]-r/2),width:Math.ceil(a),height:Math.ceil(r)},style:{fill:c.getItemVisual(_,"color"),opacity:c.getItemVisual(_,"opacity")}})}else{if(isNaN(c.get(x[1],_)))continue;w=new is({z2:1,shape:s.dataToRect([c.get(x[0],_)]).contentShape,style:{fill:c.getItemVisual(_,"color"),opacity:c.getItemVisual(_,"opacity")}})}var S=c.getItemModel(_);c.hasItemOption&&(p=S.getModel("itemStyle").getItemStyle(["color"]),g=S.getModel(d).getItemStyle(),m=S.getModel("label"),v=S.getModel(f));var M=t.getRawValue(_),I="-";M&&null!=M[2]&&(I=M[2]),$s(p,g,m,v,{labelFetcher:t,labelDataIndex:_,defaultText:I,isRectText:!0}),w.setStyle(p),Ys(w,c.hasItemOption?g:L({},g)),(w.incremental=o)&&(w.useHoverLayer=!0),h.add(w),c.setItemGraphicEl(_,w)}},_renderOnGeo:function(o,t,e,i){var n=e.targetVisuals.inRange,a=e.targetVisuals.outOfRange,r=t.getData(),s=this._hmLayer||this._hmLayer||new dM;s.blurSize=t.get("blurSize"),s.pointSize=t.get("pointSize"),s.minOpacity=t.get("minOpacity"),s.maxOpacity=t.get("maxOpacity");var l=o.getViewRect().clone(),u=o.getRoamTransform();l.applyTransform(u);var h=Math.max(l.x,0),c=Math.max(l.y,0),d=Math.min(l.width+l.x,i.getWidth()),f=Math.min(l.height+l.y,i.getHeight()),p=d-h,g=f-c,m=[r.mapDimension("lng"),r.mapDimension("lat"),r.mapDimension("value")],v=r.mapArray(m,function(t,e,i){var n=o.dataToPoint([t,e]);return n[0]-=h,n[1]-=c,n.push(i),n}),y=e.getExtent(),x="visualMap.continuous"===e.type?function(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]}}(y,e.option.range):function(e,n,o){var i=e[1]-e[0],a=(n=N(n,function(t){return{interval:[(t.interval[0]-e[0])/i,(t.interval[1]-e[0])/i]}})).length,r=0;return function(t){for(var e=r;e<a;e++){if((i=n[e].interval)[0]<=t&&t<=i[1]){r=e;break}}if(e===a)for(e=r-1;0<=e;e--){var i;if((i=n[e].interval)[0]<=t&&t<=i[1]){r=e;break}}return 0<=e&&e<a&&o[e]}}(y,e.getPieceList(),e.option.selected);s.update(v,p,g,n.color.getNormalizer(),{inRange:n.color.getColorMapper(),outOfRange:a.color.getColorMapper()},x);var _=new qn({style:{width:p,height:g,x:h,y:c,image:s.canvas},silent:!0});this.group.add(_)},dispose:function(){}});var fM=yv.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,fM.superApply(this,"getInitialData",arguments)}}),pM=["itemStyle","borderWidth"],gM=[{xy:"x",wh:"width",index:0,posDesc:["left","right"]},{xy:"y",wh:"height",index:1,posDesc:["top","bottom"]}],mM=new Hr;Mf({type:"pictorialBar",render:function(t,e,i){var r=this.group,s=t.getData(),l=this._data,n=t.coordinateSystem,o=!!n.getBaseAxis().isHorizontal(),a=n.grid.getRect(),u={ecSize:{width:i.getWidth(),height:i.getHeight()},seriesModel:t,coordSys:n,coordSysExtent:[[a.x,a.x+a.width],[a.y,a.y+a.height]],isHorizontal:o,valueDim:gM[+o],categoryDim:gM[1-o]};return s.diff(l).add(function(t){if(s.hasValue(t)){var e=MM(s,t),i=vM(s,t,e,u),n=DM(s,u,i);s.setItemGraphicEl(t,n),r.add(n),NM(n,u,i)}}).update(function(t,e){var i=l.getItemGraphicEl(e);if(s.hasValue(t)){var n=MM(s,t),o=vM(s,t,n,u),a=LM(s,o);i&&a!==i.__pictorialShapeStr&&(r.remove(i),s.setItemGraphicEl(t,null),i=null),i?function(t,e,i){var n=i.animationModel,o=i.dataIndex;sl(t.__pictorialBundle,{position:i.bundlePosition.slice()},n,o),i.symbolRepeat?_M(t,e,i,!0):wM(t,e,i,!0);bM(t,i,!0),SM(t,e,i,!0)}(i,u,o):i=DM(s,u,o,!0),s.setItemGraphicEl(t,i),i.__pictorialSymbolMeta=o,r.add(i),NM(i,u,o)}else r.remove(i)}).remove(function(t){var e=l.getItemGraphicEl(t);e&&CM(l,t,e.__pictorialSymbolMeta.animationModel,e)}).execute(),this._data=s,this.group},dispose:et,remove:function(e,t){var i=this.group,n=this._data;e.get("animation")?n&&n.eachItemGraphicEl(function(t){CM(n,t.dataIndex,e,t)}):i.removeAll()}});function vM(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,u=i.get("symbolPatternSize")||2,h=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:u,rotation:l,animationModel:h?i:null,hoverAnimation:h&&i.get("hoverAnimation"),z2:i.getShallow("z",!0)||0};!function(t,e,i,n,o){var a,r=n.valueDim,s=t.get("symbolBoundingData"),l=n.coordSys.getOtherAxis(n.coordSys.getBaseAxis()),u=l.toGlobalCoord(l.dataToCoord(0)),h=1-+(i[r.wh]<=0);if(k(s)){var c=[yM(l,s[0])-u,yM(l,s[1])-u];c[1]<c[0]&&c.reverse(),a=c[h]}else a=null!=s?yM(l,s)-u:e?n.coordSysExtent[r.index][h]-u:i[r.wh];o.boundingLength=a,e&&(o.repeatCutLength=i[r.wh]);o.pxSign=0<a?1:a<0?-1:0}(i,a,o,n,c),function(t,e,i,n,o,a,r,s,l,u){var h=l.valueDim,c=l.categoryDim,d=Math.abs(i[c.wh]),f=t.getItemVisual(e,"symbolSize");f=k(f)?f.slice():(null==f&&(f="100%"),[f,f]);f[c.index]=Pl(f[c.index],d),f[h.index]=Pl(f[h.index],n?d:Math.abs(a)),u.symbolSize=f,(u.symbolScale=[f[0]/s,f[1]/s])[h.index]*=(l.isHorizontal?-1:1)*r}(t,e,o,a,0,c.boundingLength,c.pxSign,u,n,c),function(t,e,i,n,o){var a=t.get(pM)||0;a&&(mM.attr({scale:e.slice(),rotation:i}),mM.updateTransform(),a/=mM.getLineScale(),a*=e[n.valueDim.index]);o.valueLineWidth=a}(i,c.symbolScale,l,n,c);var d=c.symbolSize,f=i.get("symbolOffset");return k(f)&&(f=[Pl(f[0],d[0]),Pl(f[1],d[1])]),function(t,e,i,n,o,a,r,s,l,u,h,c){var d=h.categoryDim,f=h.valueDim,p=c.pxSign,g=Math.max(e[f.index]+s,0),m=g;if(n){var v=Math.abs(l),y=W(t.get("symbolMargin"),"15%")+"",x=!1;y.lastIndexOf("!")===y.length-1&&(x=!0,y=y.slice(0,y.length-1)),y=Pl(y,e[f.index]);var _=Math.max(g+2*y,0),w=x?0:2*y,b=jl(n),S=b?n:OM((v+w)/_);_=g+2*(y=(v-S*g)/2/(x?S:S-1)),w=x?0:2*y,b||"fixed"===n||(S=u?OM((Math.abs(u)+w)/_):0),m=S*_-w,c.repeatTimes=S,c.symbolMargin=y}var M=p*(m/2),I=c.pathPosition=[];I[d.index]=i[d.wh]/2,I[f.index]="start"===r?M:"end"===r?l-M:l/2,a&&(I[0]+=a[0],I[1]+=a[1]);var T=c.bundlePosition=[];T[d.index]=i[d.xy],T[f.index]=i[f.xy];var A=c.barRectShape=L({},i);A[f.wh]=p*Math.max(Math.abs(i[f.wh]),Math.abs(I[f.index]+M)),A[d.wh]=i[d.wh];var D=c.clipShape={};D[d.xy]=-i[d.xy],D[d.wh]=h.ecSize[d.wh],D[f.xy]=0,D[f.wh]=i[f.wh]}(i,d,o,a,0,f,s,c.valueLineWidth,c.boundingLength,c.repeatCutLength,n,c),c}function yM(t,e){return t.toGlobalCoord(t.dataToCoord(t.scale.parse(e)))}function xM(t){var e=t.symbolPatternSize,i=mg(t.symbolType,-e/2,-e/2,e,e,t.color);return i.attr({culling:!0}),"image"!==i.type&&i.setStyle({strokeNoScale:!0}),i}function _M(t,e,o,i){var n=t.__pictorialBundle,a=o.symbolSize,r=o.valueLineWidth,s=o.pathPosition,l=e.valueDim,u=o.repeatTimes||0,h=0,c=a[e.valueDim.index]+r+2*o.symbolMargin;for(kM(t,function(t){t.__pictorialAnimationIndex=h,t.__pictorialRepeatTimes=u,h<u?PM(t,null,p(h),o,i):PM(t,null,{scale:[0,0]},o,i,function(){n.remove(t)}),AM(t,o),h++});h<u;h++){var d=xM(o);d.__pictorialAnimationIndex=h,d.__pictorialRepeatTimes=u,n.add(d);var f=p(h);PM(d,{position:f.position,scale:[0,0]},{scale:f.scale,rotation:f.rotation},o,i),d.on("mouseover",g).on("mouseout",m),AM(d,o)}function p(t){var e=s.slice(),i=o.pxSign,n=t;return("start"===o.symbolRepeatDirection?0<i:i<0)&&(n=u-1-t),e[l.index]=c*(n-u/2+.5)+s[l.index],{position:e,scale:o.symbolScale.slice(),rotation:o.rotation}}function g(){kM(t,function(t){t.trigger("emphasis")})}function m(){kM(t,function(t){t.trigger("normal")})}}function wM(t,e,i,n){var o=t.__pictorialBundle,a=t.__pictorialMainPath;a?PM(a,null,{position:i.pathPosition.slice(),scale:i.symbolScale.slice(),rotation:i.rotation},i,n):(a=t.__pictorialMainPath=xM(i),o.add(a),PM(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")})),AM(a,i)}function bM(t,e,i){var n=L({},e.barRectShape),o=t.__pictorialBarRect;o?PM(o,null,{shape:n},e,i):(o=t.__pictorialBarRect=new is({z2:2,shape:n,silent:!0,style:{stroke:"transparent",fill:"transparent",lineWidth:0}}),t.add(o))}function SM(t,e,i,n){if(i.symbolClip){var o=t.__pictorialClipPath,a=L({},i.clipShape),r=e.valueDim,s=i.animationModel,l=i.dataIndex;if(o)sl(o,{shape:a},s,l);else{a[r.wh]=0,o=new is({shape:a}),t.__pictorialBundle.setClipPath(o),t.__pictorialClipPath=o;var u={};u[r.wh]=i.clipShape[r.wh],yl[n?"updateProps":"initProps"](o,{shape:u},s,l)}}}function MM(t,e){var i=t.getItemModel(e);return i.getAnimationDelayParams=IM,i.isAnimationEnabled=TM,i}function IM(t){return{index:t.__pictorialAnimationIndex,count:t.__pictorialRepeatTimes}}function TM(){return this.parentModel.isAnimationEnabled()&&!!this.getShallow("animation")}function AM(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 DM(t,e,i,n){var o=new Ii,a=new Ii;return o.add(a),(o.__pictorialBundle=a).attr("position",i.bundlePosition.slice()),i.symbolRepeat?_M(o,e,i):wM(o,0,i),bM(o,i,n),SM(o,e,i,n),o.__pictorialShapeStr=LM(t,i),o.__pictorialSymbolMeta=i,o}function CM(t,e,i,n){var o=n.__pictorialBarRect;o&&(o.style.text=null);var a=[];kM(n,function(t){a.push(t)}),n.__pictorialMainPath&&a.push(n.__pictorialMainPath),n.__pictorialClipPath&&(i=null),E(a,function(t){sl(t,{scale:[0,0]},i,e,function(){n.parent&&n.parent.remove(n)})}),t.setItemGraphicEl(e,null)}function LM(t,e){return[t.getItemVisual(e.dataIndex,"symbol")||"none",!!e.symbolRepeat,!!e.symbolClip].join(":")}function kM(e,i,n){E(e.__pictorialBundle.children(),function(t){t!==e.__pictorialBarRect&&i.call(n,t)})}function PM(t,e,i,n,o,a){e&&t.attr(e),n.symbolClip&&!o?i&&t.attr(i):i&&yl[o?"updateProps":"initProps"](t,i,n.animationModel,n.dataIndex,a)}function NM(t,e,i){var n=i.color,o=i.dataIndex,a=i.itemModel,r=a.getModel("itemStyle").getItemStyle(["color"]),s=a.getModel("emphasis.itemStyle").getItemStyle(),l=a.getShallow("cursor");kM(t,function(t){t.setColor(n),t.setStyle(C({fill:n,opacity:i.opacity},r)),Ys(t,s),l&&(t.cursor=l),t.z2=i.z2});var u={},h=(e.valueDim.posDesc[+(0<i.boundingLength)],t.__pictorialBarRect);xv(h.style,u,a,n,e.seriesModel,o),Ys(h,u)}function OM(t){var e=Math.round(t);return Math.abs(t-e)<1e-4?e:Math.ceil(t)}vf(T(Pp,"pictorialBar")),yf(Mm("pictorialBar","roundRect"));function EM(t,e,i,n,o){Eg.call(this,t,e,i),this.type=n||"value",this.position=o||"bottom",this.orient=null}function zM(t,e,i){this.dimension="single",this.dimensions=["single"],this._axis=null,this._rect,this._init(t,e,i),this.model=t}function RM(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],u={horizontal:{top:l[2],bottom:l[3]},vertical:{left:l[0],right:l[1]}};o.position=["vertical"===r?u.vertical[a]:l[0],"horizontal"===r?u.horizontal[a]:l[3]];o.rotation=Math.PI/2*{horizontal:0,vertical:1}[r];o.labelDirection=o.tickDirection=o.nameDirection={top:-1,bottom:1,right:1,left:-1}[a],t.get("axisTick.inside")&&(o.tickDirection=-o.tickDirection),W(e.labelInside,t.get("axisLabel.inside"))&&(o.labelDirection=-o.labelDirection);var h=e.rotate;return null==h&&(h=t.get("axisLabel.rotate")),o.labelRotation="top"===a?-h:h,o.z2=1,o}EM.prototype={constructor:EM,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},w(EM,Eg),nh.register("single",{create:function(n,o){var a=[];return n.eachComponent("singleAxis",function(t,e){var i=new zM(t,n,o);i.name="single_"+e,i.resize(t,o),t.coordinateSystem=i,a.push(i)}),n.eachSeries(function(t){if("singleAxis"===t.get("coordinateSystem")){var e=n.queryComponents({mainType:"singleAxis",index:t.get("singleAxisIndex"),id:t.get("singleAxisId")})[0];t.coordinateSystem=e&&e.coordinateSystem}}),a},dimensions:(zM.prototype={type:"singleAxis",axisPointerEnabled:!0,constructor:zM,_init:function(t,e,i){var n=this.dimension,o=new EM(n,ig(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).model=t,(o.coordinateSystem=this)._axis=o},update:function(t,e){t.eachSeries(function(t){if(t.coordinateSystem===this){var e=t.getData();E(e.mapDimension(this.dimension,!0),function(t){this._axis.scale.unionExtentFromData(e,t)},this),eg(this._axis.scale,this._axis.model)}},this)},resize:function(t,e){this._rect=vu({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}}).dimensions});var BM=["axisLine","axisTickLabel","axisName"],VM="splitLine",GM=hv.extend({type:"singleAxis",axisPointerClass:"SingleAxisPointer",render:function(t,e,i,n){var o=this.group;o.removeAll();var a=RM(t),r=new Ym(t,a);E(BM,r.add,r),o.add(r.getGroup()),t.get(VM+".show")&&this["_"+VM](t),GM.superCall(this,"render",t,e,i,n)},_splitLine:function(t){var e=t.axis;if(!e.scale.isBlank()){var i=t.getModel("splitLine"),n=i.getModel("lineStyle"),o=n.get("width"),a=n.get("color");a=a instanceof Array?a:[a];for(var r=t.coordinateSystem.getRect(),s=e.isHorizontal(),l=[],u=0,h=e.getTicksCoords({tickModel:i}),c=[],d=[],f=0;f<h.length;++f){var p=e.toGlobalCoord(h[f].coord);s?(c[0]=p,c[1]=r.y,d[0]=p,d[1]=r.y+r.height):(c[0]=r.x,c[1]=p,d[0]=r.x+r.width,d[1]=p);var g=u++%a.length;l[g]=l[g]||[],l[g].push(new os({subPixelOptimize:!0,shape:{x1:c[0],y1:c[1],x2:d[0],y2:d[1]},style:{lineWidth:o},silent:!0}))}for(f=0;f<l.length;++f)this.group.add(ks(l[f],{style:{stroke:a[f%a.length],lineDash:n.getLineDash(o),lineWidth:o},silent:!0}))}}}),FM=Tu.extend({type:"singleAxis",layoutMode:"box",axis:null,coordinateSystem:null,getCoordSysModel:function(){return this}});m(FM.prototype,sg),Om("single",FM,function(t,e){return e.type||(e.data?"category":"value")},{left:"5%",top:"5%",right:"5%",bottom:"5%",type:"value",position:"bottom",orient:"horizontal",axisLine:{show:!0,lineStyle:{width:1,type:"solid"}},tooltip:{show:!0},axisTick:{show:!0,length:6,lineStyle:{width:1}},axisLabel:{show:!0,interval:"auto"},splitLine:{show:!0,lineStyle:{type:"dashed",opacity:.2}}});function WM(t,e){var i,n=[],o=t.seriesIndex;if(null==o||!(i=e.getSeriesByIndex(o)))return{point:[]};var a=i.getData(),r=Ho(a,t);if(null==r||r<0||k(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(N(l.dimensions,function(t){return a.mapDimension(t)}),r,!0))||[];else if(s){var u=s.getBoundingRect().clone();u.applyTransform(s.transform),n=[u.x+u.width/2,u.y+u.height/2]}return{point:n,el:s}}var HM=E,ZM=T,UM=Zo();function XM(t,e,i,n,o){var a=t.axis;if(!a.scale.isBlank()&&a.containData(e))if(t.involveSeries){var r=function(l,t){var u=t.axis,h=u.dim,c=l,d=[],f=Number.MAX_VALUE,p=-1;return HM(t.seriesModels,function(e,t){var i,n,o=e.getData().mapDimension(h,!0);if(e.getAxisTooltipData){var a=e.getAxisTooltipData(o,l,u);n=a.dataIndices,i=a.nestestValue}else{if(!(n=e.getData().indicesOfNearest(o[0],l,"category"===u.type?.5:null)).length)return;i=e.getData().get(o[0],n[0])}if(null!=i&&isFinite(i)){var r=l-i,s=Math.abs(r);s<=f&&((s<f||0<=r&&p<0)&&(f=s,p=r,c=i,d.length=0),HM(n,function(t){d.push({seriesIndex:e.seriesIndex,dataIndexInside:t,dataIndex:e.getData().getRawIndex(t)})}))}}),{payloadBatch:d,snapToValue:c}}(e,t),s=r.payloadBatch,l=r.snapToValue;s[0]&&null==o.seriesIndex&&L(o,s[0]),!n&&t.snap&&a.containData(l)&&null!=l&&(e=l),i.showPointer(t,e,s,o),i.showTooltip(t,r,l)}else i.showPointer(t,e)}function YM(t,e,i,n){t[e.key]={value:i,payloadBatch:n}}function jM(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,u=uv(l),h=t.map[u];h||(h=t.map[u]={coordSysId:l.id,coordSysIndex:l.componentIndex,coordSysType:l.type,coordSysMainType:l.mainType,dataByAxis:[]},t.list.push(h)),h.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 qM(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 KM(t){return!t||null==t[0]||isNaN(t[0])||null==t[1]||isNaN(t[1])}wf({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}}});var $M=Zo(),JM=E;function QM(t,e,i){if(!v.node){var n=e.getZr();$M(n).records||($M(n).records={}),function(o,a){if($M(o).initialized)return;function t(t,n){o.on(t,function(e){var i=function(i){var n={showTip:[],hideTip:[]},o=function(t){var e=n[t.type];e?e.push(t):(t.dispatchAction=o,i.dispatchAction(t))};return{dispatchAction:o,pendings:n}}(a);JM($M(o).records,function(t){t&&n(t,e,i.dispatchAction)}),function(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))}(i.pendings,a)})}$M(o).initialized=!0,t("click",T(eI,"click")),t("mousemove",T(eI,"mousemove")),t("globalout",tI)}(n,e),($M(n).records[t]||($M(n).records[t]={})).handler=i}}function tI(t,e,i){t.handler("leave",null,i)}function eI(t,e,i,n){e.handler(t,i,n)}function iI(t,e){if(!v.node){var i=e.getZr();($M(i).records||{})[t]&&($M(i).records[t]=null)}}var nI=bf({type:"axisPointer",render:function(t,e,i){var n=e.getComponent("tooltip"),o=t.get("triggerOn")||n&&n.get("triggerOn")||"mousemove|click";QM("axisPointer",i,function(t,e,i){"none"!==o&&("leave"===t||0<=o.indexOf(t))&&i({type:"updateAxisPointer",currTrigger:t,x:e&&e.offsetX,y:e&&e.offsetY})})},remove:function(t,e){iI(e.getZr(),"axisPointer"),nI.superApply(this._model,"remove",arguments)},dispose:function(t,e){iI("axisPointer",e),nI.superApply(this._model,"dispose",arguments)}}),oI=Zo(),aI=D,rI=A;function sI(){}function lI(t,e,i,n){!function i(n,t){{if(R(n)&&R(t)){var o=!0;return E(t,function(t,e){o=o&&i(n[e],t)}),!!o}return n===t}}(oI(i).lastProp,n)&&(oI(i).lastProp=n,e?sl(i,n,t):(i.stopAnimation(),i.attr(n)))}function uI(t,e){t[e.get("label.show")?"show":"hide"]()}function hI(t){return{position:t.position.slice(),rotation:t.rotation||0}}function cI(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 dI(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 fI(t,e,i,n,o){var a=pI(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=Jl(r.get("padding")||0),l=r.getFont(),u=cn(a,l),h=o.position,c=u.width+s[1]+s[3],d=u.height+s[0]+s[2],f=o.align;"right"===f&&(h[0]-=c),"center"===f&&(h[0]-=c/2);var p=o.verticalAlign;"bottom"===p&&(h[1]-=d),"middle"===p&&(h[1]-=d/2),function(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)}(h,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:h.slice(),style:{text:a,textFont:l,textFill:r.getTextColor(),textPosition:"inside",textPadding:s,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 pI(t,e,o,i,n){t=e.scale.parse(t);var a=e.scale.getLabel(t,{precision:n.precision}),r=n.formatter;if(r){var s={value:og(e,t),axisDimension:e.dim,axisIndex:e.index,seriesData:[]};E(i,function(t){var e=o.getSeriesByIndex(t.seriesIndex),i=t.dataIndexInside,n=e&&e.getDataParams(i);n&&s.seriesData.push(n)}),z(r)?a=r.replace("{value}",a):O(r)&&(a=r(s))}return a}function gI(t,e,i){var n=ee();return re(n,n,i.rotation),ae(n,n,i.position),hl([t.dataToCoord(e),(i.labelOffset||0)+(i.labelDirection||1)*(i.labelMargin||0)],n)}function mI(t,e,i,n,o,a){var r=Ym.innerTextLayout(i.rotation,0,i.labelDirection);i.labelMargin=o.get("label.margin"),fI(e,n,o,a,{position:gI(n.axis,t,i),align:r.textAlign,verticalAlign:r.textVerticalAlign})}function vI(t,e,i){return{x1:t[i=i||0],y1:t[1-i],x2:e[i],y2:e[1-i]}}function yI(t,e,i){return{x:t[i=i||0],y:t[1-i],width:e[i],height:e[1-i]}}function xI(t,e,i,n,o,a){return{cx:t,cy:e,r0:i,r:n,startAngle:o,endAngle:a,clockwise:!0}}ta((sI.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 u=l.graphicKey;u!==this._lastGraphicKey&&this.clear(i),this._lastGraphicKey=u;var h=this._moveAnimation=this.determineAnimation(t,e);if(r){var c=T(lI,e,h);this.updatePointerEl(r,l,c,e),this.updateLabelEl(r,l,c,e)}else r=this._group=new Ii,this.createPointerEl(r,l,t,e),this.createLabelEl(r,l,t,e),i.getZr().add(r);cI(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)return!0===i;var r=this.animationThreshold;if(o&&n.getBandWidth()>r)return!0;if(a){var s=sv(t).seriesDataCount,l=n.getExtent();return Math.abs(l[0]-l[1])/s>r}return!1},makeElOption:function(t,e,i,n,o){},createPointerEl:function(t,e,i,n){var o=e.pointer;if(o){var a=oI(t).pointerEl=new yl[o.type](aI(e.pointer));t.add(a)}},createLabelEl:function(t,e,i,n){if(e.label){var o=oI(t).labelEl=new is(aI(e.label));t.add(o),uI(o,n)}},updatePointerEl:function(t,e,i){var n=oI(t).pointerEl;n&&e.pointer&&(n.setStyle(e.pointer.style),i(n,{shape:e.pointer.shape}))},updateLabelEl:function(t,e,i,n){var o=oI(t).labelEl;o&&(o.setStyle(e.label.style),i(o,{shape:e.label.shape,position:e.label.position}),uI(o,n))},_renderHandle:function(t){if(!this._dragging&&this.updateHandleTransform){var e,i=this._axisPointerModel,n=this._api.getZr(),o=this._handle,a=i.getModel("handle"),r=i.get("status");if(!a.get("show")||!r||"hide"===r)return o&&n.remove(o),void(this._handle=null);this._handle||(e=!0,o=this._handle=pl(a.get("icon"),{cursor:"move",draggable:!0,onmousemove:function(t){Wt(t.event)},onmousedown:rI(this._onHandleDragMove,this,0,0),drift:rI(this._onHandleDragMove,this),ondragend:rI(this._onHandleDragEnd,this)}),n.add(o)),cI(o,i,!1);o.setStyle(a.getItemStyle(null,["color","borderColor","borderWidth","opacity","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY"]));var s=a.get("size");k(s)||(s=[s,s]),o.attr("scale",[s[0]/2,s[1]/2]),Tc(this,"_doDispatchAxisPointer",a.get("throttle")||0,"fixRate"),this._moveHandleToValue(t,e)}},_moveHandleToValue:function(t,e){lI(this._axisPointerModel,!e&&this._moveAnimation,this._handle,hI(this.getHandleTransform(t,this._axisModel,this._axisPointerModel)))},_onHandleDragMove:function(t,e){var i=this._handle;if(i){this._dragging=!0;var n=this.updateHandleTransform(hI(i),[t,e],this._axisModel,this._axisPointerModel);this._payloadInfo=n,i.stopAnimation(),i.attr(hI(n)),oI(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{x:t[i=i||0],y:t[1-i],width:e[i],height:e[1-i]}}}).constructor=sI);var _I=sI.extend({makeElOption:function(t,e,i,n,o){var a=i.axis,r=a.grid,s=n.get("type"),l=wI(r,a).getOtherAxis(a).getGlobalExtent(),u=a.toGlobalCoord(a.dataToCoord(e,!0));if(s&&"none"!==s){var h=dI(n),c=bI[s](a,u,l);c.style=h,t.graphicKey=c.type,t.pointer=c}mI(e,t,pv(r.model,i),i,n,o)},getHandleTransform:function(t,e,i){var n=pv(e.axis.grid.model,e,{labelInside:!1});return n.labelMargin=i.get("handle.margin"),{position:gI(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=wI(a,o).getOtherAxis(o).getGlobalExtent(),l="x"===o.dim?0:1,u=t.position;u[l]+=e[l],u[l]=Math.min(r[1],u[l]),u[l]=Math.max(r[0],u[l]);var h=(s[1]+s[0])/2,c=[h,h];c[l]=u[l];return{position:u,rotation:t.rotation,cursorPoint:c,tooltipOption:[{verticalAlign:"middle"},{align:"center"}][l]}}});function wI(t,e){var i={};return i[e.dim+"AxisIndex"]=e.index,t.getCartesian(i)}var bI={line:function(t,e,i){return{type:"Line",subPixelOptimize:!0,shape:vI([e,i[0]],[e,i[1]],SI(t))}},shadow:function(t,e,i){var n=Math.max(1,t.getBandWidth()),o=i[1]-i[0];return{type:"Rect",shape:yI([e-n/2,i[0]],[n,o],SI(t))}}};function SI(t){return"x"===t.dim?0:1}hv.registerAxisPointerClass("CartesianAxisPointer",_I),ff(function(t){if(t){t.axisPointer&&0!==t.axisPointer.length||(t.axisPointer={});var e=t.axisPointer.link;e&&!k(e)&&(t.axisPointer.link=[e])}}),pf(Id.PROCESSOR.STATISTIC,function(t,e){t.getComponent("axisPointer").coordSysAxesInfo=av(t,e)}),gf({type:"updateAxisPointer",event:"updateAxisPointer",update:":updateAxisPointer"},function(t,e,i){var n=t.currTrigger,r=[t.x,t.y],o=t,a=t.dispatchAction||A(i.dispatchAction,i),s=e.getComponent("axisPointer").coordSysAxesInfo;if(s){KM(r)&&(r=WM({seriesIndex:o.seriesIndex,dataIndex:o.dataIndex},e).point);var l=KM(r),u=o.axesInfo,h=s.axesInfo,c="leave"===n||KM(r),d={},f={},p={list:[],map:{}},g={showPointer:ZM(YM,f),showTooltip:ZM(jM,p)};HM(s.coordSysMap,function(t,e){var a=l||t.containPoint(r);HM(s.coordSysAxesInfo[e],function(t,e){var i=t.axis,n=function(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}}(u,t);if(!c&&a&&(!u||n)){var o=n&&n.value;null!=o||l||(o=i.pointToData(r)),null!=o&&XM(t,o,g,!1,d)}})});var m={};return HM(h,function(o,t){var a=o.linkGroup;a&&!f[t]&&HM(a.axesInfo,function(t,e){var i=f[e];if(t!==o&&i){var n=i.value;a.mapper&&(n=o.axis.scale.parse(a.mapper(n,qM(t),qM(o)))),m[o.key]=n}})}),HM(m,function(t,e){XM(h[e],t,g,!0,d)}),function(o,t,e){var a=e.axesInfo=[];HM(t,function(t,e){var i=t.axisPointerModel.option,n=o[e];n?(t.useHandle||(i.status="show"),i.value=n.value,i.seriesDataIndices=(n.payloadBatch||[]).slice()):t.useHandle||(i.status="hide"),"show"===i.status&&a.push({axisDim:t.axis.dim,axisIndex:t.axis.model.componentIndex,value:i.value})})}(f,h,d),function(t,e,i,n){if(KM(e)||!t.list.length)return n({type:"hideTip"});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})}(p,r,t,a),function(t,e,i){var n=i.getZr(),o="axisPointerLastHighlights",a=UM(n)[o]||{},r=UM(n)[o]={};HM(t,function(t,e){var i=t.axisPointerModel.option;"show"===i.status&&HM(i.seriesDataIndices,function(t){var e=t.seriesIndex+" | "+t.dataIndex;r[e]=t})});var s=[],l=[];E(a,function(t,e){r[e]||l.push(t)}),E(r,function(t,e){a[e]||s.push(t)}),l.length&&i.dispatchAction({type:"downplay",escapeConnect:!0,batch:l}),s.length&&i.dispatchAction({type:"highlight",escapeConnect:!0,batch:s})}(h,0,i),d}});var MI=["x","y"],II=["width","height"],TI=sI.extend({makeElOption:function(t,e,i,n,o){var a=i.axis,r=a.coordinateSystem,s=CI(r,1-DI(a)),l=r.dataToPoint(e)[0],u=n.get("type");if(u&&"none"!==u){var h=dI(n),c=AI[u](a,l,s);c.style=h,t.graphicKey=c.type,t.pointer=c}mI(e,t,RM(i),i,n,o)},getHandleTransform:function(t,e,i){var n=RM(e,{labelInside:!1});return n.labelMargin=i.get("handle.margin"),{position:gI(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=DI(o),s=CI(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 u=CI(a,1-r),h=(u[1]+u[0])/2,c=[h,h];return c[r]=l[r],{position:l,rotation:t.rotation,cursorPoint:c,tooltipOption:{verticalAlign:"middle"}}}}),AI={line:function(t,e,i){return{type:"Line",subPixelOptimize:!0,shape:vI([e,i[0]],[e,i[1]],DI(t))}},shadow:function(t,e,i){var n=t.getBandWidth(),o=i[1]-i[0];return{type:"Rect",shape:yI([e-n/2,i[0]],[n,o],DI(t))}}};function DI(t){return t.isHorizontal()?0:1}function CI(t,e){var i=t.getRect();return[i[MI[e]],i[MI[e]]+i[II[e]]]}hv.registerAxisPointerClass("SingleAxisPointer",TI),bf({type:"single"});var LI=ic.extend({type:"series.themeRiver",dependencies:["singleAxis"],nameMap:null,init:function(t){LI.superApply(this,"init",arguments),this.legendVisualProvider=new Gv(A(this.getData,this),A(this.getRawData,this))},fixData:function(t){var e=t.length,i=Ko(t,function(t){return t[2]}),n=[];i.buckets.each(function(t,e){n.push({name:e,dataList:t})});for(var o=n.length,a=-1,r=-1,s=0;s<o;++s){var l=n[s].dataList.length;a<l&&(a=l,r=s)}for(var u=0;u<o;++u)if(u!==r)for(var h=n[u].name,c=0;c<a;++c){for(var d=n[r].dataList[c][0],f=n[u].dataList.length,p=-1,g=0;g<f;++g){if(n[u].dataList[g][0]===d){p=g;break}}-1===p&&(t[e]=[],t[e][0]=d,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=M(t.data,function(t){return void 0!==t[2]}),o=this.fixData(n||[]),a=[],r=this.nameMap=Q(),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 u=np(o,{coordDimensions:["single"],dimensionsDefine:[{name:"time",type:Lf(i)},{name:"value",type:"float"},{name:"name",type:"ordinal"}],encodeDefine:{single:0,value:1,itemName:2}}),h=new Wf(u,this);return h.initData(o),h},getLayerSeries:function(){for(var i=this.getData(),t=i.count(),e=[],n=0;n<t;++n)e[n]=n;var o=i.mapDimension("single"),a=Ko(e,function(t){return i.get("name",t)}),r=[];return a.buckets.each(function(t,e){t.sort(function(t,e){return i.get(o,t)-i.get(o,e)}),r.push({name:e,indices:t})}),r},getAxisTooltipData:function(t,e,i){k(t)||(t=t?[t]:[]);for(var n,o=this.getData(),a=this.getLayerSeries(),r=[],s=a.length,l=0;l<s;++l){for(var u=Number.MAX_VALUE,h=-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<=u&&(n=f,u=p,h=a[l].indices[d])}r.push(h)}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="-"),eu(i+" : "+n)},defaultOption:{zlevel:0,z:2,coordinateSystem:"singleAxis",boundaryGap:["10%","10%"],singleAxisIndex:0,animationEasing:"linear",label:{margin:4,show:!0,position:"left",color:"#000",fontSize:11},emphasis:{label:{show:!0}}}});Mf({type:"themeRiver",init:function(){this._layers=[]},render:function(b,t,e){var S=b.getData(),M=this.group,I=b.getLayerSeries(),i=S.getLayout("layoutInfo"),n=i.rect,o=i.boundaryGap;function a(t){return t.name}M.attr("position",[0,n.y+o[0]]);var r=new Tf(this._layersSeries||[],I,a,a),T={};function s(t,e,i){var n=this._layers;if("remove"!==t){for(var o,a,r,s=[],l=[],u=I[e].indices,h=0;h<u.length;h++){var c=S.getItemLayout(u[h]),d=c.x,f=c.y0,p=c.y;s.push([d,f]),l.push([d,f+p]),o=S.getItemVisual(u[h],"color")}var g=S.getItemLayout(u[0]),m=S.getItemModel(u[h-1]),v=m.getModel("label"),y=v.get("margin");if("add"===t){var x=T[e]=new Ii;a=new gm({shape:{points:s,stackedOnPoints:l,smooth:.4,stackedOnSmooth:.4,smoothConstraint:!1},z2:0}),r=new Fr({style:{x:g.x-y,y:g.y0+g.y/2}}),x.add(a),x.add(r),M.add(x),a.setClipPath(function(t,e,i){var n=new is({shape:{x:t.x-10,y:t.y-10,width:0,height:t.height+20}});return ll(n,{shape:{width:t.width+20,height:t.height+20}},e,i),n}(a.getBoundingRect(),b,function(){a.removeClipPath()}))}else{x=n[i];a=x.childAt(0),r=x.childAt(1),M.add(x),T[e]=x,sl(a,{shape:{points:s,stackedOnPoints:l}},b),sl(r,{style:{x:g.x-y,y:g.y0+g.y/2}},b)}var _=m.getModel("emphasis.itemStyle"),w=m.getModel("itemStyle");Qs(r.style,v,{text:v.get("show")?b.getFormattedLabel(u[h-1],"normal")||S.getName(u[h-1]):null,textVerticalAlign:"middle"}),a.setStyle(L({fill:o},w.getItemStyle(["color"]))),Ys(a,_.getItemStyle())}else M.remove(n[e])}r.add(A(s,this,"add")).update(A(s,this,"update")).remove(A(s,this,"remove")).execute(),this._layersSeries=I,this._layers=T},dispose:function(){}});function kI(i,t,e){if(i.count())for(var n,o=t.coordinateSystem,a=t.getLayerSeries(),r=i.mapDimension("single"),s=i.mapDimension("value"),l=N(a,function(t){return N(t.indices,function(t){var e=o.dataToPoint(i.get(r,t));return e[1]=i.get(s,t),e})}),u=function(t){for(var e=t.length,i=t[0].length,n=[],o=[],a=0,r={},s=0;s<i;++s){for(var l=0,u=0;l<e;++l)u+=t[l][s][1];a<u&&(a=u),n.push(u)}for(var h=0;h<i;++h)o[h]=(a-n[h])/2;for(var c=a=0;c<i;++c){var d=n[c]+o[c];a<d&&(a=d)}return r.y0=o,r.max=a,r}(l),h=u.y0,c=e/u.max,d=a.length,f=a[0].indices.length,p=0;p<f;++p){n=h[p]*c,i.setItemLayout(a[0].indices[p],{layerIndex:0,x:l[0][p][0],y0:n,y:l[0][p][1]*c});for(var g=1;g<d;++g)n+=l[g-1][p][1]*c,i.setItemLayout(a[g].indices[p],{layerIndex:g,x:l[g][p][0],y0:n,y:l[g][p][1]*c})}}vf(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]=Pl(a[0],o.height),a[1]=Pl(a[1],o.height),kI(e,t,o.height-a[0]-a[1])):(a[0]=Pl(a[0],o.width),a[1]=Pl(a[1],o.width),kI(e,t,o.width-a[0]-a[1]));e.setLayout("layoutInfo",n)})}),yf(function(t){t.eachSeriesByType("themeRiver",function(o){var a=o.getData(),r=o.getRawData(),s=o.get("color"),l=Q();a.each(function(t){l.set(a.getRawIndex(t),t)}),r.each(function(t){var e=r.getName(t),i=s[(o.nameMap.get(e)-1)%s.length];r.setItemVisual(t,"color",i);var n=l.get(t);null!=n&&a.setItemVisual(n,"color",i)})})}),pf(ty("themeRiver")),ic.extend({type:"series.sunburst",_viewRoot:null,getInitialData:function(t,e){var i={name:t.name,children:t.data};!function i(t){var n=0;E(t.children,function(t){i(t);var e=t.value;k(e)&&(e=e[0]),n+=e});var e=t.value;k(e)&&(e=e[0]);null!=e&&!isNaN(e)||(e=n);e<0&&(e=0);k(t.value)?t.value[0]=e:t.value=e}(i);var n=t.levels||[],o={};return o.levels=n,vx.createTree(i,this,o).data},optionUpdated:function(){this.resetViewRoot()},getDataParams:function(t){var e=ic.prototype.getDataParams.apply(this,arguments),i=this.getData().tree.getNodeByDataIndex(t);return e.treePathInfo=Rx(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",borderType:"solid",shadowBlur:0,shadowColor:"rgba(0, 0, 0, 0.2)",shadowOffsetX:0,shadowOffsetY:0,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 PI="none",NI="ancestor",OI="self",EI=2,zI=4;function RI(t,e,i){Ii.call(this);var n=new Ur({z2:EI});n.seriesIndex=e.seriesIndex;var o=new Fr({z2:zI,silent:t.getModel("label").get("silent")});function a(){o.ignore=o.hoverIgnore}function r(){o.ignore=o.normalIgnore}this.add(n),this.add(o),this.updateData(!0,t,"normal",e,i),this.on("emphasis",a).on("normal",r).on("mouseover",a).on("mouseout",r)}var BI=RI.prototype;BI.updateData=function(t,e,i,n,o){(this.node=e).piece=this,n=n||this._seriesModel,o=o||this._ecModel;var a=this.childAt(0);a.dataIndex=e.dataIndex;var r=e.getModel(),s=e.getLayout(),l=L({},s);l.label=null;var u=function(t,e,i){var n=t.getVisual("color"),o=t.getVisual("visualMeta");o&&0!==o.length||(n=null);var a=t.getModel("itemStyle").get("color");{if(a)return a;if(n)return n;if(0===t.depth)return i.option.color[0];var r=i.option.color.length;a=i.option.color[function(t){var e=t;for(;1<e.depth;)e=e.parentNode;return _(t.getAncestors()[0].children,e)}(t)%r]}return a}(e,0,o);!function(t,e,i){e.getData().setItemVisual(t.dataIndex,"color",i)}(e,n,u);var h,c=r.getModel("itemStyle").getItemStyle();"normal"===i?h=c:h=m(r.getModel(i+".itemStyle").getItemStyle(),c);h=C({lineJoin:"bevel",fill:h.fill||u},h),t?(a.setShape(l),a.shape.r=s.r0,sl(a,{shape:{r:s.r}},n,e.dataIndex),a.useStyle(h)):"object"==typeof h.fill&&h.fill.type||"object"==typeof a.style.fill&&a.style.fill.type?(sl(a,{shape:l},n),a.useStyle(h)):sl(a,{shape:l,style:h},n),this._updateLabel(n,u,i);var d=r.getShallow("cursor");if(d&&a.attr("cursor",d),t){var f=n.getShallow("highlightPolicy");this._initEvents(a,e,n,f)}this._seriesModel=n||this._seriesModel,this._ecModel=o||this._ecModel},BI.onEmphasis=function(e){var i=this;this.node.hostTree.root.eachNode(function(t){t.piece&&(i.node===t?t.piece.updateData(!1,t,"emphasis"):!function(t,e,i){return i!==PI&&(i===OI?t===e:i===NI?t===e||t.isAncestorOf(e):t===e||t.isDescendantOf(e))}(t,i.node,e)?e!==PI&&t.piece.childAt(0).trigger("downplay"):t.piece.childAt(0).trigger("highlight"))})},BI.onNormal=function(){this.node.hostTree.root.eachNode(function(t){t.piece&&t.piece.updateData(!1,t,"normal")})},BI.onHighlight=function(){this.updateData(!1,this.node,"highlight")},BI.onDownplay=function(){this.updateData(!1,this.node,"downplay")},BI._updateLabel=function(t,e,i){var n=this.node.getModel(),o=n.getModel("label"),a="normal"===i||"emphasis"===i?o:n.getModel(i+".label"),r=n.getModel("emphasis.label"),s=W(t.getFormattedLabel(this.node.dataIndex,i,null,null,"label"),this.node.name);!1===S("show")&&(s="");var l=this.node.getLayout(),u=a.get("minAngle");null==u&&(u=o.get("minAngle")),u=u/180*Math.PI;var h=l.endAngle-l.startAngle;null!=u&&Math.abs(h)<u&&(s="");var c=this.childAt(1);$s(c.style,c.hoverStyle||{},o,r,{defaultText:a.getShallow("show")?s:null,autoColor:e,useInsideStyle:!0});var d,f=(l.startAngle+l.endAngle)/2,p=Math.cos(f),g=Math.sin(f),m=S("position"),v=S("distance")||0,y=S("align");"outside"===m?(d=l.r+v,y=f>Math.PI/2?"right":"left"):y&&"center"!==y?"left"===y?(d=l.r0+v,f>Math.PI/2&&(y="right")):"right"===y&&(d=l.r-v,f>Math.PI/2&&(y="left")):(d=(l.r+l.r0)/2,y="center"),c.attr("style",{text:s,textAlign:y,textVerticalAlign:S("verticalAlign")||"middle",opacity:S("opacity")});var x=d*p+l.cx,_=d*g+l.cy;c.attr("position",[x,_]);var w=S("rotate"),b=0;function S(t){var e=a.get(t);return null==e?o.get(t):e}"radial"===w?(b=-f)<-Math.PI/2&&(b+=Math.PI):"tangential"===w?(b=Math.PI/2-f)>Math.PI/2?b-=Math.PI:b<-Math.PI/2&&(b+=Math.PI):"number"==typeof w&&(b=w*Math.PI/180),c.attr("rotation",b)},BI._initEvents=function(t,e,i,n){t.off("mouseover").off("mouseout").off("emphasis").off("normal");function o(){r.onEmphasis(n)}function a(){r.onNormal()}var r=this;i.isAnimationEnabled()&&t.on("mouseover",o).on("mouseout",a).on("emphasis",o).on("normal",a).on("downplay",function(){r.onDownplay()}).on("highlight",function(){r.onHighlight()})},w(RI,Ii);gc.extend({type:"sunburst",init:function(){},render:function(o,a,t,e){var n=this;this.seriesModel=o,this.api=t,this.ecModel=a;var r=o.getData(),s=r.tree.root,i=o.getViewRoot(),l=this.group,u=o.get("renderLabelForZeroData"),h=[];i.eachNode(function(t){h.push(t)});var c=this._oldChildren||[];if(function(i,n){if(0===i.length&&0===n.length)return;function t(t){return t.getId()}function e(t,e){!function(t,e){u||!t||t.getValue()||(t=null);if(t!==s&&e!==s)if(e&&e.piece)t?(e.piece.updateData(!1,t,"normal",o,a),r.setItemGraphicEl(t.dataIndex,e.piece)):function(t){if(!t)return;t.piece&&(l.remove(t.piece),t.piece=null)}(e);else if(t){var i=new RI(t,o,a);l.add(i),r.setItemGraphicEl(t.dataIndex,i)}}(null==t?null:i[t],null==e?null:n[e])}new Tf(n,i,t,t).add(e).update(e).remove(T(e,null)).execute()}(h,c),function(t,e){if(0<e.depth){n.virtualPiece?n.virtualPiece.updateData(!1,t,"normal",o,a):(n.virtualPiece=new RI(t,o,a),l.add(n.virtualPiece)),e.piece._onclickEvent&&e.piece.off("click",e.piece._onclickEvent);var i=function(t){n._rootToNode(e.parentNode)};e.piece._onclickEvent=i,n.virtualPiece.on("click",i)}else n.virtualPiece&&(l.remove(n.virtualPiece),n.virtualPiece=null)}(s,i),e&&e.highlight&&e.highlight.piece){var d=o.getShallow("highlightPolicy");e.highlight.piece.onEmphasis(d)}else if(e&&e.unhighlight){var f=this.virtualPiece;!f&&s.children.length&&(f=s.children[0].piece),f&&f.onNormal()}this._initEvents(),this._oldChildren=h},dispose:function(){},_initEvents:function(){function t(a){var r=!1;s.seriesModel.getViewRoot().eachNode(function(t){if(!r&&t.piece&&t.piece.childAt(0)===a.target){var e=t.getModel().get("nodeClick");if("rootToNode"===e)s._rootToNode(t);else if("link"===e){var i=t.getModel(),n=i.get("link");if(n){var o=i.get("target",!0)||"_blank";window.open(n,o)}}r=!0}})}var s=this;this.group._onclickEvent&&this.group.off("click",this.group._onclickEvent),this.group.on("click",t),this.group._onclickEvent=t},_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 VI="sunburstRootToNode";gf({type:VI,update:"updateView"},function(o,t){t.eachComponent({mainType:"series",subType:"sunburst",query:o},function(t,e){var i=Ox(o,[VI],t);if(i){var n=t.getViewRoot();n&&(o.direction=zx(n,i.node)?"rollUp":"drillDown"),t.resetViewRoot(i.node)}})});var GI="sunburstHighlight";gf({type:GI,update:"updateView"},function(n,t){t.eachComponent({mainType:"series",subType:"sunburst",query:n},function(t,e){var i=Ox(n,[GI],t);i&&(n.highlight=i.node)})});gf({type:"sunburstUnhighlight",update:"updateView"},function(i,t){t.eachComponent({mainType:"series",subType:"sunburst",query:i},function(t,e){i.unhighlight=!0})});var FI=Math.PI/180;function WI(t,e){if("function"==typeof e)return t.sort(e);var n="asc"===e;return t.sort(function(t,e){var i=(t.getValue()-e.getValue())*(n?1:-1);return 0==i?(t.dataIndex-e.dataIndex)*(n?-1:1):i})}function HI(a,r){return r=r||[0,0],N(["x","y"],function(t,e){var i=this.getAxis(t),n=r[e],o=a[e]/2;return"category"===i.type?i.getBandWidth():Math.abs(i.dataToCoord(n-o)-i.dataToCoord(n+o))},this)}yf(T(Yv,"sunburst")),vf(T(function(t,e,C,i){e.eachSeriesByType(t,function(t){var e=t.get("center"),i=t.get("radius");k(i)||(i=[0,i]),k(e)||(e=[e,e]);var n=C.getWidth(),o=C.getHeight(),h=Math.min(n,o),c=Pl(e[0],n),d=Pl(e[1],o),f=Pl(i[0],h/2),a=Pl(i[1],h/2),r=-t.get("startAngle")*FI,p=t.get("minAngle")*FI,g=t.getData().tree.root,s=t.getViewRoot(),m=s.depth,l=t.get("sort");null!=l&&!function e(t,i){var n=t.children||[];t.children=WI(n,i);n.length&&E(t.children,function(t){e(t,i)})}(s,l);var u=0;E(s.children,function(t){isNaN(t.getValue())||u++});var v=s.getValue(),y=Math.PI/(v||u)*2,x=0<s.depth,_=s.height-(x?-1:1),w=(a-f)/(_||1),b=t.get("clockwise"),S=t.get("stillShowZeroSum"),M=b?1:-1,I=function(t,e){if(t){var i=e;if(t!==g){var n=t.getValue(),o=0===v&&S?y:n*y;o<p&&(o=p),i=e+M*o;var a=t.depth-m-(x?-1:1),r=f+w*a,s=f+w*(1+a),l=t.getModel();null!=l.get("r0")&&(r=Pl(l.get("r0"),h/2)),null!=l.get("r")&&(s=Pl(l.get("r"),h/2)),t.setLayout({angle:o,startAngle:e,endAngle:i,clockwise:b,cx:c,cy:d,r0:r,r:s})}if(t.children&&t.children.length){var u=0;E(t.children,function(t){u+=I(t,e+u)})}return i-e}};if(x){var T=f,A=f+w,D=2*Math.PI;g.setLayout({angle:D,startAngle:r,endAngle:r+D,clockwise:b,cx:c,cy:d,r0:T,r:A})}I(s,r)})},"sunburst")),pf(T(ty,"sunburst"));function ZI(a,r){return r=r||[0,0],N([0,1],function(t){var e=r[t],i=a[t]/2,n=[],o=[];return n[t]=e-i,o[t]=e+i,n[1-t]=o[1-t]=r[1-t],Math.abs(this.dataToPoint(n)[t]-this.dataToPoint(o)[t])},this)}function UI(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 XI(s,l){return N(["Radius","Angle"],function(t,e){var i=this["get"+t+"Axis"](),n=l[e],o=s[e]/2,a="dataTo"+t,r="category"===i.type?i.getBandWidth():Math.abs(i[a](n-o)-i[a](n+o));return"Angle"===t&&(r=r*Math.PI/180),r},this)}var YI=xs,jI=["itemStyle"],qI=["emphasis","itemStyle"],KI=["label"],$I=["emphasis","label"],JI="e\0\0",QI={cartesian2d:function(e){var t=e.grid.getRect();return{coordSys:{type:"cartesian2d",x:t.x,y:t.y,width:t.width,height:t.height},api:{coord:function(t){return e.dataToPoint(t)},size:A(HI,e)}}},geo:function(e){var t=e.getBoundingRect();return{coordSys:{type:"geo",x:t.x,y:t.y,width:t.width,height:t.height,zoom:e.getZoom()},api:{coord:function(t){return e.dataToPoint(t)},size:A(ZI,e)}}},singleAxis:function(e){var t=e.getRect();return{coordSys:{type:"singleAxis",x:t.x,y:t.y,width:t.width,height:t.height},api:{coord:function(t){return e.dataToPoint(t)},size:A(UI,e)}}},polar:function(o){var a=o.getRadiusAxis(),r=o.getAngleAxis(),t=a.getExtent();return t[0]>t[1]&&t.reverse(),{coordSys:{type:"polar",cx:o.cx,cy:o.cy,r:t[1],r0:t[0]},api:{coord:A(function(t){var e=a.dataToRadius(t[0]),i=r.dataToAngle(t[1]),n=o.coordToPoint([e,i]);return n.push(e,i*Math.PI/180),n}),size:A(XI,o)}}},calendar:function(i){var t=i.getRect(),e=i.getRangeInfo();return{coordSys:{type:"calendar",x:t.x,y:t.y,width:t.width,height:t.height,cellWidth:i.getCellWidth(),cellHeight:i.getCellHeight(),rangeInfo:{start:e.start,end:e.end,weeks:e.weeks,dayCount:e.allDay}},api:{coord:function(t,e){return i.dataToPoint(t,e)}}}}};function tT(t,e,i,n,o){null==i[t]||o||(e[t]=i[t],i[t]=n[t])}function eT(a,r,e,t){var i=a.get("renderItem"),n=a.coordinateSystem,o={};n&&(o=n.prepareCustoms?n.prepareCustoms():QI[n.type](n));var s,l,u,h,c,d=C({getWidth:t.getWidth,getHeight:t.getHeight,getZr:t.getZr,getDevicePixelRatio:t.getDevicePixelRatio,value:function(t,e){return null==e&&(e=s),r.get(r.getDimension(t||0),e)},style:function(t,e){null==e&&(e=s),g(e);var i=l.getModel(jI).getItemStyle();null!=c&&(i.fill=c);var n=r.getItemVisual(e,"opacity");null!=n&&(i.opacity=n);var o=t?rT(t,u):u;return Qs(i,o,null,{autoColor:c,isRectText:!0}),i.text=o.getShallow("show")?H(a.getFormattedLabel(e,"normal"),Gg(r,e)):null,t&&sT(i,t),i},styleEmphasis:function(t,e){null==e&&(e=s),g(e);var i=l.getModel(qI).getItemStyle(),n=t?rT(t,h):h;return Qs(i,n,null,{isRectText:!0},!0),i.text=n.getShallow("show")?Z(a.getFormattedLabel(e,"emphasis"),a.getFormattedLabel(e,"normal"),Gg(r,e)):null,t&&sT(i,t),i},visual:function(t,e){return null==e&&(e=s),r.getItemVisual(e,t)},barLayout:function(t){if(n.getBaseAxis){return function(t){var e=[],i=t.axis;if("category"===i.type){for(var n=i.getBandWidth(),o=0;o<t.count;o++)e.push(C({bandWidth:n,axisKey:"axis0",stackId:Mp+o},t));var a=Lp(e),r=[];for(o=0;o<t.count;o++){var s=a.axis0[Mp+o];s.offsetCenter=s.offset+s.width/2,r.push(s)}return r}}(C({axis:n.getBaseAxis()},t))}},currentSeriesIndices:function(){return e.getCurrentSeriesIndices()},font:function(t){return al(t,e)}},o.api||{}),f={context:{},seriesId:a.id,seriesName:a.name,seriesIndex:a.seriesIndex,coordSys:o.coordSys,dataInsideLength:r.count(),encode:function(o){var a={};return E(o.dimensions,function(t,e){var i=o.getDimensionInfo(t);if(!i.isExtraCoord){var n=i.coordDim;(a[n]=a[n]||[])[i.coordDimIndex]=e}}),a}(a.getData())},p=!0;return function(t,e){return s=t,p=!0,i&&i(C({dataIndexInside:t,dataIndex:r.getRawIndex(t),actionType:e?e.type:null},f),d)};function g(t){null==t&&(t=s),p&&(l=r.getItemModel(t),u=l.getModel(KI),h=l.getModel($I),c=r.getItemVisual(t,"color"),p=!1)}}function iT(t,e,i,n,o,a){return(t=nT(t,e,i,n,o,a,!0))&&a.setItemGraphicEl(e,t),t}function nT(t,e,i,n,o,a,r){var s=!i,l=(i=i||{}).type,u=i.shape,h=i.style;if(t&&(s||null!=l&&l!==t.__customGraphicType||"path"===l&&function(t){return t&&(t.hasOwnProperty("pathData")||t.hasOwnProperty("d"))}(u)&&uT(u)!==t.__customPathData||"image"===l&&hT(h,"image")&&h.image!==t.__customImagePath||"text"===l&&hT(u,"text")&&h.text!==t.__customText)&&(o.remove(t),t=null),!s){var c=!t;return function(e,t,i,n,o,a,r){var s={},l=i.style||{};if(i.shape&&(s.shape=D(i.shape)),i.position&&(s.position=i.position.slice()),i.scale&&(s.scale=i.scale.slice()),i.origin&&(s.origin=i.origin.slice()),i.rotation&&(s.rotation=i.rotation),"image"===e.type&&i.style){var u=s.style={};E(["x","y","width","height"],function(t){tT(t,u,l,e.style,a)})}if("text"===e.type&&i.style){u=s.style={};E(["x","y"],function(t){tT(t,u,l,e.style,a)}),!l.hasOwnProperty("textFill")&&l.fill&&(l.textFill=l.fill),!l.hasOwnProperty("textStroke")&&l.stroke&&(l.textStroke=l.stroke)}if("group"!==e.type&&(e.useStyle(l),a)){e.style.opacity=0;var h=l.opacity;null==h&&(h=1),ll(e,{style:{opacity:h}},n,t)}a?e.attr(s):sl(e,s,n,t),i.hasOwnProperty("z2")&&e.attr("z2",i.z2||0),i.hasOwnProperty("silent")&&e.attr("silent",i.silent),i.hasOwnProperty("invisible")&&e.attr("invisible",i.invisible),i.hasOwnProperty("ignore")&&e.attr("ignore",i.ignore),i.hasOwnProperty("info")&&e.attr("info",i.info);var c=i.styleEmphasis;Fs(e,c),r&&js(e,!1!==c)}(t=t||function(t){var e,i=t.type;if("path"===i){var n=t.shape,o=null!=n.width&&null!=n.height?{x:n.x||0,y:n.y||0,width:n.width,height:n.height}:null,a=uT(n);(e=Ds(a,null,o,n.layout||"center")).__customPathData=a}else if("image"===i)(e=new qn({})).__customImagePath=t.style.image;else if("text"===i)(e=new Fr({})).__customText=t.style.text;else if("group"===i)e=new Ii;else{if("compoundPath"===i)throw new Error('"compoundPath" is not supported yet.');e=new(As(i))}return e.__customGraphicType=i,e.name=t.name,e}(i),e,i,n,0,c,r),"group"===l&&function(t,e,i,n,o){var a=i.children,r=a?a.length:0,s=i.$mergeChildren,l="byName"===s||i.diffChildrenByName,u=!1===s;if(!r&&!l&&!u)return;if(l)return function(t){new Tf(t.oldChildren,t.newChildren,oT,oT,t).add(aT).update(aT).remove(lT).execute()}({oldChildren:t.children()||[],newChildren:a||[],dataIndex:e,animatableModel:n,group:t,data:o});u&&t.removeAll();for(var h=0;h<r;h++)a[h]&&nT(t.childAt(h),e,a[h],n,t,o)}(t,e,i,n,a),o.add(t),t}}function oT(t,e){var i=t&&t.name;return null!=i?i:JI+e}function aT(t,e){var i=this.context,n=null!=t?i.newChildren[t]:null;nT(null!=e?i.oldChildren[e]:null,i.dataIndex,n,i.animatableModel,i.group,i.data)}function rT(i,t){var n=new Il({},t);return E(YI,function(t,e){i.hasOwnProperty(t)&&(n.option[e]=i[t])}),n}function sT(t,e){for(var i in e)!e.hasOwnProperty(i)&&YI.hasOwnProperty(i)||(t[i]=e[i])}function lT(t){var e=this.context,i=e.oldChildren[t];i&&e.group.remove(i)}function uT(t){return t&&(t.pathData||t.d)}function hT(t,e){return t&&t.hasOwnProperty(e)}function cT(t){return t.get("stack")||"__ec_stack_"+t.seriesIndex}function dT(t,e){return e.dim+t.model.componentIndex}function fT(t,e){Eg.call(this,"radius",t,e),this.type="category"}ic.extend({type:"series.custom",dependencies:["grid","polar","geo","singleAxis","calendar"],defaultOption:{coordinateSystem:"cartesian2d",zlevel:0,z:2,legendHoverLink:!0,useTransform:!0,clip:!1},getInitialData:function(t,e){return hp(this.getSource(),this)},getDataParams:function(t,e,i){var n=ic.prototype.getDataParams.apply(this,arguments);return i&&(n.info=i.info),n}}),gc.extend({type:"custom",_data:null,render:function(i,t,e,n){var o=this._data,a=i.getData(),r=this.group,s=eT(i,a,t,e);a.diff(o).add(function(t){iT(null,t,s(t,n),i,r,a)}).update(function(t,e){iT(o.getItemGraphicEl(e),t,s(t,n),i,r,a)}).remove(function(t){var e=o.getItemGraphicEl(t);e&&r.remove(e)}).execute();var l=i.get("clip",!0)?ym(i.coordinateSystem,!1,i):null;l?r.setClipPath(l):r.removeClipPath(),this._data=a},incrementalPrepareRender:function(t,e,i){this.group.removeAll(),this._data=null},incrementalRender:function(t,e,i,n,o){var a=e.getData(),r=eT(e,a,i,n);function s(t){t.isGroup||(t.incremental=!0,t.useHoverLayer=!0)}for(var l=t.start;l<t.end;l++){iT(null,l,r(l,o),e,this.group,a).traverse(s)}},dispose:et,filterForExposedEvent:function(t,e,i,n){var o=e.element;if(null==o||i.name===o)return!0;for(;(i=i.parent)&&i!==this.group;)if(i.name===o)return!0;return!1}}),fT.prototype={constructor:fT,pointToData:function(t,e){return this.polar.pointToData(t,e)["radius"===this.dim?0:1]},dataToRadius:Eg.prototype.dataToCoord,radiusToData:Eg.prototype.coordToData},w(fT,Eg);var pT=Zo();function gT(t,e){e=e||[0,360],Eg.call(this,"angle",t,e),this.type="category"}gT.prototype={constructor:gT,pointToData:function(t,e){return this.polar.pointToData(t,e)["radius"===this.dim?0:1]},dataToAngle:Eg.prototype.dataToCoord,angleToData:Eg.prototype.coordToData,calculateCategoryInterval:function(){var t=this.getLabelModel(),e=this.scale,i=e.getExtent(),n=e.count();if(i[1]-i[0]<1)return 0;var o=i[0],a=this.dataToCoord(o+1)-this.dataToCoord(o),r=Math.abs(a),s=cn(o,t.getFont(),"center","top"),l=Math.max(s.height,7)/r;isNaN(l)&&(l=1/0);var u=Math.max(0,Math.floor(l)),h=pT(this.model),c=h.lastAutoInterval,d=h.lastTickCount;return null!=c&&null!=d&&Math.abs(c-u)<=1&&Math.abs(d-n)<=1&&u<c?u=c:(h.lastTickCount=n,h.lastAutoInterval=u),u}},w(gT,Eg);function mT(t){this.name=t||"",this.cx=0,this.cy=0,this._radiusAxis=new fT,this._angleAxis=new gT,this._radiusAxis.polar=this._angleAxis.polar=this}mT.prototype={type:"polar",axisPointerEnabled:!0,constructor:mT,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,u=l<a?1:-1;l<a||r<l;)l+=360*u;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]},getArea:function(){var t=this.getAngleAxis(),e=this.getRadiusAxis().getExtent().slice();e[0]>e[1]&&e.reverse();var i=t.getExtent(),n=Math.PI/180;return{cx:this.cx,cy:this.cy,r0:e[0],r:e[1],startAngle:-i[0]*n,endAngle:-i[1]*n,clockwise:t.inverse,contain:function(t,e){var i=t-this.cx,n=e-this.cy,o=i*i+n*n,a=this.r,r=this.r0;return o<=a*a&&r*r<=o}}}};var vT=Tu.extend({type:"polarAxis",axis:null,getCoordSysModel:function(){return this.ecModel.queryComponents({mainType:"polar",index:this.option.polarIndex,id:this.option.polarId})[0]}});m(vT.prototype,sg);var yT={splitNumber:5};function xT(t,e){return e.type||(e.data?"category":"value")}function _T(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();E(e.mapDimension("radius",!0),function(t){o.scale.unionExtentFromData(e,up(e,t))}),E(e.mapDimension("angle",!0),function(t){n.scale.unionExtentFromData(e,up(e,t))})}}),eg(n.scale,n.model),eg(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 wT(t,e){if(t.type=e.get("type"),t.scale=ig(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).model=e}Om("angle",vT,xT,{startAngle:90,clockwise:!0,splitNumber:12,axisLabel:{rotate:!1}}),Om("radius",vT,xT,yT),wf({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%"}}),nh.register("polar",{dimensions:mT.prototype.dimensions,create:function(i,s){var l=[];return i.eachComponent("polar",function(t,e){var i=new mT(e);i.update=_T;var n=i.getRadiusAxis(),o=i.getAngleAxis(),a=t.findAxisModel("radiusAxis"),r=t.findAxisModel("angleAxis");wT(n,a),wT(o,r),function(t,e,i){var n=e.get("center"),o=i.getWidth(),a=i.getHeight();t.cx=Pl(n[0],o),t.cy=Pl(n[1],a);var r=t.getRadiusAxis(),s=Math.min(o,a)/2,l=e.get("radius");null==l?l=[0,"100%"]:k(l)||(l=[0,l]),l=[Pl(l[0],s),Pl(l[1],s)],r.inverse?r.setExtent(l[1],l[0]):r.setExtent(l[0],l[1])}(i,t,s),l.push(i),(t.coordinateSystem=i).model=t}),i.eachSeries(function(t){if("polar"===t.get("coordinateSystem")){var e=i.queryComponents({mainType:"polar",index:t.get("polarIndex"),id:t.get("polarId")})[0];t.coordinateSystem=e.coordinateSystem}}),l}});var bT=["axisLine","axisLabel","axisTick","minorTick","splitLine","minorSplitLine","splitArea"];function ST(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 MT(t){return t.getRadiusAxis().inverse?0:1}function IT(t){var e=t[0],i=t[t.length-1];e&&i&&Math.abs(Math.abs(e.coord-i.coord)-360)<1e-4&&t.pop()}hv.extend({type:"angleAxis",axisPointerClass:"PolarAxisPointer",render:function(e,t){if(this.group.removeAll(),e.get("show")){var i=e.axis,n=i.polar,o=n.getRadiusAxis().getExtent(),a=i.getTicksCoords(),r=i.getMinorTicksCoords(),s=N(i.getViewLabels(),function(t){return(t=D(t)).coord=i.dataToCoord(t.tickValue),t});IT(s),IT(a),E(bT,function(t){!e.get(t+".show")||i.scale.isBlank()&&"axisLine"!==t||this["_"+t](e,n,a,r,o,s)},this)}},_axisLine:function(t,e,i,n,o){var a,r=t.getModel("axisLine.lineStyle"),s=MT(e),l=s?0:1;(a=0===o[l]?new Hr({shape:{cx:e.cx,cy:e.cy,r:o[s]},style:r.getLineStyle(),z2:1,silent:!0}):new Xr({shape:{cx:e.cx,cy:e.cy,r:o[s],r0:o[l]},style:r.getLineStyle(),z2:1,silent:!0})).style.fill=null,this.group.add(a)},_axisTick:function(t,e,i,n,o){var a=t.getModel("axisTick"),r=(a.get("inside")?-1:1)*a.get("length"),s=o[MT(e)],l=N(i,function(t){return new os({shape:ST(e,[s,s+r],t.coord)})});this.group.add(ks(l,{style:C(a.getModel("lineStyle").getLineStyle(),{stroke:t.get("axisLine.lineStyle.color")})}))},_minorTick:function(t,e,i,n,o){if(n.length){for(var a=t.getModel("axisTick"),r=t.getModel("minorTick"),s=(a.get("inside")?-1:1)*r.get("length"),l=o[MT(e)],u=[],h=0;h<n.length;h++)for(var c=0;c<n[h].length;c++)u.push(new os({shape:ST(e,[l,l+s],n[h][c].coord)}));this.group.add(ks(u,{style:C(r.getModel("lineStyle").getLineStyle(),C(a.getLineStyle(),{stroke:t.get("axisLine.lineStyle.color")}))}))}},_axisLabel:function(c,d,t,e,f,i){var p=c.getCategories(!0),g=c.getModel("axisLabel"),m=g.get("margin"),v=c.get("triggerEvent");E(i,function(t,e){var i=g,n=t.tickValue,o=f[MT(d)],a=d.coordToPoint([o+m,t.coord]),r=d.cx,s=d.cy,l=Math.abs(a[0]-r)/o<.3?"center":a[0]>r?"left":"right",u=Math.abs(a[1]-s)/o<.3?"middle":a[1]>s?"top":"bottom";p&&p[n]&&p[n].textStyle&&(i=new Il(p[n].textStyle,g,g.ecModel));var h=new Fr({silent:Ym.isLabelSilent(c)});this.group.add(h),Qs(h.style,i,{x:a[0],y:a[1],textFill:i.getTextColor()||c.get("axisLine.lineStyle.color"),text:t.formattedLabel,textAlign:l,textVerticalAlign:u}),v&&(h.eventData=Ym.makeAxisEventDataBase(c),h.eventData.targetType="axisLabel",h.eventData.value=t.rawLabel)},this)},_splitLine:function(t,e,i,n,o){var a=t.getModel("splitLine").getModel("lineStyle"),r=a.get("color"),s=0;r=r instanceof Array?r:[r];for(var l=[],u=0;u<i.length;u++){var h=s++%r.length;l[h]=l[h]||[],l[h].push(new os({shape:ST(e,o,i[u].coord)}))}for(u=0;u<l.length;u++)this.group.add(ks(l[u],{style:C({stroke:r[u%r.length]},a.getLineStyle()),silent:!0,z:t.get("z")}))},_minorSplitLine:function(t,e,i,n,o){if(n.length){for(var a=t.getModel("minorSplitLine").getModel("lineStyle"),r=[],s=0;s<n.length;s++)for(var l=0;l<n[s].length;l++)r.push(new os({shape:ST(e,o,n[s][l].coord)}));this.group.add(ks(r,{style:a.getLineStyle(),silent:!0,z:t.get("z")}))}},_splitArea:function(t,e,i,n,o){if(i.length){var a=t.getModel("splitArea").getModel("areaStyle"),r=a.get("color"),s=0;r=r instanceof Array?r:[r];for(var l=[],u=Math.PI/180,h=-i[0].coord*u,c=Math.min(o[0],o[1]),d=Math.max(o[0],o[1]),f=t.get("clockwise"),p=1;p<i.length;p++){var g=s++%r.length;l[g]=l[g]||[],l[g].push(new Ur({shape:{cx:e.cx,cy:e.cy,r0:c,r:d,startAngle:h,endAngle:-i[p].coord*u,clockwise:f},silent:!0})),h=-i[p].coord*u}for(p=0;p<l.length;p++)this.group.add(ks(l[p],{style:C({fill:r[p%r.length]},a.getAreaStyle()),silent:!0}))}}});var TT=["axisLine","axisTickLabel","axisName"],AT=["splitLine","splitArea","minorSplitLine"];hv.extend({type:"radiusAxis",axisPointerClass:"PolarAxisPointer",render:function(e,t){if(this.group.removeAll(),e.get("show")){var i=e.axis,n=i.polar,o=n.getAngleAxis(),a=i.getTicksCoords(),r=i.getMinorTicksCoords(),s=o.getExtent()[0],l=i.getExtent(),u=function(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}}(n,e,s),h=new Ym(e,u);E(TT,h.add,h),this.group.add(h.getGroup()),E(AT,function(t){e.get(t+".show")&&!i.scale.isBlank()&&this["_"+t](e,n,s,l,a,r)},this)}},_splitLine:function(t,e,i,n,o){var a=t.getModel("splitLine").getModel("lineStyle"),r=a.get("color"),s=0;r=r instanceof Array?r:[r];for(var l=[],u=0;u<o.length;u++){var h=s++%r.length;l[h]=l[h]||[],l[h].push(new Hr({shape:{cx:e.cx,cy:e.cy,r:o[u].coord}}))}for(u=0;u<l.length;u++)this.group.add(ks(l[u],{style:C({stroke:r[u%r.length],fill:null},a.getLineStyle()),silent:!0}))},_minorSplitLine:function(t,e,i,n,o,a){if(a.length){for(var r=t.getModel("minorSplitLine").getModel("lineStyle"),s=[],l=0;l<a.length;l++)for(var u=0;u<a[l].length;u++)s.push(new Hr({shape:{cx:e.cx,cy:e.cy,r:a[l][u].coord}}));this.group.add(ks(s,{style:C({fill:null},r.getLineStyle()),silent:!0}))}},_splitArea:function(t,e,i,n,o){if(o.length){var a=t.getModel("splitArea").getModel("areaStyle"),r=a.get("color"),s=0;r=r instanceof Array?r:[r];for(var l=[],u=o[0].coord,h=1;h<o.length;h++){var c=s++%r.length;l[c]=l[c]||[],l[c].push(new Ur({shape:{cx:e.cx,cy:e.cy,r0:u,r:o[h].coord,startAngle:0,endAngle:2*Math.PI},silent:!0})),u=o[h].coord}for(h=0;h<l.length;h++)this.group.add(ks(l[h],{style:C({fill:r[h%r.length]},a.getAreaStyle()),silent:!0}))}}});var DT=sI.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"+uu(a.dim)](e);var u=n.get("type");if(u&&"none"!==u){var h=dI(n),c=CT[u](a,s,r,l,h);c.style=h,t.graphicKey=c.type,t.pointer=c}var d=n.get("label.margin");fI(t,i,n,o,function(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,u,h,c=n.getRadiusAxis().getExtent();if("radius"===a.dim){var d=ee();re(d,d,s),ae(d,d,[n.cx,n.cy]),l=hl([r,-o],d);var f=e.getModel("axisLabel").get("rotate")||0,p=Ym.innerTextLayout(s,f*Math.PI/180,-1);u=p.textAlign,h=p.textVerticalAlign}else{var g=c[1];l=n.coordToPoint([g+o,r]);var m=n.cx,v=n.cy;u=Math.abs(l[0]-m)/g<.3?"center":l[0]>m?"left":"right",h=Math.abs(l[1]-v)/g<.3?"middle":l[1]>v?"top":"bottom"}return{position:l,align:u,verticalAlign:h}}(e,i,0,s,d))}});var CT={line:function(t,e,i,n,o){return"angle"===t.dim?{type:"Line",shape:vI(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=Math.max(1,t.getBandWidth()),r=Math.PI/180;return"angle"===t.dim?{type:"Sector",shape:xI(e.cx,e.cy,n[0],n[1],(-i-a/2)*r,(a/2-i)*r)}:{type:"Sector",shape:xI(e.cx,e.cy,i-a/2,i+a/2,0,2*Math.PI)}}};function LT(n,t){t.update="updateView",gf(t,function(t,e){var i={};return e.eachComponent({mainType:"geo",query:t},function(e){e[n](t.name),E(e.coordinateSystem.regions,function(t){i[t.name]=e.isSelected(t.name)||!1})}),{selected:i,name:t.name}})}hv.registerAxisPointerClass("PolarAxisPointer",DT),vf(T(function(t,e,i){var N={},O=function(t){var g={};E(t,function(t,e){var i=t.getData(),n=t.coordinateSystem,o=n.getBaseAxis(),a=dT(n,o),r=o.getExtent(),s="category"===o.type?o.getBandWidth():Math.abs(r[1]-r[0])/i.count(),l=g[a]||{bandWidth:s,remainedWidth:s,autoWidthCount:0,categoryGap:"20%",gap:"30%",stacks:{}},u=l.stacks;g[a]=l;var h=cT(t);u[h]||l.autoWidthCount++,u[h]=u[h]||{width:0,maxWidth:0};var c=Pl(t.get("barWidth"),s),d=Pl(t.get("barMaxWidth"),s),f=t.get("barGap"),p=t.get("barCategoryGap");c&&!u[h].width&&(c=Math.min(l.remainedWidth,c),u[h].width=c,l.remainedWidth-=c),d&&(u[h].maxWidth=d),null!=f&&(l.gap=f),null!=p&&(l.categoryGap=p)});var d={};return E(g,function(t,i){d[i]={};var e=t.stacks,n=t.bandWidth,o=Pl(t.categoryGap,n),a=Pl(t.gap,1),r=t.remainedWidth,s=t.autoWidthCount,l=(r-o)/(s+(s-1)*a);l=Math.max(l,0),E(e,function(t,e){var i=t.maxWidth;i&&i<l&&(i=Math.min(i,r),t.width&&(i=Math.min(i,t.width)),r-=i,t.width=i,s--)}),l=(r-o)/(s+(s-1)*a),l=Math.max(l,0);var u,h=0;E(e,function(t,e){t.width||(t.width=l),h+=(u=t).width*(1+a)}),u&&(h-=u.width*a);var c=-h/2;E(e,function(t,e){d[i][e]=d[i][e]||{offset:c,width:t.width},c+=t.width*(1+a)})}),d}(M(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,n=i.getBaseAxis(),o=dT(i,n),a=cT(t),r=O[o][a],s=r.offset,l=r.width,u=i.getOtherAxis(n),h=t.coordinateSystem.cx,c=t.coordinateSystem.cy,d=t.get("barMinHeight")||0,f=t.get("barMinAngle")||0;N[a]=N[a]||[];for(var p=e.mapDimension(u.dim),g=e.mapDimension(n.dim),m=lp(e,p),v="radius"!==n.dim||!t.get("roundCap",!0),y=u.getExtent()[0],x=0,_=e.count();x<_;x++){var w=e.get(p,x),b=e.get(g,x);if(!isNaN(w)){var S,M,I,T,A=0<=w?"p":"n",D=y;if(m&&(N[a][b]||(N[a][b]={p:y,n:y}),D=N[a][b][A]),"radius"===u.dim){var C=u.dataToRadius(w)-y,L=n.dataToAngle(b);Math.abs(C)<d&&(C=(C<0?-1:1)*d),M=(S=D)+C,T=(I=L-s)-l,m&&(N[a][b][A]=M)}else{var k=u.dataToAngle(w,v)-y,P=n.dataToRadius(b);Math.abs(k)<f&&(k=(k<0?-1:1)*f),M=(S=P+s)+l,T=(I=D)+k,m&&(N[a][b][A]=T)}e.setItemLayout(x,{cx:h,cy:c,r0:S,r:M,startAngle:-I*Math.PI/180,endAngle:-T*Math.PI/180})}}}},this)},"bar")),bf({type:"polar"}),b(Tu.extend({type:"geo",coordinateSystem:null,layoutMode:"box",init:function(t){Tu.prototype.init.apply(this,arguments),zo(t,"label",["show"])},optionUpdated:function(){var t=this.option,i=this;t.regions=ax.getFilledRegions(t.regions,t.map,t.nameMap),this._optionModelMap=S(t.regions||[],function(t,e){return e.name&&t.set(e.name,new Il(e,i)),t},Q()),this.updateSelectedMap(t.regions)},defaultOption:{zlevel:0,z:0,show:!0,left:"center",top:"center",aspectScale:null,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 Il(null,this,this.ecModel)},getFormattedLabel:function(t,e){var i=this.getRegionModel(t).get("label"+("normal"===e?".":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}}),Vv),bf({type:"geo",init:function(t,e){var i=new Uy(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()}}),LT("toggleSelected",{type:"geoToggleSelect",event:"geoselectchanged"}),LT("select",{type:"geoSelect",event:"geoselected"}),LT("unSelect",{type:"geoUnSelect",event:"geounselected"});function kT(t,e,i){this._model=t}function PT(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}kT.prototype={constructor:kT,type:"calendar",dimensions:["time","value"],getDimensionsInfo:function(){return[{name:"time",type:"time"},"value"]},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=Hl(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{y:e,m:i,d:n,day:o=Math.abs((o+7-this.getFirstDayOfWeek())%7),time:t.getTime(),formatedDate:e+"-"+i+"-"+n,date:t}},getNextNDay:function(t,e){return 0===(e=e||0)||(t=new Date(this.getDateInfo(t).time)).setDate(t.getDate()+e),this.getDateInfo(t)},update:function(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 i=this._rangeInfo.weeks||1,n=["width","height"],o=this._model.get("cellSize").slice(),a=this._model.getBoxLayoutParams(),r="horizontal"===this._orient?[i,7]:[7,i];E([0,1],function(t){u(o,t)&&(a[n[t]]=o[t]*r[t])});var s={width:e.getWidth(),height:e.getHeight()},l=this._rect=vu(a,s);function u(t,e){return null!=t[e]&&"auto"!==t[e]}E([0,1],function(t){u(o,t)||(o[t]=l[n[t]]/r[t])}),this._sw=o[0],this._sh=o[1]},dataToPoint:function(t,e){k(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+864e5))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:T(PT,"dataToPoint"),convertFromPixel:T(PT,"pointToData"),_initRangeOption:function(){var t=this._model.get("range"),e=t;if(k(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=0<n.getTime()-t[1].time?1:-1;n.getDate()!==a&&0<(n.getTime()-t[1].time)*r;)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)}},kT.dimensions=kT.prototype.dimensions,kT.getDimensionsInfo=kT.prototype.getDimensionsInfo,kT.create=function(i,n){var o=[];return i.eachComponent("calendar",function(t){var e=new kT(t,i,n);o.push(e),t.coordinateSystem=e}),i.eachSeries(function(t){"calendar"===t.get("coordinateSystem")&&(t.coordinateSystem=o[t.get("calendarIndex")||0])}),o},nh.register("calendar",kT);var NT=Tu.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=_u(t);NT.superApply(this,"init",arguments),OT(t,o)},mergeOption:function(t,e){NT.superApply(this,"mergeOption",arguments),OT(this.option,t)}});function OT(t,e){var i=t.cellSize;k(i)?1===i.length&&(i[1]=i[0]):i=t.cellSize=[i,i];var n=N([0,1],function(t){return function(t,e){return null!=t[pu[e][0]]||null!=t[pu[e][1]]&&null!=t[pu[e][2]]}(e,t)&&(i[t]="auto"),null!=i[t]&&"auto"!==i[t]});xu(t,e,{type:"box",ignoreSize:n})}var ET={EN:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],CN:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"]},zT={EN:["S","M","T","W","T","F","S"],CN:["日","一","二","三","四","五","六"]};bf({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,u=new is({shape:{x:l[0],y:l[1],width:a,height:r},cursor:"default",style:o});i.add(u)}},_renderLines:function(i,t,n,o){var a=this,r=i.coordinateSystem,s=i.getModel("splitLine.lineStyle").getLineStyle(),l=i.get("splitLine.show"),e=s.lineWidth;this._tlpoints=[],this._blpoints=[],this._firstDayOfMonth=[],this._firstDayPoints=[];for(var u=t.start,h=0;u.time<=t.end.time;h++){d(u.formatedDate),0===h&&(u=r.getDateInfo(t.start.y+"-"+t.start.m));var c=u.date;c.setMonth(c.getMonth()+1),u=r.getDateInfo(c)}function d(t){a._firstDayOfMonth.push(r.getDateInfo(t)),a._firstDayPoints.push(r.dataToRect([t],!1).tl);var e=a._getLinePointsOfOneWeek(i,t,n);a._tlpoints.push(e[0]),a._blpoints.push(e[e.length-1]),l&&a._drawSplitline(e,s,o)}d(r.getNextNDay(t.end.time,1).formatedDate),l&&this._drawSplitline(a._getEdgesPoints(a._tlpoints,e,n),s,o),l&&this._drawSplitline(a._getEdgesPoints(a._blpoints,e,n),s,o)},_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 Kr({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?au(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,u=(s[0][1]+s[1][1])/2,h="horizontal"===i?0:1,c={top:[l,s[h][1]],bottom:[l,s[1-h][1]],left:[s[1-h][0],u],right:[s[h][0],u]},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 Fr({z2:30});Qs(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"),a=n.get("margin"),r=n.get("position"),s=n.get("align"),l=[this._tlpoints,this._blpoints];z(o)&&(o=ET[o.toUpperCase()]||[]);var u="start"===r?0:1,h="horizontal"===e?0:1;a="start"===r?-a:a;for(var c="center"===s,d=0;d<l[u].length-1;d++){var f=l[u][d].slice(),p=this._firstDayOfMonth[d];if(c){var g=this._firstDayPoints[d];f[h]=(g[h]+l[0][d+1][h])/2}var m=n.get("formatter"),v=o[+p.m-1],y={yyyy:p.y,yy:(p.y+"").slice(2),MM:p.m,M:+p.m,nameMap:v},x=this._formatterLabel(m,y),_=new Fr({z2:30});L(Qs(_.style,n,{text:x}),this._monthTextPositionControl(f,c,e,r,a)),i.add(_)}}},_weekTextPositionControl:function(t,e,i,n,o){var a="center",r="middle",s=t[0],l=t[1],u="start"===i;return"horizontal"===e?(s=s+n+(u?1:-1)*o[0]/2,a=u?"right":"left"):(l=l+n+(u?1:-1)*o[1]/2,r=u?"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 a=t.coordinateSystem,r=o.get("position"),s=o.get("nameMap"),l=o.get("margin"),u=a.getFirstDayOfWeek();z(s)&&(s=zT[s.toUpperCase()]||[]);var h=a.getNextNDay(e.end.time,7-e.lweek).time,c=[a.getCellWidth(),a.getCellHeight()];l=Pl(l,c["horizontal"===i?0:1]),"start"===r&&(h=a.getNextNDay(e.start.time,-(7+e.fweek)).time,l=-l);for(var d=0;d<7;d++){var f,p=a.getNextNDay(h,d),g=a.dataToRect([p.time],!1).center;f=Math.abs((d+u)%7);var m=new Fr({z2:30});L(Qs(m.style,o,{text:s[f]}),this._weekTextPositionControl(g,i,r,l,c)),n.add(m)}}}});var RT={path:null,compoundPath:null,group:Ii,image:qn,text:Fr};ff(function(t){var e=t.graphic;k(e)?e[0]&&e[0].elements?t.graphic=[t.graphic[0]]:t.graphic=[{elements:e}]:e&&!e.elements&&(t.graphic=[{elements:[e]}])});var BT=wf({type:"graphic",defaultOption:{elements:[],parentId:null},_elOptionsToUpdate:null,mergeOption:function(t){var e=this.option.elements;this.option.elements=null,BT.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=Vo(o,a);Go(r);var s=this._elOptionsToUpdate=[];E(r,function(t,e){var i=t.option;i&&(s.push(i),function(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}(t,i),function(t,e,i){var n=L({},i),o=t[e],a=i.$action||"merge";"merge"===a?o?(m(o,n,!0),xu(o,n,{ignoreSize:!0}),wu(i,o)):t[e]=n:"replace"===a?t[e]=n:"remove"===a&&o&&(t[e]=null)}(o,e,i),function(t,e){if(!t)return;t.hv=e.hv=[FT(e,["left","right"]),FT(e,["top","bottom"])],"group"===t.type&&(null==t.width&&(t.width=e.width=0),null==t.height&&(t.height=e.height=0))}(o[e],i))},this);for(var l=o.length-1;0<=l;l--)null==o[l]?o.splice(l,1):delete o[l].$action},_flatten:function(t,i,n){E(t,function(t){if(t){n&&(t.parentOption=n),i.push(t);var e=t.children;"group"===t.type&&e&&this._flatten(e,i,t),delete t.children}},this)},useElOptionsToUpdate:function(){var t=this._elOptionsToUpdate;return this._elOptionsToUpdate=null,t}});function VT(t,e,i,n){var o=i.type,a=new(RT.hasOwnProperty(o)?RT[o]:As(o))(i);e.add(a),n.set(t,a),a.__ecGraphicId=t}function GT(t,e){var i=t&&t.parent;i&&("group"===t.type&&t.traverse(function(t){GT(t,e)}),e.removeKey(t.__ecGraphicId),i.remove(t))}function FT(e,t){var i;return E(t,function(t){null!=e[t]&&"auto"!==e[t]&&(i=!0)}),i}bf({type:"graphic",init:function(t,e){this._elMap=Q(),this._lastGraphicModel},render:function(t,e,i){t!==this._lastGraphicModel&&this._clear(),this._lastGraphicModel=t,this._updateElements(t),this._relocate(t,i)},_updateElements:function(u){var t=u.useElOptionsToUpdate();if(t){var h=this._elMap,c=this.group;E(t,function(t){var e=t.$action,i=t.id,n=h.get(i),o=t.parentId,a=null!=o?h.get(o):c,r=t.style;"text"===t.type&&r&&(t.hv&&t.hv[1]&&(r.textVerticalAlign=r.textBaseline=null),!r.hasOwnProperty("textFill")&&r.fill&&(r.textFill=r.fill),!r.hasOwnProperty("textStroke")&&r.stroke&&(r.textStroke=r.stroke));var s=function(e){return e=L({},e),E(["id","parentId","$action","hv","bounding"].concat(fu),function(t){delete e[t]}),e}(t);e&&"merge"!==e?"replace"===e?(GT(n,h),VT(i,a,s,h)):"remove"===e&&GT(n,h):n?n.attr(s):VT(i,a,s,h);var l=h.get(i);l&&(l.__ecGraphicWidthOption=t.width,l.__ecGraphicHeightOption=t.height,function(t,e){var i=t.eventData;t.silent||t.ignore||i||(i=t.eventData={componentType:"graphic",componentIndex:e.componentIndex,name:t.name});i&&(i.info=t.info)}(l,u))})}},_relocate:function(t,e){for(var i=t.option.elements,n=this.group,o=this._elMap,a=e.getWidth(),r=e.getHeight(),s=0;s<i.length;s++){var l=i[s];if((h=o.get(l.id))&&h.isGroup){var u=(c=h.parent)===n;h.__ecGraphicWidth=Pl(h.__ecGraphicWidthOption,u?a:c.__ecGraphicWidth)||0,h.__ecGraphicHeight=Pl(h.__ecGraphicHeightOption,u?r:c.__ecGraphicHeight)||0}}for(s=i.length-1;0<=s;s--){var h,c;l=i[s];if(h=o.get(l.id))yu(h,l,(c=h.parent)===n?{width:a,height:r}:{width:c.__ecGraphicWidth,height:c.__ecGraphicHeight},null,{hv:l.hv,boundingMode:l.bounding})}},_clear:function(){var e=this._elMap;e.each(function(t){GT(t,e)}),this._elMap=Q()},dispose:function(){this._clear()}});var WT={};function HT(t,e){WT[t]=e}function ZT(t){return WT[t]}var UT=wf({type:"toolbox",layoutMode:{type:"box",ignoreSize:!0},optionUpdated:function(){UT.superApply(this,"optionUpdated",arguments),E(this.option.feature,function(t,e){var i=ZT(e);i&&m(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"}},tooltip:{show:!1}}});function XT(t,e){var i=Jl(e.get("padding")),n=e.getItemStyle(["color","opacity"]);return n.fill=e.get("backgroundColor"),t=new is({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})}bf({type:"toolbox",render:function(h,c,d,l){var f=this.group;if(f.removeAll(),h.get("show")){var p=+h.get("itemSize"),u=h.get("feature")||{},g=this._features||(this._features={}),m=[];E(u,function(t,e){m.push(e)}),new Tf(this._featureNames||[],m).add(t).update(t).remove(T(t,null)).execute(),this._featureNames=m,function(t,e,i){var n=e.getBoxLayoutParams(),o=e.get("padding"),a={width:i.getWidth(),height:i.getHeight()},r=vu(n,a,o);mu(e.get("orient"),t,e.get("itemGap"),r.width,r.height),yu(t,n,a,o)}(f,h,d),f.add(XT(f.getBoundingRect(),h)),f.eachChild(function(t){var e=t.__title,i=t.hoverStyle;if(i&&e){var n=cn(e,Sn(i)),o=t.position[0]+f.position[0],a=!1;t.position[1]+f.position[1]+p+n.height>d.getHeight()&&(i.textPosition="top",a=!0);var r=a?-5-n.height:p+8;o+n.width/2>d.getWidth()?(i.textPosition=["100%",r],i.textAlign="right"):o-n.width/2<0&&(i.textPosition=[0,r],i.textAlign="left")}})}function t(t,e){var i,n=m[t],o=m[e],a=u[n],r=new Il(a,h,h.ecModel);if(l&&null!=l.newTitle&&(a.title=l.newTitle),n&&!o){if(function(t){return 0===t.indexOf("my")}(n))i={model:r,onclick:r.option.onclick,featureName:n};else{var s=ZT(n);if(!s)return;i=new s(r,c,d)}g[n]=i}else{if(!(i=g[o]))return;i.model=r,i.ecModel=c,i.api=d}n||!o?r.get("show")&&!i.unusable?(function(o,a,t){var r=o.getModel("iconStyle"),s=o.getModel("emphasis.iconStyle"),e=a.getIcons?a.getIcons():o.get("icon"),l=o.get("title")||{};if("string"==typeof e){var i=e,n=l;l={},(e={})[t]=i,l[t]=n}var u=o.iconPaths={};E(e,function(t,e){var i=pl(t,{},{x:-p/2,y:-p/2,width:p,height:p});i.setStyle(r.getItemStyle()),i.hoverStyle=s.getItemStyle(),i.setStyle({text:l[e],textAlign:s.get("textAlign"),textBorderRadius:s.get("textBorderRadius"),textPadding:s.get("textPadding"),textFill:null});var n=h.getModel("tooltip");n&&n.get("show")&&i.attr("tooltip",L({content:l[e],formatter:n.get("formatter",!0)||function(){return l[e]},formatterParams:{componentType:"toolbox",name:e,title:l[e],$vars:["name","title"]},position:n.get("position",!0)||"bottom"},n.option)),Ys(i),h.get("showTitle")&&(i.__title=l[e],i.on("mouseover",function(){var t=s.getItemStyle(),e="vertical"===h.get("orient")?null==h.get("right")?"right":"left":null==h.get("bottom")?"bottom":"top";i.setStyle({textFill:s.get("textFill")||t.fill||t.stroke||"#000",textBackgroundColor:s.get("textBackgroundColor"),textPosition:s.get("textPosition")||e})}).on("mouseout",function(){i.setStyle({textFill:null,textBackgroundColor:null})})),i.trigger(o.get("iconStatus."+e)||"normal"),f.add(i),i.on("click",A(a.onclick,a,c,d,e)),u[e]=i})}(r,i,n),r.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)},i.render&&i.render(r,c,d,l)):i.remove&&i.remove(c,d):i.dispose&&i.dispose(c,d)}},updateView:function(t,e,i,n){E(this._features,function(t){t.updateView&&t.updateView(t.model,e,i,n)})},remove:function(e,i){E(this._features,function(t){t.remove&&t.remove(e,i)}),this.group.removeAll()},dispose:function(e,i){E(this._features,function(t){t.dispose&&t.dispose(e,i)})}});var YT=Cc.toolbox.saveAsImage;function jT(t){this.model=t}jT.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:YT.title,type:"png",connectedBackgroundColor:"#fff",name:"",excludeComponents:["toolbox"],pixelRatio:1,lang:YT.lang.slice()},jT.prototype.unusable=!v.canvasSupported,jT.prototype.onclick=function(t,e){var i=this.model,n=i.get("name")||t.get("title.0.text")||"echarts",o=i.get("type",!0)||"png",a=e.getConnectedDataURL({type:o,backgroundColor:i.get("backgroundColor",!0)||t.get("backgroundColor")||"#fff",connectedBackgroundColor:i.get("connectedBackgroundColor"),excludeComponents:i.get("excludeComponents"),pixelRatio:i.get("pixelRatio")});if("function"!=typeof MouseEvent||v.browser.ie||v.browser.edge)if(window.navigator.msSaveOrOpenBlob){for(var r=atob(a.split(",")[1]),s=r.length,l=new Uint8Array(s);s--;)l[s]=r.charCodeAt(s);var u=new Blob([l]);window.navigator.msSaveOrOpenBlob(u,n+"."+o)}else{var h=i.get("lang"),c='<body style="margin:0;"><img src="'+a+'" style="max-width:100%;" title="'+(h&&h[0]||"")+'" /></body>';window.open().document.write(c)}else{var d=document.createElement("a");d.download=n+"."+o,d.target="_blank",d.href=a;var f=new MouseEvent("click",{view:window,bubbles:!0,cancelable:!1});d.dispatchEvent(f)}},HT("saveAsImage",jT);var qT=Cc.toolbox.magicType,KT="__ec_magicType_stack__";function $T(t){this.model=t}$T.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"},title:D(qT.title),option:{},seriesIndex:{}};var JT=$T.prototype;JT.getIcons=function(){var t=this.model,e=t.get("icon"),i={};return E(t.get("type"),function(t){e[t]&&(i[t]=e[t])}),i};var QT={line:function(t,e,i,n){if("bar"===t)return m({id:e,type:"line",data:i.get("data"),stack:i.get("stack"),markPoint:i.get("markPoint"),markLine:i.get("markLine")},n.get("option.line")||{},!0)},bar:function(t,e,i,n){if("line"===t)return m({id:e,type:"bar",data:i.get("data"),stack:i.get("stack"),markPoint:i.get("markPoint"),markLine:i.get("markLine")},n.get("option.bar")||{},!0)},stack:function(t,e,i,n){var o=i.get("stack")===KT;if("line"===t||"bar"===t)return n.setIconStatus("stack",o?"normal":"emphasis"),m({id:e,stack:o?"":KT},n.get("option.stack")||{},!0)}},tA=[["line","bar"],["stack"]];JT.onclick=function(u,t,h){var c=this.model,e=c.get("seriesIndex."+h);if(QT[h]){var i,d={series:[]};if(E(tA,function(t){0<=_(t,h)&&E(t,function(t){c.setIconStatus(t,"normal")})}),c.setIconStatus(h,"emphasis"),u.eachComponent({mainType:"series",query:null==e?null:{seriesIndex:e}},function(t){var e=t.subType,i=t.id,n=QT[h](e,i,t,c);n&&(C(n,t.option),d.series.push(n));var o=t.coordinateSystem;if(o&&"cartesian2d"===o.type&&("line"===h||"bar"===h)){var a=o.getAxesByScale("ordinal")[0];if(a){var r=a.dim+"Axis",s=u.queryComponents({mainType:r,index:t.get(name+"Index"),id:t.get(name+"Id")})[0].componentIndex;d[r]=d[r]||[];for(var l=0;l<=s;l++)d[r][s]=d[r][s]||{};d[r][s].boundaryGap="bar"===h}}}),"stack"===h)i=d.series&&d.series[0]&&d.series[0].stack===KT?m({stack:qT.title.tiled},qT.title):D(qT.title);t.dispatchAction({type:"changeMagicType",currentType:h,newOption:d,newTitle:i})}},gf({type:"changeMagicType",event:"magicTypeChanged",update:"prepareAndUpdate"},function(t,e){e.mergeOption(t.newOption)}),HT("magicType",$T);var eA=Cc.toolbox.dataView,iA=new Array(60).join("-"),nA="\t";function oA(t){var e=function(t){var o={},a=[],r=[];return t.eachRawSeries(function(t){var e=t.coordinateSystem;if(!e||"cartesian2d"!==e.type&&"polar"!==e.type)a.push(t);else{var i=e.getBaseAxis();if("category"===i.type){var n=i.dim+"_"+i.index;o[n]||(o[n]={categoryAxis:i,valueAxis:e.getOtherAxis(i),series:[]},r.push({axisDim:i.dim,axisIndex:i.index})),o[n].series.push(t)}else a.push(t)}}),{seriesGroupByCategoryAxis:o,other:a,meta:r}}(t);return{value:M([function(t){var h=[];return E(t,function(t,e){var i=t.categoryAxis,n=t.valueAxis.dim,o=[" "].concat(N(t.series,function(t){return t.name})),a=[i.model.getCategories()];E(t.series,function(t){a.push(t.getRawData().mapArray(n,function(t){return t}))});for(var r=[o.join(nA)],s=0;s<a[0].length;s++){for(var l=[],u=0;u<a.length;u++)l.push(a[u][s]);r.push(l.join(nA))}h.push(r.join("\n"))}),h.join("\n\n"+iA+"\n\n")}(e.seriesGroupByCategoryAxis),function(t){return N(t,function(t){var o=t.getRawData(),a=[t.name],r=[];return o.each(o.dimensions,function(){for(var t=arguments.length,e=arguments[t-1],i=o.getName(e),n=0;n<t-1;n++)r[n]=arguments[n];a.push((i?i+nA:"")+r.join(nA))}),a.join("\n")}).join("\n\n"+iA+"\n\n")}(e.other)],function(t){return t.replace(/[\n\t\s]/g,"")}).join("\n\n"+iA+"\n\n"),meta:e.meta}}function aA(t){return t.replace(/^\s\s*/,"").replace(/\s\s*$/,"")}var rA=new RegExp("["+nA+"]+","g");function sA(t,a){var e=t.split(new RegExp("\n*"+iA+"\n*","g")),r={series:[]};return E(e,function(t,e){if(function(t){if(0<=t.slice(0,t.indexOf("\n")).indexOf(nA))return!0}(t)){var i=function(t){for(var e=t.split(/\n+/g),i=[],n=N(aA(e.shift()).split(rA),function(t){return{name:t,data:[]}}),o=0;o<e.length;o++){var a=aA(e[o]).split(rA);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}}(t),n=a[e],o=n.axisDim+"Axis";n&&(r[o]=r[o]||[],r[o][n.axisIndex]={data:i.categories},r.series=r.series.concat(i.series))}else{i=function(t){for(var e=t.split(/\n+/g),i=aA(e.shift()),n=[],o=0;o<e.length;o++){var a,r=aA(e[o]).split(rA),s="",l=!1;a=isNaN(r[0])?(l=!0,s=r[0],r=r.slice(1),n[o]={name:s,value:[]},n[o].value):n[o]=[];for(var u=0;u<r.length;u++)a.push(+r[u]);1===a.length&&(l?n[o].value=a[0]:n[o]=a[0])}return{name:i,data:n}}(t);r.series.push(i)}}),r}function lA(t){this._dom=null,this.model=t}lA.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:D(eA.title),lang:D(eA.lang),backgroundColor:"#fff",textColor:"#000",textareaColor:"#fff",textareaBorderColor:"#333",buttonColor:"#c23531",buttonTextColor:"#fff"},lA.prototype.onclick=function(t,e){var i=e.getDom(),n=this.model;this._dom&&i.removeChild(this._dom);var o=document.createElement("div");o.style.cssText="position:absolute;left:5px;top:5px;bottom:5px;right:5px;",o.style.backgroundColor=n.get("backgroundColor")||"#fff";var a=document.createElement("h4"),r=n.get("lang")||[];a.innerHTML=r[0]||n.get("title"),a.style.cssText="margin: 10px 20px;",a.style.color=n.get("textColor");var s=document.createElement("div"),l=document.createElement("textarea");s.style.cssText="display:block;width:100%;overflow:auto;";var u=n.get("optionToContent"),h=n.get("contentToOption"),c=oA(t);if("function"==typeof u){var d=u(e.getOption());"string"==typeof d?s.innerHTML=d:G(d)&&s.appendChild(d)}else s.appendChild(l),l.readOnly=n.get("readOnly"),l.style.cssText="width:100%;height:100%;font-family:monospace;font-size:14px;line-height:1.6rem;",l.style.color=n.get("textColor"),l.style.borderColor=n.get("textareaBorderColor"),l.style.backgroundColor=n.get("textareaColor"),l.value=c.value;var f=c.meta,p=document.createElement("div");p.style.cssText="position:absolute;bottom:0;left:0;right:0;";var g="float:right;margin-right:20px;border:none;cursor:pointer;padding:2px 5px;font-size:12px;border-radius:3px",m=document.createElement("div"),v=document.createElement("div");g+=";background-color:"+n.get("buttonColor"),g+=";color:"+n.get("buttonTextColor");var y=this;function x(){i.removeChild(o),y._dom=null}Ft(m,"click",x),Ft(v,"click",function(){var t;try{t="function"==typeof h?h(s,e.getOption()):sA(l.value,f)}catch(t){throw x(),new Error("Data view format error "+t)}t&&e.dispatchAction({type:"changeDataView",newOption:t}),x()}),m.innerHTML=r[1],v.innerHTML=r[2],v.style.cssText=g,m.style.cssText=g,n.get("readOnly")||p.appendChild(v),p.appendChild(m),o.appendChild(a),o.appendChild(s),o.appendChild(p),s.style.height=i.clientHeight-80+"px",i.appendChild(o),this._dom=o},lA.prototype.remove=function(t,e){this._dom&&e.getDom().removeChild(this._dom)},lA.prototype.dispose=function(t,e){this.remove(t,e)},HT("dataView",lA),gf({type:"changeDataView",event:"dataViewChanged",update:"prepareAndUpdate"},function(t,n){var o=[];E(t.newOption.series,function(t){var e=n.getSeriesByName(t.name)[0];if(e){var i=e.get("data");o.push({name:t.name,data:function(t,n){return N(t,function(t,e){var i=n&&n[e];return R(i)&&!k(i)?(R(t)&&!k(t)&&(t=t.value),C({value:t},i)):t})}(t.data,i)})}else o.push(L({type:"scatter"},t))}),n.mergeOption(C({series:o},t.newOption))});var uA=E,hA=_,cA=T,dA=["dataToPoint","pointToData"],fA=["grid","xAxis","yAxis","geo","graph","polar","radiusAxis","angleAxis","bmap"];function pA(t,e,i){var n=this._targetInfoList=[],o={},a=vA(e,t);uA(yA,function(t,e){i&&i.include&&!(0<=hA(i.include,e))||t(a,n,o)})}var gA=pA.prototype;function mA(t){return t[0]>t[1]&&t.reverse(),t}function vA(t,e){return Xo(t,e,{includeMainTypes:fA})}gA.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=wA[t.brushType](0,i,e);t.__rangeOffset={offset:SA[t.brushType](n.values,t.range,[1,1]),xyMinMax:n.xyMinMax}}})},gA.matchOutputRanges=function(t,n,o){uA(t,function(i){var t=this.findTargetInfo(i,n);t&&!0!==t&&E(t.coordSyses,function(t){var e=wA[i.brushType](1,t,i.range);o(i,e.values,t,n)})},this)},gA.setInputRanges=function(t,o){uA(t,function(t){var e=this.findTargetInfo(t,o);if(t.range=t.range||[],e&&!0!==e){t.panelId=e.panelId;var i=wA[t.brushType](0,e.coordSys,t.coordRange),n=t.__rangeOffset;t.range=n?SA[t.brushType](i.values,n.offset,function(t,e){var i=IA(t),n=IA(e),o=[i[0]/n[0],i[1]/n[1]];return isNaN(o[0])&&(o[0]=1),isNaN(o[1])&&(o[1]=1),o}(i.xyMinMax,n.xyMinMax)):i.values}},this)},gA.makePanelOpts=function(i,n){return N(this._targetInfoList,function(t){var e=t.getPanelRect();return{panelId:t.panelId,defaultBrushType:n&&n(t),clipPath:Ub(e),isTargetByCursor:Yb(e,i,t.coordSysModel),getLinearBrushOtherExtent:Xb(e)}})},gA.controlSeries=function(t,e,i){var n=this.findTargetInfo(t,i);return!0===n||n&&0<=hA(n.coordSyses,e.coordinateSystem)},gA.findTargetInfo=function(t,e){for(var i=this._targetInfoList,n=vA(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<xA.length;o++)if(xA[o](n,a))return a}return!0};var yA={grid:function(t,n){var o=t.xAxisModels,a=t.yAxisModels,e=t.gridModels,i=Q(),r={},s={};(o||a||e)&&(uA(o,function(t){var e=t.axis.grid.model;i.set(e.id,e),r[e.id]=!0}),uA(a,function(t){var e=t.axis.grid.model;i.set(e.id,e),s[e.id]=!0}),uA(e,function(t){i.set(t.id,t),r[t.id]=!0,s[t.id]=!0}),i.each(function(t){var e=t.coordinateSystem,i=[];uA(e.getCartesians(),function(t,e){(0<=hA(o,t.getAxis("x").model)||0<=hA(a,t.getAxis("y").model))&&i.push(t)}),n.push({panelId:"grid--"+t.id,gridModel:t,coordSysModel:t,coordSys:i[0],coordSyses:i,getPanelRect:_A.grid,xAxisDeclared:r[t.id],yAxisDeclared:s[t.id]})}))},geo:function(t,i){uA(t.geoModels,function(t){var e=t.coordinateSystem;i.push({panelId:"geo--"+t.id,geoModel:t,coordSysModel:t,coordSys:e,coordSyses:[e],getPanelRect:_A.geo})})}},xA=[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}],_A={grid:function(){return this.coordSys.grid.getRect().clone()},geo:function(){var t=this.coordSys,e=t.getBoundingRect().clone();return e.applyTransform(ul(t)),e}},wA={lineX:cA(bA,0),lineY:cA(bA,1),rect:function(t,e,i){var n=e[dA[t]]([i[0][0],i[1][0]]),o=e[dA[t]]([i[0][1],i[1][1]]),a=[mA([n[0],o[0]]),mA([n[1],o[1]])];return{values:a,xyMinMax:a}},polygon:function(i,n,t){var o=[[1/0,-1/0],[1/0,-1/0]];return{values:N(t,function(t){var e=n[dA[i]](t);return o[0][0]=Math.min(o[0][0],e[0]),o[1][0]=Math.min(o[1][0],e[1]),o[0][1]=Math.max(o[0][1],e[0]),o[1][1]=Math.max(o[1][1],e[1]),e}),xyMinMax:o}}};function bA(t,e,i,n){var o=i.getAxis(["x","y"][t]),a=mA(N([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}}var SA={lineX:cA(MA,0),lineY:cA(MA,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,i,n){return N(t,function(t,e){return[t[0]-n[0]*i[e][0],t[1]-n[1]*i[e][1]]})}};function MA(t,e,i,n){return[e[0]-n[t]*i[0],e[1]-n[t]*i[1]]}function IA(t){return t?[t[0][1]-t[0][0],t[1][1]-t[1][0]]:[NaN,NaN]}var TA=E,AA="\0_ec_hist_store";function DA(t){var e=t[AA];return e=e||(t[AA]=[{}])}Tu.registerSubTypeDefaulter("dataZoom",function(){return"slider"});var CA=["cartesian2d","polar","singleAxis"];var LA,kA,PA,NA,OA=(kA=["axisIndex","axis","index","id"],PA=N(LA=(LA=["x","y","z","radius","angle","single"]).slice(),uu),NA=N(kA=(kA||[]).slice(),uu),function(o,a){E(LA,function(t,e){for(var i={name:t,capital:PA[e]},n=0;n<kA.length;n++)i[kA[n]]=t+NA[n];o.call(a,i)})});function EA(o,a,r){return function(t){var e,i={nodes:[],records:{}};if(a(function(t){i.records[t.name]={}}),!t)return i;for(s(t,i);e=!1,o(n),e;);function n(t){!function(t,e){return 0<=_(e.nodes,t)}(t,i)&&function(t,i){var n=!1;return a(function(e){E(r(t,e)||[],function(t){i.records[e.name][t]&&(n=!0)})}),n}(t,i)&&(s(t,i),e=!0)}return i};function s(t,i){i.nodes.push(t),a(function(e){E(r(t,e)||[],function(t){i.records[e.name][t]=!0})})}}function zA(t,e,i,n){this._dimName=t,this._axisIndex=e,this._valueWindow,this._percentWindow,this._dataExtent,this._minMaxSpan,this.ecModel=n,this._dataZoomModel=i}var RA=E,BA=Ol;function VA(t,e){var i=t.getAxisModel(),n=t._percentWindow,o=t._valueWindow;if(n){var a=Rl(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))}}zA.prototype={constructor:zA,hostedBy:function(t){return this._dataZoomModel===t},getDataValueWindow:function(){return this._valueWindow.slice()},getDataPercentWindow:function(){return this._percentWindow.slice()},getTargetSeriesModels:function(){var n=[],o=this.ecModel;return o.eachSeries(function(t){if(function(t){return 0<=_(CA,t)}(t.get("coordinateSystem"))){var e=this._dimName,i=o.queryComponents({mainType:e+"Axis",index:t.get(e+"AxisIndex"),id:t.get(e+"AxisId")})[0];this._axisIndex===(i&&i.componentIndex)&&n.push(t)}},this),n},getAxisModel:function(){return this.ecModel.getComponent(this._dimName+"Axis",this._axisIndex)},getOtherAxisModel:function(){var t,e,i,n=this._dimName,o=this.ecModel,a=this.getAxisModel();return t="x"===n||"y"===n?(e="gridIndex","x"===n?"y":"x"):(e="polarIndex","angle"===n?"radius":"angle"),o.eachComponent(t+"Axis",function(t){(t.get(e)||0)===(a.get(e)||0)&&(i=t)}),i},getMinMaxSpan:function(){return D(this._minMaxSpan)},calculateDataWindow:function(o){var a,r=this._dataExtent,s=this.getAxisModel().axis.scale,l=this._dataZoomModel.getRangePropMode(),u=[0,100],h=[],c=[];RA(["start","end"],function(t,e){var i=o[t],n=o[t+"Value"];"percent"===l[e]?(null==i&&(i=u[e]),n=s.parse(kl(i,u,r))):(a=!0,i=kl(n=null==n?r[e]:s.parse(n),r,u)),c[e]=n,h[e]=i}),BA(c),BA(h);var d=this._minMaxSpan;function t(t,e,i,n,o){var a=o?"Span":"ValueSpan";Ww(0,t,i,"all",d["min"+a],d["max"+a]);for(var r=0;r<2;r++)e[r]=kl(t[r],i,n,!0),o&&(e[r]=s.parse(e[r]))}return a?t(c,h,r,u,!1):t(h,c,u,r,!0),{valueWindow:c,percentWindow:h}},reset:function(t){if(t===this._dataZoomModel){var e=this.getTargetSeriesModels();this._dataExtent=function(t,e,i){var n=[1/0,-1/0];RA(i,function(t){var i=t.getData();i&&RA(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]);return function(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]=0<a?0:NaN);var r=i.getMax(!0);null!=r&&"dataMax"!==r&&"function"!=typeof r?e[1]=r:o&&(e[1]=0<a?a-1:NaN);i.get("scale",!0)||(0<e[0]&&(e[0]=0),e[1]<0&&(e[1]=0))}(t,n),n}(this,this._dimName,e),function(n){var o=n._minMaxSpan={},a=n._dataZoomModel,r=n._dataExtent;RA(["min","max"],function(t){var e=a.get(t+"Span"),i=a.get(t+"ValueSpan");null!=i&&(i=n.getAxisModel().axis.scale.parse(i)),null!=i?e=kl(r[0]+i,r,[0,100],!0):null!=e&&(i=kl(e,[0,100],r,!0)-r[0]),o[t+"Span"]=e,o[t+"ValueSpan"]=i})}(this);var i=this.calculateDataWindow(t.settledOption);this._valueWindow=i.valueWindow,this._percentWindow=i.percentWindow,VA(this)}},restore:function(t){t===this._dataZoomModel&&(this._valueWindow=this._percentWindow=null,VA(this,!0))},filterData:function(t,e){if(t===this._dataZoomModel){var n=this._dimName,i=this.getTargetSeriesModels(),o=t.get("filterMode"),c=this._valueWindow;"none"!==o&&RA(i,function(i){var u=i.getData(),h=u.mapDimension(n,!0);h.length&&("weakFilter"===o?u.filterSelf(function(t){for(var e,i,n,o=0;o<h.length;o++){var a=u.get(h[o],t),r=!isNaN(a),s=a<c[0],l=a>c[1];if(r&&!s&&!l)return!0;r&&(n=!0),s&&(e=!0),l&&(i=!0)}return n&&e&&i}):RA(h,function(t){if("empty"===o)i.setData(u=u.map(t,function(t){return function(t){return t>=c[0]&&t<=c[1]}(t)?t:NaN}));else{var e={};e[t]=c,u.selectRange(e)}}),RA(h,function(t){u.setApproximateExtent(c,t)}))})}}};var GA=E,FA=OA,WA=wf({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=HA(t);this.settledOption=n,this.mergeDefaultAndTheme(t,i),this.doInit(n)},mergeOption:function(t){var e=HA(t);m(this.option,t,!0),m(this.settledOption,e,!0),this.doInit(e)},doInit:function(t){var i=this.option;v.canvasSupported||(i.realtime=!1),this._setDefaultThrottle(t),ZA(this,t);var n=this.settledOption;GA([["start","startValue"],["end","endValue"]],function(t,e){"value"===this._rangePropMode[e]&&(i[t[0]]=n[t[0]]=null)},this),this.textStyleModel=this.getModel("textStyle"),this._resetTarget(),this._giveAxisProxies()},_giveAxisProxies:function(){var r=this._axisProxies;this.eachTargetAxis(function(t,e,i,n){var o=this.dependentModels[t.axis][e],a=o.__dzAxisProxy||(o.__dzAxisProxy=new zA(t.name,e,this,n));r[t.name+"_"+e]=a},this)},_resetTarget:function(){var i=this.option,t=this._judgeAutoMode();FA(function(t){var e=t.axisIndex;i[e]=Eo(i[e])},this),"axisIndex"===t?this._autoSetAxisIndex():"orient"===t&&this._autoSetOrient()},_judgeAutoMode:function(){var e=this.option,i=!1;FA(function(t){null!=e[t.axisIndex]&&(i=!0)},this);var t=e.orient;return null==t&&i?"orient":i?void 0:(null==t&&(e.orient="horizontal"),"axisIndex")},_autoSetAxisIndex:function(){var a=!0,e=this.get("orient",!0),r=this.option,t=this.dependentModels;if(a){var i="vertical"===e?"y":"x";t[i+"Axis"].length?(r[i+"AxisIndex"]=[0],a=!1):GA(t.singleAxis,function(t){a&&t.get("orient",!0)===e&&(r.singleAxisIndex=[t.componentIndex],a=!1)})}a&&FA(function(t){if(a){var e=[],i=this.dependentModels[t.axis];if(i.length&&!e.length)for(var n=0,o=i.length;n<o;n++)"category"===i[n].get("type")&&e.push(n);(r[t.axisIndex]=e).length&&(a=!1)}},this),a&&this.ecModel.eachSeries(function(o){this._isSeriesHasAllAxesTypeOf(o,"value")&&FA(function(t){var e=r[t.axisIndex],i=o.get(t.axisIndex),n=o.get(t.axisId);_(e,i=o.ecModel.queryComponents({mainType:t.axis,index:i,id:n})[0].componentIndex)<0&&e.push(i)})},this)},_autoSetOrient:function(){var e;this.eachTargetAxis(function(t){e=e||t.name},this),this.option.orient="y"===e?"vertical":"horizontal"},_isSeriesHasAllAxesTypeOf:function(n,o){var a=!0;return FA(function(t){var e=n.get(t.axisIndex),i=this.dependentModels[t.axis][e];i&&i.get("type")===o||(a=!1)},this),a},_setDefaultThrottle:function(t){if(t.hasOwnProperty("throttle")&&(this._autoThrottle=!1),this._autoThrottle){var e=this.ecModel.option;this.option.throttle=e.animation&&0<e.animationDurationUpdate?100:20}},getFirstTargetAxisModel:function(){var i;return FA(function(t){if(null==i){var e=this.get(t.axisIndex);e.length&&(i=this.dependentModels[t.axis][e[0]])}},this),i},eachTargetAxis:function(i,n){var o=this.ecModel;FA(function(e){GA(this.get(e.axisIndex),function(t){i.call(n,e,t,this,o)},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(e){var i=this.option,n=this.settledOption;GA([["start","startValue"],["end","endValue"]],function(t){null==e[t[0]]&&null==e[t[1]]||(i[t[0]]=n[t[0]]=e[t[0]],i[t[1]]=n[t[1]]=e[t[1]])},this),ZA(this,e)},setCalculatedRange:function(e){var i=this.option;GA(["start","startValue","end","endValue"],function(t){i[t]=e[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()}});function HA(e){var i={};return GA(["start","end","startValue","endValue","throttle"],function(t){e.hasOwnProperty(t)&&(i[t]=e[t])}),i}function ZA(t,o){var a=t._rangePropMode,r=t.get("rangeMode");GA([["start","startValue"],["end","endValue"]],function(t,e){var i=null!=o[t[0]],n=null!=o[t[1]];i&&!n?a[e]="percent":!i&&n?a[e]="value":r?a[e]=r[e]:i&&(a[e]="percent")})}var UA=hc.extend({type:"dataZoom",render:function(t,e,i,n){this.dataZoomModel=t,this.ecModel=e,this.api=i},getTargetCoordInfo:function(){var t=this.dataZoomModel,o=this.ecModel,a={};return t.eachTargetAxis(function(t,e){var i=o.getComponent(t.axis,e);if(i){var n=i.getCoordSysModel();n&&function(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)}(n,i,a[n.mainType]||(a[n.mainType]=[]),n.componentIndex)}},this),a}});WA.extend({type:"dataZoom.select"}),UA.extend({type:"dataZoom.select"}),pf({getTargetSeries:function(t){var n=Q();return t.eachComponent("dataZoom",function(t){t.eachTargetAxis(function(t,e,i){E(i.getAxisProxy(t.name,e).getTargetSeriesModels(),function(t){n.set(t.uid,t)})})}),n},modifyOutputEnd:!0,overallReset:function(t,n){t.eachComponent("dataZoom",function(t){t.eachTargetAxis(function(t,e,i){i.getAxisProxy(t.name,e).reset(i,n)}),t.eachTargetAxis(function(t,e,i){i.getAxisProxy(t.name,e).filterData(i,n)})}),t.eachComponent("dataZoom",function(t){var e=t.findRepresentativeAxisProxy(),i=e.getDataPercentWindow(),n=e.getDataValueWindow();t.setCalculatedRange({start:i[0],end:i[1],startValue:n[0],endValue:n[1]})})}}),gf("dataZoom",function(i,t){var n=EA(A(t.eachComponent,t,"dataZoom"),OA,function(t,e){return t.get(e.axisIndex)}),o=[];t.eachComponent({mainType:"dataZoom",query:i},function(t,e){o.push.apply(o,n(t).nodes)}),E(o,function(t,e){t.setRawRange({start:i.start,end:i.end,startValue:i.startValue,endValue:i.endValue})})});var XA=Cc.toolbox.dataZoom,YA=E;function jA(t,e,i){(this._brushController=new gb(i.getZr())).on("brush",A(this._onBrush,this)).mount(),this._isZoomActive}jA.defaultOption={show:!0,filterMode:"filter",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:D(XA.title)};var qA=jA.prototype;qA.render=function(t,e,i,n){this.model=t,this.ecModel=e,this.api=i,function(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 pA($A(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)"}})}(t,e,this,n,i),function(t,e){t.setIconStatus("back",1<function(t){return DA(t).length}(e)?"emphasis":"normal")}(t,e)},qA.onclick=function(t,e,i){KA[i].call(this)},qA.remove=function(t,e){this._brushController.unmount()},qA.dispose=function(t,e){this._brushController.dispose()};var KA={zoom:function(){var t=!this._isZoomActive;this.api.dispatchAction({type:"takeGlobalCursor",key:"dataZoomSelect",dataZoomSelectActive:t})},back:function(){this._dispatchZoomAction(function(t){var n=DA(t),e=n[n.length-1];1<n.length&&n.pop();var o={};return TA(e,function(t,e){for(var i=n.length-1;0<=i;i--){if(t=n[i][e]){o[e]=t;break}}}),o}(this.ecModel))}};function $A(e){var i={};return E(["xAxisIndex","yAxisIndex"],function(t){i[t]=e[t],null==i[t]&&(i[t]="all"),!1!==i[t]&&"none"!==i[t]||(i[t]=[])}),i}qA._onBrush=function(t,e){if(e.isEnd&&t.length){var s={},l=this.ecModel;this._brushController.updateCovers([]),new pA($A(this.model.option),l,{include:["grid"]}).matchOutputRanges(t,l,function(t,e,i){if("cartesian2d"===i.type){var n=t.brushType;"rect"===n?(o("x",i,e[0]),o("y",i,e[1])):o({lineX:"x",lineY:"y"}[n],i,e)}}),function(a,t){var r=DA(a);TA(t,function(t,e){for(var i=r.length-1;0<=i;i--){if(r[i][e])break}if(i<0){var n=a.queryComponents({mainType:"dataZoom",subType:"select",id:e})[0];if(n){var o=n.getPercentRange();r[0][e]={dataZoomId:e,start:o[0],end:o[1]}}}}),r.push(t)}(l,s),this._dispatchZoomAction(s)}function o(t,e,i){var n=e.getAxis(t),o=n.model,a=function(e,i,t){var n;return t.eachComponent({mainType:"dataZoom",subType:"select"},function(t){t.getAxisModel(e,i.componentIndex)&&(n=t)}),n}(t,o,l),r=a.findRepresentativeAxisProxy(o).getMinMaxSpan();null==r.minValueSpan&&null==r.maxValueSpan||(i=Ww(0,i.slice(),n.scale.getExtent(),0,r.minValueSpan,r.maxValueSpan)),a&&(s[a.id]={dataZoomId:a.id,startValue:i[0],endValue:i[1]})}},qA._dispatchZoomAction=function(t){var i=[];YA(t,function(t,e){i.push(D(t))}),i.length&&this.api.dispatchAction({type:"dataZoom",from:this.uid,batch:i})},HT("dataZoom",jA),ff(function(s){if(s){var l=s.dataZoom||(s.dataZoom=[]);k(l)||(s.dataZoom=l=[l]);var t=s.toolbox;if(t&&(k(t)&&(t=t[0]),t&&t.feature)){var e=t.feature.dataZoom;i("xAxis",e),i("yAxis",e)}}function i(n,o){if(o){var a=n+"Index",r=o[a];null==r||"all"===r||k(r)||(r=!1===r||"none"===r?[]:[r]),function(t,e){var i=s[t];k(i)||(i=i?[i]:[]);YA(i,e)}(n,function(t,e){if(null==r||"all"===r||-1!==_(r,e)){var i={type:"select",$fromToolbox:!0,filterMode:o.filterMode||"filter",id:"\0_ec_\0toolbox-dataZoom_"+n+e};i[a]=e,l.push(i)}})}}});var JA=Cc.toolbox.restore;function QA(t){this.model=t}QA.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:JA.title},QA.prototype.onclick=function(t,e,i){!function(t){t[AA]=null}(t),e.dispatchAction({type:"restore",from:this.uid})},HT("restore",QA),gf({type:"restore",event:"restore",update:"prepareAndUpdate"},function(t,e){e.resetOption("recreate")}),wf({type:"tooltip",dependencies:["axisPointer"],defaultOption:{zlevel:0,z:60,show:!0,showContent:!0,trigger:"item",triggerOn:"mousemove|click",alwaysShowContent:!1,displayMode:"single",renderMode:"auto",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 tD=E,eD=$l,iD=["","-webkit-","-moz-","-o-"];function nD(o){var a=[],t=o.get("transitionDuration"),e=o.get("backgroundColor"),i=o.getModel("textStyle"),n=o.get("padding");return t&&a.push(function(t){var e="cubic-bezier(0.23, 1, 0.32, 1)",i="left "+t+"s "+e+",top "+t+"s "+e;return N(iD,function(t){return t+"transition:"+i}).join(";")}(t)),e&&(v.canvasSupported?a.push("background-Color:"+e):(a.push("background-Color:#"+Ge(e)),a.push("filter:alpha(opacity=70)"))),tD(["width","color","radius"],function(t){var e="border-"+t,i=eD(e),n=o.get(i);null!=n&&a.push(e+":"+n+("color"===t?"":"px"))}),a.push(function(i){var n=[],t=i.get("fontSize"),e=i.getTextColor();return e&&n.push("color:"+e),n.push("font:"+i.getFont()),t&&n.push("line-height:"+Math.round(3*t/2)+"px"),tD(["decoration","align"],function(t){var e=i.get(t);e&&n.push("text-"+t+":"+e)}),n.join(";")}(i)),null!=n&&a.push("padding:"+Jl(n).join("px ")+"px"),a.join(";")+";"}function oD(i,t){if(v.wxa)return null;var e=document.createElement("div"),n=this._zr=t.getZr();this.el=e,this._x=t.getWidth()/2,this._y=t.getHeight()/2,i.appendChild(e),this._container=i,this._show=!1,this._hideTimeout;var o=this;e.onmouseenter=function(){o._enterable&&(clearTimeout(o._hideTimeout),o._show=!0),o._inContent=!0},e.onmousemove=function(t){if(t=t||window.event,!o._enterable){var e=n.handler;Gt(i,t,!0),e.dispatch("mousemove",t)}},e.onmouseleave=function(){o._enterable&&o._show&&o.hideLater(o._hideDelay),o._inContent=!1}}function aD(t){this._zr=t.getZr(),this._show=!1,this._hideTimeout}oD.prototype={constructor:oD,_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;"+nD(t)+";left:"+this._x+"px;top:"+this._y+"px;"+(t.get("extraCssText")||""),e.style.display=e.innerHTML?"block":"none",e.style.pointerEvents=this._enterable?"auto":"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(A(this.hide,this),t)):this.hide())},isShow:function(){return this._show},getOuterSize:function(){var t=this.el.clientWidth,e=this.el.clientHeight;if(document.defaultView&&document.defaultView.getComputedStyle){var i=document.defaultView.getComputedStyle(this.el);i&&(t+=parseInt(i.borderLeftWidth,10)+parseInt(i.borderRightWidth,10),e+=parseInt(i.borderTopWidth,10)+parseInt(i.borderBottomWidth,10))}return{width:t,height:e}}},aD.prototype={constructor:aD,_enterable:!0,update:function(){},show:function(t){this._hideTimeout&&clearTimeout(this._hideTimeout),this.el.attr("show",!0),this._show=!0},setContent:function(t,e,i){this.el&&this._zr.remove(this.el);for(var n={},o=t,a="{marker",r=o.indexOf(a);0<=r;){var s=o.indexOf("|}"),l=o.substr(r+a.length,s-r-a.length);-1<l.indexOf("sub")?n["marker"+l]={textWidth:4,textHeight:4,textBorderRadius:2,textBackgroundColor:e[l],textOffset:[3,0]}:n["marker"+l]={textWidth:10,textHeight:10,textBorderRadius:5,textBackgroundColor:e[l]},r=(o=o.substr(s+1)).indexOf("{marker")}this.el=new Fr({style:{rich:n,text:t,textLineHeight:20,textBackgroundColor:i.get("backgroundColor"),textBorderRadius:i.get("borderRadius"),textFill:i.get("textStyle.color"),textPadding:i.get("padding")},z:i.get("z")}),this._zr.add(this.el);var u=this;this.el.on("mouseover",function(){u._enterable&&(clearTimeout(u._hideTimeout),u._show=!0),u._inContent=!0}),this.el.on("mouseout",function(){u._enterable&&u._show&&u.hideLater(u._hideDelay),u._inContent=!1})},setEnterable:function(t){this._enterable=t},getSize:function(){var t=this.el.getBoundingRect();return[t.width,t.height]},moveTo:function(t,e){this.el&&this.el.attr("position",[t,e])},hide:function(){this.el&&this.el.hide(),this._show=!1},hideLater:function(t){!this._show||this._inContent&&this._enterable||(t?(this._hideDelay=t,this._show=!1,this._hideTimeout=setTimeout(A(this.hide,this),t)):this.hide())},isShow:function(){return this._show},getOuterSize:function(){var t=this.getSize();return{width:t[0],height:t[1]}}};var rD=A,sD=E,lD=Pl,uD=new is({shape:{x:-1,y:-1,width:2,height:2}});function hD(t){for(var e=t.pop();t.length;){var i=t.pop();i&&(Il.isInstance(i)&&(i=i.get("tooltip",!0)),"string"==typeof i&&(i={formatter:i}),e=new Il(i,e,e.ecModel))}return e}function cD(t,e){return t.dispatchAction||A(e.dispatchAction,e)}function dD(t){return"center"===t||"middle"===t}bf({type:"tooltip",init:function(t,e){if(!v.node){var i,n=t.getComponent("tooltip").get("renderMode");this._renderMode=qo(n),"html"===this._renderMode?(i=new oD(e.getDom(),e),this._newLine="<br/>"):(i=new aD(e),this._newLine="\n"),this._tooltipContent=i}},render:function(t,e,i){if(!v.node){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 n=this._tooltipModel.get("triggerOn");QM("itemTooltip",this._api,rD(function(t,e,i){"none"!==n&&(0<=n.indexOf(t)?this._tryShow(e,i):"leave"===t&&this._hide(i))},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(){i.isDisposed()||n.manuallyShowTip(t,e,i,{x:n._lastX,y:n._lastY})})}},manuallyShowTip:function(t,e,i,n){if(n.from!==this.uid&&!v.node){var o=cD(n,i);this._ticket="";var a=n.dataByCoordSys;if(n.tooltip&&null!=n.x&&null!=n.y){var r=uD;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=WM(n,e),l=s.point[0],u=s.point[1];null!=l&&null!=u&&this._tryShow({offsetX:l,offsetY:u,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(cD(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)if("axis"===(t=hD([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=A(e,this),clearTimeout(this._showTimout),0<i?this._showTimout=setTimeout(e,i):e()},_showAxisTooltip:function(t,e){var d=this._ecModel,i=this._tooltipModel,n=[e.offsetX,e.offsetY],o=[],f=[],a=hD([e.tooltipOption,i]),p=this._renderMode,r=this._newLine,g={};sD(t,function(t){sD(t.dataByAxis,function(s){var l=d.getComponent(s.axisDim+"Axis",s.axisIndex),u=s.value,h=[];if(l&&null!=u){var c=pI(u,l.axis,d,s.seriesDataIndices,s.valueLabelOpt);E(s.seriesDataIndices,function(t){var e=d.getSeriesByIndex(t.seriesIndex),i=t.dataIndexInside,n=e&&e.getDataParams(i);if(n.axisDim=s.axisDim,n.axisIndex=s.axisIndex,n.axisType=s.axisType,n.axisId=s.axisId,n.axisValue=og(l.axis,u),n.axisValueLabel=c,n){f.push(n);var o,a=e.formatTooltip(i,!0,null,p);if(R(a)){o=a.html;var r=a.markers;m(g,r)}else o=a;h.push(o)}});var t=c;"html"!==p?o.push(h.join(r)):o.push((t?eu(t)+r:"")+h.join(r))}})},this),o.reverse(),o=o.join(this._newLine+this._newLine);var s=e.position;this._showOrMove(a,function(){this._updateContentNotChangedOnAxis(t)?this._updatePosition(a,s,n[0],n[1],this._tooltipContent,f):this._showTooltipContent(a,o,f,Math.random(),n[0],n[1],s,void 0,g)})},_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,u=r.getData(),h=hD([u.getItemModel(s),r,a&&(a.coordinateSystem||{}).model,this._tooltipModel]),c=h.get("trigger");if(null==c||"item"===c){var d,f,p=r.getDataParams(s,l),g=r.formatTooltip(s,!1,l,this._renderMode);f=R(g)?(d=g.html,g.markers):(d=g,null);var m="item_"+r.name+"_"+s;this._showOrMove(h,function(){this._showTooltipContent(h,d,p,m,t.offsetX,t.offsetY,t.position,t.target,f)}),i({type:"showTip",dataIndexInside:s,dataIndex:u.getRawIndex(s),seriesIndex:o,from:this.uid})}},_showComponentItemTooltip:function(t,e,i){var n=e.tooltip;if("string"==typeof n){n={content:n,formatter:n}}var o=new Il(n,this._tooltipModel,this._ecModel),a=o.get("content"),r=Math.random();this._showOrMove(o,function(){this._showTooltipContent(o,a,o.get("formatterParams")||{},r,t.offsetX,t.offsetY,t.position,e)}),i({type:"showTip",from:this.uid})},_showTooltipContent:function(i,t,n,e,o,a,r,s,l){if(this._ticket="",i.get("showContent")&&i.get("show")){var u=this._tooltipContent,h=i.get("formatter");r=r||i.get("position");var c=t;if(h&&"string"==typeof h)c=ou(h,n,!0);else if("function"==typeof h){var d=rD(function(t,e){t===this._ticket&&(u.setContent(e,l,i),this._updatePosition(i,r,o,a,u,n,s))},this);this._ticket=e,c=h(n,e,d)}u.setContent(c,l,i),u.show(i),this._updatePosition(i,r,o,a,u,n,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 u=o.getSize(),h=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:u.slice()})),k(e))i=lD(e[0],s),n=lD(e[1],l);else if(R(e)){e.width=u[0],e.height=u[1];var f=vu(e,{width:s,height:l});i=f.x,n=f.y,c=h=null}else if("string"==typeof e&&r){i=(p=function(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]}(e,d,u))[0],n=p[1]}else{var p;i=(p=function(t,e,i,n,o,a,r){var s=i.getOuterSize(),l=s.width,u=s.height;null!=a&&(n<t+l+a?t-=l+a:t+=a);null!=r&&(o<e+u+r?e-=u+r:e+=r);return[t,e]}(i,n,o,s,l,h?null:20,c?null:20))[0],n=p[1]}h&&(i-=dD(h)?u[0]/2:"right"===h?u[0]:0),c&&(n-=dD(c)?u[1]/2:"bottom"===c?u[1]:0),t.get("confine")&&(i=(p=function(t,e,i,n,o){var a=i.getOuterSize(),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]}(i,n,o,s,l))[0],n=p[1]);o.moveTo(i,n)},_updateContentNotChangedOnAxis:function(n){var t=this._lastDataByCoordSys,r=!!t&&t.length===n.length;return r&&sD(t,function(t,e){var i=t.dataByAxis||{},a=(n[e]||{}).dataByAxis||[];(r&=i.length===a.length)&&sD(i,function(t,e){var i=a[e]||{},n=t.seriesDataIndices||[],o=i.seriesDataIndices||[];(r&=t.value===i.value&&t.axisType===i.axisType&&t.axisId===i.axisId&&n.length===o.length)&&sD(n,function(t,e){var i=o[e];r&=t.seriesIndex===i.seriesIndex&&t.dataIndex===i.dataIndex})})}),this._lastDataByCoordSys=n,!!r},_hide:function(t){this._lastDataByCoordSys=null,t({type:"hideTip",from:this.uid})},dispose:function(t,e){v.node||(this._tooltipContent.hide(),iI("itemTooltip",e))}}),gf({type:"showTip",event:"showTip",update:"tooltip:manuallyShowTip"},function(){}),gf({type:"hideTip",event:"hideTip",update:"tooltip:manuallyHideTip"},function(){});var fD=["rect","polygon","keep","clear"];var pD=E;function gD(t){if(t)for(var e in t)if(t.hasOwnProperty(e))return!0}function mD(t,e,a){var i={};return pD(e,function(n){var o=i[n]=function(){function t(){}return t.prototype.__hidden=t.prototype,new t}();pD(t[n],function(t,e){if(a_.isValidType(e)){var i={type:e,visual:t};a&&a(i,n),o[e]=new a_(i),"opacity"===e&&((i=D(i)).type="colorAlpha",o.__hidden.__alphaForOpacity=new a_(i))}})}),i}function vD(e,i,t){var n;E(t,function(t){i.hasOwnProperty(t)&&gD(i[t])&&(n=!0)}),n&&E(t,function(t){i.hasOwnProperty(t)&&gD(i[t])?e[t]=D(i[t]):delete e[t]})}var yD={lineX:xD(0),lineY:xD(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])&&wg(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!!(wg(n,o,a)||wg(n,o+r,a)||wg(n,o,a+s)||wg(n,o+r,a+s)||Mi.create(t).contain(l[0],l[1])||gl(o,a,o+r,a,n)||gl(o,a,o,a+s,n)||gl(o+r,a,o+r,a+s,n)||gl(o,a+s,o+r,a+s,n))||void 0}}};function xD(a){var r=["x","y"],s=["width","height"];return{point:function(t,e,i){if(t){var n=i.range;return _D(t[a],n)}},rect:function(t,e,i){if(t){var n=i.range,o=[t[r[a]],t[r[a]]+t[s[a]]];return o[1]<o[0]&&o.reverse(),_D(o[0],n)||_D(o[1],n)||_D(n[0],o)||_D(n[1],o)}}}}function _D(t,e){return e[0]<=t&&t<=e[1]}var wD=["inBrush","outOfBrush"],bD="__ecBrushSelect",SD="__ecInBrushSelectEvent",MD=Id.VISUAL.BRUSH;function ID(t,e){if(!t.isDisposed()){var i=t.getZr();i[SD]=!0,t.dispatchAction({type:"brushSelect",batch:e}),i[SD]=!1}}function TD(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 AD(t){var r=t.brushSelector;if(z(r)){var e=[];return E(yD,function(a,t){e[t]=function(t,e,i,n){var o=e.getItemLayout(t);return a[r](o,i,n)}}),e}if(O(r)){var i={};return E(yD,function(t,e){i[e]=r}),i}return r}vf(MD,function(e,t,i){e.eachComponent({mainType:"brush"},function(t){i&&"takeGlobalCursor"===i.type&&t.setBrushOption("brush"===i.key?i.brushOption:{brushType:!1}),(t.brushTargetManager=new pA(t.option,e)).setInputRanges(t.areas,e)})}),yf(MD,function(p,t,e){var o,g,m=[];p.eachComponent({mainType:"brush"},function(a,t){var s={brushId:a.id,brushIndex:t,brushName:a.name,areas:D(a.areas),selected:[]};m.push(s);var e=a.option,i=e.brushLink,n=[],l=[],u=[],h=0;t||(o=e.throttleType,g=e.throttleDelay);var r=N(a.areas,function(t){return function(i){var n=i.selectors={};return E(yD[i.brushType],function(e,t){n[t]=function(t){return e(t,n,i)}}),i}(C({boundingRect:DD[t.brushType](t)},t))}),c=mD(a.option,wD,function(t){t.mappingMethod="fixed"});function d(t){return"all"===i||n[t]}function f(t){return!!t.length}k(i)&&E(i,function(t){n[t]=1}),p.eachSeries(function(t,e){var i=u[e]=[];"parallel"===t.subType?function(t,e){var i=t.coordinateSystem;h|=i.hasAxisBrushed(),d(e)&&i.eachActiveState(t.getData(),function(t,e){"active"===t&&(l[e]=1)})}(t,e):function(e,t,i){var n=AD(e);if(!n||function(t,e){var i=t.option.seriesIndex;return null!=i&&"all"!==i&&(k(i)?_(i,e)<0:e!==i)}(a,t))return;if(E(r,function(t){n[t.brushType]&&a.brushTargetManager.controlSeries(t,e,p)&&i.push(t),h|=f(i)}),d(t)&&f(i)){var o=e.getData();o.each(function(t){TD(n,i,o,t)&&(l[t]=1)})}}(t,e,i)}),p.eachSeries(function(t,e){var i={seriesId:t.id,seriesIndex:e,seriesName:t.name,dataIndex:[]};s.selected.push(i);var n=AD(t),o=u[e],a=t.getData(),r=d(e)?function(t){return l[t]?(i.dataIndex.push(a.getRawIndex(t)),"inBrush"):"outOfBrush"}:function(t){return TD(n,o,a,t)?(i.dataIndex.push(a.getRawIndex(t)),"inBrush"):"outOfBrush"};(d(e)?h:f(o))&&function(t,u,h,c,d,f){var p,g={};function m(t){return h.getItemVisual(p,t)}function v(t,e){h.setItemVisual(p,t,e)}function e(t,e){p=null==f?t:e;var i=h.getRawDataItem(p);if(!i||!1!==i.visualMap)for(var n=c.call(d,t),o=u[n],a=g[n],r=0,s=a.length;r<s;r++){var l=a[r];o[l]&&o[l].applyVisual(t,m,v)}}E(t,function(t){var e=a_.prepareVisualTypes(u[t]);g[t]=e}),null==f?h.each(e):h.each([f],e)}(wD,c,a,r)})}),function(t,e,i,n,o){if(!o)return;var a=t.getZr();if(a[SD])return;a[bD]||(a[bD]=ID);Tc(a,bD,i,e)(t,n)}(t,o,g,m,e)});var DD={lineX:et,lineY:et,rect:function(t){return CD(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&&CD(e)}};function CD(t){return new Mi(t[0][0],t[1][0],t[0][1]-t[0][0],t[1][1]-t[1][0])}var LD=["#ddd"];wf({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||vD(i,t,["inBrush","outOfBrush"]);var n=i.inBrush=i.inBrush||{};i.outOfBrush=i.outOfBrush||{color:LD},n.hasOwnProperty("liftZ")||(n.liftZ=5)},setAreas:function(t){t&&(this.areas=N(t,function(t){return kD(this.option,t)},this))},setBrushOption:function(t){this.brushOption=kD(this.option,t),this.brushType=this.brushOption.brushType}});function kD(t,e){return m({brushType:t.brushType,brushMode:t.brushMode,transformable:t.transformable,brushStyle:new Il(t.brushStyle).getItemStyle(),removeOnClick:t.removeOnClick,z:t.z},e,!0)}function PD(t,e,i,n){n&&n.$from===t.id||this._brushController.setPanels(t.brushTargetManager.makePanelOpts(i)).enableBrush(t.brushOption).updateCovers(t.areas.slice())}bf({type:"brush",init:function(t,e){this.ecModel=t,this.api=e,this.model,(this._brushController=new gb(e.getZr())).on("brush",A(this._onBrush,this)).mount()},render:function(t){return this.model=t,PD.apply(this,arguments)},updateTransform:PD,updateView:PD,dispose:function(){this._brushController.dispose()},_onBrush:function(t,e){var i=this.model.id;this.model.brushTargetManager.setOutputRanges(t,this.ecModel),e.isEnd&&!e.removeOnClick||this.api.dispatchAction({type:"brush",brushId:i,areas:D(t),$from:i}),e.isEnd&&this.api.dispatchAction({type:"brushEnd",brushId:i,areas:D(t),$from:i})}}),gf({type:"brush",event:"brush"},function(e,t){t.eachComponent({mainType:"brush",query:e},function(t){t.setAreas(e.areas)})}),gf({type:"brushSelect",event:"brushSelected",update:"none"},function(){}),gf({type:"brushEnd",event:"brushEnd",update:"none"},function(){});var ND=Cc.toolbox.brush;function OD(t,e,i){this.model=t,this.ecModel=e,this.api=i,this._brushType,this._brushMode}OD.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:D(ND.title)};var ED=OD.prototype;ED.render=ED.updateView=function(e,t,i){var n,o,a;t.eachComponent({mainType:"brush"},function(t){n=t.brushType,o=t.brushOption.brushMode||"single",a|=t.areas.length}),this._brushType=n,this._brushMode=o,E(e.get("type",!0),function(t){e.setIconStatus(t,("keep"===t?"multiple"===o:"clear"===t?a:t===n)?"emphasis":"normal")})},ED.getIcons=function(){var t=this.model,e=t.get("icon",!0),i={};return E(t.get("type",!0),function(t){e[t]&&(i[t]=e[t])}),i},ED.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}})},HT("brush",OD),ff(function(t,e){var i=t&&t.brush;if(k(i)||(i=i?[i]:[]),i.length){var n=[];E(i,function(t){var e=t.hasOwnProperty("toolbox")?t.toolbox:[];e instanceof Array&&(n=n.concat(e))});var o=t&&t.toolbox;k(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),function(i){var e={};E(i,function(t){e[t]=1}),i.length=0,E(e,function(t,e){i.push(e)})}(s),e&&!s.length&&s.push.apply(s,fD)}}),wf({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"}}}),bf({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=H(t.get("textBaseline"),t.get("textVerticalAlign")),l=new Fr({style:Qs({},o,{text:t.get("text"),textFill:o.getTextColor()},{disableBox:!0}),z2:10}),u=l.getBoundingRect(),h=t.get("subtext"),c=new Fr({style:Qs({},a,{text:h,textFill:a.getTextColor(),y:u.height+t.get("itemGap"),textVerticalAlign:"top"},{disableBox:!0}),z2:10}),d=t.get("link"),f=t.get("sublink"),p=t.get("triggerEvent",!0);l.silent=!d&&!p,c.silent=!f&&!p,d&&l.on("click",function(){window.open(d,"_"+t.get("target"))}),f&&c.on("click",function(){window.open(f,"_"+t.get("subtarget"))}),l.eventData=c.eventData=p?{componentType:"title",componentIndex:t.componentIndex}:null,n.add(l),h&&n.add(c);var g=n.getBoundingRect(),m=t.getBoxLayoutParams();m.width=g.width,m.height=g.height;var v=vu(m,{width:i.getWidth(),height:i.getHeight()},t.get("padding"));r||("middle"===(r=t.get("left")||t.get("right"))&&(r="center"),"right"===r?v.x+=v.width:"center"===r&&(v.x+=v.width/2)),s||("center"===(s=t.get("top")||t.get("bottom"))&&(s="middle"),"bottom"===s?v.y+=v.height:"middle"===s&&(v.y+=v.height/2),s=s||"top"),n.attr("position",[v.x,v.y]);var y={textAlign:r,textVerticalAlign:s};l.setStyle(y),c.setStyle(y),g=n.getBoundingRect();var x=v.margin,_=t.getItemStyle(["color","opacity"]);_.fill=t.get("backgroundColor");var w=new is({shape:{x:g.x-x[3],y:g.y-x[0],width:g.width+x[1]+x[3],height:g.height+x[0]+x[2],r:t.get("borderRadius")},style:_,subPixelOptimize:!0,silent:!0});n.add(w)}}});function zD(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};E(n,function(t,e){a[e]||RD(o,e)||(o[e]=t)}),i.label&&!RD(n,"emphasis")&&(n.emphasis=i.label,delete i.label)}function RD(t,e){return t.hasOwnProperty(e)}Tu.registerSubTypeDefaulter("timeline",function(){return"slider"}),gf({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"),C({currentIndex:i.option.currentIndex},t)}),gf({type:"timelinePlayChange",event:"timelinePlayChanged",update:"update"},function(t,e){var i=e.getComponent("timeline");i&&null!=t.playState&&i.setPlayState(t.playState)});var BD=Tu.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){BD.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:(e<=t&&(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||[],i=t.axisType,o=this._names=[];if("category"===i){var a=[];E(e,function(t,e){var i,n=Bo(t);R(t)?(i=D(t)).value=e:i=e,a.push(i),z(n)||null!=n&&!isNaN(n)||(n=""),o.push(n+"")}),e=a}var n={category:"ordinal",time:"time"}[i]||"number";(this._data=new Wf([{name:"value",type:n}],this)).initData(e,o)},getData:function(){return this._data},getCategories:function(){if("category"===this.get("axisType"))return this._names.slice()}});b(BD.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:[]}}),Fh);function VD(t,e,i,n){Eg.call(this,t,e,i),this.type=n||"value",this.model=null}var GD=hc.extend({type:"timeline"});VD.prototype={constructor:VD,getLabelModel:function(){return this.model.getModel("label")},isHorizontal:function(){return"horizontal"===this.model.get("orient")}},w(VD,Eg);var FD=A,WD=E,HD=Math.PI;function ZD(t,e,i,n,o,a){var r=e.get("color");o?(o.setColor(r),i.add(o),a&&a.onUpdate(o)):((o=mg(t.get("symbol"),-1,-1,2,2,r)).setStyle("strokeNoScale",!0),i.add(o),a&&a.onCreate(o));var s=e.getItemStyle(["color","symbol","symbolSize"]);o.setStyle(s),n=m({rectHover:!0,z2:100},n,!0);var l=t.get("symbolSize");(l=l instanceof Array?l.slice():[+l,+l])[0]/=2,l[1]/=2,n.scale=l;var u=t.get("symbolOffset");if(u){var h=n.position=n.position||[0,0];h[0]+=Pl(u[0],l[0]),h[1]+=Pl(u[1],l[1])}var c=t.get("symbolRotate");return n.rotation=(c||0)*Math.PI/180||0,o.attr(n),o.updateTransform(),o}function UD(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)))}}GD.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(e,t,i,n){if(this.model=e,this.api=i,this.ecModel=t,this.group.removeAll(),e.get("show",!0)){var o=this._layout(e,i),a=this._createGroup("mainGroup"),r=this._createGroup("labelGroup"),s=this._axis=this._createAxis(o,e);e.formatTooltip=function(t){return eu(s.scale.getLabel(t))},WD(["AxisLine","AxisTick","Control","CurrentPointer"],function(t){this["_render"+t](o,a,s,e)},this),this._renderAxisLabel(o,r,s,e),this._position(o,e)}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=function(t,e){return vu(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()},t.get("padding"))}(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,r,s,l,u={horizontal:"center",vertical:0<=i||"+"===i?"left":"right"},h={horizontal:0<=i||"+"===i?"top":"bottom",vertical:"middle"},c={horizontal:0,vertical:HD/2},d="vertical"===n?o.height:o.width,f=t.getModel("controlStyle"),p=f.get("show",!0),g=p?f.get("itemSize"):0,m=p?f.get("itemGap"):0,v=g+m,y=t.get("label.rotate")||0;y=y*HD/180;var x=f.get("position",!0),_=p&&f.get("showPlayBtn",!0),w=p&&f.get("showPrevBtn",!0),b=p&&f.get("showNextBtn",!0),S=0,M=d;return"left"===x||"bottom"===x?(_&&(a=[0,0],S+=v),w&&(r=[S,0],S+=v)):(_&&(a=[M-g,0],M-=v),w&&(r=[0,0],S+=v)),b&&(s=[M-g,0],M-=v),l=[S,M],t.get("inverse")&&l.reverse(),{viewRect:o,mainLength:d,orient:n,rotation:c[n],labelRotation:y,labelPosOpt:i,labelAlign:t.get("label.align")||u[n],labelBaseline:t.get("label.verticalAlign")||t.get("label.baseline")||h[n],playPosition:a,prevBtnPosition:r,nextBtnPosition:s,axisExtent:l,controlSize:g,controlGap:m}},_position:function(t,e){var i=this._mainGroup,n=this._labelGroup,o=t.viewRect;if("vertical"===t.orient){var a=ee(),r=o.x,s=o.y+o.height;ae(a,a,[-r,-s]),re(a,a,-HD/2),ae(a,a,[r,s]),(o=o.clone()).applyTransform(a)}var l=m(o),u=m(i.getBoundingRect()),h=m(n.getBoundingRect()),c=i.position,d=n.position;d[0]=c[0]=l[0][0];var f,p=t.labelPosOpt;isNaN(p)?(v(c,u,l,1,f="+"===p?0:1),v(d,h,l,1,1-f)):(v(c,u,l,1,f=0<=p?0:1),d[1]=c[1]+p);function g(t){var e=t.position;t.origin=[l[0][0]-e[0],l[1][0]-e[1]]}function m(t){return[[t.x,t.x+t.width],[t.y,t.y+t.height]]}function v(t,e,i,n,o){t[n]+=i[n][o]-e[n][o]}i.attr("position",c),n.attr("position",d),i.rotation=n.rotation=t.rotation,g(i),g(n)},_createAxis:function(t,e){var i=e.getData(),n=e.get("axisType"),o=ig(e,n);o.getTicks=function(){return i.mapArray(["value"],function(t){return t})};var a=i.getDataExtent("value");o.setExtent(a[0],a[1]),o.niceTicks();var r=new VD("value",o,t.axisExtent,n);return r.model=e,r},_createGroup:function(t){var e=this["_"+t]=new Ii;return this.group.add(e),e},_renderAxisLine:function(t,e,i,n){var o=i.getExtent();n.get("lineStyle.show")&&e.add(new os({shape:{x1:o[0],y1:0,x2:o[1],y2:0},style:L({lineCap:"round"},n.getModel("lineStyle").getLineStyle()),silent:!0,z2:1}))},_renderAxisTick:function(t,s,l,u){var h=u.getData(),e=l.scale.getTicks();WD(e,function(t){var e=l.dataToCoord(t),i=h.getItemModel(t),n=i.getModel("itemStyle"),o=i.getModel("emphasis.itemStyle"),a={position:[e,0],onclick:FD(this._changeTimeline,this,t)},r=ZD(i,n,s,a);Ys(r,o.getItemStyle()),i.get("tooltip")?(r.dataIndex=t,r.dataModel=u):r.dataIndex=r.dataModel=null},this)},_renderAxisLabel:function(s,l,u,t){if(u.getLabelModel().get("show")){var h=t.getData(),e=u.getViewLabels();WD(e,function(t){var e=t.tickValue,i=h.getItemModel(e),n=i.getModel("label"),o=i.getModel("emphasis.label"),a=u.dataToCoord(t.tickValue),r=new Fr({position:[a,0],rotation:s.labelRotation-s.rotation,onclick:FD(this._changeTimeline,this,e),silent:!1});Qs(r.style,n,{text:t.formattedLabel,textAlign:s.labelAlign,textVerticalAlign:s.labelBaseline}),l.add(r),Ys(r,Qs({},o))},this)}},_renderControl:function(t,a,e,r){var s=t.controlSize,l=t.rotation,u=r.getModel("controlStyle").getItemStyle(),h=r.getModel("emphasis.controlStyle").getItemStyle(),c=[0,-s/2,s,s],i=r.getPlayState(),n=r.get("inverse",!0);function o(t,e,i,n){if(t){var o=function(t,e,i,n){return Ds(t.get(e).replace(/^path:\/\//,""),D(n||{}),new Mi(i[0],i[1],i[2],i[3]),"center")}(r,e,c,{position:t,origin:[s/2,0],rotation:n?-l:0,rectHover:!0,style:u,onclick:i});a.add(o),Ys(o,h)}}o(t.nextBtnPosition,"controlStyle.nextIcon",FD(this._changeTimeline,this,n?"-":"+")),o(t.prevBtnPosition,"controlStyle.prevIcon",FD(this._changeTimeline,this,n?"+":"-")),o(t.playPosition,"controlStyle."+(i?"stopIcon":"playIcon"),FD(this._handlePlayClick,this,!i),!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=FD(s._handlePointerDrag,s),t.ondragend=FD(s._handlePointerDragend,s),UD(t,a,i,n,!0)},onUpdate:function(t){UD(t,a,i,n)}};this._currentPointer=ZD(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=Ol(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(FD(function(){var t=this.model;this._changeTimeline(t.getCurrentIndex()+(t.get("rewind",!0)?-1:1))},this),this.model.get("playInterval")))},_toAxisCoord:function(t){return hl(t,this._mainGroup.getLocalTransform(),!0)},_findNearestTick:function(o){var a,t=this.model.getData(),r=1/0,s=this._axis;return t.each(["value"],function(t,e){var i=s.dataToCoord(t),n=Math.abs(i-o);n<r&&(r=n,a=e)}),a},_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})}}),ff(function(t){var e=t&&t.timeline;k(e)||(e=e?[e]:[]),E(e,function(t){t&&function(t){var e=t.type,i={number:"value",time:"time"};i[e]&&(t.axisType=i[e],delete t.type);if(zD(t),RD(t,"controlPosition")){var n=t.controlStyle||(t.controlStyle={});RD(n,"position")||(n.position=t.controlPosition),"none"!==n.position||RD(n,"show")||(n.show=!1,delete n.position),delete t.controlPosition}E(t.data||[],function(t){R(t)&&!k(t)&&(!RD(t,"value")&&RD(t,"name")&&(t.value=t.name),zD(t))})}(t)})});var XD=Kl,YD=eu;function jD(t){zo(t,"label",["show"])}var qD=wf({type:"marker",dependencies:["series","grid","polar","geo"],init:function(t,e,i){this.mergeDefaultAndTheme(t,i),this._mergeOption(t,i,!1,!0)},isAnimationEnabled:function(){if(v.node)return!1;var t=this.__hostSeries;return this.getShallow("animation")&&t&&t.isAnimationEnabled()},mergeOption:function(t,e){this._mergeOption(t,e,!1,!1)},_mergeOption:function(t,n,e,o){var a=this.constructor,r=this.mainType+"Model";e||n.eachSeries(function(t){var e=t.get(this.mainType,!0),i=t[r];e&&e.data?(i?i._mergeOption(e,n,!0):(o&&jD(e),E(e.data,function(t){t instanceof Array?(jD(t[0]),jD(t[1])):jD(t)}),L(i=new a(e,this,n),{mainType:this.mainType,seriesIndex:t.seriesIndex,name:t.name,createdBySelf:!0}),i.__hostSeries=t),t[r]=i):t[r]=null},this)},formatTooltip:function(t){var e=this.getData(),i=this.getRawValue(t),n=k(i)?N(i,XD).join(", "):XD(i),o=e.getName(t),a=YD(this.name);return null==i&&!o||(a+="<br />"),o&&(a+=YD(o),null!=i&&(a+=" : ")),null!=i&&(a+=YD(n)),a},getData:function(){return this._data},setData:function(t){this._data=t}});b(qD,Fh),qD.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 KD=_;function $D(t,e,i,n,o,a){var r=[],s=lp(e,n)?e.getCalculationInfo("stackResultDimension"):n,l=oC(e,s,t),u=e.indicesOfNearest(s,l)[0];r[o]=e.get(i,u),r[a]=e.get(n,u);var h=El(e.get(n,u));return 0<=(h=Math.min(h,20))&&(r[a]=+r[a].toFixed(h)),r}var JD=T,QD={min:JD($D,"min"),max:JD($D,"max"),average:JD($D,"average")};function tC(t,e){var i=t.getData(),n=t.coordinateSystem;if(e&&!function(t){return!isNaN(parseFloat(t.x))&&!isNaN(parseFloat(t.y))}(e)&&!k(e.coord)&&n){var o=n.dimensions,a=eC(e,i,n,t);if((e=D(e)).type&&QD[e.type]&&a.baseAxis&&a.valueAxis){var r=KD(o,a.baseAxis.dim),s=KD(o,a.valueAxis.dim);e.coord=QD[e.type](i,a.baseDataDim,a.valueDataDim,r,s),e.value=e.coord[s]}else{for(var l=[null!=e.xAxis?e.xAxis:e.radiusAxis,null!=e.yAxis?e.yAxis:e.angleAxis],u=0;u<2;u++)QD[l[u]]&&(l[u]=oC(i,i.mapDimension(o[u]),l[u]));e.coord=l}}return e}function eC(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(function(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}}(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 iC(t,e){return!(t&&t.containData&&e.coord&&!function(t){return!(isNaN(parseFloat(t.x))&&isNaN(parseFloat(t.y)))}(e))||t.containData(e.coord)}function nC(t,e,i,n){return n<2?t.coord&&t.coord[n]:t.value}function oC(t,e,i){if("average"!==i)return"median"===i?t.getMedian(e):t.getDataExtent(e,!0)["max"===i?1:0];var n=0,o=0;return t.each(e,function(t,e){isNaN(t)||(n+=t,o++)}),n/o}var aC=bf({type:"marker",init:function(){this.markerGroupMap=Q()},render:function(t,i,n){var e=this.markerGroupMap;e.each(function(t){t.__keep=!1});var o=this.type+"Model";i.eachSeries(function(t){var e=t[o];e&&this.renderSeries(t,e,i,n)},this),e.each(function(t){t.__keep||this.group.remove(t.group)},this)},renderSeries:function(){}});function rC(s,l,u){var h=l.coordinateSystem;s.each(function(t){var e,i=s.getItemModel(t),n=Pl(i.get("x"),u.getWidth()),o=Pl(i.get("y"),u.getHeight());if(isNaN(n)||isNaN(o)){if(l.getMarkerPosition)e=l.getMarkerPosition(s.getValues(s.dimensions,t));else if(h){var a=s.get(h.dimensions[0],t),r=s.get(h.dimensions[1],t);e=h.dataToPoint([a,r])}}else e=[n,o];isNaN(n)||(e[0]=n),isNaN(o)||(e[1]=o),s.setItemLayout(t,e)})}aC.extend({type:"markPoint",updateTransform:function(t,e,i){e.eachSeries(function(t){var e=t.markPointModel;e&&(rC(e.getData(),t,i),this.markerGroupMap.get(t.id).updateLayout(e))},this)},renderSeries:function(t,l,e,i){var n=t.coordinateSystem,o=t.id,u=t.getData(),a=this.markerGroupMap,r=a.get(o)||a.set(o,new $g),h=function(t,e,i){var n;n=t?N(t&&t.dimensions,function(t){return C({name:t},e.getData().getDimensionInfo(e.getData().mapDimension(t))||{})}):[{name:"value",type:"float"}];var o=new Wf(n,i),a=N(i.get("data"),T(tC,e));t&&(a=M(a,T(iC,t)));return o.initData(a,null,t?nC:function(t){return t.value}),o}(n,t,l);l.setData(h),rC(l.getData(),t,i),h.each(function(t){var e=h.getItemModel(t),i=e.getShallow("symbol"),n=e.getShallow("symbolSize"),o=O(i),a=O(n);if(o||a){var r=l.getRawValue(t),s=l.getDataParams(t);o&&(i=i(r,s)),a&&(n=n(r,s))}h.setItemVisual(t,{symbol:i,symbolSize:n,color:e.get("itemStyle.color")||u.getVisual("color")})}),r.updateData(h),this.group.add(r.group),h.eachItemGraphicEl(function(t){t.traverse(function(t){t.dataModel=l})}),r.__keep=!0,r.group.silent=l.get("silent")||t.get("silent")}}),ff(function(t){t.markPoint=t.markPoint||{}}),qD.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"}});function sC(t,e,i,n){var o=t.getData(),a=n.type;if(!k(n)&&("min"===a||"max"===a||"average"===a||"median"===a||null!=n.xAxis||null!=n.yAxis)){var r,s;if(null!=n.yAxis||null!=n.xAxis)r=e.getAxis(null!=n.yAxis?"y":"x"),s=W(n.yAxis,n.xAxis);else{var l=eC(n,o,e,t);r=l.valueAxis,s=oC(o,up(o,l.valueDataDim),a)}var u="x"===r.dim?0:1,h=1-u,c=D(n),d={};c.type=null,c.coord=[],d.coord=[],c.coord[h]=-1/0,d.coord[h]=1/0;var f=i.get("precision");0<=f&&"number"==typeof s&&(s=+s.toFixed(Math.min(f,20))),c.coord[u]=d.coord[u]=s,n=[c,d,{type:a,valueIndex:n.valueIndex,value:s}]}return(n=[tC(t,n[0]),tC(t,n[1]),L({},n[2])])[2].type=n[2].type||"",m(n[2],n[0]),m(n[2],n[1]),n}function lC(t){return!isNaN(t)&&!isFinite(t)}function uC(t,e,i,n){var o=1-t,a=n.dimensions[t];return lC(e[o])&&lC(i[o])&&e[t]===i[t]&&n.getAxis(a).containData(e[t])}function hC(t,e){if("cartesian2d"===t.type){var i=e[0].coord,n=e[1].coord;if(i&&n&&(uC(1,i,n,t)||uC(0,i,n,t)))return!0}return iC(t,e[0])&&iC(t,e[1])}function cC(t,e,i,n,o){var a,r=n.coordinateSystem,s=t.getItemModel(e),l=Pl(s.get("x"),o.getWidth()),u=Pl(s.get("y"),o.getHeight());if(isNaN(l)||isNaN(u)){if(n.getMarkerPosition)a=n.getMarkerPosition(t.getValues(t.dimensions,e));else{var h=r.dimensions,c=t.get(h[0],e),d=t.get(h[1],e);a=r.dataToPoint([c,d])}if("cartesian2d"===r.type){var f=r.getAxis("x"),p=r.getAxis("y");h=r.dimensions;lC(t.get(h[0],e))?a[0]=f.toGlobalCoord(f.getExtent()[i?0:1]):lC(t.get(h[1],e))&&(a[1]=p.toGlobalCoord(p.getExtent()[i?0:1]))}isNaN(l)||(a[0]=l),isNaN(u)||(a[1]=u)}else a=[l,u];t.setItemLayout(e,a)}aC.extend({type:"markLine",updateTransform:function(t,e,a){e.eachSeries(function(e){var t=e.markLineModel;if(t){var i=t.getData(),n=t.__from,o=t.__to;n.each(function(t){cC(n,t,!0,e,a),cC(o,t,!1,e,a)}),i.each(function(t){i.setItemLayout(t,[n.getItemLayout(t),o.getItemLayout(t)])}),this.markerGroupMap.get(e.id).updateLayout()}},this)},renderSeries:function(o,i,t,a){var e=o.coordinateSystem,n=o.id,r=o.getData(),s=this.markerGroupMap,l=s.get(n)||s.set(n,new ow);this.group.add(l.group);var u=function(t,e,i){var n;n=t?N(t&&t.dimensions,function(t){return C({name:t},e.getData().getDimensionInfo(e.getData().mapDimension(t))||{})}):[{name:"value",type:"float"}];var o=new Wf(n,i),a=new Wf(n,i),r=new Wf([],i),s=N(i.get("data"),T(sC,e,t,i));t&&(s=M(s,T(hC,t)));var l=t?nC:function(t){return t.value};return o.initData(N(s,function(t){return t[0]}),null,l),a.initData(N(s,function(t){return t[1]}),null,l),r.initData(N(s,function(t){return t[2]})),r.hasItemOption=!0,{from:o,to:a,line:r}}(e,o,i),h=u.from,c=u.to,d=u.line;i.__from=h,i.__to=c,i.setData(d);var f=i.get("symbol"),p=i.get("symbolSize");function g(t,e,i){var n=t.getItemModel(e);cC(t,e,i,o,a),t.setItemVisual(e,{symbolSize:n.get("symbolSize")||p[i?0:1],symbol:n.get("symbol",!0)||f[i?0:1],color:n.get("itemStyle.color")||r.getVisual("color")})}k(f)||(f=[f,f]),"number"==typeof p&&(p=[p,p]),u.from.each(function(t){g(h,t,!0),g(c,t,!1)}),d.each(function(t){var e=d.getItemModel(t).get("lineStyle.color");d.setItemVisual(t,{color:e||h.getItemVisual(t,"color")}),d.setItemLayout(t,[h.getItemLayout(t),c.getItemLayout(t)]),d.setItemVisual(t,{fromSymbolSize:h.getItemVisual(t,"symbolSize"),fromSymbol:h.getItemVisual(t,"symbol"),toSymbolSize:c.getItemVisual(t,"symbolSize"),toSymbol:c.getItemVisual(t,"symbol")})}),l.updateData(d),u.line.eachItemGraphicEl(function(t,e){t.traverse(function(t){t.dataModel=i})}),l.__keep=!0,l.group.silent=i.get("silent")||o.get("silent")}}),ff(function(t){t.markLine=t.markLine||{}}),qD.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"}}}});function dC(t,e,i,n){var o=tC(t,n[0]),a=tC(t,n[1]),r=W,s=o.coord,l=a.coord;s[0]=r(s[0],-1/0),s[1]=r(s[1],-1/0),l[0]=r(l[0],1/0),l[1]=r(l[1],1/0);var u=p([{},o,a]);return u.coord=[o.coord,a.coord],u.x0=o.x,u.y0=o.y,u.x1=a.x,u.y1=a.y,u}function fC(t){return!isNaN(t)&&!isFinite(t)}function pC(t,e,i){var n=1-t;return fC(e[n])&&fC(i[n])}function gC(t,e){var i=e.coord[0],n=e.coord[1];return!("cartesian2d"!==t.type||!i||!n||!pC(1,i,n)&&!pC(0,i,n))||(iC(t,{coord:i,x:e.x0,y:e.y0})||iC(t,{coord:n,x:e.x1,y:e.y1}))}function mC(t,e,i,n,o){var a,r=n.coordinateSystem,s=t.getItemModel(e),l=Pl(s.get(i[0]),o.getWidth()),u=Pl(s.get(i[1]),o.getHeight());if(isNaN(l)||isNaN(u)){if(n.getMarkerPosition)a=n.getMarkerPosition(t.getValues(i,e));else{var h=[f=t.get(i[0],e),p=t.get(i[1],e)];r.clampData&&r.clampData(h,h),a=r.dataToPoint(h,!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);fC(f)?a[0]=c.toGlobalCoord(c.getExtent()["x0"===i[0]?0:1]):fC(p)&&(a[1]=d.toGlobalCoord(d.getExtent()["y0"===i[1]?0:1]))}isNaN(l)||(a[0]=l),isNaN(u)||(a[1]=u)}else a=[l,u];return a}var vC=[["x0","y0"],["x1","y0"],["x1","y1"],["x0","y1"]];aC.extend({type:"markArea",updateTransform:function(t,e,o){e.eachSeries(function(i){var t=i.markAreaModel;if(t){var n=t.getData();n.each(function(e){var t=N(vC,function(t){return mC(n,e,t,i,o)});n.setItemLayout(e,t),n.getItemGraphicEl(e).setShape("points",t)})}},this)},renderSeries:function(i,r,t,n){var e=i.coordinateSystem,o=i.id,a=i.getData(),s=this.markerGroupMap,l=s.get(o)||s.set(o,{group:new Ii});this.group.add(l.group),l.__keep=!0;var u=function(t,i,e){var n,o;o=t?(n=N(t&&t.dimensions,function(t){var e=i.getData();return C({name:t},e.getDimensionInfo(e.mapDimension(t))||{})}),new Wf(N(["x0","y0","x1","y1"],function(t,e){return{name:t,type:n[e%2].type}}),e)):new Wf(n=[{name:"value",type:"float"}],e);var a=N(e.get("data"),T(dC,i,t,e));t&&(a=M(a,T(gC,t)));var r=t?function(t,e,i,n){return t.coord[Math.floor(n/2)][n%2]}:function(t){return t.value};return o.initData(a,null,r),o.hasItemOption=!0,o}(e,i,r);r.setData(u),u.each(function(e){u.setItemLayout(e,N(vC,function(t){return mC(u,e,t,i,n)})),u.setItemVisual(e,{color:a.getVisual("color")})}),u.diff(l.__data).add(function(t){var e=new qr({shape:{points:u.getItemLayout(t)}});u.setItemGraphicEl(t,e),l.group.add(e)}).update(function(t,e){var i=l.__data.getItemGraphicEl(e);sl(i,{shape:{points:u.getItemLayout(t)}},r,t),l.group.add(i),u.setItemGraphicEl(t,i)}).remove(function(t){var e=l.__data.getItemGraphicEl(t);l.group.remove(e)}).execute(),u.eachItemGraphicEl(function(t,e){var i=u.getItemModel(e),n=i.getModel("label"),o=i.getModel("emphasis.label"),a=u.getItemVisual(e,"color");t.useStyle(C(i.getModel("itemStyle").getItemStyle(),{fill:Xe(a,.4),stroke:a})),t.hoverStyle=i.getModel("emphasis.itemStyle").getItemStyle(),$s(t.style,t.hoverStyle,n,o,{labelFetcher:r,labelDataIndex:e,defaultText:u.getName(e)||"",isRectText:!0,autoColor:a}),Ys(t,{}),t.dataModel=r}),l.__data=u,l.group.silent=r.get("silent")||i.get("silent")}}),ff(function(t){t.markArea=t.markArea||{}});var yC=Cc.legend.selector,xC={all:{type:"all",title:D(yC.all)},inverse:{type:"inverse",title:D(yC.inverse)}},_C=wf({type:"legend.plain",dependencies:["series"],layoutMode:{type:"box",ignoreSize:!0},init:function(t,e,i){this.mergeDefaultAndTheme(t,i),t.selected=t.selected||{},this._updateSelector(t)},mergeOption:function(t){_C.superCall(this,"mergeOption",t),this._updateSelector(t)},_updateSelector:function(t){var i=t.selector;!0===i&&(i=t.selector=["all","inverse"]),k(i)&&E(i,function(t,e){z(t)&&(t={type:t}),i[e]=m(t,xC[t.type])})},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(o){var a=[],r=[];o.eachRawSeries(function(t){var e,i=t.name;if(r.push(i),t.legendVisualProvider){var n=t.legendVisualProvider.getAllNames();o.isSeriesFiltered(t)||(r=r.concat(n)),n.length?a=a.concat(n):e=!0}else e=!0;e&&Fo(t)&&a.push(t.name)}),this._availableNames=r;var t=N(this.get("data")||a,function(t){return"string"!=typeof t&&"number"!=typeof t||(t={name:t}),new Il(t,this,this.ecModel)},this);this._data=t},getData:function(){return this._data},select:function(t){var e=this.option.selected;"single"===this.get("selectedMode")&&E(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)},allSelect:function(){var t=this._data,e=this.option.selected;E(t,function(t){e[t.get("name",!0)]=!0})},inverseSelect:function(){var t=this._data,i=this.option.selected;E(t,function(t){var e=t.get("name",!0);i.hasOwnProperty(e)||(i[e]=!0),i[e]=!i[e]})},isSelected:function(t){var e=this.option.selected;return!(e.hasOwnProperty(t)&&!e[t])&&0<=_(this._availableNames,t)},getOrient:function(){return"vertical"===this.get("orient")?{index:1,name:"vertical"}:{index:0,name:"horizontal"}},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",inactiveBorderColor:"#ccc",itemStyle:{borderWidth:0},textStyle:{color:"#333"},selectedMode:!0,selector:!1,selectorLabel:{show:!0,borderRadius:10,padding:[3,5,3,5],fontSize:12,fontFamily:" sans-serif",color:"#666",borderWidth:1,borderColor:"#666"},emphasis:{selectorLabel:{show:!0,color:"#eee",backgroundColor:"#666"}},selectorPosition:"auto",selectorItemGap:7,selectorButtonGap:10,tooltip:{show:!1}}});function wC(t,e,i){var o,a={},r="toggleSelected"===t;return i.eachComponent("legend",function(n){r&&null!=o?n[o?"select":"unSelect"](e.name):"allSelect"===t||"inverseSelect"===t?n[t]():(n[t](e.name),o=n.isSelected(e.name)),E(n.getData(),function(t){var e=t.get("name");if("\n"!==e&&""!==e){var i=n.isSelected(e);a.hasOwnProperty(e)?a[e]=a[e]&&i:a[e]=i}})}),"allSelect"===t||"inverseSelect"===t?{selected:a}:{name:e.name,selected:a}}gf("legendToggleSelect","legendselectchanged",T(wC,"toggleSelected")),gf("legendAllSelect","legendselectall",T(wC,"allSelect")),gf("legendInverseSelect","legendinverseselect",T(wC,"inverseSelect")),gf("legendSelect","legendselected",T(wC,"select")),gf("legendUnSelect","legendunselected",T(wC,"unSelect"));var bC=T,SC=E,MC=Ii,IC=bf({type:"legend.plain",newlineDisabled:!1,init:function(){this.group.add(this._contentGroup=new MC),this._backgroundEl,this.group.add(this._selectorGroup=new MC),this._isFirstRender=!0},getContentGroup:function(){return this._contentGroup},getSelectorGroup:function(){return this._selectorGroup},render:function(t,e,i){var n=this._isFirstRender;if(this._isFirstRender=!1,this.resetInner(),t.get("show",!0)){var o=t.get("align"),a=t.get("orient");o&&"auto"!==o||(o="right"===t.get("left")&&"vertical"===a?"right":"left");var r=t.get("selector",!0),s=t.get("selectorPosition",!0);!r||s&&"auto"!==s||(s="horizontal"===a?"end":"start"),this.renderInner(o,t,e,i,r,a,s);var l=t.getBoxLayoutParams(),u={width:i.getWidth(),height:i.getHeight()},h=t.get("padding"),c=vu(l,u,h),d=this.layoutInner(t,o,c,n,r,s),f=vu(C({width:d.width,height:d.height},l),u,h);this.group.attr("position",[f.x-d.x,f.y-d.y]),this.group.add(this._backgroundEl=XT(d,t))}},resetInner:function(){this.getContentGroup().removeAll(),this._backgroundEl&&this.group.remove(this._backgroundEl),this.getSelectorGroup().removeAll()},renderInner:function(u,h,c,d,t,e,i){var f=this.getContentGroup(),p=Q(),g=h.get("selectedMode"),m=[];c.eachRawSeries(function(t){t.get("legendHoverLink")||m.push(t.id)}),SC(h.getData(),function(a,r){var s=a.get("name");if(this.newlineDisabled||""!==s&&"\n"!==s){var t=c.getSeriesByName(s)[0];if(!p.get(s))if(t){var e=t.getData(),i=e.getVisual("color"),n=e.getVisual("borderColor");"function"==typeof i&&(i=i(t.getDataParams(0))),"function"==typeof n&&(n=n(t.getDataParams(0)));var o=e.getVisual("legendSymbol")||"roundRect",l=e.getVisual("symbol");this._createItem(s,r,a,h,o,l,u,i,n,g).on("click",bC(AC,s,null,d,m)).on("mouseover",bC(DC,t.name,null,d,m)).on("mouseout",bC(CC,t.name,null,d,m)),p.set(s,!0)}else c.eachRawSeries(function(t){if(!p.get(s)&&t.legendVisualProvider){var e=t.legendVisualProvider;if(!e.containName(s))return;var i=e.indexOfName(s),n=e.getItemVisual(i,"color"),o=e.getItemVisual(i,"borderColor");this._createItem(s,r,a,h,"roundRect",null,u,n,o,g).on("click",bC(AC,null,s,d,m)).on("mouseover",bC(DC,null,s,d,m)).on("mouseout",bC(CC,null,s,d,m)),p.set(s,!0)}},this)}else f.add(new MC({newline:!0}))},this),t&&this._createSelector(t,h,d,e,i)},_createSelector:function(t,a,r,e,i){var s=this.getSelectorGroup();SC(t,function(t){!function(t){var e=t.type,i=new Fr({style:{x:0,y:0,align:"center",verticalAlign:"middle"},onclick:function(){r.dispatchAction({type:"all"===e?"legendAllSelect":"legendInverseSelect"})}});s.add(i);var n=a.getModel("selectorLabel"),o=a.getModel("emphasis.selectorLabel");$s(i.style,i.hoverStyle={},n,o,{defaultText:t.title,isRectText:!1}),Ys(i)}(t)})},_createItem:function(t,e,i,n,o,a,r,s,l,u){var h=n.get("itemWidth"),c=n.get("itemHeight"),d=n.get("inactiveColor"),f=n.get("inactiveBorderColor"),p=n.get("symbolKeepAspect"),g=n.getModel("itemStyle"),m=n.isSelected(t),v=new MC,y=i.getModel("textStyle"),x=i.get("icon"),_=i.getModel("tooltip"),w=_.parentModel,b=mg(o=x||o,0,0,h,c,m?s:d,null==p||p);if(v.add(TC(b,o,g,l,f,m)),!x&&a&&(a!==o||"none"===a)){var S=.8*c;"none"===a&&(a="circle");var M=mg(a,(h-S)/2,(c-S)/2,S,S,m?s:d,null==p||p);v.add(TC(M,a,g,l,f,m))}var I="left"===r?h+5:-5,T=r,A=n.get("formatter"),D=t;"string"==typeof A&&A?D=A.replace("{name}",null!=t?t:""):"function"==typeof A&&(D=A(t)),v.add(new Fr({style:Qs({},y,{text:D,x:I,y:c/2,textFill:m?y.getTextColor():d,textAlign:T,textVerticalAlign:"middle"})}));var C=new is({shape:v.getBoundingRect(),invisible:!0,tooltip:_.get("show")?L({content:t,formatter:w.get("formatter",!0)||function(){return t},formatterParams:{componentType:"legend",legendIndex:n.componentIndex,name:t,$vars:["name"]}},_.option):null});return v.add(C),v.eachChild(function(t){t.silent=!0}),C.silent=!u,this.getContentGroup().add(v),Ys(v),v.__legendDataIndex=e,v},layoutInner:function(t,e,i,n,o,a){var r=this.getContentGroup(),s=this.getSelectorGroup();mu(t.get("orient"),r,t.get("itemGap"),i.width,i.height);var l=r.getBoundingRect(),u=[-l.x,-l.y];if(o){mu("horizontal",s,t.get("selectorItemGap",!0));var h=s.getBoundingRect(),c=[-h.x,-h.y],d=t.get("selectorButtonGap",!0),f=t.getOrient().index,p=0===f?"width":"height",g=0===f?"height":"width",m=0===f?"y":"x";"end"===a?c[f]+=l[p]+d:u[f]+=h[p]+d,c[1-f]+=l[g]/2-h[g]/2,s.attr("position",c),r.attr("position",u);var v={x:0,y:0};return v[p]=l[p]+d+h[p],v[g]=Math.max(l[g],h[g]),v[m]=Math.min(0,h[m]+c[1-f]),v}return r.attr("position",u),this.group.getBoundingRect()},remove:function(){this.getContentGroup().removeAll(),this._isFirstRender=!0}});function TC(t,e,i,n,o,a){var r;return"line"!==e&&e.indexOf("empty")<0?(r=i.getItemStyle(),t.style.stroke=n,a||(r.stroke=o)):r=i.getItemStyle(["borderWidth","borderColor"]),t.setStyle(r)}function AC(t,e,i,n){CC(t,e,i,n),i.dispatchAction({type:"legendToggleSelect",name:null!=t?t:e}),DC(t,e,i,n)}function DC(t,e,i,n){var o=i.getZr().storage.getDisplayList()[0];o&&o.useHoverLayer||i.dispatchAction({type:"highlight",seriesName:t,name:e,excludeSeriesId:n})}function CC(t,e,i,n){var o=i.getZr().storage.getDisplayList()[0];o&&o.useHoverLayer||i.dispatchAction({type:"downplay",seriesName:t,name:e,excludeSeriesId:n})}pf(Id.PROCESSOR.SERIES_FILTER,function(t){var i=t.findComponents({mainType:"legend"});i&&i.length&&t.filterSeries(function(t){for(var e=0;e<i.length;e++)if(!i[e].isSelected(t.name))return!1;return!0})}),Tu.registerSubTypeDefaulter("legend",function(){return"plain"});var LC=_C.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=_u(t);LC.superCall(this,"init",t,e,i,n),kC(this,t,o)},mergeOption:function(t,e){LC.superCall(this,"mergeOption",t,e),kC(this,this.option,t)}});function kC(t,e,i){var n=[1,1];n[t.getOrient().index]=0,xu(e,i,{type:"box",ignoreSize:n})}var PC=Ii,NC=["width","height"],OC=["x","y"],EC=IC.extend({type:"legend.scroll",newlineDisabled:!0,init:function(){EC.superCall(this,"init"),this._currentIndex=0,this.group.add(this._containerGroup=new PC),this._containerGroup.add(this.getContentGroup()),this.group.add(this._controllerGroup=new PC),this._showController},resetInner:function(){EC.superCall(this,"resetInner"),this._controllerGroup.removeAll(),this._containerGroup.removeClipPath(),this._containerGroup.__rectSize=null},renderInner:function(t,o,e,a,i,n,r){var s=this;EC.superCall(this,"renderInner",t,o,e,a,i,n,r);var l=this._controllerGroup,u=o.get("pageIconSize",!0);k(u)||(u=[u,u]),c("pagePrev",0);var h=o.getModel("pageTextStyle");function c(t,e){var i=t+"DataIndex",n=pl(o.get("pageIcons",!0)[o.getOrient().name][e],{onclick:A(s._pageGo,s,i,o,a)},{x:-u[0]/2,y:-u[1]/2,width:u[0],height:u[1]});n.name=t,l.add(n)}l.add(new Fr({name:"pageText",style:{textFill:h.getTextColor(),font:h.getFont(),textVerticalAlign:"middle",textAlign:"center"},silent:!0})),c("pageNext",1)},layoutInner:function(t,e,i,n,o,a){var r=this.getSelectorGroup(),s=t.getOrient().index,l=NC[s],u=OC[s],h=NC[1-s],c=OC[1-s];o&&mu("horizontal",r,t.get("selectorItemGap",!0));var d=t.get("selectorButtonGap",!0),f=r.getBoundingRect(),p=[-f.x,-f.y],g=D(i);o&&(g[l]=i[l]-f[l]-d);var m=this._layoutContentAndController(t,n,g,s,l,h,c);if(o){if("end"===a)p[s]+=m[l]+d;else{var v=f[l]+d;p[s]-=v,m[u]-=v}m[l]+=f[l]+d,p[1-s]+=m[c]+m[h]/2-f[h]/2,m[h]=Math.max(m[h],f[h]),m[c]=Math.min(m[c],f[c]+p[1-s]),r.attr("position",p)}return m},_layoutContentAndController:function(t,e,i,n,o,a,r){var s=this.getContentGroup(),l=this._containerGroup,u=this._controllerGroup;mu(t.get("orient"),s,t.get("itemGap"),n?i.width:null,n?null:i.height),mu("horizontal",u,t.get("pageButtonItemGap",!0));var h=s.getBoundingRect(),c=u.getBoundingRect(),d=this._showController=h[o]>i[o],f=[-h.x,-h.y];e||(f[n]=s.position[n]);var p=[0,0],g=[-c.x,-c.y],m=H(t.get("pageButtonGap",!0),t.get("itemGap",!0));d&&("end"===t.get("pageButtonPosition",!0)?g[n]+=i[o]-c[o]:p[n]+=c[o]+m);g[1-n]+=h[a]/2-c[a]/2,s.attr("position",f),l.attr("position",p),u.attr("position",g);var v={x:0,y:0};if(v[o]=d?i[o]:h[o],v[a]=Math.max(h[a],c[a]),v[r]=Math.min(0,c[r]+g[1-n]),l.__rectSize=i[o],d){var y={x:0,y:0};y[o]=Math.max(i[o]-c[o]-m,0),y[a]=v[a],l.setClipPath(new is({shape:y})),l.__rectSize=y[o]}else u.eachChild(function(t){t.attr({invisible:!0,silent:!0})});var x=this._getPageInfo(t);return null!=x.pageIndex&&sl(s,{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(n,o){var a=this._controllerGroup;E(["pagePrev","pageNext"],function(t){var e=null!=o[t+"DataIndex"],i=a.childOfName(t);i&&(i.setStyle("fill",e?n.get("pageIconColor",!0):n.get("pageIconInactiveColor",!0)),i.cursor=e?"pointer":"default")});var t=a.childOfName("pageText"),e=n.get("pageFormatter"),i=o.pageIndex,r=null!=i?i+1:0,s=o.pageCount;t&&e&&t.setStyle("text",z(e)?e.replace("{current}",r).replace("{total}",s):e({current:r,total:s}))},_getPageInfo:function(t){var e=t.get("scrollDataIndex",!0),i=this.getContentGroup(),n=this._containerGroup.__rectSize,o=t.getOrient().index,a=NC[o],r=OC[o],s=this._findTargetItemIndex(e),l=i.children(),u=l[s],h=l.length,c=h?1:0,d={contentPosition:i.position.slice(),pageCount:c,pageIndex:c-1,pagePrevDataIndex:null,pageNextDataIndex:null};if(!u)return d;var f=y(u);d.contentPosition[o]=-f.s;for(var p=s+1,g=f,m=f,v=null;p<=h;++p)(!(v=y(l[p]))&&m.e>g.s+n||v&&!x(v,g.s))&&(g=m.i>g.i?m:v)&&(null==d.pageNextDataIndex&&(d.pageNextDataIndex=g.i),++d.pageCount),m=v;for(p=s-1,g=f,m=f,v=null;-1<=p;--p)(v=y(l[p]))&&x(m,v.s)||!(g.i<m.i)||(m=g,null==d.pagePrevDataIndex&&(d.pagePrevDataIndex=g.i),++d.pageCount,++d.pageIndex),g=v;return d;function y(t){if(t){var e=t.getBoundingRect(),i=e[r]+t.position[o];return{s:i,e:i+e[a],i:t.__legendDataIndex}}}function x(t,e){return t.e>=e&&t.s<=e+n}},_findTargetItemIndex:function(n){var o,a,t=this.getContentGroup();return this._showController&&t.eachChild(function(t,e){var i=t.__legendDataIndex;null==a&&null!=i&&(a=e),i===n&&(o=e)}),null!=o?o:a}});gf("legendScroll","legendscroll",function(t,e){var i=t.scrollDataIndex;null!=i&&e.eachComponent({mainType:"legend",subType:"scroll",query:t},function(t){t.setScrollDataIndex(i)})});WA.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"}}});var zC=is,RC=kl,BC=Ol,VC=A,GC=E,FC="horizontal",WC="vertical",HC=["line","bar","candlestick","scatter"],ZC=UA.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){ZC.superApply(this,"render",arguments),Tc(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(){ZC.superApply(this,"remove",arguments),Ac(this,"_dispatchZoomAction")},dispose:function(){ZC.superApply(this,"dispose",arguments),Ac(this,"_dispatchZoomAction")},_buildView:function(){var t=this.group;t.removeAll(),this._resetLocation(),this._resetInterval();var e=this._displayables.barGroup=new Ii;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===FC?{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=_u(t.option);E(["right","top","width","height"],function(t){"ph"===a[t]&&(a[t]=o[t])});var r=vu(a,n,t.padding);this._location={x:r.x,y:r.y},this._size=[r.width,r.height],this._orient===WC&&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!==FC||o?i===FC&&o?{scale:r?[-1,1]:[-1,-1]}:i!==WC||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 zC({silent:!0,shape:{x:0,y:0,width:e[0],height:e[1]},style:{fill:t.get("backgroundColor")},z2:-40})),i.add(new zC({shape:{x:0,y:0,width:e[0],height:e[1]},style:{fill:"transparent"},z2:0,onclick:A(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),r=.3*(a[1]-a[0]);a=[a[0]-r,a[1]+r];var s,l=[0,e[1]],u=[0,e[0]],h=[[e[0],0],[0,0]],c=[],d=u[1]/(n.count()-1),f=0,p=Math.round(n.count()/e[0]);n.each([o],function(t,e){if(0<p&&e%p)f+=d;else{var i=null==t||isNaN(t)||""===t,n=i?0:RC(t,a,l,!0);i&&!s&&e?(h.push([h[h.length-1][0],0]),c.push([c[c.length-1][0],0])):!i&&s&&(h.push([f,0]),c.push([f,0])),h.push([f,n]),c.push([f,n]),f+=d,s=i}});var g=this.dataZoomModel;this._displayables.barGroup.add(new qr({shape:{points:h},style:C({fill:g.get("dataBackgroundColor")},g.getModel("dataBackground.areaStyle").getAreaStyle()),silent:!0,z2:-20})),this._displayables.barGroup.add(new Kr({shape:{points:c},style:g.getModel("dataBackground.lineStyle").getLineStyle(),silent:!0,z2:-19}))}}},_prepareDataShadowInfo:function(){var t=this.dataZoomModel,s=t.get("showDataShadow");if(!1!==s){var l,u=this.ecModel;return t.eachTargetAxis(function(a,r){E(t.getAxisProxy(a.name,r).getTargetSeriesModels(),function(t){if(!(l||!0!==s&&_(HC,t.get("type"))<0)){var e,i=u.getComponent(a.axis,r).axis,n=function(t){return{x:"y",y:"x",radius:"angle",angle:"radius"}[t]}(a.name),o=t.coordinateSystem;null!=n&&o.getOtherAxis&&(e=o.getOtherAxis(i).inverse),n=t.getData().mapDimension(n),l={thisAxis:i,series:t,thisDim:a.name,otherDim:n,otherAxisInverse:e}}},this)},this),l}},_renderHandle:function(){var t=this._displayables,a=t.handles=[],r=t.handleLabels=[],s=this._displayables.barGroup,e=this._size,l=this.dataZoomModel;s.add(t.filler=new zC({draggable:!0,cursor:UC(this._orient),drift:VC(this._onDragMove,this,"all"),ondragstart:VC(this._showDataInfo,this,!0),ondragend:VC(this._onDragEnd,this),onmouseover:VC(this._showDataInfo,this,!0),onmouseout:VC(this._showDataInfo,this,!1),style:{fill:l.get("fillerColor"),textPosition:"inside"}})),s.add(new zC({silent:!0,subPixelOptimize:!0,shape:{x:0,y:0,width:e[0],height:e[1]},style:{stroke:l.get("dataBackgroundColor")||l.get("borderColor"),lineWidth:1,fill:"rgba(0,0,0,0)"}})),GC([0,1],function(t){var e=pl(l.get("handleIcon"),{cursor:UC(this._orient),draggable:!0,drift:VC(this._onDragMove,this,t),ondragend:VC(this._onDragEnd,this),onmouseover:VC(this._showDataInfo,this,!0),onmouseout:VC(this._showDataInfo,this,!1)},{x:-1,y:0,width:2,height:2}),i=e.getBoundingRect();this._handleHeight=Pl(l.get("handleSize"),this._size[1]),this._handleWidth=i.width/i.height*this._handleHeight,e.setStyle(l.getModel("handleStyle").getItemStyle());var n=l.get("handleColor");null!=n&&(e.style.fill=n),s.add(a[t]=e);var o=l.textStyleModel;this.group.add(r[t]=new Fr({silent:!0,invisible:!0,style:{x:0,y:0,text:"",textVerticalAlign:"middle",textAlign:"center",textFill:o.getTextColor(),textFont:o.getFont()},z2:10}))},this)},_resetInterval:function(){var t=this._range=this.dataZoomModel.getPercentRange(),e=this._getViewExtent();this._handleEnds=[RC(t[0],[0,100],e,!0),RC(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];Ww(e,n,o,i.get("zoomLock")?"all":t,null!=a.minSpan?RC(a.minSpan,r,o,!0):null,null!=a.maxSpan?RC(a.maxSpan,r,o,!0):null);var s=this._range,l=this._range=BC([RC(n[0],o,r,!0),RC(n[1],o,r,!0)]);return!s||s[0]!==l[0]||s[1]!==l[1]},_updateView:function(t){var n=this._displayables,o=this._handleEnds,e=BC(o.slice()),a=this._size;GC([0,1],function(t){var e=n.handles[t],i=this._handleHeight;e.attr({scale:[i/2,i/2],position:[o[t],a[1]/2-i/2]})},this),n.filler.setShape({x:e[0],y:0,width:e[1]-e[0],height:a[1]}),this._updateDataInfo(t)},_updateDataInfo:function(t){var e=this.dataZoomModel,a=this._displayables,r=a.handleLabels,s=this._orient,l=["",""];if(e.get("showDetail")){var i=e.findRepresentativeAxisProxy();if(i){var n=i.getAxisModel().axis,o=this._range,u=t?i.calculateDataWindow({start:o[0],end:o[1]}).valueWindow:i.getDataValueWindow();l=[this._formatLabel(u[0],n),this._formatLabel(u[1],n)]}}var h=BC(this._handleEnds.slice());function c(t){var e=ul(a.handles[t].parent,this.group),i=cl(0===t?"right":"left",e),n=this._handleWidth/2+5,o=hl([h[t]+(0===t?-n:n),this._size[1]/2],e);r[t].setStyle({x:o[0],y:o[1],textVerticalAlign:s===FC?"middle":i,textAlign:s===FC?i:"center",text:l[t]})}c.call(this,0),c.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 O(n)?n(t,a):z(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,n){this._dragging=!0,Wt(n.event);var o=hl([e,i],this._displayables.barGroup.getLocalTransform(),!0),a=this._updateInterval(t,o[0]),r=this.dataZoomModel.get("realtime");this._updateView(!r),a&&r&&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,a=this._updateInterval("all",i[0]-o);this._updateView(),a&&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 i;if(GC(this.getTargetCoordInfo(),function(t){if(!i&&t.length){var e=t[0].model.coordinateSystem;i=e.getRect&&e.getRect()}}),!i){var t=this.api.getWidth(),e=this.api.getHeight();i={x:.2*t,y:.2*e,width:.6*t,height:.6*e}}return i}});function UC(t){return"vertical"===t?"ns-resize":"ew-resize"}WA.extend({type:"dataZoom.inside",defaultOption:{disabled:!1,zoomLock:!1,zoomOnMouseWheel:!0,moveOnMouseMove:!0,moveOnMouseWheel:!1,preventDefaultMouseMove:!0}});var XC="\0_ec_dataZoom_roams";function YC(t,n){var e=qC(t),o=n.dataZoomId,a=n.coordId;E(e,function(t,e){var i=t.dataZoomInfos;i[o]&&_(n.allCoordIds,a)<0&&(delete i[o],t.count--)}),KC(e);var i=e[a];i||((i=e[a]={coordId:a,dataZoomInfos:{},count:0}).controller=function(t,r){var e=new Ly(t.getZr());return E(["pan","zoom","scrollMove"],function(a){e.on(a,function(n){var o=[];E(r.dataZoomInfos,function(t){if(n.isAvailableBehavior(t.dataZoomModel.option)){var e=(t.getRange||{})[a],i=e&&e(r.controller,n);!t.dataZoomModel.get("disabled",!0)&&i&&o.push({dataZoomId:t.dataZoomId,start:i[0],end:i[1]})}}),o.length&&r.dispatchAction(o)})}),e}(t,i),i.dispatchAction=T($C,t)),i.dataZoomInfos[o]||i.count++,i.dataZoomInfos[o]=n;var r=function(t){var n,o={type_true:2,type_move:1,type_false:0,type_undefined:-1},a=!0;return E(t,function(t){var e=t.dataZoomModel,i=!e.get("disabled",!0)&&(!e.get("zoomLock",!0)||"move");o["type_"+n]<o["type_"+i]&&(n=i),a&=e.get("preventDefaultMouseMove",!0)}),{controlType:n,opt:{zoomOnMouseWheel:!0,moveOnMouseMove:!0,moveOnMouseWheel:!0,preventDefaultMouseMove:!!a}}}(i.dataZoomInfos);i.controller.enable(r.controlType,r.opt),i.controller.setPointerChecker(n.containsPoint),Tc(i,"dispatchAction",n.dataZoomModel.get("throttle",!0),"fixRate")}function jC(t){return t.type+"\0_"+t.id}function qC(t){var e=t.getZr();return e[XC]||(e[XC]={})}function KC(i){E(i,function(t,e){t.count||(t.controller.dispose(),delete i[e])})}function $C(t,e){t.dispatchAction({type:"dataZoom",batch:e})}var JC=A,QC=UA.extend({type:"dataZoom.inside",init:function(t,e){this._range},render:function(r,t,s,e){QC.superApply(this,"render",arguments),this._range=r.getPercentRange(),E(this.getTargetCoordInfo(),function(t,o){var a=N(t,function(t){return jC(t.model)});E(t,function(e){var n=e.model,i={};E(["pan","zoom","scrollMove"],function(t){i[t]=JC(tL[t],this,e,o)},this),YC(s,{coordId:jC(n),allCoordIds:a,containsPoint:function(t,e,i){return n.coordinateSystem.containPoint([e,i])},dataZoomId:r.id,dataZoomModel:r,getRange:i})},this)},this)},dispose:function(){!function(t,i){var e=qC(t);E(e,function(t){t.controller.dispose();var e=t.dataZoomInfos;e[i]&&(delete e[i],t.count--)}),KC(e)}(this.api,this.dataZoomModel.id),QC.superApply(this,"dispose",arguments),this._range=null}}),tL={zoom:function(t,e,i,n){var o=this._range,a=o.slice(),r=t.axisModels[0];if(r){var s=nL[e](null,[n.originX,n.originY],r,i,t),l=(0<s.signal?s.pixelStart+s.pixelLength-s.pixel:s.pixel-s.pixelStart)/s.pixelLength*(a[1]-a[0])+a[0],u=Math.max(1/n.scale,0);a[0]=(a[0]-l)*u+l,a[1]=(a[1]-l)*u+l;var h=this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();return Ww(0,a,[0,100],0,h.minSpan,h.maxSpan),this._range=a,o[0]!==a[0]||o[1]!==a[1]?a:void 0}},pan:eL(function(t,e,i,n,o,a){var r=nL[n]([a.oldX,a.oldY],[a.newX,a.newY],e,o,i);return r.signal*(t[1]-t[0])*r.pixel/r.pixelLength}),scrollMove:eL(function(t,e,i,n,o,a){return nL[n]([0,0],[a.scrollDelta,a.scrollDelta],e,o,i).signal*(t[1]-t[0])*a.scrollDelta})};function eL(l){return function(t,e,i,n){var o=this._range,a=o.slice(),r=t.axisModels[0];if(r){var s=l(a,r,t,e,i,n);return Ww(s,a,[0,100],"all"),this._range=a,o[0]!==a[0]||o[1]!==a[1]?a:void 0}}}function iL(t){var e=t&&t.visualMap;k(e)||(e=e?[e]:[]),oL(e,function(t){if(t){aL(t,"splitList")&&!aL(t,"pieces")&&(t.pieces=t.splitList,delete t.splitList);var e=t.pieces;e&&k(e)&&oL(e,function(t){R(t)&&(aL(t,"start")&&!aL(t,"min")&&(t.min=t.start),aL(t,"end")&&!aL(t,"max")&&(t.max=t.end))})}})}var nL={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(),u=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=u[1]-u[0],r.pixelStart=u[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}},oL=E;function aL(t,e){return t&&t.hasOwnProperty&&t.hasOwnProperty(e)}Tu.registerSubTypeDefaulter("visualMap",function(t){return t.categories||(t.pieces?0<t.pieces.length:0<t.splitNumber)&&!t.calculable?"piecewise":"continuous"});var rL=Id.VISUAL.COMPONENT;function sL(t,e,i,n){for(var o=e.targetVisuals[n],a=a_.prepareVisualTypes(o),r={color:t.getData().getVisual("color")},s=0,l=a.length;s<l;s++){var u=a[s],h=o["opacity"===u?"__alphaForOpacity":u];h&&h.applyVisual(i,c,d)}return r.color;function c(t){return r[t]}function d(t,e){r[t]=e}}yf(rL,{createOnAllSeries:!0,reset:function(i,t){var n=[];return t.eachComponent("visualMap",function(t){var e=i.pipelineContext;!t.isTargetSeries(i)||e&&e.large||n.push(function(t,f,p,g){var m={};return E(t,function(t){var e=a_.prepareVisualTypes(f[t]);m[t]=e}),{progress:function(t,i){function e(t){return i.getItemVisual(o,t)}function n(t,e){i.setItemVisual(o,t,e)}var o;for(null!=g&&(g=i.getDimension(g));null!=(o=t.next());){var a=i.getRawDataItem(o);if(!a||!1!==a.visualMap)for(var r=null!=g?i.get(g,o,!0):o,s=p(r),l=f[s],u=m[s],h=0,c=u.length;h<c;h++){var d=u[h];l[d]&&l[d].applyVisual(r,e,n)}}}}}(t.stateList,t.targetVisuals,A(t.getValueState,t),t.getDataDimension(i.getData())))}),n}}),yf(rL,{createOnAllSeries:!0,reset:function(o,t){var a=o.getData(),r=[];t.eachComponent("visualMap",function(t){if(t.isTargetSeries(o)){var e=t.getVisualMeta(A(sL,null,o,t))||{stops:[],outerColors:[]},i=t.getDataDimension(a),n=a.getDimensionInfo(i);null!=n&&(e.dimension=n.index,r.push(e))}}),o.getData().setVisual("visualMeta",r)}});var lL=function(t,e,i){var n=D((uL[t]||{})[e]);return i&&k(n)?n[n.length-1]:n},uL={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]}},hL=a_.mapVisual,cL=a_.eachVisual,dL=k,fL=E,pL=Ol,gL=kl,mL=wf({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;v.canvasSupported||(i.realtime=!1),e||vD(i,t,this.replacableOptionKeys),this.textStyleModel=this.getModel("textStyle"),this.resetItemSize(),this.completeVisualOption()},resetVisual:function(t){var e=this.stateList;t=A(t,this),this.controllerVisuals=mD(this.option.controller,e,t),this.targetVisuals=mD(this.option.target,e,t)},getTargetSeriesIndices:function(){var t=this.option.seriesIndex,i=[];return null==t||"all"===t?this.ecModel.eachSeries(function(t,e){i.push(e)}):i=Eo(t),i},eachTargetSeries:function(e,i){E(this.getTargetSeriesIndices(),function(t){e.call(i,this.ecModel.getSeriesByIndex(t))},this)},isTargetSeries:function(e){var i=!1;return this.eachTargetSeries(function(t){t===e&&(i=!0)}),i},formatValueText:function(t,e,i){var n,o,a=this.option,r=a.precision,s=this.dataBound,l=a.formatter;return i=i||["<",">"],k(t)&&(t=t.slice(),n=!0),o=e?t:n?[u(t[0]),u(t[1])]:u(t),z(l)?l.replace("{value}",n?o[0]:o).replace("{value2}",n?o[1]:o):O(l)?n?l(t[0],t[1]):l(t):n?t[0]===s[0]?i[0]+" "+o[1]:t[1]===s[1]?i[1]+" "+o[0]:o[0]+" - "+o[1]:o;function u(t){return t===s[0]?"min":t===s[1]?"max":(+t).toFixed(Math.min(r,20))}},resetExtent:function(){var t=this.option,e=pL([t.min,t.max]);this._dataExtent=e},getDataDimension:function(t){var e=this.option.dimension,i=t.dimensions;if(null!=e||i.length){if(null!=e)return t.getDimension(e);for(var n=t.dimensions,o=n.length-1;0<=o;o--){var a=n[o];if(!t.getDimensionInfo(a).isCalculationCoord)return a}}},getExtent:function(){return this._dataExtent.slice()},completeVisualOption:function(){var t=this.ecModel,e=this.option,i={inRange:e.inRange,outOfRange:e.outOfRange},n=e.target||(e.target={}),o=e.controller||(e.controller={});m(n,i),m(o,i);var u=this.isCategory();function a(n){dL(e.color)&&!n.inRange&&(n.inRange={color:e.color.slice().reverse()}),n.inRange=n.inRange||{color:t.get("gradientColor")},fL(this.stateList,function(t){var e=n[t];if(z(e)){var i=lL(e,"active",u);i?(n[t]={},n[t][e]=i):delete n[t]}},this)}a.call(this,n),a.call(this,o),function(t,e,i){var n=t[e],o=t[i];n&&!o&&(o=t[i]={},fL(n,function(t,e){if(a_.isValidType(e)){var i=lL(e,"inactive",u);null!=i&&(o[e]=i,"color"!==e||o.hasOwnProperty("opacity")||o.hasOwnProperty("colorAlpha")||(o.opacity=[0,0]))}}))}.call(this,n,"inRange","outOfRange"),function(a){var r=(a.inRange||{}).symbol||(a.outOfRange||{}).symbol,s=(a.inRange||{}).symbolSize||(a.outOfRange||{}).symbolSize,l=this.get("inactiveColor");fL(this.stateList,function(t){var e=this.itemSize,i=a[t];null==(i=i||(a[t]={color:u?l:[l]})).symbol&&(i.symbol=r&&D(r)||(u?"roundRect":["roundRect"])),null==i.symbolSize&&(i.symbolSize=s&&D(s)||(u?e[0]:[e[0],e[0]])),i.symbol=hL(i.symbol,function(t){return"none"===t||"square"===t?"roundRect":t});var n=i.symbolSize;if(null!=n){var o=-1/0;cL(n,function(t){o<t&&(o=t)}),i.symbolSize=hL(n,function(t){return gL(t,[0,o],[0,e[0]],!0)})}},this)}.call(this,o)},resetItemSize:function(){this.itemSize=[parseFloat(this.get("itemWidth")),parseFloat(this.get("itemHeight"))]},isCategory:function(){return!!this.option.categories},setSelected:et,getValueState:et,getVisualMeta:et}),vL=[20,140],yL=mL.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){yL.superApply(this,"optionUpdated",arguments),this.resetExtent(),this.resetVisual(function(t){t.mappingMethod="linear",t.dataExtent=this.getExtent()}),this._resetRange()},resetItemSize:function(){yL.superApply(this,"resetItemSize",arguments);var t=this.itemSize;"horizontal"===this._orient&&t.reverse(),null!=t[0]&&!isNaN(t[0])||(t[0]=vL[0]),null!=t[1]&&!isNaN(t[1])||(t[1]=vL[1])},_resetRange:function(){var t=this.getExtent(),e=this.option.range;!e||e.auto?(t.auto=1,this.option.range=t):k(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(){mL.prototype.completeVisualOption.apply(this,arguments),E(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=Ol((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(n){var o=[];return this.eachTargetSeries(function(t){var i=[],e=t.getData();e.each(this.getDataDimension(e),function(t,e){n[0]<=t&&t<=n[1]&&i.push(e)},this),o.push({seriesId:t.id,dataIndex:i})},this),o},getVisualMeta:function(i){var t=xL(this,"outOfRange",this.getExtent()),e=xL(this,"inRange",this.option.range.slice()),n=[];function o(t,e){n.push({value:t,color:i(t,e)})}for(var a=0,r=0,s=e.length,l=t.length;r<l&&(!e.length||t[r]<=e[0]);r++)t[r]<e[a]&&o(t[r],"outOfRange");for(var u=1;a<s;a++,u=0)u&&n.length&&o(e[a],"outOfRange"),o(e[a],"inRange");for(u=1;r<l;r++)(!e.length||e[e.length-1]<t[r])&&(u&&(n.length&&o(n[n.length-1].value,"outOfRange"),u=0),o(t[r],"outOfRange"));var h=n.length;return{stops:n,outerColors:[h?n[0].color:"transparent",h?n[h-1].color:"transparent"]}}});function xL(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}var _L=bf({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){!1!==(this.visualMapModel=t).get("show")?this.doRender.apply(this,arguments):this.group.removeAll()},renderBackground:function(t){var e=this.visualMapModel,i=Jl(e.get("padding")||0),n=t.getBoundingRect();t.add(new is({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(i,n,o){var t=(o=o||{}).forceState,e=this.visualMapModel,a={};if("symbol"===n&&(a.symbol=e.get("itemSymbol")),"color"===n){var r=e.get("contentColor");a.color=r}function s(t){return a[t]}function l(t,e){a[t]=e}var u=e.controllerVisuals[t||e.getValueState(i)];return E(a_.prepareVisualTypes(u),function(t){var e=u[t];o.convertOpacityToAlpha&&"opacity"===t&&(t="colorAlpha",e=u.__alphaForOpacity),a_.dependsOn(t,n)&&e&&e.applyVisual(i,s,l)}),a[n]},positionGroup:function(t){var e=this.visualMapModel,i=this.api;yu(t,e.getBoxLayoutParams(),{width:i.getWidth(),height:i.getHeight()})},doRender:et});function wL(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],u=[0,null,10],h={},c=0;c<3;c++)h[s[1-r][c]]=u[c],h[l[c]]=2===c?i[0]:n[l[c]];var d=[["x","width",3],["y","height",0]][r],f=vu(h,a,n.padding);return l[(f.margin[d[2]]||0)+f[d[0]]+.5*f[d[1]]<.5*a[d[1]]?0:1]}function bL(t,e){return E(t||[],function(t){null!=t.dataIndex&&(t.dataIndexInside=t.dataIndex,t.dataIndex=null),t.highlightKey="visualMap"+(e?e.componentIndex:"")}),t}var SL=kl,ML=E,IL=Math.min,TL=Math.max,AL=_L.extend({type:"visualMap.continuous",init:function(){AL.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),u=this._applyTransform(0===i?"bottom":"top",s),h=this._orient,c=this.visualMapModel.textStyleModel;this.group.add(new Fr({style:{x:l[0],y:l[1],textVerticalAlign:"horizontal"===h?"middle":u,textAlign:"horizontal"===h?u:"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=wL(e,this.api,n),s=i.barGroup=this._createBarGroup(r);s.add(i.outOfRange=DL()),s.add(i.inRange=DL(null,a?LL(this._orient):null,A(this._dragHandle,this,"all",!1),A(this._dragHandle,this,"all",!0)));var l=e.textStyleModel.getTextRect("国"),u=TL(l.width,l.height);a&&(i.handleThumbs=[],i.handleLabels=[],i.handleLabelPoints=[],this._createHandle(s,0,n,u,o,r),this._createHandle(s,1,n,u,o,r)),this._createIndicator(s,n,u,o),t.add(s)},_createHandle:function(t,e,i,n,o){var a=A(this._dragHandle,this,e,!1),r=A(this._dragHandle,this,e,!0),s=DL(function(t,e){return 0===t?[[0,0],[e,0],[e,-e]]:[[0,0],[e,0],[e,e]]}(e,n),LL(this._orient),a,r);s.position[0]=i[0],t.add(s);var l=this.visualMapModel.textStyleModel,u=new Fr({draggable:!0,drift:a,onmousemove:function(t){Wt(t.event)},ondragend:r,style:{x:0,y:0,text:"",textFont:l.getFont(),textFill:l.getTextColor()}});this.group.add(u);var h=["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]=h,c.handleLabels[e]=u},_createIndicator:function(t,e,i,n){var o=DL([[0,0]],"move");o.position[0]=e[0],o.attr({invisible:!0,silent:!0}),t.add(o);var a=this.visualMapModel.textStyleModel,r=new Fr({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:9,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():CL(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=[SL(e[0],i,n,!0),SL(e[1],i,n,!0)]},_updateInterval:function(t,e){e=e||0;var i=this.visualMapModel,n=this._handleEnds,o=[0,i.itemSize[1]];Ww(e,n,o,t,0);var a=i.getExtent();this._dataInterval=[SL(n[0],o,a,!0),SL(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 cs(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 Ii("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(n,o){if(this._useHandle){var a=this._shapes,r=this.visualMapModel,s=a.handleThumbs,l=a.handleLabels;ML([0,1],function(t){var e=s[t];e.setStyle("fill",o.handlesColor[t]),e.position[1]=n[t];var i=hl(a.handleLabelPoints[t],ul(e,this.group));l[t].setStyle({x:i[0],y:i[1],text:r.formatValueText(this._dataInterval[t]),textVerticalAlign:"middle",textAlign:this._applyTransform("horizontal"===this._orient?0===t?"bottom":"top":"left",a.barGroup)})},this)}},_showIndicator:function(t,e,i,n){var o=this.visualMapModel,a=o.getExtent(),r=o.itemSize,s=[0,r[1]],l=SL(t,a,s,!0),u=this._shapes,h=u.indicator;if(h){h.position[1]=l,h.attr("invisible",!1),h.setShape("points",function(t,e,i,n){return t?[[0,-IL(e,TL(i,0))],[6,0],[0,IL(e,TL(n-i,0))]]:[[0,0],[5,-5],[5,5]]}(!!i,n,l,r[1]));var c=this.getControllerVisual(t,"color",{convertOpacityToAlpha:!0});h.setStyle("fill",c);var d=hl(u.indicatorLabelPoint,ul(h,this.group)),f=u.indicatorLabel;f.attr("invisible",!1);var p=this._applyTransform("left",u.barGroup),g=this._orient;f.setStyle({text:(i||"")+o.formatValueText(e),textVerticalAlign:"horizontal"===g?p:"middle",textAlign:"horizontal"===g?"center":p,x:d[0],y:d[1]})}},_enableHoverLinkToSeries:function(){var n=this;this._shapes.barGroup.on("mousemove",function(t){if(n._hovering=!0,!n._dragging){var e=n.visualMapModel.itemSize,i=n._applyTransform([t.offsetX,t.offsetY],n._shapes.barGroup,!0,!0);i[1]=IL(TL(0,i[1]),e[1]),n._doHoverLinkToSeries(i[1],0<=i[0]&&i[0]<=e[0])}}).on("mouseout",function(){n._hovering=!1,n._dragging||n._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=IL(TL(o[0],t),o[1]);var r=function(t,e,i){var n=6,o=t.get("hoverLinkDataSize");o&&(n=SL(o,e,i,!0)/2);return n}(i,a,o),s=[t-r,t+r],l=SL(t,o,a,!0),u=[SL(s[0],o,a,!0),SL(s[1],o,a,!0)];s[0]<o[0]&&(u[0]=-1/0),o[1]<s[1]&&(u[1]=1/0),e&&(u[0]===-1/0?this._showIndicator(l,u[1],"< ",r):u[1]===1/0?this._showIndicator(l,u[0],"> ",r):this._showIndicator(l,l,"≈ ",r));var h=this._hoverLinkDataIndices,c=[];(e||CL(i))&&(c=this._hoverLinkDataIndices=i.findTargetDataIndices(u));var d=function(t,e){var i={},n={};return o(t||[],i),o(e||[],n,i),[a(i),a(n)];function o(t,e,i){for(var n=0,o=t.length;n<o;n++)for(var a=t[n].seriesId,r=Eo(t[n].dataIndex),s=i&&i[a],l=0,u=r.length;l<u;l++){var h=r[l];s&&s[h]?s[h]=null:(e[a]||(e[a]={}))[h]=1}}function a(t,e){var i=[];for(var n in t)if(t.hasOwnProperty(n)&&null!=t[n])if(e)i.push(+n);else{var o=a(t[n],!0);o.length&&i.push({seriesId:n,dataIndex:o})}return i}}(h,c);this._dispatchHighDown("downplay",bL(d[0],i)),this._dispatchHighDown("highlight",bL(d[1],i))}},_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",bL(t,this.visualMapModel)),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=ul(e,n?null:this.group);return yl[k(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()}});function DL(t,e,i,n){return new qr({shape:{points:t},draggable:!!i,cursor:e,drift:i,onmousemove:function(t){Wt(t.event)},ondragend:n})}function CL(t){var e=t.get("hoverLinkOnHandle");return!!(null==e?t.get("realtime"):e)}function LL(t){return"vertical"===t?"ns-resize":"ew-resize"}gf({type:"selectDataRange",event:"dataRangeSelected",update:"update"},function(e,t){t.eachComponent({mainType:"visualMap",query:e},function(t){t.setSelected(e.selected)})}),ff(iL);var kL=mL.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){kL.superApply(this,"optionUpdated",arguments),this._pieceList=[],this.resetExtent();var i=this._mode=this._determineMode();PL[this._mode].call(this),this._resetSelected(t,e);var n=this.option.categories;this.resetVisual(function(t,e){"categories"===i?(t.mappingMethod="category",t.categories=D(n)):(t.dataExtent=this.getExtent(),t.mappingMethod="piecewise",t.pieceList=N(this._pieceList,function(t){t=D(t);return"inRange"!==e&&(t.visual=null),t}))})},completeVisualOption:function(){var n=this.option,i={},t=a_.listVisualTypes(),o=this.isCategory();function a(t,e,i){return t&&t[e]&&(R(t[e])?t[e].hasOwnProperty(i):t[e]===i)}E(n.pieces,function(e){E(t,function(t){e.hasOwnProperty(t)&&(i[t]=1)})}),E(i,function(t,e){var i=0;E(this.stateList,function(t){i|=a(n,t,e)||a(n.target,t,e)},this),i||E(this.stateList,function(t){(n[t]||(n[t]={}))[e]=lL(e,"inRange"===t?"active":"inactive",o)})},this),mL.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,E(n,function(t,e){var i=this.getSelectedMapKey(t);o.hasOwnProperty(i)||(o[i]=!0)},this),"single"===i.selectedMode){var a=!1;E(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&&0<t.pieces.length?"pieces":this.option.categories?"categories":"splitNumber"},setSelected:function(t){this.option.selected=D(t)},getValueState:function(t){var e=a_.findPieceIndex(t,this._pieceList);return null!=e&&this.option.selected[this.getSelectedMapKey(this._pieceList[e])]?"inRange":"outOfRange"},findTargetDataIndices:function(n){var o=[];return this.eachTargetSeries(function(t){var i=[],e=t.getData();e.each(this.getDataDimension(e),function(t,e){a_.findPieceIndex(t,this._pieceList)===n&&i.push(e)},this),o.push({seriesId:t.id,dataIndex:i})},this),o},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(o){if(!this.isCategory()){var a=[],r=[],s=this,t=this._pieceList.slice();if(t.length){var e=t[0].interval[0];e!==-1/0&&t.unshift({interval:[-1/0,e]}),(e=t[t.length-1].interval[1])!==1/0&&t.push({interval:[e,1/0]})}else t.push({interval:[-1/0,1/0]});var i=-1/0;return E(t,function(t){var e=t.interval;e&&(e[0]>i&&n([i,e[0]],"outOfRange"),n(e.slice()),i=e[1])},this),{stops:a,outerColors:r}}function n(t,e){var i=s.getRepresentValue({interval:t});e=e||s.getValueState(i);var n=o(i,e);t[0]===-1/0?r[0]=n:t[1]===1/0?r[1]=n:a.push({value:t[0],color:n},{value:t[1],color:n})}}}),PL={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 u=r===o-1?n[1]:s+a;e.push({index:r++,interval:[s,u],close:[1,1]})}t.maxOpen&&e.push({index:r++,interval:[n[1],1/0],close:[0,0]}),Yl(e),E(e,function(t){t.text=this.formatValueText(t.interval)},this)},categories:function(){var t=this.option;E(t.categories,function(t){this._pieceList.push({text:this.formatValueText(t,!0),value:t})},this),NL(t,this._pieceList)},pieces:function(){var t=this.option,d=this._pieceList;E(t.pieces,function(t,e){R(t)||(t={value:t});var i={text:"",index:e};if(null!=t.label&&(i.text=t.label),t.hasOwnProperty("value")){var n=i.value=t.value;i.interval=[n,n],i.close=[1,1]}else{for(var o=i.interval=[],a=i.close=[0,0],r=[1,0,1],s=[-1/0,1/0],l=[],u=0;u<2;u++){for(var h=[["gte","gt","min"],["lte","lt","max"]][u],c=0;c<3&&null==o[u];c++)o[u]=t[h[c]],a[u]=r[c],l[u]=2===c;null==o[u]&&(o[u]=s[u])}l[0]&&o[1]===1/0&&(a[0]=0),l[1]&&o[0]===-1/0&&(a[1]=0),o[0]===o[1]&&a[0]&&a[1]&&(i.value=o[0])}i.visual=a_.retrieveVisuals(t),d.push(i)},this),NL(t,d),Yl(d),E(d,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)}};function NL(t,e){var i=t.inverse;("vertical"===t.orient?!i:i)&&e.reverse()}_L.extend({type:"visualMap.piecewise",doRender:function(){var a=this.group;a.removeAll();var r=this.visualMapModel,s=r.get("textGap"),t=r.textStyleModel,l=t.getFont(),u=t.getTextColor(),h=this._getItemAlign(),c=r.itemSize,e=this._getViewData(),i=e.endsText,d=W(r.get("showLabel",!0),!i);i&&this._renderEndsText(a,i[0],c,d,h),E(e.viewPieceList,function(t){var e=t.piece,i=new Ii;i.onclick=A(this._onItemClick,this,e),this._enableHoverLink(i,t.indexInModelPieceList);var n=r.getRepresentValue(e);if(this._createItemSymbol(i,n,[0,0,c[0],c[1]]),d){var o=this.visualMapModel.getValueState(n);i.add(new Fr({style:{x:"right"===h?-s:c[0]+s,y:c[1]/2,text:e.text,textVerticalAlign:"middle",textAlign:h,textFont:l,textFill:u,opacity:"outOfRange"===o?.5:1}}))}a.add(i)},this),i&&this._renderEndsText(a,i[1],c,d,h),mu(r.get("orient"),a,r.get("itemGap")),this.renderBackground(a),this.positionGroup(a)},_enableHoverLink:function(t,i){function e(t){var e=this.visualMapModel;e.option.hoverLink&&this.api.dispatchAction({type:t,batch:bL(e.findTargetDataIndices(i),e)})}t.on("mouseover",A(e,this,"highlight")).on("mouseout",A(e,this,"downplay"))},_getItemAlign:function(){var t=this.visualMapModel,e=t.option;if("vertical"===e.orient)return wL(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 Ii,r=this.visualMapModel.textStyleModel;a.add(new Fr({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=N(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(mg(this.getControllerVisual(e,"symbol"),i[0],i[1],i[2],i[3],this.getControllerVisual(e,"color")))},_onItemClick:function(t){var e=this.visualMapModel,i=e.option,n=D(i.selected),o=e.getSelectedMapKey(t);"single"===i.selectedMode?(n[o]=!0,E(n,function(t,e){n[e]=e===o})):n[o]=!n[o],this.api.dispatchAction({type:"selectDataRange",from:this.uid,visualMapId:this.visualMapModel.id,selected:n})}});ff(iL);var OL,EL="urn:schemas-microsoft-com:vml",zL="undefined"==typeof window?null:window,RL=!1,BL=zL&&zL.document;function VL(t){return OL(t)}if(BL&&!v.canvasSupported)try{BL.namespaces.zrvml||BL.namespaces.add("zrvml",EL),OL=function(t){return BL.createElement("<zrvml:"+t+' class="zrvml">')}}catch(t){OL=function(t){return BL.createElement("<"+t+' xmlns="'+EL+'" class="zrvml">')}}var GL,FL=ir.CMD,WL=Math.round,HL=Math.sqrt,ZL=Math.abs,UL=Math.cos,XL=Math.sin,YL=Math.max;if(!v.canvasSupported){var jL=",",qL="progid:DXImageTransform.Microsoft",KL=21600,$L=KL/2,JL=function(t){t.style.cssText="position:absolute;left:0;top:0;width:1px;height:1px;",t.coordsize=KL+","+KL,t.coordorigin="0,0"},QL=function(t,e,i){return"rgb("+[t,e,i].join(",")+")"},tk=function(t,e){e&&t&&e.parentNode!==t&&t.appendChild(e)},ek=function(t,e){e&&t&&e.parentNode===t&&t.removeChild(e)},ik=function(t,e,i){return 1e5*(parseFloat(t)||0)+1e3*(parseFloat(e)||0)+i},nk=Hn,ok=function(t,e,i){var n=Re(e);i=+i,isNaN(i)&&(i=1),n&&(t.color=QL(n[0],n[1],n[2]),t.opacity=i*n[3])},ak=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 ss&&ek(t,a),a=a||VL(e),o?function(t,e,i){var n,o,a=e.fill;if(null!=a)if(a instanceof ss){var r,s=0,l=[0,0],u=0,h=1,c=i.getBoundingRect(),d=c.width,f=c.height;if("linear"===a.type){r="gradient";var p=i.transform,g=[a.x*d,a.y*f],m=[a.x2*d,a.y2*f];p&&(bt(g,g,p),bt(m,m,p));var v=m[0]-g[0],y=m[1]-g[1];(s=180*Math.atan2(v,y)/Math.PI)<0&&(s+=360),s<1e-6&&(s=0)}else{r="gradientradial";g=[a.x*d,a.y*f],p=i.transform;var x=i.scale,_=d,w=f;l=[(g[0]-c.x)/_,(g[1]-c.y)/w],p&&bt(g,g,p),_/=x[0]*KL,w/=x[1]*KL;var b=YL(_,w);u=0/b,h=2*a.r/b-u}var S=a.colorStops.slice();S.sort(function(t,e){return t.offset-e.offset});for(var M=S.length,I=[],T=[],A=0;A<M;A++){var D=S[A],C=(n=D.color,void 0,o=Re(n),[QL(o[0],o[1],o[2]),o[3]]);T.push(D.offset*h+u+" "+C[0]),0!==A&&A!==M-1||I.push(C)}if(2<=M){var L=I[0][0],k=I[1][0],P=I[0][1]*e.opacity,N=I[1][1]*e.opacity;t.type=r,t.method="none",t.focus="100%",t.angle=s,t.color=L,t.color2=k,t.colors=T.join(","),t.opacity=N,t.opacity2=P}"radial"===r&&(t.focusposition=l.join(","))}else ok(t,a,e.opacity)}(a,i,n):function(t,e){e.lineDash&&(t.dashstyle=e.lineDash.join(" ")),null==e.stroke||e.stroke instanceof ss||ok(t,e.stroke,e.opacity)}(a,i),tk(t,a)):(t[o?"filled":"stroked"]="false",ek(t,a))},rk=[[],[],[]];Sr.prototype.brushVML=function(t){var e=this.style,i=this._vmlEl;i||(i=VL("shape"),JL(i),this._vmlEl=i),ak(i,"fill",e,this),ak(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*=HL(ZL(s))}a.weight=r+"px"}var l=this.path||(this.path=new ir);this.__dirtyPath&&(l.beginPath(),l.subPixelOptimize=!1,this.buildPath(l,this.shape),l.toStatic(),this.__dirtyPath=!1),i.path=function(t,e){var i,n,o,a,r,s,l=FL.M,u=FL.C,h=FL.L,c=FL.A,d=FL.Q,f=[],p=t.data,g=t.len();for(a=0;a<g;){switch(n="",i=0,o=p[a++]){case l:n=" m ",i=1,r=p[a++],s=p[a++],rk[0][0]=r,rk[0][1]=s;break;case h:n=" l ",i=1,r=p[a++],s=p[a++],rk[0][0]=r,rk[0][1]=s;break;case d:case u:n=" c ",i=3;var m,v,y=p[a++],x=p[a++],_=p[a++],w=p[a++];o===d?(_=((m=_)+2*y)/3,w=((v=w)+2*x)/3,y=(r+2*y)/3,x=(s+2*x)/3):(m=p[a++],v=p[a++]),rk[0][0]=y,rk[0][1]=x,rk[1][0]=_,rk[1][1]=w,r=rk[2][0]=m,s=rk[2][1]=v;break;case c:var b=0,S=0,M=1,I=1,T=0;e&&(b=e[4],S=e[5],M=HL(e[0]*e[0]+e[1]*e[1]),I=HL(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 N=p[a++],O=A+UL(k)*C,E=D+XL(k)*L,z=(y=A+UL(P)*C,x=D+XL(P)*L,N?" wa ":" at ");Math.abs(O-y)<1e-4&&(.01<Math.abs(P-k)?N&&(O+=.0125):Math.abs(E-D)<1e-4?N&&O<A||!N&&A<O?x-=.0125:x+=.0125:N&&E<D||!N&&D<E?y+=.0125:y-=.0125),f.push(z,WL(((A-C)*M+b)*KL-$L),jL,WL(((D-L)*I+S)*KL-$L),jL,WL(((A+C)*M+b)*KL-$L),jL,WL(((D+L)*I+S)*KL-$L),jL,WL((O*M+b)*KL-$L),jL,WL((E*I+S)*KL-$L),jL,WL((y*M+b)*KL-$L),jL,WL((x*I+S)*KL-$L)),r=y,s=x;break;case FL.R:var R=rk[0],B=rk[1];R[0]=p[a++],R[1]=p[a++],B[0]=R[0]+p[a++],B[1]=R[1]+p[a++],e&&(bt(R,R,e),bt(B,B,e)),R[0]=WL(R[0]*KL-$L),B[0]=WL(B[0]*KL-$L),R[1]=WL(R[1]*KL-$L),B[1]=WL(B[1]*KL-$L),f.push(" m ",R[0],jL,R[1]," l ",B[0],jL,R[1]," l ",B[0],jL,B[1]," l ",R[0],jL,B[1]);break;case FL.Z:f.push(" x ")}if(0<i){f.push(n);for(var V=0;V<i;V++){var G=rk[V];e&&bt(G,G,e),f.push(WL(G[0]*KL-$L),jL,WL(G[1]*KL-$L),V<i-1?jL:"")}}}return f.join("")}(l,this.transform),i.style.zIndex=ik(this.zlevel,this.z,this.z2),tk(t,i),null!=e.text?this.drawRectText(t,this.getBoundingRect()):this.removeRectText(t)},Sr.prototype.onRemove=function(t){ek(t,this._vmlEl),this.removeRectText(t)},Sr.prototype.onAdd=function(t){tk(t,this._vmlEl),this.appendRectText(t)};qn.prototype.brushVML=function(t){var e,i,n=this.style,o=n.image;if(function(t){return"object"==typeof t&&t.tagName&&"IMG"===t.tagName.toUpperCase()}(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 u=n.x||0,h=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=BL.createElement("div"),JL(y),this._vmlEl=y);var x,_=y.style,w=!1,b=1,S=1;if(this.transform&&(x=this.transform,b=HL(x[0]*x[0]+x[1]*x[1]),S=HL(x[2]*x[2]+x[3]*x[3]),w=x[1]||x[2]),w){var M=[u,h],I=[u+c,h],T=[u,h+d],A=[u+c,h+d];bt(M,M,x),bt(I,I,x),bt(T,T,x),bt(A,A,x);var D=YL(M[0],I[0],T[0],A[0]),C=YL(M[1],I[1],T[1],A[1]),L=[];L.push("M11=",x[0]/b,jL,"M12=",x[2]/S,jL,"M21=",x[1]/b,jL,"M22=",x[3]/S,jL,"Dx=",WL(u*b+x[4]),jL,"Dy=",WL(h*S+x[5])),_.padding="0 "+WL(D)+"px "+WL(C)+"px 0",_.filter=qL+".Matrix("+L.join("")+", SizingMethod=clip)"}else x&&(u=u*b+x[4],h=h*S+x[5]),_.filter="",_.left=WL(u)+"px",_.top=WL(h)+"px";var k=this._imageEl,P=this._cropEl;k||(k=BL.createElement("div"),this._imageEl=k);var N=k.style;if(v){if(e&&i)N.width=WL(b*e*c/f)+"px",N.height=WL(S*i*d/p)+"px";else{var O=new Image,E=this;O.onload=function(){O.onload=null,e=O.width,i=O.height,N.width=WL(b*e*c/f)+"px",N.height=WL(S*i*d/p)+"px",E._imageWidth=e,E._imageHeight=i,E._imageSrc=o},O.src=o}P||((P=BL.createElement("div")).style.overflow="hidden",this._cropEl=P);var z=P.style;z.width=WL((c+g*c/f)*b),z.height=WL((d+m*d/p)*S),z.filter=qL+".Matrix(Dx="+-g*c/f*b+",Dy="+-m*d/p*S+")",P.parentNode||y.appendChild(P),k.parentNode!==P&&P.appendChild(k)}else N.width=WL(b*c)+"px",N.height=WL(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="+WL(100*B)+") "),R+=qL+".AlphaImageLoader(src="+o+", SizingMethod=scale)",N.filter=R,y.style.zIndex=ik(this.zlevel,this.z,this.z2),tk(t,y),null!=n.text&&this.drawRectText(t,this.getBoundingRect())}},qn.prototype.onRemove=function(t){ek(t,this._vmlEl),this._vmlEl=null,this._cropEl=null,this._imageEl=null,this.removeRectText(t)},qn.prototype.onAdd=function(t){tk(t,this._vmlEl),this.appendRectText(t)};var sk,lk="normal",uk={},hk=0,ck=document.createElement("div");GL=function(t,e){var i=BL;sk||((sk=i.createElement("div")).style.cssText="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;",BL.body.appendChild(sk));try{sk.style.font=e}catch(t){}return sk.innerHTML="",sk.appendChild(i.createTextNode(t)),{width:sk.offsetWidth}},un["measureText"]=GL;for(var dk=new Mi,fk=function(t,e,i,n){var o=this.style;this.__dirty&&kn(o);var a=o.text;if(null!=a&&(a+=""),a){if(o.rich){var r=wn(a,o);a=[];for(var s=0;s<r.lines.length;s++){for(var l=r.lines[s].tokens,u=[],h=0;h<l.length;h++)u.push(l[h].text);a.push(u.join(""))}a=a.join("\n")}var c,d,f=o.textAlign,p=o.textVerticalAlign,g=function(t){var e=uk[t];if(!e){100<hk&&(hk=0,uk={});var i,n=ck.style;try{n.font=t,i=n.fontFamily.split(",")[0]}catch(t){}e={style:n.fontStyle||lk,variant:n.fontVariant||lk,weight:n.fontWeight||lk,size:0|parseFloat(n.fontSize||12),family:i||"Microsoft YaHei"},uk[t]=e,hk++}return e}(o.font),m=g.style+" "+g.variant+" "+g.weight+" "+g.size+'px "'+g.family+'"';i=i||cn(a,m,f,p,o.textPadding,o.textLineHeight);var v=this.transform;if(v&&!n&&(dk.copy(e),dk.applyTransform(v),e=dk),n)c=e.x,d=e.y;else{var y=o.textPosition;if(y instanceof Array)c=e.x+nk(y[0],e.width),d=e.y+nk(y[1],e.height),f=f||"left";else{var x=this.calculateTextPosition?this.calculateTextPosition({},o,e):pn({},o,e);c=x.x,d=x.y,f=f||x.textAlign,p=p||x.textVerticalAlign}}c=dn(c,i.width,f),d=fn(d,i.height,p),d+=i.height/2;var _,w,b,S=VL,M=this._textVmlEl;M?w=(_=(b=M.firstChild).nextSibling).nextSibling:(M=S("line"),_=S("path"),w=S("textpath"),b=S("skew"),w.style["v-text-align"]="left",JL(M),_.textpathok=!0,w.on=!0,M.from="0 0",M.to="1000 0.05",tk(M,b),tk(M,_),tk(M,w),this._textVmlEl=M);var I=[c,d],T=M.style;v&&n?(bt(I,I,v),b.on=!0,b.matrix=v[0].toFixed(3)+jL+v[2].toFixed(3)+jL+v[1].toFixed(3)+jL+v[3].toFixed(3)+",0,0",b.offset=(WL(I[0])||0)+","+(WL(I[1])||0),b.origin="0 0",T.left="0px",T.top="0px"):(b.on=!1,T.left=WL(c)+"px",T.top=WL(d)+"px"),w.string=function(t){return String(t).replace(/&/g,"&amp;").replace(/"/g,"&quot;")}(a);try{w.style.font=m}catch(t){}ak(M,"fill",{fill:o.textFill,opacity:o.opacity},this),ak(M,"stroke",{stroke:o.textStroke,opacity:o.opacity,lineDash:o.lineDash||null},this),M.style.zIndex=ik(this.zlevel,this.z,this.z2),tk(t,M)}},pk=function(t){ek(t,this._textVmlEl),this._textVmlEl=null},gk=function(t){tk(t,this._textVmlEl)},mk=[Xn,jn,qn,Sr,Fr],vk=0;vk<mk.length;vk++){var yk=mk[vk].prototype;yk.drawRectText=fk,yk.removeRectText=pk,yk.appendRectText=gk}Fr.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)},Fr.prototype.onRemove=function(t){this.removeRectText(t)},Fr.prototype.onAdd=function(t){this.appendRectText(t)}}function xk(t){return parseInt(t,10)}function _k(t,e){!function(){if(!RL&&BL){RL=!0;var t=BL.styleSheets;t.length<31?BL.createStyleSheet().addRule(".zrvml","behavior:url(#default#VML)"):t[0].addRule(".zrvml","behavior:url(#default#VML)")}}(),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}_k.prototype={constructor:_k,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){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||xk(e.width))-xk(e.paddingLeft)-xk(e.paddingRight)|0},_getHeight:function(){var t=this.root,e=t.currentStyle;return(t.clientHeight||xk(e.height))-xk(e.paddingTop)-xk(e.paddingBottom)|0}},E(["getLayer","insertLayer","eachLayer","eachBuiltinLayer","eachOtherLayer","getLayers","modLayer","delLayer","clearLayer","toDataURL","pathToImage"],function(t){_k.prototype[t]=function(t){return function(){fi('In IE8.0 VML mode painter not support method "'+t+'"')}}(t)}),Do("vml",_k);function wk(t){return document.createElementNS("http://www.w3.org/2000/svg",t)}var bk=ir.CMD,Sk=Array.prototype.join,Mk="none",Ik=Math.round,Tk=Math.sin,Ak=Math.cos,Dk=Math.PI,Ck=2*Math.PI,Lk=180/Dk,kk=1e-4;function Pk(t){return Ik(1e4*t)/1e4}function Nk(t){return t<kk&&-kk<t}function Ok(t,e){e&&Ek(t,"transform","matrix("+Sk.call(e,",")+")")}function Ek(t,e,i){i&&("linear"===i.type||"radial"===i.type)||t.setAttribute(e,i)}function zk(t,e,i,n){if(function(t,e){var i=e?t.textFill:t.fill;return null!=i&&i!==Mk}(e,i)){var o=i?e.textFill:e.fill;Ek(t,"fill",o="transparent"===o?Mk:o),Ek(t,"fill-opacity",null!=e.fillOpacity?e.fillOpacity*e.opacity:e.opacity)}else Ek(t,"fill",Mk);if(function(t,e){var i=e?t.textStroke:t.stroke;return null!=i&&i!==Mk}(e,i)){var a=i?e.textStroke:e.stroke;Ek(t,"stroke",a="transparent"===a?Mk:a),Ek(t,"stroke-width",(i?e.textStrokeWidth:e.lineWidth)/(!i&&e.strokeNoScale?n.getLineScale():1)),Ek(t,"paint-order",i?"stroke":"fill"),Ek(t,"stroke-opacity",null!=e.strokeOpacity?e.strokeOpacity:e.opacity),e.lineDash?(Ek(t,"stroke-dasharray",e.lineDash.join(",")),Ek(t,"stroke-dashoffset",Ik(e.lineDashOffset||0))):Ek(t,"stroke-dasharray",""),e.lineCap&&Ek(t,"stroke-linecap",e.lineCap),e.lineJoin&&Ek(t,"stroke-linejoin",e.lineJoin),e.miterLimit&&Ek(t,"stroke-miterlimit",e.miterLimit)}else Ek(t,"stroke",Mk)}var Rk={};Rk.brush=function(t){var e=t.style,i=t.__svgEl;i||(i=wk("path"),t.__svgEl=i),t.path||t.createPathProxy();var n=t.path;if(t.__dirtyPath){n.beginPath(),n.subPixelOptimize=!1,t.buildPath(n,t.shape),t.__dirtyPath=!1;var o=function(t){for(var e=[],i=t.data,n=t.len(),o=0;o<n;){var a="",r=0;switch(i[o++]){case bk.M:a="M",r=2;break;case bk.L:a="L",r=2;break;case bk.Q:a="Q",r=4;break;case bk.C:a="C",r=6;break;case bk.A:var s=i[o++],l=i[o++],u=i[o++],h=i[o++],c=i[o++],d=i[o++],f=i[o++],p=i[o++],g=Math.abs(d),m=Nk(g-Ck)||(p?Ck<=d:Ck<=-d),v=0<d?d%Ck:d%Ck+Ck,y=!1;y=!!m||!Nk(g)&&Dk<=v==!!p;var x=Pk(s+u*Ak(c)),_=Pk(l+h*Tk(c));m&&(d=p?Ck-1e-4:1e-4-Ck,y=!0,9===o&&e.push("M",x,_));var w=Pk(s+u*Ak(c+d)),b=Pk(l+h*Tk(c+d));e.push("A",Pk(u),Pk(h),Ik(f*Lk),+y,+p,w,b);break;case bk.Z:a="Z";break;case bk.R:w=Pk(i[o++]),b=Pk(i[o++]);var S=Pk(i[o++]),M=Pk(i[o++]);e.push("M",w,b,"L",w+S,b,"L",w+S,b+M,"L",w,b+M,"L",w,b)}a&&e.push(a);for(var I=0;I<r;I++)e.push(Pk(i[o++]))}return e.join(" ")}(n);o.indexOf("NaN")<0&&Ek(i,"d",o)}zk(i,e,!1,t),Ok(i,t.transform),null!=e.text?Zk(t,t.getBoundingRect()):Xk(t)};var Bk={brush:function(t){var e=t.style,i=e.image;i instanceof HTMLImageElement&&(i=i.src);if(i){var n=e.x||0,o=e.y||0,a=e.width,r=e.height,s=t.__svgEl;s||(s=wk("image"),t.__svgEl=s),i!==t.__imageSrc&&(function(t,e,i){t.setAttributeNS("http://www.w3.org/1999/xlink",e,i)}(s,"href",i),t.__imageSrc=i),Ek(s,"width",a),Ek(s,"height",r),Ek(s,"x",n),Ek(s,"y",o),Ok(s,t.transform),null!=e.text?Zk(t,t.getBoundingRect()):Xk(t)}}},Vk={},Gk=new Mi,Fk={},Wk=[],Hk={left:"start",right:"end",center:"middle",middle:"middle"},Zk=function(t,e){var i=t.style,n=t.transform,o=t instanceof Fr||i.transformText;t.__dirty&&kn(i);var a=i.text;if(null!=a&&(a+=""),Un(a,i)){null==a&&(a=""),!o&&n&&(Gk.copy(e),Gk.applyTransform(n),e=Gk);var r=t.__textSvgEl;r||(r=wk("text"),t.__textSvgEl=r);var s=r.style,l=i.font||ln,u=r.__computedFont;l!==r.__styleFont&&(s.font=r.__styleFont=l,u=r.__computedFont=s.font);var h=i.textPadding,c=i.textLineHeight,d=t.__textCotentBlock;d&&!t.__dirtyText||(d=t.__textCotentBlock=_n(a,u,h,c,i.truncate));var f=d.outerHeight,p=d.lineHeight;Vn(Fk,t,i,e);var g=Fk.baseX,m=Fk.baseY,v=Fk.textAlign||"left",y=Fk.textVerticalAlign;!function(t,e,i,n,o,a,r){ie(Wk),e&&i&&ne(Wk,i);var s=n.textRotation;if(o&&s){var l=n.textOrigin;"center"===l?(a=o.width/2+o.x,r=o.height/2+o.y):l&&(a=l[0]+o.x,r=l[1]+o.y),Wk[4]-=a,Wk[5]-=r,re(Wk,Wk,s),Wk[4]+=a,Wk[5]+=r}Ok(t,Wk)}(r,o,n,i,e,g,m);var x=g,_=fn(m,f,y);h&&(x=function(t,e,i){return"right"===e?t-i[1]:"center"===e?t+i[3]/2-i[1]/2:t+i[3]}(g,v,h),_+=h[0]),_+=p/2,zk(r,i,!0,t);var w=d.canCacheByTextString,b=t.__tspanList||(t.__tspanList=[]),S=b.length;if(w&&t.__canCacheByTextString&&t.__text===a){if(t.__dirtyText&&S)for(var M=0;M<S;++M)Uk(b[M],v,x,_+M*p)}else{t.__text=a,t.__canCacheByTextString=w;var I=d.lines,T=I.length;for(M=0;M<T;M++){var A=b[M],D=I[M];A?A.__zrText!==D&&(A.innerHTML="",A.appendChild(document.createTextNode(D))):(A=b[M]=wk("tspan"),r.appendChild(A),A.appendChild(document.createTextNode(D))),Uk(A,v,x,_+M*p)}if(T<S){for(;M<S;M++)r.removeChild(b[M]);b.length=T}}}};function Uk(t,e,i,n){Ek(t,"dominant-baseline","middle"),Ek(t,"text-anchor",Hk[e]),Ek(t,"x",i),Ek(t,"y",n)}function Xk(t){t&&t.__textSvgEl&&(t.__textSvgEl.parentNode&&t.__textSvgEl.parentNode.removeChild(t.__textSvgEl),t.__textSvgEl=null,t.__tspanList=[],t.__text=null)}function Yk(){}function jk(t,e){for(var i=0,n=e.length,o=0,a=0;i<n;i++){var r=e[i];if(r.removed){for(s=[],l=a;l<a+r.count;l++)s.push(l);r.indices=s,a+=r.count}else{for(var s=[],l=o;l<o+r.count;l++)s.push(l);r.indices=s,o+=r.count,r.added||(a+=r.count)}}return e}Vk.drawRectText=Zk,Vk.brush=function(t){null!=t.style.text?Zk(t,!1):Xk(t)},Yk.prototype={diff:function(l,u,t){t=t||function(t,e){return t===e},this.equals=t;var h=this;l=l.slice();var c=(u=u.slice()).length,d=l.length,f=1,e=c+d,p=[{newPos:-1,components:[]}],i=this.extractCommon(p[0],u,l,0);if(p[0].newPos+1>=c&&d<=i+1){for(var n=[],o=0;o<u.length;o++)n.push(o);return[{indices:n,count:u.length}]}function a(){for(var t=-1*f;t<=f;t+=2){var e,i=p[t-1],n=p[t+1],o=(n?n.newPos:0)-t;i&&(p[t-1]=void 0);var a=i&&i.newPos+1<c,r=n&&0<=o&&o<d;if(a||r){if(!a||r&&i.newPos<n.newPos?(e={newPos:(s=n).newPos,components:s.components.slice(0)},h.pushComponent(e.components,void 0,!0)):((e=i).newPos++,h.pushComponent(e.components,!0,void 0)),o=h.extractCommon(e,u,l,t),e.newPos+1>=c&&d<=o+1)return jk(h,e.components,u,l);p[t]=e}else p[t]=void 0}var s;f++}for(;f<=e;){var r=a();if(r)return r}},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 qk=new Yk;function Kk(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 $k(t,e){Kk.call(this,t,e,["linearGradient","radialGradient"],"__gradient_in_use__")}function Jk(t,e){Kk.call(this,t,e,"clipPath","__clippath_in_use__")}function Qk(t,e){Kk.call(this,t,e,["filter"],"__filter_in_use__","_shadowDom")}function tP(t){return t&&(t.shadowBlur||t.shadowOffsetX||t.shadowOffsetY||t.textShadowBlur||t.textShadowOffsetX||t.textShadowOffsetY)}function eP(t){return parseInt(t,10)}function iP(t,e){return e&&t&&e.parentNode!==t}function nP(t,e,i){if(iP(t,e)&&i){var n=i.nextSibling;n?t.insertBefore(e,n):t.appendChild(e)}}function oP(t,e){if(iP(t,e)){var i=t.firstChild;i?t.insertBefore(e,i):t.appendChild(e)}}function aP(t,e){e&&t&&e.parentNode===t&&t.removeChild(e)}function rP(t){return t.__textSvgEl}function sP(t){return t.__svgEl}Kk.prototype.createElement=wk,Kk.prototype.getDefs=function(t){var e=this._svgRoot,n=this._svgRoot.getElementsByTagName("defs");return 0===n.length?t?((n=e.insertBefore(this.createElement("defs"),e.firstChild)).contains||(n.contains=function(t){var e=n.children;if(!e)return!1;for(var i=e.length-1;0<=i;--i)if(e[i]===t)return!0;return!1}),n):null:n[0]},Kk.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)}}},Kk.prototype.addDom=function(t){this.getDefs(!0).appendChild(t)},Kk.prototype.removeDom=function(t){var e=this.getDefs(!1);e&&t[this._domName]&&(e.removeChild(t[this._domName]),t[this._domName]=null)},Kk.prototype.getDoms=function(){var i=this.getDefs(!1);if(!i)return[];var n=[];return E(this._tagNames,function(t){var e=i.getElementsByTagName(t);n=n.concat([].slice.call(e))}),n},Kk.prototype.markAllUnused=function(){var t=this.getDoms(),e=this;E(t,function(t){t[e._markLabel]="0"})},Kk.prototype.markUsed=function(t){t&&(t[this._markLabel]="1")},Kk.prototype.removeUnused=function(){var e=this.getDefs(!1);if(e){var t=this.getDoms(),i=this;E(t,function(t){"1"!==t[i._markLabel]&&e.removeChild(t)})}},Kk.prototype.getSvgProxy=function(t){return t instanceof Sr?Rk:t instanceof qn?Bk:t instanceof Fr?Vk:Rk},Kk.prototype.getTextSvgElement=function(t){return t.__textSvgEl},Kk.prototype.getSvgElement=function(t){return t.__svgEl},w($k,Kk),$k.prototype.addWithoutUpdate=function(a,r){if(r&&r.style){var s=this;E(["fill","stroke"],function(t){if(r.style[t]&&("linear"===r.style[t].type||"radial"===r.style[t].type)){var e,i=r.style[t],n=s.getDefs(!0);i._dom?(e=i._dom,n.contains(i._dom)||s.addDom(e)):e=s.add(i),s.markUsed(r);var o=e.getAttribute("id");a.setAttribute(t,"url(#"+o+")")}})}},$k.prototype.add=function(t){var e;if("linear"===t.type)e=this.createElement("linearGradient");else{if("radial"!==t.type)return fi("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},$k.prototype.update=function(i){var n=this;Kk.prototype.update.call(this,i,function(){var t=i.type,e=i._dom.tagName;"linear"===t&&"linearGradient"===e||"radial"===t&&"radialGradient"===e?n.updateDom(i,i._dom):(n.removeDom(i),n.add(i))})},$k.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 fi("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+"%");var r=i[n].color;if(r.indexOf(!1)){var s=Re(r)[3],l=Ge(r);a.setAttribute("stop-color","#"+l),a.setAttribute("stop-opacity",s)}else a.setAttribute("stop-color",i[n].color);e.appendChild(a)}t._dom=e},$k.prototype.markUsed=function(t){if(t.style){var e=t.style.fill;e&&e._dom&&Kk.prototype.markUsed.call(this,e._dom),(e=t.style.stroke)&&e._dom&&Kk.prototype.markUsed.call(this,e._dom)}},w(Jk,Kk),Jk.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)},Jk.prototype.updateDom=function(t,e,i){if(e&&0<e.length){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 u=Array.prototype.slice.call(r.transform);oe(r.transform,r.parent.invTransform,r.transform),l.brush(r),r.transform=u}else l.brush(r);var h=this.getSvgElement(r);n.innerHTML="",n.appendChild(h.cloneNode()),t.setAttribute("clip-path","url(#"+o+")"),1<e.length&&this.updateDom(n,e.slice(1),i)}else t&&t.setAttribute("clip-path","none")},Jk.prototype.markUsed=function(t){var e=this;t.__clipPaths&&E(t.__clipPaths,function(t){t._dom&&Kk.prototype.markUsed.call(e,t._dom),t._textDom&&Kk.prototype.markUsed.call(e,t._textDom)})},w(Qk,Kk),Qk.prototype.addWithoutUpdate=function(t,e){if(e&&tP(e.style)){var i;if(e._shadowDom)i=e._shadowDom,this.getDefs(!0).contains(e._shadowDom)||this.addDom(i);else i=this.add(e);this.markUsed(e);var n=i.getAttribute("id");t.style.filter="url(#"+n+")"}},Qk.prototype.add=function(t){var e=this.createElement("filter");return t._shadowDomId=t._shadowDomId||this.nextId++,e.setAttribute("id","zr"+this._zrId+"-shadow-"+t._shadowDomId),this.updateDom(t,e),this.addDom(e),e},Qk.prototype.update=function(t,e){if(tP(e.style)){var i=this;Kk.prototype.update.call(this,e,function(){i.updateDom(e,e._shadowDom)})}else this.remove(t,e)},Qk.prototype.remove=function(t,e){null!=e._shadowDomId&&(this.removeDom(t),t.style.filter="")},Qk.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,u=t.scale&&t.scale[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/u),i.setAttribute("flood-color",r);var h=a/2/l+" "+a/2/u;i.setAttribute("stdDeviation",h),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),t._shadowDom=e},Qk.prototype.markUsed=function(t){t._shadowDom&&Kk.prototype.markUsed.call(this,t._shadowDom)};function lP(t,e,i,n){this.root=t,this.storage=e,this._opts=i=L({},i||{});var o=wk("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 $k(n,o),this.clipPathManager=new Jk(n,o),this.shadowManager=new Qk(n,o);var a=document.createElement("div");a.style.cssText="overflow:hidden;position:relative",this._svgRoot=o,this._viewport=a,t.appendChild(a),a.appendChild(o),this.resize(i.width,i.height),this._visibleList=[]}lP.prototype={constructor:lP,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)},setBackgroundColor:function(t){this._viewport.style.background=t},_paintList:function(t){this.gradientManager.markAllUnused(),this.clipPathManager.markAllUnused(),this.shadowManager.markAllUnused();var e,i,n=this._svgRoot,o=this._visibleList,a=t.length,r=[];for(e=0;e<a;e++){var s=t[e],l=(i=s)instanceof Sr?Rk:i instanceof qn?Bk:i instanceof Fr?Vk:Rk,u=sP(s)||rP(s);s.invisible||(s.__dirty&&(l&&l.brush(s),this.clipPathManager.update(s),s.style&&(this.gradientManager.update(s.style.fill),this.gradientManager.update(s.style.stroke),this.shadowManager.update(u,s)),s.__dirty=!1),r.push(s))}var h,c=function(t,e,i){return qk.diff(t,e,i)}(o,r);for(e=0;e<c.length;e++){if((p=c[e]).removed)for(var d=0;d<p.count;d++){u=sP(s=o[p.indices[d]]);var f=rP(s);aP(n,u),aP(n,f)}}for(e=0;e<c.length;e++){var p;if((p=c[e]).added)for(d=0;d<p.count;d++){u=sP(s=r[p.indices[d]]),f=rP(s);h?nP(n,u,h):oP(n,u),u?nP(n,f,u):h?nP(n,f,h):oP(n,f),nP(n,f,u),h=f||u||h,this.gradientManager.addWithoutUpdate(u||f,s),this.shadowManager.addWithoutUpdate(u||f,s),this.clipPathManager.markUsed(s)}else if(!p.removed)for(d=0;d<p.count;d++){u=sP(s=r[p.indices[d]]),f=rP(s),u=sP(s),f=rP(s);this.gradientManager.markUsed(s),this.gradientManager.addWithoutUpdate(u||f,s),this.shadowManager.markUsed(s),this.shadowManager.addWithoutUpdate(u||f,s),this.clipPathManager.markUsed(s),f&&nP(n,f,u),h=u||f||h}}this.gradientManager.removeUnused(),this.clipPathManager.removeUnused(),this.shadowManager.removeUnused(),this._visibleList=r},_getDefs:function(t){var n,e=this._svgRoot;return 0!==(n=this._svgRoot.getElementsByTagName("defs")).length?n[0]:t?((n=e.insertBefore(wk("defs"),e.firstChild)).contains||(n.contains=function(t){var e=n.children;if(!e)return!1;for(var i=e.length-1;0<=i;--i)if(e[i]===t)return!0;return!1}),n):null},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]||eP(s[i])||eP(r.style[i]))-(eP(s[o])||0)-(eP(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)},pathToDataUrl:function(){return this.refresh(),"data:image/svg+xml;charset=UTF-8,"+this._svgRoot.outerHTML}},E(["getLayer","insertLayer","eachLayer","eachBuiltinLayer","eachOtherLayer","getLayers","modLayer","delLayer","clearLayer","toDataURL","pathToImage"],function(t){lP.prototype[t]=function(t){return function(){fi('In SVG mode painter not support method "'+t+'"')}}(t)}),Do("svg",lP),t.version="4.6.0",t.dependencies={zrender:"4.2.0"},t.PRIORITY=Id,t.init=function(t,e,i){var n=cf(t);if(n)return n;var o=new kd(t,e,i);return o.id="ec_"+rf++,of[o.id]=o,jo(t,lf,o.id),function(n){var o="__connectUpdateStatus";function a(t,e){for(var i=0;i<t.length;i++){t[i][o]=e}}wd(Kd,function(t,e){n._messageCenter.on(e,function(t){if(af[n.group]&&0!==n[o]){if(t&&t.escapeConnect)return;var e=n.makeActionFromEvent(t),i=[];wd(of,function(t){t!==n&&t.group===n.group&&i.push(t)}),a(i,0),wd(i,function(t){1!==t[o]&&t.dispatchAction(e)}),a(i,2)}})})}(o),o},t.connect=function(e){if(k(e)){var t=e;e=null,wd(t,function(t){null!=t.group&&(e=t.group)}),e=e||"g_"+sf++,wd(t,function(t){t.group=e})}return af[e]=!0,e},t.disConnect=uf,t.disconnect=hf,t.dispose=function(t){"string"==typeof t?t=of[t]:t instanceof kd||(t=cf(t)),t instanceof kd&&!t.isDisposed()&&t.dispose()},t.getInstanceByDom=cf,t.getInstanceById=function(t){return of[t]},t.registerTheme=df,t.registerPreprocessor=ff,t.registerProcessor=pf,t.registerPostUpdate=function(t){Qd.push(t)},t.registerAction=gf,t.registerCoordinateSystem=mf,t.getCoordinateSystemDimensions=function(t){var e=nh.get(t);if(e)return e.getDimensionsInfo?e.getDimensionsInfo():e.dimensions.slice()},t.registerLayout=vf,t.registerVisual=yf,t.registerLoading=_f,t.extendComponentModel=wf,t.extendComponentView=bf,t.extendSeriesModel=Sf,t.extendChartView=Mf,t.setCanvasCreator=function(t){f("createCanvas",t)},t.registerMap=function(t,e,i){yd.registerMap(t,e,i)},t.getMap=function(t){var e=yd.retrieveMap(t);return e&&e[0]&&{geoJson:e[0].geoJSON,specialAreas:e[0].specialAreas}},t.dataTool={},t.zrender=Lo,t.number=ql,t.format=cu,t.throttle=Ic,t.helper=yg,t.matrix=he,t.vector=It,t.color=je,t.parseGeoJSON=Mg,t.parseGeoJson=Rg,t.util=Bg,t.graphic=Vg,t.List=Wf,t.Model=Il,t.Axis=Eg,t.env=v});
diff --git a/miniprogram/ec-canvas/wx-canvas.js b/miniprogram/ec-canvas/wx-canvas.js
new file mode 100644
index 0000000..422b807
--- /dev/null
+++ b/miniprogram/ec-canvas/wx-canvas.js
@@ -0,0 +1,121 @@
+export default class WxCanvas {
+  constructor(ctx, canvasId, isNew, canvasNode) {
+    this.ctx = ctx;
+    this.canvasId = canvasId;
+    this.chart = null;
+    this.isNew = isNew
+    if (isNew) {
+      this.canvasNode = canvasNode;
+    }
+    else {
+      this._initStyle(ctx);
+    }
+
+    // this._initCanvas(zrender, ctx);
+
+    this._initEvent();
+  }
+
+  getContext(contextType) {
+    if (contextType === '2d') {
+      return this.ctx;
+    }
+  }
+
+  // canvasToTempFilePath(opt) {
+  //   if (!opt.canvasId) {
+  //     opt.canvasId = this.canvasId;
+  //   }
+  //   return wx.canvasToTempFilePath(opt, this);
+  // }
+
+  setChart(chart) {
+    this.chart = chart;
+  }
+
+  attachEvent() {
+    // noop
+  }
+
+  detachEvent() {
+    // noop
+  }
+
+  _initCanvas(zrender, ctx) {
+    zrender.util.getContext = function () {
+      return ctx;
+    };
+
+    zrender.util.$override('measureText', function (text, font) {
+      ctx.font = font || '12px sans-serif';
+      return ctx.measureText(text);
+    });
+  }
+
+  _initStyle(ctx) {
+    var styles = ['fillStyle', 'strokeStyle', 'globalAlpha',
+      'textAlign', 'textBaseAlign', 'shadow', 'lineWidth',
+      'lineCap', 'lineJoin', 'lineDash', 'miterLimit', 'fontSize'];
+
+    styles.forEach(style => {
+      Object.defineProperty(ctx, style, {
+        set: value => {
+          if (style !== 'fillStyle' && style !== 'strokeStyle'
+            || value !== 'none' && value !== null
+          ) {
+            ctx['set' + style.charAt(0).toUpperCase() + style.slice(1)](value);
+          }
+        }
+      });
+    });
+
+    ctx.createRadialGradient = () => {
+      return ctx.createCircularGradient(arguments);
+    };
+  }
+
+  _initEvent() {
+    this.event = {};
+    const eventNames = [{
+      wxName: 'touchStart',
+      ecName: 'mousedown'
+    }, {
+      wxName: 'touchMove',
+      ecName: 'mousemove'
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'mouseup'
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'click'
+    }];
+
+    eventNames.forEach(name => {
+      this.event[name.wxName] = e => {
+        const touch = e.touches[0];
+        this.chart.getZr().handler.dispatch(name.ecName, {
+          zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
+          zrY: name.wxName === 'tap' ? touch.clientY : touch.y
+        });
+      };
+    });
+  }
+
+  set width(w) {
+    if (this.canvasNode) this.canvasNode.width = w
+  }
+  set height(h) {
+    if (this.canvasNode) this.canvasNode.height = h
+  }
+
+  get width() {
+    if (this.canvasNode)
+      return this.canvasNode.width
+    return 0
+  }
+  get height() {
+    if (this.canvasNode)
+      return this.canvasNode.height
+    return 0
+  }
+}
diff --git a/miniprogram/images/biyan.png b/miniprogram/images/biyan.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce424972552ec1a5c62e06bd77ac333c3da7cb82
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px${YgYYR9HvtR>6(JFc91g6v9b35>)_|Kq}#=1gL~`ffOT=s{_NHCbE$+b^<z1
ze3BpFcxGp3XJPvA!ym?{o<Og_zbSAy97ZtsWHPDSjQ(c=0183y-EcVEFmpW~kBhev
zsH$q2W!dz4z0R1qsnB~$V@v}Ea1j~hdH&Tk=A8;?tpT<WktHr;=B<d-BJzU@eE?%j
z{R((<UmHWM^@@nTiKrBjU7qLL)OjbntK5D*iAd4*UXp;;dQU_%5Kv03W57^HDOHBx
z?koy`a!}0}vx^xrN&w)fgqaHfgx~-c5tyv#lHHxnvaCFx&+CxH0|8I=c?{f1OGNW7
za7P^P3<iTelnB+lBLKEU1nHyTxX`v{9fI3R;rysiFhNAL3RS%k@G498+!C0@DnA~N
z&FCqm<|(5(Px#|`r$ALzC%k;QT;{0+OBoIXkPmIM5B0)udT4<)SJbsB@MqL>#tsR#
zneeU^A-MI+)Q&2qqE1zh{xkC?=B?Bix&UfOc%gCw@n#(3x=m%imnTtUCxghcuC3va
zXvqp=rt=j`<w<80hm}9GVlD9nTGOVCBb`*hg$E9zw_ZlLcbkNSt1*5yIhzd$;8^O#
zlxkf@sKyT#7dBYQxXglrK(ie!+2q1{nLyVrf5-2g{|DXy(soBrpjV(*;1}qXn=t<R
RWxD_X002ovPDHLkV1kDI1QY-O

literal 0
HcmV?d00001

diff --git a/miniprogram/images/bottom.png b/miniprogram/images/bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fbe5f462f0c14bc4177f5e76650cc3f91bdc4c3
GIT binary patch
literal 1280
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdSymnK_x8nL9eUxmg$*x;k2#8@oBXnYkIb
zSsGZFnY+OBy5uL9=BDPA!1Sgd^g7|x3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G_81
z=0WwQ;C728PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n8}7zVV_;w`_H=O!
zskrrKny)vLqr~yMR|Nhr#QqkDwVu)_A(AL2=k@AJ`-dk7&npPJu)k!jvMyP<uC}F1
z<oca5?<=d>`Hy~+|Dn&Lw8?mP#jQs9&F6J~&8|#)7I?Vy?hTz=F*$C!LYdoLzG~b^
z)R33{=kiAUfKUa?e#i9wlgls2HiY{;arL_^T)|+TV8?ROc12_Qk<3Vwl>MA~C8<Ax
zKJJX3@brSX#K}dn7oHT$&1qiJ_Jr?=MGB{4(0BFjx&vAnhWD1~tW(&@_F87sK`xcK
zp2vSj?_p7U+$1ll8lKSX%%?j4^1F%7k+VPQt?-|yx^sDSve4!8ty^ch<==EIFms&t
zpzCwcFXIVYLbRHXPL1sOeqg0acW_X`9ns0nOI8LqS;fpeyMx7V#yTtiRT;KkQjS@%
zv$cyQ<UdJ?NPgG+$+39FtmI9u-<ZAb9bR)UsoD5Wf&V79do|(tt*7;aw()#BsG6bi
t*GFTT@y2w~xmFo2^?phdum59}U|`sjc_S`;-d0eV<mu|?vd$@?2>?Yv!Y2R#

literal 0
HcmV?d00001

diff --git a/miniprogram/images/core.png b/miniprogram/images/core.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b89e0b66af0fb5d2d2545b831c7c01160d3587a
GIT binary patch
literal 1091
zcmaJ=T}TvB7#$PLAFQniQWS1uMv*%|ySloQ+q&!Q=te8DExADt&dyxjL1*qXb9Kjk
z(ulC9f*>LxLLcfOL=vJXD$0l+f}*#e2cbZE$cV@u1iPcI_RuzP=l*cc`Of#<?_Tch
z>8h@*t)wWbI^HcN$qd|4UPk_QKL3+UH8_^Wr_lh;$rhv{D#}0**X2Q&gt9tz{taxW
zsL}>4mB#7BDM3LxBfA*J(M`gpsP?d9%E}PLAOi<ABSbGhentaL4bgoq2`*uF!mQSv
zx8Uh~PfE!TDM6JEp8)NSKm>G%W#H(;hAlWDdR<o_YxkI?!8!yFh3E}a=|nH+L>2@s
zOu(z~&26AH$nb$?&L3z3K8_EvTpP>#y&Nxa0imT8Y<@I}W~l>0Qj|7hkzI(+Vr&X5
zo6F^xoS#9~Aj=1XM8n7Wd|ra^+G7Tm9j{?G6cj{gE0$(r4H>{ylrv}qhiKw-BL&^u
zk~QqjGLeF@j%>0#!?`IHfQiKap}M|>ws8_}`~9b|of<PCn}jwRu@rJ~0}XB{Q|Ppy
zjFFW>Xt+?t-Ymk%&LR`|h$V2OPcu}MvyZM55(y!0*jP3c7#Bk{kzh1U6}aXo=Z{7C
zs3f)Wd@K@_{H;=(pAT?8E*6lY1+Ivc5gi)1z*V=ozM@>W7j%<E7NMn$LRGSm4%TxP
zw4z=jQc=B4u3Fp+SCq>VGpu{Ff8BK9h_sKp-0EAh+3I{~kao97Uw1aXzD3@|gSZ$;
zIUh5tYir?`9Xk$RDk+=U)gQ?m>)=Dr74WobU}En<&&ukZ@Qup*Q+sY!ef#i!h5KGR
z`Kn**U#7&h3QtK@$<^ihr300H6TjO$VY$vbDb;i7lP`L~uW5yOShjF{!r6E4(76_>
zak1v=r@14Z`laS~<qJEPvdd?|Y>cVsnqRzITJ{9g&V4;_#`Csr{6coWb#3_e54xeL
r`seQPFZ1uJrc1QzSFT^2*+rFeRI+d8v;Wc5sQawru^w?Y+JE5>6SiNA

literal 0
HcmV?d00001

diff --git a/miniprogram/images/cz_1.png b/miniprogram/images/cz_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9922e2cc202edd456f79c6c602b6811f2d869e40
GIT binary patch
literal 1960
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/cz_2.png b/miniprogram/images/cz_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab1015620c87cf011678e18615fd6194720cb834
GIT binary patch
literal 1317
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdT<<x*0mV8kv|nS(qCdx;j}HJDWNiIhvRo
znmd{sI=R90y5uL9=BDPA!1Sgd^qS(-3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G_`P
z=0WwQ;C72KPQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n2bbMZU|?XJ;pyTS
zQgJKk&;S4ShaDKi1OzuTEUz&am>zI)-C2h>+f^73B{B*2{NMOUK|$}JqC4L=)<>Qi
zc4<G_ueR>=c*7px!zaL+l&fO=`GJ`6KjjsX6AvZq<2|A!QRs8v5pzh#ef1wY=NKLp
z$Vh#koDpa$Ag?@QmE^ys!*xP@rhF+sK4=KMX8x$U2dMYxhADR*xRyO}Q7Ai-|IvQR
zjtNT*?EVYKHW>VEUA@=2wWWli{)@pP7E`MSY>yZe!c;FA1;ngV-g)9k(nc`>eZ_-w
zu3y>oL+zo0Gh_70RVoty6FTY-O;=hOW}W!auy&Q}vi%mHRW>^AZMfpaGQFSILq{#R
zF=CcfA&=M6@QJI8ogRp7ee^?9;5E<vBdv#%0{&_`JGuTB>EFY&aFf)|C%e3w*w;Pk
znDuvtWwT&D_Y?6>#qX^rs`j)81l(_2mSL!*Tj$_1In$`9k}tb4f%*D^8A1*v&JI(!
zIIlJS2<hDrAwA1!{)EhxT$wjt%I~Ot*u5mOmCG)^(|;1@t;rvlADw(4$68t-Cvg6N
e7CS2gBO61R&V;}Z$5KIsAcLo?pUXO@geCy8Rm{x*

literal 0
HcmV?d00001

diff --git a/miniprogram/images/dingwei.png b/miniprogram/images/dingwei.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fb08c309a74bd5256f8d53b4b699dd8240ac0b8
GIT binary patch
literal 4176
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/early.png b/miniprogram/images/early.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca7aca0c3ec3997d8f3a91c2efcd4a90e11038a4
GIT binary patch
literal 3302
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/fanhui.png b/miniprogram/images/fanhui.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa8bdaa3d5281ec53b07963a7a5607dd18cd7078
GIT binary patch
literal 1304
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdXM~85$cox|+Khn3)(Fx;i>K8#z0>nwuDy
zy16(S8aTrAy5uL9=BDPA!1Sgd^jhH53rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{s<
z=0WwQ;C71{PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|nVO_@-GcYiAd%8G=
zRNQ(q{cYf31D>|*_<zA_E6f#?E0}LE7;{Q4l-`nafUSj7N^OD91%pQIr%x1mgm?c`
zD3{q)t>63fM`v<mSnJlZtu3Cr?ls0axN&TJq$I!ZF6WXO``61?@O!cUX_MHc_^8Km
z>0hJ6_j%rNKf4@j>>&R-yu$8q&55k^m`!!o@^;5E*2rex+CE>(j&<L|%U3=yd|`~>
zwJ6rTkf3qlon(zz#_nVHn5%!^<zv3~<3aDk<7fQ~*#86-s9$L`{x$LN(`i5NIhtnJ
z7R}VYz;>)YC3n5V8OiQft0h0V_&sV9-ZhO|Wv$w5j;LhUSM^REMnWg87;AF2xU73N
zGkc@+Bl$n&2la{{hTU@cRd=XtmC&}}oY^&7ZgYm*HaX4yB<sGP^R~-XtIj+v+Pdsk
zm-M~+JuQ10=k48QR3XQnwIs6dXn^7a=hci4tim`>MC=s$5u&-R_iBOBPPbhqO$*vy
zH=nj#pjlv^Y;3xPJ@1D-r?cq3mmITZHTisHnV#ghl=)wighgC*<DXq~StS_kw|Oaj
T`sQ~MR91Pq`njxgN@xNAQj*i(

literal 0
HcmV?d00001

diff --git a/miniprogram/images/foot_1.png b/miniprogram/images/foot_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b00a21c4b60288ba7284cf15fee0a59c03e5646
GIT binary patch
literal 1225
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_(<M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iG_l>rJkXg
ziGi`1j)IYap{2fog}$M&u7RPIfti)5xdId@0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2H0?jbeH!{)%s?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B>
zw8T~k=u(Imatq+b<`qMO2^e7d6^RA<hI$4dFToW0`r=obn+sQ6ToROua4%Mai$f|4
zQuTvUi}Op1l7SJIrVO&Gz{<HOHL)bWC?r2W2NsF}8Tlpo#Toep3PwODDQJXe=B4D9
z7i)qw`1)FT<`tJD<|U_ky4WfKjnK=?OtCU@aWrspaWyh=H8VFfbaiqvbTxEwb~7}$
zG_^3YaCU;}b;(aI%}vcKf$2>_=rzWv7nBxq3xGDeq!wkCrKY$Q<>xAZ{cM$q+bsq-
z&4cPq!R;19oO<<vj?o9jEK*Fvgn-Eh#Du3?AP1iEQ}ckyy$G1D*R+4R#=yX6<LTlU
zQgJKk&;S4ShZ9(Qc$!6eta7d-F6NUiy|Lo3+pNP89#;d*-&#eAnWko5GCgvm!Ggb|
zpZR0Dh8>@1^5X0cMaE2pdrU{zG9HNq%;7j<=kRCByv!cn_QewzJ@T{#Hcx(SFhNzg
z@rSO!{^m`buFh7B?gty}1eOav^yK;N7<iM_SJ;3dsh<52mra}N#0QlVZk?=nvhfx_
z*Tx8)u3*lHG?%8sJe((zx6YS)dLzH+@{J^&N5vd3tlgVr!#RM$@>7nTYM3FY>EXzg
z%_*@>CQ3zsd7AKq<5~8~EBC5ooaEPH@^dPdwJYH4INR_;eXrNQ`3`S*kBEO*v6JIS
zT)@_nwMQIPcUcOEGkla(_{ViLeL+&%lWD)Egn24_;Eq!8TT&L5CiAwlA30QH+r$}I
ZBp9X?I5p{N3nzjK7f)9|mvv4FO#n6knmqsj

literal 0
HcmV?d00001

diff --git a/miniprogram/images/foot_2.png b/miniprogram/images/foot_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..908ddb87d07e5418438d2737bb8fe6fb29a5a916
GIT binary patch
literal 1218
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_(<M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iG_l>rJkXg
ziGi`1j)IYap{2fog}$M&u7RPIfti)5xdId@0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2H0?jbeH!{)%s?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B>
zw8T~k=u(Imatq+b<`qMO2^e7d6^RA<hI$4dFToW0`r=obn+sQ6ToROua4%Mai$f|4
zQuTvUi}Op1l7SJIrVO&Gz{<HOHL)bWC?r2W2NsF}8Tlpo#Toep3PwODDQJXe=B4D9
z7i)qw`1)FT<`tJD<|U_ky4WfKjnK=?OtCUIFfliGb}=$>H8V3bbak?DHZyj%G&i#_
zH+6C|HFbpPb;(aI%}vcKf$2>_=rzWv7nBxq3xGDeq!wkCrKY$Q<>xAZ{cM$q+bsq-
z&4cPq!R;19oO<<vj?o9jEK*Fvgn-Eh#Du3?AP1iEQ}ckyy$G1DWeTRfU|?W0^>lFz
zskrqf!ke$jKwxQ`?z)v9ndDko_Oz_CY2iLBd8d-+abI=?lYMq#{PMI}TiUb~*2bRk
zj^ikqR5{nL@}z;Hi-?k1{(II9OxGM9cA7pr!>hU}=|s>U`K6Z@yF68r5!toDE82o_
zXPD>pCo_T_vpOZr{xi>b@bX;4_IRoC-S*{ucXP!)9c&E$qf(u>YL@-Qq~k(U6OE!T
zpWe#z`0E_c+iQE=)?8uKPGmkl!*4(L{e-xd#Qhp;8o%>D6n}7PmBj4$lAEpF+zWD#
zU3lPggF!;-kv`+Wiqs8iay*ah!fzz^Z{_-2rmVYP(%k*#^+|iaNJI*uz)7<O4>EXr
zZJl%0+xv9DQw|?nzR+hgE=#Ohaa8GwVaSGN>!YgEHht7sc5qJXy4F@JnK~{5hLqgI
UnW`H%r-4cpPgg&ebxsLQ00nQMq5uE@

literal 0
HcmV?d00001

diff --git a/miniprogram/images/foot_3.png b/miniprogram/images/foot_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf61a264a08b1b07908ccce8d7642b12838b2563
GIT binary patch
literal 1922
zcmaJ?X;c$u6pag!Ego^fYF)-47(ud;L<j^3B#~_(CJ}KhAsHaxWWr=L0j(gY9KZ#^
z1yMv%DWWJsz_kL3qEZpGMOhTBMnx#1R_cPK6BX@`(m7}5Th6`r-S@utok<f1&m&n*
zwj>Y;B!54F1RottuQ?I_7V$cd<HICO7=}raNK7Y3Ap&2CL_mN)ERTXDkX#ubcMb9&
z5JuRkWMNns7{pZ|Fja2CQ1!3|XA=k>UV4pO5es2J1QexG^T;pGRgnRel1E<12I-*2
z7m8N-C7_TrAy}qJh*h{L$zGm-hn|ZIzz`+}^zaI`maFHHKk0JuxoMk520lTsSRVPa
zsW4Cs_#!9-u&Eqp1%u@Z%ypwOI4rsgXAZ!mGu&u&R~o~`na<$SIb8N!;LAhCqoK-3
zu0$aE5({7P$k7<4;nHY2osOz=p(1D$jp62oYcOd{rZbLk*2b$bx!zf=wHs6rKw1T=
z(qJk?4VV<=5y(o6N5-9gP65_@l~rrMlnE~wO)uBb7*x6`r9mJF{y!9kzoNC61p4Op
zKZUijcnw68Kw4xas=yB}(#{l0!}UcWIfkGz1X(dyMR7EOA=+p}12Az*0A-;{tweO%
z*`Ej?$n{riF}Yd+`3rbtT!N}nDY>p}mJdfn=dgqv4uc`|;j;xIA)6s|WwS+dg-qrk
zSAZy1!jKvp<SM^$=MKp=^#ZKHBMTr@wF**-Py_}(<;+zL?S(a@-WRTNXfNy`xis7i
z&2+N=I_beJynRg5uYHRzzIHyO#@ijm`&t+S*y7jajlX~|)3+LOK)(s|$Jcd4ds_Lx
z4+~B?2}%s0z2^pvG$UD3E>z}=GZuyuCF<n$l(=nUTgZ-%OJ%u}jm7(g@8<KT`>6W(
zMHUvh{H)yIf!L=PJDD!Jp7S2Pik@FS<_xsEJ#BYav{X)I8t4><0$_My%^1DKV!rz_
zE45F~F#GW8<~`BU7}q|pw{VVm46HqR_=1%~&;+(+F`w$^fOfVPrJOdi2`y|dGCP!D
zn7HyrKz`YP^Bikp3#n&#eO<LJFUc@ta#xi_Tgmwg<5OycZOF02GijwG!A9HiS7yDJ
zfCs|1*HncHoV8+v)2UHcMSm@d|Ji?DV0L)oI;A6xC>@q{vfJgxmGsqDey_iuxWSB>
zS85a5Fq-~%z^;>qN<ZlUQ7MUc*Ta+*PEJ+5G5X?{dD}`kVv+IS{`&w^>V25GGc>bf
zVSMT;(#2afY#aL8<n-3U+wbU`je*<qCyi@JoYG$STGD7eI@w~E=aC1N6+1$&*|i2{
zc1+4H53OssO!7*K$sCbId5=EJEo!T2z4Nl=mEHA_Y1uo?sq1_<HYD1}k``4Z_g@Iu
z{qbluCnfG_)cA<piR7)$qfS-3luENJV9P99@#tpnUx6);WKmLqwqwVg4?)X~4vn=1
z0j=6zg2%9r;nqQ1!4j|f#P-Omv+|CO!4huVUEWwDXklq%`O{oU)0(Wovxky`91dj~
z>9e1^FMAQW?CAM5L2sKDpsRK#_NAn9^EGijH(6Hp)O!VgKG@fg51t4~PcW-|*6a!z
zHec@Qx7dDUS6NZ(6tT?9sY7Y}&MhG$rQ_OW<+|tntE)-2j0owSSc>1<wy~?I{n5Jv
z^Gb=DO|>2ix*l)J6IV7C7A)TJz0PI+4~y<u$4dEi!ImSJPaJo#Iqm$VePs?wUK3_p
z>1EeaQJqa;LTB%?prtuyg0sd{W{_?@t|&Q@R&wj_xZa{iU4N{ve^Q?6J|GHhI&iLB
zv{xA10B_l{wUZK>#4_d@JgA$Zo-Ow}&<*sQEz{gQX@0IQ>*$R&PPMO=O#DrFh?ZXT
z_%_mSU)!(V+ZSQGy2PUU%DaGc3b`Y_>C)9M^6cqjE_xm)O?K=%X|S=Rl<xSk{rYyG
zB<VzIfaAkX$a8Dn<(D(_Lgvew-Ahu4!{I(?d=s|&;3D;-z+E}dwc9&=4Ha%9)|SC(
z(}~_2FM(C1=ydxRarWM8Z^u=foe7GSeYG#;d-(afVq-Qi!!u(zuz5{P&id<9>z4df
zfvzumA+OqY<nBCU2XR1FA914FTp#k(#-Vu0y>-1G@6I_L^nqHRY5in0lN9#2k;6NE
pw}O?`NKE%WL(3=*c|R{{7~yUGn;!FRwcVz_qQ5X$aNH+6`5z-_3_t(?

literal 0
HcmV?d00001

diff --git a/miniprogram/images/foot_4.png b/miniprogram/images/foot_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..32d0110fda09d1936c3a7c95280feb7ec1e958dd
GIT binary patch
literal 1749
zcmaJ?X;2eq7)}+HAQ83L0V}u$#mJEp0$B){3xg6QA+2et!kTO(h3w{7NC+?%7*JD0
zsTbpkponsK1L6Tvj`404FLb~%wSZC;MN}xI8x-x2(w*7;j(MKvectzbzu65@kxNJp
zvmFQo0x4W9l;NYN?X{nbe@nSNmH6O_i4<5gs>V!^0VeQN=xP`U*FtMx84RgX^q1gZ
z0%4+uMy|jVk_b?VYN?P7Lp5u4IGaES4mIl_Wde)=tKl^ogiC&YwvG&FR9x~3e+gZp
z6TtBrvBdyKTO#F3OM;T4B8P?m!DbK_(83r5n6-(B5j1njqq-nIw{6qNz$gSu;F8~)
zQb?iz0cwB&e=6Ho$?yvV0ytC#+mFs-`v6QjgF~YS(ikjXIs>G$LH_{Y!$ZcS8B}Ue
zCJg%!3tw@`@ffB9X*83`L^ZLfs9_C_!QtQ<Od6Bviz9rEDF_CceG#L_n1T>CDh(PP
zra=+FrU<P@lQ1qBcltgBt?r{NV*F4hykImlq@yvYbX!VeK#Ao4p<3-nv=NiRpZxx(
zuu-0(gK09@h$b17_`#_?Y@u|ZzyL!SYLKI7;#d`<;!zAW#-lobiCY3FD>R4-H5nI;
z5+o8Z95G@LqJ+bRTrw^})o4^8kIfedIAH;PA~u`B5b*<fJOQ6g7YgZtd}bJ1Fvb<4
z$|Nm}U}Id>CvM=lTw5<_b$DbUY|tdbsxSkp1x9lQHRF5nA6M@KS2eyD_PAUcZiZ$%
z*?*n%*cRSCw&};d#TOqtA4c$YH{gA}ZR1-6zb@i%Ax~~@yIQbZ>@1zrvf@5ik!Zi?
zK-OBO|4%-or$Bi!k$*%0+~1%1u$IzxSkUZV3@+U<ppgEuzgLD}Uc6h!zHX||e4#Ev
zwpKLs4>vu(xT&T0dg@75r&9<x)V{0ZdC)6$`_Q$cSM|HsI|bR*))S+g1~OdU3{MEH
zpI~-kK029XH&ZQkbj&PQqThrBsAu0$MLG9p!H2LIb*%Jg4eTC$W^VB0B`XIn^!Z6%
z^?6md@JR8$^;9Nv-gtC>7CRjASaYmorQZF(MaGXy3OC-klyKn=C+D_&6=B!T;uVG0
z`I{r%hBk*WERyV`EMNW0$>QyR_|T?wuLqq4qHMQEG3B`>%o&9g5kEEJ4yUS&Zi)76
zdQ?})vXfdP^Y$moE>sxe>ewUc^Q^M@rwb<59xJGd+=ygRno6s#H~kK>?Vt5IoFLAw
zFS=W)Pf%47M{0R2bAE06+s2lGu!QzG_pa5gt509xGj(T;2dUD<YH^rm{i7?+WkQ|8
znrcsd)#vlhr>jgmGt1otJbQQpIcQ2dzu$iu#Prl?JfS^pY!=krE6*4>A7|I;o&gGC
zKW{6(C2D9B37R{-yt#v^Z=bDX_AgXcZ#fqBE8UHFhq8Q`;Gs6__`XK{L}J;^5~kyq
zIW@>81~YjUv1~diA^$~rb8&2QC1q3MzTqm@hz3KaDOd=tnp%~+#{*hcv>&wN`H8xY
zcju+#ZaKa~eD7R*JW<g~5if3KWgTDF)R*SGwz<dJ+Mu4{_w>X|?+1@6dh)VET~p6}
z7jv&Wxylu^tSlTR{pq>AsO?lWTVP7e35Yx$>q)9U=q%a7o`mg?g_Hy@$_u}edznhP
zU30}PrJWRUbMMl2mMOzD{WbT8Q(es?&WY<5SVO-mqD*n@ZEUqHOv{a!HRz%rN{gA~
zHgEltxQ@$)rjQP6`ioVhDCc*B%At#8-M1U_&)c0|V1ERjo9FqYNbCB<v19d;)MurO
zZ+<_o^z>qBcG|wzF*!%Nn63E}?(=h4H$>8$wx5I6dkM}whN5>{Xj^4cdG^_D1P7CM
zNp{e#HS?$C)R#N)PNpFb{r29Kf8jlCpIwVcuQ=Gvk<R&>(EOM4x)CCsAUL{QzP@Pt
Qx3(WmxF}Ls$&btY2N~q8c>n+a

literal 0
HcmV?d00001

diff --git a/miniprogram/images/foot_5.png b/miniprogram/images/foot_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cd39b0a13c9baa690f9bc8f352a139fc977b0f8
GIT binary patch
literal 1856
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
X%<~gHI(oRm{7)0|Lb%ld@rJ(v!x!E*

literal 0
HcmV?d00001

diff --git a/miniprogram/images/foot_6.png b/miniprogram/images/foot_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..20917a91123fb1b726211e240d3d872b1ba9ba94
GIT binary patch
literal 1623
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFc)WrM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iG_l>rJkXg
ziGi`1j)IYap{2fog}$M&u7RPIfti)5xdId@0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2H0?jbeH!{)%s?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B>
zw8T~k=u(ImatnNY;RfdwLjwvJWcn3}1^R}12Ku?VAb){X7ncO3BAkI$b#X{#L8^XG
zYH@yPQ8F+-(v)GEfnkT=B9KC$Ypnc>GJ%njnB$V4T$-DjSK{ens|1wMOUX<DhLWY3
zsYPm<u7R1kscwpyNs4ZwnPsA`aiUqGaY~|zxuJ<U%p7d`EnSR^O`I*wO)ZU`3=LhK
zEG=DKEldqvOq^WI%#58}VR}9Dic1pnl2c)JX9Dep>NUfw*UGslHL)bWC?r2W2bKx~
zGV)9Ei!<^I6pVlYs-O{`nU|7ZUaSd<BZ!w>Qj0RnQd8WD@^clyfozqD#R0^59-=>m
z+`!WZI!YguQjk&(ObD19K}>i)0CM0tDK!t6eTsnjWbcUy+zbp%Rh}-6Ar-gY%<%UR
z36wcr?!tL-iNYk;Sc4Z61Uy)#iGP1H|5HHw0`FFqTZwC%A1qwqyrg}rcN4p9=e#8u
zidIrbb_vWXnK*a$))s|#xBjc1dHegp_79(b-aGT=&6^$VKM%J5+-rV+?$2}8`S<=r
zEDq3US*393fs%)abyoig4`m6a@Pn)cbAI(MHYgMSGI^qbx#Psgy!(4<8P}T43ca`D
z<H;L~n9sgu*4_A{Hi_kp=$DH}zP6puf9if=<%|1l%lFPY#s5J52cO*SjNcA%$zDg6
zJKO3ldm?s1YuTf{Zu?bU)-|{*oc(p|$^EHWS&VO@*GyisC2ZT0&xd@(t>?2;UI^;j
z$oo<)NilwL_i4e&w;m<NO*7)~b4fp_e{^#3S?2DEf86p@PIxCz?vg%gddqKvX6E&S
zn&!8=ubwPDI{CZRju%EJ8fO-Lv%PEgP5R2_GOn0!#fO96CRe6q$?y4ad&;>R@mB8|
zUO$-U{(YCH^8Dl)*3$_NVy~A4#iYcQx3^!GR<*1$s(EL|x7loyb;7xIZz{R-8q%(P
zXPcqtp560ww~n~?Gl|O)Qq^qlnypsWbEP=U=1%^@Ts!Hh;jX+B@09KQ&b>A<&sb_2
z_;G^!n%Pg^AJ9IfoG|4R-%E4t1#^8nJ4|*wS-R0}8h7yd$lVz|{ma(Pc)h5&ZTjuj
z%Mo8a9`D>}e5pH8AlyXie$U4rXFj<sE&I2s<3L1$j)9m&@z1qS{s;1IvN`n0{!PW9
zR<m<vPaIprGIfp~v2Br2vu=yca5rsEiSm8QGSzz5jirzLT&8fj$EJ8ZcF8tcyRE4=
z=->_AsgBtpH$P=8?)q+%QLv!*a{Sz*KR72nSef%^KLaxZ=dX)CSNAKu0TuP0u6{1-
HoD!M<L(6#&

literal 0
HcmV?d00001

diff --git a/miniprogram/images/foot_7.png b/miniprogram/images/foot_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f34a65c33135a43a26e1c6c3be54d74f4d070fd
GIT binary patch
literal 2650
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
LFXn0I;M9KumyA`6

literal 0
HcmV?d00001

diff --git a/miniprogram/images/footer_1.png b/miniprogram/images/footer_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f75dcc18389fb4268d3554717fe8e708dbd82807
GIT binary patch
literal 1237
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_(<M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iG_l>rJkXg
ziGi`1j)IYap{2fog}$M&u7RPIfti)5xdId@0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2H0?jbeH!{)%s?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B>
zw8T~k=u(Imatq+b<`qMO2^e7d6^RA<hI$4dFToW0`r=obn+sQ6ToROua4%Mai$f|4
zQuTvUi}Op1l7SJIrVO&Gz{<HOHL)bWC?r2W2NsF}8Tlpo#Toep3PwODDQJXe=B4D9
z7i)qw`1)FT<`tJD<|U_ky4WfKjnK=?OtCU_c5!quG%zu7H8VFfbaiqxHa4|1Gc>m_
zc5^Z}H!_9kb;(aI%}vcKf$2>_=rzTu7nBxq3xGDeq!wkCrKY$Q<>xAZ{cM$q+bu>o
z&4cPq!R;1foO<<vj?o9jEK*Fvgn-Eh#Du3?AP1iEQ}ckyy$G1DnO;X1F)%QCc)B=-
zRNPAX^Z&p7;RF^Ro@S9AtDGx|i}|EWZ>%`%HtTSN$JGGyw^os2rm2~iOpn}Xu;B0L
zXa1P3VaF$$yg0i<kug)@9@7!Fj7MStb2yIJIsBQT)Bdnq%I4ttw!?uZ7*w{4cARbe
zp}z8D6KB>*7lk_RBkvdFI9;6JcOcMU0soOq7ZrA%-;RMdS$%~K7?SGQA92~VxlR<&
zR@gfE<B8<0@*+taBSe-9Z8+1x(k>}9;dqw4?Wv9TpNMVf-q>+oalv~T&axOqh5oB`
z0aDt`Np4FNST)zECfq2>nCQS0;pZT?`tJgP->gS|I_R(*{TX0blb|LLuW~4G`hu*F
zjBCCbPr6m>tW~{)b4sd0d-Y+ih^jD8|AnpTi~{o+AFU6lVbe-;%UkK6IhCcmtuw$U
u^nk@JVR>-S$eO*{5ZK;p#iP%_VZe|f=xZpN;kpx4(0ID~xvX<aXaWFmS)DNe

literal 0
HcmV?d00001

diff --git a/miniprogram/images/footer_2.png b/miniprogram/images/footer_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a640566fd61a7392d134250d25bcbf19c9dfb1b
GIT binary patch
literal 1270
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_(<M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iG_l>rJkXg
ziGi`1j)IYap{2fog}$M&u7RPIfti)5xdId@0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2H0?jbeH!{)%s?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B>
zw8T~k=u(Imatq+b<`qMO2^e7d6^RA<hI$4dFToW0`r=obn+sQ6ToROua4%Mai$f|4
zQuTvUi}Op1l7SJIrVO&Gz{<HOHL)bWC?r2W2NsF}8Tlpo#Toep3PwODDQJXe=B4D9
z7i)qw`1)FT<`tJD<|U_ky4WfKjnK=?OtCUIGqrRxF|agoH8V3bbaiqxb2D>uF|aUq
zbv7|EuyBLvb;(aI%}vcKf$2>_=yk-Y7nBxq3xGDeq!wkCrKY$Q<>xAZ{cM$q+b!le
z&4cPq!R;0coO<<vj?o9jEK*Fvgn-Eh#Du3?AP1iEQ}ckyy$G1D&xLwsF)%P@db&7<
zRNPAX^Z&p7;RF_)6LWTDUaxHoQ52ZXWXM1F&Ii^Gf9AsY;AzjqW+*7@9BJswVhp;<
zEEBNS;rP`9vTP+&_$TbGoN#23{Ds2ViGh(VDjS(QCO1qv-)YGDLeooDiSx+kh8xVM
z*j1OF^$F<XoaD4f)|HoGt2U=6#~ZO3hbu0M1Tj}IeKc11*UxO<yvlL=WbvDcTNsKL
zUTo3ldj4oqiqwOaa~1-8-i(jLE1t|}Dl`gY)tP$Gj47~FoTntjNI*8}KvCzqsp{*B
z3NEzWxX|g9ka*mqcZI^jC&y>CxTS;$#j0MsowzvkQpQx1DAnFDPdM|47U#1K=RJ1%
zO!DGu4)yG@*uWFQd%}-Xr8a(oY#Ezp65lMRsOf)<GBV$q6j@&5KhhVlO<cf!`5_Iy
zoeSjUk`{c_P`GNv(X~EoMYMo&*M)?y%t5RUIc!JnloXu_SFmH{(wwo_K*nqagF^!&
Y!{w#D?{Xt&7=TJ5Pgg&ebxsLQ0G_0*hyVZp

literal 0
HcmV?d00001

diff --git a/miniprogram/images/footer_3.png b/miniprogram/images/footer_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..82321d0487f3fcce42a706f8022673b9d95816d7
GIT binary patch
literal 1886
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
B;wk_D

literal 0
HcmV?d00001

diff --git a/miniprogram/images/footer_4.png b/miniprogram/images/footer_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..40b28bc7d2688c22753fe71f6ea858ca94f66f8e
GIT binary patch
literal 1914
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/footer_5.png b/miniprogram/images/footer_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..e00b504cbe4772ef9ff9841129223b280a0efcb6
GIT binary patch
literal 1764
zcmaJ?X;2eq7!C*oP?00$5RVu{0ZBHSKu97n4J6!&2ysZEH7v>I5RwhaLIU+_A{`Eo
z5fS56JUS|hHsghetw`&EQpKZ6ffhzu8HS7sI8`g!ZV+gHl<v&#cg*uV@AJOj`^{FQ
zixOvh&h^CMaI=$>_!-!^#PPbjVc+AN!PD3fgbE~RCZa%%kRHbI<VYS&Ox8e3I0J^{
zC53HpEDkp#L@kz}5@8x!hG-~|14A)sbQl|li{+YhkSrfYiFvS6t>uuOH(wzU)p8Cg
zD_Teu>f&LQI;m6-XO@b@veJAROHSghAjX>5n1BXGA)-lBpf#{f9MZTh8=E_}0TOW>
zg64BbA52Mv>BM+M4-=y)46+Q2ViIFm6p#@`r86RlG%Cmfs7wH)lc^w^%3w#w5GNiI
z7ELc#urv4x6S1%rhonML9UB0QMkB>YryzPI0J2z^1`VLm$QXibDAA&jiL5n*Oe*kU
zgG{g1p=v}+bSOf3ND;~*VNO4!pwUgqY7G-*!U_hMARPcwsE(8-fkNT`Lp7Qyv;ob4
z|MB~u!Ul1P4hAw{15%`yVF#xOafH&b<Ml9vB6=}`6iikzU4@{CL51juG|Un)EK9AG
zBSu5`I6)|6Cu<ETq?N(Rd=3edps3YyHiJn86Jp|{q67>E2nym@(R@0K7M&2q6!4jR
z0ezCoM`T4BSc^__<^OP_r{y|&L8HSW^I^TZ7?vmK5e;!XXSRBJFSKd(Cb;tHz0jxS
z0+<=VakBq9>B%jueH_!NzQq<(oeyiVcGqKl&F`6|#I8$LGM^_lb=j?{s!Sf?%Lj*Z
zPo?+>X2f|*JyxjF1d-nbJaau&bjW>eN_Xe$I9`>1eR<xsq#W>3fR-OXK^J+>727I>
z`6nL|>cYyG^>&td|Mdm;ciNqv<xLeG0<U#da)s!9`+n9yPfm^K7zf|=mc#0lc$1_p
z!7sL5JQH8!bhmt-OWD;WHr(+s)MAiRa|W(aTsf}F7Sh%*h}Yp+of{DLR@&NNj{Brx
z=B9qa#f7HP&~|Z$vIC~C_$bOCqH~*l6{IjPhBMbXE22eZ+j3*KxM5g7P~FqEsh;Y`
z(`-33R~Phkr0mMo^*Zy=5U;K^agSi#vUlNS<QQ+l3<J;QW#Dzmax4CVWq0N9Dgxm0
zY)9EH^N^Q$41M1NmsSjS9_~A@xU-6y>CX^>!>*EKUiiulc7oOG^d|0otGmVNq)pn_
z+}c*43)t^+c4Tpb(`DzMD(6W^&#m4Ux}IK23|bi1H*dFj^Y#r32BUu5|Lw>&kJJ~J
z9y8tT{p5%kf*4===Ga)}Fz?rqH+|O6E|mwnHz>)37?TBUf5NOaANaKQ`o75Std2OI
z&!54xX3~PCknjE9F55y!H%5hJ)wPuPziMo%S-f*TfzigR@xFJHwYB*08S;~(&aj`;
zm3@iD*5$RUeHPB4P~V)2CcIACQPuEHve}#+m>H4ptWHfD^OH4pzVv9mHF9oFPhmN)
zaejecYPtuvs_L9`L!;+tHXly2-_qze5AtCyvz8j0y+{?jGU>uv&on}gHf7iKdl9<r
zq4GknAgTR5UY8zn>-*lMn_%(QX2RphZ2SVMSAb%X3V*iAeJp%0YtGe2?cfP59AN1Z
z9W>zvU6j1gz<O){kvgUQwnDY;7hHaeZwFMJOLy+i@IBw<Ke97)0Br6|KkD6WRZ)O5
zy!5>f`uA0|fIUqqcxi7-Xf--YeR9@EW&DBtIq((qGdoepug@ORKCRmp>u!ho@Fjjl
zp(^^uOu}1_JwVm#%7ZmCm!?#S==nq05Fk5Y4q9Ws<L9>i8_SFAKcp)L@45)r_&lr*
z6dWZSXcblq@!bd2{<ljC-5TZ>tUhERqqZ`yVr!92>+<x7rD*jsjvHuwWwgcb*~sjY
bI=SI))cS0{EsXux@!v@ni1?@Da?O7O8`GAy

literal 0
HcmV?d00001

diff --git a/miniprogram/images/footer_6.png b/miniprogram/images/footer_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cad69b4fe533b1298eff9480b32d8bce69872fb
GIT binary patch
literal 1727
zcmbVNc~BE~6iz`XawsaqtIE0@f<v-7Hm3xHEP;pt<T6-`F3AQWBpWu1307sK#e%dj
zT4yXcDp+elZPW^g0u>cd3U)%JMWO8|qEuuA9i`HubOU1hhvRg*JG;MQ-}k-uzTbPZ
zg|X2QZqAFGX*8OfJQ9hcMnBu*<Vd|MB@Zmru#gN_lJU5PG@%4W3svK(7$Dc7X;>VF
zs&lg1upk=E-l$Dbl1jxIu?p8QQJW3ZtTRw(8Z9WqY(P~R7zw0eX<EGm9In3z0$Q~M
zT*p(e6b31lu8rJEVDVd{6I5F>R3bGP5)1^H#T0=KBT>Mt%hVgiW(hdSE2ieQZ3qM=
zO~?!hI2Dvq5erCh0t0wVK10QZg@8cBWb<JbmmdglSZoo*5<+Y)gT)rJ_+p*_cy)o4
zH$tru$04#;zNnQ1OeaZ$7=lbD6Vt?H;zSz67Ktbh4#eRwC<}%$M^B<=hTiBs&46G=
z6`?hdT3ip<7|~Qbo0Nc5q*E#A3<||-V!iQ|P?Thl88tv`CJWN(Y<W#u8_78ApD^BN
zZA{29U{D-p#Ip$%bsie;X)vYT+a1{qsc6J8gqAuKG!wy9**Z*5$`J`jePOD#YDy&$
zpC`mL3>II&W2pJCnt}2~D1(dgQLY+=1#DO_&GRNajL6_Hn9bsexM6H|cvvV)C=HeJ
zWnpkAPsro(rm=Fpkwo<>Y}&V$@;!xR$=-?;O9>1maUuc7GpDN{HXSE%V>)gCIFz7(
z|2nN+jhl=CwlkVa8Nmqc7ECQ8a2+ryvRM0u0RCI@Q+W0N6%V3<f^3!YugaO;qRP=W
zeccDt;&mrsda8X0s!#S`UV4W{v+I*1p$X=mp)VAXo@+g>ZZBD0k=%dG49LQhLubr6
z>gmyCfn4%j1)g(0cH#NwxU|qa_xBvzGIQqwWT$VWwUzJNTog>d6Bv&a1Q&c)kuqVQ
zc6%6m)X|Vt*4?+{dDies<D<q2(?Ca~$uH60W5s>duY%t?PP`bq@$hI#;PC@%y|Q1F
z?*38fCY(8IRhQqsqOQX$@=wQag4~xS(<?^z<oft#I(IoV_m4%0m!apR%|ZV8r_YwV
zjgJ<dPjp68yDw$5*O<&;$kn|nbJ-y+nCoC)es%e_*>&&Im6nT~C8bVz#TCEX*9`8B
zXk0vG*DEP2D3?C{%cah_IFC2@p_;#Xe!%7hEsD7<wQk#JMQwtN0-{N8by?IDKQhm?
z^x#*QE#vOKQRC|gIq3Dy!SXhzVQcThGFQUuy{GHP8UyErSvPw?t9TPe@@9GW@DZWC
z#d@Ueh)<QVY`lW81Q`4_I;3ckA$-rX2Oo|6JaTcyiQS&}R;t{6&sKLnA7HriG+OX+
z`=z?t`Y(H9ecF}CcIn!1%S@-u&bJ1B5Yii~KdJQc87%o_7l^cIQbeOs?SI^6AvG;<
z(ut0SL*NDtYtG$G8!PYG?fk|a_P87RxXzNhV~d??mZR^4)b(Z_v2d)_YAqDLKT!Fy
za4@l2A@3;PSp31h0LLpAmY!eJ*OP#tQB^5XWOC|#=POO3#1!qq@@N7q>=)qol8%Qs
zdapm#t&?RocFIQUJzLw*xo~U1$z6lq*Qzq$1D4aPpWNd2FfN1~>)XJ*tREb6N5`7;
zFC{&BS#{QX=v=dp->07mhC6d>o=nV7qEFrQtW*7X!gbQ=<njsAiv4wGNQr;#VS2x&
zL>Yt5^JtK=uUBvuFRQ)6krzKp>Vvc7B`f)#-$<)({l3>)9Ww+svK?B)JsWSAhJ2mI
z4R(}7+>LH8G}$Y!o%!=YQ}vGR?EA9=W30mt+>ui>dm7ySQ_Hpn|LeA2iab0Tv4m~P
F`x^(`lzadH

literal 0
HcmV?d00001

diff --git a/miniprogram/images/footer_7.png b/miniprogram/images/footer_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6aed484405e56d9141d46b0c1668e1b7259c6db
GIT binary patch
literal 2092
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
W88?rvY(Ko~|1IFB^E%eaw*3b{vp)d<

literal 0
HcmV?d00001

diff --git a/miniprogram/images/guodu.gif b/miniprogram/images/guodu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2c0238a14a539299cd041a276d1018c551ec38cb
GIT binary patch
literal 2538
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/i_location.png b/miniprogram/images/i_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ef39fec0fb8d15f3484240d972c004eaf0fd34e
GIT binary patch
literal 4541
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
bFZy=?drp<??60u{00000NkvXXu0mjfo5_M}

literal 0
HcmV?d00001

diff --git a/miniprogram/images/i_mechanics.png b/miniprogram/images/i_mechanics.png
new file mode 100644
index 0000000000000000000000000000000000000000..957fa4abed020c1b8bc5d174202b4a7c815dbee1
GIT binary patch
literal 4895
zcmV+)6X5KLP)<h;3K|Lk000e1NJLTq002e+002e^1^@s6aW3M700009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z2uw*tK~#9!?3{UQ6lEC3f4fuKg0!U;LA*f`uqqP715i8*ig%PK=z1T2cm}V6;_a%@
zX#B%qG%=JIOjNv&C<YG_#fwNQ#R~xir9kDb&`!rc=9%y@&USaZSGDsdlTNoY-_G}Z
z@A16PHxO|ghtU3Q(GY?Vm=Kr{m=Kr{m=Kr{m=Kr{m=Kr{n9xFCQnjK?2Z+aP?=%7&
z4%`YH29yc-cKzG|ECF5sJ_K6Q_?kU|THt7%JI1&U@ICMn@FuW1o#(HuvvLEBtOB?e
zxC%G`umZf%0R{mh1<W*HO_Fg-fl0trV5puqXxx3ZC}(S7R(6F@>aR)O1PlgxXxvs{
zIq(zkw>+vylNb*?102}FxV?bOfk)(l#m4jgrOCG%<L(EH1)c+{3kpm;W|wG{t_Jqf
z#~XlafJ1>3fm1cHi;b1s8#oELM8F2wF~Hrx08Jj?E?^ii3K%B<&IB5bkQ)WuoCNfo
z=a`Ye?Leh|{~EZ$@DkHj0^b6U0yPT18-Nc2LaG|LN1y<#763m3n|#;)4EzW@2%M*J
zCjs+;U-IrT@t9o(9Iu=LP_H~w9{>tUzKvSVMe>3Q-~xq#X~TdqI$r@?FHkoHjOz%P
z+knqCr*hyTU`QcC=^(9qM3Y{ihfik9fVm1efQiaY7-2S12^>|N*HajG1@O2LuEzie
z7Xp~QwX#v53HU6HdtZ^8Tk^OH<8On2(K_EKz*AN1-v_?ad8HAGc?G6ehnEA=0p?d7
zsEU;tf9t7=1h76uFZ66X@Q2PVfgH&<FcIT^J3(IQ$hH{g{fzT=9f+(gO><l)8}rK+
zFjXqg>6l45%M)DFqA*Rzs(g9J$u}^owVLhX565M&vi@_&0IwvCF^4Pf0c=fyS?2_p
z2H*{OPB}0^m8vtqbo6{ZQXFr0U<PoAeqSW!onK&T>#R+{LSUUHc_i>e8jREKAVebu
z_erHG>??j$BM)u?-Vwhk2=i@JZ*rZ=;~6TwH>=cc1KNBG(5~+->A;g5<Gf0V-7-G&
zy6WB<=PKYvUDK>eHZK7o%snu*b=K;5%$}vr_h@mOaln^atp=6c5+4Ju0FE`JgI1px
zdq9o=Ueq{!1V)>>?j68UD#;#g_*1#>4uw+T^cVqfi^6D>y5}D1cdAp!Gws0IfX_Tm
zGfqb`TPa{J?L>*snI5wem;zj=#;{WTPc%unZ<0ru`pFvgJY_ycoG5uO*ZJ!}T#^J`
z1sE?xW&?BNDK!eQ-iE7tp<`>}E$WKDGRCO~?$zoK6o8IT32Yaj8x*#lBAB(8eX<FR
zw~DR6Vl{tO5|8m{yx)ET?ldZt<D>nK(U#a9RJbk!jGxxGW^jKHV7mdc3{M&_58}T9
z3`T?KF<3jG9Vkw-r2Z{6a5%6k4f59|fVouFX`m_;0pZ|<(I(&v;8`CTD+ea4L_ea>
zN~9L{(*6CFiyk)msq4jiW@ge3WE+?<Qt+xp%S%(d?@)pBqv2)e;!2yAI`3sF*(a-n
zd)HklG3sN1c!|EZNZ_n0Brv78g7{Rm1(6i;N7UyXgME5TwHi~zs<!}p1dP=iI8AC@
zv2u_tZ!Imf#|#JVV^@83Ht>l`s$~EY(S!HG)o4c;N!83F^Kf?&Mhd8&NuHt7IA11C
z^GCseiO1|gz;pwYCgp*7DY)@?1DIAHA6kH`@{jc0vle(&*L&WwXMj5Rjrz3w0~3$g
z#khM$XBhg-Ln^1KSX&1YM3t(K3Dy!N+IJ0L-d0{a&hV-MX=*rG*JJhvPSK=nCBT`T
z{O*YHa~STv&=>=>M%>M|mnA^$P!~N{pEnrb?xW;=cnTqylTaF{vK*C*FEE<FbgfC%
zX994JCKWMq(_-l>LG~4{5MQm_W#MiY*XWt%$lLM;jH%|YQnKx={Q?}JP~0bg)Fsn>
zm&%iRsmhg$=bWG<oL68>rEN2=@SKiWzWlOI<JihS5nuC}j57Geur_tt8}c1WX2L9!
z%+QzyC>2IUDrM)s_VFseW5r!|Q}yaA@Pa@Y&Cb0kN3ul&@Po)>UX$+@@f1gHdsG_t
z4rAx`>1Lyknk6>-nD5z+5H0ZQGiAW}0><;MjcOyV1D+JG$ty5RRW7%yM4s*=YKg1_
z_cf6N^!sA|{i4rmX)K=gRSz~zoT;yp^)0|t?D|r`5;E8w$QYQ~I?GGAUW0goG?d~b
z-S%YQEQP=}-2G<%sy4H83)f_~x8uHQ^0^kKmR&d4P!hHa28<yqz9skVCr_AWBxe6{
z1#rJO&|2IL_|MpNyB6h_%MyHNZ`}Q>$^`w;2!&ojWry!Y>Z(P$`r&S4oF-bnP~LPH
z?k++#?#9>}t?CS2V_JXQH?jI;P%WpZTmPohB{$Q56B&=$MOxvf#X%|!39{8#fD%3Q
zdU2B&@Tspg@VvMNcfV>K?(RdqnD7m_I<na?&Qbp~RNh)4&;2MB1u>UzZMKPFPLa1v
z#ucWkd_Bv0k-~)%m=*<q;&G7q0^1UK+>WaQFOi210e%A>z<q_aS>D?q&{t$2t7cWG
zYSXGtml`)wVY9!y<Tr7g*Azy-CmC;h0AbvwoV3-DD&7+)UZYvxRi(`)9m_<|dkUBq
z9qTe2e;e?;l)QSfw1<>0&DSfp%{dr%2kw^bd$@XWYp#Ha`Vy%{*EUChEEn)u+hFt0
zJ=#J4)7{KTsa(fnb`)@G>ntY;(*J2R5|!&{0zgbvty@}A0_I3<on?1tV4?x8)vW=^
zRudTl6OY-Ec+8H3zyx30ZGcIc`F6M56Xuv~_e$bB-X{J3&LZJ|-W6>B3;?PRAG1T&
Rg-QSb002ovPDHLkV1mI6L-POt

literal 0
HcmV?d00001

diff --git a/miniprogram/images/i_personnel.png b/miniprogram/images/i_personnel.png
new file mode 100644
index 0000000000000000000000000000000000000000..216695bc655202ed4118d921076263beaafc0a0a
GIT binary patch
literal 4250
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icon_1.png b/miniprogram/images/icon_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..17a6290917586db341ea7cab5463f61a3cb9c553
GIT binary patch
literal 3365
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icon_2.png b/miniprogram/images/icon_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d46f8f4f281c2bd016126e42f6b51b1cb011b208
GIT binary patch
literal 2592
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
MOu7fHf)W(}C$Riq5C8xG

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icon_3.png b/miniprogram/images/icon_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b59453db2b323922761603489a477181ea9d4f6
GIT binary patch
literal 3580
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icon_4.png b/miniprogram/images/icon_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c682c6e0b447a55076558af64c18f16abd7db51c
GIT binary patch
literal 3215
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
U6L+#B7k&|(N!y6kTm2LM2jhK%zW@LL

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icon_5.png b/miniprogram/images/icon_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..f70150310fa5b393330dd10439353f60d22e49c8
GIT binary patch
literal 2647
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icons_1.png b/miniprogram/images/icons_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a01a1e5b27d710963adac504c1cb62a78b96315
GIT binary patch
literal 1965
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
MFgRRL!(XBQ7m_0mu>b%7

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icons_2.png b/miniprogram/images/icons_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..22f8ff27f05b39d033e47f78fc524747ed10a920
GIT binary patch
literal 1342
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1|$ph9<=}|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yY-;xWReF(0~F4nSMoLfxe-hfqrf-$X{U9#U(+h2xnkbT^v$bkg6Y)
zTAW{6lnjiIG-a4(VA$ce2&53`8Y`Fl<kH;Kyb@0rTP2`~UP@+)m6?&5v5|q1i>s@p
zsiC2(qobLNg{6_Dxq*e7tGSD#6HKpXUU5lcUUDi-Zze*oGhV$`&PAz-CHX}m`T04p
z*bB(WFUc>?$S+VZ0tSSFMtEjkN`85<CMay7PE9S!EK5ysE6UGR00)j$CKd;nJ6kv!
z7?~P5xw)Bv9B*l9YVPc8=xT0ZVC?E*40Jq1ZweNVL-iWt)T<A4j6Nu4kzyJq1WZ04
zCOq8&Iq;O9ng>koMZk2e%x(RFfq`+Or;B4q#jQ894|*LokT@<a`B~xX9^Uu^;x~d<
z@IOjiQ6X$|Vh<-Xzg<W2hG6*v;vabL)LuROMPR=Jo1<>tkFC7Vz8{>Q>U~{hzuC$C
zzS(QGN`AC0b6}7-z`$nEz{r!pzzk%zF+dq=iU!9QIfZoPIBV6;bYG=g_`PPT$+ox0
zBUanGy-eF-9d+5G>R_i^?3P`ZTqn%yW>dO6fo<QJ(mB~C9<O^MyNc$QiN^jZZNJWc
zUOK<Jxa!9Ae)0cTdo6!&oMTuyAx@*LJNn|Pqzkb>|Ey1ars;Ei`l3A7dB1C?tm@w>
zyf^$wZO6OUT04X-XK1fK=A8Y3w>&ATX+>1K-&xTolNz#@x-9BjCvsTgbA9?!-MRTi
zv6;coXUj;;(LX2ty!-RfpO0!d;p}Y>YqlPk;<#)5o0{^?^TluNYSezm`oHq3<f+nY
zRow}HE7V?TuIv22j5+?9Ro9Gb>+S~g^-nC>zv9}u<)!BYqR%C1@rz454gY`VqLnbO
zYc=n|3Srw$wV98E#oNl2c7`!Qg9{Rb9I&ud>hou0V_?4FyO&|p+s~j9&C}J-Wt~$(
F697H2;CKK4

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icons_3.png b/miniprogram/images/icons_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..81e04f9c7e495f35630205d9cda0feca48ebb0eb
GIT binary patch
literal 1989
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
Gm;4tE0~Egi

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icons_4.png b/miniprogram/images/icons_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..e71a75057c91c8218b7ac696150b70cc31ea095e
GIT binary patch
literal 1723
zcmaJ?3rrJd9IpZ*Dr9JVbWV1h)1c$pUfXN02ep(Iu*M>fF2E+}U3;Y!+AHk=g$?Jx
zs3?d;nKCjnCnB43VsvwWBB*3cU~W<C1Jt5b%rr85PEfZiP<4s%^4)!}|L^yI=Smae
z;{qqWJBh_&1*#XTl9)Nx^G=+=d~>+h*D@1_j!C7HDFdC4+enr|PZ1=bHshIO5{c^z
za(*KtSuCF-lQxx3)hxwyl$ncrWVjBql|i#uk#dI>*JY73K#-XxiwqoSJ`MsVy$no2
zG<=O!Ng7Ry3vFa_VZ2sXn5C2ILHQye(t$AqW|GDMhdJ9~#~d<ngcoDho?{*ejEK-#
zGH}$WR80b)q--RBaK(@g7NLMd%7w)uzEB(v2>7s+$47av5aPoaUyLCVVC(@IZ8p6D
zOH##->0)*=&`8r(jK|B*&*$a~xs)xF2TP?4hkz##K#T-rFR;+K1G3oXdKpxtU1u{{
zX%l4uJd8L&<<c^cv2@f0vsI&cNo=u?1&Rq7&w*QcFqh9Wn>~JwNZaWo@|78Hl(uUN
ztRydqv{Sh@9g`2kTrZf3-P;v;1Q~0vWi}I&6g*o+>2l4ag;uL%AaldjoAj7Oi7NO4
zL>L_#D~911g;a`2lu9^8g7SqiDq*yj<4ss4B0%{fr38_{(F`_PA&ONgV+5!eMWgvj
zfyj$hTkJG$(UD%gCPwcVR{T~hrnHebP1&>*mF=y71S3ULb|Ym41WYi2uoRO;PvzSe
zc=9vqu8Opo@<@HGjWPox0me*kFu)*1#W-ppA-<H*L$FXpLZ}eYLxd0&BZN+bAP5eQ
z;q|WtZnQv|6UGUv*A|RKU;^eN21o#-dPpD<=^#`JqYz>sgkpmT7LkY)<S{1lJT>!L
z4SA24!t^X(b_BC|*;Ay2X(SudF%M7hhghuf=hP~N)^Yi6O>-7Ik-a|iGk`cZQIRGZ
z=QrIiw6?SkE-ydBzPtwpiVt2i1~+UlhOVkK?sCbuXcdVK844om+qU`o2xJ4$)RL|e
zzTkd3GiYn$rQAkgM8&l)DjMzmcOzRG^Yb2W`DJInv~178;z?oai2n}-%vQqeL(AQ*
za81PWs)S(3H3c2l)LM9Dz>wILX4P)$@LL>4=A1g}*R#sqr61%76XSkY*7(!Yv{T;q
zJ<_)1<l}Nz){ORgM*!wCBwy2Qs$O!YZAH=c1Lrzq<4;dmurMP{9)S?xEzv)2sC@6b
zXX+JKC00(?rWU-XpYzkUoQB)g%77l={<YzsKjd5?hS^~y`_(gq{mmV6S8WUWxx47j
zl3UNiD1z;ODPXm4Z$Y&^r@Hc?-;`L{&6A5-yVp#fgShjGFSPWg{o!2Ozp|b%_}qKe
zhb>BB&9ffhM1Q~bQOJX7KTN-K))nRK3?f6x;9m7t+Zs+ib9Pp^*eGQ>{=Cp#<vS47
zmIux6nt60}=kV;mSN$3_bti0gy>k&93MnB<hHLzr>ET1SQ<C$_E&GZFHb1E7xZ@h1
zI;X)r?r=r#*TV<qWXO)hX=<En7N&=k1>iN;hsqj#*99iMm!7@wgTB73=Hd%;FE4BL
zxpI%CY&v$~Np<GR<{eYde|Jc(AwE`pqHdh$+()>Lg6<oZW8LO2cNm;HL-@_w_^zNo
zL(cA2=Jama%7Fz}H$2{bxaDab_$rU{?Q-zuwfcvpdFze;PVIC~u*J1c##cmH!rPZ_
z+A6Cbj7to+2fBkeo72l4Xq$F*2G%9C*B-Sz!KzMFEto;a%Nk=UXLklCADj45!(W3{
zp&4k^>78YHdy@ux{GI13_thnCzdamO*NXJa?7M&5_;kN&q-vPL8679TnYD4(tc|6j
b7Xf_M4P!w7H@xAI=XauxiC6s?y|VZ}x^9vz

literal 0
HcmV?d00001

diff --git a/miniprogram/images/icons_5.png b/miniprogram/images/icons_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd75a4140b0e22a2c67f1c3c027bb28fc79f7b9c
GIT binary patch
literal 1435
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1|$ph9<=}|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>@%vOby+fjGdg^+)NA&T^%i)-5eba-CQh<
z4b7dMO)O!0UGkGlb5rw5V0u#!dYy6V1*L`D0-((<sYRJ(sVQzn`MC;UKU-zuc8euW
z^PqZDaJ$73r(S)aWAs5Wixkr^Az<<WG2!VJ$bqN))I4BvF9N1(IlYPe3=B+so-U3d
z6}R5Z^4D;2lsUfE-ZCIaXKBoodO>#Ag)Q9dPxJI;rZhKCk@1)`Tf@~)skK>p>68LR
z%Y^P`kx0eDsGs52%CoL)`?h!H_SE!`f3Ggjy?<s;<$Gh}{d2e5hARkkB-iv;Xf2TF
zT8M(!jt20cAOnrIBp_NO+BwloW{%a>b=G%6m#mt^$@SD>E_1xd@4l0g!A#c<@ZMmI
ze!%sn>DK>UQ)V5I%V6VFObtyCF8PyYSeYPlrde*ns*7skI!z)+jpnn7&bmI4=hTy(
zz1=IB-51DL9FVYJknAd3R5$C`&&dZm+-&<}`r01|<uGjbG&D|h+snYCd26fHi^YzL
z8`;h@eOZv)n{ac=44Db}#l~TZE@_s3o^FYjo10j4<$8{unc_3ah`r07ZO{BJ=NP}<
zEcG47={lb?$`RW&qBmuJXY-T!@_2gXVXbeveft}dgDscI=CId_8)pdlXxut$`6AiT
zF!|WQ$Qh5Bi#{yc{dsC3_p7IAI?;U-&TR`hk<GlctIDp|MK5ok)R&Xz*=P2I_t*%r
z9Cbgj=HglZq~`5hr*vP%G>8=}FWgss;dgl1zUvEwN>1B+RB5d|`gp<|-?(7$=a0BA
v{JGr-3R5KHXei>0f_Px@GUG;%KO-B%|1F_DVZT>~gNjQ}S3j3^P6<r_)XxEp

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_1.png b/miniprogram/images/img_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bf5dc50146b7a9af135a42f364ffd85c3b4c096
GIT binary patch
literal 2178
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_10.png b/miniprogram/images/img_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..8298f45a22d93e53f58afdc514f0f0d45e2d21bc
GIT binary patch
literal 3681
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_11.png b/miniprogram/images/img_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cc4db5ad77a73c508d58afa501de1f506d59dea
GIT binary patch
literal 3630
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
A!T<mO

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_12.png b/miniprogram/images/img_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..adca3507baa2ae9623f0f35687119bafb5f465e4
GIT binary patch
literal 3549
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
XFC_8*TfH4B00000NkvXXu0mjfrlij=

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_2.png b/miniprogram/images/img_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7598e52a1ee5160c339ae4d74a1b61b802e8192
GIT binary patch
literal 1838
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
Ci`*Rm

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_3.png b/miniprogram/images/img_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..adbaadc599b6760f55ad18583706821c36dd9434
GIT binary patch
literal 1800
zcmaJ?X;c$u6rC6p4Fci<ief^r6oD+mk_}P>hDeSC14Ia}WEsc+nF+~g0$2o81j?eg
zAZk&f^{7Av^r&^I7R95LRtutnifAqFP!$m^l}=Q&KT7AEnQuAw-gn>o-gl-z8adaN
z;!FVmz*Za%MH3^<@{S!td<_{HeZ(*g50m3DSR!sz=wTpOjVWQ8SgS~aqhW<QJ?$bK
z2moX^L?*}Ok_dqc(=rtn4AZ355o`bm3^M5ysuUQfDd8jp71Dc8oTk$dwU8d?FJVh`
zp|A!C&(Om$8IdwoMv98BrU!jR3p5D`0WFLxXeMncY7m%&^!K^~Vs6=H(P{4?c#4qz
z!IWGgrG;X8nC8#qFjSx)kH+OQL5?5Wm*Y+IVS{`Yo5uou8EjC%<_P?`w2u#+h^AL3
z3Zfy=$5_NlNY~)FPQYRrjYg)?mx<|<SRkKIX!x*vd>90RVMs@Dg^7V0+=dk(*r3uQ
zIvl}Jnnh8e#FpbiI^py~3R>MKS=8{cOhmz0CWVd#GTD}thJg~v|3kIfPiO-k4S)9g
zpTY)Nx(;SV!v<`*UPT;SqMId@P7tbx6*#7sVOZ*L6{Q*s#|#=wNAn>p(LCZ1RE-%8
zv)>aW5`h>s;0ja)iy<MMkYFN+TEOLSxIABeXoyI}1;MajeyBf}&*nhv5DwcP<b%Up
z2vaTB!YDq>Re$C}BXTXhpw$tPAy|*BfYl;Brlq~lS%8e}C3r-=k6iW0UP4CXvIsLQ
z%gO%hq=&bN_OVPq^)0dZ)cG(<w7Z_@>lvG#R}t4GQw#;mOda>*B$}&pCTC$~wY$c8
zdgKZR$P~%~Z+YFmXH{(nxb@|oj6SJQUL&oynfaJ%Hfu5+N@M%X9t-N6exg*<Wezoy
zYrnM5rOP-0m$9;^obBq?R4<us3zk@x9?<*CU*Fc{UkTxa+1zqm44mNcTOUD=74?gK
z9H{5d0`5<|p1zvm7ssw7yA&{I`SeV0xHNj}cfvD!tq0$*^7~4{I+c~{HZ7lOdo8=$
zd(Fc$D^uE>!!^_#+n$K~Axp2qi!RF6&++br7Usz{PL)M$V|M@PyX5PI&1-G6Q!}#n
zPd#pb26gXwy;H$V-gXeE<)xJ;WgRblmsa?9L-Wd;FR4!sdkln(hO82z6j$HOyAyV7
z-MKtR&r91K+--J$f&V-(ZVks-6JARi3@XZ41zX*QrfhiC&f8xh-_cHz&M-UYzjI#F
zzp!%sxY<-rMU-`*G~Y#1(tM_Lg4J#m@UTP72}lbVKU>e3Hrf4F-_rtSK|+h_9K)_=
zx|LUoh;)Ng6+h;=el@6Ko<Gb~TCHb`1`i!ESJyULC)W=p&L;~VBzxE?NPel)8-=To
z^t@NUIZHd{<n3<rU0v6(+5M*e!j*e%6T4!Hj~IX^*Wz*KCo~@&G+!ys$}DW{B|l4B
zW;pdQYi~cP*2jSt5ufT;@`v-DQm3f_llqVUsuaF>V4rihOWAo14qs&BJ|*UaqX;c$
zMCi%Ab|lfh9gB)iHpX18Jh-)gCQq(R6(3is`H{QES1W6xf&;2I#Kt+4PZZg#L1xDy
zOvV+z!??rcubT$fAMIXdTk3kBx%nRCv`xHUH1^n}@e$^?qiO@^7G|lyV*bLVF`K!8
z0Y6N9+mwId#){KH)M7WLW+N%RhijGw*azV0-CgM7#Rp>}R-h3n8>eB)1~BLPye`O@
zv~5%sK5<D{cTS3vCzV<Sjn>6PWe?IzC|#XHC$*WUlJ-PZ<+N}08l3-)FU7jK(JIrk
zWuEJFV^7@}fv)gWW%6z4-W@T2-^+$%N7J34a#m3p5H3(3LSK5W9iRKCbyH?4dCP)}
zuc!R!R+H0|(An)GvK4uUN8S=i8efc0H+%L}Ai=ZJ3>AP!@3Hn4$`I&OJ5*0PRHm^j
zOnU1G2D^q%ddw|7`=c>l+);hDZnw#$;bF&t0k4$4op1bpAA0v>pcEhjqY^XW3A^0$
PEdM5PSS0j)NJ8#E7NM<e

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_4.png b/miniprogram/images/img_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e34b20e294bc9698a886538fd48daddfda84f0b
GIT binary patch
literal 1346
zcmaJ>eM}o=96r*FU>P{J#W*vU^S})P^zQoIgF2usP+19<Myd%3$K4CPu>0`tYD<}l
zj4g_bQJ9FjB`&Tbn{2RTumNrioeQ`TyN`@HabRQ-Gt`jGVZcSNj57ZaFS&a^@;uM)
z`F-TxE-NicQa`1JASlUMY<DXw9DNhwm9G>E-BXrLvcoHv^EGmS6akb^^VI-$vSclA
z1Cp+PWfbH>kSdk&cxA6^2SM?yhKyn~K~_-M5R|(;D3DYgkl|`j%WziY_rW0qW@sx?
zVQ^tC!3KOxaYzK^p;8YOs-rA4vi&(YH%KS~ERab!$nNAMB4|aHbO~i2y+#pu2_n~7
zk%y+dt}@uhivTugjM)^fH^U~21~=+4oiPj6Vz>px%qXtQ#&7~N5(X2z{2)p+k**=!
z_QK^@%E^lOWLY3kG!O`A0y+&Z)}pw@qG)JQtu|XhWJ~p&Oa`+#DK(~G2NESRg3Rz7
z991N%dB1E$6sHeUV1*S~PFgOLQZO_~3Mj6@qAA6IF4zA<S#||2$!_q-?|%wQo_YbG
zZXoe~ky090lNt>r5H=BzGB0{~erK$TWj<c!B_A)qTE!BaUcqoQACNMZ2rd`l<RqEo
zDB!eP5k*47Ff?JtwK|i<rY$HeG~u`-->l8o6&i5NgxfK_&SHyk?L6gY0Vl_}^dqir
zRc>?^SV4(w2O{$-pbJHwg_m+BnAN>ttLiOt>D9g9t8!7r3>xk1zd9YeQpP8`U71_u
zurm38Q^s9X=GvppFhfvWuhX9I3ErBn$Z>y#t*d;EJ0CZdtj{?3Zfo*D-q$I<j^WD@
z+ohD5ba%ud>-%5m0(Z<)yQX_@sLA-T*%7MYaOeE}<7s=|5=M^vcz*1}mM#3Tfu9rb
zZyM*{DLC~qb%5V`rs2w6DAZTdk{BNA7lx&l49BJq@~)|Ks+$_Gj;aPb)z_QTC)%ri
z8o&8u?WOKN^LC%{Ko=(V4QyzE549CXxT8?Z7n%ssop=~7zSb_JRhCS4L6LFe)4Xq?
zVXeNce`1fXe5C4R=f(KebZYdXZYpIzewx1VzHHe4_<YsuTuVmR6VCM;Pwl;O`r9zH
zu6t%K<V|iyKJy>D4Q{9HI9cAcwR!%s`9=5H1<!?BeQ}WL%lkc(`xe*4)$c{%tl2{b
z$LC%OL)w1DZ+bsg^=9@>o+V3+$&Gi*xtAV${m2{LJ)t$>*4FpN-mC<lbV!5e9{gZq
ziu{?@U^t(e*<k7(hBgnX;v1682YS{<Qg(f}donR0r$=2g7FYCJ$9Pfgxds2xzq3?%
z8?PP*&pQLxHy?a<ac*1nAGp1#C)_?wraX{8bq;0zwfOzqhmZ=oqyI?%%rEzbqJK4~
Lqtt$)psMK~AfM|r

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_5.png b/miniprogram/images/img_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..635aa8d6eeeec4a7aec2b30bd05f91297d7b55a6
GIT binary patch
literal 1888
zcmaJ?X;c$u6b*s~K@<eU3YH-(f|4B)6A2J9L_k6zfPexe$xKLs$qdP05^w>rm{zJ(
z1*sH7rJ}M_>weUuSX^jDRH_s=5L|J?BWSTIov6_MD4la=zUAC|-+k|U-<hvtW9Hl0
z%&;L42zHSXpco$k^J_f;|LSsc2k_xDEIb*DN934ZqJ;^32$8}-q*{^*i(v_5%x-~$
z2n0({WkNEREQ;pJ5H&?&#!w7u6lW6%K_LcIBFlm?KniCnH9XSuV<$;~65^4P0!1_t
zDu5Nrh+HikpBs}P%gvH;AW}#$5M<!u0%{nO00#9EjgD*Jkv`~h@ws`MN&-GWuq+<w
zqp4(3EFeI%Fc3&#k!AFNxd59(p|b*LOqM^upwT&0+FUA~Nv6@cG!{3I4Sae?cr+~}
z=ZZn$r&#!kM^a!I%B52EdObzYq#)W%DxJf@H5gO|gN!4{I->@Y7|0r(=ZFFb>ttFb
ziYXBdU{;h!ksORi!kvChL5+^eYIL8<gcpozkf2mLg=S7^1Sk^yKUA$AMe8sz{Ey%N
z6xJmeQJ5-*bx4j@h98{V(;N!r3be2UL$nD9vSg%+u?hr3bP5Co7`P?CH%Y015WUXt
z13@I>Mrw4JL?eSEK^_U0peU6PcWxM8$PzMyVL~CBP7mjYao7S**jzR<K)_-P`ScMk
zh{$r(um&69LZe(JZA`AY7t|;o8HBaUr7$GaB5L46&Rpf#UcfQ+K5?Njy)eSZ<Wg}n
zRP)LH>!e4v@b)oJNBb6EjCMY(!P{Mn_jN~>+j;!Dv`2#c1jF^_q)3Gm->KnCUN2*|
zFs`|<dKN#(OG9k+02;yUrhFow=LLYV#nl!wr`Vj`1s;z^E#gX=eN9JfEyC$w05O|m
z>gI!SO(hCOTG#8^ET76w#?#`O?!-iW;&8+J;lYaXlyBv>L+<OYZF4NJ_T1*!c|OAn
zp5)hHC#;;_Qtljmkw3KV58l~DArXzn9hWSU^9EK^@-SB!$I5pv*-Di%?_i6IeT~iX
zIXhRm@J)~Mi)EMUT~)u!De(=5cS@Hc{hkq7Yx92$9UnWn=Ux?gqpB`O{@S{}PxaL8
zR7GGgA3T*bjapC}s`nUo)5^zU0V;RM>bf&;^*%=J9S8Pu#C?BuUBtX&v@U5^Y42j|
z)*Gb{9xM-a>9<YZDj=lS`ql-e3#yaAN%!BRPF|a1Q?4Mt{bIVm{a)$0#`&Sge$DN%
zo*#<Y#@r}W^MGqIQx~zn^u{z*Y+a|v=Go=Z;~f(7^*Q|DQ%kyAxQkZNh85YCLq1X8
z?6Cw3{7i*A1gfyrn_Q=O7tgUe*t_i^?XG_qZQsEw-6kbef0w~HbI-!XDj92^apG`V
zeEOi5Rqdt#2M6Z^YPU-T`_~<%tR!x#E(e`zO20b2Y<%ycyx0cs{h=1u+nzj*@36mK
zc2q^|dw(tsjWeb+yI1KZ>E<nij;=ShmN?c;b!)OOJu`8wFLz1Tq3`Z5cy;l7Mmob*
z5p~D@^OboFkKGT^#liRAt{?aIz@m#4(=SKSRxDFJ<zCqh{oMA-xFWrkV;TQ0NIS9r
z@;dE~QrO{72l4F*#mLKwv{^r}?R4!1$cE4!yx?M9-mTXBVpC?v$%Z+N6ZIiiq0Fj5
zZiCfeY1wb@Zcaln+c)m4w=9RrRW&Tk?TpVa;-`;Nd&)RbVHZwppuH$+ZQSO1_C(cl
z>)TB>nf0Wp9WF&F=b^U8HTBh<H~joH2VYL^9*T&wFWqx)!|j4+t5?2Q;FW4>*{Gi7
zbbX^#zRMdrZQPz=UsPBoemo?;6FgA2#(T;UFeqRu5@^SMV05pP``xl>wX7`J?lDMy
zIrFkl=!%r0zV5oVs2+nI-!YDPLEoH2G_hvg+tOAWh^D%(=y|!mZu-J^Sw6)xMB>y}
zi<!?VU#xML9<nQcc(NovS7CSdc$dqy?We9uf9l=b?ksvQ?DKl|<_#F_m{gS3H-FPD
z=NbN22l{XRHStLWt%{t;0|q-Z3kSA1v8BPbrz1ApE-xD-X6#%Ts}^U!Pk6F5?$9)y
zn@S+PIpJJ=Q^?wyB%)upCG(byiGDv&&gNTRQ4CiNJ7*BQ^D{d?H<1g?|GdcX7_c!c
GW7Xem;NbZH

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_6.png b/miniprogram/images/img_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..c67e2e77e125a372c79c0f940864816bb45616bb
GIT binary patch
literal 2125
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_7.png b/miniprogram/images/img_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c247af37da1cf0ecd349aaa74e255dd2d8a56f6
GIT binary patch
literal 1482
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>-lAoL!xa%-o#Z+{_IPT^$__91WZdEu4+q
z%uUQK4Gm#>UGkGlb5rw5V0u&Fdd&@R>IJ2R+ybD@E~!PCWvMA{Mftf3U_V=B;&zJ*
zPV=C8Q*gS)%oV3zeV}9XK{1OI(=Z`m@&Pg7=@!U=r~K4BU~(@4rt2#{ea9FWm~1^=
z978H@Jqh3IC+#ROFLJ%-RHL9>JJdW@3TP_b>}WD)Shd8_t8q~Wm&z0iF|UbiEmPPS
zTdh^PmiS7=H;PP7_YmRIl4DT5xqWi}_3WEg$De=xsk7MN(w#NswVRFa|9K<V&EY#)
z#CK*%Nz(Vy$tKU!c~8o5>MjpFb!2zN9(De86BN^2mD<YqLiaE(U{wy1Kd!A<$*!Dc
za7WIP#qyNAg{oRi$+@0mvC1yn6u!BcF<jICk@!IU5=-LI*SA`J%+cbEd>WMZ?!}tp
z9lRZj3s)_8R@m{_PNurIA?EnvS^IcendS>GY4N_dx$EhU=?7v}T;iPO@aZ0IRD2k7
z(`(9e_V3X<US#K8c=y-&QK-!|A?X8ewy?MHwEdaWy6@0yHlZgh%S>j3FmJ7W_kT{U
zdd{lo)1f&f%<j)xey}gAXFkvLMEZbL|J?X52PUj=5td$Xmicr&!(;V|x<4Hm@iUxs
zbSHjrxM1we(0M)6qi@~GHw%{9W$r&Qh4rYEKvwS0OW(hTKQQ|AKq#Z;NQmI%)=sGf
z(Y~kqZRPG;9zSoe;=uRzwxeaIm?phn?tNfNgNo+iUA)ZNPop*)>T2(cxMuuIE9c_+
z!l<-8j9jPR@;0CF5{Umj@p9!R@kt-^LJm7Kh*;@)XuNe^HF=4y=bM*v_fERI*E;c;
z<GdOnKRL#K>x&(Z%DO}b&e8kY-`~Y;uao*BLvvAe0bk3Nn$;fHFBW7)zP*<j7iJz<
zm%*VY@;P|MZ(Za63s1jndADzA_5ad8;SG!o7sHNae4KyC4OF^%y85}Sb4q9e05B{j
AX#fBK

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_8.png b/miniprogram/images/img_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..1025c198309fcb608f331e66ba4867cc89618039
GIT binary patch
literal 1991
zcmaJ?c~lek8ciyqqHIzrpyD{uDhSy~0*M3~NFsR}!vhowR0zoc5t0d+p$Rltfm%V-
zSZFG>P?h!pf(67wcs#T~-9RWVT@)-3&?i=^P$;H(Y@Mjs{!!kXGxJ-{z4yD{a?a$3
z?%ZZ;<7R`y;cNvV+%RkfEbmfl?2BY({)R2CC@%^PhZ9k?SOwuYQaAwu1aff_6b6Z<
z8EGAmKMuEuAd84Xql7zH5?D?YTQEe8T#2!9IR8M6QY=Y<P#^(Hk}25WXmbk)$fRsA
zk}f0*mBCQ5EF@C}g=g-JkYuJvm{Kq>0PxqaFabG)iUEy0Re`WHZ1A}*3)@?+Ng(hX
zf~K&+7p9_wp+GRKf&e;^;Vq%i`~Y7jk;0&neHdN<l}urh$bKY>k2jgZA~RTYU*P2f
zV$oF6L{=D=|1uVKVuQ&js$`K!YPFiE_94QmBoc+m#5AZRD%Bf9cq17KRIKq<AcT1Z
zE`&%_G9@a56@W!ioB*ezY!Gw$A_ckfm8=4JSthJtB#l@}q7ccJl;(j#;s1xq<*(2P
z8V3F8_iu%fhzun}3WE?hT_wR9mq@ULQnG?okQjwk5ip!OU&YX57=@8!SP4)uOTgwx
znL-My5s&8tp^zm|AgEX&fdpJOh)ED-GAWDW$EDKA6nYS!?@OWZI2=xpFOM2b_Tlq+
zL1a2@p38+L>2gSc&U2-Iav2M9Ewdn3Vv)I!O7<=!<*Q&h@H}UhY+)}x3+lb(N*DG*
zTaZh_%#bXd{Y$6kudwm4Y+ubSc6c@UkOCWb6*kvhVX4kIoE1yJ<wR(DA4H1scI|SR
z`x+V8;lSzo9w`G>`d)tv{DQ-ied=UzSlr;;6Ia?;>3m)lPRni1dDpxD%f(IY2Pny9
zm6cx{D4-HfmkDix=yqK<!Cc?b(%J#$aI>lJz2W{0n5MjyG2PEBnd%!gm5xqztGgk`
z(_4F1^bPLLUo!Qql6Q6GGN-g@ZhQ3o;m?rr#tI#yElFfF<MREDyyCeJ?$Y)&`2}vP
z*pg*%Y$@8TI{NTbXM-uA!}aEATRcG@&|}A*$^YguUr_FuMJsqpCgZhpaUYyg9FEN~
z6J9TJqVFGR-FR%@!CAK-&5Z#g>iWU8RRcBnYx=0w>t5f>*0sIUda0FVq{K6o_C75(
zx|6~Voz>dL#QhVG64wgz<?P&BTUyWX`ps+Z=B?>HI!h|OSF$`R(t7%?A?WHY=J=V7
z8%)P{T(Fsed91Cjp$Av5o3z_tcIk`qu+9CDnRdL^<4MCT{;aZpdHtTGi$(b0C&d$y
zzrWXfxVX6Uj_%3B!)J0DuKSm`IHLBe+{p1-+mMyrE+^urdHeJIdKAS!v+R6Me^!xa
zGEDY<gb)8E+kL|g!}pJM5Vc<0cJhj2`=E7Q@R8pczXll}y&d0b8!Te#JbI+dJ#V)g
z$|qEZ2ZzX^tI}Zy;2f^=mZl&1?{-Q|>N@#93C;i84QJ09M)&@By|>OS7wE|Oa@G9<
z6?gw}VkDJeRbv?W96qRP-<>-6T4@d6#a%*`gre^|W>n4Ke(F*}EAs4}MV@%J>-c0V
z)3|gD1y>ItA$bG0_0u0G9W}nOB()@NJoaDuo4+O2KTW@+C)8;dJu)2Q4%5x<`0lsv
z7f_nSy-k2sA>diN=xK;;Rv^!HJj-j`V^523#bm=FeKq-U&l>ZM&7zi+vRM0$Zzxr+
zHK|LJqnFequ&sVtvS$BSv*)im?uD?<E)8*`lj_`_I|@DX*u<53ugL2-O1EARfAahU
z>TqZvG^gNO>%hFWT2G4e>LG`sisGG@H<sLs(QLag_g!oUBR28p5m(N$spxqAdP8)F
z={_tHRC#?e`L*WC;uSGtkX`l3v{;_N&mP&7e)hq58~9+mOjN(U-&iQPq4$k<J9jBd
z4(gr4Lrz_+DWsQ<8vPYb=Ar)>x0DyS3;e3bd}_kVZ1|r9>?m7)R2H+(ZOCquQ?wW3
z(e5pk^}kfJH`f6l-saUlTen{1erK2Wzc)GmknQ$yTz=z;tLCRM=!}QU)++alL+R=a
zLUd{Llc`mOFj*^Gb~z@yGpe;5EbZ%G_I6`YN{aGCR`%?Mx@zve#ba+O@fpUIa^c?X
zs%!Q|h0k8oM#2MyQkQ(@+2c1{*%R*s=8eSAwOT0yOz3X7H$!Yq>rA0%Cw@1~erTOl
z|Ck+g?`)CnXy{iXqVsm&LW-}L*G5s3?9C&Jq62fLxNCDZWZXygdhL1>&EE2B74UX)
JYl7l){s7b9E^z<=

literal 0
HcmV?d00001

diff --git a/miniprogram/images/img_9.png b/miniprogram/images/img_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5bbf83874f835129d75a3c366f7166950c72f35
GIT binary patch
literal 3523
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/jt.png b/miniprogram/images/jt.png
new file mode 100644
index 0000000000000000000000000000000000000000..1340ac78a1fcbbc066b787b5da793c25eb005390
GIT binary patch
literal 2899
zcmV-Z3#{~sP)<h;3K|Lk000e1NJLTq000UA000OG1^@s6!1`{s00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z0DwtEK~#9!bkMO0!cY{2;qN^&fQV~2gyX1)g$vj@L>91!*}y5p6+~hq=>mc_30zVC
z?!V{2ftylY9x=xY51)*Ya4N9C1yf9XbH^&9!P<Y8XmT$HR6k19aL?hmK^we{OR;#x
xF8Cg|K~k#AI91?`5oYLO5P4$Tzod)7djQ{-7-0!Wc~bxY002ovPDHLkV1gd@gXRDL

literal 0
HcmV?d00001

diff --git a/miniprogram/images/left.png b/miniprogram/images/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab354850aec54e7382e46b04c7bf8d7371826f79
GIT binary patch
literal 3404
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_1.png b/miniprogram/images/lw_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a54cbdc4e8ce998c43cc6a695f14a63209d0542
GIT binary patch
literal 1545
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdSymn>!jgIvbk0IvW}qx;i<z8My&TV<%Hn
z3nwEtLzrHd{N&Qy)Vvay-V}shBb<6cX(6`&XtPUdQD#|cid#{Bt^(N4R+%{6;^c<Y
zJgD9j+-@<zsaGH97=2L8BE>XJ2$+08OnABla^NXHH4m8Fi-75xsU+tj0|Qfyr;B4q
z#jPjd`?EzI1?Jtft=}rvb<l4^h3hPhgQu2w<}Y44S4r$2bEAuZ^+wYhw>TI5V}74=
z#3_KuKR{Yr_lVnkj_JE4)4zR-d-wfr^}J;Thc|35-u-*;&$4&7IgN~ET#O4GbWg~=
zi}9~^Njxw)L16QBWrdEV{}(VHQu5~5T)8~uttaR6wR}cqUu$>CBowQ^kp0*(L!I-J
z@<y%|%ops{w)(o&DX+_}ciGC|H0g-?rFh=w8*?`$v%9~vih6ZwuF(g{jp`F7z2)hZ
z6>rKmZZY+L8}{<9_Qu|*gyg&X7W(WqDN#D<xJGJAc`xs(ld8FqC#>F9?mi<@KX>Dc
z#c5vGZr|J%Ewz>5F54o5{c$tmC;pwDx+9ul+1?)(%M!Dz=h#L_XB54BtiEx>-v=L7
zrOYUKCe0Z7Ov{Z;@=EdHU#~BpJn}wedH0k9{>|G&&C_;dHqK+5x%_5T<m+$QfBL+0
zW4!XW?+X@@Y4DyMy_a>#5{~S{sbb&R%T5|5e4Zb!ziK=CzeT?ot=~SqxnRL@W7ktZ
zLtQzg{+!^x>-TuhuRS>*R%^|D`{6sg+r_wz$~%kqFPQGwTW`8a!1U+y(^;9-FK6>g
zt3KcJtEKzLb2hsvJMz4awcK3U+0$jO@k{dIjQ-cx180=2iWc9HU$tKE=W|a#uh0Mb
zlg=Nl3o%olCx0XT{kgi*hsRz&;^(eAdF#ZE)5=>eGA;H0dz8=IMQ{C*o=@EF$&>5<
zt2HUEsC%&X@_q3Qq7mITs|2~ibxnS<YvsHDU$f4SkA3~p-|xEjc&68y&et@aZ|kP|
zXyuBtwR1n1D^2NovM|YH?#D8L!?r(d!q}ExWqGf<LccZT&-;JnzjO~UZ2he~W7D3G
Q8KA=1)78&qol`;+0H>^20ssI2

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_2.png b/miniprogram/images/lw_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..52388b101442421e2731dba1367e0d4dcd3eb9c7
GIT binary patch
literal 1521
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdSy`ySciVn3<TmIvW}qx;i<UyPCK;1Gz2+
zE{>LFCNRA&`N^fZsd*(Zy(tL2ra1M2(n4+l&}Ns^qRg_?6t|-MTm`V7tuk@D#R#W)
zP`xR*-C~SWuRhQ*`k<IaifNb-F!_L(@N^60z*Bx|9x%BV0n>Hs`)fuF3`{AWE{-7;
zx6Xv^&lYtQn0IscVXfW;la_EU@s85Y&C$7X>X?&`l83;h8<7zn3jdorT4%&@OLK2D
z=<S+d(kL#V6V&1&ptwM@=6%_*{O{l1*?#?dqkMY$oX5Lw-oAVL=FFep*jH=KZCSEc
zesy_=k(!WLlTw=VsfB?{0+wVLAK^UztS#r#Mg6WQv(EhTyS~<cCW(r2&Z=AV<3r%}
zX)6tHsy-0ye7AI`+>fHb@cWNBc4ptOX|qdtH2qW&OD(J5j#aIj&nK}<9ZoLWxWC`&
zwn03L`8s9w?Fm0Ntq+b$zUU@5pIMGUFEjgq<A;=U&Y8|3t8-Y3_Jv>bzL4J-`@pP#
zt%9qDX&%G;`r^gYuPR)BX>u_?<YVV~>BZ4`e+oY}cI?=opU|{+lb(Mi*OOlt&9AK7
zc>PdK)Hw~V=(`sEtm@W>zBNgou1%Si$9HC<(fMlMPm4^nwB)3I?%22UM$rlWM4fPZ
z;iFk*LPZhz%^S4p_Fj+jv;7&*^`uMCece~L*Am&=blldTZwlYCPWgw$or2|0IOlHl
z+$WK2v2msP<g-!|+hzt_`WRQwYNl4^@n!P2l@C1S%oDE010|N7`gmu?lUun@3a`!m
zYHfPbrziB!W`0v`U!Lz59?M1Sk~sM~?6J&m=6yF<=CS{=E;7vCIp1wva__B=JaZ?^
z5Ii0od51@{|6tl@neu!QdBG#^4Vjbb@2}*$bgS)d?(z+LjV``^dw;u*oaN_z<(ogq
zl?5!R|5GIKrG&TpuezU=tX)5wv{>fK{WCrr#hpGbeB}`1;<Rds)%O=X?tOet-Dw}!
m*Qy7)pZ7-|pFAa=iHE^Z;KhSow?8q13Sm!IKbLh*2~7Y9CPYC1

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_3.png b/miniprogram/images/lw_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..d73d1c31ec04618085860a9393795320682e2485
GIT binary patch
literal 1794
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdS!8nHidzI6IlTIvW}qx;i<UnpnCSxHwuk
zn!1`8x|zWAy5uL9=BDPA!1Sgd^g83z3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{U%
z=0WwQ;C2hp)j0g24|I$^C}xpj8YToxJ|HGM-2yrAl%JXhOzuU%bUi)hvnnvVlzO^2
zhE&`-67HQL;wZ58)y&=n99kMpmOmI-TQ%5tB(9uQytu;LaQYqICjzz-JpzW@a*y}}
z15I{zxGPr$PSKdrozN00xQN58>DXj;M?od)+fQHreB)P^o>tB@DK4)3e2M@5b*t8`
ziW3uz>PedYDyBc!^gz$TOUr&}$hBR(DY5xn`I((<-<Y0Fe37K|^1+I?g4Z?rH{4L%
z|DQej=K-bn7xfd$eKUBkC7!FCP`-Ho-n>rXQ|SqlZwv1X5h%SHW+XjNK`dWUcd^bE
zcK<Zt?+xpsj%X#madXg$dE;`K|BTz2-z;xZA1VHqOk4QIsnc2^aeaDRRmZPP*;}U#
zKgYhWiAZ-nc+F5laPtZ;lb_vxMIP1(Ne3O*R#)~Bi}HTaW66GF&BPr`mmT@BPU!4D
z*5iS`%Rfw7|LnuezN0f^8C)0Y6n<TQb?MblJw4e!Hk{mIRkEq&#>FQdlK(o}gI|g@
zESgZVYPx#oQLl;FD?g}db^F=u*w}0=$GF{kL!88#HJc9nkkT{bfAn*kVYuC)7ComU
zL7j#1+xS9yHFNHCly0vQdc9}$L=BcBQrlJ^V6I;{Rr1<#X@k>jMlrJ2jSKjrGdJnB
zpNZKM#a5Gfp-gUphRVt+p>q|-`ES*(D8Huomhp`3%j_(MtM6x-UDFC?ZP#pPU1o5H
zVS9b+Huc20vvsZs@Bc3$!Obt0W6Qra>1$8Yt4oJE_HOF+%zJoO@Ia2*do@mdMU&0t
zVm?1PWb_21Ce2aNInKG%S@Z{w=+@0*5A%5o4Lsi7aH*c4yVJy>_`<1F8-BKbu^YtZ
z&GkD_x^7C0yZCL7m0>wK=3-`y&!o3}5L)<U?opGM8I|6e??lRK(mqXQnYi(;<9>TV
z)151Pk39NfKB22f@YlPqSI*V$kc#c+^;_qkC44e(@n*}$=cWZ(ofgtXotIZ6c{*R0
zPEoRR>trf6Q_$0SXtc3<|EFovALa?ZYiY}#s8zH4=*$BLPdQ%wo%Gz>FkCY`;!)n4
zs{PBI%o%=^+w#5MHYHZ8#BR#Bb+3e!BPN{Pb-DY25!0sUrFHw6BPLGz%=<xmLWQP>
z_1?3qCu(s|6yE9(77=&geDKD!XDss$=IR+<($4GJa!USm`1AW7>!W?QG}try*n6$g
zOUsD*`&9GBdpqrw=DGcrUFHg}*7_e^y{0qj`tAQw6&wFq>&`mzpGAV<?}_TfhYH<O
PLA8>ntDnm{r-UW|M0dL8

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_4.png b/miniprogram/images/lw_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..a177e21c33e77e099370a561877a321e2278c518
GIT binary patch
literal 1669
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdYWd8d(|}yBM3gIvW@ox;i--xHvkRyP7x}
zyEq%Wn3}`%y5uL9=BDPA!1Sgd^qSz*3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{6v
z=0WwQ;C71<PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n`FUw+3=B*^JY5_^
zDsCMK-<vJ!C@_C!ZD5NF>%<itN?8jdA|zb5cq*?@m?n78t*O3IV9Vx!fGy$&|1gSO
zREp|qmG2M}V-po&HJsok<jeH&Zr}c$cdKJg?5-|1)R&wwckka{XV0B^cW&dVOHl!b
zyQHTFZV=)Q-u$xD@>`Yvp?7vteg8zIoKCkmM=Ms|)p;~;;;ZQOCk;Bc>|*(RMT{+e
zw>smFmTlTE6`sgl_bE$U*!k&U70+XS$8R@dKBT<tD^5{JKTzK^i|OR+<h#H4nqv<}
zaUT1!)byClH0~8&Z~1&+`l0-TvqF!559d0$%P#CoQ=cC_awI%!M}hjW`*A7UhP9<K
zM=L+PKf^iwQQmH!oNIghF7mYO*e9_>KHSSJh(kZ@eYrxwz9qHy=KGn)9V+CxIj3aZ
z*61@<X<}892mQA-7=B{ts?_*!;Ecets4u^+9COq(e{Cz?KGpw_SX2LO3H#-z9G6}w
zX1D2owNLfnQQfDeQ@kc;NHhL%tl76Z;q>#4SF<O?Z#-ARHdAF*^#0nA=UXOx$!V5z
zbDO;U(CcI8)_fP+7;gMj_rlaAe?J8M-5AkuNo0%iQSQSDvdhK2vbK30NaItCo2$LK
z;msc2hV-m;nX@yS_Rl_l@V*xFVT<JoZkD^ZPIKgVA^+sgO{IiLu2p4I>K0o4jSpx2
zyu5Al{Fnk^v6;V2chrBaJ@e2r<Pw*)u+lpDo}dTGtLDfRRNq;!d#7*q8;hQ;t8?{R
zv)6T)9g)t}VqQP%g2>Mw9Nji;cdp&MV!~Z0^T)1k`GdHvS3-NY>Fa+E^SK}N@`lFx
z?CCNZKdY?Ga%XeemM&uU;Z&L}?iEm7v)HgT=9TllohJIP6SC&dT*nv6sKb)B$D=9d
za#`HhDI9FYXH9lq{5SEWN%>TV>CTg^9c(M6SIyl0!6;K|)9%L~XJ@{Z=*<`Sr5>=C
z^`89Y+w(-5d>6^|S?$SSeEe9CrD3bQyz-t)?+u?{j*&Y%yXp-0{N@_g3p@4pa85I=
pb9-jlvZ8j%t4(3{x&K)t7`A3IKk)sq>O81o@O1TaS?83{1OQV|ht~iA

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_5.png b/miniprogram/images/lw_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e9545e4cf335e84ea39593d1cb88a956c7cfd57
GIT binary patch
literal 1462
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdXM{85ucSIysrTIvW}qx;i--8W>p^n_8N=
zxtbc7xLUyUy5uL9=BDPA!1Sgd^g83z3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{U%
z=0WwQ;C726PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|nhn&`hF)%P`db&7<
zRNUG#&Cnw>QRH}SmXKcC${Ptzjcv1|xu&V4HG4aDKS)`$gvIJffUlOW-_;AvES?z!
z0R;iV?HZbeh2CDSIUKq|r2(GzcmL!2Q(AH7`R?zZAGXT3SHHJ>{=fEl-Tj|=M?UZA
z`MhIOv(>llmHY;}0Sn#lCw_=DF_KcT6H0OG@JW;^`5kZO{!KaQd(hJpJPJnY6H7B%
zwHJk+m-_ItY?<W51>&D&>I`39QnAaPvHC*$`R)tGN{v&O3G*%dGv(m4)60Vm7kY<t
zOiyT?_)fj}(r(e8V!Jq=p2}m52sv&i9^10*VDR7I*l&Lyb#bb@c>YVMyTP^i+tuYY
zr+3dtifHn^{`9V@weulqJEd<qG28tmV(wHPp7cg{886=h<DQpSYj?1UD|C5OTUj;d
zp1b~v&CvE7Q*>d!z|RTm;>>wY2e2Q%f7<F;%bM!-$zs#CFt2*B$?HkEY=&Y@qhgx5
zcm&79?=#Zw9@{eOU*<;@wi|9|uRFZC%aG(B%%%7#bn}hP|5zup=q>rtb}eQ00{6R#
zZ8Lr?abnqXd1i9DukyLoiG1dda*uTfOuLcd-%_wi(C4t;lm}a07ESWXVdh%UX0y3d
z`rF1g-r<6!BDc5f-Ie?8HIMn#^=_9wbQ>(W8u3~^gk`_v#q*n2O-N?{EWS?l_J+zU
zJA$5j&s*GA`r&m~|4+`^CTj!zb|3eJJ8n&WTK8D}i$L7L+^gpAG*XlVC6>0_T{tVt
dYMnA88^f31r<%Sn*lh)sq@J#RF6*2UngFUnB=`UT

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_6.png b/miniprogram/images/lw_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa68320c1a986ab7174c94d28b3f5b2a1e2af11b
GIT binary patch
literal 1378
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rU1jz%+k!s!qn8&+0f9?)ydM-!ot$Y(aFrv
z(#^%v(gLQ}B|o_|H#M&WrZ)wl*9@m#P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;w;1Cz
z52`l>w_8kb>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4E0nuwsrM0|Vn#PZ!6K
zid%caY`vKs1$>)&=dRQh>1j<!JjEQS5+NDDJ=>%#OEqfcik1cc7^OFE5oVeEhe7e;
zA+x!@K<U*>Hcy<BpCC5<<h{G^VhbJ`-g$d&&+PMix4i$o@_$6KUi<p8zswztRd#!Q
z<8QxOmTSZ0$eh%9u3I-Kuc<)QP|)L+fN{<j$%?1C{>u5yIc8>p9;*bT9pob#Hu7(@
zXZ^_5!)*E{pY7%;mx`Da|27W`_b+*U=S2?lq$&yd9}O~}$g#<4ZmMj0|FlRm-L6%d
zC38A9>DbF!DM+`kI9_zMDIxBKh2Y)II*|fXTl$JCSIcp|5q^8d`rMO8eG8Z_Fclei
zBx)A7UW{VbI>7QhQt@TVh1r+3>{~hgP?W-^#7d(QlS%s=y1rXk{C@F9u=?Vo4SyKQ
z54axSuwvh4$@_PKrjd(^)77S+d!M)hT@!hhYL@ulnsDZJnO1m=@5{Dl9qFRAq2@V4
z?Gq;YO+TdmeBPH8XC_x@A6&b(q`$}VkhqT19v9PjFTJLR@1C|kbE@{<#Oo1uE)%}&
zkn*km{bypzV~HEgekv1>f6`Vm5#3kn``YcshkyU{1gs7{J-2}I$16+C6Jj?*&hK(h
qKk$U3{wZJMs>|=MX<S>+z|0W7f$Qow^XopKQqR-X&t;ucLK6Vm_VAVf

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_7.png b/miniprogram/images/lw_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..b06c5261bcb4751c676a89af8b1b43ac7db976a3
GIT binary patch
literal 1299
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdXL7n;Ka-Ia!#xIvW}qx;j}HTDm!!nVFbc
zSh~2G8=JxOy5uL9=BDPA!1Sgd^jhN73rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G`hf
z=0WwQ;C72SPQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n3mmshXJBA#^K@|x
zskoK&=l_3uW?KgCl~Pfc|8Hm3ELR9)c_ew&SW>(5;&G1??hehl4IwrH)yx}JCS8$N
zNMnmS;<By3p{<>HC69s`dy?M@gA=ahjTNRR)E)K+biDQCvs&=*lS3B2fVM(sJ^LeW
zhdYcVKfO$jPmpyNZiry*h-di7sql_fs;)(>(^0^Mfp_{6*Hy_$3xpF6PQJy*pjm5@
z7%(T2srK)LYj#OTCayp6UGTzHK9{IC#w|MYCit%ubeC?3VCs0!tUJfoPp0wHRQp*U
zyubWmdBW~=wP}+J*92LnCAAkfv)Rcv8ohEc*~1j2vXK3=bH=t83`ungb}S*=`y#q)
z8g~fDK0bZq0+U$CjeE>V6a1eGOqOt9n-pW@Al$-rVbcE#lhQt<-1zFiW!t%*F-iPO
z3XksFbcdaiFF4yK^owlh=zI{6-O%hC(q^in80XNrpeR6O)#39>1&>)YTR9m%GAezQ
z5(wZode1EIp8Z&&fR5o01yvq)A=z&Ky$oAg6z|+wB*wsDz`*3(+#=4Uy#Z8AdAj<!
JtaD0e0syJavBm%Z

literal 0
HcmV?d00001

diff --git a/miniprogram/images/lw_8.png b/miniprogram/images/lw_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..1927a100cf663cf3199a82b8d87b532273ddbb53
GIT binary patch
literal 1740
zcmaJ?X;2eq7!DDrQb5Zghpns$9th+BLdZ&hkc4XtAVf*=A|wlmB-xPNGzo%bI7V*p
zC{j^8No8yq7zN5DQV|u9dV*p>u?&rrqK++!w%QF9?2po&+5L`rp67ku_j|wD{OHI~
zD+^}}91dp{9>$5mMrY%@*c|)TL~QKG1}Bs&Kx5$~R3lVDIF=Yrgn)3lFd2%0gkoLl
zHOL=_TSS!d1*m|x5fs64lF*1DY2`|cjl=l|YL!A!3WNfQP_k6PBs^{HAOKP^lMqMa
zQFux=B$0-tsi4@jNWLg7MZ^#j0s{blEr<!oAyf!x<uU~VYMF#tT@afax5)%x7J{ZQ
z3ICW9@S*`Wtbza<$=6dv_3;Df3=-AXhvMz)0eDfU3^K)!O!fApP(g|>NTUPq9|9Il
zB~AikI3e$2VJjv<f}%>0Ox9>LB#k!-Rwa|E3<jp*MfURY#1Ni{PJs%wo(hCGr@(;_
zkxHsWrLY1pDhd-}HOeGlPX9?kuAG-uAn(hB6^yJED#=t5#hB6@kjMLfs9ZjeM$j1O
zgWvxYM)*1<M2>+FSgjIa2bV-NhEjrT6(mGq6(5FWb5)F%z$lDJU?t#%SpwF@NflyP
zgSgEScswv%fuKT#2ny#g377;)DiwplK2#3fht8mJ*;Fc(8_eL+X>1n7%a={__G8o8
zb6gHAQp+I)I>!}%;IbCv8hb&m#3FMbmGlcp9HN5dz--Q-bYU;_1@+!@#S44!TaZh}
z%#e*I`>&Ip+rrw%IGyiXY%$;YkOFIW71q~9)JH1px&(%ESbXhJ+m`kyJC@xs`ebVQ
zD;KTVQEFmV0<m}~=#qU9u&=AU>t1EhDW8PopF@MCc(ahOwzD30db)FnCL$;?l|OK0
zP(D4g+Z%pa{(u?aQPJCafB5T{yI+jA&$O>f@{PNRpV_K=yz^vOk&P*HU%l(YB58=8
ze_VoJ)Rce56{)`nwhXU%u&eWMOG8Dk0_d#6XEr{Iv^sjzH2p$C^W;~<HtEE7I{<Ub
z&CkBKsHu9gX>a3_rE6oKhSoJKy7Ae&9(Em=vv;Ncp;4Vvchj=~wG&${>r`)loqTCD
z=ALC^Ho>KOZSLATwst=V*`0{vitPT=w`ux2))J&>l6B;hHSsLE^$clcb65W3>%^zk
zE-MC`L)0((z0aGx+Uj=tviA7d4g06e#@xp?_2V5xzZTTryjEtqr#r*-aHF$~CdvyR
z3pl=#5=sZ^pD(ZI<sTjxbh<2a0#j?`;~86?x3~tM%;;x`dM4lM6aD%Q_?DWxB0ue^
z&mbm;=A8VvDr6e5WhNMc?u*Wz03x>ePqilPT4vkJjZeD}!K=G<Z-iK)m~c8MW3*W|
z2>!Hob{br2@7`(MX0l#4{b-1lecQxfTEfpObNKGnm}7RFk4@~rld%0(#isP~l2xP0
zhN>j<TP<04t41QqO11<~$_PBX!A+Oj0oyEheUtKgAh6U{ANB++h!9@s9l2Y*UZa*B
z`;>A(`(lNKW^~xWzXPruJSAAt=<UjPiCQ+5RUx>VqceXvv}QQ_#G!yzLw#9r1njp%
zStPf$`GXJV0Qb#9x*|&dDnDrWQU7|U8%=O^U0Zx&{*ejYeszNV>d)abc~raF&BeDJ
z-<BiiuJ>H)qg-xOCd9ex%Iz-+muGtnZf>Z;6*?F^CQPi9^vVl+3KJaSkDVa4#5*?K
z%B^GWt(N@Ol()JgPc4b9!M8oEt<(sV7Y*MKx#OjV0pL{G$dTrDuu+c`Pn475g&#Fk
z^*w6q69$f3JC6&b)p}$qlWV@ujq9}}J3X^+$8<lXaBE)<*`*}6aB*kejflpyXfD2V
zL-&{4Ba6(>ImbIIJuI{Q)x(50?&tLd^?|>bmDNt*XQDDqaNqhz$qLf8RT}><;oL}0
IZE!-?-!j>x_5c6?

literal 0
HcmV?d00001

diff --git a/miniprogram/images/middl_right.png b/miniprogram/images/middl_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec22d6059f631744c66725e4ccf98ce275b2a742
GIT binary patch
literal 3159
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/middle_left.png b/miniprogram/images/middle_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c7e05fc662a16bef693e0acb41c44d782674425
GIT binary patch
literal 3123
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
N002ovPDHLkV1l}y?!y28

literal 0
HcmV?d00001

diff --git a/miniprogram/images/quanping.png b/miniprogram/images/quanping.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dc54d9c5814ad61aaa0168ed816542d51d208dc
GIT binary patch
literal 1289
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdU~+xH-BxIyt!-n3)(Fx;k1o0eNOF=8ooW
z#x54FE-<|=`N^fZsd*(Zy(tL2&N%gg(n4+l&}Ns^qRg_?6t|-MTm`V7tuk@D#S*7^
zP`xR*-QtK-uRhQ*`k<IaifNb-F!_L(@N^60z*Bx|9x%BV0n@eK+^P%)2F4ms7srr_
zTW_XcEIh2h<FN2Lqm7eWf%ylvuN*fQykvXF_L8Mcy~Eh?GUo!}l9nC97LWL<S`<`r
zeqDX#w~^WD{4*8B?#g+`XR5P1a@?4+W8adWqBcLL1%<K9c<p`1{aBpi@)JJ}eE80A
z%k9`%X8XG~sR~?Mgj$dM*krf<2>a_xA2`0W7e2q)yFmZjJ~msCiiZb(8GXu;G>^V}
z^MAAXwe=Oz_s=IB-*qFb{KTStEK^wfo;=ZG-u3y~+$Kx09b8O#ryKH`9aaS;Jm2HC
z=u*2mXU62FsM)v9?r!9rC^R|tg4&y?Y~!UthDQ%QFg?6ZFS6#}Q+^M(0@Iy=v%Qw{
zzL+`j__~TYn)UD6v=p)&83R2S3(dN;W@fpb3<)`T<iM^2iXZ2(9_!oMdOYbo)B4tB
z4>WGfH~3rDXd+|yUx}mb$;NF4|4VxWv-7{|Z`p3ua%7*%HxK9f7JW`%+3tc$7pY&X
z&z$(#BFHe!#r4;tUq-cGCuaV3JTp7?SIV!d-5drCpI$QhOg`6@2P&LAUHx3vIVCg!
E0B-!%761SM

literal 0
HcmV?d00001

diff --git a/miniprogram/images/right.png b/miniprogram/images/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f09a421dbc72932baa6d64eebe269845de747268
GIT binary patch
literal 1320
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>=_#T#VhE42_-K+{_IPT^*f_+)SKZj4ez|
z4IB+E49#GAUGkGlb5rw5V0u#!dQEWZ1*L`D0-((<sYRJ(sVQzn`MC;UKU-zuc8eiS
z^PqZDaJ$6_r(S)aWAs5Wixkr^Az<<WG2!VJ$bqN))I4BvF9N3P)Qkir1_s92o-U3d
z6}R3@->=V{D08gZgw1;50$rtF?KgOQoLHEZ%nUp33k6+TXqeq3;c{fX#1bD5p0wEq
zvo><)-ui4=sbVg%?)tsz=D1H!W>*)T{9L)e^8Wj~k=t_J5AAuSq!@47uwr_9(B(4Q
zRGz)M@1wRSmLzbzT`Xg;Igw${BBf0i_ymgG7&CrP-W4!mDr3^U7iuhzdW?ELZMx*3
zBVo(xFlV*!eu3K#I+C_+4lzM&u>zV3VSkw->f8+%)=uHRqL9tJqcpj>V?*{ShF_Dm
zvRzqr(UZf)PhkG0u!b8(R$Yxd7JgaGAKC4&g!w*m{hQ9XQ=(Z@OgZn&J30L#cUAda
zbLnd7O}`|b${kI$bT>_AY51_?kag-`9_?H6`DGeDv>dWdnQQg<R(6FeLyNU`odaj2
zI+s369S`UGOQ(`I^<Ct6c=Q0f;KRFI`O`~V-2S#q=XI#yf6BM@q?OC#y2GcL6l_+0
z2#aLTSTw2N{NxEA)J_>^O?+A-?<W{%^wn`vNo%@kn)g+Sq`?03wu>a6Y|-|vxccw;
inp^uH?q~lYmcVd!e!qLb7UgxIvdh!e&t;ucLK6UqA<(!0

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_1.png b/miniprogram/images/s_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4475e32c3ee3f5887131c372f05cb21a91ce80bb
GIT binary patch
literal 2515
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
Qul{Bc9o+C$_CZPi0gomuL;wH)

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_10.png b/miniprogram/images/s_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5720ae00ecf0534bc3ec8e63dd65ea2428b559a
GIT binary patch
literal 1953
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
X_CFQ%YX;6w8h)C5?ix;&cVyaMa8n`6

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_11.png b/miniprogram/images/s_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..31523ab30926b45edc268858f1ed7cb3968aaab4
GIT binary patch
literal 1912
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_12.png b/miniprogram/images/s_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..83a890b54dcca5a6be486bf408aae45e35552370
GIT binary patch
literal 1887
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
I^bFhj4_?*|YybcN

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_13.png b/miniprogram/images/s_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..df8d7441bfbaf903cdd79ea075386a0388dc2f0d
GIT binary patch
literal 2016
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_14.png b/miniprogram/images/s_14.png
new file mode 100644
index 0000000000000000000000000000000000000000..36e170b433a5cb3065a1e8540fb5306c10dacd9c
GIT binary patch
literal 1961
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_15.png b/miniprogram/images/s_15.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cfa97934288c57f2c494a2bf7f6e249213c7e58
GIT binary patch
literal 1914
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_16.png b/miniprogram/images/s_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..d044e6248e01c2465944e4303ee784344d57c019
GIT binary patch
literal 2124
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_17.png b/miniprogram/images/s_17.png
new file mode 100644
index 0000000000000000000000000000000000000000..192f1c04b8b816be15d6ff29d628ce1ae6c1fecd
GIT binary patch
literal 2081
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_18.png b/miniprogram/images/s_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c8abeb7c01e5f64c9580b20aa86538f7d46cbff
GIT binary patch
literal 1699
zcmaJ?eM}Q~7;b}z7K-AE(rMr*)A`k2TS{qb5lc&@LIKNHjl<cGgH~*>v{zeD5C>?0
z>0(e2D+Cb?3KZPj0D&p$hUf+a1&vb#ox&6qA;e0Y?23T<W9*W<-$$P3d7t<Fy}w*e
zWcX%0?sFUlgTaeJ1QK-gw7(1Hqu&iwYZ*Eakzgqj1t%aTnI6LMl&~BEL>gHlB!Ohg
zl;n1Zi@`YfsH3HbR2;@pz#59oj-i+}I+TsUa0AUcnIZ{706CPX)&`JXH(e$HYGnW^
z&QDAg>-dmL9g?btqEf@76{$%IwvrUM5#X9RsDK7SWPn+-TWjE$14vW49CU8q21&pa
z1W5`YeKaK%M*@6U4*`A@CRssaumFEHg~nu1eVOY4I+ex-sVtD@OQzB|R3^vIADDhf
zXf(Ytfg=$Jr(>b30FnwpbQ};gnM@RuF9p^of;2W8)u4lPIvGWf4JlegW+rP5J~Ije
z$e_@xb%+|)0(M2295x~WB-H806g0Y7S*>BZOlZMCvrGrlC{%k&GeEKU|DhVqEZTrb
zpih4PQ`iulqJuyQWPpu&1$uA^KK4*L4qp$+5Lh1#!@Fmy7^#90*r0-S03Editd3J_
zm9WXMW{Mydb3|GLBGW1$ksyGCN>J2lC5Oid5(;U-L42N&N23MvSafO-Pr#!G2M06Q
zEFOP`D}WV74Wvb8xXMpl{+wKUFKBdVWC5gC?}3y;J*)wya^|S#_QIZ1Z<?!|+Y4__
zE{K`|?I-)Mlb+c^+s8hg?OSv)+xd_dZFfD|*IzOl2hi)XR3zX<o9_?DiB+HR2<b3W
zUbSGCI~lij>G^&y_wF-?f_Pn-fxs?z@WZ&=4eZYE7teF7s91KCG+y45?>}Bnl9w*Y
z^*CKvMkqg)(WM-G*HSEU(J(9;>N2N3<={)p-+hx|Qb8s0T4cWPc1Dyl(I3nb{1zi9
zk}e&~Cg(g2XFkZ(sNI@yl5GiNo?G{Yr{C(=;rr+L{J#E)Eq#Niykzvqr3V8|C#;$2
z%=<kS-giZf4{OItb8!2=YGu@2_i%o2e${bNT409SvdlccXh+ES<992r`n{}=&$Jbs
zq*)zbaf#xZ(%U8Dj<IiBn^G`QH{LI9W=f6A_x1*rE&o0$G&h;Rxp1EEb~~mzcClrl
zf(5^kC{8^N`SW;GWXiz&vQlh&#kNjHMC`Bo7FVh?Yu=u*$&Au>H{->vcUe~L*o8$&
zCah1#<WcqTh$`QmgT0Zzv2741$WP9QI54p(d*08Hkm<~^UK<y<wr|n7l01iI*VME5
zani=Oon<bsfH9aT&voEt-{Xo^v@$pWTkOuS6|eSE)Q5e$wJUQ=&lAi9tbX2+RGs}|
zxW{N2+9GV&<hYRPRE9sb8aqPlI(@=QfyNlmT!!#Vl9ses?wxe>uEjUI$F4YcSG(=(
zo?9kO;gvKuLRw3k<G~@9j7Q$BxsOdmI%%s#N?_k1Z@+j;Tl&*ZFAm|bLyfc7&E6N!
zH`^voG$hnj3fGo|#&6$S;7M@8w*#zo14C{ji{95PjB)tzrfrn4J-OPk<Cg=YEPjFS
z$S}>O4D^Wa%__Fl)Nw-e>#w%EB2Gii5m#PX<A_^$=bo<W_KC744!D~1v6mam<tvYL
ztm;l)q`F=#p=ULI-RX&MF+S@1%isIQFs;bAn_K4v9vH=6UVi#!a`Qx1VFczrZaDA8
zvz8r{L*s+juMC4}?nh4Ysv58(-qgE_G%r%&1ua(9_WH0s=VAq8G}U?K!GXRX%%{ex
z<4axlhjuBut2+O<R9jDLtE|xBiXJ-D59iS%Y!0>tj}S@$c5?FS`>Hpg8CXowIznCy
S_Rbgf--akSTwo2_`OQBvj+Es9

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_2.png b/miniprogram/images/s_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3717e33e69f1bd7a0c2cabcbe7397a1b96688f83
GIT binary patch
literal 2078
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_3.png b/miniprogram/images/s_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf16c0b1e7e3532934645596785f432bcc545363
GIT binary patch
literal 2529
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_4.png b/miniprogram/images/s_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..222a809ed21583167bcbea7ee038147f9777f4cd
GIT binary patch
literal 2098
zcmaJ?dpMN&9-pI&`_d}pk}<aFvgYnKQxfyKOd2tC47HBAyco>9W9DTB$#&`#LfE1r
zwa&6pv^Zo!7p>bAI$BKDWlx0ED!0Q?Y2Rtno<ENBKF|C9F3;!l`F_5a=Xq0oeLVGb
z%ydvFls>}?U?J-k^{cfW`R*cC6d}uI*qsggLt(ItBLPvae25F88A47t$O1Y1_?UKZ
zHwv}JMi9V;+06Yk9wfwb)EK;6C`Q;Q)NU8Kn8S+#VKf&E7l@oOuj=n$&;q_QCeWTq
zWQyrvgup970{SQT1n?4~cvL>dWe<9{oQ4PpL70P<3!_C+n%o)lL6?T?)z<_J`U3=x
za>o2_ip}&z(;*3nw#Pf*cqBU~v?CQya<C&(9Bk2KB8f^MIuS?|9FasLI?(JL(H|cS
z5>3Jnqp<*wkFk)GGbRFt#WVszCX?Z16g(seCy=OAM1xEqlW_<FCyf`u963%TwOLUB
zKq*fm5W@mUgjOqZxKJ$Yj6t0Ko`O*PNmeBNSSF-k1UW}cAmNGXlvaRD=KqHZg`dz;
zm<9gf_kRjY1LDOXfdxvTSP2hlT$qhIl$b`BfE*Z-1VB*qN)>%0AQ+NHKw>l*v4q|p
zC=l@>nRLeo0+UH&h@>z_!~+?CGX{~s3j}-`-Hrm-Q7Hi3)q_eRxx2c$k?5{&u5=HI
zod?Cqp1i^ZAYQBx6u~Q8{vTZTRk`X}5Q>q=04Nc}fqV}MBt(D6nI>4>i`%MtAG!S1
zz0g<X5)d;4b!Y#p(<@iV_^7v^<`y}8ntV`%jJpJx>+FPqlPJ{MVg}$EAnzZ|V@4lz
z-`Luvcs1YHmz&ZX8I`gYmzrT+g2fLQ(gy>MuhsS=siq>eTIzaCP4N3rc}Ic3^+x7q
z|FGV)ff0J|B%q)52pBPGD#|g|D7oCQFt)gBVW_wE6^9T_oUR@39JoMv|Gq#P*7?w%
z^3ASkKys?^?Gdo6;yYN=R_=Nbvq}3%nJEV6FYPahSKKshPpTlB@CSBEiWL!ge)W^V
zv%D{w{ltrBE<3sedo(o7I#pTz5N@v9z3!=-XM570eYeqc7yFJ_x^?nv7qMNz*muUe
zZ|v<kyTsq<y$sV?mX1}Is&v1?ZiTMA+58M8nT|`Tw_ZeLb<Vx{^00%}BBPr4?=wA9
zEfasbJ_w}5J-WU5Qs8sB&XbISx^vAn8>s2<Mdi9taPsG@uIx(M5>GJf&^J%Y*}o`G
zJC`cgpV?ED_Qb$n)O6KV_gf3MgL*+0yc>y!x=oZ7r%i56-_O(bNUy=_PXFA-tDCPc
zdp^}3)Ofdy*=Fl|l16vy5C7aR;_7mzhP;Dh@n!RME8evh_q@{99aE;~@h?o-2HfVy
z++d9v>=O@@zzQ2rn@SSJ5*6o^ne^z4z~vDAdZaQ}#fY_^VfMUKmAN&%4=FqU(x?OM
zmyIQdC2i8xEZQ!6SedmYSXOnXtK-1YWAYLVuDL)s&+sfdzL7$C=A>DGw`;Sm@nsti
zER|gIVJ(NI&ZP6!Rc^Um+Zg~GbOh!a9vFV~#+%uFtlNs6*j;Uq#?nrhENm#)$31VY
z*;@Ed)l618wSBzVtL8p6G9}-<xF<Z-=BROL$i>134Ew920cH^*_p}SP#urY&7{)g-
zFA1axi>h8~BzNG7ZbtU^DsD)&>GO3h$zJJyk0u!puOX1fAv$B^!k97+7Z}tuZRK=H
zi8cBgKXC0+>)SuD#kb2&P3>&gu8G73R_Daj><1cVs&zx^@}rHVKN%kAXag#>`+%xW
z+u`2BXCFAS&7Yy4<$u?nEK?MhdKBx&pB*$qaE_Z)uQB7LqPt4b`p<GFa2KOT-^4lu
zmHc|5iJw5uXo-4I3DDT$@q8W8*LWMevc_;!>x8-QBp9RT=rCa$c_3$R?Z}VUYnL7v
zwQl#wB{n)X`dh?gnw>u0Orf^zb?Hv9>&7K_C=C_KhBwa`jj(D>J^MJ+$abu%Nh{}+
z(d50*SmQh_LG&37P`<bsnrJ?|^e!N4*z~PHf4u00A1*O->NU|U(O$8nSBh^u2gI`O
z?in)C>ZRqhF86E|Kq;RSGX{l>u%@CPcQWzTa|$0FmCxhE%zv?WjHR_cz2SA|dk1c#
z{>2TmYlaqFemVJzk9P54+mMCYIs;2@yq?Wy`S{~G)n#tjtz#Cg_W90FG^@9%jQ<jv
zXZ13vjXvugkv-d3-W7YeuXRziab&T4NZ~Wm67FO>w6&md`YRplkUM)9jRdbFX~&HF
zw|omFnOzgKScE>@HJ3R&g_9Npz0!DR^mQC+*&?XisA^uZ?^erCgJXS%-fURNyy7yU
zD=4<w{-6EzWW~12_j2A@2+Qa3b6;H1Zfn_kztEf9@&4DFkB2q%P>nWkm8TWbPW4}$
M;qC)exP|`pH<`s}r~m)}

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_5.png b/miniprogram/images/s_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..fab5f4fddedb217d7ba1881e01eae27eb882c1bb
GIT binary patch
literal 2048
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
OWPU&}x6c1y_J06A<3}$5

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_6.png b/miniprogram/images/s_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8bced083b7111d91fed9ba61cb958fa9380ff64
GIT binary patch
literal 1549
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdYW;IU2e-n>ac<x>*_;x;k38I-0v08XH?W
znme01nw!D&y5uL9=BDPA!1Sgd^g7|x3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G_81
z=0WwQ;C728PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n=3dH<3=B*So-U3d
z6}R4m+h&M53e3BCwmUZ9ihx{4SyOLg$fAT)FVDoOet%wW@kmrm5@~7@<Q8nn(9&IV
zBuYowOlZU9V-Xq2ixjxB?%nOXfA8(?`L#Ez?JYk^i9h@HzHHymvS(@EBU~~hTrW;I
zb)mt%Ywm6F%T|kK%&?SB_q=t!^QFbBiw*01)#}=-ZcR8jbK@ehY3J?NFz|^cZhYW=
zL1ukT|C1{YJ+U(zWLi!3e$=0EIN)DJcd6iwdF2n%_wHOj!F<Ad#|IHfZ+hyMdH61}
z4vRXs<z>`+#qTyxi+^VCiMho(aemZ`<A+#_U))m8W$Jk<@np&CoQhNByLWLut=_Av
z_wJl|{$0Br6+S|DzgTU#dh~$gcbOerR+Aa#Y8#d4Xzu9S<RQKG)5agU({f5!!`^!p
zFl|)rs-JqTwY0qd72Ba>j<LU1Kl(d2W73)EYl8i2(qHdNIkN7+MzvGUP1kCfyfTAk
z^xvFNlpu3wid}<p%aTHcGg`c=hMWo2YXl>ieVGre6^YQYxs-fr%f7A;8=TB$t1c2g
za77?%i^*N5-=epSWzWe>+4wcF{q3BayV)=E_e{E3QvH-!PCv_1MP>VclP9_<2fy-5
zEL=Wg{?jkEvn}#+)KjOOeA?dXyEs^4<|cL~hl$glwixFLUM)Q_|5nrLfOk%OPUjRW
z@^)<$b9f$jf1|v^+UJD_f87_T7SP%C<0iw4)aqGcj@5~`^&gk*Z2J2@$7c_h`I;+5
zf-91ApY}ib*B4WJYk}pCFP}tt&Q)luo}4jdk?oFkr|xI%p7uSvqGO}pmh)F?HePW|
zQ2EzCiT%ptsP`8y#2%b+-Q$eVt4sy+Y)6q_Eyqu<_Rd;c^W)F|)|(4I`8O~!l$D;F
U)oicG0V<$9UHx3vIVCg!0Hx4eMF0Q*

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_7.png b/miniprogram/images/s_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..f391ae41422f4b0edb76b9d64045024ffd48801d
GIT binary patch
literal 1787
zcmaJ?Yfuws6pbP%u}W2{C4gOnGd`2e0|*HTnq&zC2?k6{#AhBG5+S=WSxkbDDpq^|
zT9KkCQWX>(9x9+krHTqw6k0?Dp`wUb5J3>6;-Iw~1==5_JG1*e=A3iSz2E(2cS=J7
zCJ;$P0)a3=90-Ns<8<3Q&H?}W((;etgA3*_$CjWP%&aiN1il(o!hl$>h=jvnh1$Bd
z0_GA3b{;yJ9Ft3eIVx07RoF08i{5~<2?Xu}i$S4^f-yh|N9qtBx$DvuGN4oQ$l+cR
zn#3T4wYtDqBfKOwM5c<3QnA(K1%3e6!odafFs1-3`e?+&vGB+rbvgLlwhfYjj}R=1
zNB(3=E|CI4)CdD!RBwuk?&$-t*i^c=CynVnA7IevY>?&y(wP(*okR2Hc(H)Nhm1!v
zsx_Q2NHiD=U-8IV3^Q;*&}=qS%}gq4j0EXyHm<<{84L=JpqQ)(rm#>DlgE$(1e;Vw
zodMIK2w+oGDA5><N5-9gN<nWJmPJg1Wx@*vS`-G5PNmsW8Ujir{}0vchtVc14F1RO
ze+rvqRs#%%!6r1usKO6U<6#SB;0TSd0z-{56pbFLqEw4ws7Z?&00wRem>sS|)Tr4s
z=OaNP;fN6vra)A%7~+v}393$~=7@ZRp5A;&B;<?Obh<xZz-KV{Ou7#wfEWU{Ks3aK
zP*sc`MzA5SdYJ1^8<A`41-$`}48ca-I#?|-qI%$C&K%vyUZ4^62D$1Hy+HmWazWe-
zXgk?|o%GNa-afYJaNpvK;m(H<yxom>U;lZ&6u_?wB8K=fOG8JvB=Bp#a|ZKG9Az2Q
zlo@#JtCPnm4N%^(g{-|n&gz7W;@LD}^rRJz5kbx=@`QyE{kzuX$Hi9fAze;-IYvnI
zbPS$7`{^V0MpNtZpWl{r-2hlg=@(3`RlLXPS5T2sbIwJQBUy9Ep(A@0vLdB%wQp`>
z%??2ssY_(N{76NPnY<vKzRR2(<{Nk?otzQrzob9fjdAoruvF<ZwLXyabS28IB>bwa
z`hJ76(Ju|K7BstEbQ7(UWCuG5;{gw^WhEh(^1U9f+!l71cC;)jh?be<so!>A0$p@W
z?fk_d;_P`l*Y?s4oBKApj+%I&?L^|0dB>s%?k9^D6_*@xemo5wLs(VTy^>dPKYq{T
zYS#D(MH7D8Lb}#Nc>L`1+C6li-W54H->fc67*9R$Zp`~hH;wL&zE1V_`x2VB$F+#P
z&vex%dW$Dh;*%~iD?>#y+GPii2b>%unftnJbbKLls$xJ^-)twHWVi1G!WH;Fx|}##
zIj()DuCXbI`Rd1_rPoEt^J*`EQ+$+nsn=ZsJCJYlHwE=wqq+ErDsQM7)e+1s{4Z{l
zqx({?zki$5TWnv~vNV!welDP-J)4=RE<D@P9sZ7#Yt3iXjeDMaR+39T^q}WW7B6T1
ze#dBCb!TZw47EFYRjEV6%oP7nQf{g%I3wRYzwMTrHS$guyt}5|mAS&*gmNOAkel0o
zC~slOr^mkwKJ}oWwhDS}pPUx=tkV9P`Qbpoi*1`H>i(#k>ec>XM<YuVv0&G^G;Q#$
zd8_Z_?Ib=6&0d^V`ZDE-rsgljTHSJywlk_|CKb%A?};$Cj2g(Ed;e82cTdFP(2{{9
z_xjN9`bp=X-1fD*R~S?}MLFPzwI)|cm%Klce|T!Myn91m0g>i(d*b@LY1*UjVfp6Z
zfDN6`xAq^DQAo3Dg&AW()#28|`=bk6d+R!KHRF$LFKgdw+4ySO{;QihE|=dqO=5VZ
zhj^Sh4vq?VL#&a_YMay6wzsAri?Q^D)vamk?dGSdj3;$p_T8J>B;EUDk<sOh!)LYY
z?XFgB@%z2^9)pzfTJ@5scJ2w;U2=TQ0PVb6rqMU2@j?bkxc#Av#ClX#J?mUKcV%8p
z;v5aTIF)>EtZ2Wc!71nTttus{C$A@xdw|bKzWL$9wzmPDKN0K*yA!yT#nSs5ZNDS2
Le+ZN>SRMB_8Y<2S

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_8.png b/miniprogram/images/s_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..a86d30cc6688a19a681fe6dedeae2f1eecbd027a
GIT binary patch
literal 1624
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdS!67#bRwnK(H+x;Yvex;i=;7@J#|J32bM
z85tXzxR}B8y5uL9=BDPA!1Sgd^g83z3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{U%
z=0WwQ;C726PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|n;l~`c7#NsNd%8G=
zRNQ(KZkr(zC@`<`cbH9}bZ1hMy84O^6(P<f#jr&Y8O!%3q-rW@m~pl5RbpHn!O<kP
zh{Y#Sv7=*AM~2H$tvM`AT`ywG?*G`k_w3ty|L%9jJ+|Igoqzv)jq&HSXWt@RG9-L2
zPPlcUqx8?iOOi_4Ra5MH`md)Ih5bD8=E@0=v!5#_KmIj&#$1(2do4Bzf7tkcmeDh%
zW2aqHo-Z#oD_pad^_uZzu`j^~EH=3B-n9Dhl6yNECOyAk%lM8zWn;mGTz0((rQ=g`
z87J~OyvzH|sPnK;@Ne*%Ieh1|wkpq`(cLNA?{?9)ja7N$OEsPUT<^}$sArV?oWj5q
zvF|dM;pUW2iD8l5OBy1!Ki!}q#d)_}wEB7B6WeH`g=s-~G1DZXUiC()HI|r(#^g@9
zVp(+hX5AtY6S?xK8xOvm5VALU%lwI^lXlI|+xW0&Ps-Md-!EFre*SOKuRBws)1&yz
zfh`qj2W<R)_cwR=g@&GP;z$nLsA;*>RQAxq>lHQ3dzjwrxNBdyQM)RpFEQ5e>cRt#
z87ZePC^2zs9@pP!!+a)G`I*D3)C80C<E0NGeI{17Wj3}hU(l*+kz8<CLafaB=wgmr
ze`i#O`{gkGmur|%YdPI&vWDHYO>7(5O!A+mN*%w$5|%SB-yo+?dC9sdLf*^e?zFMa
z7xI4nX8QWC?71qDdQpn=+AnCcvaJm}c{S1QzT<a|#Fx=pE4srTt`O@GkN*Cfb6s@f
z?#WV~X<FaiY)>~->ez;=q|Q#}V)<=UA=fTtUU0lz``-hee@YX+tvHip@%#FHhfSAv
zCeKowELvl^U8VK)(ydXVI@3ADUg__cv#QCsW&3Z%>z$u&Kk0by;%VVo!{=zx*kBX6
zVEJtCH9Nje$oR_CHhbaQvr5;Oy_@(_VqX7~YIoZcrKXR5D1Tbf7+bv1H1vb+k@aUv
s7wQ*0?fsx@^61xp@n`W{?=$f*+++WyyxsVN1E{R`boFyt=akR{0Kb)Sw*UYD

literal 0
HcmV?d00001

diff --git a/miniprogram/images/s_9.png b/miniprogram/images/s_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc2acbaa1e23785ea1da53589cc67693bf8661b8
GIT binary patch
literal 1477
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdSyo8<?3pSr|Jzx;Yvex;k1qS(vyvnVXpy
z8alZdnHt0Ny5uL9=BDPA!1Sgd^qSz*3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ?G{6v
z=0WwQ;C71<PQCg-$LND%7AdA-Lcrt$V#3ockONQosd>QUUIa|nQ=DFGV_;yi@N{tu
zskrqfY`?dRqe$KTGfzLbtFs(AWbepSrkNA$`L8KNtTDu_(V>T>slK6C;gNm9YxxOo
zZ}^xRJ-S3Z6*Wy573W=?UHLPu?EIST<-5yYuR6=SXYSp(Gr#YBfA)Kt_$n>_i#;|0
z(#-dxv%l=SQL(bEDVptrQ;6CRuVCq|wu>wo%R>JAyS43O>jAA_Qx?3h*sZamdG@(a
zMPAk#-e28V)~?rGX4f6edvtP(W|`#Ms?tSg=Dy07*eq2$jq!MG=j%KCaeX@tSOOWR
zM|1r-^-ITlYg%*A50<cYlZLtHxqN<gZZ@=dq8B*#acZNPVaqP&iNd$cZ+-N5`lWue
zr<j_9t@^EN7jA~_ZFs<2Ua?stAozg9sl=%2Eq7ff@7lGCZ$DGA;C;c3W&JPYe_lBw
z%Fyh5?<?!gc?nl0YoEU}fA#kJvFFdUg&z}H?Pg=jU3^;kGh3R_x8$<(RT3=A;?>kI
zeiHfcbg5gxu|tf#D_8KHsX3@nQN_CW{o3>Stbfl>c=>*1W`}aY@BZ}ntUGugH@wV!
z(Z6Eje3eUQR$Tei@WU%_-9gRpDM1WuuRKjRzVLl3_qW!MpZRQv^NP!xzgeamO7}fD
z)|95n9nQH!x?KI*l#3T+Gv{a4uZ+L$8747X@}c2syLV>~Y<k6>BmDJ7WzjtCu3Nkz
z#{B|(ACwIzJKYLOXsvs+N%h{^4~0uVtZ?|4u>C~y`M67eAJuwiU;Sa5x75yi-|;5r
vWiOoP?zfAnn-Tu*M|&Mljr-gA49pBYUvIBZaokY^Dp);T{an^LB{Ts5S+z2I

literal 0
HcmV?d00001

diff --git a/miniprogram/images/set.png b/miniprogram/images/set.png
new file mode 100644
index 0000000000000000000000000000000000000000..a505b6f066c7481a0e1c8d432b523fb8018344ae
GIT binary patch
literal 2260
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
WyKzR>n7x1TKf}YtlU_y*PWls=I<u7k

literal 0
HcmV?d00001

diff --git a/miniprogram/images/sliding_up.png b/miniprogram/images/sliding_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ba6954d29aa67e4684c7a01da29159ec5ed6b0d
GIT binary patch
literal 3376
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
GLSTYR5NR6#

literal 0
HcmV?d00001

diff --git a/miniprogram/images/user_3.png b/miniprogram/images/user_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc37d2389c0ad7a821ea5adeb7b703a77d1a8f29
GIT binary patch
literal 4920
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

literal 0
HcmV?d00001

diff --git a/miniprogram/images/video.png b/miniprogram/images/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..a14c8c7e6ed854be8655483fd94d0d59d9f1e25a
GIT binary patch
literal 1660
zcmaJ?c~BE~7|jR@LhwMM2vwE^6szP8BwGS5gg}%aLV!@JZH@&pB-tgqkOUa5-~kS0
z6lun`auh~UtAJqDiXw_ypvE%VB5IW~SVe4$TA+$oHwf52N_S@Wcg%b5d*3m$MX@oF
zE>0d!6bi*f5+#ZwR}b6kIE(xqS`&ShTow}%av~m0C5#FKLV?w&5&<MSMH&)^DAeZ6
z4kVaDvGdW$<b+%r4XIEaU17t}O*)KZQz*fqCQPBqKnOsIq-pd*aH#nl2x!zoFo`E+
zO0jSxT@#gKK;m;^WU8DDl|T)Kh5*4Ph!oHvgaR<>w0aye3Bhq)h}_$*86YqYAu@#E
zTT^mrED(+w5P(My3{bJSd>}|bX9aSZoWNB8o5>O|n0y9{6ToCa%s_}21WY_28O@+h
zh2liwiCE-G2&NMR1~C{$qmgdp&{0DggC!7<8f*re9Y7)iaI>CJm;&^;&!mC~!Bqwg
zMrcqyU{h2m(JVp;l1|^Ipu?tQ_4q`Y$bvCU3XH*`Gi@nN0;SUbhw5}wXq<>c-ueAc
zVO(a$5Jnt=qge(O*|=06TPO?)Hy{cEHONp@J6Xlpbd*5xbQA;Fq$R*VNuyVzMtsFM
zK`MnLdYn+`Rft3+1W5_HMx%yU5n{H0%L)q<i}@^81PpVTf-pXx9VienBf|LMlUxz1
z%F-cvVv?(V#|@vBYnuffMn)DP22D1i78_6<FrG7{ncj<FTD=LbdU`MLv|I*hhGFaM
zzdAj6MUIbcJ2kiDVQTUbJvr_Ma;~p@P}N4E%ovi0V43OG8B0o30_?W^?_=DWrCast
z^-dD^-F`9xt{#9v|NJ>?gzk>p;4x*kcLU&^!*s04r+R_stEyrL!sZHz9r0b;KxgZ~
zs6iHkn8z$HJ+~L+R{DtTyfQ{V%;>(w$+cc7@!caC+I+l7aXG4a5iC;J9VwW(f{yml
zf7w2&{>eG-QB+rP6x%M-eiRxEc~<>8y4|R)?ep(wN!?fId#NzKVf|qa=5V^NhQO=l
zb+;{jsJ{?WdN%s2Lf?2AAvm+6pBh}5TJ+6)hp#D1lMR=t_REy5_RiFic?BD&roo<C
zAobCc1t;L|6L+4X_+b}ZRd4!lH^ptNqYnPM!*8ub`NQ@7H$667`;7a%J40KpG{Z%m
z-k#9$yPHaviJXso8>x7;@MiD>&n$njSze8lmTx-b+CGchiuP0o1;qCfE>E9u4{-dt
z557qE_LXh0T)eA2r{&q7zW*#+RS#G2yv9y8%++Yaj?G9@`@MMY<<pO-iG!i#L0Kua
z+DlJIxZTPtE^Ev7k663$Q0jodSSI?e(WU(cp6Af!dbaB}ZSeV$;m-Qf-#Rj#E{=WP
zIMR9JdXLij{$tNCGUvOU5AV*~`{~i)q=Uqs;ND$B%WC(fSd+#;>tI4pafL*j;Fu^`
zG~fEz*`x1RdRbj^$fhSEn$JSZ0F+l?ZD_k$>@bgpE#Bz-D5?Ga$#Rd3l{oKCa$4>I
zNz!WCmOuCREMI8`BT&y%(%yrem599hVIkf?YY9KPL_q!BnIHRCR(|EyWNdbJe{W?6
zk0ot7Z0T(2pdHPvCr+%hv<8+BS6G@XzLlJoXJuG($s5<mSFoX_rs<mA2kzgC%9kf^
znbY-igIi+9@alvduZms13q8_Sg)TqsmP_RP=wo{M@vD9JH1%@N#*_tj8V=KAdM`iV
zN3IJVaPT|gUIHJg%irDeWyhMdhk50^=JMWF@6r)9R3o`nW%gdMk+bt^Nqt-YYjMA3
c^GtV&g+Kdz@gI%%Z2tpEM2x5|?34U|03zsv2LJ#7

literal 0
HcmV?d00001

diff --git a/miniprogram/images/warning.png b/miniprogram/images/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..773f8a86cea12829931a5264eeaffeb70171aea2
GIT binary patch
literal 1408
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#6rQ`QqR!L
z#K720N5ROz&{E&PLf_C>*TB%qz|6|jTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8fo2%#8yV>WRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi
zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1tXx76g0v!^HTE5
zi#5R-e0{Av^NLFn^O93NU2K(rM(AZ`rdS!8xw@H{8XG#fxmg$*x;i?#xw$x*8M>M~
zJDXZsIvd0Ey5uL9=BDPA!1Sgd^cvyR3rY*Q1wfl!Qj0RnQd8WD@^clyezwZQ=@uh5
zoaRCGrr>sq0ZzU8K*#8VViqZ;VM4&<17gC{Esz6G`Kfup<X!|!*NJHdw=*y>e)e>6
z45_$vWZHRcmq3x@_b=<HYIZHrwB9^3kR!P5|AF<IVM}g!o;r4DwkD_dk~JsX($=^{
zY6PG9G4aNXr8+(uIypT-=fC^izxcNDbJ{)QV=K?!sVu)|dB6I+?e}|urLo~%iL30A
zZ>J0HIFRy7bIyH-SUxuMqh;bpK9y<(cBP~_HO9MMxngu-f_Db5Ok;=Z3Wd&@9UP6q
z1<mi7!<^c4e(N4tbVMV_Pu@SuBk)m}Q(#|M#N;dStZoOaD%ivm<i2>mzv8Xr81gvQ
z?rH4lE)jkI4VSVuo%t}MQGVvG>YDn^yZe=V79Wb7Q^@<;LHPyS()-QauRYa&uLu>A
zWRq5VAJQy)f$dwv`IC0DQg`PH2)^Vjl(tC_dz%s8AigqsgSJXj3FE}qnav#@%hPV;
zC+AeJ4N`ZzcqV=0kH-s|&o6Sx=T(|{YSQU?`I;r#{=wQ8mmLr)`24+C{Pay-OIeS_
zwo`wZYcBFgN(wmb5zoa`_^Wb9ne(Le(M!(pTXnW)CvD;Ska_8T@~q_>_8pCwxuec-
zvC76x;Z|E3MA<qw`kz#qb|C%G$(Mimo_!M1JYcFQ_D6{4mhF|daW!+hoPS^Me(!%~
z#;(B0!B$fqyZx<Pm64?oYmjK0R#sJgFtkzqQS*(hg>L={Q{8<Pbq>y$6FBjoLmj69
YgWBwB!+@U)-9Tlcr>mdKI;Vst03YQA<NyEw

literal 0
HcmV?d00001

diff --git a/miniprogram/images/wl_fg.png b/miniprogram/images/wl_fg.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d4e45c3d1178501f2ba4d19c76fb88ac3debfbe
GIT binary patch
literal 1961
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
S?&ZUv%G1-;&t;ucLK6V(n;+-^

literal 0
HcmV?d00001

diff --git a/miniprogram/images/yj_01.png b/miniprogram/images/yj_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..489d04a47182efb14b85505e2654b33d93577223
GIT binary patch
literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$=1D|BR9HvtR@;rjFc9=6p^gIyN1}=gl^j$8R03BCTop($5}^)Ed>UjU$7jdB
zm-tD30NI(Ho!y;<*pnZ6a(p%r7!(*3_?7~7T`!2}g)vs?@vW3n4ZdetcED%bwjX6#
z?o!7)O5k`rj*FsrV~ni<ihu}a0xP91AVoxDrPLVYa7IKsDdqcYHoFrHJ-q~k5Xf|I
z06FKISZ0Q>Qfh&_Akz0<kbn?krL$hA1a^rz$^|jJ1cVTKUFSLH{9ar80r+S%S|LlV
zP9vpU`s6l=K#A#ex^%I=5U?^21}}=@Y|5em*Z6(A-R3?LT8%Rlb=B+;Fg5pGG|W$@
z(-xU?&L8hu0S=t=xvx(!L5#5#5iM<1I|S;wJ`+(B0s%1YU<zD0p&W>nWjP5oD#*8O
zTiHr=vdHs%?*q31Lj-)vxJ1xf7*(5OM}fXt889D6pEA~aW~w^9<!wSp>DI~s8Io=j
z;#^8O2~5J>Pohl-5Zg#XCZg|bjq9Oo*Xwl?3GQuBuMeb}NX!*e%&gan_42{kC40N0
zAa;Y-PYn6wWn_6f$TT2@MWp@SyNpsSJW9ZBzC6#XEX!W?R(xzeO#)jFTk`U!>o`{D
u-<~Hc@Y_H?`akerL2cYYfkA<%EAR<gtyeIv=4kH#0000<MNUMnLSTaKNA5oW

literal 0
HcmV?d00001

diff --git a/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.js b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.js
new file mode 100644
index 0000000..a9e4b07
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.js
@@ -0,0 +1,64 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var button_1 = require('../mixins/button');
+var open_type_1 = require('../mixins/open-type');
+component_1.VantComponent({
+  mixins: [button_1.button, open_type_1.openType],
+  props: {
+    show: Boolean,
+    title: String,
+    cancelText: String,
+    description: String,
+    round: {
+      type: Boolean,
+      value: true,
+    },
+    zIndex: {
+      type: Number,
+      value: 100,
+    },
+    actions: {
+      type: Array,
+      value: [],
+    },
+    overlay: {
+      type: Boolean,
+      value: true,
+    },
+    closeOnClickOverlay: {
+      type: Boolean,
+      value: true,
+    },
+    closeOnClickAction: {
+      type: Boolean,
+      value: true,
+    },
+    safeAreaInsetBottom: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    onSelect: function (event) {
+      var index = event.currentTarget.dataset.index;
+      var item = this.data.actions[index];
+      if (item && !item.disabled && !item.loading) {
+        this.$emit('select', item);
+        if (this.data.closeOnClickAction) {
+          this.onClose();
+        }
+      }
+    },
+    onCancel: function () {
+      this.$emit('cancel');
+    },
+    onClose: function () {
+      this.$emit('close');
+    },
+    onClickOverlay: function () {
+      this.$emit('click-overlay');
+      this.onClose();
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.json b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.json
new file mode 100644
index 0000000..19bf989
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.json
@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-popup": "../popup/index",
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxml
new file mode 100644
index 0000000..7ed2819
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxml
@@ -0,0 +1,67 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-popup
+  show="{{ show }}"
+  position="bottom"
+  round="{{ round }}"
+  z-index="{{ zIndex }}"
+  overlay="{{ overlay }}"
+  custom-class="van-action-sheet"
+  safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:close="onClickOverlay"
+>
+  <view wx:if="{{ title }}" class="van-hairline--bottom van-action-sheet__header">
+    {{ title }}
+    <van-icon
+      name="close"
+      custom-class="van-action-sheet__close"
+      bind:click="onClose"
+    />
+  </view>
+  <view wx:if="{{ description }}" class="van-action-sheet__description">
+    {{ description }}
+  </view>
+  <view wx:if="{{ actions && actions.length }}">
+    <!-- button外包一层view，防止actions动态变化，导致渲染时button被打散 -->
+    <button
+      wx:for="{{ actions }}"
+      wx:key="index"
+      open-type="{{ item.openType }}"
+      style="{{ item.color ? 'color: ' + item.color : '' }}"
+      class="{{ utils.bem('action-sheet__item', { disabled: item.disabled || item.loading }) }} van-hairline--top {{ item.className || '' }}"
+      hover-class="van-action-sheet__item--hover"
+      data-index="{{ index }}"
+      bind:tap="onSelect"
+      bindgetuserinfo="bindGetUserInfo"
+      bindcontact="bindContact"
+      bindgetphonenumber="bindGetPhoneNumber"
+      binderror="bindError"
+      bindlaunchapp="bindLaunchApp"
+      bindopensetting="bindOpenSetting"
+      lang="{{ lang }}"
+      session-from="{{ sessionFrom }}"
+      send-message-title="{{ sendMessageTitle }}"
+      send-message-path="{{ sendMessagePath }}"
+      send-message-img="{{ sendMessageImg }}"
+      show-message-card="{{ showMessageCard }}"
+      app-parameter="{{ appParameter }}"
+    >
+      <block wx:if="{{ !item.loading }}">
+        {{ item.name }}
+        <text wx:if="{{ item.subname }}" class="van-action-sheet__subname" >{{ item.subname }}</text>
+      </block>
+      <van-loading wx:else custom-class="van-action-sheet__loading" size="20px" />
+    </button>
+  </view>
+  <slot />
+  <view
+    wx:if="{{ cancelText }}"
+    class="van-action-sheet__cancel"
+    hover-class="van-action-sheet__cancel--hover"
+    hover-stay-time="70"
+    bind:tap="onCancel"
+  >
+    {{ cancelText }}
+  </view>
+</van-popup>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxss
new file mode 100644
index 0000000..dc54840
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/action-sheet/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-action-sheet{max-height:90%!important;max-height:var(--action-sheet-max-height,90%)!important;color:#323233;color:var(--action-sheet-item-text-color,#323233)}.van-action-sheet__cancel,.van-action-sheet__item{text-align:center;font-size:16px;font-size:var(--action-sheet-item-font-size,16px);line-height:50px;line-height:var(--action-sheet-item-height,50px);background-color:#fff;background-color:var(--action-sheet-item-background,#fff)}.van-action-sheet__cancel--hover,.van-action-sheet__item--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-action-sheet__cancel:before{display:block;content:" ";height:8px;height:var(--action-sheet-cancel-padding-top,8px);background-color:#f7f8fa;background-color:var(--action-sheet-cancel-padding-color,#f7f8fa)}.van-action-sheet__item--disabled{color:#c8c9cc;color:var(--action-sheet-item-disabled-text-color,#c8c9cc)}.van-action-sheet__item--disabled.van-action-sheet__item--hover{background-color:#fff;background-color:var(--action-sheet-item-background,#fff)}.van-action-sheet__subname{margin-left:4px;margin-left:var(--padding-base,4px);font-size:12px;font-size:var(--action-sheet-subname-font-size,12px);color:#646566;color:var(--action-sheet-subname-color,#646566)}.van-action-sheet__header{text-align:center;font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--action-sheet-header-font-size,16px);line-height:44px;line-height:var(--action-sheet-header-height,44px)}.van-action-sheet__description{text-align:center;padding:16px;padding:var(--padding-md,16px);color:#646566;color:var(--action-sheet-description-color,#646566);font-size:14px;font-size:var(--action-sheet-description-font-size,14px);line-height:20px;line-height:var(--action-sheet-description-line-height,20px)}.van-action-sheet__close{position:absolute!important;top:0;right:0;line-height:inherit!important;padding:0 12px;padding:var(--action-sheet-close-icon-padding,0 12px);font-size:18px!important;font-size:var(--action-sheet-close-icon-size,18px)!important;color:#969799;color:var(--action-sheet-close-icon-color,#969799)}.van-action-sheet__loading{display:-webkit-flex!important;display:flex!important;height:50px;height:var(--action-sheet-item-height,50px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/area/index.js b/miniprogram/miniprogram_npm/@vant/weapp/area/index.js
new file mode 100644
index 0000000..ed80e4c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/area/index.js
@@ -0,0 +1,257 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var shared_1 = require('../picker/shared');
+var COLUMNSPLACEHOLDERCODE = '000000';
+component_1.VantComponent({
+  classes: ['active-class', 'toolbar-class', 'column-class'],
+  props: __assign(__assign({}, shared_1.pickerProps), {
+    value: {
+      type: String,
+      observer: function (value) {
+        this.code = value;
+        this.setValues();
+      },
+    },
+    areaList: {
+      type: Object,
+      value: {},
+      observer: 'setValues',
+    },
+    columnsNum: {
+      type: null,
+      value: 3,
+      observer: function (value) {
+        this.setData({
+          displayColumns: this.data.columns.slice(0, +value),
+        });
+      },
+    },
+    columnsPlaceholder: {
+      type: Array,
+      observer: function (val) {
+        this.setData({
+          typeToColumnsPlaceholder: {
+            province: val[0] || '',
+            city: val[1] || '',
+            county: val[2] || '',
+          },
+        });
+      },
+    },
+  }),
+  data: {
+    columns: [{ values: [] }, { values: [] }, { values: [] }],
+    displayColumns: [{ values: [] }, { values: [] }, { values: [] }],
+    typeToColumnsPlaceholder: {},
+  },
+  mounted: function () {
+    var _this = this;
+    setTimeout(function () {
+      _this.setValues();
+    }, 0);
+  },
+  methods: {
+    getPicker: function () {
+      if (this.picker == null) {
+        this.picker = this.selectComponent('.van-area__picker');
+      }
+      return this.picker;
+    },
+    onCancel: function (event) {
+      this.emit('cancel', event.detail);
+    },
+    onConfirm: function (event) {
+      var index = event.detail.index;
+      var value = event.detail.value;
+      value = this.parseOutputValues(value);
+      this.emit('confirm', { value: value, index: index });
+    },
+    emit: function (type, detail) {
+      detail.values = detail.value;
+      delete detail.value;
+      this.$emit(type, detail);
+    },
+    // parse output columns data
+    parseOutputValues: function (values) {
+      var columnsPlaceholder = this.data.columnsPlaceholder;
+      return values.map(function (value, index) {
+        // save undefined value
+        if (!value) return value;
+        value = JSON.parse(JSON.stringify(value));
+        if (!value.code || value.name === columnsPlaceholder[index]) {
+          value.code = '';
+          value.name = '';
+        }
+        return value;
+      });
+    },
+    onChange: function (event) {
+      var _this = this;
+      var _a = event.detail,
+        index = _a.index,
+        picker = _a.picker,
+        value = _a.value;
+      this.code = value[index].code;
+      this.setValues().then(function () {
+        _this.$emit('change', {
+          picker: picker,
+          values: _this.parseOutputValues(picker.getValues()),
+          index: index,
+        });
+      });
+    },
+    getConfig: function (type) {
+      var areaList = this.data.areaList;
+      return (areaList && areaList[type + '_list']) || {};
+    },
+    getList: function (type, code) {
+      var typeToColumnsPlaceholder = this.data.typeToColumnsPlaceholder;
+      var result = [];
+      if (type !== 'province' && !code) {
+        return result;
+      }
+      var list = this.getConfig(type);
+      result = Object.keys(list).map(function (code) {
+        return {
+          code: code,
+          name: list[code],
+        };
+      });
+      if (code) {
+        // oversea code
+        if (code[0] === '9' && type === 'city') {
+          code = '9';
+        }
+        result = result.filter(function (item) {
+          return item.code.indexOf(code) === 0;
+        });
+      }
+      if (typeToColumnsPlaceholder[type] && result.length) {
+        // set columns placeholder
+        var codeFill =
+          type === 'province'
+            ? ''
+            : type === 'city'
+            ? COLUMNSPLACEHOLDERCODE.slice(2, 4)
+            : COLUMNSPLACEHOLDERCODE.slice(4, 6);
+        result.unshift({
+          code: '' + code + codeFill,
+          name: typeToColumnsPlaceholder[type],
+        });
+      }
+      return result;
+    },
+    getIndex: function (type, code) {
+      var compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6;
+      var list = this.getList(type, code.slice(0, compareNum - 2));
+      // oversea code
+      if (code[0] === '9' && type === 'province') {
+        compareNum = 1;
+      }
+      code = code.slice(0, compareNum);
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].code.slice(0, compareNum) === code) {
+          return i;
+        }
+      }
+      return 0;
+    },
+    setValues: function () {
+      var _this = this;
+      var county = this.getConfig('county');
+      var code = this.code;
+      if (!code) {
+        if (this.data.columnsPlaceholder.length) {
+          code = COLUMNSPLACEHOLDERCODE;
+        } else if (Object.keys(county)[0]) {
+          code = Object.keys(county)[0];
+        } else {
+          code = '';
+        }
+      }
+      var province = this.getList('province');
+      var city = this.getList('city', code.slice(0, 2));
+      var picker = this.getPicker();
+      if (!picker) {
+        return;
+      }
+      var stack = [];
+      stack.push(picker.setColumnValues(0, province, false));
+      stack.push(picker.setColumnValues(1, city, false));
+      if (city.length && code.slice(2, 4) === '00') {
+        code = city[0].code;
+      }
+      stack.push(
+        picker.setColumnValues(
+          2,
+          this.getList('county', code.slice(0, 4)),
+          false
+        )
+      );
+      return Promise.all(stack)
+        .catch(function () {})
+        .then(function () {
+          return picker.setIndexes([
+            _this.getIndex('province', code),
+            _this.getIndex('city', code),
+            _this.getIndex('county', code),
+          ]);
+        })
+        .catch(function () {});
+    },
+    getValues: function () {
+      var picker = this.getPicker();
+      return picker
+        ? picker.getValues().filter(function (value) {
+            return !!value;
+          })
+        : [];
+    },
+    getDetail: function () {
+      var values = this.getValues();
+      var area = {
+        code: '',
+        country: '',
+        province: '',
+        city: '',
+        county: '',
+      };
+      if (!values.length) {
+        return area;
+      }
+      var names = values.map(function (item) {
+        return item.name;
+      });
+      area.code = values[values.length - 1].code;
+      if (area.code[0] === '9') {
+        area.country = names[1] || '';
+        area.province = names[2] || '';
+      } else {
+        area.province = names[0] || '';
+        area.city = names[1] || '';
+        area.county = names[2] || '';
+      }
+      return area;
+    },
+    reset: function (code) {
+      this.code = code || '';
+      return this.setValues();
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/area/index.json b/miniprogram/miniprogram_npm/@vant/weapp/area/index.json
new file mode 100644
index 0000000..a778e91
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/area/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-picker": "../picker/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/area/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/area/index.wxml
new file mode 100644
index 0000000..6075794
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/area/index.wxml
@@ -0,0 +1,18 @@
+<van-picker
+  class="van-area__picker"
+  active-class="active-class"
+  toolbar-class="toolbar-class"
+  column-class="column-class"
+  show-toolbar
+  value-key="name"
+  title="{{ title }}"
+  loading="{{ loading }}"
+  columns="{{ displayColumns }}"
+  item-height="{{ itemHeight }}"
+  visible-item-count="{{ visibleItemCount }}"
+  cancel-button-text="{{ cancelButtonText }}"
+  confirm-button-text="{{ confirmButtonText }}"
+  bind:change="onChange"
+  bind:confirm="onConfirm"
+  bind:cancel="onCancel"
+/>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/area/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/area/index.wxss
new file mode 100644
index 0000000..99694d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/area/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/button/index.js b/miniprogram/miniprogram_npm/@vant/weapp/button/index.js
new file mode 100644
index 0000000..d38d35d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/button/index.js
@@ -0,0 +1,81 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var button_1 = require('../mixins/button');
+var open_type_1 = require('../mixins/open-type');
+var version_1 = require('../common/version');
+var mixins = [button_1.button, open_type_1.openType];
+if (version_1.canIUseFormFieldButton()) {
+  mixins.push('wx://form-field-button');
+}
+component_1.VantComponent({
+  mixins: mixins,
+  classes: ['hover-class', 'loading-class'],
+  data: {
+    baseStyle: '',
+  },
+  props: {
+    formType: String,
+    icon: String,
+    classPrefix: {
+      type: String,
+      value: 'van-icon',
+    },
+    plain: Boolean,
+    block: Boolean,
+    round: Boolean,
+    square: Boolean,
+    loading: Boolean,
+    hairline: Boolean,
+    disabled: Boolean,
+    loadingText: String,
+    customStyle: String,
+    loadingType: {
+      type: String,
+      value: 'circular',
+    },
+    type: {
+      type: String,
+      value: 'default',
+    },
+    dataset: null,
+    size: {
+      type: String,
+      value: 'normal',
+    },
+    loadingSize: {
+      type: String,
+      value: '20px',
+    },
+    color: {
+      type: String,
+      observer: function (color) {
+        var style = '';
+        if (color) {
+          style += 'color: ' + (this.data.plain ? color : 'white') + ';';
+          if (!this.data.plain) {
+            // Use background instead of backgroundColor to make linear-gradient work
+            style += 'background: ' + color + ';';
+          }
+          // hide border when color is linear-gradient
+          if (color.indexOf('gradient') !== -1) {
+            style += 'border: 0;';
+          } else {
+            style += 'border-color: ' + color + ';';
+          }
+        }
+        if (style !== this.data.baseStyle) {
+          this.setData({ baseStyle: style });
+        }
+      },
+    },
+  },
+  methods: {
+    onClick: function () {
+      if (!this.data.loading) {
+        this.$emit('click');
+      }
+    },
+    noop: function () {},
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/button/index.json b/miniprogram/miniprogram_npm/@vant/weapp/button/index.json
new file mode 100644
index 0000000..e00a588
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/button/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/button/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/button/index.wxml
new file mode 100644
index 0000000..ab393e8
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/button/index.wxml
@@ -0,0 +1,68 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<button
+  id="{{ id }}"
+  data-detail="{{ dataset }}"
+  class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]) }} {{ hairline ? 'van-hairline--surround' : '' }}"
+  hover-class="van-button--active hover-class"
+  lang="{{ lang }}"
+  form-type="{{ formType }}"
+  style="{{ baseStyle }} {{ customStyle }}"
+  open-type="{{ disabled ? '' : openType }}"
+  business-id="{{ businessId }}"
+  session-from="{{ sessionFrom }}"
+  send-message-title="{{ sendMessageTitle }}"
+  send-message-path="{{ sendMessagePath }}"
+  send-message-img="{{ sendMessageImg }}"
+  show-message-card="{{ showMessageCard }}"
+  app-parameter="{{ appParameter }}"
+  aria-label="{{ ariaLabel }}"
+  bindtap="{{ !disabled ? 'onClick' : 'noop' }}"
+  bindgetuserinfo="bindGetUserInfo"
+  bindcontact="bindContact"
+  bindgetphonenumber="bindGetPhoneNumber"
+  binderror="bindError"
+  bindlaunchapp="bindLaunchApp"
+  bindopensetting="bindOpenSetting"
+>
+  <block wx:if="{{ loading }}">
+    <van-loading
+      custom-class="loading-class"
+      size="{{ loadingSize }}"
+      type="{{ loadingType }}"
+      color="{{ loadingColor(type,color,plain) }}"
+    />
+    <view wx:if="{{ loadingText }}" class="van-button__loading-text">
+      {{ loadingText }}
+    </view>
+  </block>
+  <block wx:else>
+    <van-icon
+      wx:if="{{ icon }}"
+      size="1.2em"
+      name="{{ icon }}"
+      class-prefix="{{ classPrefix }}"
+      class="van-button__icon"
+      custom-style="line-height: inherit;"
+    />
+    <view class="van-button__text">
+      <slot />
+    </view>
+  </block>
+</button>
+
+
+<wxs module="loadingColor">
+function get(type, color,plain) {
+  if(plain) {
+    return color ? color: '#c9c9c9';
+  }
+
+  if(type === 'default') {
+    return '#c9c9c9';
+  }
+  return 'white';
+}
+
+module.exports = get;
+</wxs>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/button/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/button/index.wxss
new file mode 100644
index 0000000..5a591fb
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/button/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-button{position:relative;display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;padding:0;text-align:center;vertical-align:middle;-webkit-appearance:none;-webkit-text-size-adjust:100%;height:44px;height:var(--button-default-height,44px);line-height:20px;line-height:var(--button-line-height,20px);font-size:16px;font-size:var(--button-default-font-size,16px);transition:opacity .2s;transition:opacity var(--animation-duration-fast,.2s);border-radius:2px;border-radius:var(--button-border-radius,2px)}.van-button:before{position:absolute;top:50%;left:50%;width:100%;height:100%;border:inherit;border-radius:inherit;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);opacity:0;content:" ";background-color:#000;background-color:var(--black,#000);border-color:#000;border-color:var(--black,#000)}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{color:#323233;color:var(--button-default-color,#323233);background:#fff;background:var(--button-default-background-color,#fff);border:1px solid #ebedf0;border:var(--button-border-width,1px) solid var(--button-default-border-color,#ebedf0)}.van-button--primary{color:#fff;color:var(--button-primary-color,#fff);background:#07c160;background:var(--button-primary-background-color,#07c160);border:1px solid #07c160;border:var(--button-border-width,1px) solid var(--button-primary-border-color,#07c160)}.van-button--info{color:#fff;color:var(--button-info-color,#fff);background:#1989fa;background:var(--button-info-background-color,#1989fa);border:1px solid #1989fa;border:var(--button-border-width,1px) solid var(--button-info-border-color,#1989fa)}.van-button--danger{color:#fff;color:var(--button-danger-color,#fff);background:#ee0a24;background:var(--button-danger-background-color,#ee0a24);border:1px solid #ee0a24;border:var(--button-border-width,1px) solid var(--button-danger-border-color,#ee0a24)}.van-button--warning{color:#fff;color:var(--button-warning-color,#fff);background:#ff976a;background:var(--button-warning-background-color,#ff976a);border:1px solid #ff976a;border:var(--button-border-width,1px) solid var(--button-warning-border-color,#ff976a)}.van-button--plain{background:#fff;background:var(--button-plain-background-color,#fff)}.van-button--plain.van-button--primary{color:#07c160;color:var(--button-primary-background-color,#07c160)}.van-button--plain.van-button--info{color:#1989fa;color:var(--button-info-background-color,#1989fa)}.van-button--plain.van-button--danger{color:#ee0a24;color:var(--button-danger-background-color,#ee0a24)}.van-button--plain.van-button--warning{color:#ff976a;color:var(--button-warning-background-color,#ff976a)}.van-button--large{width:100%;height:50px;height:var(--button-large-height,50px)}.van-button--normal{padding:0 15px;font-size:14px;font-size:var(--button-normal-font-size,14px)}.van-button--small{min-width:60px;min-width:var(--button-small-min-width,60px);height:30px;height:var(--button-small-height,30px);padding:0 8px;padding:0 var(--padding-xs,8px);font-size:12px;font-size:var(--button-small-font-size,12px)}.van-button--mini{display:inline-block;min-width:50px;min-width:var(--button-mini-min-width,50px);height:22px;height:var(--button-mini-height,22px);font-size:10px;font-size:var(--button-mini-font-size,10px)}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:-webkit-flex;display:flex;width:100%}.van-button--round{border-radius:999px;border-radius:var(--button-round-border-radius,999px)}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5;opacity:var(--button-disabled-opacity,.5)}.van-button__text{display:inline}.van-button__icon+.van-button__text:not(:empty),.van-button__loading-text{margin-left:4px}.van-button__icon{min-width:1em;line-height:inherit!important;vertical-align:top}.van-button--hairline{padding-top:1px;border-width:0}.van-button--hairline:after{border-color:inherit;border-width:1px;border-radius:4px;border-radius:calc(var(--button-border-radius, 2px)*2)}.van-button--hairline.van-button--round:after{border-radius:999px;border-radius:var(--button-round-border-radius,999px)}.van-button--hairline.van-button--square:after{border-radius:0}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/calendar.wxml b/miniprogram/miniprogram_npm/@vant/weapp/calendar/calendar.wxml
new file mode 100644
index 0000000..09a60b3
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/calendar.wxml
@@ -0,0 +1,57 @@
+<wxs src="./index.wxs" module="computed"></wxs>
+
+<template name="calendar">
+  <view class="van-calendar">
+    <header
+      title="{{ title }}"
+      showTitle="{{ showTitle }}"
+      subtitle="{{ subtitle }}"
+      showSubtitle="{{ showSubtitle }}"
+    >
+      <slot name="title" slot="title"></slot>
+    </header>
+
+    <scroll-view class="van-calendar__body" scroll-y scroll-into-view="{{ scrollIntoView }}">
+      <month
+        wx:for="{{ computed.getMonths(minDate, maxDate) }}"
+        wx:key="index"
+        id="month{{ index }}"
+        class="month"
+        data-date="{{ item }}"
+        date="{{ item }}"
+        type="{{ type }}"
+        color="{{ color }}"
+        minDate="{{ minDate }}"
+        maxDate="{{ maxDate }}"
+        showMark="{{ showMark }}"
+        formatter="{{ formatter }}"
+        rowHeight="{{ rowHeight }}"
+        currentDate="{{ currentDate }}"
+        showSubtitle="{{ showSubtitle }}"
+        allowSameDay="{{ allowSameDay }}"
+        showMonthTitle="{{ index !== 0 || !showSubtitle }}"
+        bind:click="onClickDay"
+      />
+    </scroll-view>
+
+    <view class="van-calendar__footer {{ safeAreaInsetBottom ? 'van-calendar__footer--safe-area-inset-bottom' : '' }}">
+      <slot name="footer"></slot>
+    </view>
+
+    <view class="van-calendar__footer {{ safeAreaInsetBottom ? 'van-calendar__footer--safe-area-inset-bottom' : '' }}">
+      <van-button
+        wx:if="{{ showConfirm }}"
+        round
+        block
+        type="danger"
+        color="{{ color }}"
+        custom-class="van-calendar__confirm"
+        disabled="{{ computed.getButtonDisabled(type, currentDate) }}"
+        nativeType="text"
+        bind:click="onConfirm"
+      >
+        {{ computed.getButtonDisabled(type, currentDate) ? confirmDisabledText : confirmText }}
+      </van-button>
+    </view>
+  </view>
+</template>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.js b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.js
new file mode 100644
index 0000000..cf725ae
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.js
@@ -0,0 +1,18 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../../../common/component');
+component_1.VantComponent({
+  props: {
+    title: {
+      type: String,
+      value: '日期选择',
+    },
+    subtitle: String,
+    showTitle: Boolean,
+    showSubtitle: Boolean,
+  },
+  data: {
+    weekdays: ['日', '一', '二', '三', '四', '五', '六'],
+  },
+  methods: {},
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.json b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxml
new file mode 100644
index 0000000..eb8e4b4
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxml
@@ -0,0 +1,16 @@
+<view class="van-calendar__header">
+  <block wx:if="{{ showTitle }}">
+    <view class="van-calendar__header-title"><slot name="title"></slot></view>
+    <view class="van-calendar__header-title">{{ title }}</view>
+  </block>
+
+  <view wx:if="{{ showSubtitle }}" class="van-calendar__header-subtitle">
+    {{ subtitle }}
+  </view>
+
+  <view class="van-calendar__weekdays">
+    <view wx:for="{{ weekdays }}" wx:key="index" class="van-calendar__weekday">
+      {{ item }}
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxss
new file mode 100644
index 0000000..4075e48
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/header/index.wxss
@@ -0,0 +1 @@
+@import '../../../common/index.wxss';.van-calendar__header{-webkit-flex-shrink:0;flex-shrink:0;box-shadow:0 2px 10px rgba(125,126,128,.16);box-shadow:var(--calendar-header-box-shadow,0 2px 10px rgba(125,126,128,.16))}.van-calendar__header-subtitle,.van-calendar__header-title{text-align:center;height:44px;height:var(--calendar-header-title-height,44px);font-weight:500;font-weight:var(--font-weight-bold,500);line-height:44px;line-height:var(--calendar-header-title-height,44px)}.van-calendar__header-title+.van-calendar__header-title,.van-calendar__header-title:empty{display:none}.van-calendar__header-title:empty+.van-calendar__header-title{display:block!important}.van-calendar__weekdays{display:-webkit-flex;display:flex}.van-calendar__weekday{-webkit-flex:1;flex:1;text-align:center;font-size:12px;font-size:var(--calendar-weekdays-font-size,12px);line-height:30px;line-height:var(--calendar-weekdays-height,30px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.js b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.js
new file mode 100644
index 0000000..1950c6c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.js
@@ -0,0 +1,167 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../../../common/component');
+var utils_1 = require('../../utils');
+component_1.VantComponent({
+  props: {
+    date: {
+      type: null,
+      observer: 'setDays',
+    },
+    type: {
+      type: String,
+      observer: 'setDays',
+    },
+    color: String,
+    minDate: {
+      type: null,
+      observer: 'setDays',
+    },
+    maxDate: {
+      type: null,
+      observer: 'setDays',
+    },
+    showMark: Boolean,
+    rowHeight: [Number, String],
+    formatter: {
+      type: null,
+      observer: 'setDays',
+    },
+    currentDate: {
+      type: [null, Array],
+      observer: 'setDays',
+    },
+    allowSameDay: Boolean,
+    showSubtitle: Boolean,
+    showMonthTitle: Boolean,
+  },
+  data: {
+    visible: true,
+    days: [],
+  },
+  methods: {
+    onClick: function (event) {
+      var index = event.currentTarget.dataset.index;
+      var item = this.data.days[index];
+      if (item.type !== 'disabled') {
+        this.$emit('click', item);
+      }
+    },
+    setDays: function () {
+      var days = [];
+      var startDate = new Date(this.data.date);
+      var year = startDate.getFullYear();
+      var month = startDate.getMonth();
+      var totalDay = utils_1.getMonthEndDay(
+        startDate.getFullYear(),
+        startDate.getMonth() + 1
+      );
+      for (var day = 1; day <= totalDay; day++) {
+        var date = new Date(year, month, day);
+        var type = this.getDayType(date);
+        var config = {
+          date: date,
+          type: type,
+          text: day,
+          bottomInfo: this.getBottomInfo(type),
+        };
+        if (this.data.formatter) {
+          config = this.data.formatter(config);
+        }
+        days.push(config);
+      }
+      this.setData({ days: days });
+    },
+    getMultipleDayType: function (day) {
+      var currentDate = this.data.currentDate;
+      if (!Array.isArray(currentDate)) {
+        return '';
+      }
+      var isSelected = function (date) {
+        return currentDate.some(function (item) {
+          return utils_1.compareDay(item, date) === 0;
+        });
+      };
+      if (isSelected(day)) {
+        var prevDay = utils_1.getPrevDay(day);
+        var nextDay = utils_1.getNextDay(day);
+        var prevSelected = isSelected(prevDay);
+        var nextSelected = isSelected(nextDay);
+        if (prevSelected && nextSelected) {
+          return 'multiple-middle';
+        }
+        if (prevSelected) {
+          return 'end';
+        }
+        return nextSelected ? 'start' : 'multiple-selected';
+      }
+      return '';
+    },
+    getRangeDayType: function (day) {
+      var _a = this.data,
+        currentDate = _a.currentDate,
+        allowSameDay = _a.allowSameDay;
+      if (!Array.isArray(currentDate)) {
+        return;
+      }
+      var startDay = currentDate[0],
+        endDay = currentDate[1];
+      if (!startDay) {
+        return;
+      }
+      var compareToStart = utils_1.compareDay(day, startDay);
+      if (!endDay) {
+        return compareToStart === 0 ? 'start' : '';
+      }
+      var compareToEnd = utils_1.compareDay(day, endDay);
+      if (compareToStart === 0 && compareToEnd === 0 && allowSameDay) {
+        return 'start-end';
+      }
+      if (compareToStart === 0) {
+        return 'start';
+      }
+      if (compareToEnd === 0) {
+        return 'end';
+      }
+      if (compareToStart > 0 && compareToEnd < 0) {
+        return 'middle';
+      }
+    },
+    getDayType: function (day) {
+      var _a = this.data,
+        type = _a.type,
+        minDate = _a.minDate,
+        maxDate = _a.maxDate,
+        currentDate = _a.currentDate;
+      if (
+        utils_1.compareDay(day, minDate) < 0 ||
+        utils_1.compareDay(day, maxDate) > 0
+      ) {
+        return 'disabled';
+      }
+      if (type === 'single') {
+        return utils_1.compareDay(day, currentDate) === 0 ? 'selected' : '';
+      }
+      if (type === 'multiple') {
+        return this.getMultipleDayType(day);
+      }
+      /* istanbul ignore else */
+      if (type === 'range') {
+        return this.getRangeDayType(day);
+      }
+    },
+    getBottomInfo: function (type) {
+      if (this.data.type === 'range') {
+        if (type === 'start') {
+          return '开始';
+        }
+        if (type === 'end') {
+          return '结束';
+        }
+        if (type === 'start-end') {
+          return '开始/结束';
+        }
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.json b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxml
new file mode 100644
index 0000000..55bab83
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxml
@@ -0,0 +1,39 @@
+<wxs src="./index.wxs" module="computed"></wxs>
+<wxs src="../../../wxs/utils.wxs" module="utils" />
+
+<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
+  <view wx:if="{{ showMonthTitle }}" class="van-calendar__month-title">
+    {{ computed.formatMonthTitle(date) }}
+  </view>
+
+  <view wx:if="{{ visible }}" class="van-calendar__days">
+    <view wx:if="{{ showMark }}" class="van-calendar__month-mark">
+      {{ computed.getMark(date) }}
+    </view>
+
+    <view
+      wx:for="{{ days }}"
+      wx:key="index"
+      style="{{ computed.getDayStyle(item.type, index, date, rowHeight, color) }}"
+      class="{{ utils.bem('calendar__day', [item.type]) }} {{ item.className }}"
+      data-index="{{ index }}"
+      bindtap="onClick"
+    >
+      <view wx:if="{{ item.type === 'selected' }}" class="van-calendar__selected-day" style="background: {{ color }}">
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+
+      <view wx:else>
+        <view wx:if="{{ item.topInfo }}" class="van-calendar__top-info">{{ item.topInfo }}</view>
+        {{ item.text }}
+        <view wx:if="{{ item.bottomInfo }}" class="van-calendar__bottom-info">
+          {{ item.bottomInfo }}
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxs
new file mode 100644
index 0000000..a057079
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxs
@@ -0,0 +1,67 @@
+/* eslint-disable */
+var utils = require('../../utils.wxs');
+
+function getMark(date) {
+  return getDate(date).getMonth() + 1;
+}
+
+var ROW_HEIGHT = 64;
+
+function getDayStyle(type, index, date, rowHeight, color) {
+  var style = [];
+  var offset = getDate(date).getDay();
+
+  if (index === 0) {
+    style.push(['margin-left', (100 * offset) / 7 + '%']);
+  }
+
+  if (rowHeight !== ROW_HEIGHT) {
+    style.push(['height', rowHeight + 'px']);
+  }
+
+  if (color) {
+    if (
+      type === 'start' ||
+      type === 'end' ||
+      type === 'multiple-selected' ||
+      type === 'multiple-middle'
+    ) {
+      style.push(['background', color]);
+    } else if (type === 'middle') {
+      style.push(['color', color]);
+    }
+  }
+
+  return style
+    .map(function(item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+function formatMonthTitle(date) {
+  date = getDate(date);
+  return date.getFullYear() + '年' + (date.getMonth() + 1) + '月';
+}
+
+function getMonthStyle(visible, date, rowHeight) {
+  if (!visible) {
+    date = getDate(date);
+
+    var totalDay = utils.getMonthEndDay(
+      date.getFullYear(),
+      date.getMonth() + 1
+    );
+    var offset = getDate(date).getDay();
+    var padding = Math.ceil((totalDay + offset) / 7) * rowHeight;
+
+    return 'padding-bottom:' + padding + 'px';
+  }
+}
+
+module.exports = {
+  getMark: getMark,
+  getDayStyle: getDayStyle,
+  formatMonthTitle: formatMonthTitle,
+  getMonthStyle: getMonthStyle
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxss
new file mode 100644
index 0000000..17c12f4
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/components/month/index.wxss
@@ -0,0 +1 @@
+@import '../../../common/index.wxss';.van-calendar{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;height:100%;background-color:#fff;background-color:var(--calendar-background-color,#fff)}.van-calendar__month-title{text-align:center;height:44px;height:var(--calendar-header-title-height,44px);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:14px;font-size:var(--calendar-month-title-font-size,14px);line-height:44px;line-height:var(--calendar-header-title-height,44px)}.van-calendar__days{position:relative;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-user-select:none;user-select:none}.van-calendar__month-mark{position:absolute;top:50%;left:50%;z-index:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);pointer-events:none;color:rgba(242,243,245,.8);color:var(--calendar-month-mark-color,rgba(242,243,245,.8));font-size:160px;font-size:var(--calendar-month-mark-font-size,160px)}.van-calendar__day,.van-calendar__selected-day{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;text-align:center}.van-calendar__day{position:relative;width:14.285%;height:64px;height:var(--calendar-day-height,64px);font-size:16px;font-size:var(--calendar-day-font-size,16px)}.van-calendar__day--end,.van-calendar__day--multiple-middle,.van-calendar__day--multiple-selected,.van-calendar__day--start,.van-calendar__day--start-end{color:#fff;color:var(--calendar-range-edge-color,#fff);background-color:#ee0a24;background-color:var(--calendar-range-edge-background-color,#ee0a24)}.van-calendar__day--start{border-radius:4px 0 0 4px;border-radius:var(--border-radius-md,4px) 0 0 var(--border-radius-md,4px)}.van-calendar__day--end{border-radius:0 4px 4px 0;border-radius:0 var(--border-radius-md,4px) var(--border-radius-md,4px) 0}.van-calendar__day--multiple-selected,.van-calendar__day--start-end{border-radius:4px;border-radius:var(--border-radius-md,4px)}.van-calendar__day--middle{color:#ee0a24;color:var(--calendar-range-middle-color,#ee0a24)}.van-calendar__day--middle:after{position:absolute;top:0;right:0;bottom:0;left:0;background-color:currentColor;content:"";opacity:.1;opacity:var(--calendar-range-middle-background-opacity,.1)}.van-calendar__day--disabled{cursor:default;color:#c8c9cc;color:var(--calendar-day-disabled-color,#c8c9cc)}.van-calendar__bottom-info,.van-calendar__top-info{position:absolute;right:0;left:0;font-size:10px;font-size:var(--calendar-info-font-size,10px);line-height:14px;line-height:var(--calendar-info-line-height,14px)}@media (max-width:350px){.van-calendar__bottom-info,.van-calendar__top-info{font-size:9px}}.van-calendar__top-info{top:6px}.van-calendar__bottom-info{bottom:6px}.van-calendar__selected-day{width:54px;width:var(--calendar-selected-day-size,54px);height:54px;height:var(--calendar-selected-day-size,54px);color:#fff;color:var(--calendar-selected-day-color,#fff);background-color:#ee0a24;background-color:var(--calendar-selected-day-background-color,#ee0a24);border-radius:4px;border-radius:var(--border-radius-md,4px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.js b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.js
new file mode 100644
index 0000000..e2b2ce1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.js
@@ -0,0 +1,318 @@
+'use strict';
+var __spreadArrays =
+  (this && this.__spreadArrays) ||
+  function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++)
+      s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+      for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+        r[k] = a[j];
+    return r;
+  };
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('./utils');
+var toast_1 = __importDefault(require('../toast/toast'));
+component_1.VantComponent({
+  props: {
+    title: {
+      type: String,
+      value: '日期选择',
+    },
+    color: String,
+    show: {
+      type: Boolean,
+      observer: function (val) {
+        if (val) {
+          this.initRect();
+          this.scrollIntoView();
+        }
+      },
+    },
+    formatter: null,
+    confirmText: {
+      type: String,
+      value: '确定',
+    },
+    rangePrompt: String,
+    defaultDate: {
+      type: [Number, Array],
+      observer: function (val) {
+        this.setData({ currentDate: val });
+        this.scrollIntoView();
+      },
+    },
+    allowSameDay: Boolean,
+    confirmDisabledText: String,
+    type: {
+      type: String,
+      value: 'single',
+      observer: 'reset',
+    },
+    minDate: {
+      type: null,
+      value: Date.now(),
+    },
+    maxDate: {
+      type: null,
+      value: new Date(
+        new Date().getFullYear(),
+        new Date().getMonth() + 6,
+        new Date().getDate()
+      ).getTime(),
+    },
+    position: {
+      type: String,
+      value: 'bottom',
+    },
+    rowHeight: {
+      type: [Number, String],
+      value: utils_1.ROW_HEIGHT,
+    },
+    round: {
+      type: Boolean,
+      value: true,
+    },
+    poppable: {
+      type: Boolean,
+      value: true,
+    },
+    showMark: {
+      type: Boolean,
+      value: true,
+    },
+    showTitle: {
+      type: Boolean,
+      value: true,
+    },
+    showConfirm: {
+      type: Boolean,
+      value: true,
+    },
+    showSubtitle: {
+      type: Boolean,
+      value: true,
+    },
+    safeAreaInsetBottom: {
+      type: Boolean,
+      value: true,
+    },
+    closeOnClickOverlay: {
+      type: Boolean,
+      value: true,
+    },
+    maxRange: {
+      type: [Number, String],
+      value: null,
+    },
+  },
+  data: {
+    subtitle: '',
+    currentDate: null,
+    scrollIntoView: '',
+  },
+  created: function () {
+    this.setData({
+      currentDate: this.getInitialDate(),
+    });
+  },
+  mounted: function () {
+    if (this.data.show || !this.data.poppable) {
+      this.initRect();
+      this.scrollIntoView();
+    }
+  },
+  methods: {
+    reset: function () {
+      this.setData({ currentDate: this.getInitialDate() });
+      this.scrollIntoView();
+    },
+    initRect: function () {
+      var _this = this;
+      if (this.contentObserver != null) {
+        this.contentObserver.disconnect();
+      }
+      var contentObserver = this.createIntersectionObserver({
+        thresholds: [0, 0.1, 0.9, 1],
+        observeAll: true,
+      });
+      this.contentObserver = contentObserver;
+      contentObserver.relativeTo('.van-calendar__body');
+      contentObserver.observe('.month', function (res) {
+        if (res.boundingClientRect.top <= res.relativeRect.top) {
+          // @ts-ignore
+          _this.setData({
+            subtitle: utils_1.formatMonthTitle(res.dataset.date),
+          });
+        }
+      });
+    },
+    getInitialDate: function () {
+      var _a = this.data,
+        type = _a.type,
+        defaultDate = _a.defaultDate,
+        minDate = _a.minDate;
+      if (type === 'range') {
+        var _b = defaultDate || [],
+          startDay = _b[0],
+          endDay = _b[1];
+        return [
+          startDay || minDate,
+          endDay || utils_1.getNextDay(new Date(minDate)).getTime(),
+        ];
+      }
+      if (type === 'multiple') {
+        return defaultDate || [minDate];
+      }
+      return defaultDate || minDate;
+    },
+    scrollIntoView: function () {
+      var _this = this;
+      setTimeout(function () {
+        var _a = _this.data,
+          currentDate = _a.currentDate,
+          type = _a.type,
+          show = _a.show,
+          poppable = _a.poppable,
+          minDate = _a.minDate,
+          maxDate = _a.maxDate;
+        var targetDate = type === 'single' ? currentDate : currentDate[0];
+        var displayed = show || !poppable;
+        if (!targetDate || !displayed) {
+          return;
+        }
+        var months = utils_1.getMonths(minDate, maxDate);
+        months.some(function (month, index) {
+          if (utils_1.compareMonth(month, targetDate) === 0) {
+            _this.setData({ scrollIntoView: 'month' + index });
+            return true;
+          }
+          return false;
+        });
+      }, 100);
+    },
+    onOpen: function () {
+      this.$emit('open');
+    },
+    onOpened: function () {
+      this.$emit('opened');
+    },
+    onClose: function () {
+      this.$emit('close');
+    },
+    onClosed: function () {
+      this.$emit('closed');
+    },
+    onClickDay: function (event) {
+      var date = event.detail.date;
+      var _a = this.data,
+        type = _a.type,
+        currentDate = _a.currentDate,
+        allowSameDay = _a.allowSameDay;
+      if (type === 'range') {
+        var startDay = currentDate[0],
+          endDay = currentDate[1];
+        if (startDay && !endDay) {
+          var compareToStart = utils_1.compareDay(date, startDay);
+          if (compareToStart === 1) {
+            this.select([startDay, date], true);
+          } else if (compareToStart === -1) {
+            this.select([date, null]);
+          } else if (allowSameDay) {
+            this.select([date, date]);
+          }
+        } else {
+          this.select([date, null]);
+        }
+      } else if (type === 'multiple') {
+        var selectedIndex_1;
+        var selected = currentDate.some(function (dateItem, index) {
+          var equal = utils_1.compareDay(dateItem, date) === 0;
+          if (equal) {
+            selectedIndex_1 = index;
+          }
+          return equal;
+        });
+        if (selected) {
+          var cancelDate = currentDate.splice(selectedIndex_1, 1);
+          this.setData({ currentDate: currentDate });
+          this.unselect(cancelDate);
+        } else {
+          this.select(__spreadArrays(currentDate, [date]));
+        }
+      } else {
+        this.select(date, true);
+      }
+    },
+    unselect: function (dateArray) {
+      var date = dateArray[0];
+      if (date) {
+        this.$emit('unselect', utils_1.copyDates(date));
+      }
+    },
+    select: function (date, complete) {
+      if (complete && this.data.type === 'range') {
+        var valid = this.checkRange(date);
+        if (!valid) {
+          // auto selected to max range if showConfirm
+          if (this.data.showConfirm) {
+            this.emit([
+              date[0],
+              utils_1.getDayByOffset(date[0], this.data.maxRange - 1),
+            ]);
+          } else {
+            this.emit(date);
+          }
+          return;
+        }
+      }
+      this.emit(date);
+      if (complete && !this.data.showConfirm) {
+        this.onConfirm();
+      }
+    },
+    emit: function (date) {
+      var getTime = function (date) {
+        return date instanceof Date ? date.getTime() : date;
+      };
+      this.setData({
+        currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date),
+      });
+      this.$emit('select', utils_1.copyDates(date));
+    },
+    checkRange: function (date) {
+      var _a = this.data,
+        maxRange = _a.maxRange,
+        rangePrompt = _a.rangePrompt;
+      if (maxRange && utils_1.calcDateNum(date) > maxRange) {
+        toast_1.default({
+          context: this,
+          message:
+            rangePrompt ||
+            '\u9009\u62E9\u5929\u6570\u4E0D\u80FD\u8D85\u8FC7 ' +
+              maxRange +
+              ' \u5929',
+        });
+        return false;
+      }
+      return true;
+    },
+    onConfirm: function () {
+      var _this = this;
+      if (
+        this.data.type === 'range' &&
+        !this.checkRange(this.data.currentDate)
+      ) {
+        return;
+      }
+      wx.nextTick(function () {
+        _this.$emit('confirm', utils_1.copyDates(_this.data.currentDate));
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.json b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.json
new file mode 100644
index 0000000..61dec08
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.json
@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "header": "./components/header/index",
+    "month": "./components/month/index",
+    "van-button": "../button/index",
+    "van-popup": "../popup/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxml
new file mode 100644
index 0000000..d4849cc
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxml
@@ -0,0 +1,31 @@
+<wxs src="./index.wxs" module="computed" />
+
+<import src="./calendar.wxml" />
+
+<van-popup
+  wx:if="{{ poppable }}"
+  custom-class="van-calendar__popup--{{ position }}"
+  close-icon-class="van-calendar__close-icon"
+  show="{{ show }}"
+  round="{{ round }}"
+  position="{{ position }}"
+  closeable="{{ showTitle || showSubtitle }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:enter="onOpen"
+  bind:close="onClose"
+  bind:after-enter="onOpened"
+  bind:after-leave="onClosed"
+>
+  <template
+    is="calendar"
+    data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+  />
+</van-popup>
+
+<template
+  wx:else
+  is="calendar"
+  data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+/>
+
+<van-toast id="van-toast" />
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxs
new file mode 100644
index 0000000..2c04be1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxs
@@ -0,0 +1,37 @@
+/* eslint-disable */
+var utils = require('./utils.wxs');
+
+function getMonths(minDate, maxDate) {
+  var months = [];
+  var cursor = getDate(minDate);
+
+  cursor.setDate(1);
+
+  do {
+    months.push(cursor.getTime());
+    cursor.setMonth(cursor.getMonth() + 1);
+  } while (utils.compareMonth(cursor, getDate(maxDate)) !== 1);
+
+  return months;
+}
+
+function getButtonDisabled(type, currentDate) {
+  if (currentDate == null) {
+    return true;
+  }
+
+  if (type === 'range') {
+    return !currentDate[0] || !currentDate[1];
+  }
+
+  if (type === 'multiple') {
+    return !currentDate.length;
+  }
+
+  return !currentDate;
+}
+
+module.exports = {
+  getMonths: getMonths,
+  getButtonDisabled: getButtonDisabled
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxss
new file mode 100644
index 0000000..9d78e0f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-calendar{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;height:100%;height:var(--calendar-height,100%);background-color:#fff;background-color:var(--calendar-background-color,#fff)}.van-calendar__close-icon{top:11px}.van-calendar__popup--bottom,.van-calendar__popup--top{height:80%;height:var(--calendar-popup-height,80%)}.van-calendar__popup--left,.van-calendar__popup--right{height:100%}.van-calendar__body{-webkit-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}.van-calendar__footer{-webkit-flex-shrink:0;flex-shrink:0;padding:0 16px;padding:0 var(--padding-md,16px)}.van-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.van-calendar__footer+.van-calendar__footer,.van-calendar__footer:empty{display:none}.van-calendar__footer:empty+.van-calendar__footer{display:block!important}.van-calendar__confirm{height:36px!important;height:var(--calendar-confirm-button-height,36px)!important;margin:7px 0!important;margin:var(--calendar-confirm-button-margin,7px 0)!important;line-height:34px!important;line-height:var(--calendar-confirm-button-line-height,34px)!important}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.js b/miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.js
new file mode 100644
index 0000000..cdd1a0c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.js
@@ -0,0 +1,91 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.getMonths = exports.getMonthEndDay = exports.copyDates = exports.calcDateNum = exports.getNextDay = exports.getPrevDay = exports.getDayByOffset = exports.compareDay = exports.compareMonth = exports.formatMonthTitle = exports.ROW_HEIGHT = void 0;
+exports.ROW_HEIGHT = 64;
+function formatMonthTitle(date) {
+  if (!(date instanceof Date)) {
+    date = new Date(date);
+  }
+  return date.getFullYear() + '\u5E74' + (date.getMonth() + 1) + '\u6708';
+}
+exports.formatMonthTitle = formatMonthTitle;
+function compareMonth(date1, date2) {
+  if (!(date1 instanceof Date)) {
+    date1 = new Date(date1);
+  }
+  if (!(date2 instanceof Date)) {
+    date2 = new Date(date2);
+  }
+  var year1 = date1.getFullYear();
+  var year2 = date2.getFullYear();
+  var month1 = date1.getMonth();
+  var month2 = date2.getMonth();
+  if (year1 === year2) {
+    return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+  }
+  return year1 > year2 ? 1 : -1;
+}
+exports.compareMonth = compareMonth;
+function compareDay(day1, day2) {
+  if (!(day1 instanceof Date)) {
+    day1 = new Date(day1);
+  }
+  if (!(day2 instanceof Date)) {
+    day2 = new Date(day2);
+  }
+  var compareMonthResult = compareMonth(day1, day2);
+  if (compareMonthResult === 0) {
+    var date1 = day1.getDate();
+    var date2 = day2.getDate();
+    return date1 === date2 ? 0 : date1 > date2 ? 1 : -1;
+  }
+  return compareMonthResult;
+}
+exports.compareDay = compareDay;
+function getDayByOffset(date, offset) {
+  date = new Date(date);
+  date.setDate(date.getDate() + offset);
+  return date;
+}
+exports.getDayByOffset = getDayByOffset;
+function getPrevDay(date) {
+  return getDayByOffset(date, -1);
+}
+exports.getPrevDay = getPrevDay;
+function getNextDay(date) {
+  return getDayByOffset(date, 1);
+}
+exports.getNextDay = getNextDay;
+function calcDateNum(date) {
+  var day1 = new Date(date[0]).getTime();
+  var day2 = new Date(date[1]).getTime();
+  return (day2 - day1) / (1000 * 60 * 60 * 24) + 1;
+}
+exports.calcDateNum = calcDateNum;
+function copyDates(dates) {
+  if (Array.isArray(dates)) {
+    return dates.map(function (date) {
+      if (date === null) {
+        return date;
+      }
+      return new Date(date);
+    });
+  }
+  return new Date(dates);
+}
+exports.copyDates = copyDates;
+function getMonthEndDay(year, month) {
+  return 32 - new Date(year, month - 1, 32).getDate();
+}
+exports.getMonthEndDay = getMonthEndDay;
+function getMonths(minDate, maxDate) {
+  var months = [];
+  var cursor = new Date(minDate);
+  cursor.setDate(1);
+  do {
+    months.push(cursor.getTime());
+    cursor.setMonth(cursor.getMonth() + 1);
+  } while (compareMonth(cursor, maxDate) !== 1);
+  return months;
+}
+exports.getMonths = getMonths;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.wxs b/miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.wxs
new file mode 100644
index 0000000..e57f6b3
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/calendar/utils.wxs
@@ -0,0 +1,25 @@
+/* eslint-disable */
+function getMonthEndDay(year, month) {
+  return 32 -  getDate(year, month - 1, 32).getDate();
+}
+
+function compareMonth(date1, date2) {
+  date1 = getDate(date1);
+  date2 = getDate(date2);
+
+  var year1 = date1.getFullYear();
+  var year2 = date2.getFullYear();
+  var month1 = date1.getMonth();
+  var month2 = date2.getMonth();
+
+  if (year1 === year2) {
+    return month1 === month2 ? 0 : month1 > month2 ? 1 : -1;
+  }
+
+  return year1 > year2 ? 1 : -1;
+}
+
+module.exports = {
+  getMonthEndDay: getMonthEndDay,
+  compareMonth: compareMonth
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/card/index.js b/miniprogram/miniprogram_npm/@vant/weapp/card/index.js
new file mode 100644
index 0000000..cb0f982
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/card/index.js
@@ -0,0 +1,51 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var link_1 = require('../mixins/link');
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  classes: [
+    'num-class',
+    'desc-class',
+    'thumb-class',
+    'title-class',
+    'price-class',
+    'origin-price-class',
+  ],
+  mixins: [link_1.link],
+  props: {
+    tag: String,
+    num: String,
+    desc: String,
+    thumb: String,
+    title: String,
+    price: {
+      type: String,
+      observer: 'updatePrice',
+    },
+    centered: Boolean,
+    lazyLoad: Boolean,
+    thumbLink: String,
+    originPrice: String,
+    thumbMode: {
+      type: String,
+      value: 'aspectFit',
+    },
+    currency: {
+      type: String,
+      value: '¥',
+    },
+  },
+  methods: {
+    updatePrice: function () {
+      var price = this.data.price;
+      var priceArr = price.toString().split('.');
+      this.setData({
+        integerStr: priceArr[0],
+        decimalStr: priceArr[1] ? '.' + priceArr[1] : '',
+      });
+    },
+    onClickThumb: function () {
+      this.jumpLink('thumbLink');
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/card/index.json b/miniprogram/miniprogram_npm/@vant/weapp/card/index.json
new file mode 100644
index 0000000..e917407
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/card/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-tag": "../tag/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/card/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/card/index.wxml
new file mode 100644
index 0000000..39b4b33
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/card/index.wxml
@@ -0,0 +1,50 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class van-card">
+  <view class="{{ utils.bem('card__header', { center: centered }) }}">
+    <view class="van-card__thumb" bind:tap="onClickThumb">
+      <image
+        wx:if="{{ thumb }}"
+        src="{{ thumb }}"
+        mode="{{ thumbMode }}"
+        lazy-load="{{ lazyLoad }}"
+        class="van-card__img thumb-class"
+      />
+      <slot name="thumb" />
+      <van-tag
+        wx:if="{{ tag }}"
+        mark
+        type="danger"
+        custom-class="van-card__tag"
+      >
+        {{ tag }}
+      </van-tag>
+    </view>
+
+    <view class="van-card__content {{ utils.bem('card__content', { center: centered }) }}">
+      <view>
+        <view wx:if="{{ title }}" class="van-card__title title-class">{{ title }}</view>
+        <slot wx:else name="title" />
+
+        <view wx:if="{{ desc }}" class="van-card__desc desc-class">{{ desc }}</view>
+        <slot wx:else name="desc" />
+
+        <slot name="tags" />
+      </view>
+
+      <view class="van-card__bottom">
+        <slot name="price-top" />
+        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">{{ currency }}<text class="van-card__price-integer">{{ integerStr }}</text><text class="van-card__price-decimal">{{ decimalStr }}</text></view>
+        <slot wx:else name="price" />
+        <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
+        <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>
+        <slot wx:else  name="num" />
+        <slot name="bottom" />
+      </view>
+    </view>
+  </view>
+
+  <view class="van-card__footer">
+    <slot name="footer" />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/card/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/card/index.wxss
new file mode 100644
index 0000000..0a90c3c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/card/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-card{position:relative;box-sizing:border-box;padding:8px 16px;padding:var(--card-padding,8px 16px);font-size:12px;font-size:var(--card-font-size,12px);color:#323233;color:var(--card-text-color,#323233);background-color:#fafafa;background-color:var(--card-background-color,#fafafa)}.van-card__header{display:-webkit-flex;display:flex}.van-card__header--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:relative;-webkit-flex:none;flex:none;width:88px;width:var(--card-thumb-size,88px);height:88px;height:var(--card-thumb-size,88px);margin-right:8px;margin-right:var(--padding-xs,8px)}.van-card__thumb:empty{display:none}.van-card__img{width:100%;height:100%;border-radius:8px;border-radius:var(--border-radius-lg,8px)}.van-card__content{position:relative;display:-webkit-flex;display:flex;-webkit-flex:1;flex:1;-webkit-flex-direction:column;flex-direction:column;-webkit-justify-content:space-between;justify-content:space-between;min-width:0;min-height:88px;min-height:var(--card-thumb-size,88px)}.van-card__content--center{-webkit-justify-content:center;justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:16px;line-height:var(--card-title-line-height,16px)}.van-card__desc{line-height:20px;line-height:var(--card-desc-line-height,20px);color:#646566;color:var(--card-desc-color,#646566)}.van-card__bottom{line-height:20px}.van-card__price{display:inline-block;font-weight:700;color:#ee0a24;color:var(--card-price-color,#ee0a24);font-size:12px;font-size:var(--card-price-font-size,12px)}.van-card__price-integer{font-size:16px;font-size:var(--card-price-integer-font-size,16px)}.van-card__price-decimal,.van-card__price-integer{font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--card-price-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif)}.van-card__origin-price{display:inline-block;margin-left:5px;text-decoration:line-through;font-size:10px;font-size:var(--card-origin-price-font-size,10px);color:#646566;color:var(--card-origin-price-color,#646566)}.van-card__num{float:right}.van-card__tag{position:absolute;top:2px;left:0}.van-card__footer{-webkit-flex:none;flex:none;width:100%;text-align:right}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.js b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.js
new file mode 100644
index 0000000..7d93487
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.js
@@ -0,0 +1,12 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    title: String,
+    border: {
+      type: Boolean,
+      value: true,
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.json b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxml
new file mode 100644
index 0000000..6e0b471
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxml
@@ -0,0 +1,9 @@
+<view
+  wx:if="{{ title }}"
+  class="van-cell-group__title"
+>
+  {{ title }}
+</view>
+<view class="custom-class van-cell-group {{ border ? 'van-hairline--top-bottom' : '' }}">
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxss
new file mode 100644
index 0000000..edbccd5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell-group/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-cell-group__title{padding:16px 16px 8px;padding:var(--cell-group-title-padding,16px 16px 8px);font-size:14px;font-size:var(--cell-group-title-font-size,14px);line-height:16px;line-height:var(--cell-group-title-line-height,16px);color:#969799;color:var(--cell-group-title-color,#969799)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell/index.js b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.js
new file mode 100644
index 0000000..4c04091
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.js
@@ -0,0 +1,39 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var link_1 = require('../mixins/link');
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  classes: [
+    'title-class',
+    'label-class',
+    'value-class',
+    'right-icon-class',
+    'hover-class',
+  ],
+  mixins: [link_1.link],
+  props: {
+    title: null,
+    value: null,
+    icon: String,
+    size: String,
+    label: String,
+    center: Boolean,
+    isLink: Boolean,
+    required: Boolean,
+    clickable: Boolean,
+    titleWidth: String,
+    customStyle: String,
+    arrowDirection: String,
+    useLabelSlot: Boolean,
+    border: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    onClick: function (event) {
+      this.$emit('click', event.detail);
+      this.jumpLink();
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell/index.json b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxml
new file mode 100644
index 0000000..afaaaf8
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxml
@@ -0,0 +1,45 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('cell', [size, { center, required, borderless: !border, clickable: isLink || clickable }]) }}"
+  hover-class="van-cell--hover hover-class"
+  hover-stay-time="70"
+  style="{{ customStyle }}"
+  bind:tap="onClick"
+>
+  <van-icon
+    wx:if="{{ icon }}"
+    name="{{ icon }}"
+    class="van-cell__left-icon-wrap"
+    custom-class="van-cell__left-icon"
+  />
+  <slot wx:else name="icon" />
+
+  <view
+    style="{{ titleWidth ? 'max-width:' + titleWidth + ';min-width:' + titleWidth : '' }}"
+    class="van-cell__title title-class"
+  >
+    <block wx:if="{{ title }}">{{ title }}</block>
+    <slot wx:else name="title" />
+
+    <view wx:if="{{ label || useLabelSlot }}" class="van-cell__label label-class">
+      <slot wx:if="{{ useLabelSlot }}" name="label" />
+      <block wx:elif="{{ label }}">{{ label }}</block>
+    </view>
+  </view>
+
+  <view class="van-cell__value value-class">
+    <block wx:if="{{ value || value === 0 }}">{{ value }}</block>
+    <slot wx:else />
+  </view>
+
+  <van-icon
+    wx:if="{{ isLink }}"
+    name="{{ arrowDirection ? 'arrow' + '-' + arrowDirection : 'arrow' }}"
+    class="van-cell__right-icon-wrap right-icon-class"
+    custom-class="van-cell__right-icon"
+  />
+  <slot wx:else name="right-icon" />
+
+  <slot name="extra" />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxss
new file mode 100644
index 0000000..7afd1c4
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/cell/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-cell{position:relative;display:-webkit-flex;display:flex;box-sizing:border-box;width:100%;padding:10px 16px;padding:var(--cell-vertical-padding,10px) var(--cell-horizontal-padding,16px);font-size:14px;font-size:var(--cell-font-size,14px);line-height:24px;line-height:var(--cell-line-height,24px);color:#323233;color:var(--cell-text-color,#323233);background-color:#fff;background-color:var(--cell-background-color,#fff)}.van-cell:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:auto;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-cell--borderless:after{display:none}.van-cell-group{background-color:#fff;background-color:var(--cell-background-color,#fff)}.van-cell__label{margin-top:3px;margin-top:var(--cell-label-margin-top,3px);font-size:12px;font-size:var(--cell-label-font-size,12px);line-height:18px;line-height:var(--cell-label-line-height,18px);color:#969799;color:var(--cell-label-color,#969799)}.van-cell__value{overflow:hidden;text-align:right;vertical-align:middle;color:#969799;color:var(--cell-value-color,#969799)}.van-cell__title,.van-cell__value{-webkit-flex:1;flex:1}.van-cell__title:empty,.van-cell__value:empty{display:none}.van-cell__left-icon-wrap,.van-cell__right-icon-wrap{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:24px;height:var(--cell-line-height,24px);font-size:16px;font-size:var(--cell-icon-size,16px)}.van-cell__left-icon-wrap{margin-right:5px}.van-cell__right-icon-wrap{margin-left:5px;color:#969799;color:var(--cell-right-icon-color,#969799)}.van-cell__left-icon{vertical-align:middle}.van-cell__left-icon,.van-cell__right-icon{line-height:24px;line-height:var(--cell-line-height,24px)}.van-cell--clickable.van-cell--hover{background-color:#f2f3f5;background-color:var(--cell-active-color,#f2f3f5)}.van-cell--required{overflow:visible}.van-cell--required:before{position:absolute;content:"*";left:8px;left:var(--padding-xs,8px);font-size:14px;font-size:var(--cell-font-size,14px);color:#ee0a24;color:var(--cell-required-color,#ee0a24)}.van-cell--center{-webkit-align-items:center;align-items:center}.van-cell--large{padding-top:12px;padding-top:var(--cell-large-vertical-padding,12px);padding-bottom:12px;padding-bottom:var(--cell-large-vertical-padding,12px)}.van-cell--large .van-cell__title{font-size:16px;font-size:var(--cell-large-title-font-size,16px)}.van-cell--large .van-cell__value{font-size:16px;font-size:var(--cell-large-value-font-size,16px)}.van-cell--large .van-cell__label{font-size:14px;font-size:var(--cell-large-label-font-size,14px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.js b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.js
new file mode 100644
index 0000000..8f89f17
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.js
@@ -0,0 +1,42 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  field: true,
+  relation: {
+    name: 'checkbox',
+    type: 'descendant',
+    current: 'checkbox-group',
+    linked: function (target) {
+      this.updateChild(target);
+    },
+  },
+  props: {
+    max: Number,
+    value: {
+      type: Array,
+      observer: 'updateChildren',
+    },
+    disabled: {
+      type: Boolean,
+      observer: 'updateChildren',
+    },
+  },
+  methods: {
+    updateChildren: function () {
+      var _this = this;
+      (this.children || []).forEach(function (child) {
+        return _this.updateChild(child);
+      });
+    },
+    updateChild: function (child) {
+      var _a = this.data,
+        value = _a.value,
+        disabled = _a.disabled;
+      child.setData({
+        value: value.indexOf(child.data.name) !== -1,
+        parentDisabled: disabled,
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.json b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxml
new file mode 100644
index 0000000..4fa864c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxml
@@ -0,0 +1 @@
+<slot />
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxss
new file mode 100644
index 0000000..99694d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox-group/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.js b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.js
new file mode 100644
index 0000000..c1a3e5e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.js
@@ -0,0 +1,83 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+function emit(target, value) {
+  target.$emit('input', value);
+  target.$emit('change', value);
+}
+component_1.VantComponent({
+  field: true,
+  relation: {
+    name: 'checkbox-group',
+    type: 'ancestor',
+    current: 'checkbox',
+  },
+  classes: ['icon-class', 'label-class'],
+  props: {
+    value: Boolean,
+    disabled: Boolean,
+    useIconSlot: Boolean,
+    checkedColor: String,
+    labelPosition: String,
+    labelDisabled: Boolean,
+    shape: {
+      type: String,
+      value: 'round',
+    },
+    iconSize: {
+      type: null,
+      value: 20,
+    },
+  },
+  data: {
+    parentDisabled: false,
+  },
+  methods: {
+    emitChange: function (value) {
+      if (this.parent) {
+        this.setParentValue(this.parent, value);
+      } else {
+        emit(this, value);
+      }
+    },
+    toggle: function () {
+      var _a = this.data,
+        parentDisabled = _a.parentDisabled,
+        disabled = _a.disabled,
+        value = _a.value;
+      if (!disabled && !parentDisabled) {
+        this.emitChange(!value);
+      }
+    },
+    onClickLabel: function () {
+      var _a = this.data,
+        labelDisabled = _a.labelDisabled,
+        parentDisabled = _a.parentDisabled,
+        disabled = _a.disabled,
+        value = _a.value;
+      if (!disabled && !labelDisabled && !parentDisabled) {
+        this.emitChange(!value);
+      }
+    },
+    setParentValue: function (parent, value) {
+      var parentValue = parent.data.value.slice();
+      var name = this.data.name;
+      var max = parent.data.max;
+      if (value) {
+        if (max && parentValue.length >= max) {
+          return;
+        }
+        if (parentValue.indexOf(name) === -1) {
+          parentValue.push(name);
+          emit(parent, parentValue);
+        }
+      } else {
+        var index = parentValue.indexOf(name);
+        if (index !== -1) {
+          parentValue.splice(index, 1);
+          emit(parent, parentValue);
+        }
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.json b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxml
new file mode 100644
index 0000000..94789d8
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxml
@@ -0,0 +1,20 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<view class="van-checkbox custom-class">
+  <view class="van-checkbox__icon-wrap" bindtap="toggle">
+    <slot wx:if="{{ useIconSlot }}" name="icon" />
+    <van-icon
+      wx:else
+      name="success"
+      size="0.8em"
+      class="{{ utils.bem('checkbox__icon', [shape, { disabled: disabled || parentDisabled, checked: value }]) }}"
+      style="{{ computed.iconStyle(checkedColor, value, disabled, parentDisabled, iconSize) }}"
+      custom-class="icon-class"
+      custom-style="line-height: 1.25em;"
+    />
+  </view>
+  <view class="label-class {{ utils.bem('checkbox__label', [labelPosition, { disabled: disabled || parentDisabled }]) }}" bindtap="onClickLabel">
+    <slot />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxs
new file mode 100644
index 0000000..927eb55
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxs
@@ -0,0 +1,20 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function iconStyle(checkedColor, value, disabled, parentDisabled, iconSize) {
+  var styles = [['font-size', utils.addUnit(iconSize)]];
+  if (checkedColor && value && !disabled && !parentDisabled) {
+    styles.push(['border-color', checkedColor]);
+    styles.push(['background-color', checkedColor]);
+  }
+
+  return styles
+    .map(function(item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  iconStyle: iconStyle
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxss
new file mode 100644
index 0000000..afaf37b
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/checkbox/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-checkbox{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{-webkit-flex:none;flex:none}.van-checkbox__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;font-size:20px;font-size:var(--checkbox-size,20px);border:1px solid #c8c9cc;border:1px solid var(--checkbox-border-color,#c8c9cc);transition-duration:.2s;transition-duration:var(--checkbox-transition-duration,.2s)}.van-checkbox__icon--round{border-radius:100%}.van-checkbox__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--checkbox-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--checkbox-checked-icon-color,#1989fa)}.van-checkbox__icon--disabled{background-color:#ebedf0;background-color:var(--checkbox-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__icon--disabled.van-checkbox__icon--checked{color:#c8c9cc;color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__label{word-wrap:break-word;margin-left:10px;margin-left:var(--checkbox-label-margin,10px);color:#323233;color:var(--checkbox-label-color,#323233)}.van-checkbox__label--left{float:left;margin:0 10px 0 0;margin:0 var(--checkbox-label-margin,10px) 0 0}.van-checkbox__label--disabled{color:#c8c9cc;color:var(--checkbox-disabled-label-color,#c8c9cc)}.van-checkbox__label:empty{margin:0}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/circle/canvas.js b/miniprogram/miniprogram_npm/@vant/weapp/circle/canvas.js
new file mode 100644
index 0000000..dbee1d7
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/circle/canvas.js
@@ -0,0 +1,47 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.adaptor = void 0;
+function adaptor(ctx) {
+  // @ts-ignore
+  return Object.assign(ctx, {
+    setStrokeStyle: function (val) {
+      ctx.strokeStyle = val;
+    },
+    setLineWidth: function (val) {
+      ctx.lineWidth = val;
+    },
+    setLineCap: function (val) {
+      ctx.lineCap = val;
+    },
+    setFillStyle: function (val) {
+      ctx.fillStyle = val;
+    },
+    setFontSize: function (val) {
+      ctx.font = String(val);
+    },
+    setGlobalAlpha: function (val) {
+      ctx.globalAlpha = val;
+    },
+    setLineJoin: function (val) {
+      ctx.lineJoin = val;
+    },
+    setTextAlign: function (val) {
+      ctx.textAlign = val;
+    },
+    setMiterLimit: function (val) {
+      ctx.miterLimit = val;
+    },
+    setShadow: function (offsetX, offsetY, blur, color) {
+      ctx.shadowOffsetX = offsetX;
+      ctx.shadowOffsetY = offsetY;
+      ctx.shadowBlur = blur;
+      ctx.shadowColor = color;
+    },
+    setTextBaseline: function (val) {
+      ctx.textBaseline = val;
+    },
+    createCircularGradient: function () {},
+    draw: function () {},
+  });
+}
+exports.adaptor = adaptor;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/circle/index.js b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.js
new file mode 100644
index 0000000..5c34f80
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.js
@@ -0,0 +1,209 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+var color_1 = require('../common/color');
+var canvas_1 = require('./canvas');
+function format(rate) {
+  return Math.min(Math.max(rate, 0), 100);
+}
+var PERIMETER = 2 * Math.PI;
+var BEGIN_ANGLE = -Math.PI / 2;
+var STEP = 1;
+component_1.VantComponent({
+  props: {
+    text: String,
+    lineCap: {
+      type: String,
+      value: 'round',
+    },
+    value: {
+      type: Number,
+      value: 0,
+      observer: 'reRender',
+    },
+    speed: {
+      type: Number,
+      value: 50,
+    },
+    size: {
+      type: Number,
+      value: 100,
+      observer: function () {
+        this.drawCircle(this.currentValue);
+      },
+    },
+    fill: String,
+    layerColor: {
+      type: String,
+      value: color_1.WHITE,
+    },
+    color: {
+      type: [String, Object],
+      value: color_1.BLUE,
+      observer: function () {
+        var _this = this;
+        this.setHoverColor().then(function () {
+          _this.drawCircle(_this.currentValue);
+        });
+      },
+    },
+    type: {
+      type: String,
+      value: '',
+    },
+    strokeWidth: {
+      type: Number,
+      value: 4,
+    },
+    clockwise: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    hoverColor: color_1.BLUE,
+  },
+  methods: {
+    getContext: function () {
+      var _this = this;
+      var _a = this.data,
+        type = _a.type,
+        size = _a.size;
+      if (type === '') {
+        var ctx = wx.createCanvasContext('van-circle', this);
+        return Promise.resolve(ctx);
+      }
+      var dpr = wx.getSystemInfoSync().pixelRatio;
+      return new Promise(function (resolve) {
+        wx.createSelectorQuery()
+          .in(_this)
+          .select('#van-circle')
+          .node()
+          .exec(function (res) {
+            var canvas = res[0].node;
+            var ctx = canvas.getContext(type);
+            if (!_this.inited) {
+              _this.inited = true;
+              canvas.width = size * dpr;
+              canvas.height = size * dpr;
+              ctx.scale(dpr, dpr);
+            }
+            resolve(canvas_1.adaptor(ctx));
+          });
+      });
+    },
+    setHoverColor: function () {
+      var _this = this;
+      var _a = this.data,
+        color = _a.color,
+        size = _a.size;
+      if (utils_1.isObj(color)) {
+        return this.getContext().then(function (context) {
+          var LinearColor = context.createLinearGradient(size, 0, 0, 0);
+          Object.keys(color)
+            .sort(function (a, b) {
+              return parseFloat(a) - parseFloat(b);
+            })
+            .map(function (key) {
+              return LinearColor.addColorStop(
+                parseFloat(key) / 100,
+                color[key]
+              );
+            });
+          _this.hoverColor = LinearColor;
+        });
+      }
+      this.hoverColor = color;
+      return Promise.resolve();
+    },
+    presetCanvas: function (context, strokeStyle, beginAngle, endAngle, fill) {
+      var _a = this.data,
+        strokeWidth = _a.strokeWidth,
+        lineCap = _a.lineCap,
+        clockwise = _a.clockwise,
+        size = _a.size;
+      var position = size / 2;
+      var radius = position - strokeWidth / 2;
+      context.setStrokeStyle(strokeStyle);
+      context.setLineWidth(strokeWidth);
+      context.setLineCap(lineCap);
+      context.beginPath();
+      context.arc(position, position, radius, beginAngle, endAngle, !clockwise);
+      context.stroke();
+      if (fill) {
+        context.setFillStyle(fill);
+        context.fill();
+      }
+    },
+    renderLayerCircle: function (context) {
+      var _a = this.data,
+        layerColor = _a.layerColor,
+        fill = _a.fill;
+      this.presetCanvas(context, layerColor, 0, PERIMETER, fill);
+    },
+    renderHoverCircle: function (context, formatValue) {
+      var clockwise = this.data.clockwise;
+      // 结束角度
+      var progress = PERIMETER * (formatValue / 100);
+      var endAngle = clockwise
+        ? BEGIN_ANGLE + progress
+        : 3 * Math.PI - (BEGIN_ANGLE + progress);
+      this.presetCanvas(context, this.hoverColor, BEGIN_ANGLE, endAngle);
+    },
+    drawCircle: function (currentValue) {
+      var _this = this;
+      var size = this.data.size;
+      this.getContext().then(function (context) {
+        context.clearRect(0, 0, size, size);
+        _this.renderLayerCircle(context);
+        var formatValue = format(currentValue);
+        if (formatValue !== 0) {
+          _this.renderHoverCircle(context, formatValue);
+        }
+        context.draw();
+      });
+    },
+    reRender: function () {
+      var _this = this;
+      // tofector 动画暂时没有想到好的解决方案
+      var _a = this.data,
+        value = _a.value,
+        speed = _a.speed;
+      if (speed <= 0 || speed > 1000) {
+        this.drawCircle(value);
+        return;
+      }
+      this.clearInterval();
+      this.currentValue = this.currentValue || 0;
+      this.interval = setInterval(function () {
+        if (_this.currentValue !== value) {
+          if (_this.currentValue < value) {
+            _this.currentValue += STEP;
+          } else {
+            _this.currentValue -= STEP;
+          }
+          _this.drawCircle(_this.currentValue);
+        } else {
+          _this.clearInterval();
+        }
+      }, 1000 / speed);
+    },
+    clearInterval: function () {
+      if (this.interval) {
+        clearInterval(this.interval);
+        this.interval = null;
+      }
+    },
+  },
+  mounted: function () {
+    var _this = this;
+    this.currentValue = this.data.value;
+    this.setHoverColor().then(function () {
+      _this.drawCircle(_this.currentValue);
+    });
+  },
+  destroyed: function () {
+    this.clearInterval();
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/circle/index.json b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxml
new file mode 100644
index 0000000..52bc59f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxml
@@ -0,0 +1,9 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-circle">
+  <canvas class="van-circle__canvas" type="{{ type }}" style="width: {{ utils.addUnit(size) }};height:{{ utils.addUnit(size) }}" id="van-circle" canvas-id="van-circle"></canvas>
+  <view wx:if="{{ !text }}" class="van-circle__text">
+    <slot></slot>
+  </view>
+  <cover-view wx:else class="van-circle__text">{{ text }}</cover-view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxss
new file mode 100644
index 0000000..3ab63df
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/circle/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-circle{position:relative;display:inline-block;text-align:center}.van-circle__text{position:absolute;top:50%;left:0;width:100%;-webkit-transform:translateY(-50%);transform:translateY(-50%);color:#323233;color:var(--circle-text-color,#323233)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/col/index.js b/miniprogram/miniprogram_npm/@vant/weapp/col/index.js
new file mode 100644
index 0000000..0e30ba0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/col/index.js
@@ -0,0 +1,28 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    name: 'row',
+    type: 'ancestor',
+    current: 'col',
+  },
+  props: {
+    span: Number,
+    offset: Number,
+  },
+  data: {
+    viewStyle: '',
+  },
+  methods: {
+    setGutter: function (gutter) {
+      var padding = gutter / 2 + 'px';
+      var viewStyle = gutter
+        ? 'padding-left: ' + padding + '; padding-right: ' + padding + ';'
+        : '';
+      if (viewStyle !== this.data.viewStyle) {
+        this.setData({ viewStyle: viewStyle });
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/col/index.json b/miniprogram/miniprogram_npm/@vant/weapp/col/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/col/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/col/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/col/index.wxml
new file mode 100644
index 0000000..52544f0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/col/index.wxml
@@ -0,0 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('col', [span]) }} {{ offset ? 'van-col--offset-' + offset : '' }}"
+  style="{{ viewStyle }}"
+>
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/col/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/col/index.wxss
new file mode 100644
index 0000000..44c896a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/col/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-col{float:left;box-sizing:border-box}.van-col--1{width:4.16666667%}.van-col--offset-1{margin-left:4.16666667%}.van-col--2{width:8.33333333%}.van-col--offset-2{margin-left:8.33333333%}.van-col--3{width:12.5%}.van-col--offset-3{margin-left:12.5%}.van-col--4{width:16.66666667%}.van-col--offset-4{margin-left:16.66666667%}.van-col--5{width:20.83333333%}.van-col--offset-5{margin-left:20.83333333%}.van-col--6{width:25%}.van-col--offset-6{margin-left:25%}.van-col--7{width:29.16666667%}.van-col--offset-7{margin-left:29.16666667%}.van-col--8{width:33.33333333%}.van-col--offset-8{margin-left:33.33333333%}.van-col--9{width:37.5%}.van-col--offset-9{margin-left:37.5%}.van-col--10{width:41.66666667%}.van-col--offset-10{margin-left:41.66666667%}.van-col--11{width:45.83333333%}.van-col--offset-11{margin-left:45.83333333%}.van-col--12{width:50%}.van-col--offset-12{margin-left:50%}.van-col--13{width:54.16666667%}.van-col--offset-13{margin-left:54.16666667%}.van-col--14{width:58.33333333%}.van-col--offset-14{margin-left:58.33333333%}.van-col--15{width:62.5%}.van-col--offset-15{margin-left:62.5%}.van-col--16{width:66.66666667%}.van-col--offset-16{margin-left:66.66666667%}.van-col--17{width:70.83333333%}.van-col--offset-17{margin-left:70.83333333%}.van-col--18{width:75%}.van-col--offset-18{margin-left:75%}.van-col--19{width:79.16666667%}.van-col--offset-19{margin-left:79.16666667%}.van-col--20{width:83.33333333%}.van-col--offset-20{margin-left:83.33333333%}.van-col--21{width:87.5%}.van-col--offset-21{margin-left:87.5%}.van-col--22{width:91.66666667%}.van-col--offset-22{margin-left:91.66666667%}.van-col--23{width:95.83333333%}.van-col--offset-23{margin-left:95.83333333%}.van-col--24{width:100%}.van-col--offset-24{margin-left:100%}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.js b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.js
new file mode 100644
index 0000000..6407fbd
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.js
@@ -0,0 +1,114 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var nextTick = function () {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, 20);
+  });
+};
+component_1.VantComponent({
+  classes: ['title-class', 'content-class'],
+  relation: {
+    name: 'collapse',
+    type: 'ancestor',
+    current: 'collapse-item',
+  },
+  props: {
+    name: null,
+    title: null,
+    value: null,
+    icon: String,
+    label: String,
+    disabled: Boolean,
+    clickable: Boolean,
+    border: {
+      type: Boolean,
+      value: true,
+    },
+    isLink: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    contentHeight: 0,
+    expanded: false,
+    transition: false,
+  },
+  mounted: function () {
+    var _this = this;
+    this.updateExpanded()
+      .then(nextTick)
+      .then(function () {
+        var data = { transition: true };
+        if (_this.data.expanded) {
+          data.contentHeight = 'auto';
+        }
+        _this.setData(data);
+      });
+  },
+  methods: {
+    updateExpanded: function () {
+      if (!this.parent) {
+        return Promise.resolve();
+      }
+      var _a = this.parent.data,
+        value = _a.value,
+        accordion = _a.accordion;
+      var _b = this.parent.children,
+        children = _b === void 0 ? [] : _b;
+      var name = this.data.name;
+      var index = children.indexOf(this);
+      var currentName = name == null ? index : name;
+      var expanded = accordion
+        ? value === currentName
+        : (value || []).some(function (name) {
+            return name === currentName;
+          });
+      var stack = [];
+      if (expanded !== this.data.expanded) {
+        stack.push(this.updateStyle(expanded));
+      }
+      stack.push(this.set({ index: index, expanded: expanded }));
+      return Promise.all(stack);
+    },
+    updateStyle: function (expanded) {
+      var _this = this;
+      return this.getRect('.van-collapse-item__content')
+        .then(function (rect) {
+          return rect.height;
+        })
+        .then(function (height) {
+          if (expanded) {
+            return _this.set({
+              contentHeight: height ? height + 'px' : 'auto',
+            });
+          }
+          return _this
+            .set({ contentHeight: height + 'px' })
+            .then(nextTick)
+            .then(function () {
+              return _this.set({ contentHeight: 0 });
+            });
+        });
+    },
+    onClick: function () {
+      if (this.data.disabled) {
+        return;
+      }
+      var _a = this.data,
+        name = _a.name,
+        expanded = _a.expanded;
+      var index = this.parent.children.indexOf(this);
+      var currentName = name == null ? index : name;
+      this.parent.switch(currentName, !expanded);
+    },
+    onTransitionEnd: function () {
+      if (this.data.expanded) {
+        this.setData({
+          contentHeight: 'auto',
+        });
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.json b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.json
new file mode 100644
index 0000000..0e5425c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "../cell/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxml
new file mode 100644
index 0000000..91afbc2
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxml
@@ -0,0 +1,44 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-collapse-item custom-class {{ index !== 0 ? 'van-hairline--top' : '' }}">
+  <van-cell
+    title="{{ title }}"
+    title-class="title-class"
+    icon="{{ icon }}"
+    value="{{ value }}"
+    label="{{ label }}"
+    is-link="{{ isLink }}"
+    clickable="{{ clickable }}"
+    border="{{ border && expanded }}"
+    class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}"
+    right-icon-class="van-cell__right-icon"
+    custom-class="van-cell"
+    hover-class="van-cell--hover"
+    bind:click="onClick"
+  >
+    <slot
+      name="title"
+      slot="title"
+    />
+    <slot
+      name="icon"
+      slot="icon"
+    />
+    <slot name="value" />
+    <slot
+      name="right-icon"
+      slot="right-icon"
+    />
+  </van-cell>
+  <view
+    class="{{ utils.bem('collapse-item__wrapper', { transition }) }}"
+    style="height: {{ contentHeight }};"
+    bind:transitionend="onTransitionEnd"
+  >
+    <view
+      class="van-collapse-item__content content-class"
+    >
+      <slot />
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxss
new file mode 100644
index 0000000..6ca214e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse-item/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c8c9cc!important;color:var(--collapse-item-title-disabled-color,#c8c9cc)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__wrapper--transition{transition:height .3s ease-in-out}.van-collapse-item__content{padding:15px;padding:var(--collapse-item-content-padding,15px);color:#969799;color:var(--collapse-item-content-text-color,#969799);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.js b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.js
new file mode 100644
index 0000000..ab68400
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.js
@@ -0,0 +1,53 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    name: 'collapse-item',
+    type: 'descendant',
+    current: 'collapse',
+  },
+  props: {
+    value: {
+      type: null,
+      observer: 'updateExpanded',
+    },
+    accordion: {
+      type: Boolean,
+      observer: 'updateExpanded',
+    },
+    border: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    updateExpanded: function () {
+      this.children.forEach(function (child) {
+        child.updateExpanded();
+      });
+    },
+    switch: function (name, expanded) {
+      var _a = this.data,
+        accordion = _a.accordion,
+        value = _a.value;
+      var changeItem = name;
+      if (!accordion) {
+        name = expanded
+          ? (value || []).concat(name)
+          : (value || []).filter(function (activeName) {
+              return activeName !== name;
+            });
+      } else {
+        name = expanded ? name : '';
+      }
+      if (expanded) {
+        this.$emit('open', changeItem);
+      } else {
+        this.$emit('close', changeItem);
+      }
+      this.$emit('change', name);
+      this.$emit('input', name);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.json b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxml
new file mode 100644
index 0000000..fd4e171
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxml
@@ -0,0 +1,3 @@
+<view class="custom-class van-collapse {{ border ? 'van-hairline--top-bottom' : '' }}">
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxss
new file mode 100644
index 0000000..99694d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/collapse/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/color.js b/miniprogram/miniprogram_npm/@vant/weapp/common/color.js
new file mode 100644
index 0000000..885acaa
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/color.js
@@ -0,0 +1,10 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.GRAY_DARK = exports.GRAY = exports.ORANGE = exports.GREEN = exports.WHITE = exports.BLUE = exports.RED = void 0;
+exports.RED = '#ee0a24';
+exports.BLUE = '#1989fa';
+exports.WHITE = '#fff';
+exports.GREEN = '#07c160';
+exports.ORANGE = '#ff976a';
+exports.GRAY = '#323233';
+exports.GRAY_DARK = '#969799';
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/component.js b/miniprogram/miniprogram_npm/@vant/weapp/common/component.js
new file mode 100644
index 0000000..e43a277
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/component.js
@@ -0,0 +1,118 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.VantComponent = void 0;
+var basic_1 = require('../mixins/basic');
+var relationFunctions = {
+  ancestor: {
+    linked: function (parent) {
+      this.parent = parent;
+    },
+    unlinked: function () {
+      this.parent = null;
+    },
+  },
+  descendant: {
+    linked: function (child) {
+      this.children = this.children || [];
+      this.children.push(child);
+    },
+    unlinked: function (child) {
+      this.children = (this.children || []).filter(function (it) {
+        return it !== child;
+      });
+    },
+  },
+};
+function mapKeys(source, target, map) {
+  Object.keys(map).forEach(function (key) {
+    if (source[key]) {
+      target[map[key]] = source[key];
+    }
+  });
+}
+function makeRelation(options, vantOptions, relation) {
+  var _a;
+  var type = relation.type,
+    name = relation.name,
+    linked = relation.linked,
+    unlinked = relation.unlinked,
+    linkChanged = relation.linkChanged;
+  var beforeCreate = vantOptions.beforeCreate,
+    destroyed = vantOptions.destroyed;
+  if (type === 'descendant') {
+    options.created = function () {
+      beforeCreate && beforeCreate.bind(this)();
+      this.children = this.children || [];
+    };
+    options.detached = function () {
+      this.children = [];
+      destroyed && destroyed.bind(this)();
+    };
+  }
+  options.relations = Object.assign(
+    options.relations || {},
+    ((_a = {}),
+    (_a['../' + name + '/index'] = {
+      type: type,
+      linked: function (node) {
+        relationFunctions[type].linked.bind(this)(node);
+        linked && linked.bind(this)(node);
+      },
+      linkChanged: function (node) {
+        linkChanged && linkChanged.bind(this)(node);
+      },
+      unlinked: function (node) {
+        relationFunctions[type].unlinked.bind(this)(node);
+        unlinked && unlinked.bind(this)(node);
+      },
+    }),
+    _a)
+  );
+}
+function VantComponent(vantOptions) {
+  if (vantOptions === void 0) {
+    vantOptions = {};
+  }
+  var options = {};
+  mapKeys(vantOptions, options, {
+    data: 'data',
+    props: 'properties',
+    mixins: 'behaviors',
+    methods: 'methods',
+    beforeCreate: 'created',
+    created: 'attached',
+    mounted: 'ready',
+    relations: 'relations',
+    destroyed: 'detached',
+    classes: 'externalClasses',
+  });
+  var relation = vantOptions.relation;
+  if (relation) {
+    makeRelation(options, vantOptions, relation);
+  }
+  // add default externalClasses
+  options.externalClasses = options.externalClasses || [];
+  options.externalClasses.push('custom-class');
+  // add default behaviors
+  options.behaviors = options.behaviors || [];
+  options.behaviors.push(basic_1.basic);
+  // map field to form-field behavior
+  if (vantOptions.field) {
+    options.behaviors.push('wx://form-field');
+  }
+  if (options.properties) {
+    Object.keys(options.properties).forEach(function (name) {
+      if (Array.isArray(options.properties[name])) {
+        // miniprogram do not allow multi type
+        options.properties[name] = null;
+      }
+    });
+  }
+  // add default options
+  options.options = {
+    multipleSlots: true,
+    addGlobalClass: true,
+  };
+  Component(options);
+}
+exports.VantComponent = VantComponent;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/index.wxss
new file mode 100644
index 0000000..6e6891f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/index.wxss
@@ -0,0 +1 @@
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}.van-clearfix:after{display:table;clear:both;content:""}.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/clearfix.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/clearfix.wxss
new file mode 100644
index 0000000..a0ca838
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/style/clearfix.wxss
@@ -0,0 +1 @@
+.van-clearfix:after{display:table;clear:both;content:""}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/ellipsis.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/ellipsis.wxss
new file mode 100644
index 0000000..1e9dbc9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/style/ellipsis.wxss
@@ -0,0 +1 @@
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/hairline.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/hairline.wxss
new file mode 100644
index 0000000..f64e2f8
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/style/hairline.wxss
@@ -0,0 +1 @@
+.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/clearfix.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/clearfix.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/ellipsis.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/ellipsis.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/hairline.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/mixins/hairline.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/theme.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/theme.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/style/var.wxss b/miniprogram/miniprogram_npm/@vant/weapp/common/style/var.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/utils.js b/miniprogram/miniprogram_npm/@vant/weapp/common/utils.js
new file mode 100644
index 0000000..f8f07e8
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/utils.js
@@ -0,0 +1,42 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.addUnit = exports.getSystemInfoSync = exports.nextTick = exports.range = exports.isNumber = exports.isObj = exports.isDef = void 0;
+function isDef(value) {
+  return value !== undefined && value !== null;
+}
+exports.isDef = isDef;
+function isObj(x) {
+  var type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+exports.isObj = isObj;
+function isNumber(value) {
+  return /^\d+(\.\d+)?$/.test(value);
+}
+exports.isNumber = isNumber;
+function range(num, min, max) {
+  return Math.min(Math.max(num, min), max);
+}
+exports.range = range;
+function nextTick(fn) {
+  setTimeout(function () {
+    fn();
+  }, 1000 / 30);
+}
+exports.nextTick = nextTick;
+var systemInfo = null;
+function getSystemInfoSync() {
+  if (systemInfo == null) {
+    systemInfo = wx.getSystemInfoSync();
+  }
+  return systemInfo;
+}
+exports.getSystemInfoSync = getSystemInfoSync;
+function addUnit(value) {
+  if (!isDef(value)) {
+    return undefined;
+  }
+  value = String(value);
+  return isNumber(value) ? value + 'px' : value;
+}
+exports.addUnit = addUnit;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/common/version.js b/miniprogram/miniprogram_npm/@vant/weapp/common/version.js
new file mode 100644
index 0000000..50b90a5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/common/version.js
@@ -0,0 +1,36 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.canIUseFormFieldButton = exports.canIUseModel = void 0;
+var utils_1 = require('./utils');
+function compareVersion(v1, v2) {
+  v1 = v1.split('.');
+  v2 = v2.split('.');
+  var len = Math.max(v1.length, v2.length);
+  while (v1.length < len) {
+    v1.push('0');
+  }
+  while (v2.length < len) {
+    v2.push('0');
+  }
+  for (var i = 0; i < len; i++) {
+    var num1 = parseInt(v1[i], 10);
+    var num2 = parseInt(v2[i], 10);
+    if (num1 > num2) {
+      return 1;
+    }
+    if (num1 < num2) {
+      return -1;
+    }
+  }
+  return 0;
+}
+function canIUseModel() {
+  var system = utils_1.getSystemInfoSync();
+  return compareVersion(system.SDKVersion, '2.9.3') >= 0;
+}
+exports.canIUseModel = canIUseModel;
+function canIUseFormFieldButton() {
+  var system = utils_1.getSystemInfoSync();
+  return compareVersion(system.SDKVersion, '2.10.3') >= 0;
+}
+exports.canIUseFormFieldButton = canIUseFormFieldButton;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.js b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.js
new file mode 100644
index 0000000..348d489
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.js
@@ -0,0 +1,103 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('./utils');
+function simpleTick(fn) {
+  return setTimeout(fn, 30);
+}
+component_1.VantComponent({
+  props: {
+    useSlot: Boolean,
+    millisecond: Boolean,
+    time: {
+      type: Number,
+      observer: 'reset',
+    },
+    format: {
+      type: String,
+      value: 'HH:mm:ss',
+    },
+    autoStart: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    timeData: utils_1.parseTimeData(0),
+    formattedTime: '0',
+  },
+  destroyed: function () {
+    clearTimeout(this.tid);
+    this.tid = null;
+  },
+  methods: {
+    // 开始
+    start: function () {
+      if (this.counting) {
+        return;
+      }
+      this.counting = true;
+      this.endTime = Date.now() + this.remain;
+      this.tick();
+    },
+    // 暂停
+    pause: function () {
+      this.counting = false;
+      clearTimeout(this.tid);
+    },
+    // 重置
+    reset: function () {
+      this.pause();
+      this.remain = this.data.time;
+      this.setRemain(this.remain);
+      if (this.data.autoStart) {
+        this.start();
+      }
+    },
+    tick: function () {
+      if (this.data.millisecond) {
+        this.microTick();
+      } else {
+        this.macroTick();
+      }
+    },
+    microTick: function () {
+      var _this = this;
+      this.tid = simpleTick(function () {
+        _this.setRemain(_this.getRemain());
+        if (_this.remain !== 0) {
+          _this.microTick();
+        }
+      });
+    },
+    macroTick: function () {
+      var _this = this;
+      this.tid = simpleTick(function () {
+        var remain = _this.getRemain();
+        if (!utils_1.isSameSecond(remain, _this.remain) || remain === 0) {
+          _this.setRemain(remain);
+        }
+        if (_this.remain !== 0) {
+          _this.macroTick();
+        }
+      });
+    },
+    getRemain: function () {
+      return Math.max(this.endTime - Date.now(), 0);
+    },
+    setRemain: function (remain) {
+      this.remain = remain;
+      var timeData = utils_1.parseTimeData(remain);
+      if (this.data.useSlot) {
+        this.$emit('change', timeData);
+      }
+      this.setData({
+        formattedTime: utils_1.parseFormat(this.data.format, timeData),
+      });
+      if (remain === 0) {
+        this.pause();
+        this.$emit('finish');
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.json b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxml
new file mode 100644
index 0000000..e206e16
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxml
@@ -0,0 +1,4 @@
+<view class="van-count-down">
+  <slot wx:if="{{ useSlot }}"/>
+  <block wx:else>{{ formattedTime }}</block>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxss
new file mode 100644
index 0000000..bc33f5d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/count-down/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-count-down{color:#323233;color:var(--count-down-text-color,#323233);font-size:14px;font-size:var(--count-down-font-size,14px);line-height:20px;line-height:var(--count-down-line-height,20px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/count-down/utils.js b/miniprogram/miniprogram_npm/@vant/weapp/count-down/utils.js
new file mode 100644
index 0000000..10864a2
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/count-down/utils.js
@@ -0,0 +1,65 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.isSameSecond = exports.parseFormat = exports.parseTimeData = void 0;
+function padZero(num, targetLength) {
+  if (targetLength === void 0) {
+    targetLength = 2;
+  }
+  var str = num + '';
+  while (str.length < targetLength) {
+    str = '0' + str;
+  }
+  return str;
+}
+var SECOND = 1000;
+var MINUTE = 60 * SECOND;
+var HOUR = 60 * MINUTE;
+var DAY = 24 * HOUR;
+function parseTimeData(time) {
+  var days = Math.floor(time / DAY);
+  var hours = Math.floor((time % DAY) / HOUR);
+  var minutes = Math.floor((time % HOUR) / MINUTE);
+  var seconds = Math.floor((time % MINUTE) / SECOND);
+  var milliseconds = Math.floor(time % SECOND);
+  return {
+    days: days,
+    hours: hours,
+    minutes: minutes,
+    seconds: seconds,
+    milliseconds: milliseconds,
+  };
+}
+exports.parseTimeData = parseTimeData;
+function parseFormat(format, timeData) {
+  var days = timeData.days;
+  var hours = timeData.hours,
+    minutes = timeData.minutes,
+    seconds = timeData.seconds,
+    milliseconds = timeData.milliseconds;
+  if (format.indexOf('DD') === -1) {
+    hours += days * 24;
+  } else {
+    format = format.replace('DD', padZero(days));
+  }
+  if (format.indexOf('HH') === -1) {
+    minutes += hours * 60;
+  } else {
+    format = format.replace('HH', padZero(hours));
+  }
+  if (format.indexOf('mm') === -1) {
+    seconds += minutes * 60;
+  } else {
+    format = format.replace('mm', padZero(minutes));
+  }
+  if (format.indexOf('ss') === -1) {
+    milliseconds += seconds * 1000;
+  } else {
+    format = format.replace('ss', padZero(seconds));
+  }
+  return format.replace('SSS', padZero(milliseconds, 3));
+}
+exports.parseFormat = parseFormat;
+function isSameSecond(time1, time2) {
+  return Math.floor(time1 / 1000) === Math.floor(time2 / 1000);
+}
+exports.isSameSecond = isSameSecond;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.js b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.js
new file mode 100644
index 0000000..fc420b3
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.js
@@ -0,0 +1,377 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+var __spreadArrays =
+  (this && this.__spreadArrays) ||
+  function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++)
+      s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+      for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+        r[k] = a[j];
+    return r;
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+var shared_1 = require('../picker/shared');
+var currentYear = new Date().getFullYear();
+function isValidDate(date) {
+  return utils_1.isDef(date) && !isNaN(new Date(date).getTime());
+}
+function range(num, min, max) {
+  return Math.min(Math.max(num, min), max);
+}
+function padZero(val) {
+  return ('00' + val).slice(-2);
+}
+function times(n, iteratee) {
+  var index = -1;
+  var result = Array(n < 0 ? 0 : n);
+  while (++index < n) {
+    result[index] = iteratee(index);
+  }
+  return result;
+}
+function getTrueValue(formattedValue) {
+  if (!formattedValue) return;
+  while (isNaN(parseInt(formattedValue, 10))) {
+    formattedValue = formattedValue.slice(1);
+  }
+  return parseInt(formattedValue, 10);
+}
+function getMonthEndDay(year, month) {
+  return 32 - new Date(year, month - 1, 32).getDate();
+}
+var defaultFormatter = function (_, value) {
+  return value;
+};
+component_1.VantComponent({
+  classes: ['active-class', 'toolbar-class', 'column-class'],
+  props: __assign(__assign({}, shared_1.pickerProps), {
+    value: {
+      type: null,
+      observer: 'updateValue',
+    },
+    filter: null,
+    type: {
+      type: String,
+      value: 'datetime',
+      observer: 'updateValue',
+    },
+    showToolbar: {
+      type: Boolean,
+      value: true,
+    },
+    formatter: {
+      type: null,
+      value: defaultFormatter,
+    },
+    minDate: {
+      type: Number,
+      value: new Date(currentYear - 10, 0, 1).getTime(),
+      observer: 'updateValue',
+    },
+    maxDate: {
+      type: Number,
+      value: new Date(currentYear + 10, 11, 31).getTime(),
+      observer: 'updateValue',
+    },
+    minHour: {
+      type: Number,
+      value: 0,
+      observer: 'updateValue',
+    },
+    maxHour: {
+      type: Number,
+      value: 23,
+      observer: 'updateValue',
+    },
+    minMinute: {
+      type: Number,
+      value: 0,
+      observer: 'updateValue',
+    },
+    maxMinute: {
+      type: Number,
+      value: 59,
+      observer: 'updateValue',
+    },
+  }),
+  data: {
+    innerValue: Date.now(),
+    columns: [],
+  },
+  methods: {
+    updateValue: function () {
+      var _this = this;
+      var data = this.data;
+      var val = this.correctValue(this.data.value);
+      var isEqual = val === data.innerValue;
+      if (!isEqual) {
+        this.updateColumnValue(val).then(function () {
+          _this.$emit('input', val);
+        });
+      } else {
+        this.updateColumns();
+      }
+    },
+    getPicker: function () {
+      if (this.picker == null) {
+        this.picker = this.selectComponent('.van-datetime-picker');
+        var picker_1 = this.picker;
+        var setColumnValues_1 = picker_1.setColumnValues;
+        picker_1.setColumnValues = function () {
+          var args = [];
+          for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+          }
+          return setColumnValues_1.apply(
+            picker_1,
+            __spreadArrays(args, [false])
+          );
+        };
+      }
+      return this.picker;
+    },
+    updateColumns: function () {
+      var _a = this.data.formatter,
+        formatter = _a === void 0 ? defaultFormatter : _a;
+      var results = this.getOriginColumns().map(function (column) {
+        return {
+          values: column.values.map(function (value) {
+            return formatter(column.type, value);
+          }),
+        };
+      });
+      return this.set({ columns: results });
+    },
+    getOriginColumns: function () {
+      var filter = this.data.filter;
+      var results = this.getRanges().map(function (_a) {
+        var type = _a.type,
+          range = _a.range;
+        var values = times(range[1] - range[0] + 1, function (index) {
+          var value = range[0] + index;
+          value = type === 'year' ? '' + value : padZero(value);
+          return value;
+        });
+        if (filter) {
+          values = filter(type, values);
+        }
+        return { type: type, values: values };
+      });
+      return results;
+    },
+    getRanges: function () {
+      var data = this.data;
+      if (data.type === 'time') {
+        return [
+          {
+            type: 'hour',
+            range: [data.minHour, data.maxHour],
+          },
+          {
+            type: 'minute',
+            range: [data.minMinute, data.maxMinute],
+          },
+        ];
+      }
+      var _a = this.getBoundary('max', data.innerValue),
+        maxYear = _a.maxYear,
+        maxDate = _a.maxDate,
+        maxMonth = _a.maxMonth,
+        maxHour = _a.maxHour,
+        maxMinute = _a.maxMinute;
+      var _b = this.getBoundary('min', data.innerValue),
+        minYear = _b.minYear,
+        minDate = _b.minDate,
+        minMonth = _b.minMonth,
+        minHour = _b.minHour,
+        minMinute = _b.minMinute;
+      var result = [
+        {
+          type: 'year',
+          range: [minYear, maxYear],
+        },
+        {
+          type: 'month',
+          range: [minMonth, maxMonth],
+        },
+        {
+          type: 'day',
+          range: [minDate, maxDate],
+        },
+        {
+          type: 'hour',
+          range: [minHour, maxHour],
+        },
+        {
+          type: 'minute',
+          range: [minMinute, maxMinute],
+        },
+      ];
+      if (data.type === 'date') result.splice(3, 2);
+      if (data.type === 'year-month') result.splice(2, 3);
+      return result;
+    },
+    correctValue: function (value) {
+      var data = this.data;
+      // validate value
+      var isDateType = data.type !== 'time';
+      if (isDateType && !isValidDate(value)) {
+        value = data.minDate;
+      } else if (!isDateType && !value) {
+        var minHour = data.minHour;
+        value = padZero(minHour) + ':00';
+      }
+      // time type
+      if (!isDateType) {
+        var _a = value.split(':'),
+          hour = _a[0],
+          minute = _a[1];
+        hour = padZero(range(hour, data.minHour, data.maxHour));
+        minute = padZero(range(minute, data.minMinute, data.maxMinute));
+        return hour + ':' + minute;
+      }
+      // date type
+      value = Math.max(value, data.minDate);
+      value = Math.min(value, data.maxDate);
+      return value;
+    },
+    getBoundary: function (type, innerValue) {
+      var _a;
+      var value = new Date(innerValue);
+      var boundary = new Date(this.data[type + 'Date']);
+      var year = boundary.getFullYear();
+      var month = 1;
+      var date = 1;
+      var hour = 0;
+      var minute = 0;
+      if (type === 'max') {
+        month = 12;
+        date = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
+        hour = 23;
+        minute = 59;
+      }
+      if (value.getFullYear() === year) {
+        month = boundary.getMonth() + 1;
+        if (value.getMonth() + 1 === month) {
+          date = boundary.getDate();
+          if (value.getDate() === date) {
+            hour = boundary.getHours();
+            if (value.getHours() === hour) {
+              minute = boundary.getMinutes();
+            }
+          }
+        }
+      }
+      return (
+        (_a = {}),
+        (_a[type + 'Year'] = year),
+        (_a[type + 'Month'] = month),
+        (_a[type + 'Date'] = date),
+        (_a[type + 'Hour'] = hour),
+        (_a[type + 'Minute'] = minute),
+        _a
+      );
+    },
+    onCancel: function () {
+      this.$emit('cancel');
+    },
+    onConfirm: function () {
+      this.$emit('confirm', this.data.innerValue);
+    },
+    onChange: function () {
+      var _this = this;
+      var data = this.data;
+      var value;
+      var picker = this.getPicker();
+      if (data.type === 'time') {
+        var indexes = picker.getIndexes();
+        value =
+          +data.columns[0].values[indexes[0]] +
+          ':' +
+          +data.columns[1].values[indexes[1]];
+      } else {
+        var values = picker.getValues();
+        var year = getTrueValue(values[0]);
+        var month = getTrueValue(values[1]);
+        var maxDate = getMonthEndDay(year, month);
+        var date = getTrueValue(values[2]);
+        if (data.type === 'year-month') {
+          date = 1;
+        }
+        date = date > maxDate ? maxDate : date;
+        var hour = 0;
+        var minute = 0;
+        if (data.type === 'datetime') {
+          hour = getTrueValue(values[3]);
+          minute = getTrueValue(values[4]);
+        }
+        value = new Date(year, month - 1, date, hour, minute);
+      }
+      value = this.correctValue(value);
+      this.updateColumnValue(value).then(function () {
+        _this.$emit('input', value);
+        _this.$emit('change', picker);
+      });
+    },
+    updateColumnValue: function (value) {
+      var _this = this;
+      var values = [];
+      var _a = this.data,
+        type = _a.type,
+        _b = _a.formatter,
+        formatter = _b === void 0 ? defaultFormatter : _b;
+      var picker = this.getPicker();
+      if (type === 'time') {
+        var pair = value.split(':');
+        values = [formatter('hour', pair[0]), formatter('minute', pair[1])];
+      } else {
+        var date = new Date(value);
+        values = [
+          formatter('year', '' + date.getFullYear()),
+          formatter('month', padZero(date.getMonth() + 1)),
+        ];
+        if (type === 'date') {
+          values.push(formatter('day', padZero(date.getDate())));
+        }
+        if (type === 'datetime') {
+          values.push(
+            formatter('day', padZero(date.getDate())),
+            formatter('hour', padZero(date.getHours())),
+            formatter('minute', padZero(date.getMinutes()))
+          );
+        }
+      }
+      return this.set({ innerValue: value })
+        .then(function () {
+          return _this.updateColumns();
+        })
+        .then(function () {
+          return picker.setValues(values);
+        });
+    },
+  },
+  created: function () {
+    var _this = this;
+    var innerValue = this.correctValue(this.data.value);
+    this.updateColumnValue(innerValue).then(function () {
+      _this.$emit('input', innerValue);
+    });
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.json b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.json
new file mode 100644
index 0000000..a778e91
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-picker": "../picker/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxml
new file mode 100644
index 0000000..ade2202
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxml
@@ -0,0 +1,16 @@
+<van-picker
+  class="van-datetime-picker"
+  active-class="active-class"
+  toolbar-class="toolbar-class"
+  column-class="column-class"
+  title="{{ title }}"
+  columns="{{ columns }}"
+  item-height="{{ itemHeight }}"
+  show-toolbar="{{ showToolbar }}"
+  visible-item-count="{{ visibleItemCount }}"
+  confirm-button-text="{{ confirmButtonText }}"
+  cancel-button-text="{{ cancelButtonText }}"
+  bind:change="onChange"
+  bind:confirm="onConfirm"
+  bind:cancel="onCancel"
+/>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxss
new file mode 100644
index 0000000..99694d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/datetime-picker/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/definitions/index.js b/miniprogram/miniprogram_npm/@vant/weapp/definitions/index.js
new file mode 100644
index 0000000..c8ad2e5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/definitions/index.js
@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/definitions/weapp.js b/miniprogram/miniprogram_npm/@vant/weapp/definitions/weapp.js
new file mode 100644
index 0000000..c8ad2e5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/definitions/weapp.js
@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dialog/dialog.js b/miniprogram/miniprogram_npm/@vant/weapp/dialog/dialog.js
new file mode 100644
index 0000000..dba62f2
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dialog/dialog.js
@@ -0,0 +1,85 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var queue = [];
+function getContext() {
+  var pages = getCurrentPages();
+  return pages[pages.length - 1];
+}
+var Dialog = function (options) {
+  options = __assign(__assign({}, Dialog.currentOptions), options);
+  return new Promise(function (resolve, reject) {
+    var context = options.context || getContext();
+    var dialog = context.selectComponent(options.selector);
+    delete options.context;
+    delete options.selector;
+    if (dialog) {
+      dialog.setData(
+        __assign({ onCancel: reject, onConfirm: resolve }, options)
+      );
+      queue.push(dialog);
+    } else {
+      console.warn(
+        '未找到 van-dialog 节点，请确认 selector 及 context 是否正确'
+      );
+    }
+  });
+};
+Dialog.defaultOptions = {
+  show: true,
+  title: '',
+  width: null,
+  message: '',
+  zIndex: 100,
+  overlay: true,
+  selector: '#van-dialog',
+  className: '',
+  asyncClose: false,
+  transition: 'scale',
+  customStyle: '',
+  messageAlign: '',
+  overlayStyle: '',
+  confirmButtonText: '确认',
+  cancelButtonText: '取消',
+  showConfirmButton: true,
+  showCancelButton: false,
+  closeOnClickOverlay: false,
+  confirmButtonOpenType: '',
+};
+Dialog.alert = Dialog;
+Dialog.confirm = function (options) {
+  return Dialog(__assign({ showCancelButton: true }, options));
+};
+Dialog.close = function () {
+  queue.forEach(function (dialog) {
+    dialog.close();
+  });
+  queue = [];
+};
+Dialog.stopLoading = function () {
+  queue.forEach(function (dialog) {
+    dialog.stopLoading();
+  });
+};
+Dialog.setDefaultOptions = function (options) {
+  Object.assign(Dialog.currentOptions, options);
+};
+Dialog.resetDefaultOptions = function () {
+  Dialog.currentOptions = __assign({}, Dialog.defaultOptions);
+};
+Dialog.resetDefaultOptions();
+exports.default = Dialog;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.js b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.js
new file mode 100644
index 0000000..2a25dec
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.js
@@ -0,0 +1,111 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var button_1 = require('../mixins/button');
+var open_type_1 = require('../mixins/open-type');
+var color_1 = require('../common/color');
+component_1.VantComponent({
+  mixins: [button_1.button, open_type_1.openType],
+  props: {
+    show: {
+      type: Boolean,
+      observer: function (show) {
+        !show && this.stopLoading();
+      },
+    },
+    title: String,
+    message: String,
+    useSlot: Boolean,
+    className: String,
+    customStyle: String,
+    asyncClose: Boolean,
+    messageAlign: String,
+    overlayStyle: String,
+    useTitleSlot: Boolean,
+    showCancelButton: Boolean,
+    closeOnClickOverlay: Boolean,
+    confirmButtonOpenType: String,
+    width: null,
+    zIndex: {
+      type: Number,
+      value: 2000,
+    },
+    confirmButtonText: {
+      type: String,
+      value: '确认',
+    },
+    cancelButtonText: {
+      type: String,
+      value: '取消',
+    },
+    confirmButtonColor: {
+      type: String,
+      value: color_1.BLUE,
+    },
+    cancelButtonColor: {
+      type: String,
+      value: color_1.GRAY,
+    },
+    showConfirmButton: {
+      type: Boolean,
+      value: true,
+    },
+    overlay: {
+      type: Boolean,
+      value: true,
+    },
+    transition: {
+      type: String,
+      value: 'scale',
+    },
+  },
+  data: {
+    loading: {
+      confirm: false,
+      cancel: false,
+    },
+  },
+  methods: {
+    onConfirm: function () {
+      this.handleAction('confirm');
+    },
+    onCancel: function () {
+      this.handleAction('cancel');
+    },
+    onClickOverlay: function () {
+      this.onClose('overlay');
+    },
+    handleAction: function (action) {
+      var _a;
+      if (this.data.asyncClose) {
+        this.setData(((_a = {}), (_a['loading.' + action] = true), _a));
+      }
+      this.onClose(action);
+    },
+    close: function () {
+      this.setData({
+        show: false,
+      });
+    },
+    stopLoading: function () {
+      this.setData({
+        loading: {
+          confirm: false,
+          cancel: false,
+        },
+      });
+    },
+    onClose: function (action) {
+      if (!this.data.asyncClose) {
+        this.close();
+      }
+      this.$emit('close', action);
+      // 把 dialog 实例传递出去，可以通过 stopLoading() 在外部关闭按钮的 loading
+      this.$emit(action, { dialog: this });
+      var callback = this.data[action === 'confirm' ? 'onConfirm' : 'onCancel'];
+      if (callback) {
+        callback(this);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.json b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.json
new file mode 100644
index 0000000..e2ee09a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "../popup/index",
+    "van-button": "../button/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxml
new file mode 100644
index 0000000..cbad7f6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxml
@@ -0,0 +1,71 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-popup
+  show="{{ show }}"
+  z-index="{{ zIndex }}"
+  overlay="{{ overlay }}"
+  transition="{{ transition }}"
+  custom-class="van-dialog {{ className }}"
+  custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
+  overlay-style="{{ overlayStyle }}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  bind:close="onClickOverlay"
+>
+  <view
+    wx:if="{{ title || useTitleSlot  }}"
+    class="van-dialog__header {{ message || useSlot ? '' : 'van-dialog--isolated' }}"
+  >
+    <slot wx:if="{{ useTitleSlot }}" name="title" />
+    <block wx:elif="{{ title }}">{{ title }}</block>
+  </view>
+
+  <slot wx:if="{{ useSlot }}" />
+  <view
+    wx:elif="{{ message }}"
+    class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }} {{ messageAlign ? 'van-dialog__message--' + messageAlign : '' }}"
+  >
+    <text class="van-dialog__message-text">{{ message }}</text>
+  </view>
+
+  <view class="van-hairline--top van-dialog__footer">
+    <van-button
+      wx:if="{{ showCancelButton }}"
+      size="large"
+      loading="{{ loading.cancel }}"
+      class="van-dialog__button van-hairline--right"
+      custom-class="van-dialog__cancel"
+      custom-style="color: {{ cancelButtonColor }}"
+      bind:click="onCancel"
+    >
+      {{ cancelButtonText }}
+    </van-button>
+    <van-button
+      wx:if="{{ showConfirmButton }}"
+      size="large"
+      class="van-dialog__button"
+      loading="{{ loading.confirm }}"
+      custom-class="van-dialog__confirm"
+      custom-style="color: {{ confirmButtonColor }}"
+
+      open-type="{{ confirmButtonOpenType }}"
+      lang="{{ lang }}"
+      business-id="{{ businessId }}"
+      session-from="{{ sessionFrom }}"
+      send-message-title="{{ sendMessageTitle }}"
+      send-message-path="{{ sendMessagePath }}"
+      send-message-img="{{ sendMessageImg }}"
+      show-message-card="{{ showMessageCard }}"
+      app-parameter="{{ appParameter }}"
+
+      bind:click="onConfirm"
+      bindgetuserinfo="bindGetUserInfo"
+      bindcontact="bindContact"
+      bindgetphonenumber="bindGetPhoneNumber"
+      binderror="bindError"
+      bindlaunchapp="bindLaunchApp"
+      bindopensetting="bindOpenSetting"
+    >
+      {{ confirmButtonText }}
+    </van-button>
+  </view>
+</van-popup>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxss
new file mode 100644
index 0000000..e5f6cbb
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dialog/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-dialog{top:45%!important;overflow:hidden;width:320px;width:var(--dialog-width,320px);font-size:16px;font-size:var(--dialog-font-size,16px);border-radius:16px;border-radius:var(--dialog-border-radius,16px);background-color:#fff;background-color:var(--dialog-background-color,#fff)}@media (max-width:321px){.van-dialog{width:90%;width:var(--dialog-small-screen-width,90%)}}.van-dialog__header{text-align:center;padding-top:24px;padding-top:var(--dialog-header-padding-top,24px);font-weight:500;font-weight:var(--dialog-header-font-weight,500);line-height:24px;line-height:var(--dialog-header-line-height,24px)}.van-dialog__header--isolated{padding:24px 0;padding:var(--dialog-header-isolated-padding,24px 0)}.van-dialog__message{overflow-y:auto;text-align:center;-webkit-overflow-scrolling:touch;font-size:14px;font-size:var(--dialog-message-font-size,14px);line-height:20px;line-height:var(--dialog-message-line-height,20px);max-height:60vh;max-height:var(--dialog-message-max-height,60vh);padding:24px;padding:var(--dialog-message-padding,24px)}.van-dialog__message-text{word-wrap:break-word}.van-dialog__message--has-title{padding-top:12px;padding-top:var(--dialog-has-title-message-padding-top,12px);color:#646566;color:var(--dialog-has-title-message-text-color,#646566)}.van-dialog__message--left{text-align:left}.van-dialog__message--right{text-align:right}.van-dialog__footer{display:-webkit-flex;display:flex}.van-dialog__button{-webkit-flex:1;flex:1}.van-dialog__cancel,.van-dialog__confirm{border:0!important}.van-dialog-bounce-enter{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.van-dialog-bounce-leave-active{-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9);opacity:0}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/divider/index.js b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.js
new file mode 100644
index 0000000..50ce01a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.js
@@ -0,0 +1,35 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    dashed: {
+      type: Boolean,
+      value: false,
+    },
+    hairline: {
+      type: Boolean,
+      value: false,
+    },
+    contentPosition: {
+      type: String,
+      value: '',
+    },
+    fontSize: {
+      type: Number,
+      value: '',
+    },
+    borderColor: {
+      type: String,
+      value: '',
+    },
+    textColor: {
+      type: String,
+      value: '',
+    },
+    customStyle: {
+      type: String,
+      value: '',
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/divider/index.json b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.json
new file mode 100644
index 0000000..a89ef4d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxml
new file mode 100644
index 0000000..412e73f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxml
@@ -0,0 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('divider', [{dashed, hairline}, contentPosition]) }}"
+  style="{{ borderColor  ? 'border-color: ' + borderColor + ';' : '' }}{{ textColor ? 'color: ' + textColor + ';' : '' }} {{ fontSize ? 'font-size: ' + fontSize + 'px;' : '' }} {{ customStyle }}"
+>
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxss
new file mode 100644
index 0000000..c055e3a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/divider/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-divider{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;margin:16px 0;margin:var(--divider-margin,16px 0);color:#969799;color:var(--divider-text-color,#969799);font-size:14px;font-size:var(--divider-font-size,14px);line-height:24px;line-height:var(--divider-line-height,24px);border:0 solid #ebedf0;border-color:var(--divider-border-color,#ebedf0)}.van-divider:after,.van-divider:before{display:block;-webkit-flex:1;flex:1;box-sizing:border-box;height:1px;border-color:inherit;border-style:inherit;border-width:1px 0 0}.van-divider:before{content:""}.van-divider--hairline:after,.van-divider--hairline:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-divider--dashed{border-style:dashed}.van-divider--center:before,.van-divider--left:before,.van-divider--right:before{margin-right:16px;margin-right:var(--divider-content-padding,16px)}.van-divider--center:after,.van-divider--left:after,.van-divider--right:after{content:"";margin-left:16px;margin-left:var(--divider-content-padding,16px)}.van-divider--left:before{max-width:10%;max-width:var(--divider-content-left-width,10%)}.van-divider--right:after{max-width:10%;max-width:var(--divider-content-right-width,10%)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.js b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.js
new file mode 100644
index 0000000..af9bc36
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.js
@@ -0,0 +1,115 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  field: true,
+  relation: {
+    name: 'dropdown-menu',
+    type: 'ancestor',
+    current: 'dropdown-item',
+    linked: function () {
+      this.updateDataFromParent();
+    },
+  },
+  props: {
+    value: {
+      type: null,
+      observer: 'rerender',
+    },
+    title: {
+      type: String,
+      observer: 'rerender',
+    },
+    disabled: Boolean,
+    titleClass: {
+      type: String,
+      observer: 'rerender',
+    },
+    options: {
+      type: Array,
+      value: [],
+      observer: 'rerender',
+    },
+    popupStyle: String,
+  },
+  data: {
+    transition: true,
+    showPopup: false,
+    showWrapper: false,
+    displayTitle: '',
+  },
+  methods: {
+    rerender: function () {
+      var _this = this;
+      wx.nextTick(function () {
+        _this.parent && _this.parent.updateItemListData();
+      });
+    },
+    updateDataFromParent: function () {
+      if (this.parent) {
+        var _a = this.parent.data,
+          overlay = _a.overlay,
+          duration = _a.duration,
+          activeColor = _a.activeColor,
+          closeOnClickOverlay = _a.closeOnClickOverlay,
+          direction = _a.direction;
+        this.setData({
+          overlay: overlay,
+          duration: duration,
+          activeColor: activeColor,
+          closeOnClickOverlay: closeOnClickOverlay,
+          direction: direction,
+        });
+      }
+    },
+    onOpen: function () {
+      this.$emit('open');
+    },
+    onOpened: function () {
+      this.$emit('opened');
+    },
+    onClose: function () {
+      this.$emit('close');
+    },
+    onClosed: function () {
+      this.$emit('closed');
+      this.setData({ showWrapper: false });
+    },
+    onOptionTap: function (event) {
+      var option = event.currentTarget.dataset.option;
+      var value = option.value;
+      var shouldEmitChange = this.data.value !== value;
+      this.setData({ showPopup: false, value: value });
+      this.$emit('close');
+      this.rerender();
+      if (shouldEmitChange) {
+        this.$emit('change', value);
+      }
+    },
+    toggle: function (show, options) {
+      var _this = this;
+      if (options === void 0) {
+        options = {};
+      }
+      var showPopup = this.data.showPopup;
+      if (typeof show !== 'boolean') {
+        show = !showPopup;
+      }
+      if (show === showPopup) {
+        return;
+      }
+      this.setData({
+        transition: !options.immediate,
+        showPopup: show,
+      });
+      if (show) {
+        this.parent.getChildWrapperStyle().then(function (wrapperStyle) {
+          _this.setData({ wrapperStyle: wrapperStyle, showWrapper: true });
+          _this.rerender();
+        });
+      } else {
+        this.rerender();
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.json b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.json
new file mode 100644
index 0000000..88d5409
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.json
@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "../popup/index",
+    "van-cell": "../cell/index",
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxml
new file mode 100644
index 0000000..dd75292
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxml
@@ -0,0 +1,48 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ showWrapper }}"
+  class="{{ utils.bem('dropdown-item', direction) }}"
+  style="{{ wrapperStyle }}"
+>
+  <van-popup
+    show="{{ showPopup }}"
+    custom-style="position: absolute;{{ popupStyle }}"
+    overlay-style="position: absolute;"
+    overlay="{{ overlay }}"
+    position="{{ direction === 'down' ? 'top' : 'bottom' }}"
+    duration="{{ transition ? duration : 0 }}"
+    close-on-click-overlay="{{ closeOnClickOverlay }}"
+    bind:enter="onOpen"
+    bind:leave="onClose"
+    bind:close="toggle"
+    bind:after-enter="onOpened"
+    bind:after-leave="onClosed"
+  >
+    <van-cell
+      wx:for="{{ options }}"
+      wx:key="value"
+      data-option="{{ item }}"
+      class="{{ utils.bem('dropdown-item__option', { active: item.value === value } ) }}"
+      clickable
+      icon="{{ item.icon }}"
+      bind:tap="onOptionTap"
+    >
+      <view
+        slot="title"
+        class="van-dropdown-item__title"
+        style="{{ item.value === value  ? 'color:' + activeColor : '' }}"
+      >
+        {{ item.text }}
+      </view>
+      <van-icon
+        wx:if="{{ item.value === value }}"
+        name="success"
+        class="van-dropdown-item__icon"
+        color="{{ activeColor }}"
+      />
+    </van-cell>
+
+    <slot />
+  </van-popup>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxss
new file mode 100644
index 0000000..e06c287
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-item/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-dropdown-item{position:fixed;right:0;left:0;overflow:hidden}.van-dropdown-item__option{text-align:left}.van-dropdown-item__option--active .van-dropdown-item__icon,.van-dropdown-item__option--active .van-dropdown-item__title{color:#1989fa;color:var(--dropdown-menu-option-active-color,#1989fa)}.van-dropdown-item--up{top:0}.van-dropdown-item--down{bottom:0}.van-dropdown-item__icon{display:block;line-height:inherit}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.js b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.js
new file mode 100644
index 0000000..8f574a8
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.js
@@ -0,0 +1,133 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+var ARRAY = [];
+component_1.VantComponent({
+  field: true,
+  relation: {
+    name: 'dropdown-item',
+    type: 'descendant',
+    current: 'dropdown-menu',
+    linked: function () {
+      this.updateItemListData();
+    },
+    unlinked: function () {
+      this.updateItemListData();
+    },
+  },
+  props: {
+    activeColor: {
+      type: String,
+      observer: 'updateChildrenData',
+    },
+    overlay: {
+      type: Boolean,
+      value: true,
+      observer: 'updateChildrenData',
+    },
+    zIndex: {
+      type: Number,
+      value: 10,
+    },
+    duration: {
+      type: Number,
+      value: 200,
+      observer: 'updateChildrenData',
+    },
+    direction: {
+      type: String,
+      value: 'down',
+      observer: 'updateChildrenData',
+    },
+    closeOnClickOverlay: {
+      type: Boolean,
+      value: true,
+      observer: 'updateChildrenData',
+    },
+    closeOnClickOutside: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    itemListData: [],
+  },
+  beforeCreate: function () {
+    var windowHeight = wx.getSystemInfoSync().windowHeight;
+    this.windowHeight = windowHeight;
+    ARRAY.push(this);
+  },
+  destroyed: function () {
+    var _this = this;
+    ARRAY = ARRAY.filter(function (item) {
+      return item !== _this;
+    });
+  },
+  methods: {
+    updateItemListData: function () {
+      this.setData({
+        itemListData: this.children.map(function (child) {
+          return child.data;
+        }),
+      });
+    },
+    updateChildrenData: function () {
+      this.children.forEach(function (child) {
+        child.updateDataFromParent();
+      });
+    },
+    toggleItem: function (active) {
+      this.children.forEach(function (item, index) {
+        var showPopup = item.data.showPopup;
+        if (index === active) {
+          item.toggle();
+        } else if (showPopup) {
+          item.toggle(false, { immediate: true });
+        }
+      });
+    },
+    close: function () {
+      this.children.forEach(function (child) {
+        child.toggle(false, { immediate: true });
+      });
+    },
+    getChildWrapperStyle: function () {
+      var _this = this;
+      var _a = this.data,
+        zIndex = _a.zIndex,
+        direction = _a.direction;
+      return this.getRect('.van-dropdown-menu').then(function (rect) {
+        var _a = rect.top,
+          top = _a === void 0 ? 0 : _a,
+          _b = rect.bottom,
+          bottom = _b === void 0 ? 0 : _b;
+        var offset = direction === 'down' ? bottom : _this.windowHeight - top;
+        var wrapperStyle = 'z-index: ' + zIndex + ';';
+        if (direction === 'down') {
+          wrapperStyle += 'top: ' + utils_1.addUnit(offset) + ';';
+        } else {
+          wrapperStyle += 'bottom: ' + utils_1.addUnit(offset) + ';';
+        }
+        return wrapperStyle;
+      });
+    },
+    onTitleTap: function (event) {
+      var _this = this;
+      var index = event.currentTarget.dataset.index;
+      var child = this.children[index];
+      if (!child.data.disabled) {
+        ARRAY.forEach(function (menuItem) {
+          if (
+            menuItem &&
+            menuItem.data.closeOnClickOutside &&
+            menuItem !== _this
+          ) {
+            menuItem.close();
+          }
+        });
+        this.toggleItem(index);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.json b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxml
new file mode 100644
index 0000000..037ac3b
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxml
@@ -0,0 +1,23 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<view class="van-dropdown-menu van-dropdown-menu--top-bottom">
+  <view
+    wx:for="{{ itemListData }}"
+    wx:key="index"
+    data-index="{{ index }}"
+    class="{{ utils.bem('dropdown-menu__item', { disabled: item.disabled }) }}"
+    bind:tap="onTitleTap"
+  >
+    <view
+      class="{{ item.titleClass }} {{ utils.bem('dropdown-menu__title', { active: item.showPopup, down: item.showPopup === (direction === 'down') }) }}"
+      style="{{ item.showPopup ? 'color:' + activeColor : '' }}"
+    >
+      <view class="van-ellipsis">
+        {{ computed.displayTitle(item) }}
+      </view>
+    </view>
+  </view>
+
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxs
new file mode 100644
index 0000000..6538854
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxs
@@ -0,0 +1,16 @@
+/* eslint-disable */
+function displayTitle(item) {
+  if (item.title) {
+    return item.title;
+  }
+
+  var match = item.options.filter(function(option) {
+    return option.value === item.value;
+  });
+  var displayTitle = match.length ? match[0].text : '';
+  return displayTitle;
+}
+
+module.exports = {
+  displayTitle: displayTitle
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxss
new file mode 100644
index 0000000..43efd77
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/dropdown-menu/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-dropdown-menu{display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none;height:50px;height:var(--dropdown-menu-height,50px);background-color:#fff;background-color:var(--dropdown-menu-background-color,#fff)}.van-dropdown-menu__item{display:-webkit-flex;display:flex;-webkit-flex:1;flex:1;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;min-width:0}.van-dropdown-menu__item:active{opacity:.7}.van-dropdown-menu__item--disabled:active{opacity:1}.van-dropdown-menu__item--disabled .van-dropdown-menu__title{color:#969799;color:var(--dropdown-menu-title-disabled-text-color,#969799)}.van-dropdown-menu__title{position:relative;box-sizing:border-box;max-width:100%;padding:0 8px;padding:var(--dropdown-menu-title-padding,0 8px);color:#323233;color:var(--dropdown-menu-title-text-color,#323233);font-size:15px;font-size:var(--dropdown-menu-title-font-size,15px);line-height:18px;line-height:var(--dropdown-menu-title-line-height,18px)}.van-dropdown-menu__title:after{position:absolute;top:50%;right:-4px;margin-top:-5px;border-color:transparent transparent currentcolor currentcolor;border-style:solid;border-width:3px;-webkit-transform:rotate(-45deg);transform:rotate(-45deg);opacity:.8;content:""}.van-dropdown-menu__title--active{color:#1989fa;color:var(--dropdown-menu-title-active-text-color,#1989fa)}.van-dropdown-menu__title--down:after{margin-top:-1px;-webkit-transform:rotate(135deg);transform:rotate(135deg)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/field/index.js b/miniprogram/miniprogram_npm/@vant/weapp/field/index.js
new file mode 100644
index 0000000..764114e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/field/index.js
@@ -0,0 +1,147 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var props_1 = require('./props');
+component_1.VantComponent({
+  field: true,
+  classes: ['input-class', 'right-icon-class', 'label-class'],
+  props: __assign(
+    __assign(
+      __assign(__assign({}, props_1.commonProps), props_1.inputProps),
+      props_1.textareaProps
+    ),
+    {
+      size: String,
+      icon: String,
+      label: String,
+      error: Boolean,
+      center: Boolean,
+      isLink: Boolean,
+      leftIcon: String,
+      rightIcon: String,
+      autosize: [Boolean, Object],
+      readonly: {
+        type: Boolean,
+        observer: 'setShowClear',
+      },
+      required: Boolean,
+      iconClass: String,
+      clearable: {
+        type: Boolean,
+        observer: 'setShowClear',
+      },
+      clickable: Boolean,
+      inputAlign: String,
+      customStyle: String,
+      errorMessage: String,
+      arrowDirection: String,
+      showWordLimit: Boolean,
+      errorMessageAlign: String,
+      border: {
+        type: Boolean,
+        value: true,
+      },
+      titleWidth: {
+        type: String,
+        value: '90px',
+      },
+    }
+  ),
+  data: {
+    focused: false,
+    innerValue: '',
+    showClear: false,
+  },
+  created: function () {
+    this.value = this.data.value;
+    this.setData({ innerValue: this.value });
+  },
+  methods: {
+    onInput: function (event) {
+      var _a = (event.detail || {}).value,
+        value = _a === void 0 ? '' : _a;
+      this.value = value;
+      this.setShowClear();
+      this.emitChange();
+    },
+    onFocus: function (event) {
+      this.focused = true;
+      this.setShowClear();
+      this.$emit('focus', event.detail);
+    },
+    onBlur: function (event) {
+      this.focused = false;
+      this.setShowClear();
+      this.$emit('blur', event.detail);
+    },
+    onClickIcon: function () {
+      this.$emit('click-icon');
+    },
+    onClear: function () {
+      var _this = this;
+      this.setData({ innerValue: '' });
+      this.value = '';
+      this.setShowClear();
+      wx.nextTick(function () {
+        _this.emitChange();
+        _this.$emit('clear', '');
+      });
+    },
+    onConfirm: function (event) {
+      var _a = (event.detail || {}).value,
+        value = _a === void 0 ? '' : _a;
+      this.value = value;
+      this.setShowClear();
+      this.$emit('confirm', value);
+    },
+    setValue: function (value) {
+      this.value = value;
+      this.setShowClear();
+      if (value === '') {
+        this.setData({ innerValue: '' });
+      }
+      this.emitChange();
+    },
+    onLineChange: function (event) {
+      this.$emit('linechange', event.detail);
+    },
+    onKeyboardHeightChange: function (event) {
+      this.$emit('keyboardheightchange', event.detail);
+    },
+    emitChange: function () {
+      var _this = this;
+      this.setData({ value: this.value });
+      wx.nextTick(function () {
+        _this.$emit('input', _this.value);
+        _this.$emit('change', _this.value);
+      });
+    },
+    setShowClear: function () {
+      var _a = this.data,
+        clearable = _a.clearable,
+        readonly = _a.readonly;
+      var _b = this,
+        focused = _b.focused,
+        value = _b.value;
+      this.setData({
+        showClear: !!clearable && !!focused && !!value && !readonly,
+      });
+    },
+    noop: function () {},
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/field/index.json b/miniprogram/miniprogram_npm/@vant/weapp/field/index.json
new file mode 100644
index 0000000..5906c50
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/field/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "../cell/index",
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml
new file mode 100644
index 0000000..c984d89
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml
@@ -0,0 +1,105 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<van-cell
+  size="{{ size }}"
+  icon="{{ leftIcon }}"
+  title="{{ label }}"
+  center="{{ center }}"
+  border="{{ border }}"
+  is-link="{{ isLink }}"
+  required="{{ required }}"
+  clickable="{{ clickable }}"
+  title-width="{{ titleWidth }}"
+  custom-style="{{ customStyle }}"
+  arrow-direction="{{ arrowDirection }}"
+  custom-class="van-field"
+  title-class="label-class"
+>
+  <slot name="left-icon" slot="icon" />
+  <slot name="label" slot="title" />
+  <view class="{{ utils.bem('field__body', [type]) }}">
+    <textarea
+      wx:if="{{ type === 'textarea' }}"
+      class="input-class {{ utils.bem('field__input', [inputAlign, type, { disabled, error }]) }}"
+      fixed="{{ fixed }}"
+      focus="{{ focus }}"
+      cursor="{{ cursor }}"
+      value="{{ innerValue }}"
+      auto-focus="{{ autoFocus }}"
+      disabled="{{ disabled || readonly }}"
+      maxlength="{{ maxlength }}"
+      placeholder="{{ placeholder }}"
+      placeholder-style="{{ placeholderStyle }}"
+      placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
+      auto-height="{{ !!autosize }}"
+      style="{{ computed.inputStyle(autosize) }}"
+      cursor-spacing="{{ cursorSpacing }}"
+      adjust-position="{{ adjustPosition }}"
+      show-confirm-bar="{{ showConfirmBar }}"
+      hold-keyboard="{{ holdKeyboard }}"
+      selection-end="{{ selectionEnd }}"
+      selection-start="{{ selectionStart }}"
+      disable-default-padding="{{ disableDefaultPadding }}"
+      bindinput="onInput"
+      bindblur="onBlur"
+      bindfocus="onFocus"
+      bindconfirm="onConfirm"
+      bindlinechange="onLineChange"
+      bindkeyboardheightchange="onKeyboardHeightChange"
+    >
+    </textarea>
+    <input
+      wx:else
+      class="input-class {{ utils.bem('field__input', [inputAlign, { disabled, error }]) }}"
+      type="{{ type }}"
+      focus="{{ focus }}"
+      cursor="{{ cursor }}"
+      value="{{ innerValue }}"
+      auto-focus="{{ autoFocus }}"
+      disabled="{{ disabled || readonly }}"
+      maxlength="{{ maxlength }}"
+      placeholder="{{ placeholder }}"
+      placeholder-style="{{ placeholderStyle }}"
+      placeholder-class="{{ utils.bem('field__placeholder', { error }) }}"
+      confirm-type="{{ confirmType }}"
+      confirm-hold="{{ confirmHold }}"
+      hold-keyboard="{{ holdKeyboard }}"
+      cursor-spacing="{{ cursorSpacing }}"
+      adjust-position="{{ adjustPosition }}"
+      selection-end="{{ selectionEnd }}"
+      selection-start="{{ selectionStart }}"
+      password="{{ password || type === 'password' }}"
+      bindinput="onInput"
+      bindblur="onBlur"
+      bindfocus="onFocus"
+      bindconfirm="onConfirm"
+      bindkeyboardheightchange="onKeyboardHeightChange"
+    />
+    <van-icon
+      wx:if="{{ showClear }}"
+      name="clear"
+      class="van-field__clear-root van-field__icon-root"
+      catch:touchstart="onClear"
+    />
+    <view class="van-field__icon-container" bind:tap="onClickIcon">
+      <van-icon
+        wx:if="{{ rightIcon || icon }}"
+        name="{{ rightIcon || icon }}"
+        class="van-field__icon-root {{ iconClass }}"
+        custom-class="right-icon-class"
+      />
+      <slot name="right-icon" />
+      <slot name="icon" />
+    </view>
+    <view class="van-field__button">
+      <slot name="button" />
+    </view>
+  </view>
+  <view wx:if="{{ showWordLimit && maxlength }}" class="van-field__word-limit">
+    <view class="{{ utils.bem('field__word-num', { full: value.length >= maxlength }) }}">{{ value.length }}</view>/{{ maxlength }}
+  </view>
+  <view wx:if="{{ errorMessage }}" class="{{ utils.bem('field__error-message', [errorMessageAlign, { disabled, error }]) }}">
+    {{ errorMessage }}
+  </view>
+</van-cell>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxs
new file mode 100644
index 0000000..639ae2f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxs
@@ -0,0 +1,21 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function inputStyle(autosize) {
+  if (autosize && autosize.constructor === 'Object') {
+    var style = '';
+    if (autosize.minHeight) {
+      style += 'min-height:' + utils.addUnit(autosize.minHeight) + ';';
+    }
+    if (autosize.maxHeight) {
+      style += 'max-height:' + utils.addUnit(autosize.maxHeight) + ';';
+    }
+    return style;
+  }
+
+  return '';
+}
+
+module.exports = {
+  inputStyle: inputStyle
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxss
new file mode 100644
index 0000000..00a62a3
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-field{--cell-icon-size:16px;--cell-icon-size:var(--field-icon-size,16px)}.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{line-height:1.2em}.van-field__body--textarea,.van-field__input{min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__input{position:relative;display:block;box-sizing:border-box;width:100%;margin:0;padding:0;line-height:inherit;text-align:left;background-color:initial;border:0;resize:none;color:#323233;color:var(--field-input-text-color,#323233);height:24px;height:var(--cell-line-height,24px)}.van-field__input--textarea{height:18px;height:var(--field-text-area-min-height,18px);min-height:18px;min-height:var(--field-text-area-min-height,18px)}.van-field__input--error{color:#ee0a24;color:var(--field-input-error-text-color,#ee0a24)}.van-field__input--disabled{background-color:initial;opacity:1;color:#969799;color:var(--field-input-disabled-text-color,#969799)}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;pointer-events:none;color:#c8c9cc;color:var(--field-placeholder-text-color,#c8c9cc)}.van-field__placeholder--error{color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__icon-root{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;min-height:24px;min-height:var(--cell-line-height,24px)}.van-field__clear-root,.van-field__icon-container{line-height:inherit;vertical-align:middle;padding:0 8px;padding:0 var(--padding-xs,8px);margin-right:-8px;margin-right:-var(--padding-xs,8px)}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{font-size:16px;font-size:var(--field-clear-icon-size,16px);color:#c8c9cc;color:var(--field-clear-icon-color,#c8c9cc)}.van-field__icon-container{font-size:16px;font-size:var(--field-icon-size,16px);color:#969799;color:var(--field-icon-container-color,#969799)}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:8px;padding-left:var(--padding-xs,8px)}.van-field__button:empty{display:none}.van-field__error-message{text-align:left;font-size:12px;font-size:var(--field-error-message-text-font-size,12px);color:#ee0a24;color:var(--field-error-message-color,#ee0a24)}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}.van-field__word-limit{text-align:right;margin-top:4px;margin-top:var(--padding-base,4px);color:#646566;color:var(--field-word-limit-color,#646566);font-size:12px;font-size:var(--field-word-limit-font-size,12px);line-height:16px;line-height:var(--field-word-limit-line-height,16px)}.van-field__word-num{display:inline}.van-field__word-num--full{color:#ee0a24;color:var(--field-word-num-full-color,#ee0a24)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/field/props.js b/miniprogram/miniprogram_npm/@vant/weapp/field/props.js
new file mode 100644
index 0000000..6ce703b
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/field/props.js
@@ -0,0 +1,66 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.textareaProps = exports.inputProps = exports.commonProps = void 0;
+exports.commonProps = {
+  value: {
+    type: String,
+    observer: function (value) {
+      if (value !== this.value) {
+        this.setData({ innerValue: value });
+        this.value = value;
+      }
+    },
+  },
+  placeholder: String,
+  placeholderStyle: String,
+  placeholderClass: String,
+  disabled: Boolean,
+  maxlength: {
+    type: Number,
+    value: -1,
+  },
+  cursorSpacing: {
+    type: Number,
+    value: 50,
+  },
+  autoFocus: Boolean,
+  focus: Boolean,
+  cursor: {
+    type: Number,
+    value: -1,
+  },
+  selectionStart: {
+    type: Number,
+    value: -1,
+  },
+  selectionEnd: {
+    type: Number,
+    value: -1,
+  },
+  adjustPosition: {
+    type: Boolean,
+    value: true,
+  },
+  holdKeyboard: Boolean,
+};
+exports.inputProps = {
+  type: {
+    type: String,
+    value: 'text',
+  },
+  password: Boolean,
+  confirmType: String,
+  confirmHold: Boolean,
+};
+exports.textareaProps = {
+  autoHeight: Boolean,
+  fixed: Boolean,
+  showConfirmBar: {
+    type: Boolean,
+    value: true,
+  },
+  disableDefaultPadding: {
+    type: Boolean,
+    value: true,
+  },
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.js b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.js
new file mode 100644
index 0000000..65e9dba
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.js
@@ -0,0 +1,44 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var link_1 = require('../mixins/link');
+var button_1 = require('../mixins/button');
+var open_type_1 = require('../mixins/open-type');
+component_1.VantComponent({
+  mixins: [link_1.link, button_1.button, open_type_1.openType],
+  relation: {
+    type: 'ancestor',
+    name: 'goods-action',
+    current: 'goods-action-button',
+  },
+  props: {
+    text: String,
+    color: String,
+    loading: Boolean,
+    disabled: Boolean,
+    plain: Boolean,
+    type: {
+      type: String,
+      value: 'danger',
+    },
+  },
+  methods: {
+    onClick: function (event) {
+      this.$emit('click', event.detail);
+      this.jumpLink();
+    },
+    updateStyle: function () {
+      if (this.parent == null) {
+        return;
+      }
+      var _a = this.parent.children,
+        children = _a === void 0 ? [] : _a;
+      var length = children.length;
+      var index = children.indexOf(this);
+      this.setData({
+        isFirst: index === 0,
+        isLast: index === length - 1,
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.json b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.json
new file mode 100644
index 0000000..b567686
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-button": "../button/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxml
new file mode 100644
index 0000000..3912ced
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxml
@@ -0,0 +1,30 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<van-button
+  id="{{ id }}"
+  lang="{{ lang }}"
+  type="{{ type }}"
+  color="{{ color }}"
+  plain="{{ plain }}"
+  loading="{{ loading }}"
+  disabled="{{ disabled }}"
+  open-type="{{ openType }}"
+  class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast, plain: plain }])}}"
+  custom-class="van-goods-action-button__inner"
+  business-id="{{ businessId }}"
+  session-from="{{ sessionFrom }}"
+  app-parameter="{{ appParameter }}"
+  send-message-img="{{ sendMessageImg }}"
+  send-message-path="{{ sendMessagePath }}"
+  show-message-card="{{ showMessageCard }}"
+  send-message-title="{{ sendMessageTitle }}"
+  bind:click="onClick"
+  binderror="bindError"
+  bindcontact="bindContact"
+  bindopensetting="bindOpenSetting"
+  bindgetuserinfo="bindGetUserInfo"
+  bindgetphonenumber="bindGetPhoneNumber"
+  bindlaunchapp="bindLaunchApp"
+>
+  {{ text }}
+  <slot></slot>
+</van-button>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxss
new file mode 100644
index 0000000..77d16c6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-button/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{--button-warning-background-color:linear-gradient(90deg,#ffd01e,#ff8917);--button-warning-background-color:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917));--button-danger-background-color:linear-gradient(90deg,#ff6034,#ee0a24);--button-danger-background-color:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24));--button-default-height:40px;--button-default-height:var(--goods-action-button-height,40px);--button-line-height:20px;--button-line-height:var(--goods-action-button-line-height,20px);--button-plain-background-color:#fff;--button-plain-background-color:var(--goods-action-button-plain-color,#fff);display:block;--button-border-width:0}.van-goods-action-button--first{margin-left:5px;--button-border-radius:20px 0 0 20px;--button-border-radius:var(--goods-action-button-border-radius,20px) 0 0 var(--goods-action-button-border-radius,20px)}.van-goods-action-button--last{margin-right:5px;--button-border-radius:0 20px 20px 0;--button-border-radius:0 var(--goods-action-button-border-radius,20px) var(--goods-action-button-border-radius,20px) 0}.van-goods-action-button--first.van-goods-action-button--last{--button-border-radius:20px;--button-border-radius:var(--goods-action-button-border-radius,20px)}.van-goods-action-button--plain{--button-border-width:1px}.van-goods-action-button__inner{width:100%;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.js b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.js
new file mode 100644
index 0000000..98fe99a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.js
@@ -0,0 +1,24 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var link_1 = require('../mixins/link');
+var button_1 = require('../mixins/button');
+var open_type_1 = require('../mixins/open-type');
+component_1.VantComponent({
+  classes: ['icon-class', 'text-class'],
+  mixins: [link_1.link, button_1.button, open_type_1.openType],
+  props: {
+    text: String,
+    dot: Boolean,
+    info: String,
+    icon: String,
+    disabled: Boolean,
+    loading: Boolean,
+  },
+  methods: {
+    onClick: function (event) {
+      this.$emit('click', event.detail);
+      this.jumpLink();
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.json b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.json
new file mode 100644
index 0000000..93bfe8a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-button": "../button/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxml
new file mode 100644
index 0000000..f3f0052
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxml
@@ -0,0 +1,38 @@
+<van-button
+  square
+  id="{{ id }}"
+  size="large"
+  lang="{{ lang }}"
+  loading="{{ loading }}"
+  disabled="{{ disabled }}"
+  open-type="{{ openType }}"
+  business-id="{{ businessId }}"
+  custom-class="van-goods-action-icon"
+  session-from="{{ sessionFrom }}"
+  app-parameter="{{ appParameter }}"
+  send-message-img="{{ sendMessageImg }}"
+  send-message-path="{{ sendMessagePath }}"
+  show-message-card="{{ showMessageCard }}"
+  send-message-title="{{ sendMessageTitle }}"
+  bind:click="onClick"
+  binderror="bindError"
+  bindcontact="bindContact"
+  bindopensetting="bindOpenSetting"
+  bindgetuserinfo="bindGetUserInfo"
+  bindgetphonenumber="bindGetPhoneNumber"
+  bindlaunchapp="bindLaunchApp"
+>
+  <view class="van-goods-action-icon__content">
+    <van-icon
+      wx:if="{{ icon }}"
+      size="20px"
+      name="{{ icon }}"
+      dot="{{ dot }}"
+      info="{{ info }}"
+      class="van-goods-action-icon__icon"
+      custom-class="icon-class"
+    />
+    <slot name="icon" />
+    <text class="text-class">{{ text }}</text>
+  </view>
+</van-button>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxss
new file mode 100644
index 0000000..30fff3d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action-icon/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-goods-action-icon{border:none!important;width:50px!important;width:var(--goods-action-icon-height,50px)!important}.van-goods-action-icon__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-justify-content:center;justify-content:center;height:100%;line-height:1;font-size:10px;font-size:var(--goods-action-icon-font-size,10px);color:#646566;color:var(--goods-action-icon-text-color,#646566)}.van-goods-action-icon__icon{margin-bottom:4px}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.js b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.js
new file mode 100644
index 0000000..4392147
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.js
@@ -0,0 +1,35 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    type: 'descendant',
+    name: 'goods-action-button',
+    current: 'goods-action',
+    linked: function () {
+      this.updateStyle();
+    },
+    unlinked: function () {
+      this.updateStyle();
+    },
+    linkChanged: function () {
+      this.updateStyle();
+    },
+  },
+  props: {
+    safeAreaInsetBottom: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    updateStyle: function () {
+      var _this = this;
+      wx.nextTick(function () {
+        _this.children.forEach(function (child) {
+          child.updateStyle();
+        });
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.json b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxml
new file mode 100644
index 0000000..569450c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxml
@@ -0,0 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class {{ utils.bem('goods-action', { safe: safeAreaInsetBottom }) }}">
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxss
new file mode 100644
index 0000000..22b779e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/goods-action/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-goods-action{position:fixed;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;background-color:#fff;background-color:var(--goods-action-background-color,#fff)}.van-goods-action--safe{padding-bottom:env(safe-area-inset-bottom)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.js b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.js
new file mode 100644
index 0000000..1888ff1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.js
@@ -0,0 +1,85 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var link_1 = require('../mixins/link');
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+component_1.VantComponent({
+  relation: {
+    name: 'grid',
+    type: 'ancestor',
+    current: 'grid-item',
+  },
+  classes: ['content-class', 'icon-class', 'text-class'],
+  mixins: [link_1.link],
+  props: {
+    icon: String,
+    dot: Boolean,
+    info: null,
+    badge: null,
+    text: String,
+    useSlot: Boolean,
+  },
+  data: {
+    viewStyle: '',
+  },
+  mounted: function () {
+    this.updateStyle();
+  },
+  methods: {
+    updateStyle: function () {
+      if (!this.parent) {
+        return;
+      }
+      var _a = this.parent,
+        data = _a.data,
+        children = _a.children;
+      var columnNum = data.columnNum,
+        border = data.border,
+        square = data.square,
+        gutter = data.gutter,
+        clickable = data.clickable,
+        center = data.center,
+        direction = data.direction,
+        iconSize = data.iconSize;
+      var width = 100 / columnNum + '%';
+      var styleWrapper = [];
+      styleWrapper.push('width: ' + width);
+      if (square) {
+        styleWrapper.push('padding-top: ' + width);
+      }
+      if (gutter) {
+        var gutterValue = utils_1.addUnit(gutter);
+        styleWrapper.push('padding-right: ' + gutterValue);
+        var index = children.indexOf(this);
+        if (index >= columnNum && !square) {
+          styleWrapper.push('margin-top: ' + gutterValue);
+        }
+      }
+      var contentStyle = '';
+      if (square && gutter) {
+        var gutterValue = utils_1.addUnit(gutter);
+        contentStyle =
+          '\n          right: ' +
+          gutterValue +
+          ';\n          bottom: ' +
+          gutterValue +
+          ';\n          height: auto;\n        ';
+      }
+      this.setData({
+        viewStyle: styleWrapper.join('; '),
+        contentStyle: contentStyle,
+        center: center,
+        border: border,
+        square: square,
+        gutter: gutter,
+        clickable: clickable,
+        direction: direction,
+        iconSize: iconSize,
+      });
+    },
+    onClick: function () {
+      this.$emit('click');
+      this.jumpLink();
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.json b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxml
new file mode 100644
index 0000000..a27c06f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxml
@@ -0,0 +1,22 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class {{ utils.bem('grid-item', { square }) }}" style="{{ viewStyle }}" bindtap="onClick">
+  <view
+    class="content-class {{ utils.bem('grid-item__content', [direction, { center, square, clickable, surround: border && gutter }]) }} {{ border ? 'van-hairline--surround' : '' }}"
+    style="{{ contentStyle }}"
+  >
+    <block wx:if="{{ useSlot }}">
+      <slot />
+    </block>
+    <block wx:else>
+      <view class="van-grid-item__icon icon-class">
+        <van-icon wx:if="{{ icon }}" name="{{ icon }}" dot="{{ dot }}" info="{{ badge || info }}" size="{{ iconSize }}" />
+        <slot wx:else name="icon"></slot>
+      </view>
+      <view class="van-grid-item__text text-class">
+        <text wx:if="{{ text }}">{{ text }}</text>
+        <slot wx:else name="text"></slot>
+      </view>
+    </block>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxss
new file mode 100644
index 0000000..ed7facb
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid-item/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__icon+.van-grid-item__text{margin-top:0;margin-left:8px}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)}.van-grid-item__icon+.van-grid-item__text{margin-top:8px}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid/index.js b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.js
new file mode 100644
index 0000000..cb5c067
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.js
@@ -0,0 +1,67 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+component_1.VantComponent({
+  relation: {
+    name: 'grid-item',
+    type: 'descendant',
+    current: 'grid',
+  },
+  props: {
+    square: {
+      type: Boolean,
+      observer: 'updateChildren',
+    },
+    gutter: {
+      type: [Number, String],
+      value: 0,
+      observer: 'updateChildren',
+    },
+    clickable: {
+      type: Boolean,
+      observer: 'updateChildren',
+    },
+    columnNum: {
+      type: Number,
+      value: 4,
+      observer: 'updateChildren',
+    },
+    center: {
+      type: Boolean,
+      value: true,
+      observer: 'updateChildren',
+    },
+    border: {
+      type: Boolean,
+      value: true,
+      observer: 'updateChildren',
+    },
+    direction: {
+      type: String,
+      observer: 'updateChildren',
+    },
+    iconSize: {
+      type: String,
+      observer: 'updateChildren',
+    },
+  },
+  data: {
+    viewStyle: '',
+  },
+  created: function () {
+    var gutter = this.data.gutter;
+    if (gutter) {
+      this.setData({
+        viewStyle: 'padding-left: ' + utils_1.addUnit(gutter),
+      });
+    }
+  },
+  methods: {
+    updateChildren: function () {
+      this.children.forEach(function (child) {
+        child.updateStyle();
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid/index.json b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxml
new file mode 100644
index 0000000..c5a545f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxml
@@ -0,0 +1,3 @@
+<view class="van-grid custom-class {{ border && !gutter ? 'van-hairline--top' : '' }}" style="{{ viewStyle }}">
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxss
new file mode 100644
index 0000000..327fc5e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/grid/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-grid{position:relative;box-sizing:border-box;overflow:hidden}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/icon/index.js b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.js
new file mode 100644
index 0000000..0f06f9e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.js
@@ -0,0 +1,29 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    dot: Boolean,
+    info: null,
+    size: null,
+    color: String,
+    customStyle: String,
+    classPrefix: {
+      type: String,
+      value: 'van-icon',
+    },
+    name: {
+      type: String,
+      observer: function (val) {
+        this.setData({
+          isImageName: val.indexOf('/') !== -1,
+        });
+      },
+    },
+  },
+  methods: {
+    onClick: function () {
+      this.$emit('click');
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/icon/index.json b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.json
new file mode 100644
index 0000000..bf0ebe0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxml
new file mode 100644
index 0000000..fe4065a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxml
@@ -0,0 +1,20 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
+  style="color: {{ color }};font-size: {{ utils.addUnit(size) }};{{ customStyle }}"
+  bind:tap="onClick"
+>
+  <van-info
+    wx:if="{{ info !== null || dot }}"
+    dot="{{ dot }}"
+    info="{{ info }}"
+    custom-class="van-icon__info"
+  />
+  <image
+    wx:if="{{ isImageName }}"
+    src="{{ name }}"
+    mode="aspectFit"
+    class="van-icon__image"
+  />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxss
new file mode 100644
index 0000000..cf2c506
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/icon/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';@font-face{font-weight:400;font-family:vant-icon;font-style:normal;font-display:auto;src:url(https://img.yzcdn.cn/vant/vant-icon-d3825a.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-d3825a.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-d3825a.ttf) format("truetype")}.van-icon{position:relative;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.van-icon,.van-icon:before{display:inline-block}.van-icon-add-o:before{content:"\F000"}.van-icon-add-square:before{content:"\F001"}.van-icon-add:before{content:"\F002"}.van-icon-after-sale:before{content:"\F003"}.van-icon-aim:before{content:"\F004"}.van-icon-alipay:before{content:"\F005"}.van-icon-apps-o:before{content:"\F006"}.van-icon-arrow-down:before{content:"\F007"}.van-icon-arrow-left:before{content:"\F008"}.van-icon-arrow-up:before{content:"\F009"}.van-icon-arrow:before{content:"\F00A"}.van-icon-ascending:before{content:"\F00B"}.van-icon-audio:before{content:"\F00C"}.van-icon-award-o:before{content:"\F00D"}.van-icon-award:before{content:"\F00E"}.van-icon-bag-o:before{content:"\F00F"}.van-icon-bag:before{content:"\F010"}.van-icon-balance-list-o:before{content:"\F011"}.van-icon-balance-list:before{content:"\F012"}.van-icon-balance-o:before{content:"\F013"}.van-icon-balance-pay:before{content:"\F014"}.van-icon-bar-chart-o:before{content:"\F015"}.van-icon-bars:before{content:"\F016"}.van-icon-bell:before{content:"\F017"}.van-icon-bill-o:before{content:"\F018"}.van-icon-bill:before{content:"\F019"}.van-icon-birthday-cake-o:before{content:"\F01A"}.van-icon-bookmark-o:before{content:"\F01B"}.van-icon-bookmark:before{content:"\F01C"}.van-icon-browsing-history-o:before{content:"\F01D"}.van-icon-browsing-history:before{content:"\F01E"}.van-icon-brush-o:before{content:"\F01F"}.van-icon-bulb-o:before{content:"\F020"}.van-icon-bullhorn-o:before{content:"\F021"}.van-icon-calender-o:before{content:"\F022"}.van-icon-card:before{content:"\F023"}.van-icon-cart-circle-o:before{content:"\F024"}.van-icon-cart-circle:before{content:"\F025"}.van-icon-cart-o:before{content:"\F026"}.van-icon-cart:before{content:"\F027"}.van-icon-cash-back-record:before{content:"\F028"}.van-icon-cash-on-deliver:before{content:"\F029"}.van-icon-cashier-o:before{content:"\F02A"}.van-icon-certificate:before{content:"\F02B"}.van-icon-chart-trending-o:before{content:"\F02C"}.van-icon-chat-o:before{content:"\F02D"}.van-icon-chat:before{content:"\F02E"}.van-icon-checked:before{content:"\F02F"}.van-icon-circle:before{content:"\F030"}.van-icon-clear:before{content:"\F031"}.van-icon-clock-o:before{content:"\F032"}.van-icon-clock:before{content:"\F033"}.van-icon-close:before{content:"\F034"}.van-icon-closed-eye:before{content:"\F035"}.van-icon-cluster-o:before{content:"\F036"}.van-icon-cluster:before{content:"\F037"}.van-icon-column:before{content:"\F038"}.van-icon-comment-circle-o:before{content:"\F039"}.van-icon-comment-circle:before{content:"\F03A"}.van-icon-comment-o:before{content:"\F03B"}.van-icon-comment:before{content:"\F03C"}.van-icon-completed:before{content:"\F03D"}.van-icon-contact:before{content:"\F03E"}.van-icon-coupon-o:before{content:"\F03F"}.van-icon-coupon:before{content:"\F040"}.van-icon-credit-pay:before{content:"\F041"}.van-icon-cross:before{content:"\F042"}.van-icon-debit-pay:before{content:"\F043"}.van-icon-delete:before{content:"\F044"}.van-icon-descending:before{content:"\F045"}.van-icon-description:before{content:"\F046"}.van-icon-desktop-o:before{content:"\F047"}.van-icon-diamond-o:before{content:"\F048"}.van-icon-diamond:before{content:"\F049"}.van-icon-discount:before{content:"\F04A"}.van-icon-down:before{content:"\F04B"}.van-icon-ecard-pay:before{content:"\F04C"}.van-icon-edit:before{content:"\F04D"}.van-icon-ellipsis:before{content:"\F04E"}.van-icon-empty:before{content:"\F04F"}.van-icon-envelop-o:before{content:"\F050"}.van-icon-exchange:before{content:"\F051"}.van-icon-expand-o:before{content:"\F052"}.van-icon-expand:before{content:"\F053"}.van-icon-eye-o:before{content:"\F054"}.van-icon-eye:before{content:"\F055"}.van-icon-fail:before{content:"\F056"}.van-icon-failure:before{content:"\F057"}.van-icon-filter-o:before{content:"\F058"}.van-icon-fire-o:before{content:"\F059"}.van-icon-fire:before{content:"\F05A"}.van-icon-flag-o:before{content:"\F05B"}.van-icon-flower-o:before{content:"\F05C"}.van-icon-free-postage:before{content:"\F05D"}.van-icon-friends-o:before{content:"\F05E"}.van-icon-friends:before{content:"\F05F"}.van-icon-gem-o:before{content:"\F060"}.van-icon-gem:before{content:"\F061"}.van-icon-gift-card-o:before{content:"\F062"}.van-icon-gift-card:before{content:"\F063"}.van-icon-gift-o:before{content:"\F064"}.van-icon-gift:before{content:"\F065"}.van-icon-gold-coin-o:before{content:"\F066"}.van-icon-gold-coin:before{content:"\F067"}.van-icon-good-job-o:before{content:"\F068"}.van-icon-good-job:before{content:"\F069"}.van-icon-goods-collect-o:before{content:"\F06A"}.van-icon-goods-collect:before{content:"\F06B"}.van-icon-graphic:before{content:"\F06C"}.van-icon-home-o:before{content:"\F06D"}.van-icon-hot-o:before{content:"\F06E"}.van-icon-hot-sale-o:before{content:"\F06F"}.van-icon-hot-sale:before{content:"\F070"}.van-icon-hot:before{content:"\F071"}.van-icon-hotel-o:before{content:"\F072"}.van-icon-idcard:before{content:"\F073"}.van-icon-info-o:before{content:"\F074"}.van-icon-info:before{content:"\F075"}.van-icon-invition:before{content:"\F076"}.van-icon-label-o:before{content:"\F077"}.van-icon-label:before{content:"\F078"}.van-icon-like-o:before{content:"\F079"}.van-icon-like:before{content:"\F07A"}.van-icon-live:before{content:"\F07B"}.van-icon-location-o:before{content:"\F07C"}.van-icon-location:before{content:"\F07D"}.van-icon-lock:before{content:"\F07E"}.van-icon-logistics:before{content:"\F07F"}.van-icon-manager-o:before{content:"\F080"}.van-icon-manager:before{content:"\F081"}.van-icon-map-marked:before{content:"\F082"}.van-icon-medal-o:before{content:"\F083"}.van-icon-medal:before{content:"\F084"}.van-icon-more-o:before{content:"\F085"}.van-icon-more:before{content:"\F086"}.van-icon-music-o:before{content:"\F087"}.van-icon-music:before{content:"\F088"}.van-icon-new-arrival-o:before{content:"\F089"}.van-icon-new-arrival:before{content:"\F08A"}.van-icon-new-o:before{content:"\F08B"}.van-icon-new:before{content:"\F08C"}.van-icon-newspaper-o:before{content:"\F08D"}.van-icon-notes-o:before{content:"\F08E"}.van-icon-orders-o:before{content:"\F08F"}.van-icon-other-pay:before{content:"\F090"}.van-icon-paid:before{content:"\F091"}.van-icon-passed:before{content:"\F092"}.van-icon-pause-circle-o:before{content:"\F093"}.van-icon-pause-circle:before{content:"\F094"}.van-icon-pause:before{content:"\F095"}.van-icon-peer-pay:before{content:"\F096"}.van-icon-pending-payment:before{content:"\F097"}.van-icon-phone-circle-o:before{content:"\F098"}.van-icon-phone-circle:before{content:"\F099"}.van-icon-phone-o:before{content:"\F09A"}.van-icon-phone:before{content:"\F09B"}.van-icon-photo-o:before{content:"\F09C"}.van-icon-photo:before{content:"\F09D"}.van-icon-photograph:before{content:"\F09E"}.van-icon-play-circle-o:before{content:"\F09F"}.van-icon-play-circle:before{content:"\F0A0"}.van-icon-play:before{content:"\F0A1"}.van-icon-plus:before{content:"\F0A2"}.van-icon-point-gift-o:before{content:"\F0A3"}.van-icon-point-gift:before{content:"\F0A4"}.van-icon-points:before{content:"\F0A5"}.van-icon-printer:before{content:"\F0A6"}.van-icon-qr-invalid:before{content:"\F0A7"}.van-icon-qr:before{content:"\F0A8"}.van-icon-question-o:before{content:"\F0A9"}.van-icon-question:before{content:"\F0AA"}.van-icon-records:before{content:"\F0AB"}.van-icon-refund-o:before{content:"\F0AC"}.van-icon-replay:before{content:"\F0AD"}.van-icon-scan:before{content:"\F0AE"}.van-icon-search:before{content:"\F0AF"}.van-icon-send-gift-o:before{content:"\F0B0"}.van-icon-send-gift:before{content:"\F0B1"}.van-icon-service-o:before{content:"\F0B2"}.van-icon-service:before{content:"\F0B3"}.van-icon-setting-o:before{content:"\F0B4"}.van-icon-setting:before{content:"\F0B5"}.van-icon-share:before{content:"\F0B6"}.van-icon-shop-collect-o:before{content:"\F0B7"}.van-icon-shop-collect:before{content:"\F0B8"}.van-icon-shop-o:before{content:"\F0B9"}.van-icon-shop:before{content:"\F0BA"}.van-icon-shopping-cart-o:before{content:"\F0BB"}.van-icon-shopping-cart:before{content:"\F0BC"}.van-icon-shrink:before{content:"\F0BD"}.van-icon-sign:before{content:"\F0BE"}.van-icon-smile-comment-o:before{content:"\F0BF"}.van-icon-smile-comment:before{content:"\F0C0"}.van-icon-smile-o:before{content:"\F0C1"}.van-icon-smile:before{content:"\F0C2"}.van-icon-star-o:before{content:"\F0C3"}.van-icon-star:before{content:"\F0C4"}.van-icon-stop-circle-o:before{content:"\F0C5"}.van-icon-stop-circle:before{content:"\F0C6"}.van-icon-stop:before{content:"\F0C7"}.van-icon-success:before{content:"\F0C8"}.van-icon-thumb-circle-o:before{content:"\F0C9"}.van-icon-thumb-circle:before{content:"\F0CA"}.van-icon-todo-list-o:before{content:"\F0CB"}.van-icon-todo-list:before{content:"\F0CC"}.van-icon-tosend:before{content:"\F0CD"}.van-icon-tv-o:before{content:"\F0CE"}.van-icon-umbrella-circle:before{content:"\F0CF"}.van-icon-underway-o:before{content:"\F0D0"}.van-icon-underway:before{content:"\F0D1"}.van-icon-upgrade:before{content:"\F0D2"}.van-icon-user-circle-o:before{content:"\F0D3"}.van-icon-user-o:before{content:"\F0D4"}.van-icon-video-o:before{content:"\F0D5"}.van-icon-video:before{content:"\F0D6"}.van-icon-vip-card-o:before{content:"\F0D7"}.van-icon-vip-card:before{content:"\F0D8"}.van-icon-volume-o:before{content:"\F0D9"}.van-icon-volume:before{content:"\F0DA"}.van-icon-wap-home-o:before{content:"\F0DB"}.van-icon-wap-home:before{content:"\F0DC"}.van-icon-wap-nav:before{content:"\F0DD"}.van-icon-warn-o:before{content:"\F0DE"}.van-icon-warning-o:before{content:"\F0DF"}.van-icon-warning:before{content:"\F0E0"}.van-icon-weapp-nav:before{content:"\F0E1"}.van-icon-wechat:before{content:"\F0E2"}.van-icon-youzan-shield:before{content:"\F0E3"}:host{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-icon--image{width:1em;height:1em}.van-icon__image{width:100%;height:100%}.van-icon__info{z-index:1}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/image/index.js b/miniprogram/miniprogram_npm/@vant/weapp/image/index.js
new file mode 100644
index 0000000..e3348d9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/image/index.js
@@ -0,0 +1,106 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var utils_1 = require('../common/utils');
+var component_1 = require('../common/component');
+var button_1 = require('../mixins/button');
+var open_type_1 = require('../mixins/open-type');
+var FIT_MODE_MAP = {
+  none: 'center',
+  fill: 'scaleToFill',
+  cover: 'aspectFill',
+  contain: 'aspectFit',
+  widthFix: 'widthFix',
+  heightFix: 'heightFix',
+};
+component_1.VantComponent({
+  mixins: [button_1.button, open_type_1.openType],
+  classes: ['custom-class', 'loading-class', 'error-class', 'image-class'],
+  props: {
+    src: {
+      type: String,
+      observer: function () {
+        this.setData({
+          error: false,
+          loading: true,
+        });
+      },
+    },
+    round: Boolean,
+    width: {
+      type: null,
+      observer: 'setStyle',
+    },
+    height: {
+      type: null,
+      observer: 'setStyle',
+    },
+    radius: null,
+    lazyLoad: Boolean,
+    useErrorSlot: Boolean,
+    useLoadingSlot: Boolean,
+    showMenuByLongpress: Boolean,
+    fit: {
+      type: String,
+      value: 'fill',
+      observer: 'setMode',
+    },
+    showError: {
+      type: Boolean,
+      value: true,
+    },
+    showLoading: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    error: false,
+    loading: true,
+    viewStyle: '',
+  },
+  mounted: function () {
+    this.setMode();
+    this.setStyle();
+  },
+  methods: {
+    setMode: function () {
+      this.setData({
+        mode: FIT_MODE_MAP[this.data.fit],
+      });
+    },
+    setStyle: function () {
+      var _a = this.data,
+        width = _a.width,
+        height = _a.height,
+        radius = _a.radius;
+      var style = '';
+      if (utils_1.isDef(width)) {
+        style += 'width: ' + utils_1.addUnit(width) + ';';
+      }
+      if (utils_1.isDef(height)) {
+        style += 'height: ' + utils_1.addUnit(height) + ';';
+      }
+      if (utils_1.isDef(radius)) {
+        style += 'overflow: hidden;';
+        style += 'border-radius: ' + utils_1.addUnit(radius) + ';';
+      }
+      this.setData({ viewStyle: style });
+    },
+    onLoad: function (event) {
+      this.setData({
+        loading: false,
+      });
+      this.$emit('load', event.detail);
+    },
+    onError: function (event) {
+      this.setData({
+        loading: false,
+        error: true,
+      });
+      this.$emit('error', event.detail);
+    },
+    onClick: function (event) {
+      this.$emit('click', event.detail);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/image/index.json b/miniprogram/miniprogram_npm/@vant/weapp/image/index.json
new file mode 100644
index 0000000..e00a588
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/image/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/image/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/image/index.wxml
new file mode 100644
index 0000000..6450ba1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/image/index.wxml
@@ -0,0 +1,33 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  style="{{ viewStyle }}"
+  class="custom-class {{ utils.bem('image', { round })}}"
+  bind:tap="onClick"
+>
+  <image
+    wx:if="{{ !error }}"
+    src="{{ src }}"
+    mode="{{ mode }}"
+    lazy-load="{{ lazyLoad }}"
+    class="image-class van-image__img"
+    show-menu-by-longpress="{{ showMenuByLongpress }}"
+    bind:load="onLoad"
+    bind:error="onError"
+  />
+
+  <view
+    wx:if="{{ loading && showLoading }}"
+    class="loading-class van-image__loading"
+  >
+    <slot wx:if="{{ useLoadingSlot }}" name="loading" />
+    <van-icon wx:else name="photo-o" size="22" />
+  </view>
+  <view
+    wx:if="{{ error && showError }}"
+    class="error-class van-image__error"
+  >
+    <slot wx:if="{{ useErrorSlot }}" name="error" />
+    <van-icon wx:else name="warning-o" size="22" />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/image/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/image/index.wxss
new file mode 100644
index 0000000..e5f1637
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/image/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-image{position:relative;display:inline-block}.van-image--round{overflow:hidden;border-radius:50%}.van-image--round .van-image__img{border-radius:inherit}.van-image__error,.van-image__img,.van-image__loading{display:block;width:100%;height:100%}.van-image__error,.van-image__loading{position:absolute;top:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#969799;color:var(--image-placeholder-text-color,#969799);font-size:14px;font-size:var(--image-placeholder-font-size,14px);background-color:#f7f8fa;background-color:var(--image-placeholder-background-color,#f7f8fa)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.js b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.js
new file mode 100644
index 0000000..89fcf9d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.js
@@ -0,0 +1,33 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    name: 'index-bar',
+    type: 'ancestor',
+    current: 'index-anchor',
+  },
+  props: {
+    useSlot: Boolean,
+    index: null,
+  },
+  data: {
+    active: false,
+    wrapperStyle: '',
+    anchorStyle: '',
+  },
+  methods: {
+    scrollIntoView: function (scrollTop) {
+      var _this = this;
+      this.getBoundingClientRect().then(function (rect) {
+        wx.pageScrollTo({
+          duration: 0,
+          scrollTop: scrollTop + rect.top - _this.parent.data.stickyOffsetTop,
+        });
+      });
+    },
+    getBoundingClientRect: function () {
+      return this.getRect('.van-index-anchor-wrapper');
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.json b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxml
new file mode 100644
index 0000000..49affa7
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxml
@@ -0,0 +1,14 @@
+<view
+  class="van-index-anchor-wrapper"
+  style="{{ wrapperStyle }}"
+>
+  <view
+    class="van-index-anchor {{ active ? 'van-index-anchor--active van-hairline--bottom' : '' }}"
+    style="{{ anchorStyle }}"
+  >
+    <slot wx:if="{{ useSlot }}"/>
+    <block wx:else>
+      <text>{{ index }}</text>
+    </block>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxss
new file mode 100644
index 0000000..b8c3c0a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-anchor/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-index-anchor{padding:0 16px;padding:var(--index-anchor-padding,0 16px);color:#323233;color:var(--index-anchor-text-color,#323233);font-weight:500;font-weight:var(--index-anchor-font-weight,500);font-size:14px;font-size:var(--index-anchor-font-size,14px);line-height:32px;line-height:var(--index-anchor-line-height,32px);background-color:initial;background-color:var(--index-anchor-background-color,transparent)}.van-index-anchor--active{right:0;left:0;color:#07c160;color:var(--index-anchor-active-text-color,#07c160);background-color:#fff;background-color:var(--index-anchor-active-background-color,#fff)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.js b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.js
new file mode 100644
index 0000000..ebda3b1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.js
@@ -0,0 +1,279 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var color_1 = require('../common/color');
+var page_scroll_1 = require('../mixins/page-scroll');
+var indexList = function () {
+  var indexList = [];
+  var charCodeOfA = 'A'.charCodeAt(0);
+  for (var i = 0; i < 26; i++) {
+    indexList.push(String.fromCharCode(charCodeOfA + i));
+  }
+  return indexList;
+};
+component_1.VantComponent({
+  relation: {
+    name: 'index-anchor',
+    type: 'descendant',
+    current: 'index-bar',
+    linked: function () {
+      this.updateData();
+    },
+    unlinked: function () {
+      this.updateData();
+    },
+  },
+  props: {
+    sticky: {
+      type: Boolean,
+      value: true,
+    },
+    zIndex: {
+      type: Number,
+      value: 1,
+    },
+    highlightColor: {
+      type: String,
+      value: color_1.GREEN,
+    },
+    stickyOffsetTop: {
+      type: Number,
+      value: 0,
+    },
+    indexList: {
+      type: Array,
+      value: indexList(),
+    },
+  },
+  mixins: [
+    page_scroll_1.pageScrollMixin(function (event) {
+      this.scrollTop = event.scrollTop || 0;
+      this.onScroll();
+    }),
+  ],
+  data: {
+    activeAnchorIndex: null,
+    showSidebar: false,
+  },
+  created: function () {
+    this.scrollTop = 0;
+  },
+  methods: {
+    updateData: function () {
+      var _this = this;
+      wx.nextTick(function () {
+        if (_this.timer != null) {
+          clearTimeout(_this.timer);
+        }
+        _this.timer = setTimeout(function () {
+          _this.setData({
+            showSidebar: !!_this.children.length,
+          });
+          _this.setRect().then(function () {
+            _this.onScroll();
+          });
+        }, 0);
+      });
+    },
+    setRect: function () {
+      return Promise.all([
+        this.setAnchorsRect(),
+        this.setListRect(),
+        this.setSiderbarRect(),
+      ]);
+    },
+    setAnchorsRect: function () {
+      var _this = this;
+      return Promise.all(
+        this.children.map(function (anchor) {
+          return anchor
+            .getRect('.van-index-anchor-wrapper')
+            .then(function (rect) {
+              Object.assign(anchor, {
+                height: rect.height,
+                top: rect.top + _this.scrollTop,
+              });
+            });
+        })
+      );
+    },
+    setListRect: function () {
+      var _this = this;
+      return this.getRect('.van-index-bar').then(function (rect) {
+        Object.assign(_this, {
+          height: rect.height,
+          top: rect.top + _this.scrollTop,
+        });
+      });
+    },
+    setSiderbarRect: function () {
+      var _this = this;
+      return this.getRect('.van-index-bar__sidebar').then(function (res) {
+        _this.sidebar = {
+          height: res.height,
+          top: res.top,
+        };
+      });
+    },
+    setDiffData: function (_a) {
+      var target = _a.target,
+        data = _a.data;
+      var diffData = {};
+      Object.keys(data).forEach(function (key) {
+        if (target.data[key] !== data[key]) {
+          diffData[key] = data[key];
+        }
+      });
+      if (Object.keys(diffData).length) {
+        target.setData(diffData);
+      }
+    },
+    getAnchorRect: function (anchor) {
+      return anchor.getRect('.van-index-anchor-wrapper').then(function (rect) {
+        return {
+          height: rect.height,
+          top: rect.top,
+        };
+      });
+    },
+    getActiveAnchorIndex: function () {
+      var _a = this,
+        children = _a.children,
+        scrollTop = _a.scrollTop;
+      var _b = this.data,
+        sticky = _b.sticky,
+        stickyOffsetTop = _b.stickyOffsetTop;
+      for (var i = this.children.length - 1; i >= 0; i--) {
+        var preAnchorHeight = i > 0 ? children[i - 1].height : 0;
+        var reachTop = sticky ? preAnchorHeight + stickyOffsetTop : 0;
+        if (reachTop + scrollTop >= children[i].top) {
+          return i;
+        }
+      }
+      return -1;
+    },
+    onScroll: function () {
+      var _this = this;
+      var _a = this,
+        _b = _a.children,
+        children = _b === void 0 ? [] : _b,
+        scrollTop = _a.scrollTop;
+      if (!children.length) {
+        return;
+      }
+      var _c = this.data,
+        sticky = _c.sticky,
+        stickyOffsetTop = _c.stickyOffsetTop,
+        zIndex = _c.zIndex,
+        highlightColor = _c.highlightColor;
+      var active = this.getActiveAnchorIndex();
+      this.setDiffData({
+        target: this,
+        data: {
+          activeAnchorIndex: active,
+        },
+      });
+      if (sticky) {
+        var isActiveAnchorSticky_1 = false;
+        if (active !== -1) {
+          isActiveAnchorSticky_1 =
+            children[active].top <= stickyOffsetTop + scrollTop;
+        }
+        children.forEach(function (item, index) {
+          if (index === active) {
+            var wrapperStyle = '';
+            var anchorStyle =
+              '\n              color: ' + highlightColor + ';\n            ';
+            if (isActiveAnchorSticky_1) {
+              wrapperStyle =
+                '\n                height: ' +
+                children[index].height +
+                'px;\n              ';
+              anchorStyle =
+                '\n                position: fixed;\n                top: ' +
+                stickyOffsetTop +
+                'px;\n                z-index: ' +
+                zIndex +
+                ';\n                color: ' +
+                highlightColor +
+                ';\n              ';
+            }
+            _this.setDiffData({
+              target: item,
+              data: {
+                active: true,
+                anchorStyle: anchorStyle,
+                wrapperStyle: wrapperStyle,
+              },
+            });
+          } else if (index === active - 1) {
+            var currentAnchor = children[index];
+            var currentOffsetTop = currentAnchor.top;
+            var targetOffsetTop =
+              index === children.length - 1
+                ? _this.top
+                : children[index + 1].top;
+            var parentOffsetHeight = targetOffsetTop - currentOffsetTop;
+            var translateY = parentOffsetHeight - currentAnchor.height;
+            var anchorStyle =
+              '\n              position: relative;\n              transform: translate3d(0, ' +
+              translateY +
+              'px, 0);\n              z-index: ' +
+              zIndex +
+              ';\n              color: ' +
+              highlightColor +
+              ';\n            ';
+            _this.setDiffData({
+              target: item,
+              data: {
+                active: true,
+                anchorStyle: anchorStyle,
+              },
+            });
+          } else {
+            _this.setDiffData({
+              target: item,
+              data: {
+                active: false,
+                anchorStyle: '',
+                wrapperStyle: '',
+              },
+            });
+          }
+        });
+      }
+    },
+    onClick: function (event) {
+      this.scrollToAnchor(event.target.dataset.index);
+    },
+    onTouchMove: function (event) {
+      var sidebarLength = this.children.length;
+      var touch = event.touches[0];
+      var itemHeight = this.sidebar.height / sidebarLength;
+      var index = Math.floor((touch.clientY - this.sidebar.top) / itemHeight);
+      if (index < 0) {
+        index = 0;
+      } else if (index > sidebarLength - 1) {
+        index = sidebarLength - 1;
+      }
+      this.scrollToAnchor(index);
+    },
+    onTouchStop: function () {
+      this.scrollToAnchorIndex = null;
+    },
+    scrollToAnchor: function (index) {
+      var _this = this;
+      if (typeof index !== 'number' || this.scrollToAnchorIndex === index) {
+        return;
+      }
+      this.scrollToAnchorIndex = index;
+      var anchor = this.children.find(function (item) {
+        return item.data.index === _this.data.indexList[index];
+      });
+      if (anchor) {
+        anchor.scrollIntoView(this.scrollTop);
+        this.$emit('select', anchor.data.index);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.json b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxml
new file mode 100644
index 0000000..19a59cf
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxml
@@ -0,0 +1,22 @@
+<view class="van-index-bar">
+  <slot />
+
+  <view
+    wx:if="{{ showSidebar }}"
+    class="van-index-bar__sidebar"
+    catch:tap="onClick"
+    catch:touchmove="onTouchMove"
+    catch:touchend="onTouchStop"
+    catch:touchcancel="onTouchStop"
+  >
+    <view
+      wx:for="{{ indexList }}"
+      wx:key="index"
+      class="van-index-bar__index"
+      style="z-index: {{ zIndex + 1 }}; color: {{ activeAnchorIndex === index ? highlightColor : '' }}"
+      data-index="{{ index }}"
+    >
+      {{ item }}
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxss
new file mode 100644
index 0000000..dba5dc0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/index-bar/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-index-bar{position:relative}.van-index-bar__sidebar{position:fixed;top:50%;right:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;user-select:none}.van-index-bar__index{font-weight:500;padding:0 4px 0 16px;padding:0 var(--padding-base,4px) 0 var(--padding-md,16px);font-size:10px;font-size:var(--index-bar-index-font-size,10px);line-height:14px;line-height:var(--index-bar-index-line-height,14px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/info/index.js b/miniprogram/miniprogram_npm/@vant/weapp/info/index.js
new file mode 100644
index 0000000..a08ad2c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/info/index.js
@@ -0,0 +1,10 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    dot: Boolean,
+    info: null,
+    customStyle: String,
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/info/index.json b/miniprogram/miniprogram_npm/@vant/weapp/info/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/info/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/info/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/info/index.wxml
new file mode 100644
index 0000000..3112dfc
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/info/index.wxml
@@ -0,0 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ info !== null && info !== '' || dot }}"
+  class="custom-class van-info {{ utils.bem('info', { dot }) }}"
+  style="{{ customStyle }}"
+>{{ dot ? '' : info }}</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/info/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/info/index.wxss
new file mode 100644
index 0000000..6d44b8e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/info/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif);line-height:14px;line-height:calc(var(--info-size, 16px) - var(--info-border-width, 1px)*2);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/loading/index.js b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.js
new file mode 100644
index 0000000..5aa2a81
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.js
@@ -0,0 +1,18 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    color: String,
+    vertical: Boolean,
+    type: {
+      type: String,
+      value: 'circular',
+    },
+    size: String,
+    textSize: String,
+  },
+  data: {
+    array12: Array.from({ length: 12 }),
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/loading/index.json b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxml
new file mode 100644
index 0000000..e934288
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxml
@@ -0,0 +1,18 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class van-loading {{ vertical ? 'van-loading--vertical' : '' }}">
+  <view
+    class="van-loading__spinner van-loading__spinner--{{ type }}"
+    style="color: {{ color }}; width: {{ utils.addUnit(size) }}; height: {{ utils.addUnit(size) }}"
+  >
+    <view
+      wx:if="{{ type === 'spinner' }}"
+      wx:for="{{ array12 }}"
+      wx:key="index"
+      class="van-loading__dot"
+    />
+  </view>
+  <view class="van-loading__text" style="font-size: {{ utils.addUnit(textSize) }};">
+    <slot />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxss
new file mode 100644
index 0000000..f28a6b4
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/loading/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';:host{font-size:0;line-height:1}.van-loading{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#c8c9cc;color:var(--loading-spinner-color,#c8c9cc)}.van-loading__spinner{position:relative;box-sizing:border-box;width:30px;width:var(--loading-spinner-size,30px);max-width:100%;max-height:100%;height:30px;height:var(--loading-spinner-size,30px);-webkit-animation:van-rotate .8s linear infinite;animation:van-rotate .8s linear infinite;-webkit-animation:van-rotate var(--loading-spinner-animation-duration,.8s) linear infinite;animation:van-rotate var(--loading-spinner-animation-duration,.8s) linear infinite}.van-loading__spinner--spinner{-webkit-animation-timing-function:steps(12);animation-timing-function:steps(12)}.van-loading__spinner--circular{border:1px solid transparent;border-top-color:initial;border-radius:100%}.van-loading__text{margin-left:8px;margin-left:var(--padding-xs,8px);color:#969799;color:var(--loading-text-color,#969799);font-size:14px;font-size:var(--loading-text-font-size,14px);line-height:20px;line-height:var(--loading-text-line-height,20px)}.van-loading__text:empty{display:none}.van-loading--vertical{-webkit-flex-direction:column;flex-direction:column}.van-loading--vertical .van-loading__text{margin:8px 0 0;margin:var(--padding-xs,8px) 0 0}.van-loading__dot{position:absolute;top:0;left:0;width:100%;height:100%}.van-loading__dot:before{display:block;width:2px;height:25%;margin:0 auto;background-color:currentColor;border-radius:40%;content:" "}.van-loading__dot:first-of-type{-webkit-transform:rotate(30deg);transform:rotate(30deg);opacity:1}.van-loading__dot:nth-of-type(2){-webkit-transform:rotate(60deg);transform:rotate(60deg);opacity:.9375}.van-loading__dot:nth-of-type(3){-webkit-transform:rotate(90deg);transform:rotate(90deg);opacity:.875}.van-loading__dot:nth-of-type(4){-webkit-transform:rotate(120deg);transform:rotate(120deg);opacity:.8125}.van-loading__dot:nth-of-type(5){-webkit-transform:rotate(150deg);transform:rotate(150deg);opacity:.75}.van-loading__dot:nth-of-type(6){-webkit-transform:rotate(180deg);transform:rotate(180deg);opacity:.6875}.van-loading__dot:nth-of-type(7){-webkit-transform:rotate(210deg);transform:rotate(210deg);opacity:.625}.van-loading__dot:nth-of-type(8){-webkit-transform:rotate(240deg);transform:rotate(240deg);opacity:.5625}.van-loading__dot:nth-of-type(9){-webkit-transform:rotate(270deg);transform:rotate(270deg);opacity:.5}.van-loading__dot:nth-of-type(10){-webkit-transform:rotate(300deg);transform:rotate(300deg);opacity:.4375}.van-loading__dot:nth-of-type(11){-webkit-transform:rotate(330deg);transform:rotate(330deg);opacity:.375}.van-loading__dot:nth-of-type(12){-webkit-transform:rotate(1turn);transform:rotate(1turn);opacity:.3125}@-webkit-keyframes van-rotate{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes van-rotate{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/mixins/basic.js b/miniprogram/miniprogram_npm/@vant/weapp/mixins/basic.js
new file mode 100644
index 0000000..2058c0b
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/mixins/basic.js
@@ -0,0 +1,37 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.basic = void 0;
+exports.basic = Behavior({
+  methods: {
+    $emit: function () {
+      var args = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+      }
+      this.triggerEvent.apply(this, args);
+    },
+    set: function (data, callback) {
+      this.setData(data, callback);
+      return new Promise(function (resolve) {
+        return wx.nextTick(resolve);
+      });
+    },
+    getRect: function (selector, all) {
+      var _this = this;
+      return new Promise(function (resolve) {
+        wx.createSelectorQuery()
+          .in(_this)
+          [all ? 'selectAll' : 'select'](selector)
+          .boundingClientRect(function (rect) {
+            if (all && Array.isArray(rect) && rect.length) {
+              resolve(rect);
+            }
+            if (!all && rect) {
+              resolve(rect);
+            }
+          })
+          .exec();
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/mixins/button.js b/miniprogram/miniprogram_npm/@vant/weapp/mixins/button.js
new file mode 100644
index 0000000..8de45e9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/mixins/button.js
@@ -0,0 +1,18 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.button = void 0;
+exports.button = Behavior({
+  externalClasses: ['hover-class'],
+  properties: {
+    id: String,
+    lang: String,
+    businessId: Number,
+    sessionFrom: String,
+    sendMessageTitle: String,
+    sendMessagePath: String,
+    sendMessageImg: String,
+    showMessageCard: Boolean,
+    appParameter: String,
+    ariaLabel: String,
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/mixins/link.js b/miniprogram/miniprogram_npm/@vant/weapp/mixins/link.js
new file mode 100644
index 0000000..cbd2745
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/mixins/link.js
@@ -0,0 +1,23 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.link = void 0;
+exports.link = Behavior({
+  properties: {
+    url: String,
+    linkType: {
+      type: String,
+      value: 'navigateTo',
+    },
+  },
+  methods: {
+    jumpLink: function (urlKey) {
+      if (urlKey === void 0) {
+        urlKey = 'url';
+      }
+      var url = this.data[urlKey];
+      if (url) {
+        wx[this.data.linkType]({ url: url });
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/mixins/open-type.js b/miniprogram/miniprogram_npm/@vant/weapp/mixins/open-type.js
new file mode 100644
index 0000000..a7edf77
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/mixins/open-type.js
@@ -0,0 +1,28 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.openType = void 0;
+exports.openType = Behavior({
+  properties: {
+    openType: String,
+  },
+  methods: {
+    bindGetUserInfo: function (event) {
+      this.$emit('getuserinfo', event.detail);
+    },
+    bindContact: function (event) {
+      this.$emit('contact', event.detail);
+    },
+    bindGetPhoneNumber: function (event) {
+      this.$emit('getphonenumber', event.detail);
+    },
+    bindError: function (event) {
+      this.$emit('error', event.detail);
+    },
+    bindLaunchApp: function (event) {
+      this.$emit('launchapp', event.detail);
+    },
+    bindOpenSetting: function (event) {
+      this.$emit('opensetting', event.detail);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/mixins/page-scroll.js b/miniprogram/miniprogram_npm/@vant/weapp/mixins/page-scroll.js
new file mode 100644
index 0000000..6c2a58b
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/mixins/page-scroll.js
@@ -0,0 +1,40 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.pageScrollMixin = void 0;
+function getCurrentPage() {
+  var pages = getCurrentPages();
+  return pages[pages.length - 1] || {};
+}
+function onPageScroll(event) {
+  var _a = getCurrentPage().vanPageScroller,
+    vanPageScroller = _a === void 0 ? [] : _a;
+  vanPageScroller.forEach(function (scroller) {
+    if (typeof scroller === 'function') {
+      scroller(event);
+    }
+  });
+}
+exports.pageScrollMixin = function (scroller) {
+  return Behavior({
+    attached: function () {
+      var page = getCurrentPage();
+      if (Array.isArray(page.vanPageScroller)) {
+        page.vanPageScroller.push(scroller.bind(this));
+      } else {
+        page.vanPageScroller =
+          typeof page.onPageScroll === 'function'
+            ? [page.onPageScroll.bind(page), scroller.bind(this)]
+            : [scroller.bind(this)];
+      }
+      page.onPageScroll = onPageScroll;
+    },
+    detached: function () {
+      var page = getCurrentPage();
+      page.vanPageScroller = (page.vanPageScroller || []).filter(function (
+        item
+      ) {
+        return item !== scroller;
+      });
+    },
+  });
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/mixins/touch.js b/miniprogram/miniprogram_npm/@vant/weapp/mixins/touch.js
new file mode 100644
index 0000000..8c3a145
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/mixins/touch.js
@@ -0,0 +1,39 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.touch = void 0;
+var MIN_DISTANCE = 10;
+function getDirection(x, y) {
+  if (x > y && x > MIN_DISTANCE) {
+    return 'horizontal';
+  }
+  if (y > x && y > MIN_DISTANCE) {
+    return 'vertical';
+  }
+  return '';
+}
+exports.touch = Behavior({
+  methods: {
+    resetTouchStatus: function () {
+      this.direction = '';
+      this.deltaX = 0;
+      this.deltaY = 0;
+      this.offsetX = 0;
+      this.offsetY = 0;
+    },
+    touchStart: function (event) {
+      this.resetTouchStatus();
+      var touch = event.touches[0];
+      this.startX = touch.clientX;
+      this.startY = touch.clientY;
+    },
+    touchMove: function (event) {
+      var touch = event.touches[0];
+      this.deltaX = touch.clientX - this.startX;
+      this.deltaY = touch.clientY - this.startY;
+      this.offsetX = Math.abs(this.deltaX);
+      this.offsetY = Math.abs(this.deltaY);
+      this.direction =
+        this.direction || getDirection(this.offsetX, this.offsetY);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/mixins/transition.js b/miniprogram/miniprogram_npm/@vant/weapp/mixins/transition.js
new file mode 100644
index 0000000..548a62c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/mixins/transition.js
@@ -0,0 +1,161 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.transition = void 0;
+var utils_1 = require('../common/utils');
+var getClassNames = function (name) {
+  return {
+    enter:
+      'van-' +
+      name +
+      '-enter van-' +
+      name +
+      '-enter-active enter-class enter-active-class',
+    'enter-to':
+      'van-' +
+      name +
+      '-enter-to van-' +
+      name +
+      '-enter-active enter-to-class enter-active-class',
+    leave:
+      'van-' +
+      name +
+      '-leave van-' +
+      name +
+      '-leave-active leave-class leave-active-class',
+    'leave-to':
+      'van-' +
+      name +
+      '-leave-to van-' +
+      name +
+      '-leave-active leave-to-class leave-active-class',
+  };
+};
+var nextTick = function () {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, 1000 / 30);
+  });
+};
+exports.transition = function (showDefaultValue) {
+  return Behavior({
+    properties: {
+      customStyle: String,
+      // @ts-ignore
+      show: {
+        type: Boolean,
+        value: showDefaultValue,
+        observer: 'observeShow',
+      },
+      // @ts-ignore
+      duration: {
+        type: null,
+        value: 300,
+        observer: 'observeDuration',
+      },
+      name: {
+        type: String,
+        value: 'fade',
+      },
+    },
+    data: {
+      type: '',
+      inited: false,
+      display: false,
+    },
+    methods: {
+      observeShow: function (value, old) {
+        if (value === old) {
+          return;
+        }
+        value ? this.enter() : this.leave();
+      },
+      enter: function () {
+        var _this = this;
+        var _a = this.data,
+          duration = _a.duration,
+          name = _a.name;
+        var classNames = getClassNames(name);
+        var currentDuration = utils_1.isObj(duration)
+          ? duration.enter
+          : duration;
+        this.status = 'enter';
+        this.$emit('before-enter');
+        Promise.resolve()
+          .then(nextTick)
+          .then(function () {
+            _this.checkStatus('enter');
+            _this.$emit('enter');
+            _this.setData({
+              inited: true,
+              display: true,
+              classes: classNames.enter,
+              currentDuration: currentDuration,
+            });
+          })
+          .then(nextTick)
+          .then(function () {
+            _this.checkStatus('enter');
+            _this.transitionEnded = false;
+            _this.setData({
+              classes: classNames['enter-to'],
+            });
+          })
+          .catch(function () {});
+      },
+      leave: function () {
+        var _this = this;
+        if (!this.data.display) {
+          return;
+        }
+        var _a = this.data,
+          duration = _a.duration,
+          name = _a.name;
+        var classNames = getClassNames(name);
+        var currentDuration = utils_1.isObj(duration)
+          ? duration.leave
+          : duration;
+        this.status = 'leave';
+        this.$emit('before-leave');
+        Promise.resolve()
+          .then(nextTick)
+          .then(function () {
+            _this.checkStatus('leave');
+            _this.$emit('leave');
+            _this.setData({
+              classes: classNames.leave,
+              currentDuration: currentDuration,
+            });
+          })
+          .then(nextTick)
+          .then(function () {
+            _this.checkStatus('leave');
+            _this.transitionEnded = false;
+            setTimeout(function () {
+              return _this.onTransitionEnd();
+            }, currentDuration);
+            _this.setData({
+              classes: classNames['leave-to'],
+            });
+          })
+          .catch(function () {});
+      },
+      checkStatus: function (status) {
+        if (status !== this.status) {
+          throw new Error('incongruent status: ' + status);
+        }
+      },
+      onTransitionEnd: function () {
+        if (this.transitionEnded) {
+          return;
+        }
+        this.transitionEnded = true;
+        this.$emit('after-' + this.status);
+        var _a = this.data,
+          show = _a.show,
+          display = _a.display;
+        if (!show && display) {
+          this.setData({ display: false });
+        }
+      },
+    },
+  });
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.js b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.js
new file mode 100644
index 0000000..fb4fd97
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.js
@@ -0,0 +1,75 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+component_1.VantComponent({
+  classes: ['title-class'],
+  props: {
+    title: String,
+    fixed: {
+      type: Boolean,
+      observer: 'setHeight',
+    },
+    placeholder: {
+      type: Boolean,
+      observer: 'setHeight',
+    },
+    leftText: String,
+    rightText: String,
+    customStyle: String,
+    leftArrow: Boolean,
+    border: {
+      type: Boolean,
+      value: true,
+    },
+    zIndex: {
+      type: Number,
+      value: 1,
+    },
+    safeAreaInsetTop: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    statusBarHeight: 0,
+    height: 44,
+    baseStyle: '',
+  },
+  created: function () {
+    var statusBarHeight = utils_1.getSystemInfoSync().statusBarHeight;
+    var _a = this.data,
+      safeAreaInsetTop = _a.safeAreaInsetTop,
+      zIndex = _a.zIndex;
+    var paddingTop = safeAreaInsetTop ? statusBarHeight : 0;
+    var baseStyle =
+      'z-index: ' + zIndex + ';padding-top: ' + paddingTop + 'px;';
+    this.setData({
+      statusBarHeight: statusBarHeight,
+      height: 44 + statusBarHeight,
+      baseStyle: baseStyle,
+    });
+  },
+  mounted: function () {
+    this.setHeight();
+  },
+  methods: {
+    onClickLeft: function () {
+      this.$emit('click-left');
+    },
+    onClickRight: function () {
+      this.$emit('click-right');
+    },
+    setHeight: function () {
+      var _this = this;
+      if (!this.data.fixed || !this.data.placeholder) {
+        return;
+      }
+      wx.nextTick(function () {
+        _this.getRect('.van-nav-bar').then(function (res) {
+          _this.setData({ height: res.height });
+        });
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.json b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxml
new file mode 100644
index 0000000..27ba8c9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxml
@@ -0,0 +1,41 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view wx:if="{{ fixed && placeholder }}" style="height: {{ height }}px;" />
+
+<view
+  class="{{ utils.bem('nav-bar', { fixed }) }} custom-class {{ border ? 'van-hairline--bottom' : '' }}"
+  style="{{ baseStyle }}"
+>
+  <view class="van-nav-bar__content" style="{{ customStyle }}">
+    <view class="van-nav-bar__left" bind:tap="onClickLeft">
+      <block wx:if="{{ leftArrow || leftText }}">
+        <van-icon
+          wx:if="{{ leftArrow }}"
+          size="16px"
+          name="arrow-left"
+          custom-class="van-nav-bar__arrow"
+        />
+        <view
+          wx:if="{{ leftText }}"
+          class="van-nav-bar__text"
+          hover-class="van-nav-bar__text--hover"
+          hover-stay-time="70"
+        >{{ leftText }}</view>
+      </block>
+      <slot wx:else name="left" />
+    </view>
+    <view class="van-nav-bar__title title-class van-ellipsis">
+      <block wx:if="{{ title }}">{{ title }}</block>
+      <slot wx:else name="title" />
+    </view>
+    <view class="van-nav-bar__right" bind:tap="onClickRight">
+      <view
+        wx:if="{{ rightText }}"
+        class="van-nav-bar__text"
+        hover-class="van-nav-bar__text--hover"
+        hover-stay-time="70"
+      >{{ rightText }}</view>
+      <slot wx:else name="right" />
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxss
new file mode 100644
index 0000000..a233128
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/nav-bar/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-nav-bar{text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar,.van-nav-bar__content{position:relative}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px;font-size:var(--nav-bar-arrow-size,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;top:0;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.js b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.js
new file mode 100644
index 0000000..ae1dc5c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.js
@@ -0,0 +1,140 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var FONT_COLOR = '#ed6a0c';
+var BG_COLOR = '#fffbe8';
+component_1.VantComponent({
+  props: {
+    text: {
+      type: String,
+      value: '',
+      observer: function () {
+        var _this = this;
+        wx.nextTick(function () {
+          _this.init();
+        });
+      },
+    },
+    mode: {
+      type: String,
+      value: '',
+    },
+    url: {
+      type: String,
+      value: '',
+    },
+    openType: {
+      type: String,
+      value: 'navigate',
+    },
+    delay: {
+      type: Number,
+      value: 1,
+    },
+    speed: {
+      type: Number,
+      value: 50,
+      observer: function () {
+        var _this = this;
+        wx.nextTick(function () {
+          _this.init();
+        });
+      },
+    },
+    scrollable: {
+      type: Boolean,
+      value: true,
+    },
+    leftIcon: {
+      type: String,
+      value: '',
+    },
+    color: {
+      type: String,
+      value: FONT_COLOR,
+    },
+    backgroundColor: {
+      type: String,
+      value: BG_COLOR,
+    },
+    wrapable: Boolean,
+  },
+  data: {
+    show: true,
+  },
+  created: function () {
+    this.resetAnimation = wx.createAnimation({
+      duration: 0,
+      timingFunction: 'linear',
+    });
+  },
+  destroyed: function () {
+    this.timer && clearTimeout(this.timer);
+  },
+  methods: {
+    init: function () {
+      var _this = this;
+      Promise.all([
+        this.getRect('.van-notice-bar__content'),
+        this.getRect('.van-notice-bar__wrap'),
+      ]).then(function (rects) {
+        var contentRect = rects[0],
+          wrapRect = rects[1];
+        if (
+          contentRect == null ||
+          wrapRect == null ||
+          !contentRect.width ||
+          !wrapRect.width
+        ) {
+          return;
+        }
+        var _a = _this.data,
+          speed = _a.speed,
+          scrollable = _a.scrollable,
+          delay = _a.delay;
+        if (scrollable && wrapRect.width < contentRect.width) {
+          var duration = (contentRect.width / speed) * 1000;
+          _this.wrapWidth = wrapRect.width;
+          _this.contentWidth = contentRect.width;
+          _this.duration = duration;
+          _this.animation = wx.createAnimation({
+            duration: duration,
+            timingFunction: 'linear',
+            delay: delay,
+          });
+          _this.scroll();
+        }
+      });
+    },
+    scroll: function () {
+      var _this = this;
+      this.timer && clearTimeout(this.timer);
+      this.timer = null;
+      this.setData({
+        animationData: this.resetAnimation
+          .translateX(this.wrapWidth)
+          .step()
+          .export(),
+      });
+      setTimeout(function () {
+        _this.setData({
+          animationData: _this.animation
+            .translateX(-_this.contentWidth)
+            .step()
+            .export(),
+        });
+      }, 20);
+      this.timer = setTimeout(function () {
+        _this.scroll();
+      }, this.duration);
+    },
+    onClickIcon: function () {
+      this.timer && clearTimeout(this.timer);
+      this.timer = null;
+      this.setData({ show: false });
+    },
+    onClick: function (event) {
+      this.$emit('click', event);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.json b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxml
new file mode 100644
index 0000000..eb0851c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxml
@@ -0,0 +1,37 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ show }}"
+  class="custom-class {{ utils.bem('notice-bar', { withicon: mode, wrapable }) }}"
+  style="color: {{ color }}; background-color: {{ backgroundColor }};"
+  bind:tap="onClick"
+>
+  <van-icon
+    wx:if="{{ leftIcon }}"
+    size="16px"
+    name="{{ leftIcon }}"
+    class="van-notice-bar__left-icon"
+  />
+  <slot wx:else name="left-icon" />
+
+  <view class="van-notice-bar__wrap">
+    <view class="van-notice-bar__content {{ !scrollable && !wrapable ? 'van-ellipsis' : '' }}" animation="{{ animationData }}">
+      {{ text }}
+    </view>
+  </view>
+
+  <van-icon
+    wx:if="{{ mode === 'closeable' }}"
+    class="van-notice-bar__right-icon"
+    name="cross"
+    catch:tap="onClickIcon"
+  />
+  <navigator
+    wx:elif="{{ mode === 'link' }}"
+    url="{{ url }}"
+    open-type="{{ openType }}"
+  >
+    <van-icon class="van-notice-bar__right-icon" name="arrow" />
+  </navigator>
+  <slot wx:else name="right-icon" />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxss
new file mode 100644
index 0000000..6a49858
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notice-bar/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-notice-bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:40px;height:var(--notice-bar-height,40px);padding:0 16px;padding:var(--notice-bar-padding,0 16px);font-size:14px;font-size:var(--notice-bar-font-size,14px);color:#ed6a0c;color:var(--notice-bar-text-color,#ed6a0c);line-height:24px;line-height:var(--notice-bar-line-height,24px);background-color:#fffbe8;background-color:var(--notice-bar-background-color,#fffbe8)}.van-notice-bar--withicon{position:relative;padding-right:40px}.van-notice-bar--wrapable{height:auto;padding:8px 16px;padding:var(--notice-bar-wrapable-padding,8px 16px)}.van-notice-bar--wrapable .van-notice-bar__wrap{height:auto}.van-notice-bar--wrapable .van-notice-bar__content{position:relative;white-space:normal}.van-notice-bar__left-icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;margin-right:4px;vertical-align:middle}.van-notice-bar__left-icon,.van-notice-bar__right-icon{font-size:16px;font-size:var(--notice-bar-icon-size,16px);min-width:22px;min-width:var(--notice-bar-icon-min-width,22px)}.van-notice-bar__right-icon{position:absolute;top:10px;right:15px}.van-notice-bar__wrap{position:relative;-webkit-flex:1;flex:1;overflow:hidden;height:24px;height:var(--notice-bar-line-height,24px)}.van-notice-bar__content{position:absolute;white-space:nowrap}.van-notice-bar__content.van-ellipsis{max-width:100%}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notify/index.js b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.js
new file mode 100644
index 0000000..69f9d2c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.js
@@ -0,0 +1,66 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var color_1 = require('../common/color');
+component_1.VantComponent({
+  props: {
+    message: String,
+    background: String,
+    type: {
+      type: String,
+      value: 'danger',
+    },
+    color: {
+      type: String,
+      value: color_1.WHITE,
+    },
+    duration: {
+      type: Number,
+      value: 3000,
+    },
+    zIndex: {
+      type: Number,
+      value: 110,
+    },
+    safeAreaInsetTop: {
+      type: Boolean,
+      value: false,
+    },
+    top: null,
+  },
+  data: {
+    show: false,
+  },
+  created: function () {
+    var statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
+    this.setData({ statusBarHeight: statusBarHeight });
+  },
+  methods: {
+    show: function () {
+      var _this = this;
+      var _a = this.data,
+        duration = _a.duration,
+        onOpened = _a.onOpened;
+      clearTimeout(this.timer);
+      this.setData({ show: true });
+      wx.nextTick(onOpened);
+      if (duration > 0 && duration !== Infinity) {
+        this.timer = setTimeout(function () {
+          _this.hide();
+        }, duration);
+      }
+    },
+    hide: function () {
+      var onClose = this.data.onClose;
+      clearTimeout(this.timer);
+      this.setData({ show: false });
+      wx.nextTick(onClose);
+    },
+    onTap: function (event) {
+      var onClick = this.data.onClick;
+      if (onClick) {
+        onClick(event.detail);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notify/index.json b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.json
new file mode 100644
index 0000000..c14a65f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-transition": "../transition/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxml
new file mode 100644
index 0000000..060d1ba
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxml
@@ -0,0 +1,20 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-transition
+  name="slide-down"
+  show="{{ show }}"
+  custom-class="van-notify__container"
+  custom-style="z-index: {{ zIndex }}; top: {{ utils.addUnit(top) }}"
+  bind:tap="onTap"
+>
+  <view
+    class="van-notify van-notify--{{ type }}"
+    style="background:{{ background }};color:{{ color }};"
+  >
+    <view
+      wx:if="{{ safeAreaInsetTop }}"
+      style="height: {{ statusBarHeight }}px"
+    />
+    <text>{{ message }}</text>
+  </view>
+</van-transition>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxss
new file mode 100644
index 0000000..3b4aba6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notify/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-notify{text-align:center;word-wrap:break-word;padding:6px 15px;padding:var(--notify-padding,6px 15px);font-size:14px;font-size:var(--notify-font-size,14px);line-height:20px;line-height:var(--notify-line-height,20px)}.van-notify__container{position:fixed;top:0;box-sizing:border-box;width:100%}.van-notify--primary{background-color:#1989fa;background-color:var(--notify-primary-background-color,#1989fa)}.van-notify--success{background-color:#07c160;background-color:var(--notify-success-background-color,#07c160)}.van-notify--danger{background-color:#ee0a24;background-color:var(--notify-danger-background-color,#ee0a24)}.van-notify--warning{background-color:#ff976a;background-color:var(--notify-warning-background-color,#ff976a)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/notify/notify.js b/miniprogram/miniprogram_npm/@vant/weapp/notify/notify.js
new file mode 100644
index 0000000..070cbfe
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/notify/notify.js
@@ -0,0 +1,61 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var color_1 = require('../common/color');
+var defaultOptions = {
+  selector: '#van-notify',
+  type: 'danger',
+  message: '',
+  background: '',
+  duration: 3000,
+  zIndex: 110,
+  top: 0,
+  color: color_1.WHITE,
+  safeAreaInsetTop: false,
+  onClick: function () {},
+  onOpened: function () {},
+  onClose: function () {},
+};
+function parseOptions(message) {
+  return typeof message === 'string' ? { message: message } : message;
+}
+function getContext() {
+  var pages = getCurrentPages();
+  return pages[pages.length - 1];
+}
+function Notify(options) {
+  options = __assign(__assign({}, defaultOptions), parseOptions(options));
+  var context = options.context || getContext();
+  var notify = context.selectComponent(options.selector);
+  delete options.context;
+  delete options.selector;
+  if (notify) {
+    notify.setData(options);
+    notify.show();
+    return notify;
+  }
+  console.warn('未找到 van-notify 节点，请确认 selector 及 context 是否正确');
+}
+exports.default = Notify;
+Notify.clear = function (options) {
+  options = __assign(__assign({}, defaultOptions), parseOptions(options));
+  var context = options.context || getContext();
+  var notify = context.selectComponent(options.selector);
+  if (notify) {
+    notify.hide();
+  }
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.js b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.js
new file mode 100644
index 0000000..a0e55eb
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.js
@@ -0,0 +1,24 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    show: Boolean,
+    customStyle: String,
+    duration: {
+      type: null,
+      value: 300,
+    },
+    zIndex: {
+      type: Number,
+      value: 1,
+    },
+  },
+  methods: {
+    onClick: function () {
+      this.$emit('click');
+    },
+    // for prevent touchmove
+    noop: function () {},
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.json b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.json
new file mode 100644
index 0000000..c14a65f
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-transition": "../transition/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxml
new file mode 100644
index 0000000..9212348
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxml
@@ -0,0 +1,10 @@
+<van-transition
+  show="{{ show }}"
+  custom-class="van-overlay"
+  custom-style="z-index: {{ zIndex }}; {{ customStyle }}"
+  duration="{{ duration }}"
+  bind:tap="onClick"
+  catch:touchmove="noop"
+>
+  <slot></slot>
+</van-transition>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxss
new file mode 100644
index 0000000..0f9df0e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/overlay/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-overlay{position:fixed;top:0;left:0;width:100%;height:100%;background-color:rgba(0,0,0,.7);background-color:var(--overlay-background-color,rgba(0,0,0,.7))}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/panel/index.js b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.js
new file mode 100644
index 0000000..64f3be5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.js
@@ -0,0 +1,12 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  classes: ['header-class', 'footer-class'],
+  props: {
+    desc: String,
+    title: String,
+    status: String,
+    useFooterSlot: Boolean,
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/panel/index.json b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.json
new file mode 100644
index 0000000..0e5425c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-cell": "../cell/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxml
new file mode 100644
index 0000000..3f135d2
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxml
@@ -0,0 +1,19 @@
+<view class="van-panel van-hairline--top-bottom custom-class">
+  <van-cell 
+    wx:if="{{ title || desc || status }}"
+    title="{{ title }}"
+    label="{{ desc }}"
+    value="{{ status }}"
+    custom-class="header-class"
+    value-class="van-panel__header-value"
+  />
+  <slot wx:else name="header" />
+
+  <view class="van-panel__content">
+    <slot />
+  </view>
+
+  <view wx:if="{{ useFooterSlot }}" class="van-panel__footer van-hairline--top footer-class">
+    <slot name="footer" />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxss
new file mode 100644
index 0000000..ffd9df9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/panel/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-panel{background:#fff;background:var(--panel-background-color,#fff)}.van-panel__header-value{color:#ee0a24;color:var(--panel-header-value-color,#ee0a24)}.van-panel__footer{padding:8px 16px;padding:var(--panel-footer-padding,8px 16px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.js b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.js
new file mode 100644
index 0000000..f7f5b93
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.js
@@ -0,0 +1,131 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+var DEFAULT_DURATION = 200;
+component_1.VantComponent({
+  classes: ['active-class'],
+  props: {
+    valueKey: String,
+    className: String,
+    itemHeight: Number,
+    visibleItemCount: Number,
+    initialOptions: {
+      type: Array,
+      value: [],
+    },
+    defaultIndex: {
+      type: Number,
+      value: 0,
+      observer: function (value) {
+        this.setIndex(value);
+      },
+    },
+  },
+  data: {
+    startY: 0,
+    offset: 0,
+    duration: 0,
+    startOffset: 0,
+    options: [],
+    currentIndex: 0,
+  },
+  created: function () {
+    var _this = this;
+    var _a = this.data,
+      defaultIndex = _a.defaultIndex,
+      initialOptions = _a.initialOptions;
+    this.set({
+      currentIndex: defaultIndex,
+      options: initialOptions,
+    }).then(function () {
+      _this.setIndex(defaultIndex);
+    });
+  },
+  methods: {
+    getCount: function () {
+      return this.data.options.length;
+    },
+    onTouchStart: function (event) {
+      this.setData({
+        startY: event.touches[0].clientY,
+        startOffset: this.data.offset,
+        duration: 0,
+      });
+    },
+    onTouchMove: function (event) {
+      var data = this.data;
+      var deltaY = event.touches[0].clientY - data.startY;
+      this.setData({
+        offset: utils_1.range(
+          data.startOffset + deltaY,
+          -(this.getCount() * data.itemHeight),
+          data.itemHeight
+        ),
+      });
+    },
+    onTouchEnd: function () {
+      var data = this.data;
+      if (data.offset !== data.startOffset) {
+        this.setData({ duration: DEFAULT_DURATION });
+        var index = utils_1.range(
+          Math.round(-data.offset / data.itemHeight),
+          0,
+          this.getCount() - 1
+        );
+        this.setIndex(index, true);
+      }
+    },
+    onClickItem: function (event) {
+      var index = event.currentTarget.dataset.index;
+      this.setIndex(index, true);
+    },
+    adjustIndex: function (index) {
+      var data = this.data;
+      var count = this.getCount();
+      index = utils_1.range(index, 0, count);
+      for (var i = index; i < count; i++) {
+        if (!this.isDisabled(data.options[i])) return i;
+      }
+      for (var i = index - 1; i >= 0; i--) {
+        if (!this.isDisabled(data.options[i])) return i;
+      }
+    },
+    isDisabled: function (option) {
+      return utils_1.isObj(option) && option.disabled;
+    },
+    getOptionText: function (option) {
+      var data = this.data;
+      return utils_1.isObj(option) && data.valueKey in option
+        ? option[data.valueKey]
+        : option;
+    },
+    setIndex: function (index, userAction) {
+      var _this = this;
+      var data = this.data;
+      index = this.adjustIndex(index) || 0;
+      var offset = -index * data.itemHeight;
+      if (index !== data.currentIndex) {
+        return this.set({ offset: offset, currentIndex: index }).then(
+          function () {
+            userAction && _this.$emit('change', index);
+          }
+        );
+      }
+      return this.set({ offset: offset });
+    },
+    setValue: function (value) {
+      var options = this.data.options;
+      for (var i = 0; i < options.length; i++) {
+        if (this.getOptionText(options[i]) === value) {
+          return this.setIndex(i);
+        }
+      }
+      return Promise.resolve();
+    },
+    getValue: function () {
+      var data = this.data;
+      return data.options[data.currentIndex];
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.json b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxml
new file mode 100644
index 0000000..f052ed9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxml
@@ -0,0 +1,22 @@
+<wxs src="./index.wxs" module="getOptionText" />
+
+<view
+  class="van-picker-column custom-class"
+  style="height: {{ itemHeight * visibleItemCount }}px"
+  bind:touchstart="onTouchStart"
+  catch:touchmove="onTouchMove"
+  bind:touchend="onTouchEnd"
+  bind:touchcancel="onTouchEnd"
+>
+  <view style="transition: transform {{ duration }}ms; line-height: {{ itemHeight }}px; transform: translate3d(0, {{ offset + (itemHeight * (visibleItemCount - 1)) / 2 }}px, 0)">
+    <view
+      wx:for="{{ options }}"
+      wx:for-item="option"
+      wx:key="index"
+      data-index="{{ index }}"
+      style="height: {{ itemHeight }}px"
+      class="van-ellipsis van-picker-column__item {{ option && option.disabled ? 'van-picker-column__item--disabled' : '' }} {{ index === currentIndex ? 'van-picker-column__item--selected active-class' : '' }}"
+      bindtap="onClickItem"
+    >{{ getOptionText(option, valueKey) }}</view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxs
new file mode 100644
index 0000000..3c8fc68
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxs
@@ -0,0 +1,8 @@
+function isObj(x) {
+  var type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+
+module.exports = function (option, valueKey) {
+  return isObj(option) && option[valueKey] != null ? option[valueKey] : option;
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxss
new file mode 100644
index 0000000..c5c6910
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker-column/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-picker-column{overflow:hidden;text-align:center;color:#000;color:var(--picker-option-text-color,#000);font-size:16px;font-size:var(--picker-option-font-size,16px)}.van-picker-column__item{padding:0 5px}.van-picker-column__item--selected{font-weight:500;font-weight:var(--font-weight-bold,500);color:#323233;color:var(--picker-option-selected-text-color,#323233)}.van-picker-column__item--disabled{opacity:.3;opacity:var(--picker-option-disabled-opacity,.3)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker/index.js b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.js
new file mode 100644
index 0000000..87b10ed
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.js
@@ -0,0 +1,175 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var shared_1 = require('./shared');
+component_1.VantComponent({
+  classes: ['active-class', 'toolbar-class', 'column-class'],
+  props: __assign(__assign({}, shared_1.pickerProps), {
+    valueKey: {
+      type: String,
+      value: 'text',
+    },
+    toolbarPosition: {
+      type: String,
+      value: 'top',
+    },
+    defaultIndex: {
+      type: Number,
+      value: 0,
+    },
+    columns: {
+      type: Array,
+      value: [],
+      observer: function (columns) {
+        if (columns === void 0) {
+          columns = [];
+        }
+        this.simple = columns.length && !columns[0].values;
+        this.children = this.selectAllComponents('.van-picker__column');
+        if (Array.isArray(this.children) && this.children.length) {
+          this.setColumns().catch(function () {});
+        }
+      },
+    },
+  }),
+  beforeCreate: function () {
+    this.children = [];
+  },
+  methods: {
+    noop: function () {},
+    setColumns: function () {
+      var _this = this;
+      var data = this.data;
+      var columns = this.simple ? [{ values: data.columns }] : data.columns;
+      var stack = columns.map(function (column, index) {
+        return _this.setColumnValues(index, column.values);
+      });
+      return Promise.all(stack);
+    },
+    emit: function (event) {
+      var type = event.currentTarget.dataset.type;
+      if (this.simple) {
+        this.$emit(type, {
+          value: this.getColumnValue(0),
+          index: this.getColumnIndex(0),
+        });
+      } else {
+        this.$emit(type, {
+          value: this.getValues(),
+          index: this.getIndexes(),
+        });
+      }
+    },
+    onChange: function (event) {
+      if (this.simple) {
+        this.$emit('change', {
+          picker: this,
+          value: this.getColumnValue(0),
+          index: this.getColumnIndex(0),
+        });
+      } else {
+        this.$emit('change', {
+          picker: this,
+          value: this.getValues(),
+          index: event.currentTarget.dataset.index,
+        });
+      }
+    },
+    // get column instance by index
+    getColumn: function (index) {
+      return this.children[index];
+    },
+    // get column value by index
+    getColumnValue: function (index) {
+      var column = this.getColumn(index);
+      return column && column.getValue();
+    },
+    // set column value by index
+    setColumnValue: function (index, value) {
+      var column = this.getColumn(index);
+      if (column == null) {
+        return Promise.reject(new Error('setColumnValue: 对应列不存在'));
+      }
+      return column.setValue(value);
+    },
+    // get column option index by column index
+    getColumnIndex: function (columnIndex) {
+      return (this.getColumn(columnIndex) || {}).data.currentIndex;
+    },
+    // set column option index by column index
+    setColumnIndex: function (columnIndex, optionIndex) {
+      var column = this.getColumn(columnIndex);
+      if (column == null) {
+        return Promise.reject(new Error('setColumnIndex: 对应列不存在'));
+      }
+      return column.setIndex(optionIndex);
+    },
+    // get options of column by index
+    getColumnValues: function (index) {
+      return (this.children[index] || {}).data.options;
+    },
+    // set options of column by index
+    setColumnValues: function (index, options, needReset) {
+      if (needReset === void 0) {
+        needReset = true;
+      }
+      var column = this.children[index];
+      if (column == null) {
+        return Promise.reject(new Error('setColumnValues: 对应列不存在'));
+      }
+      var isSame =
+        JSON.stringify(column.data.options) === JSON.stringify(options);
+      if (isSame) {
+        return Promise.resolve();
+      }
+      return column.set({ options: options }).then(function () {
+        if (needReset) {
+          column.setIndex(0);
+        }
+      });
+    },
+    // get values of all columns
+    getValues: function () {
+      return this.children.map(function (child) {
+        return child.getValue();
+      });
+    },
+    // set values of all columns
+    setValues: function (values) {
+      var _this = this;
+      var stack = values.map(function (value, index) {
+        return _this.setColumnValue(index, value);
+      });
+      return Promise.all(stack);
+    },
+    // get indexes of all columns
+    getIndexes: function () {
+      return this.children.map(function (child) {
+        return child.data.currentIndex;
+      });
+    },
+    // set indexes of all columns
+    setIndexes: function (indexes) {
+      var _this = this;
+      var stack = indexes.map(function (optionIndex, columnIndex) {
+        return _this.setColumnIndex(columnIndex, optionIndex);
+      });
+      return Promise.all(stack);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker/index.json b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.json
new file mode 100644
index 0000000..2fcec89
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "picker-column": "../picker-column/index",
+    "loading": "../loading/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxml
new file mode 100644
index 0000000..519adb5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxml
@@ -0,0 +1,41 @@
+<import src="./toolbar.wxml" />
+
+<view class="van-picker custom-class">
+  <template is="toolbar" wx:if="{{ toolbarPosition === 'top' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
+  <view wx:if="{{ loading }}" class="van-picker__loading">
+    <loading color="#1989fa"/>
+  </view>
+  <view
+    class="van-picker__columns"
+    style="height: {{ itemHeight * visibleItemCount }}px"
+    catch:touchmove="noop"
+  >
+    <picker-column
+      class="van-picker__column"
+      wx:for="{{ isSimple(columns) ? [columns] : columns }}"
+      wx:key="index"
+      data-index="{{ index }}"
+      custom-class="column-class"
+      value-key="{{ valueKey }}"
+      initial-options="{{ isSimple(columns) ? item : item.values }}"
+      default-index="{{ item.defaultIndex || defaultIndex }}"
+      item-height="{{ itemHeight }}"
+      visible-item-count="{{ visibleItemCount }}"
+      active-class="active-class"
+      bind:change="onChange"
+    />
+    <view class="van-picker__mask" style="background-size: 100% {{ (itemHeight * visibleItemCount - itemHeight) / 2 }}px" />
+    <view
+      class="van-picker__frame van-hairline--top-bottom"
+      style="height: {{ itemHeight }}px"
+    />
+  </view>
+  <template is="toolbar" wx:if="{{ toolbarPosition === 'bottom' }}" data="{{ showToolbar, cancelButtonText, title, confirmButtonText }}"></template>
+</view>
+
+<wxs module="isSimple">
+  function isSimple(columns) {
+    return columns.length && !columns[0].values;
+  }
+  module.exports = isSimple;
+</wxs>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxss
new file mode 100644
index 0000000..784c2b0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-picker{position:relative;overflow:hidden;-webkit-text-size-adjust:100%;-webkit-user-select:none;user-select:none;background-color:#fff;background-color:var(--picker-background-color,#fff)}.van-picker__toolbar{display:-webkit-flex;display:flex;-webkit-justify-content:space-between;justify-content:space-between;height:44px;height:var(--picker-toolbar-height,44px);line-height:44px;line-height:var(--picker-toolbar-height,44px)}.van-picker__cancel,.van-picker__confirm{padding:0 16px;padding:var(--picker-action-padding,0 16px);font-size:14px;font-size:var(--picker-action-font-size,14px);color:#1989fa;color:var(--picker-action-text-color,#1989fa)}.van-picker__cancel--hover,.van-picker__confirm--hover{background-color:#f2f3f5;background-color:var(--picker-action-active-color,#f2f3f5)}.van-picker__title{max-width:50%;text-align:center;font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--picker-option-font-size,16px)}.van-picker__columns{position:relative;display:-webkit-flex;display:flex}.van-picker__column{-webkit-flex:1 1;flex:1 1;width:0}.van-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:4;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;background-color:hsla(0,0%,100%,.9);background-color:var(--picker-loading-mask-color,hsla(0,0%,100%,.9))}.van-picker__mask{position:absolute;top:0;left:0;z-index:2;width:100%;height:100%;background-image:linear-gradient(180deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),linear-gradient(0deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-repeat:no-repeat;background-position:top,bottom;-webkit-backface-visibility:hidden;backface-visibility:hidden;pointer-events:none}.van-picker__frame,.van-picker__loading .van-loading{position:absolute;top:50%;left:0;z-index:1;width:100%;-webkit-transform:translateY(-50%);transform:translateY(-50%);pointer-events:none}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker/shared.js b/miniprogram/miniprogram_npm/@vant/weapp/picker/shared.js
new file mode 100644
index 0000000..4081f54
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker/shared.js
@@ -0,0 +1,24 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.pickerProps = void 0;
+exports.pickerProps = {
+  title: String,
+  loading: Boolean,
+  showToolbar: Boolean,
+  cancelButtonText: {
+    type: String,
+    value: '取消',
+  },
+  confirmButtonText: {
+    type: String,
+    value: '确认',
+  },
+  visibleItemCount: {
+    type: Number,
+    value: 5,
+  },
+  itemHeight: {
+    type: Number,
+    value: 44,
+  },
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/picker/toolbar.wxml b/miniprogram/miniprogram_npm/@vant/weapp/picker/toolbar.wxml
new file mode 100644
index 0000000..4fa9db5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/picker/toolbar.wxml
@@ -0,0 +1,28 @@
+<template name="toolbar">
+  <view
+    wx:if="{{ showToolbar }}"
+    class="van-picker__toolbar van-hairline--top-bottom toolbar-class"
+  >
+    <view
+      class="van-picker__cancel"
+      hover-class="van-picker__cancel--hover"
+      hover-stay-time="70"
+      data-type="cancel"
+      bindtap="emit"
+    >
+      {{ cancelButtonText }}
+    </view>
+    <view wx:if="{{ title }}" class="van-picker__title van-ellipsis">{{
+      title
+    }}</view>
+    <view
+      class="van-picker__confirm"
+      hover-class="van-picker__confirm--hover"
+      hover-stay-time="70"
+      data-type="confirm"
+      bindtap="emit"
+    >
+      {{ confirmButtonText }}
+    </view>
+  </view>
+</template>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/popup/index.js b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.js
new file mode 100644
index 0000000..1c4e6d1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.js
@@ -0,0 +1,85 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var transition_1 = require('../mixins/transition');
+component_1.VantComponent({
+  classes: [
+    'enter-class',
+    'enter-active-class',
+    'enter-to-class',
+    'leave-class',
+    'leave-active-class',
+    'leave-to-class',
+    'close-icon-class',
+  ],
+  mixins: [transition_1.transition(false)],
+  props: {
+    round: Boolean,
+    closeable: Boolean,
+    customStyle: String,
+    overlayStyle: String,
+    transition: {
+      type: String,
+      observer: 'observeClass',
+    },
+    zIndex: {
+      type: Number,
+      value: 100,
+    },
+    overlay: {
+      type: Boolean,
+      value: true,
+    },
+    closeIcon: {
+      type: String,
+      value: 'cross',
+    },
+    closeIconPosition: {
+      type: String,
+      value: 'top-right',
+    },
+    closeOnClickOverlay: {
+      type: Boolean,
+      value: true,
+    },
+    position: {
+      type: String,
+      value: 'center',
+      observer: 'observeClass',
+    },
+    safeAreaInsetBottom: {
+      type: Boolean,
+      value: true,
+    },
+    safeAreaInsetTop: {
+      type: Boolean,
+      value: false,
+    },
+  },
+  created: function () {
+    this.observeClass();
+  },
+  methods: {
+    onClickCloseIcon: function () {
+      this.$emit('close');
+    },
+    onClickOverlay: function () {
+      this.$emit('click-overlay');
+      if (this.data.closeOnClickOverlay) {
+        this.$emit('close');
+      }
+    },
+    observeClass: function () {
+      var _a = this.data,
+        transition = _a.transition,
+        position = _a.position;
+      var updateData = {
+        name: transition || position,
+      };
+      if (transition === 'none') {
+        updateData.duration = 0;
+      }
+      this.setData(updateData);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/popup/index.json b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.json
new file mode 100644
index 0000000..88a6eab
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-overlay": "../overlay/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxml
new file mode 100644
index 0000000..9b41e5c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxml
@@ -0,0 +1,24 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<van-overlay
+  wx:if="{{ overlay }}"
+  show="{{ show }}"
+  z-index="{{ zIndex }}"
+  custom-style="{{ overlayStyle }}"
+  duration="{{ duration }}"
+  bind:click="onClickOverlay"
+/>
+<view
+  wx:if="{{ inited }}"
+  class="custom-class {{ classes }} {{ utils.bem('popup', [position, { round, safe: safeAreaInsetBottom, safeTop: safeAreaInsetTop }]) }}"
+  style="z-index: {{ zIndex }}; -webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }};{{ customStyle }}"
+  bind:transitionend="onTransitionEnd"
+>
+  <slot />
+  <van-icon
+    wx:if="{{ closeable }}"
+    name="{{ closeIcon }}"
+    class="close-icon-class van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
+    bind:tap="onClickCloseIcon"
+  />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxss
new file mode 100644
index 0000000..6e477ac
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/popup/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-popup{position:fixed;box-sizing:border-box;max-height:100%;overflow-y:auto;transition-timing-function:ease;-webkit-animation:ease both;animation:ease both;-webkit-overflow-scrolling:touch;background-color:#fff;background-color:var(--popup-background-color,#fff)}.van-popup--center{top:50%;left:50%;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-popup--center.van-popup--round{border-radius:20px;border-radius:var(--popup-round-border-radius,20px)}.van-popup--top{top:0;left:0;width:100%}.van-popup--top.van-popup--round{border-radius:0 0 20px 20px;border-radius:0 0 var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px)}.van-popup--right{top:50%;right:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:20px 0 0 20px;border-radius:var(--popup-round-border-radius,20px) 0 0 var(--popup-round-border-radius,20px)}.van-popup--bottom{bottom:0;left:0;width:100%}.van-popup--bottom.van-popup--round{border-radius:20px 20px 0 0;border-radius:var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px) 0 0}.van-popup--left{top:50%;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 20px 20px 0;border-radius:0 var(--popup-round-border-radius,20px) var(--popup-round-border-radius,20px) 0}.van-popup--bottom.van-popup--safe{padding-bottom:env(safe-area-inset-bottom)}.van-popup--safeTop{padding-top:env(safe-area-inset-top)}.van-popup__close-icon{position:absolute;z-index:1;z-index:var(--popup-close-icon-z-index,1);color:#969799;color:var(--popup-close-icon-color,#969799);font-size:18px;font-size:var(--popup-close-icon-size,18px)}.van-popup__close-icon--top-left{top:16px;top:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--top-right{top:16px;top:var(--popup-close-icon-margin,16px);right:16px;right:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-left{bottom:16px;bottom:var(--popup-close-icon-margin,16px);left:16px;left:var(--popup-close-icon-margin,16px)}.van-popup__close-icon--bottom-right{right:16px;right:var(--popup-close-icon-margin,16px);bottom:16px;bottom:var(--popup-close-icon-margin,16px)}.van-popup__close-icon:active{opacity:.6}.van-scale-enter-active,.van-scale-leave-active{transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform}.van-scale-enter,.van-scale-leave-to{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.van-fade-enter-active,.van-fade-leave-active{transition-property:opacity}.van-fade-enter,.van-fade-leave-to{opacity:0}.van-center-enter-active,.van-center-leave-active{transition-property:opacity}.van-center-enter,.van-center-leave-to{opacity:0}.van-bottom-enter-active,.van-bottom-leave-active,.van-left-enter-active,.van-left-leave-active,.van-right-enter-active,.van-right-leave-active,.van-top-enter-active,.van-top-leave-active{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-bottom-enter,.van-bottom-leave-to{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.van-top-enter,.van-top-leave-to{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}.van-left-enter,.van-left-leave-to{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.van-right-enter,.van-right-leave-to{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/progress/index.js b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.js
new file mode 100644
index 0000000..c56efb7
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.js
@@ -0,0 +1,29 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var color_1 = require('../common/color');
+component_1.VantComponent({
+  props: {
+    inactive: Boolean,
+    percentage: Number,
+    pivotText: String,
+    pivotColor: String,
+    trackColor: String,
+    showPivot: {
+      type: Boolean,
+      value: true,
+    },
+    color: {
+      type: String,
+      value: color_1.BLUE,
+    },
+    textColor: {
+      type: String,
+      value: '#fff',
+    },
+    strokeWidth: {
+      type: null,
+      value: 4,
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/progress/index.json b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxml
new file mode 100644
index 0000000..e5981f0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxml
@@ -0,0 +1,20 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="getters" />
+
+<view
+  class="van-progress custom-class"
+  style="height: {{ utils.addUnit(strokeWidth) }}; {{ trackColor ? 'background: ' + trackColor : '' }}"
+>
+  <view
+    class="van-progress__portion"
+    style="width: {{ percentage }}%; background: {{ inactive ? '#cacaca' : color }}"
+  >
+    <view
+      wx:if="{{ showPivot && getters.text(pivotText, percentage) }}"
+      style="color: {{ textColor }}; background: {{ pivotColor ? pivotColor : inactive ? '#cacaca' : color }}"
+      class="van-progress__pivot"
+    >
+      {{ getters.text(pivotText, percentage) }}
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxs
new file mode 100644
index 0000000..d685345
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxs
@@ -0,0 +1,5 @@
+module.exports = {
+  text: function(pivotText, percentage) {
+    return pivotText || percentage + '%';
+  }
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxss
new file mode 100644
index 0000000..33c62c7
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/progress/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-progress{position:relative;height:4px;height:var(--progress-height,4px);border-radius:4px;border-radius:var(--progress-height,4px);background:#ebedf0;background:var(--progress-background-color,#ebedf0)}.van-progress__portion{position:absolute;left:0;height:100%;border-radius:inherit;background:#1989fa;background:var(--progress-color,#1989fa)}.van-progress__pivot{position:absolute;top:50%;right:0;box-sizing:border-box;min-width:2em;text-align:center;word-break:keep-all;border-radius:1em;-webkit-transform:translateY(-50%);transform:translateY(-50%);color:#fff;color:var(--progress-pivot-text-color,#fff);padding:0 5px;padding:var(--progress-pivot-padding,0 5px);font-size:10px;font-size:var(--progress-pivot-font-size,10px);line-height:1.6;line-height:var(--progress-pivot-line-height,1.6);background-color:#1989fa;background-color:var(--progress-pivot-background-color,#1989fa)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.js b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.js
new file mode 100644
index 0000000..78629da
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.js
@@ -0,0 +1,41 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  field: true,
+  relation: {
+    name: 'radio',
+    type: 'descendant',
+    current: 'radio-group',
+    linked: function (target) {
+      this.updateChild(target);
+    },
+  },
+  props: {
+    value: {
+      type: null,
+      observer: 'updateChildren',
+    },
+    disabled: {
+      type: Boolean,
+      observer: 'updateChildren',
+    },
+  },
+  methods: {
+    updateChildren: function () {
+      var _this = this;
+      (this.children || []).forEach(function (child) {
+        return _this.updateChild(child);
+      });
+    },
+    updateChild: function (child) {
+      var _a = this.data,
+        value = _a.value,
+        disabled = _a.disabled;
+      child.setData({
+        value: value,
+        disabled: disabled || child.data.disabled,
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.json b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxml
new file mode 100644
index 0000000..4fa864c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxml
@@ -0,0 +1 @@
+<slot />
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxss
new file mode 100644
index 0000000..99694d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio-group/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio/index.js b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.js
new file mode 100644
index 0000000..4133c8d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.js
@@ -0,0 +1,53 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  field: true,
+  relation: {
+    name: 'radio-group',
+    type: 'ancestor',
+    current: 'radio',
+  },
+  classes: ['icon-class', 'label-class'],
+  props: {
+    name: null,
+    value: null,
+    disabled: Boolean,
+    useIconSlot: Boolean,
+    checkedColor: String,
+    labelPosition: {
+      type: String,
+      value: 'right',
+    },
+    labelDisabled: Boolean,
+    shape: {
+      type: String,
+      value: 'round',
+    },
+    iconSize: {
+      type: null,
+      value: 20,
+    },
+  },
+  methods: {
+    emitChange: function (value) {
+      var instance = this.parent || this;
+      instance.$emit('input', value);
+      instance.$emit('change', value);
+    },
+    onChange: function () {
+      if (!this.data.disabled) {
+        this.emitChange(this.data.name);
+      }
+    },
+    onClickLabel: function () {
+      var _a = this.data,
+        disabled = _a.disabled,
+        labelDisabled = _a.labelDisabled,
+        name = _a.name;
+      if (!disabled && !labelDisabled) {
+        this.emitChange(name);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio/index.json b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxml
new file mode 100644
index 0000000..0b748ef
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxml
@@ -0,0 +1,29 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-radio custom-class">
+  <view
+    wx:if="{{ labelPosition === 'left' }}"
+    class="label-class {{ utils.bem('radio__label', [labelPosition, { disabled }]) }}"
+    bindtap="onClickLabel"
+  >
+    <slot />
+  </view>
+  <view class="van-radio__icon-wrap" style="font-size: {{ utils.addUnit(iconSize) }};" bindtap="onChange">
+    <slot wx:if="{{ useIconSlot }}" name="icon" />
+    <van-icon
+      wx:else
+      name="success"
+      class="{{ utils.bem('radio__icon', [shape, { disabled, checked: value === name }]) }}"
+      style="font-size: {{ utils.addUnit(iconSize) }};{{ checkedColor && !disabled && value === name ? 'border-color:' + checkedColor + '; background-color:' + checkedColor + ';' : '' }}"
+      custom-class="icon-class"
+      custom-style="line-height: {{ utils.addUnit(iconSize) }};font-size: .8em;display: block;"
+    />
+  </view>
+  <view
+    wx:if="{{ labelPosition === 'right' }}"
+    class="label-class {{ utils.bem('radio__label', [labelPosition, { disabled }]) }}"
+    bindtap="onClickLabel"
+  >
+    <slot />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxss
new file mode 100644
index 0000000..96c81f0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/radio/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-radio{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{-webkit-flex:none;flex:none}.van-radio__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;border:1px solid #c8c9cc;border:1px solid var(--radio-border-color,#c8c9cc);font-size:20px;font-size:var(--radio-size,20px);transition-duration:.2s;transition-duration:var(--radio-transition-duration,.2s)}.van-radio__icon--round{border-radius:100%}.van-radio__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--radio-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--radio-checked-icon-color,#1989fa)}.van-radio__icon--disabled{background-color:#ebedf0;background-color:var(--radio-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__icon--disabled.van-radio__icon--checked{color:#c8c9cc;color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__label{word-wrap:break-word;margin-left:10px;margin-left:var(--radio-label-margin,10px);color:#323233;color:var(--radio-label-color,#323233);line-height:20px;line-height:var(--radio-size,20px)}.van-radio__label--left{float:left;margin:0 10px 0 0;margin:0 var(--radio-label-margin,10px) 0 0}.van-radio__label--disabled{color:#c8c9cc;color:var(--radio-disabled-label-color,#c8c9cc)}.van-radio__label:empty{margin:0}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/rate/index.js b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.js
new file mode 100644
index 0000000..39f06ff
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.js
@@ -0,0 +1,110 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var version_1 = require('../common/version');
+component_1.VantComponent({
+  field: true,
+  classes: ['icon-class'],
+  props: {
+    value: {
+      type: Number,
+      observer: function (value) {
+        if (value !== this.data.innerValue) {
+          this.setData({ innerValue: value });
+        }
+      },
+    },
+    readonly: Boolean,
+    disabled: Boolean,
+    allowHalf: Boolean,
+    size: null,
+    icon: {
+      type: String,
+      value: 'star',
+    },
+    voidIcon: {
+      type: String,
+      value: 'star-o',
+    },
+    color: {
+      type: String,
+      value: '#ffd21e',
+    },
+    voidColor: {
+      type: String,
+      value: '#c7c7c7',
+    },
+    disabledColor: {
+      type: String,
+      value: '#bdbdbd',
+    },
+    count: {
+      type: Number,
+      value: 5,
+      observer: function (value) {
+        this.setData({ innerCountArray: Array.from({ length: value }) });
+      },
+    },
+    gutter: null,
+    touchable: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    innerValue: 0,
+    innerCountArray: Array.from({ length: 5 }),
+  },
+  methods: {
+    onSelect: function (event) {
+      var _this = this;
+      var data = this.data;
+      var score = event.currentTarget.dataset.score;
+      if (!data.disabled && !data.readonly) {
+        this.setData({ innerValue: score + 1 });
+        if (version_1.canIUseModel()) {
+          this.setData({ value: score + 1 });
+        }
+        wx.nextTick(function () {
+          _this.$emit('input', score + 1);
+          _this.$emit('change', score + 1);
+        });
+      }
+    },
+    onTouchMove: function (event) {
+      var _this = this;
+      var touchable = this.data.touchable;
+      if (!touchable) return;
+      var clientX = event.touches[0].clientX;
+      this.getRect('.van-rate__icon', true).then(function (list) {
+        var target = list
+          .sort(function (item) {
+            return item.right - item.left;
+          })
+          .find(function (item) {
+            return clientX >= item.left && clientX <= item.right;
+          });
+        if (target != null) {
+          _this.onSelect(
+            __assign(__assign({}, event), { currentTarget: target })
+          );
+        }
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/rate/index.json b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxml
new file mode 100644
index 0000000..58eee5c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxml
@@ -0,0 +1,34 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="van-rate custom-class"
+  bind:touchmove="onTouchMove"
+>
+  <view
+    class="van-rate__item"
+    wx:for="{{ innerCountArray }}"
+    wx:key="index"
+    style="padding-right: {{ index !== count - 1 ? utils.addUnit(gutter) : '' }}"
+  >
+    <van-icon
+      name="{{ index + 1 <= innerValue ? icon : voidIcon }}"
+      class="van-rate__icon"
+      style="font-size: {{ utils.addUnit(size) }}"
+      custom-class="icon-class"
+      data-score="{{ index }}"
+      color="{{ disabled ? disabledColor : index + 1 <= innerValue ? color : voidColor }}"
+      bind:click="onSelect"
+    />
+
+    <van-icon
+      wx:if="{{ allowHalf }}"
+      name="{{ index + 0.5 <= innerValue ? icon : voidIcon }}"
+      class="{{ utils.bem('rate__icon', ['half']) }}"
+      style="font-size: {{ utils.addUnit(size) }}"
+      custom-class="icon-class"
+      data-score="{{ index - 0.5 }}"
+      color="{{ disabled ? disabledColor : index + 0.5 <= innerValue ? color : voidColor }}"
+      bind:click="onSelect"
+    />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxss
new file mode 100644
index 0000000..6fd3435
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/rate/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-rate{display:-webkit-inline-flex;display:inline-flex;-webkit-user-select:none;user-select:none}.van-rate__item{position:relative;padding:0 2px;padding:0 var(--rate-horizontal-padding,2px)}.van-rate__icon{display:block;height:1em;font-size:20px;font-size:var(--rate-icon-size,20px)}.van-rate__icon--half{position:absolute;top:0;width:.5em;overflow:hidden;left:2px;left:var(--rate-horizontal-padding,2px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/row/index.js b/miniprogram/miniprogram_npm/@vant/weapp/row/index.js
new file mode 100644
index 0000000..613462a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/row/index.js
@@ -0,0 +1,43 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    name: 'col',
+    type: 'descendant',
+    current: 'row',
+    linked: function (target) {
+      if (this.data.gutter) {
+        target.setGutter(this.data.gutter);
+      }
+    },
+  },
+  props: {
+    gutter: {
+      type: Number,
+      observer: 'setGutter',
+    },
+  },
+  data: {
+    viewStyle: '',
+  },
+  mounted: function () {
+    if (this.data.gutter) {
+      this.setGutter();
+    }
+  },
+  methods: {
+    setGutter: function () {
+      var _this = this;
+      var gutter = this.data.gutter;
+      var margin = '-' + Number(gutter) / 2 + 'px';
+      var viewStyle = gutter
+        ? 'margin-right: ' + margin + '; margin-left: ' + margin + ';'
+        : '';
+      this.setData({ viewStyle: viewStyle });
+      this.getRelationNodes('../col/index').forEach(function (col) {
+        col.setGutter(_this.data.gutter);
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/row/index.json b/miniprogram/miniprogram_npm/@vant/weapp/row/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/row/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/row/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/row/index.wxml
new file mode 100644
index 0000000..ab8fcf5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/row/index.wxml
@@ -0,0 +1,3 @@
+<view class="custom-class van-row" style="{{ viewStyle }}">
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/row/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/row/index.wxss
new file mode 100644
index 0000000..32a098b
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/row/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-row:after{display:table;clear:both;content:""}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/search/index.js b/miniprogram/miniprogram_npm/@vant/weapp/search/index.js
new file mode 100644
index 0000000..2e61ab9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/search/index.js
@@ -0,0 +1,81 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var version_1 = require('../common/version');
+component_1.VantComponent({
+  field: true,
+  classes: ['field-class', 'input-class', 'cancel-class'],
+  props: {
+    label: String,
+    focus: Boolean,
+    error: Boolean,
+    disabled: Boolean,
+    readonly: Boolean,
+    inputAlign: String,
+    showAction: Boolean,
+    useActionSlot: Boolean,
+    useLeftIconSlot: Boolean,
+    useRightIconSlot: Boolean,
+    leftIcon: {
+      type: String,
+      value: 'search',
+    },
+    rightIcon: String,
+    placeholder: String,
+    placeholderStyle: String,
+    actionText: {
+      type: String,
+      value: '取消',
+    },
+    background: {
+      type: String,
+      value: '#ffffff',
+    },
+    maxlength: {
+      type: Number,
+      value: -1,
+    },
+    shape: {
+      type: String,
+      value: 'square',
+    },
+    clearable: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    onChange: function (event) {
+      if (version_1.canIUseModel()) {
+        this.setData({ value: event.detail });
+      }
+      this.$emit('change', event.detail);
+    },
+    onCancel: function () {
+      var _this = this;
+      /**
+       * 修复修改输入框值时，输入框失焦和赋值同时触发，赋值失效
+       * https://github.com/youzan/@vant/weapp/issues/1768
+       */
+      setTimeout(function () {
+        if (version_1.canIUseModel()) {
+          _this.setData({ value: '' });
+        }
+        _this.$emit('cancel');
+        _this.$emit('change', '');
+      }, 200);
+    },
+    onSearch: function (event) {
+      this.$emit('search', event.detail);
+    },
+    onFocus: function (event) {
+      this.$emit('focus', event.detail);
+    },
+    onBlur: function (event) {
+      this.$emit('blur', event.detail);
+    },
+    onClear: function (event) {
+      this.$emit('clear', event.detail);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/search/index.json b/miniprogram/miniprogram_npm/@vant/weapp/search/index.json
new file mode 100644
index 0000000..b4cfe91
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/search/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-field": "../field/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/search/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/search/index.wxml
new file mode 100644
index 0000000..1d0e6f1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/search/index.wxml
@@ -0,0 +1,50 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="{{ utils.bem('search', { withaction: showAction || useActionSlot }) }} custom-class"
+  style="background: {{ background }}"
+>
+  <view class="{{ utils.bem('search__content', [shape]) }}">
+    <view class="van-search__label" wx:if="{{ label }}">{{ label }}</view>
+    <slot wx:else name="label" />
+
+    <van-field
+      type="search"
+      left-icon="{{ !useLeftIconSlot ? leftIcon : '' }}"
+      right-icon="{{ !useRightIconSlot ? rightIcon : '' }}"
+      focus="{{ focus }}"
+      error="{{ error }}"
+      border="{{ false }}"
+      confirm-type="search"
+      class="van-search__field field-class"
+      value="{{ value }}"
+      disabled="{{ disabled }}"
+      readonly="{{ readonly }}"
+      clearable="{{ clearable }}"
+      maxlength="{{ maxlength }}"
+      input-align="{{ inputAlign }}"
+      input-class="input-class"
+      placeholder="{{ placeholder }}"
+      placeholder-style="{{ placeholderStyle }}"
+      custom-style="padding: 5px 10px 5px 0; background-color: transparent;"
+      bind:blur="onBlur"
+      bind:focus="onFocus"
+      bind:change="onChange"
+      bind:confirm="onSearch"
+      bind:clear="onClear"
+    >
+      <slot wx:if="{{ useLeftIconSlot }}" name="left-icon" slot="left-icon" />
+      <slot wx:if="{{ useRightIconSlot }}" name="right-icon" slot="right-icon" />
+    </van-field>
+  </view>
+
+  <view
+    wx:if="{{ showAction || useActionSlot }}"
+    class="van-search__action"
+    hover-class="van-search__action--hover"
+    hover-stay-time="70"
+  >
+    <slot wx:if="{{ useActionSlot }}" name="action" />
+    <view wx:else bind:tap="onCancel" class="cancel-class">{{ actionText }}</view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/search/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/search/index.wxss
new file mode 100644
index 0000000..32247c5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/search/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-search{-webkit-align-items:center;align-items:center;box-sizing:border-box;padding:10px 12px;padding:var(--search-padding,10px 12px)}.van-search,.van-search__content{display:-webkit-flex;display:flex}.van-search__content{-webkit-flex:1;flex:1;padding-left:8px;padding-left:var(--padding-xs,8px);border-radius:2px;border-radius:var(--border-radius-sm,2px);background-color:#f7f8fa;background-color:var(--search-background-color,#f7f8fa)}.van-search__content--round{border-radius:17px;border-radius:calc(var(--search-input-height, 34px)/2)}.van-search__label{padding:0 5px;padding:var(--search-label-padding,0 5px);font-size:14px;font-size:var(--search-label-font-size,14px);line-height:34px;line-height:var(--search-input-height,34px);color:#323233;color:var(--search-label-color,#323233)}.van-search__field{-webkit-flex:1;flex:1}.van-search__field__left-icon{color:#969799;color:var(--search-left-icon-color,#969799)}.van-search--withaction{padding-right:0}.van-search__action{padding:0 8px;padding:var(--search-action-padding,0 8px);font-size:14px;font-size:var(--search-action-font-size,14px);line-height:34px;line-height:var(--search-input-height,34px);color:#323233;color:var(--search-action-text-color,#323233)}.van-search__action--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.js b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.js
new file mode 100644
index 0000000..0cf035b
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.js
@@ -0,0 +1,34 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  classes: ['active-class', 'disabled-class'],
+  relation: {
+    type: 'ancestor',
+    name: 'sidebar',
+    current: 'sidebar-item',
+  },
+  props: {
+    dot: Boolean,
+    info: null,
+    title: String,
+    disabled: Boolean,
+  },
+  methods: {
+    onClick: function () {
+      var _this = this;
+      var parent = this.parent;
+      if (!parent || this.data.disabled) {
+        return;
+      }
+      var index = parent.children.indexOf(this);
+      parent.setActive(index).then(function () {
+        _this.$emit('click', index);
+        parent.$emit('change', index);
+      });
+    },
+    setActive: function (selected) {
+      return this.setData({ selected: selected });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.json b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.json
new file mode 100644
index 0000000..bf0ebe0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxml
new file mode 100644
index 0000000..ab8c6c4
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxml
@@ -0,0 +1,19 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="{{ utils.bem('sidebar-item', { selected, disabled }) }} {{ selected ? 'active-class' : '' }} {{ disabled ? 'disabled-class' : '' }} custom-class"
+  hover-class="van-sidebar-item--hover"
+  hover-stay-time="70"
+  bind:tap="onClick"
+>
+  <view class="van-sidebar-item__text">
+    <van-info
+      wx:if="{{ info !== null || dot }}"
+      dot="{{ dot }}"
+      info="{{ info }}"
+      custom-style="right: 4px"
+    />
+    <view wx:if="{{ title }}">{{ title }}</view>
+    <slot wx:else name="title" />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxss
new file mode 100644
index 0000000..308dc9c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar-item/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-sidebar-item{display:block;box-sizing:border-box;overflow:hidden;word-wrap:break-word;border-left:3px solid transparent;-webkit-user-select:none;user-select:none;padding:20px 12px 20px 8px;padding:var(--sidebar-padding,20px 12px 20px 8px);font-size:14px;font-size:var(--sidebar-font-size,14px);line-height:20px;line-height:var(--sidebar-line-height,20px);color:#323233;color:var(--sidebar-text-color,#323233);background-color:#f7f8fa;background-color:var(--sidebar-background-color,#f7f8fa)}.van-sidebar-item__text{position:relative;display:inline-block}.van-sidebar-item--hover:not(.van-sidebar-item--disabled){background-color:#f2f3f5;background-color:var(--sidebar-active-color,#f2f3f5)}.van-sidebar-item:after{border-bottom-width:1px}.van-sidebar-item--selected{color:#323233;color:var(--sidebar-selected-text-color,#323233);font-weight:500;font-weight:var(--sidebar-selected-font-weight,500);border-color:#ee0a24;border-color:var(--sidebar-selected-border-color,#ee0a24)}.van-sidebar-item--selected:after{border-right-width:1px}.van-sidebar-item--selected,.van-sidebar-item--selected.van-sidebar-item--hover{background-color:#fff;background-color:var(--sidebar-selected-background-color,#fff)}.van-sidebar-item--disabled{color:#c8c9cc;color:var(--sidebar-disabled-text-color,#c8c9cc)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.js b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.js
new file mode 100644
index 0000000..97a3080
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.js
@@ -0,0 +1,45 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    name: 'sidebar-item',
+    type: 'descendant',
+    current: 'sidebar',
+    linked: function () {
+      this.setActive(this.data.activeKey);
+    },
+    unlinked: function () {
+      this.setActive(this.data.activeKey);
+    },
+  },
+  props: {
+    activeKey: {
+      type: Number,
+      value: 0,
+      observer: 'setActive',
+    },
+  },
+  beforeCreate: function () {
+    this.currentActive = -1;
+  },
+  methods: {
+    setActive: function (activeKey) {
+      var _a = this,
+        children = _a.children,
+        currentActive = _a.currentActive;
+      if (!children.length) {
+        return Promise.resolve();
+      }
+      this.currentActive = activeKey;
+      var stack = [];
+      if (currentActive !== activeKey && children[currentActive]) {
+        stack.push(children[currentActive].setActive(false));
+      }
+      if (children[activeKey]) {
+        stack.push(children[activeKey].setActive(true));
+      }
+      return Promise.all(stack);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.json b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxml
new file mode 100644
index 0000000..96b11c7
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxml
@@ -0,0 +1,3 @@
+<view class="van-sidebar custom-class">
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxss
new file mode 100644
index 0000000..ba3ba94
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sidebar/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-sidebar{width:85px;width:var(--sidebar-width,85px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.js b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.js
new file mode 100644
index 0000000..52137fa
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.js
@@ -0,0 +1,48 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  classes: ['avatar-class', 'title-class', 'row-class'],
+  props: {
+    row: {
+      type: Number,
+      value: 0,
+      observer: function (value) {
+        this.setData({ rowArray: Array.from({ length: value }) });
+      },
+    },
+    title: Boolean,
+    avatar: Boolean,
+    loading: {
+      type: Boolean,
+      value: true,
+    },
+    animate: {
+      type: Boolean,
+      value: true,
+    },
+    avatarSize: {
+      type: String,
+      value: '32px',
+    },
+    avatarShape: {
+      type: String,
+      value: 'round',
+    },
+    titleWidth: {
+      type: String,
+      value: '40%',
+    },
+    rowWidth: {
+      type: null,
+      value: '100%',
+      observer: function (val) {
+        this.setData({ isArray: val instanceof Array });
+      },
+    },
+  },
+  data: {
+    isArray: false,
+    rowArray: [],
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.json b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.json
new file mode 100644
index 0000000..a89ef4d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxml
new file mode 100644
index 0000000..058e2ef
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxml
@@ -0,0 +1,29 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  wx:if="{{ loading }}"
+  class="custom-class {{ utils.bem('skeleton', [{animate}]) }}"
+>
+  <view
+    wx:if="{{ avatar }}"
+    class="avatar-class {{ utils.bem('skeleton__avatar', [avatarShape])}}"
+    style="{{ 'width:' + avatarSize + ';height:' + avatarSize }}"
+  />
+  <view class="{{ utils.bem('skeleton__content')}}">
+    <view
+      wx:if="{{ title }}"
+      class="title-class {{ utils.bem('skeleton__title') }}"
+      style="{{ 'width:' + titleWidth }}"
+    />
+    <view
+      wx:for="{{ rowArray }}"
+      wx:key="index"
+      wx:for-index="index"
+      class="row-class {{ utils.bem('skeleton__row') }}"
+      style="{{ 'width:' + (isArray ? rowWidth[index] : rowWidth) }}"
+    />
+  </view>
+</view>
+<view wx:else class="{{ utils.bem('skeleton__content')}}">
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxss
new file mode 100644
index 0000000..565b26e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/skeleton/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-skeleton{display:-webkit-flex;display:flex;box-sizing:border-box;width:100%;padding:0 16px;padding:var(--skeleton-padding,0 16px)}.van-skeleton__avatar{-webkit-flex-shrink:0;flex-shrink:0;margin-right:16px;margin-right:var(--padding-md,16px);background-color:#f2f3f5;background-color:var(--skeleton-avatar-background-color,#f2f3f5)}.van-skeleton__avatar--round{border-radius:100%}.van-skeleton__content{-webkit-flex:1;flex:1}.van-skeleton__avatar+.van-skeleton__content{padding-top:8px;padding-top:var(--padding-xs,8px)}.van-skeleton__row,.van-skeleton__title{height:16px;height:var(--skeleton-row-height,16px);background-color:#f2f3f5;background-color:var(--skeleton-row-background-color,#f2f3f5)}.van-skeleton__title{margin:0}.van-skeleton__row:not(:first-child){margin-top:12px;margin-top:var(--skeleton-row-margin-top,12px)}.van-skeleton__title+.van-skeleton__row{margin-top:20px}.van-skeleton--animate{-webkit-animation:van-skeleton-blink 1.2s ease-in-out infinite;animation:van-skeleton-blink 1.2s ease-in-out infinite}@-webkit-keyframes van-skeleton-blink{50%{opacity:.6}}@keyframes van-skeleton-blink{50%{opacity:.6}}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/slider/index.js b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.js
new file mode 100644
index 0000000..f945c10
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.js
@@ -0,0 +1,113 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var touch_1 = require('../mixins/touch');
+var version_1 = require('../common/version');
+component_1.VantComponent({
+  mixins: [touch_1.touch],
+  props: {
+    disabled: Boolean,
+    useButtonSlot: Boolean,
+    activeColor: String,
+    inactiveColor: String,
+    max: {
+      type: Number,
+      value: 100,
+    },
+    min: {
+      type: Number,
+      value: 0,
+    },
+    step: {
+      type: Number,
+      value: 1,
+    },
+    value: {
+      type: Number,
+      value: 0,
+      observer: 'updateValue',
+    },
+    barHeight: {
+      type: null,
+      value: '2px',
+    },
+  },
+  created: function () {
+    this.updateValue(this.data.value);
+  },
+  methods: {
+    onTouchStart: function (event) {
+      if (this.data.disabled) return;
+      this.touchStart(event);
+      this.startValue = this.format(this.data.value);
+      this.dragStatus = 'start';
+    },
+    onTouchMove: function (event) {
+      var _this = this;
+      if (this.data.disabled) return;
+      if (this.dragStatus === 'start') {
+        this.$emit('drag-start');
+      }
+      this.touchMove(event);
+      this.dragStatus = 'draging';
+      this.getRect('.van-slider').then(function (rect) {
+        var diff = (_this.deltaX / rect.width) * 100;
+        _this.newValue = _this.startValue + diff;
+        _this.updateValue(_this.newValue, false, true);
+      });
+    },
+    onTouchEnd: function () {
+      if (this.data.disabled) return;
+      if (this.dragStatus === 'draging') {
+        this.updateValue(this.newValue, true);
+        this.$emit('drag-end');
+      }
+    },
+    onClick: function (event) {
+      var _this = this;
+      if (this.data.disabled) return;
+      var min = this.data.min;
+      this.getRect('.van-slider').then(function (rect) {
+        var value =
+          ((event.detail.x - rect.left) / rect.width) * _this.getRange() + min;
+        _this.updateValue(value, true);
+      });
+    },
+    updateValue: function (value, end, drag) {
+      value = this.format(value);
+      var min = this.data.min;
+      var width = ((value - min) * 100) / this.getRange() + '%';
+      this.setData({
+        value: value,
+        barStyle:
+          '\n          width: ' +
+          width +
+          ';\n          ' +
+          (drag ? 'transition: none;' : '') +
+          '\n        ',
+      });
+      if (drag) {
+        this.$emit('drag', { value: value });
+      }
+      if (end) {
+        this.$emit('change', value);
+      }
+      if ((drag || end) && version_1.canIUseModel()) {
+        this.setData({ value: value });
+      }
+    },
+    getRange: function () {
+      var _a = this.data,
+        max = _a.max,
+        min = _a.min;
+      return max - min;
+    },
+    format: function (value) {
+      var _a = this.data,
+        max = _a.max,
+        min = _a.min,
+        step = _a.step;
+      return Math.round(Math.max(min, Math.min(value, max)) / step) * step;
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/slider/index.json b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxml
new file mode 100644
index 0000000..6a430f3
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxml
@@ -0,0 +1,30 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<view
+  class="custom-class {{ utils.bem('slider', { disabled }) }}"
+  style="{{ inactiveColor ? 'background:' + inactiveColor : '' }}"
+  bind:tap="onClick"
+>
+  <view
+    class="van-slider__bar"
+    style="{{ barStyle }};{{ computed.barStyle(barHeight, activeColor) }}"
+  >
+    <view
+      class="van-slider__button-wrapper"
+      bind:touchstart="onTouchStart"
+      catch:touchmove="onTouchMove"
+      bind:touchend="onTouchEnd"
+      bind:touchcancel="onTouchEnd"
+    >
+      <slot
+        wx:if="{{ useButtonSlot }}"
+        name="button"
+      />
+      <view
+        wx:else
+        class="van-slider__button"
+      />
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxs
new file mode 100644
index 0000000..d6404d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxs
@@ -0,0 +1,20 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function barStyle(barHeight, activeColor) {
+  var styles = [['height', utils.addUnit(barHeight)]];
+
+  if (activeColor) {
+    styles.push(['background', activeColor]);
+  }
+
+  return styles
+    .map(function (item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  barStyle: barStyle,
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxss
new file mode 100644
index 0000000..7886b60
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/slider/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-slider{position:relative;border-radius:999px;border-radius:var(--border-radius-max,999px);background-color:#ebedf0;background-color:var(--slider-inactive-background-color,#ebedf0)}.van-slider:before{position:absolute;right:0;left:0;content:"";top:-8px;top:-var(--padding-xs,8px);bottom:-8px;bottom:-var(--padding-xs,8px)}.van-slider__bar{position:relative;border-radius:inherit;transition:width .2s;transition:width var(--animation-duration-fast,.2s);background-color:#1989fa;background-color:var(--slider-active-background-color,#1989fa)}.van-slider__button{width:24px;height:24px;border-radius:50%;box-shadow:0 1px 2px rgba(0,0,0,.5);background-color:#fff;background-color:var(--slider-button-background-color,#fff)}.van-slider__button-wrapper{position:absolute;top:50%;right:0;-webkit-transform:translate3d(50%,-50%,0);transform:translate3d(50%,-50%,0)}.van-slider--disabled{opacity:.5}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.js b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.js
new file mode 100644
index 0000000..41c2486
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.js
@@ -0,0 +1,214 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('../common/utils');
+var LONG_PRESS_START_TIME = 600;
+var LONG_PRESS_INTERVAL = 200;
+// add num and avoid float number
+function add(num1, num2) {
+  var cardinal = Math.pow(10, 10);
+  return Math.round((num1 + num2) * cardinal) / cardinal;
+}
+function equal(value1, value2) {
+  return String(value1) === String(value2);
+}
+component_1.VantComponent({
+  field: true,
+  classes: ['input-class', 'plus-class', 'minus-class'],
+  props: {
+    value: {
+      type: null,
+      observer: function (value) {
+        if (!equal(value, this.data.currentValue)) {
+          this.setData({ currentValue: this.format(value) });
+        }
+      },
+    },
+    integer: {
+      type: Boolean,
+      observer: 'check',
+    },
+    disabled: Boolean,
+    inputWidth: null,
+    buttonSize: null,
+    asyncChange: Boolean,
+    disableInput: Boolean,
+    decimalLength: {
+      type: Number,
+      value: null,
+      observer: 'check',
+    },
+    min: {
+      type: null,
+      value: 1,
+      observer: 'check',
+    },
+    max: {
+      type: null,
+      value: Number.MAX_SAFE_INTEGER,
+      observer: 'check',
+    },
+    step: {
+      type: null,
+      value: 1,
+    },
+    showPlus: {
+      type: Boolean,
+      value: true,
+    },
+    showMinus: {
+      type: Boolean,
+      value: true,
+    },
+    disablePlus: Boolean,
+    disableMinus: Boolean,
+    longPress: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    currentValue: '',
+  },
+  created: function () {
+    this.setData({
+      currentValue: this.format(this.data.value),
+    });
+  },
+  methods: {
+    check: function () {
+      var val = this.format(this.data.currentValue);
+      if (!equal(val, this.data.currentValue)) {
+        this.setData({ currentValue: val });
+      }
+    },
+    isDisabled: function (type) {
+      if (type === 'plus') {
+        return (
+          this.data.disabled ||
+          this.data.disablePlus ||
+          this.data.currentValue >= this.data.max
+        );
+      }
+      return (
+        this.data.disabled ||
+        this.data.disableMinus ||
+        this.data.currentValue <= this.data.min
+      );
+    },
+    onFocus: function (event) {
+      this.$emit('focus', event.detail);
+    },
+    onBlur: function (event) {
+      var value = this.format(event.detail.value);
+      this.emitChange(value);
+      this.$emit(
+        'blur',
+        __assign(__assign({}, event.detail), { value: value })
+      );
+    },
+    // filter illegal characters
+    filter: function (value) {
+      value = String(value).replace(/[^0-9.-]/g, '');
+      if (this.data.integer && value.indexOf('.') !== -1) {
+        value = value.split('.')[0];
+      }
+      return value;
+    },
+    // limit value range
+    format: function (value) {
+      value = this.filter(value);
+      // format range
+      value = value === '' ? 0 : +value;
+      value = Math.max(Math.min(this.data.max, value), this.data.min);
+      // format decimal
+      if (utils_1.isDef(this.data.decimalLength)) {
+        value = value.toFixed(this.data.decimalLength);
+      }
+      return value;
+    },
+    onInput: function (event) {
+      var _a = (event.detail || {}).value,
+        value = _a === void 0 ? '' : _a;
+      // allow input to be empty
+      if (value === '') {
+        return;
+      }
+      var formatted = this.filter(value);
+      // limit max decimal length
+      if (
+        utils_1.isDef(this.data.decimalLength) &&
+        formatted.indexOf('.') !== -1
+      ) {
+        var pair = formatted.split('.');
+        formatted = pair[0] + '.' + pair[1].slice(0, this.data.decimalLength);
+      }
+      this.emitChange(formatted);
+    },
+    emitChange: function (value) {
+      if (!this.data.asyncChange) {
+        this.setData({ currentValue: value });
+      }
+      this.$emit('change', value);
+    },
+    onChange: function () {
+      var type = this.type;
+      if (this.isDisabled(type)) {
+        this.$emit('overlimit', type);
+        return;
+      }
+      var diff = type === 'minus' ? -this.data.step : +this.data.step;
+      var value = this.format(add(+this.data.currentValue, diff));
+      this.emitChange(value);
+      this.$emit(type);
+    },
+    longPressStep: function () {
+      var _this = this;
+      this.longPressTimer = setTimeout(function () {
+        _this.onChange();
+        _this.longPressStep();
+      }, LONG_PRESS_INTERVAL);
+    },
+    onTap: function (event) {
+      var type = event.currentTarget.dataset.type;
+      this.type = type;
+      this.onChange();
+    },
+    onTouchStart: function (event) {
+      var _this = this;
+      if (!this.data.longPress) {
+        return;
+      }
+      clearTimeout(this.longPressTimer);
+      var type = event.currentTarget.dataset.type;
+      this.type = type;
+      this.isLongPress = false;
+      this.longPressTimer = setTimeout(function () {
+        _this.isLongPress = true;
+        _this.onChange();
+        _this.longPressStep();
+      }, LONG_PRESS_START_TIME);
+    },
+    onTouchEnd: function () {
+      if (!this.data.longPress) {
+        return;
+      }
+      clearTimeout(this.longPressTimer);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.json b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxml
new file mode 100644
index 0000000..9570420
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxml
@@ -0,0 +1,37 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-stepper custom-class">
+  <view
+    wx:if="{{ showMinus }}"
+    data-type="minus"
+    style="width: {{ utils.addUnit(buttonSize) }}; height: {{ utils.addUnit(buttonSize) }}"
+    class="minus-class {{ utils.bem('stepper__minus', { disabled: disabled || disableMinus || currentValue <= min }) }}"
+    hover-class="van-stepper__minus--hover"
+    hover-stay-time="70"
+    bind:tap="onTap"
+    bind:touchstart="onTouchStart"
+    bind:touchend="onTouchEnd"
+  />
+  <input
+    type="{{ integer ? 'number' : 'digit' }}"
+    class="input-class {{ utils.bem('stepper__input', { disabled: disabled || disableInput }) }}"
+    style="width: {{ utils.addUnit(inputWidth) }}; height: {{ utils.addUnit(buttonSize) }}"
+    value="{{ currentValue }}"
+    focus="{{ focus }}"
+    disabled="{{ disabled || disableInput }}"
+    bindinput="onInput"
+    bind:focus="onFocus"
+    bind:blur="onBlur"
+  />
+  <view
+    wx:if="{{ showPlus }}"
+    data-type="plus"
+    style="width: {{ utils.addUnit(buttonSize) }}; height: {{ utils.addUnit(buttonSize) }}"
+    class="plus-class {{ utils.bem('stepper__plus', { disabled: disabled || disablePlus || currentValue >= max }) }}"
+    hover-class="van-stepper__plus--hover"
+    hover-stay-time="70"
+    bind:tap="onTap"
+    bind:touchstart="onTouchStart"
+    bind:touchend="onTouchEnd"
+  />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxss
new file mode 100644
index 0000000..5da5b79
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/stepper/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-stepper{font-size:0}.van-stepper__minus,.van-stepper__plus{position:relative;display:inline-block;box-sizing:border-box;margin:1px;vertical-align:middle;border:0;background-color:#f2f3f5;background-color:var(--stepper-background-color,#f2f3f5);color:#323233;color:var(--stepper-button-icon-color,#323233);width:28px;width:var(--stepper-input-height,28px);height:28px;height:var(--stepper-input-height,28px);padding:4px;padding:var(--padding-base,4px)}.van-stepper__minus:before,.van-stepper__plus:before{width:9px;height:1px}.van-stepper__minus:after,.van-stepper__plus:after{width:1px;height:9px}.van-stepper__minus:after,.van-stepper__minus:before,.van-stepper__plus:after,.van-stepper__plus:before{position:absolute;top:0;right:0;bottom:0;left:0;margin:auto;background-color:currentColor;content:""}.van-stepper__minus--hover,.van-stepper__plus--hover{background-color:#e8e8e8;background-color:var(--stepper-active-color,#e8e8e8)}.van-stepper__minus--disabled,.van-stepper__plus--disabled{color:#c8c9cc;color:var(--stepper-button-disabled-icon-color,#c8c9cc)}.van-stepper__minus--disabled,.van-stepper__minus--disabled.van-stepper__minus--hover,.van-stepper__minus--disabled.van-stepper__plus--hover,.van-stepper__plus--disabled,.van-stepper__plus--disabled.van-stepper__minus--hover,.van-stepper__plus--disabled.van-stepper__plus--hover{background-color:#f7f8fa;background-color:var(--stepper-button-disabled-color,#f7f8fa)}.van-stepper__minus{border-radius:4px 0 0 4px;border-radius:var(--stepper-border-radius,4px) 0 0 var(--stepper-border-radius,4px)}.van-stepper__minus:after{display:none}.van-stepper__plus{border-radius:0 4px 4px 0;border-radius:0 var(--stepper-border-radius,4px) var(--stepper-border-radius,4px) 0}.van-stepper__input{display:inline-block;box-sizing:border-box;min-height:0;margin:1px;padding:1px;text-align:center;vertical-align:middle;border:0;border-width:1px 0;border-radius:0;-webkit-appearance:none;font-size:14px;font-size:var(--stepper-input-font-size,14px);color:#323233;color:var(--stepper-input-text-color,#323233);background-color:#f2f3f5;background-color:var(--stepper-background-color,#f2f3f5);width:32px;width:var(--stepper-input-width,32px);height:28px;height:var(--stepper-input-height,28px)}.van-stepper__input--disabled{color:#c8c9cc;color:var(--stepper-input-disabled-text-color,#c8c9cc);background-color:#f2f3f5;background-color:var(--stepper-input-disabled-background-color,#f2f3f5)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/steps/index.js b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.js
new file mode 100644
index 0000000..c41e5ad
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.js
@@ -0,0 +1,35 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var color_1 = require('../common/color');
+component_1.VantComponent({
+  classes: ['desc-class'],
+  props: {
+    icon: String,
+    steps: Array,
+    active: Number,
+    direction: {
+      type: String,
+      value: 'horizontal',
+    },
+    activeColor: {
+      type: String,
+      value: color_1.GREEN,
+    },
+    inactiveColor: {
+      type: String,
+      value: color_1.GRAY_DARK,
+    },
+    activeIcon: {
+      type: String,
+      value: 'checked',
+    },
+    inactiveIcon: String,
+  },
+  methods: {
+    onClick: function (event) {
+      var index = event.currentTarget.dataset.index;
+      this.$emit('click-step', index);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/steps/index.json b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxml
new file mode 100644
index 0000000..6180b41
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxml
@@ -0,0 +1,54 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class {{ utils.bem('steps', [direction]) }}">
+  <view class="van-step__wrapper">
+    <view
+      wx:for="{{ steps }}"
+      wx:key="index"
+      bindtap="onClick"
+      data-index="{{ index }}"
+      class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
+      style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
+    >
+      <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
+        <view>{{ item.text }}</view>
+        <view class="desc-class">{{ item.desc }}</view>
+      </view>
+      <view class="van-step__circle-container">
+        <block wx:if="{{ index !== active }}">
+          <van-icon
+            wx:if="{{ item.inactiveIcon || inactiveIcon }}"
+            color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}"
+            name="{{ item.inactiveIcon || inactiveIcon }}"
+            custom-class="van-step__icon"
+          />
+          <view
+            wx:else
+            class="van-step__circle"
+            style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
+          />
+        </block>
+
+        <van-icon wx:else name="{{ item.activeIcon || activeIcon }}" color="{{ activeColor }}" custom-class="van-step__icon" />
+      </view>
+      <view
+        wx:if="{{ index !== steps.length - 1 }}"
+        class="van-step__line" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
+      />
+    </view>
+  </view>
+</view>
+
+<wxs module="status">
+function get(index, active) {
+  if (index < active) {
+    return 'finish';
+  } else if (index === active) {
+    return 'process';
+  }
+
+  return 'inactive';
+}
+
+module.exports = get;
+</wxs>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxss
new file mode 100644
index 0000000..2c50b1a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-steps{overflow:hidden;background-color:#fff;background-color:var(--steps-background-color,#fff)}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{position:relative;display:-webkit-flex;display:flex;overflow:hidden}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{position:relative;-webkit-flex:1;flex:1;font-size:14px;font-size:var(--step-font-size,14px);color:#969799;color:var(--step-text-color,#969799)}.van-step--finish{color:#323233;color:var(--step-finish-text-color,#323233)}.van-step__circle{border-radius:50%;width:5px;width:var(--step-circle-size,5px);height:5px;height:var(--step-circle-size,5px);background-color:#969799;background-color:var(--step-circle-color,#969799)}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{text-align:right;-webkit-transform:none;transform:none}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0);background-color:#fff;background-color:var(--white,#fff);padding:0 8px;padding:0 var(--padding-xs,8px)}.van-step--horizontal .van-step__title{display:inline-block;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);font-size:12px;font-size:var(--step-horizontal-title-font-size,12px)}.van-step--horizontal .van-step__line{position:absolute;right:0;bottom:6px;left:0;height:1px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}.van-step--horizontal.van-step--process{color:#323233;color:var(--step-process-text-color,#323233)}.van-step--horizontal.van-step--process .van-step__icon{display:block;line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical{padding:10px 10px 10px 0;line-height:18px}.van-step--vertical:after{border-bottom-width:1px}.van-step--vertical:last-child:after{border-bottom-width:none}.van-step--vertical:first-child:before{position:absolute;top:0;left:-15px;z-index:1;width:1px;height:20px;content:"";background-color:#fff;background-color:var(--white,#fff)}.van-step--vertical .van-step__circle,.van-step--vertical .van-step__icon,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__icon{line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.js b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.js
new file mode 100644
index 0000000..11d0c07
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.js
@@ -0,0 +1,119 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var page_scroll_1 = require('../mixins/page-scroll');
+var ROOT_ELEMENT = '.van-sticky';
+component_1.VantComponent({
+  props: {
+    zIndex: {
+      type: Number,
+      value: 99,
+    },
+    offsetTop: {
+      type: Number,
+      value: 0,
+      observer: 'onScroll',
+    },
+    disabled: {
+      type: Boolean,
+      observer: 'onScroll',
+    },
+    container: {
+      type: null,
+      observer: 'onScroll',
+    },
+    scrollTop: {
+      type: null,
+      observer: function (val) {
+        this.onScroll({ scrollTop: val });
+      },
+    },
+  },
+  mixins: [
+    page_scroll_1.pageScrollMixin(function (event) {
+      if (this.data.scrollTop != null) {
+        return;
+      }
+      this.onScroll(event);
+    }),
+  ],
+  data: {
+    height: 0,
+    fixed: false,
+    transform: 0,
+  },
+  mounted: function () {
+    this.onScroll();
+  },
+  methods: {
+    onScroll: function (_a) {
+      var _this = this;
+      var scrollTop = (_a === void 0 ? {} : _a).scrollTop;
+      var _b = this.data,
+        container = _b.container,
+        offsetTop = _b.offsetTop,
+        disabled = _b.disabled;
+      if (disabled) {
+        this.setDataAfterDiff({
+          fixed: false,
+          transform: 0,
+        });
+        return;
+      }
+      this.scrollTop = scrollTop || this.scrollTop;
+      if (typeof container === 'function') {
+        Promise.all([this.getRect(ROOT_ELEMENT), this.getContainerRect()]).then(
+          function (_a) {
+            var root = _a[0],
+              container = _a[1];
+            if (offsetTop + root.height > container.height + container.top) {
+              _this.setDataAfterDiff({
+                fixed: false,
+                transform: container.height - root.height,
+              });
+            } else if (offsetTop >= root.top) {
+              _this.setDataAfterDiff({
+                fixed: true,
+                height: root.height,
+                transform: 0,
+              });
+            } else {
+              _this.setDataAfterDiff({ fixed: false, transform: 0 });
+            }
+          }
+        );
+        return;
+      }
+      this.getRect(ROOT_ELEMENT).then(function (root) {
+        if (offsetTop >= root.top) {
+          _this.setDataAfterDiff({ fixed: true, height: root.height });
+          _this.transform = 0;
+        } else {
+          _this.setDataAfterDiff({ fixed: false });
+        }
+      });
+    },
+    setDataAfterDiff: function (data) {
+      var _this = this;
+      wx.nextTick(function () {
+        var diff = Object.keys(data).reduce(function (prev, key) {
+          if (data[key] !== _this.data[key]) {
+            prev[key] = data[key];
+          }
+          return prev;
+        }, {});
+        _this.setData(diff);
+        _this.$emit('scroll', {
+          scrollTop: _this.scrollTop,
+          isFixed: data.fixed || _this.data.fixed,
+        });
+      });
+    },
+    getContainerRect: function () {
+      var nodesRef = this.data.container();
+      return new Promise(function (resolve) {
+        return nodesRef.boundingClientRect(resolve).exec();
+      });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.json b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxml
new file mode 100644
index 0000000..15e9f4a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxml
@@ -0,0 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<view class="custom-class van-sticky" style="{{ computed.containerStyle({ fixed, height, zIndex }) }}">
+  <view class="{{ utils.bem('sticky-wrap', { fixed }) }}" style="{{ computed.wrapStyle({ fixed, offsetTop, transform, zIndex }) }}">
+    <slot />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxs
new file mode 100644
index 0000000..18efe14
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxs
@@ -0,0 +1,37 @@
+/* eslint-disable */
+function wrapStyle(data) {
+  var style = '';
+
+  if (data.transform) {
+    style += 'transform: translate3d(0, ' + data.transform + 'px, 0);';
+  }
+
+  if (data.fixed) {
+    style += 'top: ' + data.offsetTop + 'px;';
+  }
+
+  if (data.zIndex) {
+    style += 'z-index: ' + data.zIndex + ';';
+  }
+
+  return style;
+}
+
+function containerStyle(data) {
+  var style = '';
+
+  if (data.fixed) {
+    style += 'height: ' + data.height + 'px;';
+  }
+
+  if (data.zIndex) {
+    style += 'z-index: ' + data.zIndex + ';';
+  }
+
+  return style;
+}
+
+module.exports = {
+  wrapStyle: wrapStyle,
+  containerStyle: containerStyle
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxss
new file mode 100644
index 0000000..5269387
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/sticky/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-sticky{position:relative}.van-sticky-wrap--fixed{position:fixed;right:0;left:0}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.js b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.js
new file mode 100644
index 0000000..2b06332
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.js
@@ -0,0 +1,61 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  classes: ['bar-class', 'price-class', 'button-class'],
+  props: {
+    tip: {
+      type: null,
+      observer: 'updateTip',
+    },
+    tipIcon: String,
+    type: Number,
+    price: {
+      type: null,
+      observer: 'updatePrice',
+    },
+    label: String,
+    loading: Boolean,
+    disabled: Boolean,
+    buttonText: String,
+    currency: {
+      type: String,
+      value: '¥',
+    },
+    buttonType: {
+      type: String,
+      value: 'danger',
+    },
+    decimalLength: {
+      type: Number,
+      value: 2,
+      observer: 'updatePrice',
+    },
+    suffixLabel: String,
+    safeAreaInsetBottom: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    updatePrice: function () {
+      var _a = this.data,
+        price = _a.price,
+        decimalLength = _a.decimalLength;
+      var priceStrArr =
+        typeof price === 'number' &&
+        (price / 100).toFixed(decimalLength).split('.');
+      this.setData({
+        hasPrice: typeof price === 'number',
+        integerStr: priceStrArr && priceStrArr[0],
+        decimalStr: decimalLength && priceStrArr ? '.' + priceStrArr[1] : '',
+      });
+    },
+    updateTip: function () {
+      this.setData({ hasTip: typeof this.data.tip === 'string' });
+    },
+    onSubmit: function (event) {
+      this.$emit('submit', event.detail);
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.json b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.json
new file mode 100644
index 0000000..bda9b8d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-button": "../button/index",
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxml
new file mode 100644
index 0000000..a56dd46
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxml
@@ -0,0 +1,44 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-submit-bar custom-class">
+  <slot name="top" />
+
+  <view class="van-submit-bar__tip">
+    <van-icon
+      wx:if="{{ tipIcon }}"
+      size="12px"
+      name="{{ tipIcon }}"
+      custom-class="van-submit-bar__tip-icon"
+    />
+    <view wx:if="{{ hasTip }}" class="van-submit-bar__tip-text">
+      {{ tip }}
+    </view>
+    <slot name="tip" />
+  </view>
+
+  <view class="bar-class van-submit-bar__bar">
+    <slot />
+    <view wx:if="{{ hasPrice }}" class="van-submit-bar__text">
+      <text>{{ label || '合计：' }}</text>
+      <text class="van-submit-bar__price price-class">
+        <text class="van-submit-bar__currency">{{ currency }} </text>
+        <text class="van-submit-bar__price-integer">{{ integerStr }}</text><text>{{decimalStr}}</text>
+      </text>
+      <text class="van-submit-bar__suffix-label">{{ suffixLabel }}</text>
+    </view>
+    <van-button
+      round
+      type="{{ buttonType }}"
+      loading="{{ loading }}"
+      disabled="{{ disabled }}"
+      class="van-submit-bar__button"
+      custom-class="button-class"
+      custom-style="width: 100%;"
+      bind:click="onSubmit"
+    >
+      {{ loading ? '' : buttonText }}
+    </van-button>
+  </view>
+
+  <view wx:if="{{ safeAreaInsetBottom }}" class="van-submit-bar__safe" />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxss
new file mode 100644
index 0000000..3126e91
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/submit-bar/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-submit-bar{position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none;z-index:100;z-index:var(--submit-bar-z-index,100);background-color:#fff;background-color:var(--submit-bar-background-color,#fff)}.van-submit-bar__tip{padding:10px;padding:var(--submit-bar-tip-padding,10px);color:#f56723;color:var(--submit-bar-tip-color,#f56723);font-size:12px;font-size:var(--submit-bar-tip-font-size,12px);line-height:1.5;line-height:var(--submit-bar-tip-line-height,1.5);background-color:#fff7cc;background-color:var(--submit-bar-tip-background-color,#fff7cc)}.van-submit-bar__tip:empty{display:none}.van-submit-bar__tip-icon{width:12px;height:12px;margin-right:4px;vertical-align:middle;font-size:12px;font-size:var(--submit-bar-tip-icon-size,12px);min-width:18px;min-width:calc(var(--submit-bar-tip-icon-size, 12px)*1.5)}.van-submit-bar__tip-text{display:inline;vertical-align:middle}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:flex-end;justify-content:flex-end;padding:0 16px;padding:var(--submit-bar-padding,0 16px);height:50px;height:var(--submit-bar-height,50px);font-size:14px;font-size:var(--submit-bar-text-font-size,14px);background-color:#fff;background-color:var(--submit-bar-background-color,#fff)}.van-submit-bar__safe{height:constant(safe-area-inset-bottom);height:env(safe-area-inset-bottom)}.van-submit-bar__text{-webkit-flex:1;flex:1;text-align:right;color:#323233;color:var(--submit-bar-text-color,#323233);padding-right:12px;padding-right:var(--padding-sm,12px)}.van-submit-bar__price,.van-submit-bar__text{font-weight:500;font-weight:var(--font-weight-bold,500)}.van-submit-bar__price{color:#ee0a24;color:var(--submit-bar-price-color,#ee0a24);font-size:12px;font-size:var(--submit-bar-price-font-size,12px)}.van-submit-bar__price-integer{font-size:20px;font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif}.van-submit-bar__currency{font-size:12px;font-size:var(--submit-bar-currency-font-size,12px)}.van-submit-bar__suffix-label{margin-left:5px}.van-submit-bar__button{width:110px;width:var(--submit-bar-button-width,110px);font-weight:500;font-weight:var(--font-weight-bold,500);--button-default-height:40px!important;--button-default-height:var(--submit-bar-button-height,40px)!important;--button-line-height:40px!important;--button-line-height:var(--submit-bar-button-height,40px)!important}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.js b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.js
new file mode 100644
index 0000000..4753829
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.js
@@ -0,0 +1,161 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var touch_1 = require('../mixins/touch');
+var utils_1 = require('../common/utils');
+var THRESHOLD = 0.3;
+var ARRAY = [];
+component_1.VantComponent({
+  props: {
+    disabled: Boolean,
+    leftWidth: {
+      type: Number,
+      value: 0,
+      observer: function (leftWidth) {
+        if (leftWidth === void 0) {
+          leftWidth = 0;
+        }
+        if (this.offset > 0) {
+          this.swipeMove(leftWidth);
+        }
+      },
+    },
+    rightWidth: {
+      type: Number,
+      value: 0,
+      observer: function (rightWidth) {
+        if (rightWidth === void 0) {
+          rightWidth = 0;
+        }
+        if (this.offset < 0) {
+          this.swipeMove(-rightWidth);
+        }
+      },
+    },
+    asyncClose: Boolean,
+    name: {
+      type: [Number, String],
+      value: '',
+    },
+  },
+  mixins: [touch_1.touch],
+  data: {
+    catchMove: false,
+  },
+  created: function () {
+    this.offset = 0;
+    ARRAY.push(this);
+  },
+  destroyed: function () {
+    var _this = this;
+    ARRAY = ARRAY.filter(function (item) {
+      return item !== _this;
+    });
+  },
+  methods: {
+    open: function (position) {
+      var _a = this.data,
+        leftWidth = _a.leftWidth,
+        rightWidth = _a.rightWidth;
+      var offset = position === 'left' ? leftWidth : -rightWidth;
+      this.swipeMove(offset);
+      this.$emit('open', {
+        position: position,
+        name: this.data.name,
+      });
+    },
+    close: function () {
+      this.swipeMove(0);
+    },
+    swipeMove: function (offset) {
+      if (offset === void 0) {
+        offset = 0;
+      }
+      this.offset = utils_1.range(
+        offset,
+        -this.data.rightWidth,
+        this.data.leftWidth
+      );
+      var transform = 'translate3d(' + this.offset + 'px, 0, 0)';
+      var transition = this.dragging
+        ? 'none'
+        : 'transform .6s cubic-bezier(0.18, 0.89, 0.32, 1)';
+      this.setData({
+        wrapperStyle:
+          '\n        -webkit-transform: ' +
+          transform +
+          ';\n        -webkit-transition: ' +
+          transition +
+          ';\n        transform: ' +
+          transform +
+          ';\n        transition: ' +
+          transition +
+          ';\n      ',
+      });
+    },
+    swipeLeaveTransition: function () {
+      var _a = this.data,
+        leftWidth = _a.leftWidth,
+        rightWidth = _a.rightWidth;
+      var offset = this.offset;
+      if (rightWidth > 0 && -offset > rightWidth * THRESHOLD) {
+        this.open('right');
+      } else if (leftWidth > 0 && offset > leftWidth * THRESHOLD) {
+        this.open('left');
+      } else {
+        this.swipeMove(0);
+      }
+      this.setData({ catchMove: false });
+    },
+    startDrag: function (event) {
+      if (this.data.disabled) {
+        return;
+      }
+      this.startOffset = this.offset;
+      this.touchStart(event);
+    },
+    noop: function () {},
+    onDrag: function (event) {
+      var _this = this;
+      if (this.data.disabled) {
+        return;
+      }
+      this.touchMove(event);
+      if (this.direction !== 'horizontal') {
+        return;
+      }
+      this.dragging = true;
+      ARRAY.filter(function (item) {
+        return item !== _this;
+      }).forEach(function (item) {
+        return item.close();
+      });
+      this.setData({ catchMove: true });
+      this.swipeMove(this.startOffset + this.deltaX);
+    },
+    endDrag: function () {
+      if (this.data.disabled) {
+        return;
+      }
+      this.dragging = false;
+      this.swipeLeaveTransition();
+    },
+    onClick: function (event) {
+      var _a = event.currentTarget.dataset.key,
+        position = _a === void 0 ? 'outside' : _a;
+      this.$emit('click', position);
+      if (!this.offset) {
+        return;
+      }
+      if (this.data.asyncClose) {
+        this.$emit('close', {
+          position: position,
+          instance: this,
+          name: this.data.name,
+        });
+      } else {
+        this.swipeMove(0);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.json b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxml
new file mode 100644
index 0000000..7293619
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxml
@@ -0,0 +1,20 @@
+<view
+  class="van-swipe-cell"
+  data-key="cell"
+  catchtap="onClick"
+  bindtouchstart="startDrag"
+  catchtouchmove="{{ catchMove ? 'noop' : '' }}"
+  capture-bind:touchmove="onDrag"
+  bindtouchend="endDrag"
+  bindtouchcancel="endDrag"
+>
+  <view style="{{ wrapperStyle }}">
+    <view wx:if="{{ leftWidth }}" class="van-swipe-cell__left" data-key="left" catch:tap="onClick">
+      <slot name="left" />
+    </view>
+    <slot />
+    <view wx:if="{{ rightWidth }}" class="van-swipe-cell__right" data-key="right" catch:tap="onClick">
+      <slot name="right" />
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxss
new file mode 100644
index 0000000..d615270
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/swipe-cell/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-swipe-cell{position:relative;overflow:hidden}.van-swipe-cell__left,.van-swipe-cell__right{position:absolute;top:0;height:100%}.van-swipe-cell__left{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.van-swipe-cell__right{right:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/switch/index.js b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.js
new file mode 100644
index 0000000..a5b64ad
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.js
@@ -0,0 +1,59 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var color_1 = require('../common/color');
+component_1.VantComponent({
+  field: true,
+  classes: ['node-class'],
+  props: {
+    checked: {
+      type: null,
+      observer: function (value) {
+        var loadingColor = this.getLoadingColor(value);
+        this.setData({ value: value, loadingColor: loadingColor });
+      },
+    },
+    loading: Boolean,
+    disabled: Boolean,
+    activeColor: String,
+    inactiveColor: String,
+    size: {
+      type: String,
+      value: '30px',
+    },
+    activeValue: {
+      type: null,
+      value: true,
+    },
+    inactiveValue: {
+      type: null,
+      value: false,
+    },
+  },
+  created: function () {
+    var value = this.data.checked;
+    var loadingColor = this.getLoadingColor(value);
+    this.setData({ value: value, loadingColor: loadingColor });
+  },
+  methods: {
+    getLoadingColor: function (checked) {
+      var _a = this.data,
+        activeColor = _a.activeColor,
+        inactiveColor = _a.inactiveColor;
+      return checked
+        ? activeColor || color_1.BLUE
+        : inactiveColor || color_1.GRAY_DARK;
+    },
+    onClick: function () {
+      var _a = this.data,
+        activeValue = _a.activeValue,
+        inactiveValue = _a.inactiveValue;
+      if (!this.data.disabled && !this.data.loading) {
+        var checked = this.data.checked === activeValue;
+        var value = checked ? inactiveValue : activeValue;
+        this.$emit('input', value);
+        this.$emit('change', value);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/switch/index.json b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.json
new file mode 100644
index 0000000..01077f5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxml
new file mode 100644
index 0000000..31a104d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxml
@@ -0,0 +1,11 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('switch', { on: value === activeValue, disabled }) }}"
+  style="font-size: {{ size }}; {{ (checked ? activeColor : inactiveColor) ? 'background-color: ' + (checked ? activeColor : inactiveColor ) : '' }}"
+  bind:tap="onClick"
+>
+  <view class="van-switch__node node-class">
+    <van-loading wx:if="{{ loading }}" color="{{ loadingColor }}" custom-class="van-switch__loading" />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxss
new file mode 100644
index 0000000..e32a72a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/switch/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-switch{position:relative;display:inline-block;box-sizing:initial;width:2em;width:var(--switch-width,2em);height:1em;height:var(--switch-height,1em);background-color:#fff;background-color:var(--switch-background-color,#fff);border:1px solid rgba(0,0,0,.1);border:var(--switch-border,1px solid rgba(0,0,0,.1));border-radius:1em;border-radius:var(--switch-node-size,1em);transition:background-color .3s;transition:background-color var(--switch-transition-duration,.3s)}.van-switch__node{position:absolute;top:0;left:0;border-radius:100%;z-index:1;z-index:var(--switch-node-z-index,1);width:1em;width:var(--switch-node-size,1em);height:1em;height:var(--switch-node-size,1em);background-color:#fff;background-color:var(--switch-node-background-color,#fff);box-shadow:0 3px 1px 0 rgba(0,0,0,.05),0 2px 2px 0 rgba(0,0,0,.1),0 3px 3px 0 rgba(0,0,0,.05);box-shadow:var(--switch-node-box-shadow,0 3px 1px 0 rgba(0,0,0,.05),0 2px 2px 0 rgba(0,0,0,.1),0 3px 3px 0 rgba(0,0,0,.05));transition:-webkit-transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:transform .3s cubic-bezier(.3,1.05,.4,1.05),-webkit-transform .3s cubic-bezier(.3,1.05,.4,1.05);transition:-webkit-transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05);transition:transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05);transition:transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05),-webkit-transform var(--switch-transition-duration,.3s) cubic-bezier(.3,1.05,.4,1.05)}.van-switch__loading{position:absolute!important;top:25%;left:25%;width:50%;height:50%}.van-switch--on{background-color:#1989fa;background-color:var(--switch-on-background-color,#1989fa)}.van-switch--on .van-switch__node{-webkit-transform:translateX(1em);transform:translateX(1em);-webkit-transform:translateX(calc(var(--switch-width, 2em) - var(--switch-node-size, 1em)));transform:translateX(calc(var(--switch-width, 2em) - var(--switch-node-size, 1em)))}.van-switch--disabled{opacity:.4;opacity:var(--switch-disabled-opacity,.4)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tab/index.js b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.js
new file mode 100644
index 0000000..554d9d5
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.js
@@ -0,0 +1,61 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    name: 'tabs',
+    type: 'ancestor',
+    current: 'tab',
+  },
+  props: {
+    dot: {
+      type: Boolean,
+      observer: 'update',
+    },
+    info: {
+      type: null,
+      observer: 'update',
+    },
+    title: {
+      type: String,
+      observer: 'update',
+    },
+    disabled: {
+      type: Boolean,
+      observer: 'update',
+    },
+    titleStyle: {
+      type: String,
+      observer: 'update',
+    },
+    name: {
+      type: [Number, String],
+      value: '',
+    },
+  },
+  data: {
+    active: false,
+  },
+  methods: {
+    getComputedName: function () {
+      if (this.data.name !== '') {
+        return this.data.name;
+      }
+      return this.index;
+    },
+    updateRender: function (active, parent) {
+      var parentData = parent.data;
+      this.inited = this.inited || active;
+      this.setData({
+        active: active,
+        shouldRender: this.inited || !parentData.lazyRender,
+        shouldShow: active || parentData.animated,
+      });
+    },
+    update: function () {
+      if (this.parent) {
+        this.parent.updateTabs();
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tab/index.json b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxml
new file mode 100644
index 0000000..f5e99f2
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxml
@@ -0,0 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('tab__pane', { active, inactive: !active }) }}"
+  style="{{ shouldShow ? '' : 'display: none;' }}"
+>
+  <slot wx:if="{{ shouldRender }}" />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxss
new file mode 100644
index 0000000..76ddf06
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tab/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';:host{-webkit-flex-shrink:0;flex-shrink:0;width:100%}.van-tab__pane,:host{box-sizing:border-box}.van-tab__pane{overflow-y:auto;-webkit-overflow-scrolling:touch}.van-tab__pane--active{height:auto}.van-tab__pane--inactive{height:0;overflow:visible}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.js b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.js
new file mode 100644
index 0000000..76e6e23
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.js
@@ -0,0 +1,50 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    info: null,
+    name: null,
+    icon: String,
+    dot: Boolean,
+  },
+  relation: {
+    name: 'tabbar',
+    type: 'ancestor',
+    current: 'tabbar-item',
+  },
+  data: {
+    active: false,
+  },
+  methods: {
+    onClick: function () {
+      if (this.parent) {
+        this.parent.onChange(this);
+      }
+      this.$emit('click');
+    },
+    updateFromParent: function () {
+      var parent = this.parent;
+      if (!parent) {
+        return;
+      }
+      var index = parent.children.indexOf(this);
+      var parentData = parent.data;
+      var data = this.data;
+      var active = (data.name || index) === parentData.active;
+      var patch = {};
+      if (active !== data.active) {
+        patch.active = active;
+      }
+      if (parentData.activeColor !== data.activeColor) {
+        patch.activeColor = parentData.activeColor;
+      }
+      if (parentData.inactiveColor !== data.inactiveColor) {
+        patch.inactiveColor = parentData.inactiveColor;
+      }
+      return Object.keys(patch).length > 0
+        ? this.set(patch)
+        : Promise.resolve();
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.json b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.json
new file mode 100644
index 0000000..16f174c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-info": "../info/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxml
new file mode 100644
index 0000000..d83b061
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxml
@@ -0,0 +1,30 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="{{ utils.bem('tabbar-item', { active }) }} custom-class"
+  style="color: {{ active ? activeColor : inactiveColor }}"
+  bind:tap="onClick"
+>
+  <view class="van-tabbar-item__icon">
+    <van-icon
+      wx:if="{{ icon }}"
+      name="{{ icon }}"
+      custom-class="van-tabbar-item__icon__inner"
+    />
+    <block wx:else>
+      <slot
+        wx:if="{{ active }}"
+        name="icon-active"
+      />
+      <slot wx:else name="icon" />
+    </block>
+    <van-info
+      dot="{{ dot }}"
+      info="{{ info }}"
+      custom-class="van-tabbar-item__info"
+    />
+  </view>
+  <view class="van-tabbar-item__text">
+    <slot />
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxss
new file mode 100644
index 0000000..85bb21c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar-item/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-tabbar-item{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;height:100%;color:#646566;color:var(--tabbar-item-text-color,#646566);font-size:12px;font-size:var(--tabbar-item-font-size,12px);line-height:1;line-height:var(--tabbar-item-line-height,1)}.van-tabbar-item__icon{position:relative;margin-bottom:5px;margin-bottom:var(--tabbar-item-margin-bottom,5px);font-size:18px;font-size:var(--tabbar-item-icon-size,18px)}.van-tabbar-item__icon__inner{display:block;min-width:1em}.van-tabbar-item--active{color:#1989fa;color:var(--tabbar-item-active-color,#1989fa)}.van-tabbar-item__info{margin-top:2px}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.js b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.js
new file mode 100644
index 0000000..e485a33
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.js
@@ -0,0 +1,67 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  relation: {
+    name: 'tabbar-item',
+    type: 'descendant',
+    current: 'tabbar',
+    linked: function (target) {
+      target.parent = this;
+      target.updateFromParent();
+    },
+    unlinked: function () {
+      this.updateChildren();
+    },
+  },
+  props: {
+    active: {
+      type: null,
+      observer: 'updateChildren',
+    },
+    activeColor: {
+      type: String,
+      observer: 'updateChildren',
+    },
+    inactiveColor: {
+      type: String,
+      observer: 'updateChildren',
+    },
+    fixed: {
+      type: Boolean,
+      value: true,
+    },
+    border: {
+      type: Boolean,
+      value: true,
+    },
+    zIndex: {
+      type: Number,
+      value: 1,
+    },
+    safeAreaInsetBottom: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  methods: {
+    updateChildren: function () {
+      var children = this.children;
+      if (!Array.isArray(children) || !children.length) {
+        return Promise.resolve();
+      }
+      return Promise.all(
+        children.map(function (child) {
+          return child.updateFromParent();
+        })
+      );
+    },
+    onChange: function (child) {
+      var index = this.children.indexOf(child);
+      var active = child.data.name || index;
+      if (active !== this.data.active) {
+        this.$emit('change', active);
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.json b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxml
new file mode 100644
index 0000000..c49b9d9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxml
@@ -0,0 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ border ? 'van-hairline--top-bottom' : '' }} {{ utils.bem('tabbar', { fixed, safe: safeAreaInsetBottom }) }}"
+  style="{{ zIndex ? 'z-index: ' + zIndex : '' }}"
+>
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxss
new file mode 100644
index 0000000..6819569
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabbar/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-tabbar{display:-webkit-flex;display:flex;box-sizing:initial;width:100%;height:50px;height:var(--tabbar-height,50px);background-color:#fff;background-color:var(--tabbar-background-color,#fff)}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--safe{padding-bottom:env(safe-area-inset-bottom)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.js b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.js
new file mode 100644
index 0000000..a2855c1
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.js
@@ -0,0 +1,329 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var touch_1 = require('../mixins/touch');
+var utils_1 = require('../common/utils');
+component_1.VantComponent({
+  mixins: [touch_1.touch],
+  classes: ['nav-class', 'tab-class', 'tab-active-class', 'line-class'],
+  relation: {
+    name: 'tab',
+    type: 'descendant',
+    current: 'tabs',
+    linked: function (target) {
+      target.index = this.children.length - 1;
+      this.updateTabs();
+    },
+    unlinked: function () {
+      this.children = this.children.map(function (child, index) {
+        child.index = index;
+        return child;
+      });
+      this.updateTabs();
+    },
+  },
+  props: {
+    color: {
+      type: String,
+      observer: 'setLine',
+    },
+    sticky: Boolean,
+    animated: {
+      type: Boolean,
+      observer: function () {
+        var _this = this;
+        this.children.forEach(function (child, index) {
+          return child.updateRender(index === _this.data.currentIndex, _this);
+        });
+      },
+    },
+    swipeable: Boolean,
+    lineWidth: {
+      type: [String, Number],
+      value: -1,
+      observer: 'setLine',
+    },
+    lineHeight: {
+      type: [String, Number],
+      value: -1,
+      observer: 'setLine',
+    },
+    titleActiveColor: String,
+    titleInactiveColor: String,
+    active: {
+      type: [String, Number],
+      value: 0,
+      observer: function (name) {
+        if (name !== this.getCurrentName()) {
+          this.setCurrentIndexByName(name);
+        }
+      },
+    },
+    type: {
+      type: String,
+      value: 'line',
+    },
+    border: {
+      type: Boolean,
+      value: true,
+    },
+    ellipsis: {
+      type: Boolean,
+      value: true,
+    },
+    duration: {
+      type: Number,
+      value: 0.3,
+    },
+    zIndex: {
+      type: Number,
+      value: 1,
+    },
+    swipeThreshold: {
+      type: Number,
+      value: 4,
+      observer: function (value) {
+        this.setData({
+          scrollable: this.children.length > value || !this.data.ellipsis,
+        });
+      },
+    },
+    offsetTop: {
+      type: Number,
+      value: 0,
+    },
+    lazyRender: {
+      type: Boolean,
+      value: true,
+    },
+  },
+  data: {
+    tabs: [],
+    lineStyle: '',
+    scrollLeft: 0,
+    scrollable: false,
+    trackStyle: '',
+    currentIndex: null,
+    container: null,
+  },
+  mounted: function () {
+    var _this = this;
+    wx.nextTick(function () {
+      _this.setLine(true);
+      _this.scrollIntoView();
+    });
+  },
+  methods: {
+    updateContainer: function () {
+      var _this = this;
+      this.setData({
+        container: function () {
+          return _this.createSelectorQuery().select('.van-tabs');
+        },
+      });
+    },
+    updateTabs: function () {
+      var _a = this,
+        _b = _a.children,
+        children = _b === void 0 ? [] : _b,
+        data = _a.data;
+      this.setData({
+        tabs: children.map(function (child) {
+          return child.data;
+        }),
+        scrollable:
+          this.children.length > data.swipeThreshold || !data.ellipsis,
+      });
+      this.setCurrentIndexByName(this.getCurrentName() || data.active);
+    },
+    trigger: function (eventName, child) {
+      var currentIndex = this.data.currentIndex;
+      var currentChild = child || this.children[currentIndex];
+      if (!utils_1.isDef(currentChild)) {
+        return;
+      }
+      this.$emit(eventName, {
+        index: currentChild.index,
+        name: currentChild.getComputedName(),
+        title: currentChild.data.title,
+      });
+    },
+    onTap: function (event) {
+      var _this = this;
+      var index = event.currentTarget.dataset.index;
+      var child = this.children[index];
+      if (child.data.disabled) {
+        this.trigger('disabled', child);
+      } else {
+        this.setCurrentIndex(index);
+        wx.nextTick(function () {
+          _this.trigger('click');
+        });
+      }
+    },
+    // correct the index of active tab
+    setCurrentIndexByName: function (name) {
+      var _a = this.children,
+        children = _a === void 0 ? [] : _a;
+      var matched = children.filter(function (child) {
+        return child.getComputedName() === name;
+      });
+      if (matched.length) {
+        this.setCurrentIndex(matched[0].index);
+      }
+    },
+    setCurrentIndex: function (currentIndex) {
+      var _this = this;
+      var _a = this,
+        data = _a.data,
+        _b = _a.children,
+        children = _b === void 0 ? [] : _b;
+      if (
+        !utils_1.isDef(currentIndex) ||
+        currentIndex >= children.length ||
+        currentIndex < 0
+      ) {
+        return;
+      }
+      children.forEach(function (item, index) {
+        var active = index === currentIndex;
+        if (active !== item.data.active || !item.inited) {
+          item.updateRender(active, _this);
+        }
+      });
+      if (currentIndex === data.currentIndex) {
+        return;
+      }
+      var shouldEmitChange = data.currentIndex !== null;
+      this.setData({ currentIndex: currentIndex });
+      wx.nextTick(function () {
+        _this.setLine();
+        _this.scrollIntoView();
+        _this.updateContainer();
+        _this.trigger('input');
+        if (shouldEmitChange) {
+          _this.trigger('change');
+        }
+      });
+    },
+    getCurrentName: function () {
+      var activeTab = this.children[this.data.currentIndex];
+      if (activeTab) {
+        return activeTab.getComputedName();
+      }
+    },
+    setLine: function (skipTransition) {
+      var _this = this;
+      if (this.data.type !== 'line') {
+        return;
+      }
+      var _a = this.data,
+        color = _a.color,
+        duration = _a.duration,
+        currentIndex = _a.currentIndex,
+        lineWidth = _a.lineWidth,
+        lineHeight = _a.lineHeight;
+      this.getRect('.van-tab', true).then(function (rects) {
+        if (rects === void 0) {
+          rects = [];
+        }
+        var rect = rects[currentIndex];
+        if (rect == null) {
+          return;
+        }
+        var width = lineWidth !== -1 ? lineWidth : rect.width / 2;
+        var height =
+          lineHeight !== -1
+            ? 'height: ' +
+              utils_1.addUnit(lineHeight) +
+              '; border-radius: ' +
+              utils_1.addUnit(lineHeight) +
+              ';'
+            : '';
+        var left = rects.slice(0, currentIndex).reduce(function (prev, curr) {
+          return prev + curr.width;
+        }, 0);
+        left += (rect.width - width) / 2;
+        var transition = skipTransition
+          ? ''
+          : 'transition-duration: ' +
+            duration +
+            's; -webkit-transition-duration: ' +
+            duration +
+            's;';
+        _this.setData({
+          lineStyle:
+            '\n            ' +
+            height +
+            '\n            width: ' +
+            utils_1.addUnit(width) +
+            ';\n            background-color: ' +
+            color +
+            ';\n            -webkit-transform: translateX(' +
+            left +
+            'px);\n            transform: translateX(' +
+            left +
+            'px);\n            ' +
+            transition +
+            '\n          ',
+        });
+      });
+    },
+    // scroll active tab into view
+    scrollIntoView: function () {
+      var _this = this;
+      var _a = this.data,
+        currentIndex = _a.currentIndex,
+        scrollable = _a.scrollable;
+      if (!scrollable) {
+        return;
+      }
+      Promise.all([
+        this.getRect('.van-tab', true),
+        this.getRect('.van-tabs__nav'),
+      ]).then(function (_a) {
+        var tabRects = _a[0],
+          navRect = _a[1];
+        var tabRect = tabRects[currentIndex];
+        var offsetLeft = tabRects
+          .slice(0, currentIndex)
+          .reduce(function (prev, curr) {
+            return prev + curr.width;
+          }, 0);
+        _this.setData({
+          scrollLeft: offsetLeft - (navRect.width - tabRect.width) / 2,
+        });
+      });
+    },
+    onTouchScroll: function (event) {
+      this.$emit('scroll', event.detail);
+    },
+    onTouchStart: function (event) {
+      if (!this.data.swipeable) return;
+      this.touchStart(event);
+    },
+    onTouchMove: function (event) {
+      if (!this.data.swipeable) return;
+      this.touchMove(event);
+    },
+    // watch swipe touch end
+    onTouchEnd: function () {
+      if (!this.data.swipeable) return;
+      var _a = this.data,
+        tabs = _a.tabs,
+        currentIndex = _a.currentIndex;
+      var _b = this,
+        direction = _b.direction,
+        deltaX = _b.deltaX,
+        offsetX = _b.offsetX;
+      var minSwipeDistance = 50;
+      if (direction === 'horizontal' && offsetX >= minSwipeDistance) {
+        if (deltaX > 0 && currentIndex !== 0) {
+          this.setCurrentIndex(currentIndex - 1);
+        } else if (deltaX < 0 && currentIndex !== tabs.length - 1) {
+          this.setCurrentIndex(currentIndex + 1);
+        }
+      }
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.json b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.json
new file mode 100644
index 0000000..19c0bc3
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index",
+    "van-sticky": "../sticky/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxml
new file mode 100644
index 0000000..99ac411
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxml
@@ -0,0 +1,63 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="getters" />
+
+<view class="custom-class {{ utils.bem('tabs', [type]) }}">
+  <van-sticky
+    disabled="{{ !sticky }}"
+    z-index="{{ zIndex }}"
+    offset-top="{{ offsetTop }}"
+    container="{{ container }}"
+    bind:scroll="onTouchScroll"
+  >
+    <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
+      <slot name="nav-left" />
+
+      <scroll-view
+        scroll-x="{{ scrollable }}"
+        scroll-with-animation
+        scroll-left="{{ scrollLeft }}"
+        class="{{ utils.bem('tabs__scroll', [type]) }}"
+        style="{{ color ? 'border-color: ' + color : '' }}"
+      >
+        <view class="{{ utils.bem('tabs__nav', [type]) }} nav-class" style="{{ getters.tabCardTypeBorderStyle(color, type) }}">
+          <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
+          <view
+            wx:for="{{ tabs }}"
+            wx:key="index"
+            data-index="{{ index }}"
+            class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}"
+            style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}"
+            bind:tap="onTap"
+          >
+            <view class="{{ ellipsis ? 'van-ellipsis' : '' }}" style="{{ item.titleStyle }}">
+              {{ item.title }}
+              <van-info
+                wx:if="{{ item.info !== null || item.dot }}"
+                info="{{ item.info }}"
+                dot="{{ item.dot }}"
+                custom-class="van-tab__title__info"
+              />
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+
+      <slot name="nav-right" />
+    </view>
+  </van-sticky>
+
+  <view
+    class="van-tabs__content"
+    bind:touchstart="onTouchStart"
+    bind:touchmove="onTouchMove"
+    bind:touchend="onTouchEnd"
+    bind:touchcancel="onTouchEnd"
+  >
+    <view
+      class="{{ utils.bem('tabs__track', [{ animated }]) }} van-tabs__track"
+      style="{{ getters.trackStyle({ duration, currentIndex, animated }) }}"
+    >
+      <slot />
+    </view>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxs
new file mode 100644
index 0000000..88bcafd
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxs
@@ -0,0 +1,78 @@
+/* eslint-disable */
+function tabClass(active, ellipsis) {
+  var classes = ['tab-class'];
+
+  if (active) {
+    classes.push('tab-active-class');
+  }
+
+  if (ellipsis) {
+    classes.push('van-ellipsis');
+  }
+
+  return classes.join(' ');
+}
+
+function tabStyle(
+  active,
+  ellipsis,
+  color,
+  type,
+  disabled,
+  activeColor,
+  inactiveColor,
+  swipeThreshold,
+  scrollable
+) {
+  var styles = [];
+  var isCard = type === 'card';
+  // card theme color
+  if (color && isCard) {
+    styles.push('border-color:' + color);
+
+    if (!disabled) {
+      if (active) {
+        styles.push('background-color:' + color);
+      } else {
+        styles.push('color:' + color);
+      }
+    }
+  }
+
+  var titleColor = active ? activeColor : inactiveColor;
+  if (titleColor) {
+    styles.push('color:' + titleColor);
+  }
+
+  if (scrollable && ellipsis) {
+    styles.push('flex-basis:' + 88 / swipeThreshold + '%');
+  }
+
+  return styles.join(';');
+}
+
+function tabCardTypeBorderStyle(color, type) {
+  var isCard = type === 'card';
+  var styles = [];
+  if (isCard && color) {
+    styles.push('border-color:' + color);
+  }
+  return styles.join(';');
+}
+
+function trackStyle(data) {
+  if (!data.animated) {
+    return '';
+  }
+
+  return [
+    'transform: translate3d(' + -100 * data.currentIndex + '%, 0, 0)',
+    '-webkit-transition-duration: ' + data.duration + 's',
+    'transition-duration: ' + data.duration + 's'
+  ].join(';');
+}
+
+module.exports.tabClass = tabClass;
+module.exports.tabStyle = tabStyle;
+module.exports.trackStyle = trackStyle;
+module.exports.tabCardTypeBorderStyle = tabCardTypeBorderStyle;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxss
new file mode 100644
index 0000000..623405d
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tabs/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{display:-webkit-flex;display:flex;overflow:hidden}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__scroll{background-color:#fff;background-color:var(--tabs-nav-background-color,#fff)}.van-tabs__scroll--line{box-sizing:initial;height:calc(100% + 15px)}.van-tabs__scroll--card{margin:0 16px;margin:0 var(--padding-md,16px)}.van-tabs__scroll::-webkit-scrollbar{display:none}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--card{box-sizing:border-box;height:30px;height:var(--tabs-card-height,30px);border:1px solid #ee0a24;border:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24);border-radius:2px;border-radius:var(--border-radius-sm,2px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--tabs-default-color,#ee0a24);line-height:28px;line-height:calc(var(--tabs-card-height, 30px) - 2*var(--border-width-base, 1px));border-right:1px solid #ee0a24;border-right:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;height:var(--tabs-bottom-bar-height,3px);border-radius:3px;border-radius:var(--tabs-bottom-bar-height,3px);background-color:#ee0a24;background-color:var(--tabs-bottom-bar-color,#ee0a24)}.van-tabs__track{position:relative;width:100%;height:100%}.van-tabs__track--animated{display:-webkit-flex;display:flex;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-tabs__content{overflow:hidden}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tab{position:relative;-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;text-align:center;cursor:pointer;color:#646566;color:var(--tab-text-color,#646566);font-size:14px;font-size:var(--tab-font-size,14px);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;font-weight:var(--font-weight-bold,500);color:#323233;color:var(--tab-active-text-color,#323233)}.van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tab--complete{-webkit-flex:1 0 auto!important;flex:1 0 auto!important}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tag/index.js b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.js
new file mode 100644
index 0000000..b51d3fb
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.js
@@ -0,0 +1,23 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    size: String,
+    mark: Boolean,
+    color: String,
+    plain: Boolean,
+    round: Boolean,
+    textColor: String,
+    type: {
+      type: String,
+      value: 'default',
+    },
+    closeable: Boolean,
+  },
+  methods: {
+    onClose: function () {
+      this.$emit('close');
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tag/index.json b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.json
new file mode 100644
index 0000000..0a336c0
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxml
new file mode 100644
index 0000000..8c78686
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxml
@@ -0,0 +1,14 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view
+  class="custom-class {{ utils.bem('tag', [type, size, { mark, plain, round }]) }} {{ plain ? 'van-hairline--surround' : '' }}"
+  style="{{ color && !plain ? 'background-color: ' + color + ';' : '' }}{{ textColor || (color && plain) ? 'color: ' + (textColor || color) : '' }}"
+>
+  <slot />
+  <van-icon
+    wx:if="{{ closeable }}"
+    name="cross"
+    custom-class="van-tag__close"
+    bind:click="onClose"
+  />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxss
new file mode 100644
index 0000000..0615a99
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tag/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-tag{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;line-height:normal;padding:.2em .5em;padding:var(--tag-padding,.2em .5em);color:#fff;color:var(--tag-text-color,#fff);font-size:10px;font-size:var(--tag-font-size,10px);border-radius:.2em;border-radius:var(--tag-border-radius,.2em)}.van-tag:after{border-color:currentColor;border-radius:.2em * 2;border-radius:var(--tag-border-radius,.2em) * 2}.van-tag--default{background-color:#969799;background-color:var(--tag-default-color,#969799)}.van-tag--default.van-tag--plain{color:#969799;color:var(--tag-default-color,#969799)}.van-tag--danger{background-color:#ee0a24;background-color:var(--tag-danger-color,#ee0a24)}.van-tag--danger.van-tag--plain{color:#ee0a24;color:var(--tag-danger-color,#ee0a24)}.van-tag--primary{background-color:#1989fa;background-color:var(--tag-primary-color,#1989fa)}.van-tag--primary.van-tag--plain{color:#1989fa;color:var(--tag-primary-color,#1989fa)}.van-tag--success{background-color:#07c160;background-color:var(--tag-success-color,#07c160)}.van-tag--success.van-tag--plain{color:#07c160;color:var(--tag-success-color,#07c160)}.van-tag--warning{background-color:#ff976a;background-color:var(--tag-warning-color,#ff976a)}.van-tag--warning.van-tag--plain{color:#ff976a;color:var(--tag-warning-color,#ff976a)}.van-tag--plain{background-color:#fff;background-color:var(--tag-plain-background-color,#fff)}.van-tag--mark{padding-right:.7em}.van-tag--mark,.van-tag--mark:after{border-radius:0 999px 999px 0;border-radius:0 var(--tag-round-border-radius,999px) var(--tag-round-border-radius,999px) 0}.van-tag--round,.van-tag--round:after{border-radius:999px;border-radius:var(--tag-round-border-radius,999px)}.van-tag--medium{font-size:12px;font-size:var(--tag-medium-font-size,12px)}.van-tag--large{font-size:14px;font-size:var(--tag-large-font-size,14px)}.van-tag__close{margin-left:2px}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/toast/index.js b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.js
new file mode 100644
index 0000000..da703bb
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.js
@@ -0,0 +1,31 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  props: {
+    show: Boolean,
+    mask: Boolean,
+    message: String,
+    forbidClick: Boolean,
+    zIndex: {
+      type: Number,
+      value: 1000,
+    },
+    type: {
+      type: String,
+      value: 'text',
+    },
+    loadingType: {
+      type: String,
+      value: 'circular',
+    },
+    position: {
+      type: String,
+      value: 'middle',
+    },
+  },
+  methods: {
+    // for prevent touchmove
+    noop: function () {},
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/toast/index.json b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.json
new file mode 100644
index 0000000..9b1b78c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.json
@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index",
+    "van-overlay": "../overlay/index",
+    "van-transition": "../transition/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxml
new file mode 100644
index 0000000..635e7d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxml
@@ -0,0 +1,33 @@
+<van-overlay
+  wx:if="{{ mask || forbidClick }}"
+  show="{{ show }}"
+  z-index="{{ zIndex }}"
+  custom-style="{{ mask ? '' : 'background-color: transparent;' }}"
+/>
+<van-transition
+  show="{{ show }}"
+  custom-style="z-index: {{ zIndex }}"
+  custom-class="van-toast__container"
+>
+  <view
+    class="van-toast van-toast--{{ type === 'text' ? 'text' : 'icon' }} van-toast--{{ position }}"
+    catch:touchmove="noop"
+  >
+    <!-- text only -->
+    <text wx:if="{{ type === 'text' }}">{{ message }}</text>
+
+    <!-- with icon -->
+    <block wx:else>
+      <van-loading
+        wx:if="{{ type === 'loading' }}"
+        color="white"
+        type="{{ loadingType }}"
+        custom-class="van-toast__loading"
+      />
+      <van-icon wx:else class="van-toast__icon" name="{{ type }}" />
+      <text wx:if="{{ message }}" class="van-toast__text">{{ message }}</text>
+    </block>
+
+    <slot />
+  </view>
+</van-transition>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxss
new file mode 100644
index 0000000..da946c9
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/toast/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-toast{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:initial;color:#fff;color:var(--toast-text-color,#fff);font-size:14px;font-size:var(--toast-font-size,14px);line-height:20px;line-height:var(--toast-line-height,20px);white-space:pre-wrap;word-wrap:break-word;background-color:rgba(50,50,51,.88);background-color:var(--toast-background-color,rgba(50,50,51,.88));border-radius:4px;border-radius:var(--toast-border-radius,4px)}.van-toast__container{position:fixed;top:50%;left:50%;width:-webkit-fit-content;width:fit-content;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);max-width:70%;max-width:var(--toast-max-width,70%)}.van-toast--text{min-width:96px;min-width:var(--toast-text-min-width,96px);padding:8px 12px;padding:var(--toast-text-padding,8px 12px)}.van-toast--icon{width:90px;width:var(--toast-default-width,90px);min-height:90px;min-height:var(--toast-default-min-height,90px);padding:16px;padding:var(--toast-default-padding,16px)}.van-toast--icon .van-toast__icon{font-size:48px;font-size:var(--toast-icon-size,48px)}.van-toast--icon .van-toast__text{padding-top:8px}.van-toast__loading{margin:10px 0}.van-toast--top{-webkit-transform:translateY(-30vh);transform:translateY(-30vh)}.van-toast--bottom{-webkit-transform:translateY(30vh);transform:translateY(30vh)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/toast/toast.js b/miniprogram/miniprogram_npm/@vant/weapp/toast/toast.js
new file mode 100644
index 0000000..96c5d11
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/toast/toast.js
@@ -0,0 +1,92 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var utils_1 = require('../common/utils');
+var defaultOptions = {
+  type: 'text',
+  mask: false,
+  message: '',
+  show: true,
+  zIndex: 1000,
+  duration: 2000,
+  position: 'middle',
+  forbidClick: false,
+  loadingType: 'circular',
+  selector: '#van-toast',
+};
+var queue = [];
+var currentOptions = __assign({}, defaultOptions);
+function parseOptions(message) {
+  return utils_1.isObj(message) ? message : { message: message };
+}
+function getContext() {
+  var pages = getCurrentPages();
+  return pages[pages.length - 1];
+}
+function Toast(toastOptions) {
+  var options = __assign(
+    __assign({}, currentOptions),
+    parseOptions(toastOptions)
+  );
+  var context = options.context || getContext();
+  var toast = context.selectComponent(options.selector);
+  if (!toast) {
+    console.warn('未找到 van-toast 节点，请确认 selector 及 context 是否正确');
+    return;
+  }
+  delete options.context;
+  delete options.selector;
+  toast.clear = function () {
+    toast.setData({ show: false });
+    if (options.onClose) {
+      options.onClose();
+    }
+  };
+  queue.push(toast);
+  toast.setData(options);
+  clearTimeout(toast.timer);
+  if (options.duration > 0) {
+    toast.timer = setTimeout(function () {
+      toast.clear();
+      queue = queue.filter(function (item) {
+        return item !== toast;
+      });
+    }, options.duration);
+  }
+  return toast;
+}
+var createMethod = function (type) {
+  return function (options) {
+    return Toast(__assign({ type: type }, parseOptions(options)));
+  };
+};
+Toast.loading = createMethod('loading');
+Toast.success = createMethod('success');
+Toast.fail = createMethod('fail');
+Toast.clear = function () {
+  queue.forEach(function (toast) {
+    toast.clear();
+  });
+  queue = [];
+};
+Toast.setDefaultOptions = function (options) {
+  Object.assign(currentOptions, options);
+};
+Toast.resetDefaultOptions = function () {
+  currentOptions = __assign({}, defaultOptions);
+};
+exports.default = Toast;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/transition/index.js b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.js
new file mode 100644
index 0000000..f3c96e4
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.js
@@ -0,0 +1,15 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var transition_1 = require('../mixins/transition');
+component_1.VantComponent({
+  classes: [
+    'enter-class',
+    'enter-active-class',
+    'enter-to-class',
+    'leave-class',
+    'leave-active-class',
+    'leave-to-class',
+  ],
+  mixins: [transition_1.transition(true)],
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/transition/index.json b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxml
new file mode 100644
index 0000000..412e8af
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxml
@@ -0,0 +1,8 @@
+<view
+  wx:if="{{ inited }}"
+  class="van-transition custom-class {{ classes }}"
+  style="-webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }} {{ customStyle }}"
+  bind:transitionend="onTransitionEnd"
+>
+  <slot />
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxss
new file mode 100644
index 0000000..d459f5c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/transition/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-transition{transition-timing-function:ease}.van-fade-enter-active,.van-fade-leave-active{transition-property:opacity}.van-fade-enter,.van-fade-leave-to{opacity:0}.van-fade-down-enter-active,.van-fade-down-leave-active,.van-fade-left-enter-active,.van-fade-left-leave-active,.van-fade-right-enter-active,.van-fade-right-leave-active,.van-fade-up-enter-active,.van-fade-up-leave-active{transition-property:opacity,-webkit-transform;transition-property:opacity,transform;transition-property:opacity,transform,-webkit-transform}.van-fade-up-enter,.van-fade-up-leave-to{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);opacity:0}.van-fade-down-enter,.van-fade-down-leave-to{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);opacity:0}.van-fade-left-enter,.van-fade-left-leave-to{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);opacity:0}.van-fade-right-enter,.van-fade-right-leave-to{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);opacity:0}.van-slide-down-enter-active,.van-slide-down-leave-active,.van-slide-left-enter-active,.van-slide-left-leave-active,.van-slide-right-enter-active,.van-slide-right-leave-active,.van-slide-up-enter-active,.van-slide-up-leave-active{transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform}.van-slide-up-enter,.van-slide-up-leave-to{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.van-slide-down-enter,.van-slide-down-leave-to{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}.van-slide-left-enter,.van-slide-left-leave-to{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.van-slide-right-enter,.van-slide-right-leave-to{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.js b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.js
new file mode 100644
index 0000000..67b5422
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.js
@@ -0,0 +1,69 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+component_1.VantComponent({
+  classes: [
+    'main-item-class',
+    'content-item-class',
+    'main-active-class',
+    'content-active-class',
+    'main-disabled-class',
+    'content-disabled-class',
+  ],
+  props: {
+    items: {
+      type: Array,
+      observer: 'updateSubItems',
+    },
+    activeId: null,
+    mainActiveIndex: {
+      type: Number,
+      value: 0,
+      observer: 'updateSubItems',
+    },
+    height: {
+      type: [Number, String],
+      value: 300,
+    },
+    max: {
+      type: Number,
+      value: Infinity,
+    },
+  },
+  data: {
+    subItems: [],
+  },
+  methods: {
+    // 当一个子项被选择时
+    onSelectItem: function (event) {
+      var item = event.currentTarget.dataset.item;
+      var isArray = Array.isArray(this.data.activeId);
+      // 判断有没有超出右侧选择的最大数
+      var isOverMax = isArray && this.data.activeId.length >= this.data.max;
+      // 判断该项有没有被选中, 如果有被选中，则忽视是否超出的条件
+      var isSelected = isArray
+        ? this.data.activeId.indexOf(item.id) > -1
+        : this.data.activeId === item.id;
+      if (!item.disabled && (!isOverMax || isSelected)) {
+        this.$emit('click-item', item);
+      }
+    },
+    // 当一个导航被点击时
+    onClickNav: function (event) {
+      var index = event.detail;
+      var item = this.data.items[index];
+      if (!item.disabled) {
+        this.$emit('click-nav', { index: index });
+      }
+    },
+    // 更新子项列表
+    updateSubItems: function () {
+      var _a = this.data,
+        items = _a.items,
+        mainActiveIndex = _a.mainActiveIndex;
+      var _b = (items[mainActiveIndex] || {}).children,
+        children = _b === void 0 ? [] : _b;
+      return this.set({ subItems: children });
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.json b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.json
new file mode 100644
index 0000000..42991a2
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.json
@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-sidebar": "../sidebar/index",
+    "van-sidebar-item": "../sidebar-item/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxml
new file mode 100644
index 0000000..547a94a
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxml
@@ -0,0 +1,39 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="wxs" />
+
+<view
+  class="van-tree-select"
+  style="height: {{ utils.addUnit(height) }}"
+>
+  <scroll-view scroll-y class="van-tree-select__nav">
+    <van-sidebar active-key="{{ mainActiveIndex }}" bind:change="onClickNav" custom-class="van-tree-select__nav__inner">
+      <van-sidebar-item
+        wx:for="{{ items }}"
+        wx:key="index"
+        custom-class="main-item-class"
+        active-class="main-active-class"
+        disabled-class="main-disabled-class"
+        title="{{ item.text }}"
+        disabled="{{ item.disabled }}"
+      />
+    </van-sidebar>
+  </scroll-view>
+  <scroll-view scroll-y class="van-tree-select__content">
+    <slot name="content" />
+    <view
+      wx:for="{{ subItems }}"
+      wx:key="id"
+      class="van-ellipsis content-item-class {{ utils.bem('tree-select__item', { active: wxs.isActive(activeId, item.id), disabled: item.disabled }) }} {{ wxs.isActive(activeId, item.id) ? 'content-active-class' : '' }} {{ item.disabled ? 'content-disabled-class' : '' }}"
+      data-item="{{ item }}"
+      bind:tap="onSelectItem"
+    >
+      {{ item.text }}
+      <van-icon
+        wx:if="{{ wxs.isActive(activeId, item.id) }}"
+        name="checked"
+        size="16px"
+        class="van-tree-select__selected"
+      />
+    </view>
+  </scroll-view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxs b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxs
new file mode 100644
index 0000000..b1cbb39
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxs
@@ -0,0 +1,12 @@
+/* eslint-disable */
+var array = require('../wxs/array.wxs');
+
+function isActive (activeList, itemId) {
+  if (array.isArray(activeList)) {
+    return activeList.indexOf(itemId) > -1;
+  }
+
+  return activeList === itemId;
+}
+
+module.exports.isActive = isActive;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxss
new file mode 100644
index 0000000..3f7cca6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/tree-select/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-tree-select{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none;font-size:14px;font-size:var(--tree-select-font-size,14px)}.van-tree-select__nav{-webkit-flex:1;flex:1;background-color:#f7f8fa;background-color:var(--tree-select-nav-background-color,#f7f8fa);--sidebar-padding:12px 8px 12px 12px}.van-tree-select__nav__inner{width:100%!important;height:100%}.van-tree-select__content{-webkit-flex:2;flex:2;background-color:#fff;background-color:var(--tree-select-content-background-color,#fff)}.van-tree-select__item{position:relative;font-weight:700;padding:0 32px 0 16px;padding:0 32px 0 var(--padding-md,16px);line-height:44px;line-height:var(--tree-select-item-height,44px)}.van-tree-select__item--active{color:#ee0a24;color:var(--tree-select-item-active-color,#ee0a24)}.van-tree-select__item--disabled{color:#c8c9cc;color:var(--tree-select-item-disabled-color,#c8c9cc)}.van-tree-select__selected{position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);right:16px;right:var(--padding-md,16px)}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.js b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.js
new file mode 100644
index 0000000..56c03d6
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.js
@@ -0,0 +1,226 @@
+'use strict';
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s)
+            if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+var component_1 = require('../common/component');
+var utils_1 = require('./utils');
+var shared_1 = require('./shared');
+component_1.VantComponent({
+  props: __assign(
+    __assign(
+      {
+        disabled: Boolean,
+        multiple: Boolean,
+        uploadText: String,
+        useBeforeRead: Boolean,
+        afterRead: null,
+        beforeRead: null,
+        previewSize: {
+          type: null,
+          value: 90,
+        },
+        name: {
+          type: [Number, String],
+          value: '',
+        },
+        accept: {
+          type: String,
+          value: 'image',
+        },
+        fileList: {
+          type: Array,
+          value: [],
+          observer: 'formatFileList',
+        },
+        maxSize: {
+          type: Number,
+          value: Number.MAX_VALUE,
+        },
+        maxCount: {
+          type: Number,
+          value: 100,
+        },
+        deletable: {
+          type: Boolean,
+          value: true,
+        },
+        showUpload: {
+          type: Boolean,
+          value: true,
+        },
+        previewImage: {
+          type: Boolean,
+          value: true,
+        },
+        previewFullImage: {
+          type: Boolean,
+          value: true,
+        },
+        imageFit: {
+          type: String,
+          value: 'scaleToFill',
+        },
+        uploadIcon: {
+          type: String,
+          value: 'photograph',
+        },
+      },
+      shared_1.chooseImageProps
+    ),
+    shared_1.chooseVideoProps
+  ),
+  data: {
+    lists: [],
+    isInCount: true,
+  },
+  methods: {
+    formatFileList: function () {
+      var _a = this.data,
+        _b = _a.fileList,
+        fileList = _b === void 0 ? [] : _b,
+        maxCount = _a.maxCount;
+      var lists = fileList.map(function (item) {
+        return __assign(__assign({}, item), {
+          isImage:
+            typeof item.isImage === 'undefined'
+              ? utils_1.isImageFile(item)
+              : item.isImage,
+          deletable:
+            typeof item.deletable === 'undefined' ? true : item.deletable,
+        });
+      });
+      this.setData({ lists: lists, isInCount: lists.length < maxCount });
+    },
+    getDetail: function (index) {
+      return {
+        name: this.data.name,
+        index: index == null ? this.data.fileList.length : index,
+      };
+    },
+    startUpload: function () {
+      var _this = this;
+      var _a = this.data,
+        maxCount = _a.maxCount,
+        multiple = _a.multiple,
+        accept = _a.accept,
+        lists = _a.lists,
+        disabled = _a.disabled;
+      if (disabled) return;
+      utils_1
+        .chooseFile(
+          __assign(__assign({}, this.data), {
+            maxCount: maxCount - lists.length,
+          })
+        )
+        .then(function (res) {
+          var file = null;
+          if (utils_1.isVideo(res, accept)) {
+            file = __assign({ path: res.tempFilePath }, res);
+          } else {
+            file = multiple ? res.tempFiles : res.tempFiles[0];
+          }
+          _this.onBeforeRead(file);
+        })
+        .catch(function (error) {
+          _this.$emit('error', error);
+        });
+    },
+    onBeforeRead: function (file) {
+      var _this = this;
+      var _a = this.data,
+        beforeRead = _a.beforeRead,
+        useBeforeRead = _a.useBeforeRead;
+      var res = true;
+      if (typeof beforeRead === 'function') {
+        res = beforeRead(file, this.getDetail());
+      }
+      if (useBeforeRead) {
+        res = new Promise(function (resolve, reject) {
+          _this.$emit(
+            'before-read',
+            __assign(__assign({ file: file }, _this.getDetail()), {
+              callback: function (ok) {
+                ok ? resolve() : reject();
+              },
+            })
+          );
+        });
+      }
+      if (!res) {
+        return;
+      }
+      if (utils_1.isPromise(res)) {
+        res.then(function (data) {
+          return _this.onAfterRead(data || file);
+        });
+      } else {
+        this.onAfterRead(file);
+      }
+    },
+    onAfterRead: function (file) {
+      var maxSize = this.data.maxSize;
+      var oversize = Array.isArray(file)
+        ? file.some(function (item) {
+            return item.size > maxSize;
+          })
+        : file.size > maxSize;
+      if (oversize) {
+        this.$emit('oversize', __assign({ file: file }, this.getDetail()));
+        return;
+      }
+      if (typeof this.data.afterRead === 'function') {
+        this.data.afterRead(file, this.getDetail());
+      }
+      this.$emit('after-read', __assign({ file: file }, this.getDetail()));
+    },
+    deleteItem: function (event) {
+      var index = event.currentTarget.dataset.index;
+      this.$emit(
+        'delete',
+        __assign(__assign({}, this.getDetail(index)), {
+          file: this.data.fileList[index],
+        })
+      );
+    },
+    onPreviewImage: function (event) {
+      if (!this.data.previewFullImage) return;
+      var index = event.currentTarget.dataset.index;
+      var lists = this.data.lists;
+      var item = lists[index];
+      wx.previewImage({
+        urls: lists
+          .filter(function (item) {
+            return item.isImage;
+          })
+          .map(function (item) {
+            return item.url || item.path;
+          }),
+        current: item.url || item.path,
+        fail: function () {
+          wx.showToast({ title: '预览图片失败', icon: 'none' });
+        },
+      });
+    },
+    onClickPreview: function (event) {
+      var index = event.currentTarget.dataset.index;
+      var item = this.data.lists[index];
+      this.$emit(
+        'click-preview',
+        __assign(__assign({}, item), this.getDetail(index))
+      );
+    },
+  },
+});
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.json b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.json
new file mode 100644
index 0000000..e00a588
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index",
+    "van-loading": "../loading/index"
+  }
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxml
new file mode 100644
index 0000000..bce0a49
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxml
@@ -0,0 +1,68 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="van-uploader">
+  <view class="van-uploader__wrapper">
+    <!-- 预览样式 -->
+    <view
+      wx:if="{{ previewImage }}"
+      wx:for="{{ lists }}"
+      wx:key="index"
+      class="van-uploader__preview"
+      data-index="{{ index }}"
+      bindtap="onClickPreview"
+    >
+      <image
+        wx:if="{{ item.isImage }}"
+        mode="{{ imageFit }}"
+        src="{{ item.url || item.path }}"
+        alt="{{ item.name || ('图片' + index) }}"
+        class="van-uploader__preview-image"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
+        data-index="{{ index }}"
+        bind:tap="onPreviewImage"
+      />
+      <view
+        wx:else
+        class="van-uploader__file"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
+      >
+        <van-icon name="description" class="van-uploader__file-icon" />
+        <view class="van-uploader__file-name van-ellipsis">{{ item.name || item.url || item.path }}</view>
+      </view>
+      <view
+        wx:if="{{ item.status === 'uploading' || item.status === 'failed' }}"
+        class="van-uploader__mask"
+      >
+       <van-icon wx:if="{{ item.status === 'failed' }}" name="warning-o" class="van-uploader__mask-icon" />
+       <van-loading wx:else class="van-uploader__loading" />
+       <text wx:if="{{ item.message }}" class="van-uploader__upload-text">{{ item.message }}</text>
+      </view>
+      <view
+        wx:if="{{ deletable && item.deletable }}"
+        data-index="{{ index }}"
+        class="van-uploader__preview-delete"
+        catch:tap="deleteItem"
+      >
+      <van-icon name="clear" class="van-uploader__preview-delete__icon" />
+    </view>
+    </view>
+
+    <!-- 上传样式 -->
+    <block wx:if="{{ isInCount }}">
+      <view class="van-uploader__slot" bind:tap="startUpload">
+        <slot />
+      </view>
+
+      <!-- 默认上传样式 -->
+      <view
+        wx:if="{{ showUpload }}"
+        class="van-uploader__upload {{ disabled ? 'van-uploader__upload--disabled': ''}}"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
+        bindtap="startUpload"
+      >
+        <van-icon name="{{ uploadIcon }}" class="van-uploader__upload-icon" />
+        <text wx:if="{{ uploadText }}" class="van-uploader__upload-text">{{ uploadText }}</text>
+      </view>
+    </block>
+  </view>
+</view>
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxss b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxss
new file mode 100644
index 0000000..b1fd959
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/uploader/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:8px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:8px}.van-uploader__preview-delete{position:absolute;top:0;right:0;z-index:1;display:-webkit-flex;display:flex;padding:10px;border-radius:50%;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%)}.van-uploader__preview-delete__icon{color:#969799;font-size:18px;background-color:#fff;border-radius:50%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:8px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88);border-radius:8px}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff}
\ No newline at end of file
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/uploader/shared.js b/miniprogram/miniprogram_npm/@vant/weapp/uploader/shared.js
new file mode 100644
index 0000000..9418618
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/uploader/shared.js
@@ -0,0 +1,33 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.chooseVideoProps = exports.chooseImageProps = void 0;
+// props for choose image
+exports.chooseImageProps = {
+  sizeType: {
+    type: Array,
+    value: ['original', 'compressed'],
+  },
+  capture: {
+    type: Array,
+    value: ['album', 'camera'],
+  },
+};
+// props for choose video
+exports.chooseVideoProps = {
+  capture: {
+    type: Array,
+    value: ['album', 'camera'],
+  },
+  compressed: {
+    type: Boolean,
+    value: true,
+  },
+  maxDuration: {
+    type: Number,
+    value: 60,
+  },
+  camera: {
+    type: String,
+    value: 'back',
+  },
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/uploader/utils.js b/miniprogram/miniprogram_npm/@vant/weapp/uploader/utils.js
new file mode 100644
index 0000000..082374e
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/uploader/utils.js
@@ -0,0 +1,91 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.isPromise = exports.isObject = exports.isFunction = exports.chooseFile = exports.isVideo = exports.isImageFile = void 0;
+var IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i;
+function isImageUrl(url) {
+  return IMAGE_REGEXP.test(url);
+}
+function isImageFile(item) {
+  if (item.type) {
+    return item.type.indexOf('image') === 0;
+  }
+  if (item.path) {
+    return isImageUrl(item.path);
+  }
+  if (item.url) {
+    return isImageUrl(item.url);
+  }
+  return false;
+}
+exports.isImageFile = isImageFile;
+function isVideo(res, accept) {
+  return accept === 'video';
+}
+exports.isVideo = isVideo;
+function chooseFile(_a) {
+  var accept = _a.accept,
+    multiple = _a.multiple,
+    capture = _a.capture,
+    compressed = _a.compressed,
+    maxDuration = _a.maxDuration,
+    sizeType = _a.sizeType,
+    camera = _a.camera,
+    maxCount = _a.maxCount;
+  switch (accept) {
+    case 'image':
+      return new Promise(function (resolve, reject) {
+        wx.chooseImage({
+          count: multiple ? Math.min(maxCount, 9) : 1,
+          sourceType: capture,
+          sizeType: sizeType,
+          success: resolve,
+          fail: reject,
+        });
+      });
+    case 'media':
+      return new Promise(function (resolve, reject) {
+        wx.chooseMedia({
+          count: multiple ? Math.min(maxCount, 9) : 1,
+          sourceType: capture,
+          maxDuration: maxDuration,
+          sizeType: sizeType,
+          camera: camera,
+          success: resolve,
+          fail: reject,
+        });
+      });
+    case 'video':
+      return new Promise(function (resolve, reject) {
+        wx.chooseVideo({
+          sourceType: capture,
+          compressed: compressed,
+          maxDuration: maxDuration,
+          camera: camera,
+          success: resolve,
+          fail: reject,
+        });
+      });
+    default:
+      return new Promise(function (resolve, reject) {
+        wx.chooseMessageFile({
+          count: multiple ? maxCount : 1,
+          type: 'file',
+          success: resolve,
+          fail: reject,
+        });
+      });
+  }
+}
+exports.chooseFile = chooseFile;
+function isFunction(val) {
+  return typeof val === 'function';
+}
+exports.isFunction = isFunction;
+function isObject(val) {
+  return val !== null && typeof val === 'object';
+}
+exports.isObject = isObject;
+function isPromise(val) {
+  return isObject(val) && isFunction(val.then) && isFunction(val.catch);
+}
+exports.isPromise = isPromise;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/wxs/add-unit.wxs b/miniprogram/miniprogram_npm/@vant/weapp/wxs/add-unit.wxs
new file mode 100644
index 0000000..27a22d8
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/wxs/add-unit.wxs
@@ -0,0 +1,14 @@
+/* eslint-disable */
+var REGEXP = getRegExp('^\d+(\.\d+)?$');
+
+function addUnit(value) {
+  if (value == null) {
+    return undefined;
+  }
+
+  return REGEXP.test('' + value) ? value + 'px' : value;
+}
+
+module.exports = {
+  addUnit: addUnit
+};
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/wxs/array.wxs b/miniprogram/miniprogram_npm/@vant/weapp/wxs/array.wxs
new file mode 100644
index 0000000..610089c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/wxs/array.wxs
@@ -0,0 +1,5 @@
+function isArray(array) {
+  return array && array.constructor === 'Array';
+}
+
+module.exports.isArray = isArray;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/wxs/bem.wxs b/miniprogram/miniprogram_npm/@vant/weapp/wxs/bem.wxs
new file mode 100644
index 0000000..93b2777
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/wxs/bem.wxs
@@ -0,0 +1,38 @@
+var array = require('./array.wxs');
+var object = require('./object.wxs');
+var PREFIX = 'van-';
+
+function join(name, mods) {
+  name = PREFIX + name;
+  mods = mods.map(function(mod) {
+    return name + '--' + mod;
+  });
+  mods.unshift(name);
+  return mods.join(' ');
+}
+
+function traversing(mods, conf) {
+  if (!conf) {
+    return;
+  }
+
+  if (typeof conf === 'string' || typeof conf === 'number') {
+    mods.push(conf);
+  } else if (array.isArray(conf)) {
+    conf.forEach(function(item) {
+      traversing(mods, item);
+    });
+  } else if (typeof conf === 'object') {
+    object.keys(conf).forEach(function(key) {
+      conf[key] && mods.push(key);
+    });
+  }
+}
+
+function bem(name, conf) {
+  var mods = [];
+  traversing(mods, conf);
+  return join(name, mods);
+}
+
+module.exports.bem = bem;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/wxs/memoize.wxs b/miniprogram/miniprogram_npm/@vant/weapp/wxs/memoize.wxs
new file mode 100644
index 0000000..261ae67
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/wxs/memoize.wxs
@@ -0,0 +1,54 @@
+/**
+ * Simple memoize
+ * wxs doesn't support fn.apply, so this memoize only support up to 2 args
+ */
+
+function isPrimitive(value) {
+  var type = typeof value;
+  return (
+    type === 'boolean' ||
+    type === 'number' ||
+    type === 'string' ||
+    type === 'undefined' ||
+    value === null
+  );
+}
+
+// mock simple fn.call in wxs
+function call(fn, args) {
+  if (args.length === 2) {
+    return fn(args[0], args[1]);
+  }
+
+  if (args.length === 1) {
+    return fn(args[0]);
+  }
+
+  return fn();
+}
+
+function serializer(args) {
+  if (args.length === 1 && isPrimitive(args[0])) {
+    return args[0];
+  }
+  var obj = {};
+  for (var i = 0; i < args.length; i++) {
+    obj['key' + i] = args[i];
+  }
+  return JSON.stringify(obj);
+}
+
+function memoize(fn) {
+  var cache = {};
+
+  return function() {
+    var key = serializer(arguments);
+    if (cache[key] === undefined) {
+      cache[key] = call(fn, arguments);
+    }
+
+    return cache[key];
+  };
+}
+
+module.exports.memoize = memoize;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/wxs/object.wxs b/miniprogram/miniprogram_npm/@vant/weapp/wxs/object.wxs
new file mode 100644
index 0000000..e077107
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/wxs/object.wxs
@@ -0,0 +1,13 @@
+/* eslint-disable */
+var REGEXP = getRegExp('{|}|"', 'g');
+
+function keys(obj) {
+  return JSON.stringify(obj)
+    .replace(REGEXP, '')
+    .split(',')
+    .map(function(item) {
+      return item.split(':')[0];
+    });
+}
+
+module.exports.keys = keys;
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/wxs/utils.wxs b/miniprogram/miniprogram_npm/@vant/weapp/wxs/utils.wxs
new file mode 100644
index 0000000..d5c9d8c
--- /dev/null
+++ b/miniprogram/miniprogram_npm/@vant/weapp/wxs/utils.wxs
@@ -0,0 +1,10 @@
+/* eslint-disable */
+var bem = require('./bem.wxs').bem;
+var memoize = require('./memoize.wxs').memoize;
+var addUnit = require('./add-unit.wxs').addUnit;
+
+module.exports = {
+  bem: memoize(bem),
+  memoize: memoize,
+  addUnit: addUnit
+};
diff --git a/miniprogram/newComponents/number/index.js b/miniprogram/newComponents/number/index.js
new file mode 100644
index 0000000..8652f71
--- /dev/null
+++ b/miniprogram/newComponents/number/index.js
@@ -0,0 +1,55 @@
+// newComponents/number/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    number: {
+      type: Number,
+    },
+  },
+  observers: {
+    number:function(val){
+      this.numberArr()
+    }
+  },
+  lifetimes: {
+    created: function(){
+    //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+   
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+       
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+        this.numberArr();
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+},
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    people:[]
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  
+  methods: {
+    numberArr(){
+      var n = this.data.number.toString().split('')
+      this.setData({
+        people:n
+      })
+      
+    }
+  }
+})
diff --git a/miniprogram/newComponents/number/index.json b/miniprogram/newComponents/number/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/newComponents/number/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/newComponents/number/index.wxml b/miniprogram/newComponents/number/index.wxml
new file mode 100644
index 0000000..21179b6
--- /dev/null
+++ b/miniprogram/newComponents/number/index.wxml
@@ -0,0 +1,6 @@
+<!--newComponents/number/index.wxml-->
+<view class="number_max">
+    <view class="number_min">
+        <view class="number_con" wx:for="{{people}}" wx:key="index">{{item}}</view>
+    </view>
+</view>
diff --git a/miniprogram/newComponents/number/index.wxss b/miniprogram/newComponents/number/index.wxss
new file mode 100644
index 0000000..821ae20
--- /dev/null
+++ b/miniprogram/newComponents/number/index.wxss
@@ -0,0 +1,46 @@
+/* newComponents/number/index.wxss */
+/* @font-face {
+    font-family: "numberfont";
+    src: url("../../fonts/PUTHIAfont.eot");
+    src:url("../../fonts/PUTHIAfont.eot") format("embedded-opentype"),
+    url("../../fonts/PUTHIAfont.svg") format("svg"),
+    url("../../fonts/PUTHIAfont.ttf") format("truetype"),
+    url("../../fonts/PUTHIAfont.woff") format("woff"),
+} */
+.number_max{
+    padding: 20rpx 0;
+}
+.number_min{
+    display: flex;
+    align-items: center;
+    
+}
+.number_con{
+    width: 40rpx;
+    height: 70rpx;
+    background: url("http://fileimg.makalu.cc/WEB_3976596DEC1B4726BDDB70F17DC3D58D.png") no-repeat center/100% 100%;
+    font-family: 'numberfont' !important;
+    text-align: center;
+    line-height: 70rpx;
+    font-size: 35rpx;
+    margin-right: 10rpx;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/newComponents/safety-bar-chart/index.js b/miniprogram/newComponents/safety-bar-chart/index.js
new file mode 100644
index 0000000..b651c2f
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chart/index.js
@@ -0,0 +1,264 @@
+// components/safety-pie-chart/index.js
+import * as echarts from '../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        data:{
+            type: Array
+        },
+        height:{
+            type: Number
+        }
+
+    },
+    observers: {
+        data: function (val) {
+            console.log(val)
+            this.initChart() 
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            this.component.init((canvas, width, height, dpr) => {
+                let chart = echarts.init(canvas, null, {
+                    width: width,
+                    height: height,
+                    devicePixelRatio: dpr
+                })
+                chart.setOption(this.getData());
+                return chart;
+            })
+        },
+        getData() {
+            var data = this.data.data
+        
+            var max = data[0].total
+            var nameData = [];
+            var totalData = []
+            var background = []
+            var yesMonitor = []
+            var notMonitor = []
+            var yesProp = []
+            var notProp = []
+            var unitData = []
+
+            for (let i = data.length-1; i >=0 ; i--) {
+                nameData.push(data[i].name);
+                totalData.push(data[i].total)
+                unitData.push(data[i].unit)
+                background.push(100);
+                yesMonitor.push(data[i].yesMonitor);
+                notMonitor.push(data[i].notMonitor);
+                yesProp.push((data[i].yesMonitor/max)*100)
+                notProp.push((data[i].notMonitor/max)*100)
+            }
+
+            var legend = ["已监控", "未监控"]
+          
+            var option =  {
+                grid: {
+                    //图表的位置
+                    top: "8%",
+                    left: "3%",
+                    right: "5%",
+                    bottom: "-12%",
+                    containLabel: true,
+                },
+                legend: {
+                    top: "0",
+                    //icon: "circle",
+                    itemWidth: 10,
+                    itemHeight:10,
+                    itemGap: 8,
+                    textStyle: {
+                        fontSize: 12,
+                        color:'#c6d9fa'
+                    },
+                    data: legend,
+                },
+                xAxis: [{
+                    show: false,
+                },
+                    //由于下边X轴已经是百分比刻度了,所以需要在顶部加一个X轴,刻度是金额,也隐藏掉
+                    {
+                        show: false,
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'category',
+                        axisLabel: {
+                            show: false, //让Y轴数据不显示
+                        },
+                        itemStyle: {
+
+                        },
+                        axisTick: {
+                            show: false, //隐藏Y轴刻度
+                        },
+                        axisLine: {
+                            show: false, //隐藏Y轴线段
+                        },
+                        data: [],
+                    },{
+                        show: false,
+                        data: [],
+                        axisLine: {
+                            show: false
+                        }
+                    }],
+                series: [
+                    //数据条--------------------我是分割线君------------------------------//
+                    {
+                        show: true,
+                        type: 'bar',
+                        xAxisIndex: 1, //代表使用第二个X轴刻度!!!!!!!!!!!!!!!!!!!!!!!!
+                        barGap: '-100%',
+                        barWidth: '6', //统计条宽度
+                        itemStyle: {
+                            normal: {
+                                color: 'rgba(22,203,115,0.05)'
+                            },
+                        },
+                        label: {
+                            normal: {
+                                show: true,
+                                //label 的position位置可以是top bottom left,right,也可以是固定值
+                                //在这里需要上下统一对齐,所以用固定值
+                                position: [0, '-20'],
+                                rich: { //富文本
+                                    prop: { //自定义颜色
+                                        color: '#c6d9fa',
+                                        fontSize:'14',
+                                    },
+                                    unit:{
+                                        color: '#6c829a',
+                                        fontSize:'12',
+                                    },
+                                    yes:{
+                                        color: '#55adf7',
+                                        fontSize:'14',
+                                    },
+                                    not:{
+                                        color: '#4677fa',
+                                        fontSize:'14',
+                                    },
+                                    index:{
+                                        color: '#fcbc02',
+                                        fontStyle: 'italic',
+                                        padding:[0,0,0,5],
+                                        fontSize:'14',
+                                    },
+                                    name: {
+                                        width: 120,
+                                        color: '#c6d9fa',
+                                        padding:[0,0,0,10],
+                                        fontSize:'14',
+                                    },
+                                    color:{
+                                        color: '#8ca2be',
+                                        fontSize:'14',
+                                    },
+                                   
+
+                                },
+                                formatter: function(data) {
+                                    //富文本固定格式{colorName|这里填你想要写的内容}
+                                    //return '{arrow|}'
+                                    return '{index|No.'+(nameData.length-data.dataIndex)+'}{name|' + nameData[data.dataIndex] + '}{prop|' + totalData[data.dataIndex] + '}{unit| '+unitData[data.dataIndex]+'}{prop|（} {yes|'+yesMonitor[data.dataIndex]+'}{unit| '+unitData[data.dataIndex]+'/}{not|'+notMonitor[data.dataIndex]+'}{unit| '+unitData[data.dataIndex]+'}{prop|）} ';
+                                },
+                            }
+                        },
+                        data: background
+                    },
+                    {
+                        type: 'bar',
+
+                        silent: true,
+                        yAxisIndex: 1,
+                        barWidth: 6,
+                        itemStyle: {
+                            normal: {
+                                color: 'rgba(0,82,198,0.3)'
+                            },
+                            emphasis: {
+                                color: 'rgba(0,82,198,0.3)'
+                            }
+                        },
+                        data: background
+                },
+                    {
+                    type: 'bar',
+                    name:legend[0],
+
+                    stack: '1',
+                    legendHoverLink: false,
+                    barWidth: 6,
+                    itemStyle: {
+                        normal: {
+                            color: '#52adf4'
+                        },
+                        emphasis: {
+                            color: '#52adf4'
+                        }
+                    },
+                    data: yesProp
+                }, {
+                    type: 'bar',
+                        name:legend[1],
+                    stack: '1',
+                    legendHoverLink: false,
+                    barWidth: 6,
+                    itemStyle: {
+                        normal: {
+                            color: '#4677ff'
+                        },
+                        emphasis: {
+                            color: '#4677ff'
+                        }
+                    },
+                    data: notProp
+                }]
+            };
+
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/newComponents/safety-bar-chart/index.json b/miniprogram/newComponents/safety-bar-chart/index.json
new file mode 100644
index 0000000..b11802e
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chart/index.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/newComponents/safety-bar-chart/index.wxml b/miniprogram/newComponents/safety-bar-chart/index.wxml
new file mode 100644
index 0000000..d56ac15
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chart/index.wxml
@@ -0,0 +1,4 @@
+<!--components/bar-chart/index.wxml-->
+<view class="chart_canvas" style="height:{{height+'rpx'}}">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/newComponents/safety-bar-chart/index.wxss b/miniprogram/newComponents/safety-bar-chart/index.wxss
new file mode 100644
index 0000000..e14d6ee
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chart/index.wxss
@@ -0,0 +1,5 @@
+/* components/bar-chart/index.wxss */
+.chart_canvas{
+    width: 100%;
+    position: relative;
+}
diff --git a/miniprogram/newComponents/safety-bar-charts/index.js b/miniprogram/newComponents/safety-bar-charts/index.js
new file mode 100644
index 0000000..c2c592d
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-charts/index.js
@@ -0,0 +1,273 @@
+// components/safety-pie-chart/index.js
+import * as echarts from '../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        data:{
+            type: Array
+        },
+        height:{
+            type: Number
+        }
+
+    },
+    observers: {
+        data: function (val) {
+            this.initChart() 
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            if(this.component){
+                this.component.init((canvas, width, height, dpr) => {
+                    let chart = echarts.init(canvas, null, {
+                        width: width,
+                        height: height,
+                        devicePixelRatio: dpr
+                    })
+                    chart.setOption(this.getData());
+                    return chart;
+                })
+            }
+            
+        },
+        getData() {
+            var data = this.data.data
+        
+            var max = data[0].total
+            var nameData = [];
+            var totalData = []
+            var background = []
+            var yesMonitor = []
+            var notMonitor = []
+            var yesProp = []
+            var notProp = []
+            var unitData = []
+
+            for (let i = data.length-1; i >=0 ; i--) {
+                nameData.push(data[i].name);
+                totalData.push(data[i].total)
+                unitData.push(data[i].unit)
+                background.push(100);
+                yesMonitor.push(data[i].yesMonitor);
+                notMonitor.push(data[i].notMonitor);
+                yesProp.push((data[i].yesMonitor/max)*100)
+                notProp.push((data[i].notMonitor/max)*100)
+            }
+
+            var legend = ["已监控", "未监控"]
+          
+            var option =  {
+                grid: {
+                    //图表的位置
+                    top: "8%",
+                    left: "3%",
+                    right: "5%",
+                    bottom: "-12%",
+                    containLabel: true,
+                },
+                // legend: {
+                //     top: "0",
+                //     //icon: "circle",
+                //     itemWidth: 10,
+                //     itemHeight:10,
+                //     itemGap: 8,
+                //     textStyle: {
+                //         fontSize: 12,
+                //         color:'#c6d9fa'
+                //     },
+                //     // data: legend,
+                // },
+                xAxis: [{
+                    show: false,
+                },
+                    //由于下边X轴已经是百分比刻度了,所以需要在顶部加一个X轴,刻度是金额,也隐藏掉
+                    {
+                        show: false,
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'category',
+                        axisLabel: {
+                            show: false, //让Y轴数据不显示
+                        },
+                        itemStyle: {
+
+                        },
+                        axisTick: {
+                            show: false, //隐藏Y轴刻度
+                        },
+                        axisLine: {
+                            show: false, //隐藏Y轴线段
+                        },
+                        data: [],
+                    },{
+                        show: false,
+                        data: [],
+                        axisLine: {
+                            show: false
+                        }
+                    }],
+                series: [
+                    //数据条--------------------我是分割线君------------------------------//
+                    {
+                        show: true,
+                        type: 'bar',
+                        xAxisIndex: 1, //代表使用第二个X轴刻度!!!!!!!!!!!!!!!!!!!!!!!!
+                        barGap: '-100%',
+                        barWidth: '6', //统计条宽度
+                        itemStyle: {
+                            normal: {
+                                color: 'rgba(22,203,115,0.05)'
+                            },
+                        },
+                        label: {
+                            normal: {
+                                show: true,
+                                //label 的position位置可以是top bottom left,right,也可以是固定值
+                                //在这里需要上下统一对齐,所以用固定值
+                                position: [0, '-20'],
+                                rich: { //富文本
+                                    prop: { //自定义颜色
+                                        color: '#c6d9fa',
+                                        fontSize:'14',
+                                    },
+                                    unit:{
+                                        color: '#6c829a',
+                                        fontSize:'12',
+                                    },
+                                    yes:{
+                                        color: '#55adf7',
+                                        fontSize:'14',
+                                    },
+                                    // not:{
+                                    //     color: '#4677fa',
+                                    //     fontSize:'14',
+                                    // },
+                                    index:{
+                                        color: '#fcbc02',
+                                        fontStyle: 'italic',
+                                        padding:[0,0,0,5],
+                                        fontSize:'14',
+                                    },
+                                    name: {
+                                        width: 120,
+                                        color: '#c6d9fa',
+                                        padding:[0,0,0,10],
+                                        fontSize:'14',
+                                    },
+                                    color:{
+                                        color: '#8ca2be',
+                                        fontSize:'14',
+                                    },
+                                    // arrow:{
+                                    //     width:20,
+                                    //     height:15,
+                                    //     backgroundColor: {
+                                    //         image: "http://fileimg.makalu.cc/WEB_2B7C06210CD44D55BFEE6205A35DE4A7.png",
+                                    //     },
+                                    // },
+
+                                },
+                                formatter: function(data) {
+                                    //富文本固定格式{colorName|这里填你想要写的内容}
+                                    //return '{arrow|}'
+                                    // return '{arrow|}{name|' + text[data.dataIndex] + '}{prop|' + value[data.dataIndex] + '}{color| 人}   {prop|'+prop[data.dataIndex]+'}{color| %} ';
+                                    return '{index|No.'+(nameData.length-data.dataIndex)+'}{name|' + nameData[data.dataIndex] + '}               {prop|} {yes|'+((Number(yesMonitor[data.dataIndex] / totalData[data.dataIndex]) * 100).toFixed(1))+'}{unit| '+unitData[data.dataIndex]+'}';
+                                },
+                            }
+                        },
+                        data: background
+                    },
+                    {
+                        type: 'bar',
+
+                        silent: true,
+                        yAxisIndex: 1,
+                        barWidth: 6,
+                        itemStyle: {
+                            normal: {
+                                color: 'rgba(0,82,198,0.3)'
+                            },
+                            emphasis: {
+                                color: 'rgba(0,82,198,0.3)'
+                            }
+                        },
+                        data: background
+                },
+                    {
+                    type: 'bar',
+                    name:legend[0],
+
+                    stack: '1',
+                    legendHoverLink: false,
+                    barWidth: 6,
+                    itemStyle: {
+                        normal: {
+                            color: '#52adf4'
+                        },
+                        emphasis: {
+                            color: '#52adf4'
+                        }
+                    },
+                    data: yesProp
+                }, {
+                    type: 'bar',
+                        name:legend[1],
+                    stack: '1',
+                    legendHoverLink: false,
+                    barWidth: 6,
+                    itemStyle: {
+                        normal: {
+                            color: '#4677ff'
+                        },
+                        emphasis: {
+                            color: '#4677ff'
+                        }
+                    },
+                    data: notProp
+                }]
+            };
+
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/newComponents/safety-bar-charts/index.json b/miniprogram/newComponents/safety-bar-charts/index.json
new file mode 100644
index 0000000..b11802e
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-charts/index.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/newComponents/safety-bar-charts/index.wxml b/miniprogram/newComponents/safety-bar-charts/index.wxml
new file mode 100644
index 0000000..d56ac15
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-charts/index.wxml
@@ -0,0 +1,4 @@
+<!--components/bar-chart/index.wxml-->
+<view class="chart_canvas" style="height:{{height+'rpx'}}">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/newComponents/safety-bar-charts/index.wxss b/miniprogram/newComponents/safety-bar-charts/index.wxss
new file mode 100644
index 0000000..e14d6ee
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-charts/index.wxss
@@ -0,0 +1,5 @@
+/* components/bar-chart/index.wxss */
+.chart_canvas{
+    width: 100%;
+    position: relative;
+}
diff --git a/miniprogram/newComponents/safety-bar-chartss/index.js b/miniprogram/newComponents/safety-bar-chartss/index.js
new file mode 100644
index 0000000..3215086
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chartss/index.js
@@ -0,0 +1,230 @@
+// components/safety-pie-chart/index.js
+import * as echarts from '../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        data:{
+            type: Array
+        },
+        height:{
+            type: Number
+        }
+
+    },
+    observers: {
+        data: function (val) {
+            this.initChart() 
+            this.setData({
+                chartData:val
+            })
+           
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+        chartData:[]
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            if(this.component){
+                this.component.init((canvas, width, height, dpr) => {
+                    let chart = echarts.init(canvas, null, {
+                        width: width,
+                        height: height,
+                        devicePixelRatio: dpr
+                    })
+                    chart.setOption(this.getData());
+                    return chart;
+                })
+            }
+            
+        },
+        getData() {
+            var data = this.data.chartData
+            console.log(data)
+            var yData_1 = []
+            var yData_2 = []
+            var xData = []
+            var legend = ['设计量','应耗量']
+            var unit = '单位：m³'
+
+            data.forEach(item =>{
+                yData_1.push(item.sjQuantity)
+                yData_2.push(item.yesMonitor)
+                xData.push(item.name)
+            })
+            var option = {
+                tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                        type: "shadow",
+                        label: {
+                            show: true,
+                        },
+                    },
+                },
+                grid:{
+                    left: "15%",
+                    top: "25%",
+                    right: "5%",
+                    bottom: "12%",
+                },
+                legend: {
+                    data: legend,
+                    right: 10,
+                    top: 12,
+                    textStyle: {
+                      color: "#fff",
+                    },
+                    itemWidth: 12,
+                    itemHeight: 10,
+                    // itemGap: 35
+                  },
+                xAxis: {
+                    data: xData,
+                    axisLine: {
+                        show: true, //隐藏X轴轴线
+                        lineStyle: {
+                            color: "#2f4472",
+                            width: 1,
+                        },
+                    },
+                    axisTick: {
+                        show: true, //隐藏X轴刻度
+                        alignWithLabel: true,
+                    },
+                    axisLabel: {
+                        show: true,
+                        textStyle: {
+                            color: "#cbdaff", //X轴文字颜色
+                            fontSize: 12,
+                        },
+                        interval: 0,
+
+                    },
+                },
+                yAxis: {
+                    name:unit,
+                    nameTextStyle: {		//Y轴那么的样式
+                        color: '#42d0ff',
+                        fontSize: 12,
+                    },
+                    type: "value",
+                    axisLabel: {
+                        textStyle: {
+                            color: "#cbdaff",
+                        },
+                        formatter: "{value}",
+                    },
+                    splitLine: {
+                        lineStyle: {
+                            type: "dashed",
+                            color: "#2f4472",
+                        },
+                    },
+                    axisLine: {
+                        show: true,
+                        lineStyle: {
+                            color: "#2f4472",
+                        },
+                    },
+                },
+                series: [
+                    {
+                        name: legend[0],
+                        type: "bar",
+                        barWidth: 8,
+                        barGap: 2,
+                        label: {
+                            normal: {
+                                show: true,
+                                position: "top",
+                                color:"#fff"
+                            },
+                        },
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                    {
+                                        offset: 0,
+                                        color: "rgba(64,124,254,1)",
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: "rgba(64,124,254,0.2)",
+                                    },
+                                ]),
+                            },
+                        },
+                        data: yData_1,
+                    },
+                    {
+                        name: legend[1],
+                        type: "bar",
+                        barWidth: 8,
+                        barGap: 2,
+                        label: {
+                            normal: {
+                                show: true,
+                                position: "inside",
+                                color:"#fff"
+                            },
+                        },
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                                    {
+                                        offset: 0,
+                                        color: "rgba(25,210,204,1)",
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: "rgba(25,210,204,0.2)",
+                                    },
+                                ]),
+                            },
+                        },
+                        data: yData_2,
+                    },
+
+                ],
+            };
+
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/newComponents/safety-bar-chartss/index.json b/miniprogram/newComponents/safety-bar-chartss/index.json
new file mode 100644
index 0000000..b11802e
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chartss/index.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/newComponents/safety-bar-chartss/index.wxml b/miniprogram/newComponents/safety-bar-chartss/index.wxml
new file mode 100644
index 0000000..d56ac15
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chartss/index.wxml
@@ -0,0 +1,4 @@
+<!--components/bar-chart/index.wxml-->
+<view class="chart_canvas" style="height:{{height+'rpx'}}">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/newComponents/safety-bar-chartss/index.wxss b/miniprogram/newComponents/safety-bar-chartss/index.wxss
new file mode 100644
index 0000000..e14d6ee
--- /dev/null
+++ b/miniprogram/newComponents/safety-bar-chartss/index.wxss
@@ -0,0 +1,5 @@
+/* components/bar-chart/index.wxss */
+.chart_canvas{
+    width: 100%;
+    position: relative;
+}
diff --git a/miniprogram/newComponents/safety-pie-chart/index.js b/miniprogram/newComponents/safety-pie-chart/index.js
new file mode 100644
index 0000000..0a86526
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-chart/index.js
@@ -0,0 +1,177 @@
+// components/safety-pie-chart/index.js
+import * as echarts from '../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        chartData:{
+            type: Array
+        },
+        title:{
+            type: String
+        }
+    },
+    observers: {
+        chartData: function (val) {
+            console.log(val)
+            this.initChart() 
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            this.component.init((canvas, width, height, dpr) => {
+                let chart = echarts.init(canvas, null, {
+                    width: width,
+                    height: height,
+                    devicePixelRatio: dpr
+                })
+                chart.setOption(this.getData());
+                return chart;
+            })
+        },
+        getData() {
+            var data = this.data.chartData
+            var legendData = []
+            var total = 0
+            for(var i=0;i<data.length;i++){
+                total += Number(data[i].value);
+                legendData.push(data[i].name)
+            }
+            var option = {
+                title: {
+                  text: total,
+                  subtext: this.data.title,
+                  textStyle: {
+                    fontSize: 20,
+                    color: "#0cd4f5",
+                    lineHeight: 15,
+                  },
+                  subtextStyle: {
+                    fontSize: 12,
+                    color: "#d5dcf8",
+                  },
+                  textAlign: "center",
+                  left: "18%",
+                  top: "39%",
+                },
+                tooltip: {
+                  trigger: "item",
+                },
+                legend: {
+                    icon: "vertical",
+                    right: "0%",
+                    top: "center",
+                    orient: "vertical",
+                    itemGap: 20,
+                    itemWidth: 10,
+                    itemHeight: 10,
+                  
+                    data: legendData,
+                    textStyle: {
+                        fontSize: 12,
+                        color: "#c3dbfd",
+                        rich: {
+                            uname: {
+                                width: 75,
+                            },
+                            unum: {
+                                color: "#18DB9F",
+                                width: 40,
+                                align: "center",
+                            },
+                        },
+                    },
+                    formatter(name) {
+                        let res = data.filter((v) => v.name === name);
+                        return "{uname| " + name + "}{unum|" + res[0].value + "}{unum|" + res[0].prop + "%}"
+                        //return `{uname|${name}}{unum|1132}`;
+                    },
+                },
+                color: ['#4775ff','#55adf7','#6662da','#1f6086'],
+                series: [
+                    {
+                        name: "",
+                        type: "pie",
+                        radius: ['38%', '55%'],
+                        center: ["20%", "50%"],
+                        label: {
+                            show: false,
+                        },
+                        labelLine: {
+                            show: false,
+                        },
+                        itemStyle: {
+                            borderWidth: 5,
+                            borderColor: "#1e2336",
+                        },
+                        data: data
+                    },
+                    {
+                        name: "外边框",
+                        type: "pie",
+                        clockWise: false, //顺时加载
+                        hoverAnimation: false, //鼠标移入变大
+                        center: ["20%", "50%"],
+                        radius: ["63%", "63%"],
+                        label: {
+                            normal: {
+                                show: false,
+                            },
+                        },
+                        data: [
+                            {
+                                value: 9,
+                                name: "",
+                                itemStyle: {
+                                    normal: {
+                                        borderWidth: 3,
+                                        borderColor: "#152c65",
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                ],
+            };
+
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/newComponents/safety-pie-chart/index.json b/miniprogram/newComponents/safety-pie-chart/index.json
new file mode 100644
index 0000000..b11802e
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-chart/index.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/newComponents/safety-pie-chart/index.wxml b/miniprogram/newComponents/safety-pie-chart/index.wxml
new file mode 100644
index 0000000..ec79a90
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-chart/index.wxml
@@ -0,0 +1,4 @@
+<!--components/bar-chart/index.wxml-->
+<view class="chart_canvas">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/newComponents/safety-pie-chart/index.wxss b/miniprogram/newComponents/safety-pie-chart/index.wxss
new file mode 100644
index 0000000..34e3afa
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-chart/index.wxss
@@ -0,0 +1,6 @@
+/* components/bar-chart/index.wxss */
+.chart_canvas{
+    height: 400rpx;
+    width: 100%;
+    position: relative;
+}
diff --git a/miniprogram/newComponents/safety-pie-charts/index.js b/miniprogram/newComponents/safety-pie-charts/index.js
new file mode 100644
index 0000000..2f61ebe
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-charts/index.js
@@ -0,0 +1,191 @@
+// components/safety-pie-chart/index.js
+import * as echarts from '../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        chartData:{
+            type: Array
+        },
+        title:{
+            type: String
+        }
+    },
+    observers: {
+        chartData: function (val) {
+            this.initChart() 
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            if(this.component){
+                this.component.init((canvas, width, height, dpr) => {
+                    let chart = echarts.init(canvas, null, {
+                        width: width,
+                        height: height,
+                        devicePixelRatio: dpr
+                    })
+                    chart.setOption(this.getData());
+                    return chart;
+                })
+            }
+            
+        },
+        getData() {
+            var data = this.data.chartData
+            var legendData = []
+            var total = 0
+            for(var i=0;i<data.length;i++){
+                total += Number(data[i].value)
+                legendData.push(data[i].name)
+            }
+            var option = {
+                title: {
+                  text: total.toFixed(1),
+                  subtext: this.data.title,
+                  textStyle: {
+                    fontSize: 20,
+                    color: "#0cd4f5",
+                    lineHeight: 15,
+                  },
+                  subtextStyle: {
+                    fontSize: 12,
+                    color: "#d5dcf8",
+                  },
+                  textAlign: "center",
+                  left: "21%",
+                  top: "39%",
+                },
+                tooltip: {
+                  trigger: "item",
+                },
+                // grid:{
+                //     left:20
+                // },
+                legend: {
+                    icon: "vertical",
+                    // right: "0%",
+                     left: '44%', // 靠左对齐
+                    
+                    top: "center",
+                    orient: "vertical",
+                    // bottom: 40,
+
+                    itemGap: 16,
+                    itemWidth: 8,
+                    itemHeight: 8,
+                    data: legendData,
+                    textStyle: {
+                    
+                        color: "#c3dbfd",
+                        rich: {
+                            uname: {
+                                width: 50,
+                                lineHeight: 20,
+                                fontSize: 9,
+                                // padding:  [10, 10, 10, 10],
+                            },
+                            unum: {
+                                color: "#18DB9F",
+                                // width: 24,
+                                // align: "left",
+                                fontSize: 8,
+                                padding: [10, 0, 0, 5],
+                                // lineHeight: 20
+                            },
+                        },
+                    },
+                    formatter(name) {
+                        let res = data.filter((v) => v.name === name);
+                        return "{uname| " + name + "}\n{unum|" + Number(res[0].value).toFixed(1) + "}{unum|" + res[0].prop + "%}"
+                        //return `{uname|${name}}{unum|1132}`;
+                    },
+                },
+                color: ['#4775ff','#55adf7','#6662da','#1f6086'],
+                series: [
+                    {
+                        name: "",
+                        type: "pie",
+                        radius: ['38%', '55%'],
+                        center: ["22%", "50%"],
+                        label: {
+                            show: false,
+                        },
+                        labelLine: {
+                            show: false,
+                        },
+                        itemStyle: {
+                            borderWidth: 5,
+                            borderColor: "#1e2336",
+                        },
+                        data: data
+                    },
+                    {
+                        name: "外边框",
+                        type: "pie",
+                        clockWise: false, //顺时加载
+                        hoverAnimation: false, //鼠标移入变大
+                        center: ["22%", "50%"],
+                        radius: ["63%", "63%"],
+                        label: {
+                            normal: {
+                                show: false,
+                            },
+                        },
+                        data: [
+                            {
+                                value: 9,
+                                name: "",
+                                itemStyle: {
+                                    normal: {
+                                        borderWidth: 3,
+                                        borderColor: "#152c65",
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                ],
+            };
+
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/newComponents/safety-pie-charts/index.json b/miniprogram/newComponents/safety-pie-charts/index.json
new file mode 100644
index 0000000..b11802e
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-charts/index.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/newComponents/safety-pie-charts/index.wxml b/miniprogram/newComponents/safety-pie-charts/index.wxml
new file mode 100644
index 0000000..ec79a90
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-charts/index.wxml
@@ -0,0 +1,4 @@
+<!--components/bar-chart/index.wxml-->
+<view class="chart_canvas">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/newComponents/safety-pie-charts/index.wxss b/miniprogram/newComponents/safety-pie-charts/index.wxss
new file mode 100644
index 0000000..34e3afa
--- /dev/null
+++ b/miniprogram/newComponents/safety-pie-charts/index.wxss
@@ -0,0 +1,6 @@
+/* components/bar-chart/index.wxss */
+.chart_canvas{
+    height: 400rpx;
+    width: 100%;
+    position: relative;
+}
diff --git a/miniprogram/newComponents/select-person/index.js b/miniprogram/newComponents/select-person/index.js
new file mode 100644
index 0000000..f53adf8
--- /dev/null
+++ b/miniprogram/newComponents/select-person/index.js
@@ -0,0 +1,113 @@
+// newComponents/select-person/index.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        choose:{
+            type:Array
+        },
+        multiple:{
+            type:Boolean,
+            value:true
+        },
+        rectifierData:{
+            type:Array,
+            value:[ 
+                {state:false,name:'党鹏',url:'http://fileimg.makalu.cc/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'},
+                {state:false,name:'董超',url:'http://fileimg.makalu.cc/WEB_B3F05B5BC25C452F90EAA2347833D228.jpg'},
+                {state:false,name:'黄海军',url:'http://fileimg.makalu.cc/WEB_08FE97020FBD49C3A775B97B5FAA05DF.jpg'},
+                {state:false,name:'黄嘉伟',url:'http://fileimg.makalu.cc/WEB_65398BB3CB5A4098B5D222AFB6C286EF.jpg'},
+                {state:false,name:'李鑫',url:'http://fileimg.makalu.cc/WEB_F62AAB25BA4946BB8CC406BA2AAF4CA7.jpg'},
+                {state:false,name:'聂少刚',url:'http://fileimg.makalu.cc/WEB_9D3E6D980B2A4B57AC4A32C16CB384A0.jpg'},
+                {state:false,name:'王晨',url:'http://fileimg.makalu.cc/WEB_E8BD336312324B69924D7264AC726D65.jpg'},
+                {state:false,name:'王程',url:'http://fileimg.makalu.cc/WEB_F5E8BF2385E747AA8D9FD328A413E021.jpg'},
+                {state:false,name:'王国雄',url:'http://fileimg.makalu.cc/WEB_37C63EB77EC240598C72979582273990.jpg'},
+                {state:false,name:'杨启明',url:'http://fileimg.makalu.cc/WEB_A09316E46D1C4A1AB558258918740247.jpg'},
+                {state:false,name:'赵平印',url:'http://fileimg.makalu.cc/WEB_CA897DDFF6294940ADB187099F77F6FE.jpg'},
+                {state:false,name:'张明亮',url:'http://fileimg.makalu.cc/WEB_B2C7971895B74BA6B33A6D17F132E86E.jpg'},
+                {state:false,name:'张露露',url:'http://fileimg.makalu.cc/WEB_0185D8D49A00474D8058A9651E96506A.jpg'}
+            ]
+        }
+    },
+    observers: {
+        choose: function (val) {
+            this.setData({
+                gridData : val
+            })
+        },
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        show:false,
+        gridData:[]
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        onAddResponsible(){
+            this.setData({
+                show:true
+            })
+        },
+        onClose(){
+            this.setData({
+                show:false
+            })
+        },
+        onSelected(e){
+            if(!this.data.multiple){
+                let tempData = JSON.parse(JSON.stringify(this.data.rectifierData))
+                tempData.forEach(item=>item.state = false)
+                this.setData({
+                    rectifierData:tempData
+                })
+            }    
+            
+            var index = e.currentTarget.dataset.index
+            var data = this.data.rectifierData
+            
+           
+            if(data[index].state == false){
+                data[index].state = true
+            }else{
+                data[index].state = false
+            }
+            this.setData({
+                rectifierData : data
+            })
+        },
+        onConfirm(){
+            var data = this.data.rectifierData
+            let gridData = data.filter(x => x.state == true);
+            this.triggerEvent('selected',gridData)
+            this.setData({
+                gridData:gridData,
+                show:false
+            })
+        }
+
+    }
+})
diff --git a/miniprogram/newComponents/select-person/index.json b/miniprogram/newComponents/select-person/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/miniprogram/newComponents/select-person/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/newComponents/select-person/index.wxml b/miniprogram/newComponents/select-person/index.wxml
new file mode 100644
index 0000000..fe57254
--- /dev/null
+++ b/miniprogram/newComponents/select-person/index.wxml
@@ -0,0 +1,41 @@
+<!--newComponents/select-person/index.wxml-->
+<view class="nspect_info_rectifier">
+    <van-row>
+        <van-col span="4" style="text-align: center;" wx:for="{{gridData}}" wx:key="index">
+            <van-image width="100rpx" height="100rpx" fit="cover" src="{{item.url}}" />
+            <view style="padding: 5rpx 0 15rpx;">{{item.name}}</view>
+        </van-col>
+        <van-col span="4" style="text-align: center;">
+            <view class="rectifier_add_to" bindtap="onAddResponsible" data-index="{{index}}"><van-icon name="plus" /></view>
+        </van-col>
+    </van-row>
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose">
+    <view class="rectifier_max">
+        <view class="rectifier_title">
+            <view class="rectifier_text">整改责任人</view>
+            <view class="rectifier_close" bindtap="onClose"><van-icon name="cross" /></view>
+        </view>
+        <view class="rectifier_list"> 
+            <view class="rectifier_list_height">
+                <view class="rectifier_list_for" wx:for="{{rectifierData}}" wx:key="index" data-index="{{index}}" bindtap="onSelected">
+                    <view class="rectifier_list_radio">
+                        <view class="rectifier_list_radio_circle {{item.state?'active':''}}">
+                            <van-icon name="success" wx:if="{{item.state}}"/>
+                        </view>
+                    </view>
+                    <view>
+                        <van-image width="100rpx" height="100rpx" src="{{item.url}}" fit="cover"/>
+                    </view>
+                    <view class="rectifier_list_name {{item.state?'active':''}}">{{item.name}}</view>
+                </view>
+            </view>
+        </view>
+        <view class="rectifier_btn">
+            <view bindtap="onClose">取消</view>
+            <view bindtap="onConfirm">确认</view>
+        </view>
+    </view>
+</van-popup>
\ No newline at end of file
diff --git a/miniprogram/newComponents/select-person/index.wxss b/miniprogram/newComponents/select-person/index.wxss
new file mode 100644
index 0000000..d9dd965
--- /dev/null
+++ b/miniprogram/newComponents/select-person/index.wxss
@@ -0,0 +1,108 @@
+/* newComponents/select-person/index.wxss */
+.rectifier_add_to{
+    width: 100rpx;
+    height: 100rpx;
+    margin: auto;
+    background: #252d41;
+    text-align: center;
+    line-height: 110rpx;
+    font-size: 50rpx;
+    color: #57668f;
+    font-weight: bold;
+    border-radius: 5rpx;
+}
+.rectifier_max{
+    width: 600rpx;
+    background: #232a44;
+    border-radius: 15rpx;
+}
+.rectifier_title{
+    position: relative;
+    background: #27304f;
+    border-radius: 15rpx;
+    text-align: center;
+    padding:20rpx 15rpx;
+}
+.rectifier_close{
+    position: absolute;
+    width: 50rpx;
+    height: 50rpx;
+    right: 20rpx;
+    top: 12rpx;
+    line-height: 60rpx;
+    text-align: center;
+}
+.rectifier_list{
+    padding:20rpx 40rpx;
+}
+.rectifier_list_height{
+    height: 580rpx;
+    overflow: auto;
+}
+.rectifier_list_for{
+    display: flex;
+    align-items: center;
+    padding: 5rpx 0;
+}
+.rectifier_list_radio{
+    width: 70rpx;
+}
+.rectifier_list_radio_circle{
+    width: 30rpx;
+    height: 30rpx;
+    border-radius: 50%;
+    border: 1px solid #6576a2;
+}
+.rectifier_list_radio_circle.active{
+    background: #8262f3;
+    border: 1px solid #8262f3;
+}
+.rectifier_list_name{
+    padding-left: 30rpx;
+    color: #6576a2;
+}
+.rectifier_list_name.active{
+    color: #ffffff;
+}
+.rectifier_btn{
+    display: flex;
+    align-items: center;
+    background: #27304f;
+    border-radius: 0 0 15rpx 15rpx;
+}
+.rectifier_btn view{
+    width: 50%;
+    text-align: center;
+    height: 80rpx;
+    line-height: 80rpx;
+    color:#6874a4;
+}
+.rectifier_btn view:last-child{
+    border-left: 1px solid #6874a4;
+    color: #ffffff;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/AIWarningList/index.js b/miniprogram/pageage/AIWarningList/index.js
new file mode 100644
index 0000000..1887b9a
--- /dev/null
+++ b/miniprogram/pageage/AIWarningList/index.js
@@ -0,0 +1,139 @@
+// pages/AIWarningList/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    videoShow:false,
+    videoWarningArray:[],
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    pageNo:0,
+    pageSize:10,
+    pageFlag:true,
+    videoStreamUrl:''
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  //查看视频打开弹窗
+  viewVideo(e){
+    let token = e.currentTarget.dataset.token;
+    this.setData({ videoShow: true });
+    this.getVideoRtmp(token);
+  },
+  //查看视频关闭弹窗
+  onViewVideoClose(){
+    this.setData({ videoShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        console.log(res.data);
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+        })  
+        that.getVideoAlert(0);
+      }
+    }) 
+  },
+
+/**
+   * AI视频预警
+   */
+  getVideoAlert:function(startIndex){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getVideoAlert',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+        startIndex:startIndex,
+        pageSize:this.data.pageSize
+      },
+      success: resData => {
+        this.onClickHide();
+        let videoWarningArray = this.data.videoWarningArray;
+        for(let i =0;i<resData.data.length;i++){
+          videoWarningArray.push(resData.data[i])
+        }
+        this.setData({
+          pageFlag:resData.data.length < this.data.pageSize?false:true,
+          videoWarningArray:videoWarningArray
+        })
+      }
+    })
+  },
+
+  /**
+   * 获取视频流
+   */
+  getVideoRtmp:function(token){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getVideoRtmp',
+      method: 'get',
+      data: {
+        token:token
+      },
+      success: resData => {
+        if(resData.data.code == "200"){
+          let data = JSON.parse(resData.data.data);     
+          this.setData({
+            videoStreamUrl:data.url
+          })
+        }else{
+          app.toast("播放失败");
+          return;
+        }
+      }
+    })
+  },
+
+  /**
+   * 返回AI视频页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../AIvideoAnalysis/index'
+    })
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    this.onClickShow();
+    this.setData({
+      pageNo:this.data.pageNo+10
+    })
+    if(this.data.pageFlag){
+      this.getVideoAlert(this.data.pageNo);
+    }
+  },
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/AIWarningList/index.json b/miniprogram/pageage/AIWarningList/index.json
new file mode 100644
index 0000000..803abc5
--- /dev/null
+++ b/miniprogram/pageage/AIWarningList/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/AIWarningList/index.wxml b/miniprogram/pageage/AIWarningList/index.wxml
new file mode 100644
index 0000000..7eee007
--- /dev/null
+++ b/miniprogram/pageage/AIWarningList/index.wxml
@@ -0,0 +1,54 @@
+<!--pages/AIWarningList/index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+     
+      <van-col span="7">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh"> 返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">预警列表</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+
+<view class="max_content">
+
+    <view class="modify_echarts_max">
+        <view class="video_list_max">
+        <view class="ai_warning_list" wx:for="{{videoWarningArray}}" wx:key="index">
+            <image src="{{item.photo}}" class="ai_warning_list_img"></image>
+            <view class="ai_warning_list_con">
+                <view class="ai_warning_list_project">{{item.projectName}}</view>
+                <view class="ai_warning_list_reason">预警原因：<text>{{item.alertor_type_name}}</text></view>
+                <view class="ai_warning_list_position">预警位置：<text>{{item.stream_name}}</text></view>
+                <view class="ai_warning_list_time">
+                    <view class="ai_warning_list_time_date">{{item.dateTime}}</view>
+                    <view class="ai_warning_list_video_btn"  bindtap="viewVideo" data-token="{{item.video_token}}">
+                        <image src="http://fileimg.makalu.cc/WEB_84F967AF6E48448EB73D2AA2A00F57F4.png"></image>
+                        <text>查看视频</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        </view>
+    </view>
+</view>
+
+<van-popup show="{{ videoShow }}" bind:close="onViewVideoClose" custom-style="width: 100%;" custom-class='custom_style'>
+   <view class="ai_video_popup">
+    <live-player src="{{videoStreamUrl}}" autoplay="true" style="width: 100%;"></live-player>
+   </view>
+</van-popup>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
diff --git a/miniprogram/pageage/AIWarningList/index.wxss b/miniprogram/pageage/AIWarningList/index.wxss
new file mode 100644
index 0000000..058405e
--- /dev/null
+++ b/miniprogram/pageage/AIWarningList/index.wxss
@@ -0,0 +1,4 @@
+/* pages/AIWarningList/index.wxss */
+.custom_style{
+    background: none !important;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/AIvideoAnalysis/index.js b/miniprogram/pageage/AIvideoAnalysis/index.js
new file mode 100644
index 0000000..50a51ad
--- /dev/null
+++ b/miniprogram/pageage/AIvideoAnalysis/index.js
@@ -0,0 +1,203 @@
+// pages/AIvideoAnalysis/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    AIvideoSurvey: {},
+    show: false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    ycCount:0,
+    jrCount:0,
+    yjCount:0,
+    videoWarningArray:[],
+    videoShow:false,
+    videoStreamUrl:"",
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    this.onLoad();
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  //查看视频打开弹窗
+  viewVideo(e){
+    let token = e.currentTarget.dataset.token;
+    this.setData({ videoShow: true });
+    this.getVideoRtmp(token);
+  },
+  //查看视频关闭弹窗
+  onViewVideoClose(){
+    this.setData({ videoShow: false });
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        console.log(res.data);
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+        })  
+        that.getVideoAnalysis();
+        that.getVideoAlert();
+      }
+    }) 
+  },
+
+  /**
+   * ai视频分析
+   */
+  getVideoAnalysis:function(){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getVideoAnalysis',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId
+      },
+      success: resData => {
+          this.onClickHide();
+          let value = resData.data.jrCount == 0?0:(resData.data.ycCount/resData.data.jrCount*100).toFixed(0);
+          let AIvideoSurvey = {
+            value:value>100?100:value,
+            text: '异常接入率'
+          }
+          this.setData({
+            jrCount:resData.data.jrCount,
+            ycCount:resData.data.ycCount,
+            yjCount:resData.data.yjCount,
+            AIvideoSurvey:AIvideoSurvey
+          })
+      }
+    })
+  },
+
+  /**
+   * AI视频预警
+   */
+  getVideoAlert:function(){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getVideoAlert',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+        dataNum:3
+      },
+      success: resData => {
+          this.onClickHide();
+          this.setData({
+            videoWarningArray:resData.data
+          })
+      }
+    })
+  },
+
+  /**
+   * 获取视频流
+   */
+  getVideoRtmp:function(token){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getVideoRtmp',
+      method: 'get',
+      data: {
+        token:token
+      },
+      success: resData => {
+        if(resData.data.code == "200"){
+          let data = JSON.parse(resData.data.data);  
+          console.log(data)   
+          this.setData({
+            videoStreamUrl:data.url
+          })
+        }else{
+          app.toast("播放失败");
+          return;
+        }
+      }
+    })
+  },
+
+  /**
+   * 视频页面跳转
+   */
+  videoPageJump(e){
+    let index = e.currentTarget.dataset.index
+    if(index == 1){
+      wx.redirectTo({
+        url: '../xiangmushipin/xiangmushipin',
+      })
+    }else if(index == 3){
+      wx.redirectTo({
+        url: '../vehicleManage/index',
+      })
+    }
+  },
+
+  /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+
+  /**
+   * 跳转ai视频预警列表
+  */
+  goList:function(){
+    wx.redirectTo({
+      url: '../AIWarningList/index',
+    })
+  }
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/AIvideoAnalysis/index.json b/miniprogram/pageage/AIvideoAnalysis/index.json
new file mode 100644
index 0000000..807d4c4
--- /dev/null
+++ b/miniprogram/pageage/AIvideoAnalysis/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" ,
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationBarTitleText": "视频管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/AIvideoAnalysis/index.wxml b/miniprogram/pageage/AIvideoAnalysis/index.wxml
new file mode 100644
index 0000000..4fae5d5
--- /dev/null
+++ b/miniprogram/pageage/AIvideoAnalysis/index.wxml
@@ -0,0 +1,122 @@
+<!--pages/AIvideoAnalysis/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">项目视频</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+
+<view class="max_new_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+  <view class="modify_video_nav">
+      <view bindtap="videoPageJump" data-index="1"><text>视频管理</text></view>
+      <view class="active" bindtap="videoPageJump" data-index="2"><text>AI视频分析</text></view>
+      <!-- <view bindtap="videoPageJump" data-index="3"><text>车辆管理</text></view> -->
+  </view>
+
+  <view class="modify_echarts_max">
+    <view class="modify_echarts_min">
+      <view class="modify_eharts_title">AI视频分析</view>  
+      <view class="video_ai_survey">
+          <van-row>
+              <van-col span="12">
+                  <pie-chart chart-id="chart2" chart-data="{{AIvideoSurvey}}"></pie-chart>
+              </van-col>
+              <van-col span="12">
+                  <view class="ai_video_con">
+                      <view class="ai_video_con_title">
+                          <image src="http://fileimg.makalu.cc/WEB_1687339C488F426CAA9ABFC7F9963D0C.png"></image>
+                          <text>算法接入</text>
+                      </view>
+                      <view class="ai_video_con_number">
+                          <text>{{jrCount}}</text> 路
+                      </view>
+                  </view>
+                  <view class="ai_video_con">
+                      <view class="ai_video_con_title">
+                          <image src="http://fileimg.makalu.cc/WEB_0A05F33F7CF94B249E5C4C97B24CCD0B.png"></image>
+                          <text>异常预警</text>
+                      </view>
+                      <view class="ai_video_con_number">
+                          <text>{{ycCount}}</text> 路
+                      </view>
+                  </view>
+                  <view class="ai_video_con">
+                      <view class="ai_video_con_title">
+                          <image src="http://fileimg.makalu.cc/WEB_E217CC761C0440908943CEAD8A5DFDC4.png"></image>
+                          <text>预警次数</text>
+                      </view>
+                      <view class="ai_video_con_number">
+                          <text>{{yjCount}}</text> 路
+                      </view>
+                  </view>
+              </van-col>
+          </van-row>
+      </view>
+    </view>
+  </view>
+  <view class="modify_echarts_max">
+    <view class="modify_echarts_title_min">
+        <view class="modify_eharts_title">AI视频预警</view> 
+        <view class="modify_list_btn" bindtap="goList">预警列表 》</view>
+    </view>
+    <view class="video_list_max">
+      <view class="ai_warning_list" wx:for="{{videoWarningArray}}">
+          <image src="{{item.photo}}" class="ai_warning_list_img"></image>
+          <view class="ai_warning_list_con">
+              <view class="ai_warning_list_project">{{item.projectName}}</view>
+              <view class="ai_warning_list_reason">预警原因：<text>{{item.alertor_type_name}}</text></view>
+              <view class="ai_warning_list_position">预警位置：<text>{{item.stream_name}}</text></view>
+              <view class="ai_warning_list_time">
+                  <view class="ai_warning_list_time_date">{{item.dateTime}}</view>
+                  <view class="ai_warning_list_video_btn" bindtap="viewVideo" data-token="{{item.video_token}}">
+                    <image src="http://fileimg.makalu.cc/WEB_84F967AF6E48448EB73D2AA2A00F57F4.png"></image>
+                    <text>查看视频</text>
+                  </view>
+              </view>
+          </view>
+      </view>
+    </view>
+  </view>
+</view>
+
+<van-popup show="{{ videoShow }}" bind:close="onViewVideoClose" custom-style="width: 100%;" custom-class='custom_style'>
+   <view class="ai_video_popup">
+      <live-player src="{{videoStreamUrl}}" autoplay="true" style="width: 100%;"></live-player>
+   </view>
+</van-popup>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
diff --git a/miniprogram/pageage/AIvideoAnalysis/index.wxss b/miniprogram/pageage/AIvideoAnalysis/index.wxss
new file mode 100644
index 0000000..3ceed79
--- /dev/null
+++ b/miniprogram/pageage/AIvideoAnalysis/index.wxss
@@ -0,0 +1,4 @@
+/* pages/AIvideoAnalysis/index.wxss */
+.custom_style{
+    background: none !important;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/Material-Management/index.js b/miniprogram/pageage/Material-Management/index.js
new file mode 100644
index 0000000..fe07f92
--- /dev/null
+++ b/miniprogram/pageage/Material-Management/index.js
@@ -0,0 +1,752 @@
+// pages/Material-Management/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        initData:{},
+        indexNum:0,
+        indexNum1:1,
+        indexNum2:1,
+        AIvideoSurvey: [],
+        background:'skyblue',
+        videoSurvey: [],
+        safetyDeepList:[],
+        safetyDeepData:[],
+        //服务请求接口表示
+        request:{
+          //获取完工工号数
+          getRebarOrConcreteOrOtherGhFinishNumService:"getRebarOrConcreteOrOtherGhFinishNumService",
+          // 混凝土统计使用量
+          getFinishConcreteGhInfoByProjectIdWx:"getFinishConcreteGhInfoByProjectIdWx",
+          //超耗物料top排行榜
+          getReportConcreteExceedMaterielTopService:"getReportConcreteExceedMaterielTopService",
+          //超耗原因分析
+          getReportConcreteExceedReasonService:"getReportConcreteExceedReasonService",
+          //进行中工号物料情况
+          getUseSituationRPTDayService:"getUseSituationRPTDayService",
+          //混凝土使用情况
+          getConcreteMaterialActquantityNumService:"getConcreteMaterialActquantityNumService"  ,
+          //进行中工号数
+          getRebarOrConcreteOrOtherGhUnderNumService:"getRebarOrConcreteOrOtherGhUnderNumService",
+          //获取工号楼层信息
+          getConcreteMaterialActQuantityGhInfoService:"getConcreteMaterialActQuantityGhInfoService"
+        },
+        value2: "本月",
+        value1: "本月",
+        value3: "本月",
+        actions2: [{ name: '本月',id:0 }, { name: '累计', id:1},],
+        actions1: [{ name: '本月',id:1 }, { name: '累计', id:2},],
+        actions3: [{ name: '本月',id:1 }, { name: '累计', id:0},],
+        //完工工号数
+        finishGhNumber:0,
+        //完工超耗
+        finishGhSjl:0,
+        finishGhShl:0,
+        finishGhJcl:0,
+        finishGhJclRate:0,
+        //进行中用料情况
+        materialZc:0,
+        materialCh:0,
+        materialLj:0,
+        underGhNumber:0,
+        loadShow:false,
+        topMaterialIsSHowFlag:false,
+        topMaterialReasonIsSHowFlag:false,
+        ghId:"",
+
+      //混凝土使用情况
+      situationList:[]
+
+    },
+    //选择项目
+    onProjectSelect(e){
+      let projectId = e.detail.id;
+      let projectName = e.detail.text;
+      app.globalData.projectId = projectId;
+      app.globalData.projectName = projectName;
+      this.setData({
+          projectId: projectId,
+          projectName: projectName,
+      })
+      this.onLoad()
+    },
+    onClick(){
+      this.setData({
+        show2:true
+      })
+    },
+    onClick1(){
+      this.setData({
+        show1:true
+      })
+    },
+    onClick2(){
+      this.setData({
+        show3:true
+      })
+    },
+    // 点击进行超耗tab切换
+    onSelect2(e){
+      // console.log(e);
+        let indexNum =  e.detail.id;
+        this.setData({
+            indexNum,
+            value2: e.detail.name,
+        })
+        //数据切换
+        ///获取混凝土完工工号数
+        this.getRebarOrConcreteOrOtherGhFinishNumService(indexNum)
+        //获取混凝土完工超耗情况
+        this.getProjectChaoHaoStatisticsRPTService(indexNum)
+        //获取混凝土超耗top榜单
+        this.getReportConcreteExceedMaterielTopService(indexNum)
+        //获取混凝土超耗原因分析
+        this.getReportConcreteExceedReasonService(indexNum)
+    },
+  
+
+onSelect1(e){
+  let indexNum1 =  e.detail.id;
+  console.log(indexNum1);
+      this.setData({
+        indexNum1,
+        value1: e.detail.name,
+      })
+      this.getUseSituationRPTDayService(indexNum1)
+    },
+    onSelect3(e){
+        let {ghId} = this.data
+        let indexNum2 =  e.detail.id;
+        this.setData({
+          indexNum2,
+          value3: e.detail.name,
+        })
+        if(ghId == 0){
+          this.onClickTemperatureTrend(indexNum2)
+        }else{
+          this.onClickTemperatureTrend(indexNum2,ghId)
+        }
+        
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:res=>{
+          this.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+          this.getProjectCorrespondence(app.globalData.projectId)
+        }
+      })
+    },  
+   /**
+    * 项目对应关系
+    */
+  getProjectCorrespondence(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          projectData: res.data
+        })
+        //数据请求
+        //获取混凝土完工工号数
+        that.getRebarOrConcreteOrOtherGhFinishNumService(0)
+        //获取混凝土完工超耗情况
+        that.getProjectChaoHaoStatisticsRPTService(0)
+        //获取混凝土超耗top榜单
+        that.getReportConcreteExceedMaterielTopService(0)
+        //获取混凝土超耗原因分析
+        that.getReportConcreteExceedReasonService(0)
+        //混凝土使用情况
+        that.onClickTemperatureTrend(1)
+        //使用情况进行中
+        that.getUseSituationRPTDayService(1)
+        //获取楼层
+        that.getConcreteMaterialActQuantityGhInfoService()
+      }
+    })
+  },
+
+  /**
+   * 获取混凝土完工工号数
+   */
+  getRebarOrConcreteOrOtherGhFinishNumService(type){
+    let that = this
+    that.setData({
+      loadShow:true
+    })
+    let {clxh} = that.data.projectData
+    let startDate = ""
+    let endDate = ""
+    if(type == 0){
+      startDate = that.dateFormat(that.getlastMonth(),"yyyy-MM-dd") + " 00:00:00"
+      endDate = that.dateFormat(new Date(),"yyyy-MM-dd") + " 00:00:00"
+    }else{
+      startDate = "1970-01-01 00:00:00"
+      endDate = that.dateFormat(new Date(),"yyyy-MM-dd") + " 00:00:00"
+    }
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/material/getRebarOrConcreteOrOtherGhFinishNumService',
+      method:"GET",
+      data:{
+        service:that.data.request.getRebarOrConcreteOrOtherGhFinishNumService,
+        projectId:clxh,
+        startDate,
+        endDate,
+        materialType:0
+      },
+      header:{
+        'content-type': 'application/x-www-form-urlencoded'  
+      },
+      success(res){
+        that.setData({
+          loadShow:false
+        })
+        res = res.data
+        if(res.code == "000000"){
+          that.setData({
+            finishGhNumber:res.data[0].finishNum
+          })
+        }else{
+          that.setData({
+            finishGhNumber:0
+          })
+        }
+      }
+    })
+  },
+  /**
+   * 获取混凝土完工超耗情况
+   */
+  getProjectChaoHaoStatisticsRPTService(type){
+    
+    let that = this
+    that.setData({
+      loadShow:true
+    })
+    let {clxh} = that.data.projectData
+    let startTime = ""
+    let endTime = ""
+    if(type == 0){
+      startTime = that.dateFormat(that.getlastMonth(),"yyyy-MM-dd") + " 00:00:00"
+      endTime = that.dateFormat(new Date(),"yyyy-MM-dd") + " 23:59:59"
+    }
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/material/getProjectChaoHaoStatisticsRPTService',
+      method:"GET",
+      data:{
+        service:that.data.request.getFinishConcreteGhInfoByProjectIdWx,
+        projectId:clxh,
+        startTime,
+        endTime,
+        materialType:0
+      },
+      header:{
+        'content-type': 'application/x-www-form-urlencoded'  
+      },
+      success(res){
+        that.setData({
+          loadShow:false
+        })
+        res = res.data
+        if(res.code == "000000"){
+          that.setData({
+            finishGhSjl:res.data[0].finishGhSjl,
+            finishGhShl:res.data[0].finishGhShl,
+            finishGhJcl:res.data[0].finishGhJcl,
+            finishGhJclRate:res.data[0].finishGhJclRate
+          })
+        }else{
+          that.setData({
+            finishGhSjl:0,
+            finishGhShl:0,
+            finishGhJcl:0,
+            finishGhJclRate:0
+          })
+        }
+      }
+    })
+  },
+   /**
+   * 获取混凝土超耗top榜单
+   */
+  getReportConcreteExceedMaterielTopService(type){
+    
+    let that = this
+    that.setData({
+      loadShow:true
+    })
+    let {clxh} = that.data.projectData
+    let startTime = ""
+    let endTime = ""
+    if(type == 0){
+      startTime = that.dateFormat(that.getlastMonth(),"yyyy-MM-dd") + " 00:00:00"
+      endTime = that.dateFormat(new Date(),"yyyy-MM-dd") + " 23:59:59"
+    }
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/material/getReportConcreteExceedMaterielTopService',
+      method:"GET",
+      data:{
+        service:that.data.request.getReportConcreteExceedMaterielTopService,
+        projectId:clxh,
+        startTime,
+        endTime,
+        materialType:0,
+        top:5
+      },
+      header:{
+        'content-type': 'application/x-www-form-urlencoded'  
+      },
+      success(res){
+        res = res.data
+        that.setData({
+          loadShow:false
+        })
+        if(res.code == "000000" && res.data){
+          that.setData({
+            topMaterialIsSHowFlag:false
+          })
+          let temp = []
+          res.data.forEach((item,index)=>{
+              let tempObject = {}
+              tempObject.yesMonitor = Number(item.ch).toFixed(1)
+              tempObject.name = item.materielName +'('+item.materielModel+')'
+              tempObject.total = item.sumCh
+              tempObject.unit = "%"
+              temp.push(tempObject)
+          })
+          let excessRateData = temp.sort((prev,next)=> next.prop - prev.prop)
+          that.setData({
+            safetyDeepData:excessRateData
+          })
+        }else{
+          that.setData({
+            safetyDeepData:[]
+          })
+        }
+      }
+    })
+  },
+
+   /**
+   * 获取混凝土超耗原因分析
+   */
+  getReportConcreteExceedReasonService(type){
+    
+    let that = this
+    that.setData({
+      loadShow:true
+    })
+    let {clxh} = that.data.projectData
+    let startTime = ""
+    let endTime = ""
+    if(type == 0){
+      startTime = that.dateFormat(that.getlastMonth(),"yyyy-MM-dd") + " 00:00:00"
+      endTime = that.dateFormat(new Date(),"yyyy-MM-dd") + " 23:59:59"
+    }
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/material/getReportConcreteExceedReasonService',
+      method:"GET",
+      data:{
+        service:that.data.request.getReportConcreteExceedReasonService,
+        projectId:clxh,
+        startTime,
+        endTime,
+        materialType:0
+      },
+      header:{
+        'content-type': 'application/x-www-form-urlencoded'  
+      },
+     
+      success(res){
+        that.setData({
+          loadShow:false
+        })
+          res = res.data
+          if(res.code == "000000" && res.data){
+            that.setData({
+              topMaterialReasonIsSHowFlag:true
+            })
+            var temp = {}
+            let datas2 = []
+            const total = res.data.reduce((prev,cur,index)=>{
+              return prev + cur.chActQuantity
+            },0)
+            for(let i = 0;i < res.data.length;i++){
+                if(res.data[i].causeName.indexOf('其他') != -1 ){
+                    for(let k in res.data[i]){
+                        temp[k] = res.data[i][k]
+                    }
+                    temp.name = "其它原因"
+                    temp.value = Number(temp.chActQuantity).toFixed(1);
+                    temp.prop = ((Number(temp.chActQuantity) / total) * 100 ).toFixed(1)
+                    res.data.splice(i,1)
+                    break;
+                }
+            }
+
+            for(let i = 0;i < res.data.length;i++){
+                if(i < 5){
+                    res.data[i].value = Number(res.data[i].chActQuantity).toFixed(1);
+                    res.data[i].name = res.data[i].causeName;
+                    res.data[i].prop =  ((Number(res.data[i].chActQuantity) / total) * 100 ).toFixed(1)
+                    datas2.push(
+                      res.data[i]
+                    )
+                }else{
+                    temp.value = Number(Number(temp.value) + Number(Number(res.data[i].chActQuantity).toFixed(1))).toFixed(1)
+                }
+            }
+
+            datas2 =  datas2.sort((next,prev)=> prev.value - next.value   )
+            if(Object.keys(temp).length > 0){
+                datas2.push(temp)
+            }
+            that.setData({
+              videoSurvey:datas2
+            })
+          }else{
+            that.setData({
+              videoSurvey:[]
+            })
+          }
+      }
+    })
+  },
+
+  /**
+   * 进行中工号数
+   */
+  getUseSituationRPTDayService(type){
+    
+    let that = this
+    that.setData({
+      loadShow:true
+    })
+    let {clxh} = that.data.projectData
+    let startTime = ""
+    let endTime = ""
+    if(type == 1){
+      startTime = that.dateFormat(that.getlastMonth(),"yyyy-MM-dd") + " 00:00:00"
+      endTime = that.dateFormat(new Date(),"yyyy-MM-dd") + " 23:59:59"
+    }
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/material/getUseSituationRPTDayService',
+      method:"GET",
+      data:{
+        service:that.data.request.getUseSituationRPTDayService,
+        projectId:clxh,
+        startTime,
+        endTime,  
+        type
+      },
+      header:{
+        'content-type': 'application/x-www-form-urlencoded'  
+      },
+      success(res){
+      wx.request({
+      url: app.globalData.reqUrl + '/weixin/material/getRebarOrConcreteOrOtherGhUnderNumService',
+      method:"GET",
+      data:{
+        service:that.data.request.getRebarOrConcreteOrOtherGhUnderNumService,
+        projectId:clxh,
+        startDate:startTime,
+        endDate:endTime,
+        materialType:0
+      },
+      header:{
+        'content-type': 'application/x-www-form-urlencoded'  
+      },
+      success(res1){
+        that.setData({
+          loadShow:false
+        })
+        //getRebarOrConcreteOrOtherGhUnderNumService
+        res = res.data
+        res1 = res1.data
+        if(res.code == "000000"){
+          let {concrete_consume_zc,concrete_consume_ch,concrete_consume_lj} = res.data[0]
+          let materialZc =  isNaN(parseFloat(concrete_consume_zc).toFixed(1)) ? 0.0: parseFloat(concrete_consume_zc).toFixed(1);
+          //混凝土超耗
+          let materialCh =  isNaN(parseFloat(concrete_consume_ch).toFixed(1)) ? 0.0:parseFloat(concrete_consume_ch).toFixed(1);
+          //混凝土临建
+          let materialLj =  isNaN(parseFloat(concrete_consume_lj).toFixed(1)) ? 0.0:parseFloat(concrete_consume_lj).toFixed(1);
+          that.setData({
+            materialZc,
+            materialCh,
+            materialLj,
+            underGhNumber:res1.data[0].underNum
+          })
+        }else{
+          that.setData({
+            materialZc:0,
+            materialCh:0,
+            materialLj:0,
+            underGhNumber:0
+          })
+        }
+      }
+      })
+        
+      }
+    })
+  },
+
+
+    //混凝土使用情况
+  onClickTemperatureTrend(type,ghId=''){
+      let that = this
+      that.setData({
+        loadShow:true
+      })
+      let {clxh} = that.data.projectData
+      let startTime = ""
+      let endTime = ""
+      if(type == 1){
+        startTime = that.dateFormat(that.getlastMonth(),"yyyy-MM-dd") + " 00:00:00"
+        endTime = that.dateFormat(new Date(),"yyyy-MM-dd") + " 23:59:59"
+      }
+      wx.request({
+        url: app.globalData.reqUrl + '/weixin/material/getConcreteMaterialActquantityNumService',
+        method:"GET",
+        data:{
+          service:that.data.request.getConcreteMaterialActquantityNumService,
+          projectId:clxh,
+          startTime,
+          endTime,
+          materialType:0,
+          top:3,
+          ghId
+        },
+        header:{
+          'content-type': 'application/x-www-form-urlencoded'  
+        },
+        success(res){
+          that.setData({
+            loadShow:false
+          })
+          res = res.data
+          if(res.code == "000000"){
+            if(res.data){
+              let safetyDeepList = []
+              const total = res.data.reduce((prev,cur,index)=>{
+                return prev + cur.actQuantity
+              },0)   
+              res.data.forEach(item=>{
+                safetyDeepList.push({
+                  //name:item.materielName+'/'+item.materielModel,
+                  name:item.materielModel,
+                  yesMonitor:item.actQuantity.toFixed(1),
+                  total:total,
+                  unit: 'm³',
+                  sjQuantity:item.yhl.toFixed(1)
+                })
+              })
+             that.setData({
+                safetyDeepList
+             })   
+                
+            }else{
+                that.setData({
+                  safetyDeepList:[]
+                })
+               
+            }
+  
+  
+        }
+        }
+      })  
+      
+  },
+
+  /**
+   * 获取楼号下拉框
+   * @param {} e 
+   */
+  getConcreteMaterialActQuantityGhInfoService(){
+    let that = this
+    let situationList = [{
+      id:0,
+      text:"全部"
+    }]
+    let {clxh} = that.data.projectData
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/material/getConcreteMaterialActquantityNumService',
+      method:"GET",
+      data:{
+        service:that.data.request.getConcreteMaterialActQuantityGhInfoService,
+        projectId:clxh
+      },
+      header:{
+        'content-type': 'application/x-www-form-urlencoded'  
+      },
+      success(res){
+        res = res.data
+        if(res.code == "000000" && res.data){
+          res.data.forEach(item=>{
+            situationList.push({
+              id:item.ghId,
+              text:item.ghName
+            })
+          })
+        }
+        that.setData({
+          situationList
+        })
+      }
+  })
+  },
+  onSelectEducationType(e){
+    let id = e.detail.id
+    let {indexNum2} = this.data
+    this.setData({
+      ghId:id
+    })
+    if(id == 0){
+      this.onClickTemperatureTrend(indexNum2)
+    }else{
+      this.onClickTemperatureTrend(indexNum2,id)
+    }
+  },
+
+
+
+
+
+  /**
+   * 获取当前时间上一月时间
+   */
+  getlastMonth() {
+    let now = new Date();
+    // 当前月的日期
+    let nowDate = now.getDate();
+    let lastMonth = new Date(now.getTime());
+    // 设置上一个月（这里不需要减1）
+    lastMonth.setMonth(lastMonth.getMonth());
+    // 设置为0，默认为当前月的最后一天
+    lastMonth.setDate(0);
+    // 上一个月的天数
+    let daysOflastMonth = lastMonth.getDate();
+    // 设置上一个月的日期，如果当前月的日期大于上个月的总天数，则为最后一天
+    lastMonth.setDate(nowDate > daysOflastMonth ? daysOflastMonth : nowDate);
+    return lastMonth;
+  },
+
+  /**
+   * 格式化时间
+   */
+  dateFormat(date,fmt) {
+    let ret;
+    const opt = {
+        "y+": date.getFullYear().toString(),        // 年
+        "M+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "m+": date.getMinutes().toString(),         // 分
+        "s+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+  },
+
+
+
+
+
+
+
+
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+    
+  showPopup() {
+    this.setData({ show: true });
+    
+  },
+  onClose() {
+    this.setData({ show: false });
+    this.setData({ show1: false });
+    this.setData({ show2: false });
+    this.setData({ show3: false });
+},
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/Material-Management/index.json b/miniprogram/pageage/Material-Management/index.json
new file mode 100644
index 0000000..84b08f0
--- /dev/null
+++ b/miniprogram/pageage/Material-Management/index.json
@@ -0,0 +1,7 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index",
+        "van-action-sheet": "@vant/weapp/action-sheet"
+    },
+    "navigationBarTitleText": "材料管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/Material-Management/index.wxml b/miniprogram/pageage/Material-Management/index.wxml
new file mode 100644
index 0000000..5a63563
--- /dev/null
+++ b/miniprogram/pageage/Material-Management/index.wxml
@@ -0,0 +1,339 @@
+<!--pages/Material-Management/index.wxml-->
+
+<!-- <view class="header_title">
+	<view class="header_title_row">
+		<van-row>
+		<van-col span="3">
+			<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+		</van-col>
+		<van-col span="4">
+			<view class="header_img" bindtap="goGCLB">
+			<image src="/images/left.png"></image>
+			<text class="header_fh">返回</text>
+			</view>
+		</van-col>
+		<van-col span="10">
+			<view class="header_name">材料管理</view>
+		</van-col>
+		</van-row>
+	</view>
+</view> -->
+
+<!-- 材料管理 -->
+<view class="cailiao" style="padding-top: 0;">
+	
+	<!-- nav顶部 -->
+	<view class="nav-cailiao">
+		 <project-select  width='640rpx' left='-30rpx'  init="{{initData}}" bindchange="onProjectSelect"></project-select>
+	</view>
+	<!-- 完结超耗 -->
+	<view class="cailiao-content" style="margin-top: 64rpx;">
+		<!-- 头部 -->
+		<view class="header-cailiao">
+			<!-- 头部左边 -->
+			<view class="eharts_title">
+				完结工号超耗情况
+			</view>
+			<!-- 头部右边 -->
+			<!-- <view class="header-cailiao-right">
+				<view class="{{indexNum==0?'header-cailiao-right-left active':'header-cailiao-right-left'}}" data-set="{{0}}" bindtap="onClick">
+					本月
+				</view>
+				<view class="{{indexNum==1?'header-cailiao-right-right active':'header-cailiao-right-right'}}"  data-set="{{1}}" bindtap="onClick">
+					开累
+				</view>
+			</view> -->
+			<text class="hj_float" bindtap="onClick" style="margin-left: 140rpx;">{{value2}} </text>
+        <van-action-sheet show="{{ show2 }}" actions="{{ actions2 }}" bind:close="onClose" bind:select="onSelect2" />
+		</view>
+		<!-- 内容部分 -->
+		<view class="wanjieNum"> 
+		<!-- 已完结功耗数 -->
+			<view class="wanjieNum-over">
+			<!-- 上面部分 -->
+				<view class="project-title">
+					<view style="border-bottom: 1px solid #0f498c;height: 36rpx;font-size: 28rpx;">
+						已完结工号数({{finishGhNumber}})
+					</view>
+				</view>
+			<!-- 下面部分 -->
+				<view class="wanjieNum-over-bottom">
+				<!-- 每一行两个小盒子 -->
+					<view class="wanjieNum-over-bottom-top">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_90A967456DFE407BB0575AEEBB6A2823.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									消耗设计量
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #0189f3;"> 
+									{{finishGhSjl}}
+								</view>	m²
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_85DFF1C6FA83430AAFB759BE5E9BF540.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									消耗实耗
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #0189f3;"> 
+									{{finishGhShl}}
+								</view>	m²
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="wanjieNum-over-bottom-top">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_EEA74BB38112403EACC4EEEE147B7B8A.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									节超量
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #0189f3;"> 
+									{{finishGhJcl}}
+								</view>	m³
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_E1531591CFF242DB9C1EE50BAB08059A.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+								节超率
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #0189f3;"> 
+								{{finishGhJclRate}}
+								</view>	%
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		<!-- 超耗率TOP5材料 -->
+			<view class="chaohao" wx:if="{{topMaterialIsSHowFlag}}">
+			<!-- 上面部分 -->
+				<view class="project-title">
+					<view style="border-bottom: 1px solid #0f498c;height: 36rpx;">
+						超耗率TOP5材料
+					</view>
+				</view>
+			<!-- 下面部分 -->
+				<view class="chaohao-bottom">
+			<!-- echarts图 -->
+					<view class="chaohao-content">
+						<safety-bar-charts chart-id="chart2" data="{{safetyDeepData}}" height="570"></safety-bar-charts>
+					</view>
+				</view>
+			</view>
+		<!-- 超耗原因分析 -->
+			<view class="chaohao-fenxi" wx:if="{{topMaterialReasonIsSHowFlag}}">
+		<!-- 上面部分 -->
+					<view class="project-title">
+						<view style="border-bottom: 1px solid #0f498c;height: 36rpx;display: flex;justify-content: space-between;align-items: center;">
+							超耗原因分析
+							<view style="color:#4675ff;">
+							混凝土(m²)
+							</view>
+						</view>
+					</view>
+		<!-- 下面部分 -->
+			<view class="chaohao-fenxi-bottom">
+				<safety-pie-charts chart-id="chart1" title="超耗总量" chart-data="{{videoSurvey}}"></safety-pie-charts>
+			</view>
+			</view>
+		</view>
+	</view>
+	<!-- 进行中工号用料情况 -->
+	<view class="yongliao">
+			<!-- 头部 -->
+				<view class="header-cailiao">
+				<!-- 头部左边 -->
+				<view class="eharts_title">
+					进行中工号用料情况
+				</view>
+				<!-- 头部右边 -->
+				<!-- <view class="header-cailiao-right">
+					<view class="{{indexNum1==1?'header-cailiao-right-left active':'header-cailiao-right-left'}}" data-set="{{1}}" bindtap="onClick1">
+						本月
+					</view>
+					<view class="{{indexNum1==2?'header-cailiao-right-right active':'header-cailiao-right-right'}}"  data-set="{{2}}" bindtap="onClick1">
+						开累
+					</view>
+				</view> -->
+				<text class="hj_float" bindtap="onClick1" style="margin-left: 140rpx;">{{value1}} </text>
+        <van-action-sheet show="{{ show1 }}" actions="{{ actions1 }}" bind:close="onClose" bind:select="onSelect1" />
+				</view>
+			<!-- 用料情况内容 -->
+				<view class="wanjieNum">
+					<!-- 已完结功耗数 -->
+					<view class="wanjieNum-over">
+					<!-- 上面部分 -->
+						<!-- <view class="project-title">
+							<view style="border-bottom: 1px solid #0f498c;height: 36rpx;">
+								已完结工号数(30)
+							</view>
+						</view> -->
+					<!-- 下面部分 -->
+						<view class="wanjieNum-over-bottom">
+						<!-- 每一行两个小盒子 -->
+							<view class="wanjieNum-over-bottom-top">
+							<!-- 每一个小盒子 -->
+								<view class="wanjieNum-over-bottom-top-box">
+									<view class="wanjieNum-over-bottom-top-box-ImgA">
+										<!-- <view class="wanjieNum-over-bottom-top-box-Img-small"> 
+											<image src="http://fileimg.makalu.cc/WEB_90A967456DFE407BB0575AEEBB6A2823.png" mode="" style="width: 100%;height: 100%;"/>
+										</view> -->
+									</view>
+									<view class="wanjieNum-over-bottom-top-box-title">
+										<view class="wanjieNum-over-bottom-top-box-title-text">
+											进行中工号数
+										</view>
+										<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+										<view style="font-size: 30rpx;color: #0189f3;"> 
+											{{underGhNumber}}
+										</view>	
+										</view>
+									</view>
+								</view>
+								<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+									<view class="wanjieNum-over-bottom-top-box-ImgB">
+										<!-- <view class="wanjieNum-over-bottom-top-box-Img-small"> 
+											<image src="http://fileimg.makalu.cc/WEB_85DFF1C6FA83430AAFB759BE5E9BF540.png" mode="" style="width: 100%;height: 100%;"/>
+										</view> -->
+									</view>
+									<view class="wanjieNum-over-bottom-top-box-title">
+										<view class="wanjieNum-over-bottom-top-box-title-text">
+											正常量
+										</view>
+										<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+										<view style="font-size: 30rpx;color: #0189f3;"> 
+											{{materialZc}}
+										</view>	m³
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top">
+							<!-- 每一个小盒子 -->
+								<view class="wanjieNum-over-bottom-top-box">
+									<view class="wanjieNum-over-bottom-top-box-ImgC">
+										<!-- <view class="wanjieNum-over-bottom-top-box-Img-small"> 
+											<image src="http://fileimg.makalu.cc/WEB_EEA74BB38112403EACC4EEEE147B7B8A.png" mode="" style="width: 100%;height: 100%;"/>
+										</view> -->
+									</view>
+									<view class="wanjieNum-over-bottom-top-box-title">
+										<view class="wanjieNum-over-bottom-top-box-title-text">
+											超耗量
+										</view>
+										<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+										<view style="font-size: 30rpx;color: #0189f3;"> 
+											{{materialCh}}
+										</view>	m³
+										</view>
+									</view>
+								</view>
+								<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+									<view class="wanjieNum-over-bottom-top-box-ImgD">
+										<!-- <view class="wanjieNum-over-bottom-top-box-Img-small"> 
+											<image src="http://fileimg.makalu.cc/WEB_E1531591CFF242DB9C1EE50BAB08059A.png" mode="" style="width: 100%;height: 100%;"/>
+										</view> -->
+									</view>
+									<view class="wanjieNum-over-bottom-top-box-title">
+										<view class="wanjieNum-over-bottom-top-box-title-text">
+									临建量
+										</view>
+										<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+										<view style="font-size: 30rpx;color: #0189f3;"> 
+											{{materialLj}}	
+										</view>m³
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+	</view>
+	<!-- 混凝土使用情况 -->
+	<view class="hunningtu">
+			<!-- 头部 -->
+					<view class="header-cailiao">
+						<!-- 头部左边 -->
+							<view class="eharts_title">
+							混凝土使用情况
+							</view>
+						<!-- 头部右边 -->
+						<text class="hj_float" bindtap="onClick2" style="margin-left: 140rpx;">{{value3}} </text>
+        <van-action-sheet show="{{ show3 }}" actions="{{ actions3 }}" bind:close="onClose" bind:select="onSelect3" />
+						<!-- <view class="header-cailiaos">
+						<view class="header-cailiao-right">
+							<view class="{{indexNum2==1?'header-cailiao-right-left active':'header-cailiao-right-left'}}" data-set="{{1}}" bindtap="onClick2">
+								本月
+							</view>
+							<view class="{{indexNum2==0?'header-cailiao-right-right active':'header-cailiao-right-right'}}"  data-set="{{0}}" bindtap="onClick2">
+								开累
+							</view>
+						</view>
+					</view> -->
+					</view>
+			<!-- 内容有边 -->
+					<view style="padding:40rpx 30rpx;">
+						<voucher-select columns="{{situationList}}" selectValue="全部" selectIndex="0" placeholder="请选择" bindchange="onSelectEducationType"></voucher-select>
+					</view>
+			<!-- 数据展示图 -->
+			<view class="hunningtu-bottom"> 
+				<view class="hunningtu-content">
+					<safety-bar-chartss chart-id="chart3" data="{{safetyDeepList}}" height="480"></safety-bar-chartss>
+				</view>
+			</view>
+	</view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
\ No newline at end of file
diff --git a/miniprogram/pageage/Material-Management/index.wxss b/miniprogram/pageage/Material-Management/index.wxss
new file mode 100644
index 0000000..f23a975
--- /dev/null
+++ b/miniprogram/pageage/Material-Management/index.wxss
@@ -0,0 +1,230 @@
+/* pages/Material-Management/index.wxss */
+/* 材料管理 */
+.cailiao{
+	padding: 60rpx 40rpx 30rpx;
+}
+.nav-cailiao{
+	margin: 10rpx 0 50rpx;
+}
+.hj_float{
+	float: right;
+	padding: 5rpx 50rpx 5rpx 20rpx;
+	background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+	border-radius: 40rpx;
+  }
+  .hj_float:active{
+	background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+  }
+  .van-popup--bottom.van-popup--round{
+	border-radius: 0 !important
+  }
+  .van-popup{
+	background-color: var(--popup-background-color,#232a44) !important
+  }
+  .van-action-sheet__cancel,.van-action-sheet__item{
+	background-color: var(--popup-background-color,#232a44) !important;
+	color: #0ad7ec;
+	
+  }
+/* 完结超耗 */
+.cailiao-content{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+.header-cailiao{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 40rpx;
+}
+.header-cailiaos{
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+}
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	font-size: 32rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+  .header-cailiao-right{
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  width: 300rpx;
+	  height: 80rpx;
+	  font-size: 24rpx;
+	  color: rgb(155, 154, 154);
+  }
+  .header-cailiao-right-left{
+	  width: 120rpx;
+	  height: 46rpx;
+	  line-height: 46rpx;
+	  text-align: center;
+	  border-top-left-radius: 36rpx;
+	  border-bottom-left-radius: 36rpx;
+	  border: 1px solid #2e355f;
+	  font-size: 28rpx;
+  }
+  .header-cailiao-right-right{
+	width: 120rpx;
+	height: 46rpx;
+	line-height: 46rpx;
+	text-align: center;
+	border-top-right-radius: 36rpx;
+	border-bottom-right-radius: 36rpx;
+	border: 1px solid #2e355f;
+}
+.active{
+	color: #fff;
+	background-color: #2e355f;
+}
+/* 完结工号数 */
+.wanjieNum{
+	padding:0 30rpx 40rpx 60rpx;
+}
+.wanjieNum-over{
+	width: 100%;
+}
+.project-title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 40rpx;
+	background: url("http://fileimg.makalu.cc/WEB_F6B0554C215E496195EA7D6FCE2C0B8E.png") no-repeat left/35rpx;
+}
+.wanjieNum-over-bottom{
+	display: flex;
+	flex-direction: column;
+	justify-content:space-evenly ;
+	height: 518rpx;
+}
+.wanjieNum-over-bottom-top{
+	display: flex;
+	justify-content: space-between;
+	height: 100rpx;
+	line-height: 100rpx;
+}
+.wanjieNum-over-bottom-top-box{
+	display: flex;
+	width: 50%;
+	height: 100rpx;
+}
+.wanjieNum-over-bottom-top-box-Img{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%;
+}
+.wanjieNum-over-bottom-top-box-Img-small{
+	width: 38rpx;
+	height: 38rpx;
+	line-height: 38rpx;
+}
+.wanjieNum-over-bottom-top-box-title{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	width: 60%;
+	height:100rpx ;
+	font-size: 22rpx;
+}
+.wanjieNum-over-bottom-top-box-title-text{
+	height: 50rpx;
+	line-height: 50rpx;
+	font-size: 28rpx;
+}
+/* 进行中功耗用料情况 */
+.wanjieNum-over-bottom-top-box-ImgA{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_09B5E990ABB5491D979F19A299532C13.png") no-repeat center/100%;
+}
+.wanjieNum-over-bottom-top-box-ImgB{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_AA8F63B6D1C44A14BE1A6C5720E14371.png") no-repeat center/100%;
+}
+.wanjieNum-over-bottom-top-box-ImgC{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_735D7FFF509C4DAA98ADC7C10AB9E89D.png") no-repeat center/100%;
+}
+.wanjieNum-over-bottom-top-box-ImgD{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_1E99222D2C104243896FBAE1D53AF5AB.png") no-repeat center/100%;
+}
+/* 超耗材料 */
+.chaohao{
+	width: 100%;
+}
+.chaohao-bottom{
+	display: flex;
+	flex-direction: column;
+	justify-content:space-evenly ;
+	height: 748rpx;
+}
+.chaohao-content{
+	height: 570rpx;
+}
+/* 超耗分析 */
+.chaohao-fenxi{
+	width: 100%;
+}
+.chaohao-fenxi-bottom{
+	display: flex;
+	flex-direction: column;
+	justify-content:space-evenly ;
+	height: 570rpx;
+}
+/* 用料情况 */
+.yongliao{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+/* 混凝土 */
+.hunningtu{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+.hunningtu-bottom{
+	padding:0 20rpx;
+}
+.hunningtu-content{
+	display: flex;
+	flex-direction: column;
+	justify-content:space-evenly ;
+	height: 480rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/Progress-management/index.js b/miniprogram/pageage/Progress-management/index.js
new file mode 100644
index 0000000..f3df4d7
--- /dev/null
+++ b/miniprogram/pageage/Progress-management/index.js
@@ -0,0 +1,567 @@
+// pages/Progress-management/index.js
+import * as echarts from '../../ec-canvas/echarts'; 
+
+const app = getApp()
+
+let chart=null
+let chart1=null
+
+function getOption(a1) {
+   let  that=this
+return {
+    title: [
+        {
+            text: a1+'%',
+            textAlign: "center",
+            left: "48%",
+            top: "30%",
+            textStyle: {
+                color: "#67abf2",
+                fontSize: 23,
+            },
+        },
+        {
+            text: '实际产值进度',
+            left: "48%",
+            top: "80%",
+            textAlign: "center",
+            textStyle: {
+                color: "#cdd7fa",
+                fontWeight: "normal",
+                fontSize: "16",
+                textAlign: "center",
+            },
+        },
+    ],
+    series: [
+        {
+            type: "pie",
+            hoverAnimation: false,
+            radius: ["60%", "59%"],
+            center: ["50%", "40%"],
+            labelLine: {
+                normal: {
+                    show: false,
+                },
+            },
+            label: {
+                normal: {
+                    position: "center",
+                },
+            },
+            data: [
+                {
+                    value: 100,
+                    itemStyle: {
+                        normal: {
+                            color: "#255788",
+                        },
+                    },
+                },
+
+            ],
+        },
+        {
+            type: "pie",
+            hoverAnimation: false,
+            radius: ["53%", "60%"],
+            center: ["50%", "40%"],
+            labelLine: {
+                normal: {
+                    show: false,
+                },
+            },
+            label: {
+                normal: {
+                    position: "center",
+                },
+            },
+            data: [
+                {
+                    value: a1,
+                    itemStyle: {
+                        normal: {
+                            color: "#68a8f2",
+                        },
+                    },
+                    normal: {
+                        show: false,
+                    },
+                },
+                {
+                    value: 100-35,
+                    itemStyle:  {
+                        normal: {
+                            label: {
+                                show: false,
+                            },
+                            labelLine: {
+                                show: false,
+                            },
+                            color: "rgba(0,0,0,0)",
+                            borderWidth: 0,
+                        },
+                        emphasis: {
+                            color: "rgba(0,0,0,0)",
+                            borderWidth: 0,
+                        },
+                    },
+                },
+            ],
+        },
+    ],
+};
+}
+
+function getOption1(a2) {
+    let  that=this
+ return {
+     title: [
+         {
+             text: a2+'%',
+             textAlign: "center",
+             left: "48%",
+             top: "30%",
+             textStyle: {
+                 color: "#67abf2",
+                 fontSize: 23,
+             },
+         },
+         {
+             text: '时间管理',
+             left: "48%",
+             top: "80%",
+             textAlign: "center",
+             textStyle: {
+                 color: "#cdd7fa",
+                 fontWeight: "normal",
+                 fontSize: "16",
+                 textAlign: "center",
+             },
+         },
+     ],
+     series: [
+         {
+             type: "pie",
+             hoverAnimation: false,
+             radius: ["60%", "59%"],
+             center: ["50%", "40%"],
+             labelLine: {
+                 normal: {
+                     show: false,
+                 },
+             },
+             label: {
+                 normal: {
+                     position: "center",
+                 },
+             },
+             data: [
+                 {
+                     value: 100,
+                     itemStyle: {
+                         normal: {
+                             color: "#255788",
+                         },
+                     },
+                 },
+ 
+             ],
+         },
+         {
+             type: "pie",
+             hoverAnimation: false,
+             radius: ["53%", "60%"],
+             center: ["50%", "40%"],
+             labelLine: {
+                 normal: {
+                     show: false,
+                 },
+             },
+             label: {
+                 normal: {
+                     position: "center",
+                 },
+             },
+             data: [
+                 {
+                     value: a2,
+                     itemStyle: {
+                         normal: {
+                             color: "#68a8f2",
+                         },
+                     },
+                     normal: {
+                         show: false,
+                     },
+                 },
+                 {
+                     value: 100-22,
+                     itemStyle:  {
+                         normal: {
+                             label: {
+                                 show: false,
+                             },
+                             labelLine: {
+                                 show: false,
+                             },
+                             color: "rgba(0,0,0,0)",
+                             borderWidth: 0,
+                         },
+                         emphasis: {
+                             color: "rgba(0,0,0,0)",
+                             borderWidth: 0,
+                         },
+                     },
+                 },
+             ],
+         },
+     ],
+ };
+ }
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+           //查看图片
+        picShow:false,
+        progressList:[{text:'曲江御井路公租房项目EPC总承包工程',id:132}],
+        progressName:'曲江御井路公租房项目EPC总承包工程',
+        num:'0',
+        startEnd:'',
+        ec:{
+            lazyLoad:true
+        },
+        ec1:{
+            lazyLoad:true
+        },
+        tableList:[{name:'整体进度',value:'4#楼 12F层'},{name:'实时进度',value:'4#-12F-YBS7dM'},{name:'预制构件总数',value:'16811'},{name:'施工完成',value:'3130'},{name:'施工验收',value:'0'},{name:'构件吊装',value:'0'},{name:'扫码进场',value:'25'},{name:'未开始',value:'13656'}],
+        contentShow:false,
+        shigongList:[],
+        timeStr:'',
+        jinduStr:'',
+        video:'',
+
+        show: false,
+        projectId:'',
+        projectName:'' ,
+        loginName:'',
+        userName:'',
+        initData:{},
+        projectData:{}
+    },
+    showPopup() {
+        this.setData({ show: true });
+    },
+    onClose() {
+        this.setData({ show: false });
+    },
+
+    // 打开遮罩层
+    showPic(e) {
+        this.setData({
+            picShow:true,
+            imageUrl:e.currentTarget.dataset.id
+        })
+      },
+    // 关闭遮罩层
+    closePic() {
+        this.setData({
+            picShow:false,
+            imageUrl:''
+        
+        })
+    },
+    // 点击单选
+    onSelectBtn(e){
+        console.log(e.currentTarget.dataset.set);
+        const m= this.data.shigongList.map(function (item,i) {
+            console.log(item);
+          if(e.currentTarget.dataset.set==i){
+           item.select= item.select==false?true:false
+          }
+          return item
+       })
+   // console.log(e.currentTarget.dataset.set);
+   this.setData({
+      shigongList:m
+   })
+    },
+    // 点击让模块隐藏
+    onClick(e){
+        console.log(e.currentTarget.dataset.set);
+         const m= this.data.shigongList.map(function (item,i) {
+             console.log(item);
+           if(e.currentTarget.dataset.set==i){
+            item.type= item.type==false?true:false
+           }
+           return item
+        })
+    // console.log(e.currentTarget.dataset.set);
+    this.setData({
+       shigongList:m
+    })
+    },
+
+    //项目切换 返回值
+    onProjectSelect(e) {
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        this.setData({
+            projectId: projectId,
+            projectName: projectName
+        })
+        this.onLoad()
+    },
+    
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this
+        //获取项目缓存数据
+        wx.getStorage({
+            key: 'userinfo',
+            success:function(res){
+            that.setData({
+                loginName:res.data.loginName,
+                userName:res.data.userName,
+                projectId:app.globalData.projectId,
+                projectName:app.globalData.projectName,
+                initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+            })  
+            }
+        })
+        that.getProjectCorrespondence(app.globalData.projectId);
+
+        this.oneComponent = this.selectComponent('#mychart-dom');
+        this.twoComponent = this.selectComponent('#mychart-dom1');
+
+     
+    },
+
+      /**
+   * 项目对应关系
+   */
+  getProjectCorrespondence(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          projectData: res.data
+        })
+
+        that.gainProgressLog()
+        that.gainVideoUrl()
+        that.gainBaseInfo()
+        
+      }
+    })
+  },
+ 
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    gainProgressLog() {
+        var that = this;
+        //日志
+        if(this.data.projectData.szh == '132') {
+            wx.request({
+            url: app.globalData.szhUrl+'/api/wei/gainWeiListFloorInfo',
+            data:{
+                "projectId":this.data.projectData.szh
+            },
+            method:"GET",
+            success:function(res){
+                that.setData({
+                    shigongList:res.data.data
+                })
+            }
+            })
+        } else {
+            that.setData({
+                shigongList:[]
+            })
+        }
+    },
+
+    gainVideoUrl() {
+        var that = this;
+        if(this.data.projectData.szh == '132') {
+             //视频
+            wx.request({
+            url: app.globalData.szhUrl+'/api/check/gainUrl',
+            data:{
+                "projectId":this.data.projectData.szh
+            },
+            method:"GET",
+            success:function(res){
+                that.setData({
+                    video:res.data.data.httpHlss
+                })
+            }
+            
+            })
+        } else {
+            that.setData({
+                video:''
+            })
+        }
+        
+    },
+
+    getDateDiff(dateTime) {   // 将年月日转换为几小时前，几天前等等
+        let dateTimeStamp = new Date(dateTime).getTime();
+        let result = '';
+        let minute = 1000 * 60;
+        let hour = minute * 60;
+        let day = hour * 24;
+        let halfamonth = day * 15;
+        let month = day * 30;
+        let year = day * 365;
+        let now = new Date().getTime();
+        let diffValue = now - dateTimeStamp;
+        if (diffValue < 0) {
+          return;
+        }
+        let monthEnd = diffValue / month;
+        let weekEnd = diffValue / (7 * day);
+        let dayEnd = diffValue / day;
+        let hourEnd = diffValue / hour;
+        let minEnd = diffValue / minute;
+        let yearEnd = diffValue / year;
+        if (yearEnd >= 1) {
+          result = dateTime;
+        } else if (monthEnd >= 1) {
+          result = "" + parseInt(monthEnd) + "月前";
+        } else if (weekEnd >= 1) {
+          result = "" + parseInt(weekEnd) + "周前";
+        } else if (dayEnd >= 1) {
+          result = "" + parseInt(dayEnd) + "天前";
+        } else if (hourEnd >= 1) {
+          result = "" + parseInt(hourEnd) + "小时前";
+        } else if (minEnd >= 1) {
+          result = "" + parseInt(minEnd) + "分钟前";
+        } else {
+          result = "刚刚";
+        }
+        return result;
+      },
+
+    initChartA(A1) {
+        this.oneComponent.init((canvas, width, height, dpr) => {
+            chart=echarts.init(canvas,null,{
+                width:width,
+                height:height,
+                devicePixelRatio:dpr
+            })
+            canvas.setChart(chart)
+            let option=getOption(A1)
+            chart.setOption(option)
+            return chart
+        })
+
+    },
+
+    initChartB(A2) {
+        this.twoComponent.init((canvas, width, height, dpr) => {
+            chart1=echarts.init(canvas,null,{
+                width:width,
+                height:height,
+                devicePixelRatio:dpr
+            })
+            canvas.setChart(chart1)
+            let option1=getOption1(A2)
+            chart1.setOption(option1)
+            return chart1
+        })
+
+    },
+
+    gainBaseInfo() {
+        //基本进度百分比
+        var that = this;
+        wx.request({
+        url: app.globalData.szhUrl+'/api/building/proBaseInfo',
+        data:{
+            "projectId":this.data.projectData.szh
+        },
+        method:"GET",
+        success:function(res){
+            that.setData({
+                num:res.data.data.contract_monery,
+                startEnd:(res.data.data.plan_start_date.split(" "))[0] + " 至 " + (res.data.data.plan_end_date.split(" "))[0],
+                jinduStr:(res.data.data.kailei_money / 67640  * 100).toFixed(0),
+                timeStr:(that.getDateDiff(res.data.data.actual_start_date) / 720 * 100).toFixed(0) 
+            })
+
+            that.initChartA((res.data.data.kailei_money / 67640 * 100).toFixed(0) )
+            that.initChartB(((parseInt(new Date() - new Date(res.data.data.actual_start_date)) / (1000 * 60 * 60 * 24)).toFixed(0) / 720 * 100).toFixed(0)  )
+        }
+        })
+        
+    },
+
+    goGCLB:function(){
+        wx.redirectTo({
+            url: '../../pages/gengduogongneng/gengduogongneng'
+        })
+    },
+    
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/Progress-management/index.json b/miniprogram/pageage/Progress-management/index.json
new file mode 100644
index 0000000..5fb7b37
--- /dev/null
+++ b/miniprogram/pageage/Progress-management/index.json
@@ -0,0 +1,8 @@
+{
+    "usingComponents": {
+        "van-row": "@vant/weapp/row",
+        "van-col": "@vant/weapp/col",
+        "van-popup": "@vant/weapp/popup/index"
+    },
+    "navigationBarTitleText": "进度管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/Progress-management/index.wxml b/miniprogram/pageage/Progress-management/index.wxml
new file mode 100644
index 0000000..a7adf60
--- /dev/null
+++ b/miniprogram/pageage/Progress-management/index.wxml
@@ -0,0 +1,185 @@
+<!--pages/Progress-management/index.wxml-->
+<!-- 进度管理 -->
+
+<view class="All-content">
+	<!-- <view class="header_title">
+		<view class="header_title_row">
+			<van-row>
+			<van-col span="3">
+				<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+			</van-col>
+			<van-col span="4">
+				<view class="header_img" bindtap="goGCLB">
+				<image src="/images/left.png"></image>
+				<text class="header_fh">返回</text>
+				</view>
+			</van-col>
+			<van-col span="10">
+				<view class="header_name">进度管理</view>
+			</van-col>
+			</van-row>
+		</view>
+	</view> -->
+<!-- 
+	<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+		<view class="left_max">
+			<van-row class="demo clearfix">
+			<van-col span="10">
+				<view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+			</van-col>
+			<van-col span="14">
+				<view class="left_info">
+				<view class="left_info_name">{{userName}}</view>
+				<view class="left_info_name">{{loginName}}</view>
+				</view>
+			</van-col>
+			</van-row>
+		</view>
+	</van-popup> -->
+	<!-- 头部模块 -->
+	<view class="max_new_content" style="width:100%;height: 105rpx;">
+		<project-select  width='640rpx' left='-30rpx'  init="{{initData}}" bindchange="onProjectSelect"></project-select>
+	<!-- 工期概括 -->
+	<view class="gongqigaikuo" style="margin-top: 64rpx;">
+		<view class="eharts_title">
+			工期概况
+		</view>
+	<view class="gongqigaikuo-content">
+	<!-- 合同工期 -->
+		<view class="gongqigaikuo-content-hetong">
+			<view class="gongqigaikuo-content-hetong-left">
+				<view style="display: flex;font-size: 20rpx;justify-content: flex-start;align-items: center;">
+					<view class="safety_inspect_title">合同工期</view>
+					<safety-number number="{{num}}"></safety-number>
+				</view>
+			</view>
+			<view class="gongqigaikuo-content-hetong-left" style="font-size: 22rpx;justify-content: flex-space-between;align-items: flex-end;">
+			<view style="color: gray;margin-left: -20rpx;">
+				天
+			</view>
+					 <view style="color: #0a7bbd;">
+						{{startEnd}}
+					</view>
+			</view>
+		</view>
+		<!-- 时间进度数据图 -->
+		<view class="gongqigaikuo-content-jindu">
+			<view class="gongqigaikuo-content-jindu-box">
+				<view class="gongqigaikuo-content-jindu-left">
+					<ec-canvas id="mychart-dom1" canvas-id="mychart1" ec="{{ec1}}"></ec-canvas>
+				</view>
+			</view>
+			<view class="gongqigaikuo-content-jindu-box">
+				<view class="gongqigaikuo-content-jindu-left">
+					<ec-canvas id="mychart-dom" canvas-id="mychart" ec="{{ec}}"></ec-canvas>
+				</view>
+			</view>
+		
+		</view>
+	</view>
+	</view>
+	<!-- 施工日志 -->
+	<view class="shigongrizhi">
+	<!-- 头部施工日志 -->
+		<view class="shigongrizhi-header">
+			<view class="eharts_title" style="font-size: 26rpx;">
+			施工日志
+			</view>
+			<!-- <view style="color:#6b7eb9;font-size: 26rpx;">
+				查看详情>>
+			</view> -->
+		</view>
+	<!-- 内容部分 -->
+	<view class="shigongrizhi-content" wx:for="{{shigongList}}" wx:key="index" bindtap="onClick"  data-set="{{index}}" >
+		<view class="shigongrizhi-content-top">
+			<view style="display: flex;justify-content: flex-start;align-items: center;">
+			<!--  -->
+				<radio color="#23aaf2" checked="{{!item.select}}"  bindtap="onSelectBtn" data-set="{{index}}"/>
+				<view style="margin-left: 18rpx;">
+					{{item.name}}
+				</view>
+			</view>
+			<view style="width: 30rpx;height: 30rpx;margin-right: 10rpx;" >
+				<image wx:if="{{item.type==false}}" src="http://fileimg.makalu.cc/WEB_18FFE67D5A8E4077870F5E2AF9B4EE97.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/>
+				<image wx:else="{{item.type==true}}" src="http://fileimg.makalu.cc/WEB_B394869CFAAA449D8DFE7BA549A19EB8.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5)"/>
+			</view>
+		</view>
+		<!-- 隐藏部分 -->
+	<view style="padding-left: 20rpx;">
+		<view wx:if="{{item.type}}" style="border-left: 1px dashed skyblue; padding-left: 40rpx;">
+		<view style="color: gray;padding-left: 70rpx;margin: 8rpx 0;">
+			设计楼层高{{item.design_floor_height}}m,设计施工高度{{item.design_elevation}}m
+			</view>
+			<view style="color: gray;padding-left: 70rpx;margin: 8rpx 0;">
+			设计楼板厚度{{item.design_floor_thickness}}m
+			</view>
+			<view class="shigongrizhi-content-bottom">
+			<!-- 模板铺设 -->
+				<view class="shigongrizhi-content-bottom-left" wx:for="{{item.typtInfo}}" wx:for-item="itemType" wx:key="A">
+					<view style="width: 78rpx;height: 78rpx;margin-right: 20rpx;">
+						<image src="http://fileimg.makalu.cc/WEB_D9E0F9ADB3E3427A9100993F7AEC16CE.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/>
+					</view>
+					<view style="display: flex;flex-direction: column;justify-content: space-around;">
+						<view>
+							{{itemType.name}}
+						</view>
+						<view style="color: gray;">
+							{{itemType.time}}
+						</view>
+					</view>
+				</view>
+			<!-- 照片墙展示 -->
+			<view class="shigongrizhi-content-top-bottom">
+				<view class="shigongrizhi-content-top-bottom-Img"  wx:for="{{item.photoInfo}}" wx:for-item="itemPhoto" wx:key="B">
+					<image src="{{itemPhoto.images}}" mode=""  bindtap="showPic" data-id="{{itemPhoto.images}}" style="width: 100%;height: 100%;"/>
+				</view>
+			</view>
+			</view>
+			
+	</view>
+	</view>
+	</view>
+	</view>
+	<!-- 视频进度 -->
+	<view class="shipinjindu">
+			<view class="shipinjindu-top">
+				<view class="eharts_title">
+				视频进度
+				</view>
+			</view>
+			<view class="shipinjindu-bottom">
+				<view class="shipinjindu-bottom-insder">
+					<video src="{{video}}" style="width: 100%;height: 100%;"/>
+				</view>
+			</view>
+	</view>
+	<!-- BIM进度 -->
+	<!-- <view class="BIM">
+		<view class="eharts_title">
+			BIM进度
+		</view>
+		<view class="BIM-content">
+			<view style="width:100%;height:300rpx;">
+				<image src="http://fileimg.makalu.cc/WEB_607867FF7DBB4B088BD8D8E16661B3CE.jpg" mode="" style="width: 100%;height: 100%;"/>
+			</view>
+			<view class="BIM-content-table">
+				<view class="BIM-content-tables" wx:for="{{tableList}}" wx:key="index">
+					<view style="width: 40%;height: 48rpx;text-align: center;line-height: 48rpx;border-right: 1px solid skyblue;background-color: #1e324a;">
+						{{item.name}}
+					</view>
+					<view style="width: 60%;height: 48rpx;text-align: center;line-height: 48rpx;color: skyblue;">
+					{{item.value}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view> -->
+	</view>
+</view>
+
+<!-- 遮罩层 -->
+<view>
+	<van-popup show="{{ picShow }}" bind:before-enter="showPic" bind:close="closePic">
+		<image src="{{imageUrl}}"  mode="scaleToFill"></image>
+	</van-popup>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pageage/Progress-management/index.wxss b/miniprogram/pageage/Progress-management/index.wxss
new file mode 100644
index 0000000..ad9ac16
--- /dev/null
+++ b/miniprogram/pageage/Progress-management/index.wxss
@@ -0,0 +1,181 @@
+/* pages/Progress-management/index.wxss */
+/* 所有样式 */
+.All-content{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	padding: 36rpx ;
+	padding-top: 0rpx;
+}
+/* 头部样式 290+40*/
+.header-content{
+	width: 100%;
+	height: 100rpx;
+	border-radius: 40rpx;
+	margin-bottom: 40rpx;
+}
+/* 工期概括 +210*/
+.gongqigaikuo{
+	width: 100%;
+	height: 520rpx;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+.gongqigaikuo-content{
+	width: 100%;
+	height: 484rpx;
+	box-sizing: border-box;
+	padding: 12rpx 20rpx 40rpx 40rpx;
+}
+.gongqigaikuo-content-hetong{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 76rpx;
+}
+.gongqigaikuo-content-hetong-left{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 50%;
+	height: 76rpx;
+}
+.gongqigaikuo-content-jindu{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 20rpx 40rpx 10rpx;
+	height: 348rpx;
+}
+.gongqigaikuo-content-jindu-left{
+	width: 320rpx;
+	height: 320rpx;
+}
+.gongqigaikuo-content-jindu-box{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+}
+  /*施工日志  */
+.shigongrizhi{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+.shigongrizhi-header{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.shigongrizhi-content{
+	width: 100%;
+	padding: 30rpx 20rpx;
+	box-sizing: border-box;
+	font-size: 24rpx;
+}
+.shigongrizhi-content-top{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 50rpx;
+	font-size: 28rpx;
+}
+.shigongrizhi-content-bottom{
+	width: 100%;
+	
+	margin: 30rpx 0;
+}
+/* 模板铺设 */
+.shigongrizhi-content-bottom-left{
+	display: flex;
+	justify-content: flex-start;
+	width: 100%;
+	height: 78rpx;
+}
+.shigongrizhi-content-top-bottom{
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	height: 130rpx;
+}
+.shigongrizhi-content-top-bottom-Img{
+	width: 160rpx;
+	height: 100rpx;
+	margin: 10rpx;
+}
+/* 视频进度 */
+.shipinjindu{
+	width: 100%;
+	height: 520rpx;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+.shipinjindu-top{
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 60rpx;
+}
+.shipinjindu-bottom{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 100%;
+	height: 460rpx;
+}
+.shipinjindu-bottom-insder{
+	width: 90%;
+	height: 400rpx;
+}
+/* BIM */
+.BIM{
+	width: 100%;
+	height: 900rpx;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+}
+.BIM-content{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	height: 768rpx;
+	padding: 30rpx 40rpx;
+
+}
+.BIM-content-table{
+	width: 100%;
+	height: 422rpx;
+}
+.BIM-content-tables{
+	display: flex;
+	height: 52rpx;
+	border: 1px solid skyblue;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/Security-control-echarts/index.js b/miniprogram/pageage/Security-control-echarts/index.js
new file mode 100644
index 0000000..f65c085
--- /dev/null
+++ b/miniprogram/pageage/Security-control-echarts/index.js
@@ -0,0 +1,66 @@
+// pageage/Security-control-echarts/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/Security-control-echarts/index.json b/miniprogram/pageage/Security-control-echarts/index.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/miniprogram/pageage/Security-control-echarts/index.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/Security-control-echarts/index.wxml b/miniprogram/pageage/Security-control-echarts/index.wxml
new file mode 100644
index 0000000..72e1cf0
--- /dev/null
+++ b/miniprogram/pageage/Security-control-echarts/index.wxml
@@ -0,0 +1,2 @@
+<!--pageage/Security-control-echarts/index.wxml-->
+<text>pageage/Security-control-echarts/index.wxml</text>
diff --git a/miniprogram/pageage/Security-control-echarts/index.wxss b/miniprogram/pageage/Security-control-echarts/index.wxss
new file mode 100644
index 0000000..2268a3a
--- /dev/null
+++ b/miniprogram/pageage/Security-control-echarts/index.wxss
@@ -0,0 +1 @@
+/* pageage/Security-control-echarts/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/biangeng/index.js b/miniprogram/pageage/biangeng/index.js
new file mode 100644
index 0000000..0b40220
--- /dev/null
+++ b/miniprogram/pageage/biangeng/index.js
@@ -0,0 +1,339 @@
+// pages/dangerousProject/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    show: false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    prjectRelation:{},
+    //参数
+    timeline:[],
+    changeNameList:[],
+    changeName:'',
+    changeContext:'',
+    allPoint:0,
+    outPoint:0,
+    comPoint:0,
+    approval:0,
+    titleindex:0,
+
+    fileList: [],
+    id:'',
+    initData:{},
+
+  },
+ 
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName,
+      changeNameList:[],
+      titleindex:0,
+      changeName:'',
+      allPoint:0,
+      outPoint:0,
+      comPoint:0,
+      approval:0,
+      timeline:[]
+    })
+	  this.onLoad();
+  },
+
+  onImagesArr(e){
+    // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+    wx.uploadFile({
+      //图片上传地址
+      url: app.globalData.reqUrl+'/weixin/security/fileUpload',
+      filePath: e.detail[0],
+      name: 'file',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+      },
+      formData: { user: 'test' },
+      success:res => {
+        // 上传完成需要更新 fileList
+        let data = JSON.parse(res.data);
+        let fileList = this.data.fileList
+        fileList.push({url: data.url});
+        this.setData({ fileList:fileList});
+        this.updateDanger(res.data,e.currentTarget.dataset.id)
+      },
+    });
+  },
+  
+  showPopup() {
+    this.setData({ show: true });
+    
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  // 项目头部切换
+  onClickTitle(e){
+    this.setData({
+      titleindex:e.target.dataset.id,
+      changeName:'',
+      changeNameList:[]
+    });
+    this.getChangeSignature();
+  },
+
+  onSelectDangerName(e){
+    this.setData({
+      changeName:e.detail.text,
+    })
+    this.getChangeSignature();
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+        }) 
+        that.getProjectCorrespondence(); 
+      }
+    }) 
+  },
+
+    /**
+   * 项目对应关系
+   */
+  getProjectCorrespondence() {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": that.data.projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          prjectRelation:res.data
+        })
+        that.getChangeSignature();
+      }
+    })
+  },
+
+  /**
+   * 变更签认
+   */
+  getChangeSignature(){
+    var that = this;
+    wx.request({
+      url: app.globalData.szhUrl+'/system/alterationEndorseConfig/list1',
+      method: 'post',
+      data: {
+        pageNum: 1,
+        pageSize: 9999,
+        projectId: that.data.prjectRelation.szh,
+        alterationType:that.data.titleindex,
+        alterationName:that.data.changeName
+      },
+      success: resData => {
+        that.onClickHide();
+        let data = resData.data.rows;
+        //总数
+        let allPoint = data.length;
+        //已通过
+        let comPoint = 0;
+        //审批中
+        let approval = 0;
+        //不通过
+        let outPoint = 0;
+        //变更名称
+        let changeNameList = [];
+        //变更列表
+        let timeline = [];
+        if(data.length > 0){
+          for(let i = 0;i<data.length;i++){
+            if(data[i].alterationStatus == 0){
+              comPoint++;
+            }else if(data[i].alterationStatus == 1){
+              approval++;
+            }else{
+              outPoint++;
+            }
+  
+            if(data[i].alterationName != '' && data[i].alterationName != null){
+              if(changeNameList.length > 0){
+                for(let j = 0;j<changeNameList.length;j++){
+                  if(changeNameList[j].text != data[i].alterationName){
+                    changeNameList.push({id:data[i].id,text:data[i].alterationName,context:data[i].alterationContext});
+                  }
+                }
+              }else{
+                changeNameList.push({id:data[i].id,text:data[i].alterationName,context:data[i].alterationContext});
+              }   
+            }
+  
+            let supervisor = {};
+            let design = {};
+            let owner = {};
+            for (var key in data[i]) {
+              if(key == 'uploadSupervisorTime'){
+                supervisor.escalation = data[i][key];
+                supervisor.title = '监理'
+                supervisor.fieldNameOne = '上报监理日期'
+              }else if(key == 'approvalSupervisorTime'){
+                supervisor.approval = data[i][key];
+                supervisor.title = '监理'
+                supervisor.fieldNameTwo = '监理批复日期'
+              }else if(key == 'approvalSupervisorStatus'){
+                supervisor.approvalContent = data[i][key];
+                supervisor.title = '监理'
+                supervisor.fieldNameThree = '监理审核情况'
+              }else if(key == 'uploadDesignTime'){
+                design.escalation = data[i][key];
+                design.title = '设计'
+                design.fieldNameOne = '上报设计日期'
+              }else if(key == 'approvalDesignTime'){
+                design.approval = data[i][key];
+                design.title = '设计'
+                design.fieldNameTwo = '设计批复日期'
+              }else if(key == 'approvalDesignStatus'){
+                design.approvalContent = data[i][key];
+                design.title = '设计'
+                design.fieldNameThree = '设计审核情况'
+              }else if(key == 'uploadOwnerTime'){
+                owner.escalation = data[i][key];
+                owner.title = '业主'
+                owner.fieldNameOne = '上报业主日期'
+              }else if(key == 'approvalOwnerTime'){
+                owner.approval = data[i][key] == null?'':data[i][key];
+                owner.title = '业主'
+                owner.fieldNameTwo = '业主批复日期'
+              }else if(key == 'alterationStatus'){
+                if(data[i][key] == 0){
+                  owner.approvalContent = '已通过';
+                }else if(data[i][key] == 1){
+                  owner.approvalContent = '审批中';
+                }else{
+                  owner.approvalContent = '未通过';
+                } 
+                owner.title = '业主'
+                owner.fieldNameThree = '业主批复状态'
+              }
+            }
+            timeline.push(supervisor);
+            timeline.push(design);
+            timeline.push(owner);
+          } 
+        }       
+        that.setData({
+          allPoint:allPoint,
+          comPoint:comPoint,
+          approval:approval,
+          outPoint:outPoint,
+          changeNameList:changeNameList,
+          changeName:changeNameList.length>0?changeNameList[0].text:'',
+          changeContext:changeNameList.length>0?changeNameList[0].context:'',
+          timeline:timeline
+        })
+      }
+    })
+  },
+
+
+  /**
+   * 图片上传
+   */
+  updateDanger:function(fileUrl,id){
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url:app.globalData.reqUrl+'/weixin/security/updateDanger',
+      data:{
+        "deptId":this.data.deptId,
+        "projectId":this.data.projectId,
+        "id":id,
+        "fileUrl":fileUrl,
+        "subName":this.data.loginName,
+      },
+      method:"POST",
+     success:function(res){
+       console.log("======"+res.data.code);
+     }
+    })
+  },
+
+  /**
+   * 文件信息查看
+   * @param {*} e 
+   */
+  previewImg(e){
+    let suffix = e.currentTarget.dataset.suffix;
+    let url = e.currentTarget.dataset.url;
+    let images = [url];
+    if(suffix == 'pdf'){
+      wx.downloadFile({
+        url: url,
+        success: function (res) {
+          const filePath = res.tempFilePath
+          wx.openDocument({
+            filePath: filePath,
+            success: function (res) {
+              console.log('打开文档成功')
+            }
+          })
+        }
+      })
+    }else{
+      wx.previewImage({
+        current: url,     //当前图片地址
+        urls: images,               //所有要预览的图片的地址集合 数组形式
+        success: function(res) {},
+        fail: function(res) {},
+        complete: function(res) {},
+      })
+    }
+  },
+
+  /**
+   * 返回到技术管理
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/technical-management/index'
+    })
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/biangeng/index.json b/miniprogram/pageage/biangeng/index.json
new file mode 100644
index 0000000..16f7544
--- /dev/null
+++ b/miniprogram/pageage/biangeng/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" ,
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationBarTitleText": "变更签认管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/biangeng/index.wxml b/miniprogram/pageage/biangeng/index.wxml
new file mode 100644
index 0000000..abddd4d
--- /dev/null
+++ b/miniprogram/pageage/biangeng/index.wxml
@@ -0,0 +1,130 @@
+<!--pages/dangerousProject/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">变更签认管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+
+<view class="max_new_content"  style="box-sizing: border-box;">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+  <!-- <van-sticky offset-top="{{ 0 }}"> -->
+      <view style="height: 110rpx;display: flex;justify-content: space-between;align-items: center;background: linear-gradient(to bottom,#323f6a,#212b49);margin-top: 60rpx;color: #6b81bb;" bindtap="onClickTitle">
+          <view style="width:50%;text-align:center;font-size: 30rpx;" class="{{titleindex==0?'active':''}}" data-id="{{0}}">
+              设计变更
+          </view>
+          <view style="width:50%;text-align:center;font-size: 30rpx;" class="{{titleindex==1?'active':''}}" data-id="{{1}}">
+              工程签证
+          </view>
+      </view>
+  <!-- </van-sticky> -->
+
+  <view class="dangerous_node">
+      <view class="dangerous_node_min">
+          <view class="dangerous_node_number cyan">{{allPoint}}</view>
+          <view class="dangerous_node_title">
+              <image src="http://fileimg.makalu.cc/WEB_73AFC6D8953E4BE4B6DF0BD331FE4F2A.png"></image>
+              <text>总数</text>
+          </view>
+      </view>
+      <view class="dangerous_node_min">
+          <view class="dangerous_node_number blue">{{comPoint}}</view>
+          <view class="dangerous_node_title">
+            <image src="http://fileimg.makalu.cc/WEB_0A0B35F80B944F2EB39D2226216C4820.png"></image>
+            <text>已通过</text>
+          </view>
+      </view>
+      <view class="dangerous_node_min">
+          <view class="dangerous_node_number orange">{{outPoint}}</view>
+          <view class="dangerous_node_title">
+            <image src="http://fileimg.makalu.cc/WEB_486045C8DBE9469B88BB2F09AC9B0EE6.png"></image>
+            <text>未通过</text>
+          </view>
+      </view>
+  </view>
+  <!-- 选框 -->
+  <!-- <van-sticky offset-top="{{ 78 }}"> -->
+    <view class="add_max">
+        <voucher-select columns="{{changeNameList}}" placeholder="{{changeName}}" bindchange="onSelectDangerName"></voucher-select>
+    </view>
+  <!-- </van-sticky> -->
+<!-- 变更内容 -->
+    <view style="height: 90rpx;display: flex;padding: 0 46rpx;font-size:30rpx;margin: 14rpx 0;">
+        <view style="width: 160rpx;">
+          变更内容:
+        </view>
+        <view style="width: calc(100% - 160rpx);color: #3789c9;">
+          {{changeContext}}
+        </view>
+    </view>
+
+  <view class="timeline_max">
+
+     <view class="timeline_for" wx:for-items="{{timeline}}" wx:key="index">
+        <view class="timeline_for_title">
+            <view wx:if="{{item.type != 0}}" class="timeline_for_dot dot_blue"></view>
+            <view wx:if="{{item.type == 0&&item.state == 0}}" class="timeline_for_dot dot_blue"></view>
+            <view wx:if="{{item.type == 0&&item.state == 1}}" class="timeline_for_dot dot_blue"></view>
+            <view class="timeline_for_text">{{item.title}}</view>
+        </view>
+        <view class="timeline_for_list">
+          <view>{{item.fieldNameOne}}：</view>
+          <view class="timeline_for_time">{{item.escalation}}</view>
+        </view>
+        <view class="timeline_for_list">
+          <view>{{item.fieldNameTwo}}：</view>
+          <view class="timeline_for_time">{{item.approval}}</view>
+        </view>
+        <view class="timeline_for_list">
+          <view>{{item.fieldNameThree}}：</view>
+          <view class="timeline_for_time">{{item.approvalContent}}</view>
+        </view>
+        <!-- <view class="timeline_for_file">
+            <view class="timeline_for_list_title" wx:if="{{item.type==1}}" >批复文件：</view>
+            <view class="timeline_for_list_file">
+            <image wx:if="{{item.type == 0}}" wx:for-items="{{item.fileUrl}}" wx:for-item="itemUrl" src="{{itemUrl.suffix !='pdf'?itemUrl.url:'http://fileimg.makalu.cc/WEB_3035C129EB234F80820521CAF815CB35.jpg'}}" data-url="{{itemUrl.url}}"  
+            data-suffix="{{itemUrl.suffix}}" mode="aspectFill" bindtap="previewImg" style="width:90px;height:90px"></image>
+            <file-uploader wx:if="{{item.type == 1}}" bindimages="onImagesArr"></file-uploader>
+            </view>
+        </view> -->
+     </view>
+  </view>
+
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
diff --git a/miniprogram/pageage/biangeng/index.wxss b/miniprogram/pageage/biangeng/index.wxss
new file mode 100644
index 0000000..4d2f88a
--- /dev/null
+++ b/miniprogram/pageage/biangeng/index.wxss
@@ -0,0 +1,8 @@
+/* pages/dangerousProject/index.wxss */
+.van-uploader__preview-image{
+  width: 140rpx !important;
+  height: 140rpx !important;
+}
+.active{
+  color: #fff;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/dangerousProject/index.js b/miniprogram/pageage/dangerousProject/index.js
new file mode 100644
index 0000000..a22cd19
--- /dev/null
+++ b/miniprogram/pageage/dangerousProject/index.js
@@ -0,0 +1,267 @@
+// pages/dangerousProject/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    stateNav:1,
+    timeline:[],
+    dangerNameList:[],
+    show: false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    allPoint:0,
+    outPoint:0,
+    comPoint:0,
+    fileList: [],
+    id:'',
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName,
+      dangerNameList:[],
+      dangerName:'',
+      timeline:[],
+      allPoint:0,
+      outPoint:0,
+      comPoint:0
+    })
+	  this.onLoad();
+  },
+
+  onImagesArr(e){
+    // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+    wx.uploadFile({
+      //图片上传地址
+      url: app.globalData.reqUrl+'/weixin/security/fileUpload',
+      filePath: e.detail[0],
+      name: 'file',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+      },
+      formData: { user: 'test' },
+      success:res => {
+        // 上传完成需要更新 fileList
+        let data = JSON.parse(res.data);
+        let fileList = this.data.fileList
+        fileList.push({url: data.url});
+        this.setData({ fileList:fileList});
+        this.updateDanger(res.data,e.currentTarget.dataset.id)
+      },
+    });
+  },
+  
+  showPopup() {
+    this.setData({ show: true });
+    
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  onSelectDangerName(e){
+    this.getProjectDanger(e.detail.id);
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+        })  
+        that.getProjectDangerPlan();
+      }
+    }) 
+  },
+
+  /**
+   * 危大工程计划
+   */
+  getProjectDangerPlan(){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getProjectDangerPlan',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId
+      },
+      success: resData => {
+        this.onClickHide();
+        if(resData.data.code == 200){
+          let array = [];
+          for(let i = 0;i<resData.data.data.length;i++){
+            array.push({text:resData.data.data[i].danger_name,id:resData.data.data[i].id});
+          }
+          that.setData({
+            dangerNameList:array,
+            dangerName:array[0].text
+          })
+          that.getProjectDanger(resData.data.data[0].id);    
+        }else{
+          that.setData({
+            dangerNameList:[],
+            dangerName:''
+          })
+        }
+      }
+    })
+  },
+
+  /**
+   * 危大工程列表
+   */
+  getProjectDanger:function(danger_id){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getProjectDanger',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+        danger_id:danger_id
+      },
+      success: resData => {
+        this.onClickHide();
+        if(resData.data.code == 200){
+          let timeline = resData.data.data.dangerList;      
+          var flag = false;
+          timeline.map(x => {
+            if(x.fileUrl.length > 0){
+              x.type = 0;
+            }else{
+              if(!flag){
+                x.type = 1
+                flag = true;
+              }else{
+                x.type = 2;
+              }
+            }
+            let fileUrl = x.fileUrl;
+            for(let i = 0;i<fileUrl.length;i++){
+               if(fileUrl[i].url.substring(fileUrl[i].url.length-4,fileUrl[i].url.length) == '.pdf'){
+                  fileUrl[i].suffix = "pdf";
+               }else{
+                  fileUrl[i].suffix = "png";
+               } 
+            }
+          })
+          this.setData({
+            timeline:timeline,
+            allPoint:resData.data.data.allPoint,
+            outPoint:resData.data.data.outPoint,
+            comPoint:resData.data.data.comPoint
+          })
+        }else{
+          this.setData({
+            timeline:[],
+            allPoint:0,
+            outPoint:0,
+            comPoint:0
+          })
+        }
+      }
+    })
+  },
+
+  /**
+   * 图片上传
+   */
+  updateDanger:function(fileUrl,id){
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url:app.globalData.reqUrl+'/weixin/security/updateDanger',
+      data:{
+        "deptId":this.data.deptId,
+        "projectId":this.data.projectId,
+        "id":id,
+        "fileUrl":fileUrl,
+        "subName":this.data.loginName,
+      },
+      method:"POST",
+     success:function(res){
+       console.log("======"+res.data.code);
+     }
+    })
+  },
+
+  /**
+   * 文件信息查看
+   * @param {*} e 
+   */
+  previewImg(e){
+    let suffix = e.currentTarget.dataset.suffix;
+    let url = e.currentTarget.dataset.url;
+    let images = [url];
+    if(suffix == 'pdf'){
+      wx.downloadFile({
+        url: url,
+        success: function (res) {
+          const filePath = res.tempFilePath
+          wx.openDocument({
+            filePath: filePath,
+            success: function (res) {
+              console.log('打开文档成功')
+            }
+          })
+        }
+      })
+    }else{
+      wx.previewImage({
+        current: url,     //当前图片地址
+        urls: images,               //所有要预览的图片的地址集合 数组形式
+        success: function(res) {},
+        fail: function(res) {},
+        complete: function(res) {},
+      })
+    }
+  },
+
+  /**
+   * 返回到技术管理
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/technical-management/index'
+    })
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/dangerousProject/index.json b/miniprogram/pageage/dangerousProject/index.json
new file mode 100644
index 0000000..64d45ca
--- /dev/null
+++ b/miniprogram/pageage/dangerousProject/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" ,
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationBarTitleText": "重大节点管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/dangerousProject/index.wxml b/miniprogram/pageage/dangerousProject/index.wxml
new file mode 100644
index 0000000..11f28e9
--- /dev/null
+++ b/miniprogram/pageage/dangerousProject/index.wxml
@@ -0,0 +1,114 @@
+<!--pages/dangerousProject/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">重大节点管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+
+<view class="max_new_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+  
+    <view class="add_max" style="margin-top: 30rpx;">
+        <voucher-select columns="{{dangerNameList}}" placeholder="{{dangerName}}" bindchange="onSelectDangerName"></voucher-select>
+    </view>
+
+
+  <view class="dangerous_node">
+      <view class="dangerous_node_min">
+          <view class="dangerous_node_number cyan">{{allPoint}}</view>
+          <view class="dangerous_node_title">
+              <image src="http://fileimg.makalu.cc/WEB_73AFC6D8953E4BE4B6DF0BD331FE4F2A.png"></image>
+              <text>总节点</text>
+          </view>
+      </view>
+      <view class="dangerous_node_min">
+          <view class="dangerous_node_number blue">{{comPoint}}</view>
+          <view class="dangerous_node_title">
+            <image src="http://fileimg.makalu.cc/WEB_0A0B35F80B944F2EB39D2226216C4820.png"></image>
+            <text>已提交</text>
+          </view>
+      </view>
+      <view class="dangerous_node_min">
+          <view class="dangerous_node_number orange">{{outPoint}}</view>
+          <view class="dangerous_node_title">
+            <image src="http://fileimg.makalu.cc/WEB_486045C8DBE9469B88BB2F09AC9B0EE6.png"></image>
+            <text>已逾期</text>
+          </view>
+      </view>
+  </view>
+
+
+  <view class="timeline_max">
+
+     <view class="timeline_for" wx:for-items="{{timeline}}" wx:key="index">
+        <view class="timeline_for_title">
+            <view wx:if="{{item.type != 0}}" class="timeline_for_dot dot_blue"></view>
+            <view wx:if="{{item.type == 0&&item.state == 0}}" class="timeline_for_dot dot_blue"></view>
+            <view wx:if="{{item.type == 0&&item.state == 1}}" class="timeline_for_dot dot_red"></view>
+            <view class="timeline_for_text">{{item.title}}</view>
+        </view>
+        <view class="timeline_for_list">
+          <view>预计提交时间：</view>
+          <view class="timeline_for_time">{{item.planTime}}</view>
+        </view>
+        <view class="timeline_for_list">
+          <view>实际提交时间：</view>
+          <view class="timeline_for_time">{{item.actualTima}}</view>
+        </view>
+        <view class="timeline_for_list">
+          <view>逾期状态：</view>
+          <view class="timeline_for_state">
+              <view class="timeline_for_state_1" wx:if="{{item.type == 0&&item.state == 0}}">正常完成</view>
+              <view class="timeline_for_state_2" wx:if="{{item.type == 0&&item.state == 1}}">逾期{{item.expectDays}}天</view>
+          </view>
+        </view>
+        <view class="timeline_for_file">
+            <view class="timeline_for_list_title" wx:if="{{item.type==1}}" >提交文件：</view>
+            <view class="timeline_for_list_file">
+            <image wx:if="{{item.type == 0}}" wx:for-items="{{item.fileUrl}}" wx:for-item="itemUrl" src="{{itemUrl.suffix !='pdf'?itemUrl.url:'http://fileimg.makalu.cc/WEB_3035C129EB234F80820521CAF815CB35.jpg'}}" data-url="{{itemUrl.url}}"  
+            data-suffix="{{itemUrl.suffix}}" mode="aspectFill" bindtap="previewImg" style="width:90px;height:90px"></image>
+            <file-uploader wx:if="{{item.type == 1}}" bindimages="onImagesArr"></file-uploader>
+            </view>
+        </view>
+     </view>
+  </view>
+
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
diff --git a/miniprogram/pageage/dangerousProject/index.wxss b/miniprogram/pageage/dangerousProject/index.wxss
new file mode 100644
index 0000000..7e1e045
--- /dev/null
+++ b/miniprogram/pageage/dangerousProject/index.wxss
@@ -0,0 +1,5 @@
+/* pages/dangerousProject/index.wxss */
+.van-uploader__preview-image{
+	width: 140rpx !important;
+	height: 140rpx !important;
+  }
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-add/index.js b/miniprogram/pageage/educations-add/index.js
new file mode 100644
index 0000000..830c3af
--- /dev/null
+++ b/miniprogram/pageage/educations-add/index.js
@@ -0,0 +1,353 @@
+// pages/educations-add/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    //参数
+    fileDataList:[],
+    educationTypeList:[],
+    cooperationTeamList:[],
+    trainingType:'',
+    trainingStartTime:'',
+    trainingEndTime:'',
+
+    trainingStartTime2:'',
+    trainingEndTime2:'',
+
+    trainingContent:'',
+    collaborateRanksId:'',
+    collaborateRanksName:'',
+    attendNumber:'',
+    activeName:'',
+    activeIndex:'',
+    // defaultStartTime:"",
+    // defaultEndTime:"",
+    maxDate:new Date(2100,1,1).getTime(),
+
+  },
+
+  //选择培训类型
+  onSelectEducationType(e){
+    this.setData({
+      trainingType:e.detail.id
+    })
+    if(e.detail.id == 4) {
+      this.setData({
+        trainingStartTime:this.dateFormat("yyyy-MM-dd",new Date()),
+        trainingStartTime2:new Date().getTime(),
+        trainingEndTime:this.addDay(this.dateFormat("yyyy-MM-dd",new Date()),8),
+        trainingEndTime2:new Date(this.addDay(this.dateFormat("yyyy-MM-dd",new Date()),8)).getTime()
+      })
+    } else {
+      this.setData({
+        trainingStartTime:this.dateFormat("yyyy-MM-dd",new Date()),
+        trainingStartTime2:new Date().getTime(),
+        trainingEndTime:this.dateFormat("yyyy-MM-dd",new Date()),
+        trainingEndTime2:new Date().getTime()
+      })
+    }
+  },
+  //培训开始时间
+  onStartTime(e){
+    var that = this
+    that.setData({
+      trainingStartTime:e.detail,
+      trainingStartTime2:new Date(e.detail).getTime()
+    })
+    let trainingEndTime = e.detail 
+    let trainingEndTime2 = new Date(e.detail).getTime()
+    if(that.data.trainingType == 4) {
+      trainingEndTime = that.addDay(e.detail,8) 
+      trainingEndTime2 = new Date(that.addDay(e.detail,8)).getTime()
+    } 
+    that.setData({
+      trainingEndTime:trainingEndTime,
+      trainingEndTime2 :trainingEndTime2
+    })
+    
+  },
+  //培训结束时间
+  onEndTime(e){
+    this.setData({
+      trainingEndTime:e.detail
+    })
+  },
+  //培训内容
+  onInputContent(e){
+    this.setData({
+      trainingContent:e.detail.value
+    })
+  },
+  //协作队伍
+  onCooperationTeam(e){
+    let collaborateRanksId = '';
+    let collaborateRanksName = '';
+    for(let i = 0;i<e.detail.length;i++){
+      collaborateRanksId += e.detail[i].id+ ","
+      collaborateRanksName += e.detail[i].text+ ","
+    }
+    if (collaborateRanksId.length > 0) {
+      collaborateRanksId = collaborateRanksId.substr(0, collaborateRanksId.length - 1);
+    }if (collaborateRanksName.length > 0) {
+      collaborateRanksName = collaborateRanksName.substr(0, collaborateRanksName.length - 1);
+    }
+
+    this.setData({
+      collaborateRanksId:collaborateRanksId,
+      collaborateRanksName:collaborateRanksName,
+    })
+  },
+  //参与人数
+  onInputNumber(e){
+    this.setData({
+      attendNumber:e.detail.value
+    })
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        let educationTypeList = [{text:'三级安全教育',id:4},{text:'班前讲话',id:5},{text:'专项培训',id:3},{text:'应急演练',id:6}];
+        let activeName;
+        let activeIndex;
+        let trainingType;
+        let trainingStartTime = that.getNowDate()
+        let trainingEndTime;
+        for(let i = 0;i<educationTypeList.length;i++){
+          if(options.activeState == educationTypeList[i].id){
+            activeName = educationTypeList[i].text;
+            activeIndex = i;
+            trainingType = educationTypeList[i].id;
+            break;
+          }
+        }
+        if(trainingType == 4) {
+          trainingEndTime = that.addDay(that.dateFormat("yyyy-MM-dd",new Date()),8)
+          
+        } else {
+          trainingEndTime = that.getNowDate()
+        }
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectId:options.projectId,
+          projectName:options.projectName,
+          activeName:activeName,
+          activeIndex:activeIndex,
+          educationTypeList:educationTypeList,
+          trainingType:trainingType,
+          trainingStartTime:trainingStartTime,
+          trainingStartTime2:new Date(trainingStartTime).getTime(),
+          trainingEndTime:trainingEndTime,
+          trainingEndTime2:new Date(trainingEndTime).getTime()
+        })  
+
+        that.getCollaborativeTeam();
+      }
+    }) 
+  },
+
+  /**
+   * 获取当前年月日
+   */
+  getNowDate(){
+    var date = new Date(); 
+    var year = date.getFullYear(); 
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    month = (month > 9) ? month : ("0" + month);
+    day = (day < 10) ? ("0" + day) : day;
+    var today = year + "-" + month + "-" + day;
+    console.log(today);
+    return today;
+  },
+
+   addDay(datetime, days) {
+             var old_time = new Date(datetime.replace(/-/g, "/")); //替换字符，js不认2013-01-31,只认2013/01/31
+             var fd = new Date(old_time.valueOf() + days * 24 * 60 * 60 * 1000); //日期加上指定的天数
+             var new_time = fd.getFullYear() + "-";
+             var month = fd.getMonth() + 1;
+             if (month >= 10) {
+                 new_time += month + "-";
+             } else {
+                //在小于10的月份上补0
+                new_time += "0" + month + "-";
+            }
+            if (fd.getDate() >= 10) {
+                new_time += fd.getDate();
+            } else {
+                //在小于10的日期上补0
+                new_time += "0" + fd.getDate();
+           }
+            return new_time; //输出格式：2013-01-02
+    },
+
+  dateFormat(fmt, date) {
+    let ret;
+    const opt = {
+        'y+': date.getFullYear().toString(), // 年
+        'M+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        'm+': date.getMinutes().toString(), // 分
+        's+': date.getSeconds().toString(), // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0'));
+        }
+    }
+    return fmt;
+  },
+
+
+  /**
+   * 协助队伍
+   */
+  getCollaborativeTeam(){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/training/getCollaborativeTeam',
+      data:{
+        "projectId":this.data.projectId,
+      },
+      method:"get",
+      success:function(res){
+        let array = [];
+        for(let i =0;i<res.data.length;i++){
+          if(array.length <= 0){
+            array.push({
+              "id":res.data[i].unitId,
+              "text":res.data[i].uninName,
+              "type":false
+            })
+          }else{
+            if(!array.some(item1=>item1.id == res.data[i].unitId)){
+              array.push({
+                "id":res.data[i].unitId,
+                "text":res.data[i].uninName,
+                "type":false
+              })
+            }
+          }
+
+        }
+     
+        that.setData({
+          cooperationTeamList:array
+        })
+      }
+    })
+  },
+
+  onImagesArr(e){
+    this.setData({fileDataList:[]});
+    let fileDataList = [];
+    for(let i = 0;i<e.detail.length;i++){
+      wx.uploadFile({
+        //图片上传地址
+        url: app.globalData.reqUrl+'/weixin/security/fileUpload',
+        filePath: e.detail[i],
+        name: 'file',
+        header: {
+          "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+        },
+        formData: { user: 'test' },
+        success:res => {
+          let data = JSON.parse(res.data);
+          fileDataList.push(data.url);
+        },
+      });
+    }
+    this.setData({ fileDataList:fileDataList});
+  },
+  
+  add:function(){
+    //判断值是否为空
+    if(this.data.trainingType == '' || this.data.trainingType == undefined){
+      app.toast("请选择培训类型");
+      return;
+    }else if(this.data.trainingStartTime == '' || this.data.trainingStartTime == undefined){
+      app.toast("请选择培训开始时间");
+      return;
+    }else if(this.data.trainingEndTime == '' || this.data.trainingEndTime == undefined){
+      app.toast("请选择培训结束时间");
+      return;
+    }else if(this.data.trainingContent == '' || this.data.trainingContent == undefined){
+      app.toast("请填写培训内容");
+      return;
+    }else if(this.data.collaborateRanksId == '' || this.data.collaborateRanksId == undefined){
+      app.toast("请选择协作队伍");
+      return;
+    }else if(this.data.attendNumber == '' || this.data.attendNumber == undefined){
+      app.toast("请选择参加人数");
+      return;
+    }
+   
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url:app.globalData.reqUrl+'/weixin/training/addTrainingData',
+      data:{
+        projectId:this.data.projectId,
+        projectName:this.data.projectName,
+        trainingType:this.data.trainingType,
+        trainingStartTime:this.data.trainingStartTime,
+        trainingEndTime:this.data.trainingEndTime,
+        trainingContent:this.data.trainingContent,
+        collaborateRanksId:this.data.collaborateRanksId,
+        collaborateRanksName:this.data.collaborateRanksName,
+        attendNumber:this.data.attendNumber,
+        createUser:this.data.loginName,
+        fileDataList:JSON.stringify(this.data.fileDataList)
+      },
+      method:"POST",
+     success:function(res){
+       if(res.data.code == 0){
+        wx.redirectTo({
+          url: '../educations-list/index',
+        })
+       }else{
+         app.toast("添加失败");
+         return;
+       }
+     }
+    })
+  },
+
+  /**
+   * 返回教育培训列表
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../educations-list/index'
+    })
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-add/index.json b/miniprogram/pageage/educations-add/index.json
new file mode 100644
index 0000000..eab979f
--- /dev/null
+++ b/miniprogram/pageage/educations-add/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationBarTitleText": "新增教育培训"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-add/index.wxml b/miniprogram/pageage/educations-add/index.wxml
new file mode 100644
index 0000000..a5f016e
--- /dev/null
+++ b/miniprogram/pageage/educations-add/index.wxml
@@ -0,0 +1,80 @@
+<!--pages/educations-add/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+     
+      <van-col span="7">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">新增教育培训</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<view class="max_new_content"> 
+    <view class="add_max">
+        <view class="add_title">培训类型</view>
+        <voucher-select columns="{{educationTypeList}}" selectValue="{{activeName}}" selectIndex="{{activeIndex}}" placeholder="请选择培训类型" bindchange="onSelectEducationType"></voucher-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">培训时间</view>
+        <van-row>
+          <van-col span="10">
+            <voucher-date-copy counts="5" currentDate="{{trainingStartTime2}}" placeholder="开始时间" time="{{trainingStartTime}}" bindchange="onStartTime"></voucher-date-copy>
+          </van-col>
+          <van-col span="4">
+            <view style="text-align: center;line-height: 90rpx;">至</view>
+          </van-col>
+          <van-col span="10">
+            <voucher-date-copy counts="5" maxDate="{{maxDate}}" currentDate="{{trainingEndTime2}}"  placeholder="结束时间" time="{{trainingEndTime}}" bindchange="onEndTime"></voucher-date-copy>
+          </van-col>
+        </van-row>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">培训内容</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写培训内容" placeholder-style="color:#6777aa;" bindinput="onInputContent"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">协作队伍</view>
+        <voucher-many-select columns="{{cooperationTeamList}}" placeholder="请选择协作队伍" bindchange="onCooperationTeam"></voucher-many-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">参与人数</view>
+        <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写参与人数" placeholder-style="color:#6777aa;" bindinput="onInputNumber"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">培训照片</view>
+        <file-uploader  bindimages="onImagesArr"></file-uploader>
+    </view>
+
+    <view class="add_btn">
+        <view class="add_btn_qx" bindtap="goGCLB">取消</view>
+        <view class="add_btn_bc" bindtap="add">保存</view>
+    </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
diff --git a/miniprogram/pageage/educations-add/index.wxss b/miniprogram/pageage/educations-add/index.wxss
new file mode 100644
index 0000000..8057ab5
--- /dev/null
+++ b/miniprogram/pageage/educations-add/index.wxss
@@ -0,0 +1,30 @@
+/* pages/educations-add/index.wxss */
+.van-picker__mask  {
+  background-image: none !important;
+}
+.van-hairline--top-bottom:after {
+  border-top: 1px solid #3a4c8b !important;
+  border-bottom: 1px solid #3a4c8b !important;
+}
+
+
+
+.van-picker {
+  background: none !important;
+}
+
+.voucher_select_max{
+  padding:0 25rpx;
+  display: flex;
+  align-items: center;
+  background: #212737;
+  height: 90rpx;
+  border-radius: 10rpx;
+}
+
+.voucher_select_min{
+  width: calc(100% - 30rpx);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
diff --git a/miniprogram/pageage/educations-details/index.js b/miniprogram/pageage/educations-details/index.js
new file mode 100644
index 0000000..efe991b
--- /dev/null
+++ b/miniprogram/pageage/educations-details/index.js
@@ -0,0 +1,272 @@
+// pages/educations-details/index.js
+// pages/educations-add/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    show:false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    //参数
+    fileDataList:[],
+    educationTypeList:[{text:'三级安全教育',id:4},{text:'班前讲话',id:5},{text:'专项培训',id:3},{text:'应急演练',id:6}],
+    cooperationTeamList:[],
+    trainingType:'',
+    trainingStartTime:'',
+    trainingEndTime:'',
+    trainingContent:'',
+    collaborateRanksId:'',
+    collaborateRanksName:'',
+    attendNumber:'',
+    trainingData:{},
+    maxDate:new Date(2100,1,1).getTime(),
+  
+  },
+// 展示图片
+showImg(){
+this.setData({
+  show:true
+})
+},
+// 关闭遮罩层
+closeShow(){
+  this.setData({
+    show:false
+  })
+},
+  //培训开始时间
+  onStartTime(e){
+    this.setData({
+      trainingStartTime:e.detail
+    })
+  },
+  //培训结束时间
+  onEndTime(e){
+    this.setData({
+      trainingEndTime:e.detail
+    })
+  },
+  //培训内容
+  onInputContent(e){
+    this.setData({
+      trainingContent:e.detail.value
+    })
+  },
+  //协作队伍
+  onCooperationTeam(e){
+    let collaborateRanksId = '';
+    let collaborateRanksName = '';
+    for(let i = 0;i<e.detail.length;i++){
+      collaborateRanksId += e.detail[i].id+ ","
+      collaborateRanksName += e.detail[i].text+ ","
+    }
+    if (collaborateRanksId.length > 0) {
+      collaborateRanksId = collaborateRanksId.substr(0, collaborateRanksId.length - 1);
+    }if (collaborateRanksName.length > 0) {
+      collaborateRanksName = collaborateRanksName.substr(0, collaborateRanksName.length - 1);
+    }
+    this.setData({
+      collaborateRanksId:collaborateRanksId,
+      collaborateRanksName:collaborateRanksName,
+    })
+  },
+  //参与人数
+  onInputNumber(e){
+    this.setData({
+      attendNumber:e.detail.value
+    })
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectId:options.projectId,
+          projectName:options.projectName,
+        })  
+        that.getTrainingDataById(options.id,options.type);
+        that.getCollaborativeTeam(options.ranksId);
+      }
+    }) 
+  },
+
+  /**
+   * 查询出单条数据
+   */
+  getTrainingDataById(id,type){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/training/getTrainingDataById',
+      data:{
+        "main_id":id,
+        "trainingType":type,
+        "projectId":this.data.projectId
+      },
+      method:"get",
+      success:function(res){
+        that.onClickHide();
+        that.setData({
+          trainingData:res.data,
+          trainingEndTime:res.data.cultivate_end == null?'':res.data.cultivate_end,
+          trainingContent:res.data.content,
+          collaborateRanksId:res.data.company_id == null?'':res.data.company_id,
+          collaborateRanksName:res.data.partnership,
+          attendNumber:res.data.people_number
+        }) 
+      }
+    })
+  },
+
+  /**
+   * 协助队伍
+   */
+  getCollaborativeTeam(ranksId){
+    var that = this;
+    let ranksIds =ranksId.split(',');
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/training/getCollaborativeTeam',
+      data:{
+        "projectId":this.data.projectId,
+      },
+      method:"get",
+      success:function(res){
+        let array = [];
+        for(let i =0;i<res.data.length;i++){
+          let type =false;
+          for(let j = 0;j<ranksIds.length;j++){
+           
+            if(res.data[i].unitId == ranksIds[j]){
+              type = true;
+            }
+          }
+          if(array.length <= 0){
+            array.push({
+              "id":res.data[i].unitId,
+              "text":res.data[i].uninName,
+              "type":type
+            })
+          }else{
+            if(!array.some(item1=>item1.id == res.data[i].unitId)){
+              array.push({
+                "id":res.data[i].unitId,
+                "text":res.data[i].uninName,
+                "type":type
+              })
+            }
+          }
+         
+        }
+        that.setData({
+          cooperationTeamList:array,
+        })
+        that.onClickHide();
+      }
+    })
+  },
+
+  onImagesArr(e){
+    console.log(e);
+    this.setData({fileDataList:[]});
+    let fileDataList = [];
+    for(let i = 0;i<e.detail.length;i++){
+      if(e.detail[i].indexOf('http://fileimg.makalu.cc') == -1){
+        wx.uploadFile({
+          //图片上传地址
+          url: app.globalData.reqUrl+'/weixin/security/fileUpload',
+          filePath: e.detail[i],
+          name: 'file',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+          },
+          formData: { user: 'test' },
+          success:res => {
+            let data = JSON.parse(res.data);
+            fileDataList.push(data.url);
+          },
+        });
+      }else{
+        fileDataList.push(e.detail[i]);
+      }
+    }
+    this.setData({ fileDataList:fileDataList});
+  },
+  
+  add:function(){
+    //判断值是否为空
+    if(this.data.trainingContent == '' || this.data.trainingContent == undefined){
+      app.toast("请填写培训内容");
+      return;
+    }else if(this.data.collaborateRanksName == '' || this.data.collaborateRanksName == undefined){
+      app.toast("请选择协作队伍");
+      return;
+    }else if(this.data.attendNumber == '' || this.data.attendNumber == undefined){
+      app.toast("请填写参加人数");
+      return;
+    }
+   
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url:app.globalData.reqUrl+'/weixin/training/updateTrainingData',
+      data:{
+        projectId:this.data.projectId,
+        mainId:this.data.trainingData.main_id,
+        trainingType:this.data.trainingData.cultivate_type,
+        trainingEndTime:this.data.trainingEndTime,
+        trainingContent:this.data.trainingContent,
+        collaborateRanksId:this.data.collaborateRanksId,
+        collaborateRanksName:this.data.collaborateRanksName,
+        attendNumber:this.data.attendNumber,
+        createUser:this.data.loginName,
+        fileDataList:JSON.stringify(this.data.fileDataList)
+      },
+      method:"POST",
+     success:function(res){
+       if(res.data.code == 0){
+        wx.redirectTo({
+          url: '../educations-list/index',
+        })
+       }else{
+         app.toast("操作失败");
+         return;
+       }
+     }
+    })
+  },
+
+  /**
+   * 返回教育培训列表
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../educations-list/index'
+    })
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-details/index.json b/miniprogram/pageage/educations-details/index.json
new file mode 100644
index 0000000..803abc5
--- /dev/null
+++ b/miniprogram/pageage/educations-details/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-details/index.wxml b/miniprogram/pageage/educations-details/index.wxml
new file mode 100644
index 0000000..97c938c
--- /dev/null
+++ b/miniprogram/pageage/educations-details/index.wxml
@@ -0,0 +1,106 @@
+<!--pages/educations-details/index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+     
+      <van-col span="7">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">教育培训详情</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<view class="max_content">
+    <view class="add_max">
+      <view class="add_title">培训类型</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder-style="color:#6777aa;" value="{{trainingData.dict_label}}" disabled="disabled"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">培训时间</view>
+        <van-row>
+          <van-col span="10">
+            <view class="voucher_select_max">
+              <view class="voucher_select_min">
+                <input placeholder-style="color:#6777aa;" value="{{trainingData.cultivate_time}}" disabled="disabled"/>
+              </view>
+            </view>
+            <!-- <voucher-date counts="5" placeholder="开始时间" bindchange="onStartTime" time="{{trainingData.cultivate_time}}"></voucher-date> -->
+          </van-col>
+          <van-col span="4">
+            <view style="text-align: center;line-height: 90rpx;">至</view>
+          </van-col>
+          <van-col span="10">
+            <voucher-date counts="5"  maxDate="{{maxDate}}"  placeholder="结束时间" bindchange="onEndTime" time="{{trainingData.cultivate_end}}"></voucher-date>
+          </van-col>
+        </van-row>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">培训内容</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写培训内容" placeholder-style="color:#6777aa;" bindinput="onInputContent" value="{{trainingData.content}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">协作队伍</view>
+        <voucher-many-select columns="{{cooperationTeamList}}" placeholder="请选择协作队伍" bindchange="onCooperationTeam" selectValue="{{trainingData.partnership}}"></voucher-many-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">参与人数</view>
+        <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写参与人数" placeholder-style="color:#6777aa;" bindinput="onInputNumber" value="{{trainingData.people_number}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">培训照片</view>
+        <file-uploader  bindimages="onImagesArr" fileUrlArray="{{trainingData.front_images_url}}"></file-uploader> 
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">电子签名</view>
+        <image wx:for="{{trainingData.people_sign}}" bindtap='showImg' data-set="{{index}}" src="{{item}}" style="width: 75px;height: 75px;margin-left:5px;filter: invert(100%);"></image> 
+        <!-- 展示图片 -->
+    <page-container wx:if="{{show}}"  position="center" bindtap="closeShow">
+      <view style="width: 100%;height: 100%;background: rgba(255, 255, 255, 0.7);position: absolute;top: 0;left: 0;">
+        <image src="{{item}}" mode="" wx:for="{{trainingData.people_sign}}" style="width: 100%;height: 100%;"/>
+      </view>
+    </page-container>
+    </view>
+
+
+    
+
+
+
+    <view class="add_btn">
+        <view class="add_btn_qx" bindtap="goGCLB">取消</view>
+        <view class="add_btn_bc" bindtap="add">保存</view>
+    </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
diff --git a/miniprogram/pageage/educations-details/index.wxss b/miniprogram/pageage/educations-details/index.wxss
new file mode 100644
index 0000000..5ef2c6d
--- /dev/null
+++ b/miniprogram/pageage/educations-details/index.wxss
@@ -0,0 +1,31 @@
+/* pages/educations-details/index.wxss */
+.van-picker__mask  {
+    background-image: none !important;
+  }
+  .van-hairline--top-bottom:after {
+    border-top: 1px solid #3a4c8b !important;
+    border-bottom: 1px solid #3a4c8b !important;
+  }
+  
+  
+  
+  .van-picker {
+    background: none !important;
+  }
+  
+  .voucher_select_max{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 90rpx;
+    border-radius: 10rpx;
+  }
+  
+  .voucher_select_min{
+    width: calc(100% - 30rpx);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-list/index.js b/miniprogram/pageage/educations-list/index.js
new file mode 100644
index 0000000..b081803
--- /dev/null
+++ b/miniprogram/pageage/educations-list/index.js
@@ -0,0 +1,292 @@
+// pages/educations-list/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    show: false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    jumpState:'',
+    //参数
+    DeviceGroupData: [],
+    numTime:0,
+    attendNumber:0,
+    imgShow:false,
+    initData:{},
+    trainingList:[],
+    type:'',
+    pageNo:1,
+    pageSize:10,
+    pageFlag:true,
+    activeState:4,
+    titleName:'三级安全教育',
+    trainingType:'',
+    startDate:'',
+    endDate:'',
+    collaborateRanksId:'',
+    imgUrl:''
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName,
+    })
+    let data = {"jumpState":this.data.jumpState};
+	  this.onLoad(data);
+  },
+  winterPut(e){
+    this.setData({
+      imgShow:true,
+      imgUrl:e.currentTarget.dataset.url
+    })
+  },
+   //关闭放大的图片
+  closeImages(){
+    this.setData({
+      imgShow:false
+    })
+  },
+
+  //筛选条件
+  screenCondition(e){
+    this.setData({
+      collaborateRanksId:e.detail.typeId,
+      startDate:e.detail.startDate,
+      endDate:e.detail.endDate,
+      pageNo:1,
+      type:1
+    })
+    this.getTrainingList();
+    this.getTrainingNumberOfPeopleCount();
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+     that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId},
+          jumpState:options.jumpState,
+          titleName:'三级安全教育',
+          activeState:4,
+          pageNo:1,
+          type:1,
+          trainingType:4,
+          startDate:'',
+          endDate:'',
+          collaborateRanksId:''
+        }) 
+        that.getTrainingList();
+        that.getTrainingNumberOfPeopleCount();
+        that.getCollaborativeTeam();
+      }
+    }) 
+  },
+
+  /**
+   * 教育培训列表
+   */
+  getTrainingList(){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/training/getTrainingList',
+      data:{
+        "projectId":this.data.projectId,
+        "trainingType":this.data.trainingType,
+        "pageNo":(this.data.pageNo-1)*this.data.pageSize,
+        "startDate":this.data.startDate,
+        "endDate":this.data.endDate,
+        "collaborateRanksId":this.data.collaborateRanksId,
+      },
+      method:"get",
+      success:function(res){
+        if(res.data.length < that.data.pageSize){
+          that.setData({ pageFlag:false })
+        }else{
+          that.setData({ pageFlag:true })
+        }
+
+        let array;
+        if(that.data.type == 1){
+          array = [];
+        }else{
+          array = that.data.trainingList
+        }
+        for(let i = 0;i<res.data.length;i++){
+          array.push(res.data[i]);
+        }
+        that.setData({trainingList:array});
+        that.onClickHide();
+      }
+    })
+  },
+
+  /**
+   * 教育培训次数、人数
+   */
+  getTrainingNumberOfPeopleCount(){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/training/getTrainingNumberOfPeopleCount',
+      data:{
+        "projectId":this.data.projectId,
+        "trainingType":this.data.trainingType,
+        "startDate":this.data.startDate,
+        "endDate":this.data.endDate,
+        "collaborateRanksId":this.data.collaborateRanksId
+      },
+      method:"get",
+      success:function(res){
+        that.onClickHide();
+        that.setData({
+          numTime:res.data.typeNum,
+          attendNumber:res.data.personNum
+        })
+      }
+    })
+  },
+
+  /**
+   * 标签切换
+   */
+  trainingTypeJump(e){
+    this.onClickShow();
+    let index = e.currentTarget.dataset.index;
+    let titleName =  '';
+    if(index == 4){
+      titleName = '三级安全教育';
+    }else if(index == 5){
+      titleName = '班前讲话';
+    }else if(index == 3){
+      titleName = '专项培训';
+    }else if(index == 6){
+      titleName = '应急演练'
+    }
+    this.setData({
+      titleName:titleName,
+      activeState:index,
+      pageNo:1,
+      type:1,
+      trainingType:index,
+      startDate:'',
+      endDate:'',
+      collaborateRanksId:''
+    });
+    this.getTrainingList();
+    this.getTrainingNumberOfPeopleCount();
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.setData({
+      pageNo:this.data.pageNo+1,
+      type:2
+    })
+    if(this.data.pageFlag){
+      this.getTrainingList();
+    }
+  },
+
+  /**
+   * 协助队伍
+   */
+  getCollaborativeTeam(){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/training/getCollaborativeTeam',
+      data:{
+        "projectId":this.data.projectId,
+      },
+      method:"get",
+      success:function(res){
+        let array = [{"id":'',"text":'请选择'}];
+        for(let i =0;i<res.data.length;i++){
+          array.push({
+            "id":res.data[i].id,
+            "text":res.data[i].uninName
+          })
+        }
+        that.setData({
+          DeviceGroupData:array
+        })
+      }
+    })
+  },
+
+  /**
+   * 详情页面
+   * @param {*} e 
+   */
+  checkDetailsData(e){
+    let id = e.currentTarget.dataset.id;
+    let ranksId = e.currentTarget.dataset.ranksid;
+    let type = e.currentTarget.dataset.type
+    wx.redirectTo({
+      url: '../educations-details/index?id='+id+'&projectName='+this.data.projectName+"&projectId="+this.data.projectId+"&ranksId="+(ranksId==null?'':ranksId)+"&type="+type,
+    })
+  },
+
+  /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    let jumpState = this.data.jumpState;
+    wx.redirectTo({
+      url: jumpState != 1?'../../pages/gengduogongneng/gengduogongneng':'../../pages/newAddPage/safetyManagement/index'
+    })
+  },
+
+  /**
+   * 跳转到add页面
+   */
+  add:function(){
+    wx.navigateTo({
+      url: '../educations-add/index?projectName='+this.data.projectName+"&projectId="+this.data.projectId+"&activeState="+this.data.activeState,
+    })
+  }
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-list/index.json b/miniprogram/pageage/educations-list/index.json
new file mode 100644
index 0000000..5d5ccce
--- /dev/null
+++ b/miniprogram/pageage/educations-list/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" ,
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationBarTitleText": "教育培训"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/educations-list/index.wxml b/miniprogram/pageage/educations-list/index.wxml
new file mode 100644
index 0000000..b401ce4
--- /dev/null
+++ b/miniprogram/pageage/educations-list/index.wxml
@@ -0,0 +1,165 @@
+<!--pages/educations-list/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">教育培训</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- 
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+
+<view class="max_new_content" style="padding-bottom: 0;">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+  <!-- <view class="video_add">
+    <view class="video_address">
+      <view class="video_address_min" bindtap="GOMAP">
+        {{projectName}}
+      </view>
+    </view>
+  </view> -->
+
+  <view class="modify_video_nav" style="margin-top: 64rpx;">
+      <view class="{{activeState==4?'active':''}}" bindtap="trainingTypeJump" data-index="4"><text>三级安全教育</text></view>
+      <view class="{{activeState==5?'active':''}}" bindtap="trainingTypeJump" data-index="5"><text>班前讲话</text></view>
+      <view class="{{activeState==3?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>专项培训</text></view>
+      <view class="{{activeState==6?'active':''}}" bindtap="trainingTypeJump" data-index="6"><text>应急演练</text></view>
+  </view>
+
+  <view class="video_num">
+    <van-row>
+      <van-col span="12">
+        <view class="video_icon">
+          培训次数：
+          <text>{{numTime}}</text>
+          次
+        </view>
+      </van-col>
+      <van-col span="12">
+        <view class="video_icon">
+          培训人数：
+          <text>{{attendNumber}}</text>
+          个
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+
+  <view class="modify_echarts_max" >
+    <view class="modify_echarts_title_min">
+        <view class="modify_eharts_title">{{titleName}}</view> 
+        <pz-screen-training columns="{{DeviceGroupData}}" bindscreen="screenCondition"></pz-screen-training>
+    </view>
+  </view>
+  <!-- 冬季施工安全专项培训 342+150-->
+  <view>
+    <view class="Winter-training"  wx:for="{{trainingList}}" wx:key="index">
+      <view class="Winter-training-box">
+        <!-- 上盒子 -->
+        <view class="Winter-training-topBox">
+          <!-- 左盒子 -->
+          <view class="Winter-training-leftBox">
+              <view class="Winter-training-left-box">
+                {{index+1}}
+              </view>
+              <view class="Winter-training-right-box">
+              {{item.content}}
+              </view>
+          </view>
+          <!--右盒子 15+15-->
+          <view class="Winter-training-Img" data-set="{{index}}" data-url="{{item.qr_url}}" bindtap="winterPut">
+            <image src="http://fileimg.makalu.cc/WEB_635514B7BEA4463FA176EDE34180EB38.png" mode=""/>
+          </view>
+        </view>
+
+      <!-- 下盒子 -->
+      <view class="Winter-training-bottomBox" bindtap="checkDetailsData" data-id="{{item.main_id}}" data-ranksId="{{item.company_id}}" data-type="{{item.cultivate_type}}">
+      <!-- 上部分 305+54-->
+        <view class="Winter-training-bottomBox-top">
+          <view class="Winter-training-bottomBox-left-box">
+            <image src="{{item.front_images_url[0]}}" mode=""/>
+          </view>
+          <view class="Winter-training-bottomBox-right-box">
+            <view style="margin-bottom: 26rpx;display: flex;width: 460rpx;height: 32rpx;justify-content: space-between;">
+              <view style="display: flex;">
+                参与人数：<view style="color: #ff8301;">
+                {{item.people_number}}
+              </view>
+              </view>
+              <view style="display: flex;">
+                签名人数：<view style="color: green;">
+                  {{item.people_number_all}}
+                </view>
+              </view>
+            </view>
+            <view style="display: flex;">
+              培训时间：<view style="color: #43abf9;">
+              {{item.cultivate_time}}~{{item.cultivate_end == null?'':item.cultivate_end}}
+              </view>
+            </view>
+          </view>
+        </view>
+        <!-- 下部分 -->
+        <view style="font-size: 26rpx;display: flex;">
+         <view style="width:130rpx;">
+          协作队伍:
+         </view>
+         <view style="color: #7489c7;width:calc(100% - 140rpx); display: -webkit-box;overflow:hidden;white-space: normal !important;text-overflow: ellipsis;word-wrap: break-word;-webkit-line-clamp: 3;-webkit-box-orient: vertical">
+    {{item.partnership}}
+    </view>
+        </view>
+      </view>
+
+      </view>
+    </view>
+    <!-- 图片放大弹窗 -->
+    <view class="popup_img" wx:if="{{imgShow}}" bindtap="closeImages">
+      <view class="popup_images" 
+      style="background: url('{{imgUrl}}') no-repeat center/100%"></view>
+    </view>
+    <!-- 新增模块 -->
+    <view class="button-add" bindtap="add">
+    <view style="width: 38rpx;height: 38rpx;">
+      <image src="http://fileimg.makalu.cc/WEB_73DDBFC7781A41C082FC10AB5F530472.png" mode=""/>
+    </view>
+    <view style="font-size: 26rpx;color: #748bca;">
+      新增
+    </view>
+  </view>
+  </view>
+</view>
+
+<van-toast id="van-toast" />
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
diff --git a/miniprogram/pageage/educations-list/index.wxss b/miniprogram/pageage/educations-list/index.wxss
new file mode 100644
index 0000000..94df71d
--- /dev/null
+++ b/miniprogram/pageage/educations-list/index.wxss
@@ -0,0 +1,150 @@
+/* pages/educations-list/index.wxss */
+.van-uploader__preview-image{
+  width: 140rpx !important;
+  height: 140rpx !important;
+}
+.van-picker__mask {
+  background-image: none !important;
+}
+
+.van-hairline--top-bottom:after {
+  border-top: 1px solid #3a4c8b !important;
+  border-bottom: 1px solid #3a4c8b !important;
+}
+
+.van-picker {
+  background: none !important;
+}
+.video_num{
+  padding-top: 20rpx;
+}
+.modify_echarts_max{
+  margin-bottom: 50rpx;
+}
+/* 冬季培训 */
+.Winter-training{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 80rpx;
+  padding-bottom: 36rpx;
+}
+.Winter-training-box{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+  width: 684rpx;
+  height:300rpx;
+  border: 1px solid #1e2336;
+  background-color: #1e2336;
+  border-radius: 15rpx;
+}
+/* 上盒子 */
+.Winter-training-topBox{
+  display: flex;
+  justify-content: space-between;
+  width: 632rpx;
+  height: 48rpx;
+  border-bottom: 2px solid #282f5e;
+}
+/* 左盒子 */
+.Winter-training-leftBox{
+  display: flex;
+  justify-content: flex-start;
+  width: 580rpx;
+  height: 48rpx;
+
+}
+.Winter-training-left-box{
+  text-align: center;
+  width: 48rpx;
+  height: 48rpx;
+  border-bottom: 2px solid #434e98;
+  padding: 0 8rpx;
+}
+.Winter-training-right-box{
+  width: 516rpx;
+  height: 48rpx;
+  border-bottom: 2px solid #282f5e;
+    white-space: nowrap;
+  overflow: hidden; 
+  text-overflow: ellipsis;
+}
+/* 右盒子 */
+.Winter-training-Img{
+  width: 30rpx;
+  height: 30rpx;
+}
+.Winter-training-Img image{
+  width: 100%;
+  height: 100%;
+}
+/* 下盒子 */
+.Winter-training-bottomBox{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  width: 632rpx;
+  height: 200rpx;
+}
+.Winter-training-bottomBox-top{
+  display: flex;
+  width: 600rpx;
+  height: 108rpx;
+  margin-left: 20rpx;
+}
+/* 上部分 */
+.Winter-training-bottomBox-left-box{
+  width: 100rpx;
+  height: 100rpx;
+  margin-right: 16rpx;
+  background: url("http://fileimg.makalu.cc/WEB_DC5E7AB4FFB4412A886A44BDC2B820E0.png") no-repeat center/100% 100%;
+}
+.Winter-training-bottomBox-left-box image{
+width: 100%;
+height: 100%;
+}
+.Winter-training-bottomBox-right-box{
+  font-size: 26rpx;
+  width: 460rpx;
+  height: 108rpx;
+}
+/* 新增模块 */
+.button-add{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  bottom: 10rpx;
+  right: 10rpx;
+  width: 110rpx;
+  height: 110rpx;
+  border-radius: 50%;
+  background-color: #273252;
+}
+.button-add image{
+  width: 100%;
+  height: 100%;
+}
+/* 弹窗 */
+.popup_img{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background: rgba(0,0,0,0.6);
+  z-index: 100;
+}
+.popup_images{
+  width: 70%;
+  height: 70%;
+  
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.js b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.js
new file mode 100644
index 0000000..e47fa28
--- /dev/null
+++ b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.js
@@ -0,0 +1,149 @@
+// pages/lw-baobiaochaxun/lw-baobiaochaxun.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    projectName:'',
+    date: '',
+    today:'',
+    show: false,
+    minDate: new Date(2020, 0, 1).getTime(),
+    maxDate: new Date().getTime(),
+    tableList:[],
+    tableListNew:[],
+    loadShow:false,
+    pageNum:1,
+    //静态变量
+    type:false,
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  onDisplay() {
+    this.setData({ show: true });
+  }, 
+  onClose() {
+    this.setData({ show: false });
+  },
+  formatDate(date) {
+    date = new Date(date);
+    var dateYaer = date.getFullYear();
+    var dateMonth = date.getMonth() + 1;
+    var dateDay = date.getDate();
+    if(dateMonth < 10 ){
+      dateMonth = '0' + dateMonth;
+    }
+    if(dateDay < 10 ){
+      dateDay = '0' + dateDay;
+    }
+    return  dateYaer+'-'+dateMonth+ '-'+dateDay;
+  },
+
+  onConfirm(event) {
+    this.onClickShow();
+    this.setData({
+      show: false,
+      date: this.formatDate(event.detail),
+      tableListNew:[],
+      pageNum:1
+    });
+    this.selectClockPunch(app.globalData.projectId,this.formatDate(event.detail),1,20);
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.onClickShow();
+    var date = new Date();
+    var dateYaer = date.getFullYear();
+    var dateMonth = date.getMonth() + 1;
+    var dateDay = date.getDate();
+    if(dateMonth < 10 ){
+      dateMonth = '0' + dateMonth;
+    }
+    if(dateDay < 10 ){
+      dateDay = '0' + dateDay;
+    }
+    this.setData({
+      date: dateYaer+'-'+dateMonth+ '-'+dateDay,
+    });
+    this.setData({
+      today:dateYaer+'-'+dateMonth+ '-'+dateDay,
+      projectName:app.globalData.projectName,
+      tableListNew:[]
+    })
+    this.selectClockPunch(app.globalData.projectId,dateYaer+'-'+dateMonth+ '-'+dateDay,1,20);
+  },
+
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    //判断数组是否存在值
+    if(this.data.type){
+      this.setData({pageNum:this.data.pageNum+1});
+      this.selectClockPunch(app.globalData.projectId,this.data.date,this.data.pageNum,20);
+    }
+   
+  },
+
+  /**
+   * 获取项目打卡数据
+   * @param {*} projectId  项目id
+   * @param {*} date  日期
+   * @param {*} pageNum  页数(1开始)
+   * @param {*} size  每页条数
+   */
+  selectClockPunch:function(projectId,date,pageNum,size){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/labour/selectClockPunch',
+      data:{
+        "projectId":projectId,
+        "date":date,
+        "pageNum":pageNum,
+        "size":size
+      },
+      method:"GET",
+      success:function(res) {
+        that.onClickHide();
+        if(res.data.code == '200'){
+          //赋值
+          var tableListNew =that.data.tableListNew;
+          for(var i = 0;i<res.data.data.length;i++){
+            tableListNew.push(res.data.data[i]);
+          }
+          //判断查询到的数据是否有值
+          var type = true;
+          if(res.data.data.length < 20 ){ type = false; }
+
+          that.setData({
+            tableList:tableListNew,
+            type:type
+          })
+        }else{
+          app.toast(res.data.msg);
+        }
+      }
+    })
+  },
+
+  /**
+   * 返回劳务管控页面
+   */
+  goBack:function(){
+    wx.redirectTo({
+      url: '../lw-index/lw-index',
+    })
+  }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.json b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.json
new file mode 100644
index 0000000..0b95f0f
--- /dev/null
+++ b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml
new file mode 100644
index 0000000..f174317
--- /dev/null
+++ b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml
@@ -0,0 +1,84 @@
+<!--pages/lw-baobiaochaxun/lw-baobiaochaxun.wxml-->
+<!--pages/lw-index/lw-index.wxml-->
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="6" bindtap="goBack">
+        <view class="header_img"><image src="/images/left.png"></image></view>
+      </van-col>
+      <van-col span="12">
+        <view class="header_name">报表查询</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<view class="max_content">
+  <view class="lw_max">
+    <view class="lw_min" bindtap="onDisplay">
+      <text value="{{ date }}">{{ date }}</text>
+      <image src="/images/lw_4.png" class="lw_img_right"></image>
+    </view>
+  </view>
+
+  <van-calendar show="{{ show }}" bind:close="onClose" default-date="{{today}}"  show-confirm="{{ false }}"  bind:confirm="onConfirm" min-date="{{ minDate }}" max-date="{{ maxDate }}" color="#07c160" />
+
+  <view class="lw_gdgq">
+    <van-row>
+      <van-col span="12">
+        项目名称：<text>{{projectName}}</text>
+      </van-col>
+    </van-row>
+    
+    <view class="eharts_title">考勤列表</view>  
+   
+    <view class="lw_table_th">
+      <van-row>
+        <van-col span="4">
+          <view>姓名</view>
+        </van-col>
+        <van-col span="12">
+          <view>参建单位</view>
+        </van-col>
+        <van-col span="4">
+          <view>首次打卡</view>
+        </van-col>
+        <van-col span="4">  
+          <view>末次打卡</view>
+        </van-col>
+      </van-row>
+    </view>
+    
+    <view class="lw_table_tr">
+      <view class="lw_table_td" wx:for="{{tableList}}">
+        <van-row>
+          <van-col span="4">
+            <view>{{item.name}}</view>
+          </van-col>
+          <van-col span="12">
+            <view>{{item.enterprise_name}}</view>
+          </van-col>
+          <van-col span="4">
+            <view>{{item.scdk}}</view>
+          </van-col>
+          <van-col span="4">  
+            <view>{{item.mcdk}}</view>
+          </van-col>
+        </van-row>
+      </view>
+    </view>
+
+
+
+  </view>
+
+
+    
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxss b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxss
new file mode 100644
index 0000000..1528d1b
--- /dev/null
+++ b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxss
@@ -0,0 +1,77 @@
+/* pages/lw-baobiaochaxun/lw-baobiaochaxun.wxss */
+.lw_max{
+  padding: 20rpx 30rpx;
+}
+.lw_min{
+  padding: 20rpx 30rpx;
+  background: #2b345b;
+  border-radius: 15rpx;
+  font-size: 30rpx;
+}
+.lw_img_right{
+  float: right;
+  width: 40rpx;
+  height: 40rpx;
+}
+.lw_gdgq{
+  padding: 30rpx;
+  font-size: 28rpx;
+}
+.lw_gdgq text{
+  padding: 0 20rpx;
+  color: #89a4eb;
+}
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding: 40rpx;
+  font-size: 28rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.lw_table_th{
+  background: #222a41;
+  text-align: center;
+  padding: 20rpx 0;
+  font-size:24rpx;
+}
+.lw_table_tr{
+  padding: 10rpx 0;
+}
+.lw_table_td{
+  text-align: center;
+  padding: 20rpx 0;
+  font-size: 24rpx;
+  color: #8ba2ee;
+}
+.lw_table_td view{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 0 5rpx;
+}
+.van-calendar{
+  background-color: #232a44 !important;
+}
+.van-calendar__month-mark{
+  color:rgba(255,255,255,0.2)  !important;
+}
+.van-popup{
+  background: none !important;
+}
+
+.van-calendar__day--disabled{
+  color:rgba(255,255,255,0.4)  !important;
+}
+.van-calendar__header-subtitle{
+  display: none;
+}
+.van-button--block.van-button--round{
+  width: 100%;
+}
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.js b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.js
new file mode 100644
index 0000000..e023021
--- /dev/null
+++ b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.js
@@ -0,0 +1,97 @@
+// pages/lw-gerenxinxi/lw-gerenxinxi.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    register:'',    // 1  已注册   2  未注册
+    userInfoData:{},
+    //人员信息
+    userphoto:'',
+    name:'',
+    workType:'',
+    uninName:'',
+    date:'',
+    loadShow:false,
+  },
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var date = new Date();
+    var dateYaer = date.getFullYear();
+    var dateMonth = date.getMonth() + 1;
+    var dateDay = date.getDate();
+    if(options.register == 1){
+      var json =JSON.parse(decodeURIComponent(options.userInfo));
+      this.setData({
+        register:options.register,
+        userphoto:'data:image/jpeg;base64,'+json.pathUrl,
+        name:json.name,
+        workType:json.workType,
+        uninName:json.uninName,
+        date: dateYaer+'-'+dateMonth+ '-'+dateDay,
+        userInfoData:json,
+      });
+    }else{
+      this.setData({
+        register:options.register,
+        userphoto:'data:image/jpeg;base64,'+decodeURIComponent(options.pathUrl),
+      });
+    }
+  },
+
+  /**
+   * 打卡确认
+   */
+  returnData:function(){
+    var that = this;
+    that.onClickShow();
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/labour/synClockData',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      method:"POST",
+      data:{
+        id:app.globalData.projectId,
+        userInfoData:JSON.stringify(this.data.userInfoData),
+      },
+      success:function(res){
+        that.onClickHide();
+        app.toast(res.data.msg);
+        wx.redirectTo({
+          url: '../lw-index/lw-index',
+        })
+      }
+    })
+  },
+
+  /**
+   * 返回劳务管控页面
+   */
+  goBack:function(){
+    wx.redirectTo({
+      url: '../lw-index/lw-index',
+    })
+  },
+
+  /**
+   * 返回到注册页面
+   */
+  goRegisterPage:function(){
+    wx.redirectTo({
+      url: '../lw-jibenxinxi/lw-jibenxinxi',
+    })
+  }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.json b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.json
new file mode 100644
index 0000000..3c2c0f7
--- /dev/null
+++ b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.json
@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml
new file mode 100644
index 0000000..d60d7bd
--- /dev/null
+++ b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml
@@ -0,0 +1,88 @@
+<!--pages/lw-gerenxinxi/lw-gerenxinxi.wxml-->
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="6" bindtap="goBack">
+        <view class="header_img"><image src="/images/left.png"></image></view>
+      </van-col>
+      <van-col span="12">
+        <view class="header_name">个人信息</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+<view class="max_content">
+  <view class="lw_info_padding">
+    <view class="lw_info_img">
+      <image src="{{userphoto}}"></image>
+    </view>
+  </view>
+
+  <!-- 已注册 -->
+  <view wx:if="{{register == 1}}">
+    <view class="lw_info_list">
+      <van-row>
+        <van-col span="6">
+            <image src="/images/lw_5.png"></image>
+            <text>姓名</text>
+        </van-col>
+        <van-col span="18">
+          <view class="lw_info_right">{{name}}</view>
+        </van-col>
+      </van-row>
+    </view>
+    <view class="lw_info_list">
+      <van-row>
+        <van-col span="6">
+            <image src="/images/lw_6.png"></image>
+            <text>工种</text>
+        </van-col>
+        <van-col span="18">
+          <view class="lw_info_right">{{workType}}</view>
+        </van-col>
+      </van-row>
+    </view>
+    <view class="lw_info_list">
+      <van-row>
+        <van-col span="6">
+            <image src="/images/lw_7.png"></image>
+            <text>劳务公司</text>
+        </van-col>
+        <van-col span="18">
+          <view class="lw_info_right">{{uninName}}</view>
+        </van-col>
+      </van-row>
+    </view>
+    <view class="lw_info_list">
+      <van-row>
+        <van-col span="6">
+            <image src="/images/lw_8.png"></image>
+            <text>时间</text>
+        </van-col>
+        <van-col span="18">
+          <view class="lw_info_right">{{date}}</view>
+        </van-col>
+      </van-row>
+    </view>
+    <view class="lw_btn_zc" bindtap="returnData">确认</view>
+  </view>
+ 
+
+  <!-- 未注册 -->
+  <view wx:if="{{register == 2}}">
+    <view class="lw_tips">该人员信息未注册，是否录入基本信息？</view>
+    <view class="lw_bnt" bindtap="goRegisterPage">
+      <button class="lw_bnt_1">立即注册</button>
+    </view>
+    <view class="lw_bnt" bindtap="goBack">
+      <button class="lw_bnt_2">返回</button>
+    </view>
+  </view>
+  
+</view>
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxss b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxss
new file mode 100644
index 0000000..ce3fd59
--- /dev/null
+++ b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxss
@@ -0,0 +1,75 @@
+/* pages/lw-gerenxinxi/lw-gerenxinxi.wxss */
+.lw_info_padding{
+  padding: 50rpx 0;
+}
+.lw_info_img{
+  width: 300rpx;
+  height: 300rpx;
+  margin: auto;
+  background: url("http://fileimg.makalu.cc/WEB_84250138634B44129412859F8877F7FB.png") no-repeat center/100% 100%;
+}
+.lw_info_img image{
+  width: 300rpx;
+  height: 300rpx;
+}
+.lw_info_list{
+  padding: 30rpx 40rpx;
+  font-size: 26rpx;
+  color: #8ba2ee;
+}
+.lw_info_list image{
+  width: 35rpx;
+  height: 35rpx;
+  margin-right: 10rpx;
+}
+.lw_info_list text{
+  position: relative;
+  top: -8rpx;
+}
+.lw_info_right{
+  text-align: right;
+  color: #ffffff;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.lw_tips{
+  text-align: center;
+  color: #8ba2ee;
+  font-size: 30rpx;
+  padding: 30rpx 0;
+}
+.lw_bnt{
+  padding: 30rpx;
+}
+.lw_bnt button{
+  border-radius: 50rpx;
+  font-weight: 400;
+  font-size: 30rpx;
+}
+.lw_bnt_1{
+  background:#7067fe ;
+  color: #ffffff;
+}
+.lw_bnt_1:active{
+  background: #6487ff;
+}
+.lw_bnt_2{
+  background:#28345a ;
+  color: #8ba3ed;
+}
+.lw_bnt_2:active{
+  background: #323b57;
+}
+.lw_btn_zc{
+  width:70%;
+  margin: 50rpx auto 0;
+  text-align: center;
+  height: 70rpx;
+  line-height: 70rpx;
+  background: #687bfe;
+  border-radius: 30rpx;
+}
+.lw_btn_zc:active{
+  background: #7655fc;
+}
diff --git a/miniprogram/pageage/lw-index/lw-index.js b/miniprogram/pageage/lw-index/lw-index.js
new file mode 100644
index 0000000..1303c83
--- /dev/null
+++ b/miniprogram/pageage/lw-index/lw-index.js
@@ -0,0 +1,151 @@
+// pages/lw-index/lw-index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    show: false,
+    projectId:'',
+    projectName:'' ,
+    loginName:'',
+    userName:'',
+    loadShow:false,
+    remark:''
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          remark:res.data.remark,
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          projectId:app.globalData.projectId,
+          projectName:app.globalData.projectName,
+        })  
+      }
+    })
+
+  },
+
+  /**
+   * 人脸照片识别
+   * file 图片地址
+   * type == "" 人脸图片
+   */
+  selectIDCardInfo:function(file,projectId){
+    var that = this;
+    that.onClickShow();
+    wx.uploadFile({
+      url: app.globalData.reqUrl+'/weixin/labour/selectUserInfoDiscern',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      filePath: file[0],
+      name: 'file',
+      formData: {'projectId':projectId},
+      method:"post",
+      success:function(res){
+        that.onClickHide();
+        var json = JSON.parse(res.data);
+        if(json.code == '200'){
+          wx.redirectTo({
+            url: '../lw-gerenxinxi/lw-gerenxinxi?register=1'+'&userInfo='+encodeURIComponent(JSON.stringify(json.data)),
+          })
+        }else if(json.code == '400'){
+          wx.redirectTo({
+            url: '../lw-gerenxinxi/lw-gerenxinxi?register=2'+'&pathUrl='+encodeURIComponent(json.data),
+          })
+        }else{
+          app.toast(json.msg);
+        }
+      },
+    })
+  },
+
+  /**
+   * 跳转到考勤打卡
+   */
+  KQDK:function(){
+    var _this = this;
+    var Type = _this.data.sourceType
+    wx.chooseImage({
+      count: 1, // 默认9 
+      sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+      sourceType: Type, // 可以指定来源是相册还是相机，默认二者都有 
+      success: function (res) {
+        // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 
+
+        _this.selectIDCardInfo(res.tempFilePaths,app.globalData.projectId);
+      }
+    })
+
+  },
+
+  /**
+   * 跳转到报表查询
+   */
+  BBCX:function(){
+    wx.redirectTo({
+      url: '../lw-baobiaochaxun/lw-baobiaochaxun',
+    })
+  },
+
+  /**
+   * 跳转信息录入
+   */
+  XXLR:function(){
+    wx.redirectTo({
+      url: '../lw-jibenxinxi/lw-jibenxinxi',
+    })
+  },
+
+  /**
+   * 返回更多功能
+   */
+  goBack:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+
+  /**
+   * 退出登录
+   */
+  TCDL:function(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+        url: '../login/login',
+    })
+  },
+
+
+
+
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-index/lw-index.json b/miniprogram/pageage/lw-index/lw-index.json
new file mode 100644
index 0000000..8eb5a96
--- /dev/null
+++ b/miniprogram/pageage/lw-index/lw-index.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-popup": "@vant/weapp/popup",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-index/lw-index.wxml b/miniprogram/pageage/lw-index/lw-index.wxml
new file mode 100644
index 0000000..c20a0cc
--- /dev/null
+++ b/miniprogram/pageage/lw-index/lw-index.wxml
@@ -0,0 +1,100 @@
+<!--pages/lw-index/lw-index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goBack">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">劳务管控</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<!-- 左侧账号信息 -->
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+
+    <view class="left_manage_max">
+    </view>
+    <!-- <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view> -->
+  </view>
+</van-popup>
+
+<view class="max_content">
+
+    <view class="lw_max">
+      <view class="lw_min" bindtap="KQDK">
+        <image src="/images/lw_1.png" class="lw_img_1"></image>
+        考勤打卡
+        <image src="/images/right.png" class="lw_img_right"></image>
+      </view>
+    </view>
+    <view class="lw_max">
+      <view class="lw_min" bindtap="BBCX">
+        <image src="/images/lw_2.png" class="lw_img_1"></image>
+        报表查询
+        <image src="/images/right.png" class="lw_img_right"></image>
+      </view>
+    </view>
+    <!-- <view class="lw_max"  wx:if="{{remark == ''}}">
+      <view class="lw_min" bindtap="XXLR">
+        <image src="/images/lw_3.png" class="lw_img_1"></image>
+        信息录入
+        <image src="/images/right.png" class="lw_img_right"></image>
+      </view>
+    </view> -->
+  
+</view>
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/lw-index/lw-index.wxss b/miniprogram/pageage/lw-index/lw-index.wxss
new file mode 100644
index 0000000..f2655da
--- /dev/null
+++ b/miniprogram/pageage/lw-index/lw-index.wxss
@@ -0,0 +1,35 @@
+/* pages/lw-index/lw-index.wxss */
+.lw_max{
+  padding: 20rpx 50rpx;
+}
+.lw_min{
+  padding: 20rpx;
+  background: #2b345b;
+  border-radius: 15rpx;
+  font-size: 30rpx;
+}
+.lw_min .lw_img_1{
+  width: 40rpx;
+  height: 40rpx;
+  position: relative;
+  top: 8rpx;
+  margin-right: 15rpx;
+}
+.lw_img_right{
+  float: right;
+  width: 40rpx;
+  height: 40rpx;
+  position: relative;
+  top: 5rpx;
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.js b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.js
new file mode 100644
index 0000000..65c0f41
--- /dev/null
+++ b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.js
@@ -0,0 +1,480 @@
+// // pages/lw-jibenxinxi/lw-jibenxinxi.js
+// const app = getApp()
+// Page({
+//   /**
+//    * 页面的初始数据
+//    */
+//   data: {
+//     radio: '1',
+//     nameGz:'请选择工种',
+//     showGz: false,
+//     columnsGz:[],
+//     nameGx:'请选择班组',
+//     showGx: false,
+//     columnsGx:[],
+//     nameLwgs:'请选择劳务公司',
+//     showLwgs: false,
+//     columnsLwgs:[],
+//     date:'请选择入场时间',
+//     showDate: false,
+//     today:'',
+//     minDate: new Date(2020, 0, 1).getTime(),
+//     maxDate: new Date().getTime(),
+//     //上传证件
+//     tempFilePaths: '',
+//     sourceType: ['album', 'camera'],
+//     FilePaths:'',
+//     recitePaths:'',
+//     photographImg:'',
+//     idCardPositiveMap:{},
+//     idCardVersoMap:{},
+//     facePhotos:{},
+//     idCardPositiveErrorMap:{},
+//     idCardVersoErrorMap:{},
+//     facePhotosError:{},
+//     //个人信息
+//     phone:'',
+//     teamid:'',
+//     worktypeid:'',
+//     labourId:'',
+//     loadShow:false,
+//   },
+
+//   onClickShow() {
+//     this.setData({ loadShow: true });
+//   },
+
+//   onClickHide() {
+//     this.setData({ loadShow: false });
+//   },
+
+//   onChange(event) {
+//     this.setData({
+//       radio: event.detail,
+//     });
+//   },
+//   onClose() {
+//     this.setData({ showGz: false });
+//     this.setData({ showGx: false });
+//     this.setData({ showLwgs : false });
+//     this.setData({ showDate: false });
+//   },
+//    //劳务工种
+//   showPopupGz() {
+//     this.setData({ showGz: true });
+//   },
+//   onChangeGz(event) {
+//     this.setData({ nameGz: event.detail.value.text,worktypeid:event.detail.value.id });
+//     this.setData({ showGz: false });
+//   },
+//   //劳务班组
+//   showPopupGx() {
+//     this.setData({ showGx: true });
+//   },
+//   onChangeGx(event) {
+//     this.setData({ nameGx: event.detail.value.text,teamid: event.detail.value.id});
+//     this.setData({ showGx: false });
+//   },
+//   //劳务公司
+//   showPopupLwgs () {
+//     this.setData({ showLwgs : true });
+//   },
+//   onChangeLwgs (event) {
+//     this.setData({ nameLwgs : event.detail.value.text,labourId:event.detail.value.id });
+//     this.setData({ showLwgs : false });
+//     this.setData({ nameGx : '请选择班组' });
+//     this.selectLabourGroupAll(app.globalData.projectId,event.detail.value.id);
+//   },
+
+//   //入场时间
+//   onDisplay() {
+//     this.setData({ showDate: true });
+//   }, 
+//   formatDate(date) {
+//     date = new Date(date);
+//     var dateYaer = date.getFullYear();
+//     var dateMonth = date.getMonth() + 1;
+//     var dateDay = date.getDate();
+//     if(dateMonth < 10 ){
+//       dateMonth = '0' + dateMonth;
+//     }
+//     if(dateDay < 10 ){
+//       dateDay = '0' + dateDay;
+//     }
+//     return  dateYaer+'-'+dateMonth+ '-'+dateDay;
+//   },
+
+//   onConfirm(event) {
+//     this.setData({
+//       showDate: false,
+//       date: this.formatDate(event.detail),
+//     });
+//   },
+
+
+//   frontimage: function () {
+//     this.onClickShow();
+//     var _this = this;
+//     var Type = _this.data.sourceType
+//     wx.chooseImage({
+//       count: 1, // 默认9 
+//       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+//       sourceType: Type, // 可以指定来源是相册还是相机，默认二者都有 
+//       success: function (res) {
+//         // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 
+//         _this.setData({
+//           FilePaths: res.tempFilePaths
+//         })
+
+//         _this.selectIDCardInfo(res.tempFilePaths,'1');
+//       }
+//     })
+//   },
+
+//   reciteimage: function () {
+//     this.onClickShow();
+//     var _this = this;
+//     var Type = _this.data.sourceType
+//     wx.chooseImage({
+//       count: 1, // 默认9 
+//       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 
+//       sourceType: Type, // 可以指定来源是相册还是相机，默认二者都有 
+//       success: function (res) {
+//         // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 
+//         _this.setData({
+//           recitePaths: res.tempFilePaths
+//         })
+
+//         _this.selectIDCardInfo(res.tempFilePaths,'2');
+//       }
+//     })
+//   },
+
+
+//   photograph: function () {
+//     this.onClickShow();
+//     var _this = this;
+//     var Type = _this.data.sourceType
+//     wx.chooseImage({
+//       count: 1, // 默认9 
+//       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 
+//       sourceType: Type, // 可以指定来源是相册还是相机，默认二者都有 
+//       success: function (res) {
+//         // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 
+//         _this.setData({
+//           photographImg: res.tempFilePaths
+//         })
+
+//         _this.selectIDCardInfo(res.tempFilePaths,'');
+//       }
+//     })
+//   },
+
+//   /**
+//    * 人员电话信息
+//    * @param {} even 
+//    */
+//   phone:function(even){
+//     this.setData({
+//       phone:even.detail.value
+//     })
+//   },
+
+//   /**
+//    * 生命周期函数--监听页面加载
+//    */
+//   onLoad: function (options) {
+//     this.onClickShow();
+//     var date = new Date();
+//     var dateYaer = date.getFullYear();
+//     var dateMonth = date.getMonth() + 1;
+//     var dateDay = date.getDate();
+//     if(dateMonth < 10 ){
+//       dateMonth = '0' + dateMonth;
+//     }
+//     if(dateDay < 10 ){
+//       dateDay = '0' + dateDay;
+//     }
+//     this.setData({
+//       today:dateYaer+'-'+dateMonth+ '-'+dateDay,
+//     })
+//     this.selectLabourWorkAll();
+//     this.selectLabourUnitAll(app.globalData.projectId);
+
+//   },
+
+//   /**
+//    * 查询全量工种信息
+//    */
+//   selectLabourWorkAll:function(){
+//     var that = this;
+//     wx.request({
+//       url: app.globalData.reqUrl+'/weixin/labour/selectLabourWorkAll',
+//       method:"GET",
+//       success:function(res){
+//         if(res.data.code == '200'){
+//           that.setData({
+//             columnsGz:res.data.data
+//           })
+//         }
+//       }
+//     })
+//   },
+
+//   /**
+//    * 根据项目id查询出参建单位信息
+//    * @param {*} projectId 项目id
+//    */
+//   selectLabourUnitAll:function(projectId){
+//     var that = this;
+//     wx.request({
+//       url: app.globalData.reqUrl+'/weixin/labour/selectLabourUnitAll',
+//       data:{
+//         "projectId":projectId
+//       },
+//       method:"GET",
+//       success:function(res){
+//         that.onClickHide();
+//         if(res.data.code == '200'){
+//           that.setData({
+//             columnsLwgs:res.data.data
+//           })
+//         }
+//       }
+//     })
+//   },
+
+//   /**
+//    * 查询出班组信息
+//    * @param {*} projectId 项目id
+//    * @param {*} unitId 劳务公司id
+//    */
+//   selectLabourGroupAll:function(projectId,unitId){
+//     var that = this;
+//     wx.request({
+//       url: app.globalData.reqUrl+'/weixin/labour/selectLabourGroupAll',
+//       data:{
+//         "projectId":projectId,
+//         "unitId":unitId
+//       },
+//       method:"GET",
+//       success:function(res){
+//         if(res.data.code == '200'){
+//           that.setData({
+//             columnsGx:res.data.data
+//           })  
+//         }
+//       }
+//     })
+//   },
+
+//   /**
+//    * 身份证识别
+//    * file 图片地址
+//    * type == 1 身份证正面
+//    * type == 2 身份证反面
+//    * type == "" 人脸图片
+//    */
+//   selectIDCardInfo:function(file,type){
+//     var that = this;
+//     wx.uploadFile({
+//       url: app.globalData.reqUrl+'/weixin/labour/selectIDCardInfo',
+//       header: {
+//         "Content-Type": "application/x-www-form-urlencoded"
+//       },
+//       filePath: file[0],
+//       name: 'file',
+//       formData: {'type':type},
+//       method:"post",
+//       success:function(res){
+//         that.onClickHide();
+//         var json = JSON.parse(res.data);
+//         if(json.code == "200"){
+//           if(type == "1"){
+//             that.setData({
+//               idCardPositiveMap:json.data,
+//               idCardPositiveErrorMap:{}
+//             })
+//           }else if(type == "2"){
+//             that.setData({
+//               idCardVersoMap:json.data,
+//               idCardVersoErrorMap:{}
+//             })
+//           }else{
+//             that.setData({
+//               facePhotos:json.data,
+//               facePhotosError:{}
+//             }) 
+//           }
+//         }else{
+//           if(type == "1"){
+//             that.setData({
+//               idCardPositiveMap:{},
+//               idCardPositiveErrorMap:json
+//             })
+//           }else if(type == "2"){
+//             that.setData({
+//               idCardVersoMap:{},
+//               idCardVersoErrorMap:json
+//             })
+//           }else{
+//             that.setData({
+//               facePhotos:{},
+//               facePhotosError:json
+//             }) 
+//           }
+//           app.toast(json.msg);
+//         }
+//       },
+//     })
+//   },
+
+  
+//   /**
+//    * 人员注册
+//    */
+//   add:function(){
+//     var that = this;
+//     //验证
+//     var FilePaths = this.data.FilePaths;
+//     var recitePaths = this.data.recitePaths;
+//     var photographImg = this.data.photographImg;
+//     var phone = this.data.phone;
+//     var nameGz = this.data.nameGz;
+//     var nameLwgs = this.data.nameLwgs;
+//     var nameGx = this.data.nameGx;
+//     var date = this.data.date;
+
+//     var teamid = this.data.teamid;
+//     var worktypeid = this.data.worktypeid;
+//     var labourId = this.data.labourId;
+//     var idCardPositiveMap = this.data.idCardPositiveMap;
+//     var idCardVersoMap = this.data.idCardVersoMap;
+//     var facePhotos = this.data.facePhotos;
+
+//     //异常信息
+//     var idCardPositiveErrorMap = this.data.idCardPositiveErrorMap;
+//     var idCardVersoErrorMap = this.data.idCardVersoErrorMap;
+//     var facePhotosError = this.data.facePhotosError;
+ 
+//     if(FilePaths == ""){
+//       app.toast("请上传身份证正面照片!");
+//       return;
+//     }if(recitePaths == ""){
+//       app.toast("请上传身份证反面照片!");
+//       return;
+//     }if(photographImg == ""){
+//       app.toast("请上传人脸照片!");
+//       return;
+//     }if(phone == "" || phone.length != 11){
+//       app.toast("请填写正确的电话号码!");
+//       return;
+//     }if(nameGz == "请选择工种"){
+//       app.toast("请选择工种信息!");
+//       return;
+//     }if(nameLwgs == "请选择劳务公司"){
+//       app.toast("请选择劳务公司!");
+//       return;
+//     }if(nameGx == "请选择班组"){
+//       app.toast("请选择班组!");
+//       return;
+//     }if(date == "请选择入场时间"){
+//       app.toast("请选择入场时间");
+//       return;
+//     }if(idCardPositiveErrorMap !='' && idCardPositiveErrorMap.code == "300"){
+//       app.toast(idCardPositiveErrorMap.msg);
+//       return;
+//     }if(idCardVersoErrorMap !='' && idCardVersoErrorMap.code == "300"){
+//       app.toast(idCardVersoErrorMap.msg);
+//       return;
+//     }if(idCardVersoErrorMap != '' && facePhotosError.code == "300"){
+//       app.toast(facePhotosError.msg);
+//       return;
+//     }
+
+//     /************对比照片是否为同一人********/
+//     this.onClickShow();
+//      //定义数组
+//      var list =new Array();
+//      var userData = {
+//        "image":facePhotos.pathUrl,
+//        "image_type":"BASE64",
+//        "face_type":"LIVE",
+//      };
+//      var idcardimgData = {
+//        "image":idCardPositiveMap.pathUrl,
+//        "image_type":"BASE64",
+//        "face_type":"CERT",
+//      }
+//      list.push(idcardimgData);
+//      list.push(userData);
+//      wx.request({
+//        url: app.globalData.reqUrl+'/weixin/labour/imgContrast',
+//        header: {
+//         "Content-Type": "application/x-www-form-urlencoded"
+//        },
+//        data:{
+//          "parame":JSON.stringify(list)
+//        },
+//        method:"POST",
+//        success:function(res){
+//          if(res.data.code == '200'){
+//           //同步数据
+//           wx.request({
+//             url: app.globalData.reqUrl+'/weixin/labour/addUserData',
+//             header: {
+//               "Content-Type": "application/x-www-form-urlencoded"
+//             },
+//             data:{
+//               "id":app.globalData.projectId,
+//               "idcardnum":idCardPositiveMap.cardNum,
+//               "name":idCardPositiveMap.name,
+//               "teamid":teamid,
+//               "userphone":phone,
+//               "userphotoSpare":facePhotos.pathUrl,
+//               "enterdate":date,
+//               "worktypeid":worktypeid,
+//               "sex":idCardPositiveMap.sex,
+//               "nation":idCardPositiveMap.nation,
+//               "birthday":idCardPositiveMap.birthday,
+//               "address":idCardPositiveMap.address,
+//               "organization":idCardVersoMap.organization,
+//               "useStarttime":idCardVersoMap.use_starttime,
+//               "useEndtime":idCardVersoMap.use_endTime,
+//               "idcardimgSpare":idCardPositiveMap.pathUrl,
+//               "idcardimgSpare2":idCardVersoMap.pathUrl
+//             },
+//             method:"POST",
+//             success:function(res){
+//               that.onClickHide();
+//               if(res.data.code == "200"){
+//                 app.toast("注册成功");
+//                 wx.redirectTo({
+//                   url: '../lw-jibenxinxi/lw-jibenxinxi',
+//                 })
+//               }else{
+//                 app.toast(res.data.msg);
+//                 return;
+//               }
+//             }
+//           })
+//          }else{
+//           that.onClickHide();
+//           app.toast(res.data.msg);
+//           return;
+//          }
+//        }
+//      })
+//   },
+
+//   /**
+//    * 返回劳务管控页面
+//    */
+//   goBack:function(){
+//     wx.redirectTo({
+//       url: '../lw-index/lw-index',
+//     })
+//   }
+
+
+// })
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.json b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.json
new file mode 100644
index 0000000..4cedcc9
--- /dev/null
+++ b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.json
@@ -0,0 +1,14 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-picker": "@vant/weapp/picker/index",
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml
new file mode 100644
index 0000000..a970469
--- /dev/null
+++ b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml
@@ -0,0 +1,139 @@
+<!-- pages/lw-jibenxinxi/lw-jibenxinxi.wxml
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="6" bindtap="goBack">
+        <view class="header_img"><image src="/images/left.png"></image></view>
+      </van-col>
+      <van-col span="12">
+        <view class="header_name">基本信息</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+<view class="max_content">
+  <view class="eharts_title">身份证信息</view>  
+  <view class="max_content_padding">
+    <van-row>
+      <van-col span="12">
+        <view class="lw_id_padding">
+          <view class="lw_id_border"  bindtap="frontimage">
+            <view class="lw_id_card lw_id_card_z">
+              <image src="{{FilePaths}}"></image>
+            </view>
+            <view class="lw_id_where">上传身份证正面</view>
+            
+          </view>
+        </view>
+      </van-col>
+      <van-col span="12">
+        <view class="lw_id_padding">
+          <view class="lw_id_border"  bindtap="reciteimage">
+            <view class="lw_id_card lw_id_card_f">
+              <image src="{{recitePaths}}"></image>
+            </view>
+            <view class="lw_id_where">上传身份证正面</view>
+          </view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+  
+  <view class="eharts_title">人脸信息</view>  
+  <view class="max_content_padding">
+    <van-row>
+      <van-col span="12">
+        <view class="lw_id_padding">
+          <view class="lw_id_border" bindtap="photograph">
+            <view class="lw_photo">
+              <image src="{{photographImg}}"></image>
+            </view>
+          </view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+
+  <view class="eharts_title">个人信息</view>  
+  <view class="lw_table_div">
+    <van-row>
+      <van-col span="6">
+        <view class="lw_table_left">电话：</view>
+      </van-col>
+       <van-col span="18">
+        <view class="lw_table_right">
+          <input type="text" placeholder="请输入电话" class="lw_input" bindinput="phone"></input>
+        </view>
+      </van-col>
+    </van-row>
+
+    <van-row>
+      <van-col span="6">
+        <view class="lw_table_left">工种：</view>
+      </van-col>
+       <van-col span="18">
+        <view class="lw_table_right">
+          <view class="lw_input lw_input_view " bindtap="showPopupGz">{{nameGz}} <image src="/images/bottom.png"></image></view>
+          <van-popup show="{{ showGz }}" position="bottom" bind:close="onClose">
+            <view class="map_list_info">
+              <van-picker show-toolbar  default-index="{{0}}" columns="{{ columnsGz }}"  bind:cancel="onClose" bind:confirm="onChangeGz"/>
+            </view>
+          </van-popup>
+        </view>
+      </van-col>
+    </van-row>
+
+    <van-row>
+      <van-col span="6">
+        <view class="lw_table_left">劳务公司：</view>
+      </van-col>
+       <van-col span="18">
+        <view class="lw_table_right">
+          <view class="lw_input lw_input_view " bindtap="showPopupLwgs">{{nameLwgs}} <image src="/images/bottom.png"></image></view>
+          <van-popup show="{{ showLwgs }}" position="bottom" bind:close="onClose">
+            <view class="map_list_info">
+              <van-picker show-toolbar  default-index="{{0}}" columns="{{ columnsLwgs }}"  bind:cancel="onClose" bind:confirm="onChangeLwgs"/>
+            </view>
+          </van-popup>
+        </view>
+      </van-col>
+    </van-row>
+
+    <van-row>
+      <van-col span="6">
+        <view class="lw_table_left">班组名称：</view>
+      </van-col>
+       <van-col span="18">
+        <view class="lw_table_right">
+          <view class="lw_input lw_input_view " bindtap="showPopupGx">{{nameGx}} <image src="/images/bottom.png"></image></view>
+          <van-popup show="{{ showGx }}" position="bottom"  bind:close="onClose">
+            <view class="map_list_info">
+              <van-picker show-toolbar  default-index="{{0}}" columns="{{ columnsGx }}"  bind:cancel="onClose" bind:confirm="onChangeGx"/>
+            </view>
+          </van-popup>
+        </view>
+      </van-col>
+    </van-row>
+
+    <van-row>
+      <van-col span="6">
+        <view class="lw_table_left">入场时间：</view>
+      </van-col>
+       <van-col span="18">
+        <view class="lw_table_right">
+          <view class="lw_input lw_input_view"  bindtap="onDisplay"  value="{{ date }}">{{date}} <image src="/images/lw_1.png"></image></view>
+          <van-calendar show="{{ showDate }}" bind:close="onClose" default-date="{{today}}"  show-confirm="{{ false }}"  bind:confirm="onConfirm" min-date="{{ minDate }}" max-date="{{ maxDate }}" color="#07c160" />
+        </view>
+      </van-col>
+    </van-row>
+
+    <view class="lw_btn_zc" bindtap="add">立即注册</view>
+  </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>   -->
diff --git a/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxss b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxss
new file mode 100644
index 0000000..14a97fc
--- /dev/null
+++ b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxss
@@ -0,0 +1,261 @@
+/* pages/lw-jibenxinxi/lw-jibenxinxi.wxss */
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  margin: 0 30rpx;
+  padding: 40rpx;
+  font-size: 28rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.max_content_padding{
+  padding: 0 15rpx;
+}
+.lw_id_padding{
+  padding:0 15rpx ;
+}
+.lw_id_card{
+  height: 200rpx;
+  border-radius:10rpx 10rpx  0 0 ;
+}
+.lw_id_card_z{
+  background: url("http://fileimg.makalu.cc/WEB_F094DC0DFE42440A82055968A36CDD0C.png") no-repeat center/65%;
+}
+.lw_id_card_f{
+  background:url("http://fileimg.makalu.cc/WEB_43595673EA4A42DEBED5D3705C3CAADA.png") no-repeat center/65%;
+}
+.lw_id_card image{
+  width: 100%;
+  height: 100%;
+  border-radius:10rpx 10rpx  0 0 ;
+}
+.lw_id_border{
+  background: #28345a;
+  border-radius: 10rpx;
+  border: 1px solid #425399;
+}
+.lw_id_where{
+  background: #425399;
+  text-align: center;
+  font-size: 28rpx;
+  padding:15rpx 0;
+  color: #c1d2ff;
+}
+.lw_photo{
+  height: 300rpx;
+  background:url("http://fileimg.makalu.cc/WEB_FA2A182381DB4C36BBDC68DAB90D2186.png") no-repeat center/80%;
+}
+.lw_photo image{
+  width: 100%;
+  height: 100%;
+  border-radius: 10rpx;
+}
+.lw_table_div{
+  padding: 0 30rpx;
+  font-size: 28rpx;
+}
+.lw_table_left{
+  padding:0 10rpx;
+  height: 100rpx;
+  text-align: right;
+  line-height: 100rpx;
+}
+.lw_table_right{
+  padding:0  10rpx;
+  height: 100rpx;
+  border-bottom: 1px solid #343d5a;
+}
+.lw_input{
+  height: 100rpx;
+  width: 100%;
+}
+.van-radio__label{
+  color:#ffffff !important;
+}
+.van-radio{
+  float: left;
+  margin: 30rpx 30rpx 30rpx 0;
+}
+
+
+
+
+
+
+
+
+
+/* 插件 */
+/* pages/gongchengliebiao/gongchengliebiao.wxss */
+.list_max{
+  padding: 0 30rpx;
+  margin: 30rpx 0 10rpx;
+}
+.list_min{
+  border-radius:10rpx;
+  background: #2b345b;
+  height: 80rpx;
+}
+.list_min_1{
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 28rpx;
+  padding-left: 10rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+}
+.list_min_2{
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+.list_bottom{
+  width:30rpx;
+  height:30rpx;
+}
+.list_title{
+  color:#8ca4ee;
+  font-size: 24rpx;
+  padding: 20rpx 30rpx;
+}
+.list_title text{
+  font-size: 26rpx;
+  color: #1aeff5;
+}
+
+
+
+
+.list_warning.active{
+  background: url("http://fileimg.makalu.cc/CORE_ACFA3598B4C943EB836848A6977C4189.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.list_video.active{
+  background: url("http://fileimg.makalu.cc/CORE_48D684509A314D55BD3B61EFFB77EF07.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.list_dust.active{
+  background: url("http://fileimg.makalu.cc/CORE_085FA305D4314B8CA5954C569D127EB9.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.lw_input_view{
+  line-height: 100rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+  width: 100%;
+}
+.lw_input_view image{
+  float: right;
+  width: 30rpx;
+  height: 30rpx;
+  position: relative;
+  top: 35rpx;
+}
+.address{
+  margin: 0 30rpx;
+  color: #8ca4ee;
+  font-size: 28rpx;
+  padding: 20rpx  0 20rpx 50rpx;
+  background: url("http://fileimg.makalu.cc/CORE_1F1F3A2778334D3EAC1226DDCEBD48D0.png") no-repeat left/40rpx;
+}
+.map_list_info{
+  background: #232a44;
+  padding: 0 30rpx;
+}
+
+.van-center-enter-to.van-center-enter-active{
+  border-radius: 20rpx;
+  background: #232a44;
+}
+.map_list_info_title{
+  padding: 30rpx;
+  text-align: center;
+}
+.map_list_info .van-picker{
+  background: none;
+}
+.map_list_info view{
+  background: none;
+}
+.map_list_info .van-picker-column{
+  color: #157dd2;
+}
+.map_list_info .van-picker-column__item--selected{
+  color: #00e3fe;
+}
+.map_list_info .van-hairline--top-bottom:after{
+  border-width: 0px 0;
+}
+
+.splicing{
+  background: #232a44;
+  color: #1aeff5;
+  padding: 20rpx 30rpx;
+}
+
+
+/* -------------------------- */
+.van-popup.van-popup--bottom{
+  background: #232a44;
+}
+.van-tabs__scroll{
+  background: none !important;
+}
+.van-hairline--top-bottom:after{
+  border: none !important;
+}
+.van-tab.van-tab--active{
+  color: #14feff !important;
+}
+.van-tab{
+  color: #157dd2 !important;
+}
+.van-tabs__line{
+  background-color:#14feff !important;
+}
+
+.van-calendar{
+  background-color: #232a44 !important;
+}
+.van-calendar__month-mark{
+  color:rgba(255,255,255,0.2)  !important;
+}
+.van-popup{
+  background: none !important;
+}
+
+.van-calendar__day--disabled{
+  color:rgba(255,255,255,0.4)  !important;
+}
+.van-calendar__header-subtitle{
+  display: none;
+}
+.van-button--block.van-button--round{
+  width: 100%;
+}
+
+
+.lw_btn_zc{
+  width: 70%;
+  margin: 50rpx auto 0;
+  text-align: center;
+  height: 70rpx;
+  line-height: 70rpx;
+  background: #687bfe;
+  border-radius: 30rpx;
+}
+.lw_btn_zc:active{
+  background: #7655fc;
+}
+
+
+  
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.js b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.js
new file mode 100644
index 0000000..36d7580
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.js
@@ -0,0 +1,399 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        maxDate:new Date(2099,1,1).getTime(),
+        projectId:"",
+        loginName:"",
+        userName:"",
+        personnelShow:false,
+        rectifierData:[],
+        inspectInfoData:[
+            {
+                existing_problems:'',
+                image_upload:[],
+                person_responsible:[]
+            },
+        ],
+        stateNav:2,
+        checkType:1,
+        //检查部位名称
+        checkSiteName:'',
+        //检查时间
+        checkTime:'',
+        //检查限制时间
+        checkImposeTime:'',
+        loadShow:false
+    },
+       /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let {projectId} = options
+        //获取缓存数据
+        wx.getStorage({
+        key: 'userinfo',
+        success:res=>{
+            this.setData({
+            projectId,
+            loginName:res.data.loginName,
+            userName:res.data.userName
+            }) 
+            this.getRectifierData()
+        }  
+        }) 
+    },
+    //获取选中人信息
+    getRectifierData(){
+        let that = this
+        let {projectId} = this.data
+        wx.request({
+            url: app.globalData.szhUrl+'/system/checkDutyUser/list',
+            method:"POST",
+            data:{
+                projectId
+            },
+            header:{
+              'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                res = res.data
+                if(res.code == 0 && res.rows.length > 0){
+                    let tempdata = []
+                    res.rows.forEach(item=>{
+                        tempdata.push({
+                            state:false,
+                            name:item.userName,
+                            url: item.photoUrl,
+                            loginName:item.loginName,
+                            userId:item.userId  
+                       })
+                    })
+                    that.setData({
+                        rectifierData:tempdata  
+                    })
+                }
+            }
+        })
+    },
+
+    //切换检查类型
+    onStateSelect(e){
+        let state = e.currentTarget.dataset.set;
+        this.setData({
+            stateNav:state,  
+        });
+    },
+
+    //检查部位
+    onInputValue(e){
+        let checkSiteName = e.detail.value
+        this.setData({
+            checkSiteName
+        })
+    },
+
+    //检查时间
+    onStartTime(e){
+        let checkTime = e.detail
+        this.setData({
+            checkTime
+        })
+    },
+
+    //限期整改时间
+    onEndTime(e){
+        let checkImposeTime = e.detail
+        this.setData({
+            checkImposeTime
+        })
+    },
+
+    // list  上传图片
+    onImagesArr(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.inspectInfoData
+        data[index].image_upload = e.detail
+        this.setData({
+            inspectInfoData:data
+        })
+    },
+
+    //新增问题
+    onNewIssues(){
+        var data = this.data.inspectInfoData
+        data.push(
+            {
+                existing_problems:'',
+                image_upload:[],
+                person_responsible:[]
+            }
+        )
+        this.setData({
+            inspectInfoData:data
+        })
+        
+    },
+
+    //删除
+    onNewIssuesDelete(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.inspectInfoData
+        data.splice(index, 1)　
+        this.setData({
+            inspectInfoData:data
+        })
+    },
+
+    // 存在问题input
+    onPositionInput(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.inspectInfoData
+        data[index].existing_problems = e.detail.value
+        this.setData({
+            inspectInfoData:data
+        })
+    },
+
+    //添加整改责任人
+    onAddResponsible(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.inspectInfoData
+        data[index].person_responsible = e.detail
+        this.setData({
+            inspectInfoData:data
+        })
+       
+    },
+
+    //取消页面
+    cancelSaveView(){
+        wx.navigateBack()
+    },
+
+
+
+    //保存
+    onProblemSubmitSave(){
+        this.setData({
+            loadShow:true
+        })
+        let that = this
+        let {projectId,loginName,userName,checkType,stateNav,checkSiteName,checkTime,checkImposeTime,inspectInfoData} =  that.data
+        if(stateNav == '3'){
+            stateNav = '2'
+            checkType = '2'
+        }
+        
+        
+        //数据校验
+        if(!checkSiteName || checkSiteName.length<=0 || !checkTime || checkTime.length <= 0 || !checkImposeTime || checkImposeTime.length <= 0){
+            app.toast("数据填写不完整!")
+            that.setData({
+                loadShow:false
+            })
+            return;    
+        }
+        //校验信息
+        let flag = false
+        for(let i = 0;i <inspectInfoData.length;i++){
+            if(inspectInfoData[i].existing_problems.length <= 0){
+                flag = true
+                app.toast("存在问题不能为空!")
+                that.setData({
+                    loadShow:false
+                })
+                break;
+            }
+            if(inspectInfoData[i].image_upload.length <= 0){
+                flag = true
+                app.toast("检查图片不能为空!")
+                that.setData({
+                    loadShow:false
+                })
+                break;
+            }
+
+            if(inspectInfoData[i].person_responsible <= 0){
+                flag = true
+                app.toast("责任整改人不能为空!")
+                that.setData({
+                    loadShow:false
+                })
+                break;
+            }
+        }
+        if(flag){
+            return;
+        }
+
+        let tempInspectInfoData = []
+        inspectInfoData.forEach(async (item)=>{
+            console.log(app.globalData.reqUrl+'/weixin/security/fileUploads')
+            let beforeCheckUrl = [] 
+            item.image_upload.forEach(async (item1)=>{
+               let requestUrl = app.globalData.reqUrl+'/weixin/security/fileUpload'
+               let name = "file" 
+               //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+               let photoUrlObj = await that.syncUploadImage(requestUrl,item1,name)
+               beforeCheckUrl.push(photoUrlObj.data.url)   
+               if(beforeCheckUrl.length >= item.image_upload.length){
+                tempInspectInfoData.push({
+                    issueContext:item.existing_problems,
+                    beforeCheckUrl:beforeCheckUrl.join(","),
+                    checkUserId:item.person_responsible[0].userId,
+                    checkUserName:item.person_responsible[0].name,
+                    checkLoginName:item.person_responsible[0].loginName,
+                })
+               }
+               if(tempInspectInfoData.length >= inspectInfoData.length){
+                let params = {
+                    projectId,
+                    checkLoginName:loginName,
+                    checkType,
+                    userName,
+                    deptId:"131",
+                    checkTitle:stateNav,
+                    checkSiteName,
+                    checkTime,
+                    checkImposeTime,
+                    saftCheckIssueItemList:tempInspectInfoData
+                }
+                wx.request({
+                  url: app.globalData.szhUrl + '/system/saftcheckissue/addJson',
+                  method:"POST",
+                  data:params,
+                  header: {
+                    "Content-Type": "application/json"
+                  },
+                  success(res){
+                    that.setData({
+                        loadShow:true
+                    })
+                    res =res.data
+                    if(res.code == 0){
+                        app.toast("添加成功!")
+                        setTimeout(()=>{
+                           wx.navigateTo({
+                             url: '../securityCheckGR/index',
+                           })
+                        },2000)
+                    }
+                   
+                  }
+                })
+                }
+            })
+           
+        
+           
+           
+        })
+
+
+
+    
+    
+    
+    },
+
+
+
+    /**
+     * 这里考虑上传图片异步问题，封装为同步
+     */
+
+    syncUploadImage(url,uploadFile,name) {
+        return new Promise((resolve, reject) => {
+            wx.uploadFile({
+            url, // 上传的服务器接口地址
+            filePath: uploadFile,
+            header: {
+                "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"      
+            },
+            name, //上传的所需字段，后端提供
+            formData: { user: 'test' },
+            success: (res) => {
+                // 上传完成操作
+                const data = JSON.parse(res.data)
+                resolve({
+                    data: data
+                })
+            },
+            fail: (err) => {
+                //上传失败：修改pedding为reject
+                console.log("访问接口失败", err);
+                wx.showToast({
+                title: "网络出错,上传失败",
+                icon: 'none',
+                duration: 1000
+                });
+                reject(err)
+            }
+            });
+        })
+          
+    
+    
+    },
+
+
+
+
+
+
+ 
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.json b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.json
new file mode 100644
index 0000000..0771fdf
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index" 
+    },
+    "navigationBarTitleText": "新增安全检查"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml
new file mode 100644
index 0000000..7a4c080
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml
@@ -0,0 +1,143 @@
+<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
+<view class="inspect_info">
+    <view class="inspect_info_list">
+        <view class="inspect_info_title">检查类型</view>
+        <view class="inspect_info_type">
+            <view class="{{stateNav==2?'active':''}}"   bindtap="onStateSelect" data-set="2">常规周检</view>
+            <view class="{{stateNav==1?'active':''}}"   bindtap="onStateSelect" data-set="1">常规月检</view>
+            <view class="{{stateNav==3?'active':''}}"   bindtap="onStateSelect" data-set="3">专项检查</view>
+        </view>
+    </view>
+    <view class="inspect_info_list" >
+        <view class="inspect_info_title">检查部位</view>
+        <view class="inspect_info_content">
+            <input placeholder="请填写检查部位" placeholder-style="color:#6777aa;" class="inspect_input_fill_in" bindinput="onInputValue"/>
+        </view>
+    </view>
+    <view class="inspect_info_list">
+        <view class="inspect_info_title">检查时间</view>
+        <view class="inspect_info_content">
+            <voucher-date counts="5" placeholder="请选择检查时间" bindchange="onStartTime"></voucher-date>
+        </view>
+    </view>
+    <view class="inspect_info_list">
+        <view class="inspect_info_title">限期整改时间</view>
+        <view class="inspect_info_content">
+            <voucher-date counts="5" maxDate="{{maxDate}}" placeholder="请选择限期整改时间" bindchange="onEndTime"></voucher-date>
+        </view>
+    </view>
+</view>
+
+<view>
+    <view class="inspect_info" wx:for="{{inspectInfoData}}" wx:key="index">
+        <view class="module_title module_title_flex">
+            <view>问题 {{index + 1}}</view>
+            <view class="module_see_info_delete" wx:if="{{index != 0}}" bindtap="onNewIssuesDelete" data-index="{{index}}"><van-icon name="delete" /> 删除</view>
+        </view>
+        <view class="inspect_info_list">
+            <view class="inspect_info_title" style="padding: 30rpx 0 20rpx;">存在问题</view>
+            <view class="problem_list_info_con">
+                <input placeholder="请填写" placeholder-style="color:#6777aa;" class="inspect_input_fill_in"
+                 value="{{item.existing_problems}}" bindinput="onPositionInput" data-index="{{index}}"/>
+            </view>
+        </view>
+        <view class="inspect_info_list">
+            <view class="inspect_info_title" style="padding: 20rpx 0 20rpx;">检查图片</view>
+            <view class="problem_list_info_con">
+                <file-uploader  bindimages="onImagesArr" data-index="{{index}}" fileUrlArray="{{item.image_upload}}"></file-uploader>
+            </view>
+        </view>
+        <view class="inspect_info_list">
+            <view class="inspect_info_title" style="padding: 30rpx 0 20rpx;">整改责任人</view>
+            <view class="problem_list_info_con">
+                <select-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddResponsible" data-index="{{index}}" choose="{{item.person_responsible}}"></select-person>
+                <!-- <view class="nspect_info_rectifier">
+                    <van-row>
+                        <van-col span="4" style="text-align: center;">
+                            <van-image width="100rpx" height="100rpx" fit="cover" src="https://img.yzcdn.cn/vant/cat.jpeg" />
+                            <view style="padding: 5rpx 0 15rpx;">党鹏</view>
+                        </van-col>
+                        <van-col span="4" style="text-align: center;">
+                            <view class="inspect_info_add_to" bindtap="onAddResponsible" data-index="{{index}}"><van-icon name="plus" /></view>
+                        </van-col>
+                    </van-row>
+                </view> -->
+            </view>
+        </view>
+    </view>
+</view>
+
+<view class="inspect_new_issues_max">
+    <view class="inspect_new_issues" bindtap="onNewIssues"><van-icon name="add-o" style="position: relative;top:5rpx"/> 新增问题</view>
+</view>
+
+<view class="problem_submit_to">
+    <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
+    <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">保存</view>
+</view> 
+
+
+<van-overlay show="{{loadShow}}">
+    <view class="gif">
+        <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+        <view>数据加载中！请稍后...</view>
+    </view>
+</van-overlay>  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxss b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxss
new file mode 100644
index 0000000..a22e780
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxss
@@ -0,0 +1,7 @@
+/* pageage/safetyManagement/addSafetyInspect/index.wxss */
+.van-popup{
+    background: none !important;
+}
+.van-image__img{
+    border-radius: 10rpx !important;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/problemRectification/index.js b/miniprogram/pageage/safetyManagement/problemRectification/index.js
new file mode 100644
index 0000000..9446bc0
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectification/index.js
@@ -0,0 +1,226 @@
+// pageage/safetyManagement/problemRectification/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        id:"",
+        projectId:"",
+        loginName:"",
+        userName:"",
+        //检查类型名称
+        checkTypeName:"",
+        //检查部位名称
+        checkSiteName:"",
+        //检查时间
+        checkTime:"",
+        //检查限制时间
+        checkImposeTime:"",
+        rectifySituation:"",
+        
+         // state    0  待我整改   1  我已整改   2 无需整改 
+        problemData:[],     
+        loadShow:false
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let {id,projectId,checkType,checkpoint,rectify_time,inspect_time} = options
+        console.log(inspect_time);
+         
+        //获取缓存数据
+        wx.getStorage({
+        key: 'userinfo',
+        success:res=>{
+          this.setData({
+            id,
+            projectId,
+            checkType,checkpoint,rectify_time,inspect_time,
+            loginName:res.data.loginName,
+            userName:res.data.userName
+          }) 
+          this.getSafetCheckDetailsInfo(); 
+        }  
+        }) 
+    },
+
+
+    /**
+     * 获取安全检查详情信息
+     * 
+     */
+    getSafetCheckDetailsInfo(){
+        let {id,checkType,checkpoint,rectify_time,inspect_time} = this.data
+        let that = this
+        wx.request({
+          url: app.globalData.szhUrl+'/api/check/getCheckDetailList',
+          method:"get",
+          data:{
+              info_id:id          
+          },
+          success(res){
+            res = res.data
+            console.log(res);
+
+            //let {id,projectId,checkImposeTime,checkSiteName,checkTime,checkTypeName,result} = res.data.saftCheckIssue
+
+            if(res.code == 200){
+               let  problemDataTemp = []
+               let result = res.data;
+               result.forEach((item,index)=>{
+               
+                let  rectify_front = []
+                let  rectify_photo = []
+                rectify_front.push({url:item.imageList[0].photo_url});
+                rectify_photo.push({url:item.imageList[1].photo_url});
+
+                // item.beforeCheckUrl.split(",").forEach(item=>{
+                //     rectify_front.push({url:item})
+                // })  
+                // if(item.finishList.length > 0){
+                //     item.finishList[0].afterCheckUrl.split(",").forEach(item=>{
+                //         rectify_photo.push({url:item})
+                //     }) 
+                // }
+               
+                problemDataTemp.push({    
+                    title:'问题'+(index+1),
+                    overall_state:false,
+                    state:item.rectification_situation?1:0,
+                    existing_problems:item.existing_problems,
+                    rectify_person:item.responsible_person,
+                    //rectifyuserId:item.checkUserId,
+                    rectify_front,
+                    rectifyloginName:item.responsible_person,
+                    rectify_situation:item.rectification_situation,
+                    rectify_time:item.rectification_time,
+                    rectify_photo,
+                    issueId:id,
+                    issueItemId:item.id
+                })
+               
+               })   
+               console.log(that.data.checkTypeName);
+               that.setData({
+                    //检查类型名称
+                    checkTypeName:checkType,
+                    //检查部位名称
+                    checkSiteName:checkpoint,
+                    //检查时间
+                    checkTime:inspect_time,
+                    //检查限制时间
+                    checkImposeTime:rectify_time,
+                    //问题列表
+                    problemData:problemDataTemp
+               })  
+
+                that.setData({
+                    loadShow:false
+                })
+            }
+
+          }
+        })
+    },
+
+    //问题展开
+    onExpandDetails(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+
+        if(data[index].overall_state == false){
+            data[index].overall_state = true
+        }else{
+            data[index].overall_state = false
+        }
+        
+        this.setData({
+            problemData:data
+        })
+    },
+
+    //list 问题整改按钮
+    onProblemRectification(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        data[index].problem_btn = true
+        this.setData({
+            problemData:data
+        })
+    },
+
+    //list 整改情况 填写
+    onRectificationSituation(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        data[index].rectify_situation = e.detail.value
+        this.setData({
+            problemData:data
+        })
+    },
+
+    //list 取消按钮
+    onCancellation(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        data[index].problem_btn = false
+        this.setData({
+            problemData:data
+        })
+    },
+   
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/problemRectification/index.json b/miniprogram/pageage/safetyManagement/problemRectification/index.json
new file mode 100644
index 0000000..6fd943c
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectification/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "安全检查整改详情"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/problemRectification/index.wxml b/miniprogram/pageage/safetyManagement/problemRectification/index.wxml
new file mode 100644
index 0000000..023e7ed
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectification/index.wxml
@@ -0,0 +1,99 @@
+<!--pageage/safetyManagement/problemRectification/index.wxml-->
+<view>
+  
+    <view class="inspect_overview_max">
+    
+        <view class="inspect_overview">
+            <view class="module_title module_title_padding">
+                <view>检查概况</view>
+            </view>
+            <view class="inspect_overview_list_max">
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">检查类型</text></van-col>
+                        <van-col span="16">{{checkTypeName}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">检查部位</text></van-col>
+                        <van-col span="16">{{checkSiteName}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">检查时间</text></van-col>
+                        <van-col span="16">{{checkTime}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">限期整改时间</text></van-col>
+                        <van-col span="16">{{checkImposeTime}}</van-col>
+                    </van-row>
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <view class="problem_list_max">
+        <view class="problem_list_for" wx:for="{{problemData}}" wx:key="index">
+            <view class="problem_list_title" bindtap="onExpandDetails" data-index="{{index}}">
+                <view class="module_title module_title_flex" style="background: none;padding-left: 0;">
+                    <view class="module_title_text">{{index+1}}、{{item.existing_problems}}</view>
+                    <view class="inspect_list_title_state">
+                        <text class="state_colour_0" wx:if="{{item.state == 0}}">待整改</text>
+                        <text class="state_colour_1" wx:if="{{item.state == 1}}">已整改</text>
+                    </view>
+                </view>
+            </view>
+            <view class="problem_list_content" wx:if="{{item.overall_state}}">
+                <view>
+                    <view class="problem_list_module">
+                        <view class="problem_list_content_title">存在问题</view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">存在问题</view>
+                            <view class="problem_list_info_con">{{item.existing_problems}}</view>
+                        </view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">整改前</view>
+                            <view class="problem_list_info_con">
+                                <van-uploader file-list="{{item.rectify_front}}" show-upload="{{fales}}" deletable="{{fales}}"/>
+                            </view>
+                        </view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">整改责任人</view>
+                            <view class="problem_list_info_con">{{item.rectify_person}}</view>
+                        </view>
+                    </view>
+                </view>
+                <view wx:if="{{item.state == 1}}" class="problem_list_module_border">
+                    <view class="problem_list_content_title">问题整改</view>
+                    <view class="problem_list_info">
+                        <view class="problem_list_info_title">整改情况</view>
+                        <view class="problem_list_info_con">{{item.rectify_situation}}</view>
+                    </view>
+                    <view class="problem_list_info">
+                        <view class="problem_list_info_title">整改照片</view>
+                        <view class="problem_list_info_con">
+                            <van-uploader file-list="{{item.rectify_photo}}" show-upload="{{fales}}" deletable="{{fales}}"/>
+                        </view>
+                    </view>
+                    <view class="problem_list_info">
+                        <view class="problem_list_info_title">整改时间</view>
+                        <view class="problem_list_info_con">{{item.rectify_time}}</view>
+                    </view>
+                </view>
+                
+            </view>
+        </view>
+       
+    </view>
+    <!-- <view class="problem_submit_to">
+        <view class="problem_submit_to_btn">取消</view>
+        <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">保存</view>
+    </view> -->
+
+
+
+</view>
diff --git a/miniprogram/pageage/safetyManagement/problemRectification/index.wxss b/miniprogram/pageage/safetyManagement/problemRectification/index.wxss
new file mode 100644
index 0000000..ea7d1c2
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectification/index.wxss
@@ -0,0 +1 @@
+/* pageage/safetyManagement/problemRectification/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/problemRectificationGR/index.js b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.js
new file mode 100644
index 0000000..87e2feb
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.js
@@ -0,0 +1,309 @@
+// pageage/safetyManagement/problemRectification/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        id:"",
+        projectId:"",
+        loginName:"",
+        userName:"",
+        //检查类型名称
+        checkTypeName:"",
+        //检查部位名称
+        checkSiteName:"",
+        //检查时间
+        checkTime:"",
+        //检查限制时间
+        checkImposeTime:"",
+        rectifySituation:"",
+        
+         // state    0  待我整改   1  我已整改   2 无需整改 
+        problemData:[],    
+        loadShow:false
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let {id,projectId} = options
+         
+        //获取缓存数据
+        wx.getStorage({
+        key: 'userinfo',
+        success:res=>{
+          this.setData({
+            id,
+            projectId,
+            loginName:res.data.loginName,
+            userName:res.data.userName
+          }) 
+          this.getSafetCheckDetailsInfo(); 
+        }  
+        }) 
+    },
+
+
+    /**
+     * 获取安全检查详情信息
+     * 
+     */
+    getSafetCheckDetailsInfo(){
+        let {projectId,id} = this.data
+        let that = this
+        wx.request({
+          url: app.globalData.szhUrl+'/system/saftcheckissue/getIssureDetails',
+          method:"POST",
+          data:{
+              projectId,
+              id
+          },
+          header:{
+            'content-type': 'application/x-www-form-urlencoded'  
+          },
+          success(res){
+            res = res.data
+            let {id,projectId,checkImposeTime,checkSiteName,checkTime,checkTypeName,result} = res.data.saftCheckIssue
+            if(res.code == 200){
+               let  problemDataTemp = []
+          
+               result.forEach((item,index)=>{
+                let  state = '2'
+                let  rectify_front = []
+                let  rectify_photo = []
+                if(item.checkLoginName == that.data.loginName){
+                    state = '0'
+                    if(item.status == '1'){
+                        state = '1'        
+                    }
+                }
+                item.beforeCheckUrl.split(",").forEach(item=>{
+                    rectify_front.push({url:item})
+                })  
+                if(item.finishList.length > 0){
+                    item.finishList[0].afterCheckUrl.split(",").forEach(item=>{
+                        rectify_photo.push({url:item})
+                    }) 
+                }
+               
+                problemDataTemp.push({    
+                    title:'问题'+(index+1),
+                    overall_state:false,
+                    state,
+                    existing_problems:item.issueContext,
+                    rectify_person:item.checkUserName,
+                    rectifyuserId:item.checkUserId,
+                    rectify_front,
+                    rectifyloginName:item.checkLoginName,
+                    problem_btn: state == '0'?false:true,
+                    rectify_situation:item.finishList.length > 0 ? item.finishList[0].finishContext:"",
+                    rectify_time:item.finishList.length > 0 ? item.finishList[0].finishTime:"",
+                    rectify_photo,
+                    projectId,
+                    issueId:id,
+                    issueItemId:item.id
+                })
+               
+               })   
+               that.setData({
+                    //检查类型名称
+                    checkTypeName,
+                    //检查部位名称
+                    checkSiteName,
+                    //检查时间
+                    checkTime,
+                    //检查限制时间
+                    checkImposeTime,
+                    //问题列表
+                    problemData:problemDataTemp
+               })  
+                that.setData({
+                    loadShow:false
+                })
+            }
+          }
+        })
+    },
+
+    //上传图片返回值
+    onImagesArr(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        data[index].rectify_photo = e.detail
+        this.setData({
+            problemData:data
+        })
+    },
+
+    //问题展开
+    onExpandDetails(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+
+        if(data[index].overall_state == false){
+            data[index].overall_state = true
+        }else{
+            data[index].overall_state = false
+        }
+        
+        this.setData({
+            problemData:data
+        })
+    },
+
+    //list 问题整改按钮
+    onProblemRectification(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        data[index].problem_btn = true
+        this.setData({
+            problemData:data
+        })
+    },
+
+    //list 整改情况 填写
+    onRectificationSituation(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        data[index].rectify_situation = e.detail.value
+        this.setData({
+            problemData:data
+        })
+    },
+
+    //list 取消按钮
+    onCancellation(e){
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        data[index].problem_btn = false
+        this.setData({
+            problemData:data
+        })
+    },
+    //list 确认按钮
+    onConfirm(e){
+        let that = this
+        this.setData({
+            loadShow:true
+        })
+        var index = e.currentTarget.dataset.index
+        var data = this.data.problemData
+        let afterCheckUrl = []
+        let {issueId,issueItemId,projectId,rectifyuserId,rectifyloginName,rectify_situation,rectify_photo} = data[index]
+        if(rectify_photo.length <= 0){
+            app.toast("请上传整改图片")
+            this.setData({
+                loadShow:false
+            })
+            return;
+        }
+        if(rectify_situation.length <= 0){
+            app.toast("整改情况不能为空")
+            this.setData({
+                loadShow:false
+            })
+            return;
+        }
+        rectify_photo.forEach(item=>{
+            wx.uploadFile({
+                //图片上传地址
+                url: app.globalData.reqUrl+'/weixin/security/fileUpload',
+                filePath: item,
+                name: 'file',
+                header: {
+                  "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+                },
+                formData: { user: 'test' },
+                success:resTemp => {
+                    let dataFile = JSON.parse(resTemp.data);
+                    afterCheckUrl.push(dataFile.url) 
+                    if(afterCheckUrl.length >= rectify_photo.length){
+                        //执行保存方法
+                        wx.request({
+                            url: app.globalData.szhUrl+'/system/saftissuefinish/add',
+                            method:"POST",
+                            data:{
+                                projectId,
+                                issueId,
+                                issueItemId,
+                                finishContext:rectify_situation,
+                                afterCheckUrl:afterCheckUrl.join(","),
+                                finishUserId:rectifyuserId,
+                                finishCheckLoginName:rectifyloginName
+                            },
+                            header:{
+                              'content-type': 'application/x-www-form-urlencoded'  
+                            },
+                            success(res){
+                                app.toast("整改成功")
+                                setTimeout(()=>{
+                                    wx.navigateTo({
+                                      url: '../securityCheckGR/index',
+                                    },2000)
+                                })
+                                
+                            }
+                        })
+
+
+                    }
+                }
+            })
+        })    
+        
+    },
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/problemRectificationGR/index.json b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.json
new file mode 100644
index 0000000..f4f3bcc
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index" 
+    },
+    "navigationBarTitleText": "安全检查问题整改"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml
new file mode 100644
index 0000000..489c907
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml
@@ -0,0 +1,126 @@
+<!--pageage/safetyManagement/problemRectification/index.wxml-->
+<view>
+  
+    <view class="inspect_overview_max">
+    
+        <view class="inspect_overview">
+            <view class="module_title module_title_padding">
+                <view>检查概况</view>
+            </view>
+            <view class="inspect_overview_list_max">
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">检查类型</text></van-col>
+                        <van-col span="16">{{checkTypeName}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">检查部位</text></van-col>
+                        <van-col span="16">{{checkSiteName}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">检查时间</text></van-col>
+                        <van-col span="16">{{checkTime}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">限期整改时间</text></van-col>
+                        <van-col span="16">{{checkImposeTime}}</van-col>
+                    </van-row>
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <view class="problem_list_max">
+        <view class="problem_list_for" wx:for="{{problemData}}" wx:key="index">
+            <view class="problem_list_title" bindtap="onExpandDetails" data-index="{{index}}">
+                <view class="module_title module_title_flex">
+                    <view class="module_title_text">{{item.title}}</view>
+                    <view class="inspect_list_title_state">
+                        <text class="state_colour_0" wx:if="{{item.state == 0}}">待我整改</text>
+                        <text class="state_colour_1" wx:if="{{item.state == 1}}">我已整改</text>
+                        <text class="state_colour_2" wx:if="{{item.state == 2}}">无需整改</text>
+                    </view>
+                </view>
+            </view>
+            <view class="problem_list_content" wx:if="{{item.overall_state}}">
+                <view>
+                    <view class="problem_list_module">
+                        <view class="problem_list_content_title">存在问题</view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">存在问题</view>
+                            <view class="problem_list_info_con">{{item.existing_problems}}</view>
+                        </view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">整改前</view>
+                            <view class="problem_list_info_con">
+                                <van-uploader file-list="{{item.rectify_front}}" show-upload="{{fales}}" deletable="{{fales}}"/>
+                            </view>
+                        </view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">整改责任人</view>
+                            <view class="problem_list_info_con">{{item.rectify_person}}</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="problem_list_module_border" wx:if="{{item.state != 2}}">
+                    <view class="problem_list_btn_max"  wx:if="{{!item.problem_btn}}">
+                        <view class="problem_list_btn" bindtap="onProblemRectification" data-index="{{index}}">问题整改</view>
+                    </view>
+                </view>
+                
+                <view wx:if="{{item.state != 2}}">
+                    <view wx:if="{{item.problem_btn}}">
+                        <view class="problem_list_content_title">问题整改</view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">整改情况</view>
+                            <view class="problem_list_info_input" wx:if="{{item.state == 0}}">
+                                <textarea  class="add_textarea" placeholder="请填写整改情况" value="{{item.rectify_situation}}"
+                                placeholder-style="color:#6777aa;" bindinput="onRectificationSituation"  data-index="{{index}}"/>
+                            </view>
+                            <view class="problem_list_info_con" wx:if="{{item.state == 1}}">{{item.rectify_situation}}</view>
+                        </view>
+                        <view class="problem_list_info">
+                            <view class="problem_list_info_title">整改照片</view>
+                            <view class="problem_list_info_con" wx:if="{{item.state == 0}}">
+                                <file-uploader  bindimages="onImagesArr" data-index="{{index}}"></file-uploader>
+                            </view>
+                            <view class="problem_list_info_con" wx:if="{{item.state == 1}}">
+                                <van-uploader file-list="{{item.rectify_photo}}" show-upload="{{fales}}" deletable="{{fales}}"/>
+                            </view>
+                        </view>
+                        <view class="problem_list_info" wx:if="{{item.state == 1}}">
+                            <view class="problem_list_info_title">整改时间</view>
+                            <view class="problem_list_info_con">{{item.rectify_time}}</view>
+                        </view>
+                        <view class="problem_list_btn_max" wx:if="{{item.state == 0}}">
+                            <view class="problem_list_btn" bindtap="onCancellation" data-index="{{index}}">取消</view>
+                            <view class="problem_list_btn problem_list_btn_confirm" bindtap="onConfirm" data-set="{{item}}" data-index="{{index}}">确认</view>
+                        </view>
+                    </view>
+                </view>
+                
+            </view>
+        </view>
+       
+    </view>
+    <!-- <view class="problem_submit_to">
+        <view class="problem_submit_to_btn">取消</view>
+        <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">保存</view>
+    </view> -->
+
+    <van-overlay show="{{loadShow}}">
+    <view class="gif">
+        <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+        <view>数据加载中！请稍后...</view>
+    </view>
+    </van-overlay>  
+
+
+
+</view>
diff --git a/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxss b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxss
new file mode 100644
index 0000000..ea7d1c2
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxss
@@ -0,0 +1 @@
+/* pageage/safetyManagement/problemRectification/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheck/index.js b/miniprogram/pageage/safetyManagement/securityCheck/index.js
new file mode 100644
index 0000000..a25fabf
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheck/index.js
@@ -0,0 +1,361 @@
+// pageage/safetyManagement/securityCheckGR/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        loginName:"",
+        userName:"",
+        projectId:"",
+        projectData:{},
+        projectNameArgs:"",
+        initData: {},
+        show:false,
+
+        stateNav:1,
+        statePosit:1,
+
+        listData:[],
+        listDataed:[],
+        //常规检查总数
+        conventionNumber:0,
+        //转向检查总数
+        specialNumber:0,
+        //待整改总数
+        unRectifyNumber:0,
+        //已整改整数
+        rectifyNumber:0
+    },
+
+    onClose(){
+        this.setData({ show: false });  
+    },
+    showPopup() {
+        this.setData({ show: true });
+    },
+
+    goGCLB(){
+       wx.redirectTo({
+         url: '../../../pages/newAddPage/safetyManagement/index',
+       })
+    },
+
+
+    // 常规检查   专项检查  选择
+    onStateSelect(e){
+        let state = e.currentTarget.dataset.state;
+        this.setData({
+            stateNav:state,
+        });
+        this.getProjectCorrespondence(app.globalData.projectId)
+    },
+
+    //待整改 已整改 选择
+    onStatePosit(e){
+        let state = e.currentTarget.dataset.state;
+        this.setData({
+            statePosit:state,
+        });
+    },
+
+    //项目切换 返回值
+    onProjectSelect(e) {
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        this.setData({
+            projectId: projectId,
+            projectName: projectName,
+        })
+        this.onLoad()
+    },
+
+    skipCheckView(){
+        let {szh} = this.data.projectData
+        wx.navigateTo({
+            url: `../addSafetyInspect/index?projectId=${szh}`,
+        })
+    },
+
+    getSaftCheckDetialsInfo(e){
+        console.log(e);
+        let {id,projectId,checkType,checkpoint,rectify_time,inspect_time} = e.currentTarget.dataset.set
+
+        wx.navigateTo({
+          url: `../problemRectification/index?id=${id}&projectId=${projectId}&checkType=${checkType}&checkpoint=${checkpoint}&rectify_time=${rectify_time}&inspect_time=${inspect_time}`,
+        })
+    },
+
+
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+     //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:res=>{
+          this.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectId:app.globalData.projectId,
+            projectNameArgs:app.globalData.projectName,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+          this.getProjectCorrespondence(app.globalData.projectId)
+        }
+      })
+    },
+
+  /**
+    * 项目对应关系
+    */
+  getProjectCorrespondence(projectId) {
+
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          projectData: res.data
+        })
+        //获取常规检查数据
+        that.getSaftCheckDataInfoCg();
+        //获取专项检查数据
+        that.getSaftCheckDataInfoZx();
+        
+      }
+    })
+    },
+
+    /**
+     *  获取常规检查数据
+     */
+     getSaftCheckDataInfoCg(){
+        let that = this
+        let {szh} = that.data.projectData
+        wx.request({
+            url: app.globalData.szhUrl+'/api/check/getCheckInfoList',
+            method:"GET",
+            data:{
+                project_id:szh,
+                large_type:1
+            },
+            success(res){
+                res = res.data
+                console.log(res);
+                if(res.code == 200){
+                  let listDataTemp = [];
+                  let listDataTempEd = [];
+                  let tempa =0;
+                  let tempb =0;
+                  that.setData({
+                    //专项检查总数
+                    conventionNumber:res.data.length,
+                  })
+                  res.data.forEach((item,index)=>{
+                    //待整改数
+                    if(!item.afterPhoto){
+                      tempa++;
+                      listDataTemp.push({
+                        id:item.id,
+                        status:item.status,
+                        projectId:item.projectId,
+                        checkType:item.check_type,
+                        title:item.check_type +' '+item.inspect_time,
+                        questions_number: item.problem_number,
+                        rectification_number: item.correct_number,
+                        photo:item.beforePhoto,
+                        rectify_time:item.change_time,
+                        inspect_time:item.inspect_time,
+                        rectify_front_img:item.beforePhoto,
+                        rectify_after_img:item.afterPhoto,
+                        rectification_prop:item.correct_rate,
+                        checkpoint:item.check_position,
+                    }) 
+                    } else {
+                      //已整改数
+                      tempb++;
+                      listDataTempEd.push({
+                        id:item.id,
+                        status:item.status,
+                        projectId:item.projectId,
+                        checkType:item.check_type,
+                        title:item.check_type +' '+item.inspect_time,
+                        questions_number: item.problem_number,
+                        rectification_number: item.correct_number,
+                        photo:item.beforePhoto,
+                        rectify_time:item.change_time,
+                        inspect_time:item.inspect_time,
+                        rectify_front_img:item.beforePhoto,
+                        rectify_after_img:item.afterPhoto,
+                        rectification_prop:item.correct_rate,
+                        checkpoint:item.check_position,
+                      }) 
+                    }
+                  })
+  
+                  that.setData({
+                    //专项检查总数
+                    listData:listDataTemp,
+                  })
+                  
+                  if(that.data.stateNav == 1){
+                    that.setData({
+                      listData:listDataTemp,
+                      listDataed:listDataTempEd,
+                      unRectifyNumber:tempa,
+                      rectifyNumber:tempb
+                    })
+                  } 
+                }
+                
+            }
+        })
+    },
+
+
+     /**
+     *  获取专项检查数据
+     */
+    getSaftCheckDataInfoZx(){
+      let that = this
+      let {szh} = that.data.projectData
+      wx.request({
+          url: app.globalData.szhUrl+'/api/check/getCheckInfoList',
+          method:"GET",
+          data:{
+              project_id:szh,
+              large_type: 2
+          },
+          success(res){
+              res = res.data
+              if(res.code == 200){
+                let listDataTemp = [];
+                let listDataTempEd = [];
+                let tempa =0;
+                let tempb =0;
+                that.setData({
+                  //专项检查总数
+                  specialNumber:res.data.length,
+                })
+                res.data.forEach((item,index)=>{
+                  //待整改数
+                  if(!item.afterPhoto){
+                    tempa++;
+                    listDataTemp.push({
+                      id:item.id,
+                      status:item.status,
+                      projectId:item.projectId,
+                      checkType:item.check_type,
+                      title:item.check_type +' '+item.inspect_time,
+                      questions_number: item.problem_number,
+                      rectification_number: item.correct_number,
+                      photo:item.beforePhoto,
+                      rectify_time:item.change_time,
+                      inspect_time:item.inspect_time,
+                      rectify_front_img:item.beforePhoto,
+                      rectify_after_img:item.afterPhoto,
+                      rectification_prop:item.correct_rate,
+                      checkpoint:item.check_position,
+                  }) 
+                  } else {
+                    //已整改数
+                    tempb++;
+                    listDataTempEd.push({
+                      id:item.id,
+                      status:item.status,
+                      projectId:item.projectId,
+                      checkType:item.check_type,
+                      title:item.check_type +' '+item.inspect_time,
+                      questions_number: item.problem_number,
+                      rectification_number: item.correct_number,
+                      photo:item.beforePhoto,
+                      rectify_time:item.change_time,
+                      inspect_time:item.inspect_time,
+                      rectify_front_img:item.beforePhoto,
+                      rectify_after_img:item.afterPhoto,
+                      rectification_prop:item.correct_rate,
+                      checkpoint:item.check_position,
+                    }) 
+                  }
+                })
+
+                that.setData({
+                  //专项检查总数
+                  listData:listDataTemp,
+                })
+                if(that.data.stateNav == 2){
+                  that.setData({
+                    listData:listDataTemp,
+                    listDataed:listDataTempEd,
+                    unRectifyNumber:tempa,
+                    rectifyNumber:tempb
+                  })
+                } 
+              }
+              
+          }
+      })
+  },
+    
+
+    
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheck/index.json b/miniprogram/pageage/safetyManagement/securityCheck/index.json
new file mode 100644
index 0000000..79439cb
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheck/index.json
@@ -0,0 +1,7 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index" ,
+        "van-popup": "@vant/weapp/popup/index"
+    },
+    "navigationBarTitleText": "安全检查"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheck/index.wxml b/miniprogram/pageage/safetyManagement/securityCheck/index.wxml
new file mode 100644
index 0000000..5330bbe
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheck/index.wxml
@@ -0,0 +1,148 @@
+
+     
+
+    <van-sticky  offset-top="{{ 0 }}">
+       
+            <view  style="background: #191d28;">
+            <!--pageage/safetyManagement/securityCheckGR/index.wxml-->
+            <!-- <view class="header_title_saft">
+                <view class="header_title_row">
+                    <van-row>
+                    <van-col span="3">
+                        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+                    </van-col>
+                    <van-col span="4">
+                        <view class="header_img" bindtap="goGCLB">
+                        <image src="/images/left.png"></image>
+                        <text class="header_fh">返回</text>
+                        </view>
+                    </van-col>
+                    <van-col span="10">
+                        <view class="header_name">安全检查</view>
+                    </van-col>
+                    </van-row>
+                </view>
+            </view> -->
+            <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+            <view class="modify_video_nav">
+                <view class="{{stateNav==1?'active':''}}" bindtap="onStateSelect" data-state="1"><text>常规检查({{conventionNumber}})</text></view>
+                <view class="{{stateNav==2?'active':''}}" bindtap="onStateSelect" data-state="2"><text>专项检查({{specialNumber}})</text></view>
+            </view>
+        </view>
+    </van-sticky>
+    <!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+        <view class="left_max">
+            <van-row class="demo clearfix">
+            <van-col span="10">
+                <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+            </van-col>
+            <van-col span="14">
+                <view class="left_info">
+                <view class="left_info_name">{{userName}}</view>
+                <view class="left_info_name">{{loginName}}</view>
+                </view>
+            </van-col>
+            </van-row>
+        </view>
+    </van-popup> -->
+    <view class="deep_point_position" style="padding:40rpx 0 0">
+        <view class="{{statePosit == 1?'active':''}}" bindtap="onStatePosit" data-state="1">待整改(<text>{{unRectifyNumber}}</text>)</view>
+        <view class="{{statePosit == 2?'active':''}}" bindtap="onStatePosit" data-state="2">已整改(<text>{{rectifyNumber}}</text>)</view>
+    </view>
+    <view class="inspect_max" wx:if="{{statePosit == 1}}">
+        <view class="module_title module_title_flex">
+            <view>常规检查待整改列表</view>
+            <!-- <view class="module_see_info" bindtap="goEducations"><van-icon name="filter-o" />筛选</view> -->
+        </view>
+        <view class="inspect_list">
+            <view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getSaftCheckDetialsInfo">
+                <view class="inspect_for_bgd">
+                    <view class="inspect_list_title">
+                        <view class="inspect_list_title_label inspect_list_title_width">
+                            <view class="inspect_list_title_number">{{index < 10 ?'0'+(index+1):(index+1)}}</view>
+                            <view class="inspect_list_title_text">{{item.title}}</view>
+                        </view>
+                    </view>
+                    <view class="inspect_list_info">
+                        <view class="inspect_list_info_details">
+                            <view class="inspect_list_info_img">
+                                <van-image width="120rpx" height="120rpx" fit="cover" src="{{item.photo}}"/>
+                            </view>
+                            <view class="inspect_list_info_data">
+                                <view class="inspect_list_info_data_num">
+                                    <view class="inspect_list_info_data_num_option">问题数：<text class="color_orange">{{item.questions_number}}</text></view>
+                                    <view class="inspect_list_info_data_num_option">整改数：<text class="color_green">{{item.rectification_number}}</text></view>
+                                </view>
+                                <view class="inspect_list_info_data_prop">整改率：<text class="color_blue">{{item.rectification_prop}}%</text></view>
+                            </view>
+                        </view>
+                        <view class="inspect_list_info_position">检查部位：<text class="color_purple">{{item.checkpoint}}</text></view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <view class="inspect_max" wx:if="{{statePosit == 2}}">
+    <view class="module_title module_title_flex">
+        <view>常规检查已整改列表</view>
+        <!-- <view class="module_see_info" bindtap="goEducations"><van-icon name="filter-o" />筛选</view> -->
+    </view>
+
+    <view class="inspect_list">
+        <view class="inspect_for" wx:for="{{listDataed}}" wx:key="index" data-set="{{item}}" bindtap="getSaftCheckDetialsInfo">
+            <view class="inspect_for_bgd">
+                <view class="inspect_list_title">
+                    <view class="inspect_list_title_label">
+                        <view class="inspect_list_title_number">{{index < 10 ?'0'+(index+1):(index+1)}}</view>
+                        <view class="inspect_list_title_text">{{item.title}}</view>
+                    </view>
+                   
+                </view>
+                <view class="inspect_list_info">
+                    <view class="inspect_list_info_details">
+                        <view class="inspect_list_info_img">
+                            <van-image width="130rpx" height="130rpx" fit="cover" src="{{item.rectify_front_img}}"/>
+                            <view class="inspect_list_info_img_text">整改前</view>
+                        </view>
+                        <view class="inspect_list_info_img">
+                            <van-image width="130rpx" height="130rpx" fit="cover" src="{{item.rectify_after_img}}"/>
+                            <view class="inspect_list_info_img_text">整改后</view>
+                        </view>
+                        <view class="inspect_list_info_data_rec">
+                            <view class="inspect_list_info_data_prop_rec">问题数：<text class="color_orange">{{item.questions_number}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改数：<text class="color_green">{{item.rectification_number}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改率：<text class="color_blue">{{item.rectification_prop}}%</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改时间：<text class="color_purple">{{item.rectify_time}}</text></view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+
+</view>
+
+
+
+
+
+
+
+
+
+
+
+<view class="inspect_add_to"  bindtap="skipCheckView">
+    <view style="padding-top: 22rpx;">
+        <image src="http://fileimg.makalu.cc/WEB_73DDBFC7781A41C082FC10AB5F530472.png"></image>
+        <view>新增</view>
+    </view>
+</view>
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/safetyManagement/securityCheck/index.wxss b/miniprogram/pageage/safetyManagement/securityCheck/index.wxss
new file mode 100644
index 0000000..4292397
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheck/index.wxss
@@ -0,0 +1 @@
+/* pageage/safetyManagement/securityCheckGR/index.wxss */
diff --git a/miniprogram/pageage/safetyManagement/securityCheckGR/index.js b/miniprogram/pageage/safetyManagement/securityCheckGR/index.js
new file mode 100644
index 0000000..4c95af7
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckGR/index.js
@@ -0,0 +1,262 @@
+// pageage/safetyManagement/securityCheckGR/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        loginName:"",
+        userName:"",
+        projectId:"",
+        projectData:{},
+        projectNameArgs:"",
+        initData: {},
+
+        stateNav:1,
+        statePosit:1,
+
+        listData:[],
+        listDataed:[],
+        //常规检查总数
+        conventionNumber:0,
+        //转向检查总数
+        specialNumber:0,
+        //待整改总数
+        unRectifyNumber:0,
+        //已整改整数
+        rectifyNumber:0
+    },
+
+    // 常规检查   专项检查  选择
+    onStateSelect(e){
+        let state = e.currentTarget.dataset.state;
+        this.setData({
+            stateNav:state,
+        });
+        this.getProjectCorrespondence(app.globalData.projectId)
+    },
+
+    //待整改 已整改 选择
+    onStatePosit(e){
+        let state = e.currentTarget.dataset.state;
+        this.setData({
+            statePosit:state,
+        });
+    },
+
+    //项目切换 返回值
+    onProjectSelect(e) {
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        this.setData({
+            projectId: projectId,
+            projectName: projectName,
+        })
+        this.onLoad()
+    },
+
+    skipCheckView(){
+        let {szh} = this.data.projectData
+        wx.navigateTo({
+            url: `../addSafetyInspect/index?projectId=${szh}`,
+        })
+    },
+
+    getSaftCheckDetialsInfo(e){
+        let {id,projectId} = e.currentTarget.dataset.set
+        wx.navigateTo({
+          url: `../problemRectificationGR/index?id=${id}&projectId=${projectId}`,
+        })
+    },
+
+
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+     //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:res=>{
+          this.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectId:app.globalData.projectId,
+            projectNameArgs:app.globalData.projectName,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+          this.getProjectCorrespondence(app.globalData.projectId)
+        }
+      })
+    },
+
+
+      /**
+   * 项目对应关系
+   */
+  getProjectCorrespondence(projectId) {
+
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          projectData: res.data
+        })
+        that.getSaftCheckDataInfo()
+      }
+    })
+    },
+
+    /**
+     *  获取检查数据
+     */
+    getSaftCheckDataInfo(){
+        let that = this
+        let {szh} = that.data.projectData
+        
+        wx.request({
+            url: app.globalData.szhUrl+'/system/saftcheckissue/selectSaftCheckAllIssueDataList',
+            method:"GET",
+            data:{
+                projectId:szh,
+            },
+            header:{
+                'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+            
+                res = res.data
+                if(res.code == 200 && res.data.length > 0){
+             
+                    let listDataTemp = []
+                    let listDataTempEd = []
+                    res.data.forEach((item,index)=>{
+                        let questions_number = item.saftCheckIssueItemList.length
+                        let rectification_number   = item.saftCheckIssueItemList.filter(item=>item.status == '1').length   
+                        if(item.status == '0'){
+                           let state = 2
+                           for(let i = 0;i < item.saftCheckIssueItemList.length;i++){
+                                if(item.saftCheckIssueItemList[i].checkLoginName == that.data.loginName){
+                                    state = 1
+                                    if(item.saftCheckIssueItemList[i].status =='0'){
+                                        state = 0
+                                        break;
+                                    }    
+                                }
+                           }
+                            listDataTemp.push({
+                                id:item.id,
+                                state,
+                                status:item.status,
+                                projectId:item.projectId,
+                                checkType:item.checkType,
+                                title:item.checkTitleName+' '+item.checkTime,
+                                photo:item.saftCheckIssueItemList[0].beforeCheckUrl.split(",")[0],
+                                questions_number,
+                                rectification_number,
+                                rectification_prop: (((rectification_number / questions_number) * 100).toFixed(1) ),
+                                checkpoint:item.checkSiteName,
+                                my_receive_rectification:item.saftCheckIssueItemList.filter(item=>item.checkLoginName == that.data.loginName).length,
+                                my_already_rectification:item.saftCheckIssueItemList.filter(item=>item.checkLoginName == that.data.loginName && item.status == '1').length,
+                            }) 
+                            
+                        }else{
+                            //整改时间，取最后完成时间
+                            let rectify_time   = item.saftCheckIssueItemList.filter(item=>item.status == '1').sort((prev,next)=>new Date(next.finishTime).getTime() - new Date(prev.finishTime).getTime())[0].finishTime 
+                            listDataTempEd.push({
+                                id:item.id,
+                                status:item.status,
+                                checkType:item.checkType,
+                                title:item.checkTitleName+' '+item.checkTime,
+                                rectify_front_img:item.saftCheckIssueItemList[0].beforeCheckUrl.split(",")[0],
+                                rectify_after_img:item.saftCheckIssueItemList[0].afterCheckUrl.split(",")[0],
+                                questions_number,
+                                rectification_number,
+                                rectification_prop:(((rectification_number / questions_number) * 100).toFixed(1) ),
+                                rectify_time,
+            
+                            }) 
+                        }
+
+                    })
+                    that.setData({
+                        listData:listDataTemp.filter(item=>item.checkType == that.data.stateNav),
+                        listDataed:listDataTempEd.filter(item=>item.checkType == that.data.stateNav),
+                         //常规检查总数
+                        conventionNumber:(listDataTemp.filter(item=>item.checkType == '1').length) + (listDataTempEd.filter(item=>item.checkType == '1').length),
+                        //转向检查总数
+                        specialNumber:(listDataTemp.filter(item=>item.checkType == '2').length) + (listDataTempEd.filter(item=>item.checkType == '2').length),
+                        //待整改总数
+                        unRectifyNumber:listDataTemp.filter(item=>item.checkType == that.data.stateNav).length,
+                        //已整改整数
+                        rectifyNumber:listDataTempEd.filter(item=>item.checkType == that.data.stateNav).length
+                    })
+
+                   console.log(that.data.listData) 
+                   console.log(that.data.listDataed) 
+                }
+            }
+        })
+    },
+    
+
+    
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheckGR/index.json b/miniprogram/pageage/safetyManagement/securityCheckGR/index.json
new file mode 100644
index 0000000..6fb45ca
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckGR/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "安全检查"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml b/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml
new file mode 100644
index 0000000..fe1384c
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml
@@ -0,0 +1,111 @@
+    <!--pageage/safetyManagement/securityCheckGR/index.wxml-->
+    <van-sticky offset-top="{{ 0 }}">
+        <view style="background: #191d28;">
+            <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+            <view class="modify_video_nav">
+                <view class="{{stateNav==1?'active':''}}" bindtap="onStateSelect" data-state="1"><text>常规检查({{conventionNumber}})</text></view>
+                <view class="{{stateNav==2?'active':''}}" bindtap="onStateSelect" data-state="2"><text>专项检查({{specialNumber}})</text></view>
+            </view>
+        </view>
+    </van-sticky>
+    <view class="deep_point_position" style="padding:40rpx 0 0">
+        <view class="{{statePosit == 1?'active':''}}" bindtap="onStatePosit" data-state="1">待整改(<text>{{unRectifyNumber}}</text>)</view>
+        <view class="{{statePosit == 2?'active':''}}" bindtap="onStatePosit" data-state="2">已整改(<text>{{rectifyNumber}}</text>)</view>
+    </view>
+    <view class="inspect_max" wx:if="{{statePosit == 1}}">
+        <view class="module_title module_title_flex">
+            <view>常规检查待整改列表</view>
+            <!-- <view class="module_see_info" bindtap="goEducations"><van-icon name="filter-o" />筛选</view> -->
+        </view>
+        <view class="inspect_list">
+            <view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getSaftCheckDetialsInfo">
+                <view class="inspect_for_bgd">
+                    <view class="inspect_list_title">
+                        <view class="inspect_list_title_label inspect_list_title_width">
+                            <view class="inspect_list_title_number">{{index < 10 ?'0'+(index+1):(index+1)}}</view>
+                            <view class="inspect_list_title_text">{{item.title}}</view>
+                        </view>
+                        <view class="inspect_list_title_state">
+                            <text class="state_colour_0" wx:if="{{item.state == 0}}">待我整改</text>
+                            <text class="state_colour_1" wx:if="{{item.state == 1}}">我已整改</text>
+                            <text class="state_colour_2" wx:if="{{item.state == 2}}">无需整改</text>
+                        </view>
+                    </view>
+                    <view class="inspect_list_info">
+                        <view class="inspect_list_info_details">
+                            <view class="inspect_list_info_img">
+                                <van-image width="120rpx" height="120rpx" fit="cover" src="{{item.photo}}"/>
+                            </view>
+                            <view class="inspect_list_info_data">
+                                <view class="inspect_list_info_data_num">
+                                    <view class="inspect_list_info_data_num_option">问题数：<text class="color_orange">{{item.questions_number}}</text></view>
+                                    <view class="inspect_list_info_data_num_option">整改数：<text class="color_green">{{item.rectification_number}}</text></view>
+                                </view>
+                                <view class="inspect_list_info_data_prop">整改率：<text class="color_blue">{{item.rectification_prop}}%</text></view>
+                            </view>
+                        </view>
+                        <view class="inspect_list_info_position">检查部位：<text class="color_purple">{{item.checkpoint}}</text></view>
+                    </view>
+                </view>
+                <view class="inspect_list_info_data_num inspect_list_info_data_bgd">
+                    <view class="inspect_list_info_data_num_option">我收到整改：<text class="color_orange">{{item.my_receive_rectification}}</text></view>
+                    <view class="inspect_list_info_data_num_option">我已整改：<text class="color_green">{{item.my_already_rectification}}</text></view>
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <view class="inspect_max" wx:if="{{statePosit == 2}}">
+    <view class="module_title module_title_flex">
+        <view>常规检查已整改列表</view>
+        <!-- <view class="module_see_info" bindtap="goEducations"><van-icon name="filter-o" />筛选</view> -->
+    </view>
+
+    <view class="inspect_list">
+        <view class="inspect_for" wx:for="{{listDataed}}" wx:key="index" data-set="{{item}}" bindtap="getSaftCheckDetialsInfo">
+            <view class="inspect_for_bgd">
+                <view class="inspect_list_title">
+                    <view class="inspect_list_title_label">
+                        <view class="inspect_list_title_number">{{index < 10 ?'0'+(index+1):(index+1)}}</view>
+                        <view class="inspect_list_title_text">{{item.title}}</view>
+                    </view>
+                   
+                </view>
+                <view class="inspect_list_info">
+                    <view class="inspect_list_info_details">
+                        <view class="inspect_list_info_img">
+                            <van-image width="130rpx" height="130rpx" fit="cover" src="{{item.rectify_front_img}}"/>
+                            <view class="inspect_list_info_img_text">整改前</view>
+                        </view>
+                        <view class="inspect_list_info_img">
+                            <van-image width="130rpx" height="130rpx" fit="cover" src="{{item.rectify_after_img}}"/>
+                            <view class="inspect_list_info_img_text">整改后</view>
+                        </view>
+                        <view class="inspect_list_info_data_rec">
+                            <view class="inspect_list_info_data_prop_rec">问题数：<text class="color_orange">{{item.questions_number}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改数：<text class="color_green">{{item.rectification_number}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改率：<text class="color_blue">{{item.rectification_prop}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改时间：<text class="color_purple">{{item.rectify_time}}</text></view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+
+</view>
+
+<view class="inspect_add_to" bindtap="skipCheckView">
+    <view style="padding-top: 22rpx;">
+        <image src="http://fileimg.makalu.cc/WEB_73DDBFC7781A41C082FC10AB5F530472.png"></image>
+        <view>新增</view>
+    </view>
+</view>
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxss b/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxss
new file mode 100644
index 0000000..e16964f
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxss
@@ -0,0 +1 @@
+/* pageage/safetyManagement/securityCheckGR/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheckRectified/index.js b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.js
new file mode 100644
index 0000000..09219f2
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.js
@@ -0,0 +1,130 @@
+// pageage/safetyManagement/securityCheckRectified/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        stateNav:1,
+        statePosit:2,
+
+        listData:[
+            {
+                title:'周检1 2023-04-15',
+                rectify_front_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                rectify_after_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                questions_number:6,
+                rectification_number:3,
+                rectification_prop:100,
+                rectify_time:'2023-05-10'
+            },
+            {
+                title:'周检2 2023-04-15',
+                rectify_front_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                rectify_after_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                questions_number:6,
+                rectification_number:3,
+                rectification_prop:100,
+                rectify_time:'2023-05-10'
+            },
+            {
+                title:'周检3 2023-04-15',
+                rectify_front_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                rectify_after_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                questions_number:6,
+                rectification_number:3,
+                rectification_prop:100,
+                rectify_time:'2023-05-10'
+            },
+            {
+                title:'周检3 2023-04-15',
+                rectify_front_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                rectify_after_img:'https://img.yzcdn.cn/vant/cat.jpeg',
+                questions_number:6,
+                rectification_number:3,
+                rectification_prop:100,
+                rectify_time:'2023-05-10'
+            },
+        ]
+
+
+
+    },
+
+    // 常规检查   专项检查  选择
+    onStateSelect(e){
+        let state = e.currentTarget.dataset.state;
+        this.setData({
+            stateNav:state,
+        });
+    },
+
+    //待整改 已整改 选择
+    onStatePosit(e){
+        let state = e.currentTarget.dataset.state;
+        this.setData({
+            statePosit:state,
+        });
+    },
+
+    //项目切换 返回值
+    onProjectSelect(e) {
+        console.log(e)
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheckRectified/index.json b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.json
new file mode 100644
index 0000000..6fb45ca
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "安全检查"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxml b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxml
new file mode 100644
index 0000000..6c4434b
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxml
@@ -0,0 +1,53 @@
+<!--pageage/safetyManagement/securityCheckRectified/index.wxml-->
+<van-sticky offset-top="{{ 0 }}">
+    <view style="background: #191d28;">
+        <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+        <view class="modify_video_nav">
+            <view class="{{stateNav==1?'active':''}}" bindtap="onStateSelect" data-state="1"><text>常规检查({{1}})</text></view>
+            <view class="{{stateNav==2?'active':''}}" bindtap="onStateSelect" data-state="2"><text>专项检查({{2}})</text></view>
+        </view>
+    </view>
+</van-sticky>
+<view class="deep_point_position" style="padding:40rpx 0 0">
+    <view class="{{statePosit == 1?'active':''}}" bindtap="onStatePosit" data-state="1">待整改(<text>{{1}}</text>)</view>
+    <view class="{{statePosit == 2?'active':''}}" bindtap="onStatePosit" data-state="2">已整改(<text>{{22}}</text>)</view>
+</view>
+<view class="inspect_max">
+    <view class="module_title module_title_flex">
+        <view>常规检查已整改列表</view>
+        <view class="module_see_info" bindtap="goEducations"><van-icon name="filter-o" />筛选</view>
+    </view>
+
+    <view class="inspect_list">
+        <view class="inspect_for" wx:for="{{listData}}" wx:key="index">
+            <view class="inspect_for_bgd">
+                <view class="inspect_list_title">
+                    <view class="inspect_list_title_label inspect_list_title_width">
+                        <view class="inspect_list_title_number">{{index < 10 ?'0'+(index+1):(index+1)}}</view>
+                        <view class="inspect_list_title_text">{{item.title}}</view>
+                    </view>
+                </view>
+                <view class="inspect_list_info">
+                    <view class="inspect_list_info_details">
+                        <view class="inspect_list_info_img">
+                            <van-image width="130rpx" height="130rpx" fit="cover" src="{{item.rectify_front_img}}"/>
+                            <view class="inspect_list_info_img_text">整改前</view>
+                        </view>
+                        <view class="inspect_list_info_img">
+                            <van-image width="130rpx" height="130rpx" fit="cover" src="{{item.rectify_after_img}}"/>
+                            <view class="inspect_list_info_img_text">整改后</view>
+                        </view>
+                        <view class="inspect_list_info_data_rec">
+                            <view class="inspect_list_info_data_prop_rec">问题数：<text class="color_orange">{{item.questions_number}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改数：<text class="color_green">{{item.rectification_number}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改率：<text class="color_blue">{{item.rectification_prop}}</text></view>
+                            <view class="inspect_list_info_data_prop_rec">整改时间：<text class="color_purple">{{item.rectify_time}}</text></view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+
+</view>
diff --git a/miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxss b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxss
new file mode 100644
index 0000000..962c24e
--- /dev/null
+++ b/miniprogram/pageage/safetyManagement/securityCheckRectified/index.wxss
@@ -0,0 +1 @@
+/* pageage/safetyManagement/securityCheckRectified/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingAddRetestingDeliver/index.js b/miniprogram/pageage/samplingAddRetestingDeliver/index.js
new file mode 100644
index 0000000..b1a57d9
--- /dev/null
+++ b/miniprogram/pageage/samplingAddRetestingDeliver/index.js
@@ -0,0 +1,274 @@
+
+// pageage/samplingRetestingDeliver/index.js
+const app = getApp()
+
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        educationTypeList:[
+            {
+                text:'项目11',
+                id:'1'
+            },
+            {
+                text:'项目22',
+                id:'2'
+            },
+        ],
+        id:"",
+        projectId:"",
+        retestListData:[],
+        retestDataInfo:{},
+        maxDate:new Date(2100,1,1).getTime(),
+        typeFlag:"1",
+		inspectionTime:"",
+        sampleTime:"",
+        loadShow:false
+    },
+
+    /**
+     * 获取复试类型数据
+     */
+    getRetestListChange(){
+        let retestListData = []
+        var that = this
+        wx.request({
+            url: app.globalData.szhUrl + '/system/dict/data/listData',
+            method:"post",
+            data:{
+                dictType:"fslx_value"
+            },
+           header: {
+               'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+           },
+           success(res){
+               if(res.data.code == 0){
+                   let {rows} =  res.data
+                   rows.forEach(item=>{
+                        retestListData.push({
+                            id:item.dictValue,
+                            text:item.dictLabel
+                        })
+                   })
+                   that.setData({
+                      retestListData
+                   })
+               }
+           }
+          })
+    },
+
+    /**
+     * 选择复试类型类型
+     */
+    onRetestListChange(e){
+        let {id} = e.detail
+        this.setData({
+            typeFlag:id
+        })
+    },
+    /**
+     * 选择送检时间
+     */
+    onInspectionTime(e){
+    
+        let value = e.detail
+       
+        this.setData({
+            inspectionTime:value
+        })  
+	},
+	/**
+	 * 选择取样时间
+	 */
+	onSampleTime(e){
+		let value = e.detail
+		this.setData({
+			sampleTime:value
+		})
+    },
+    add_btn_qx(e){
+        wx.navigateTo({
+          url: '../samplingRetesting/index',
+        })
+    },
+    /**
+    *   数据提交
+    */
+    formSubmit(e){
+        let that = this
+		let {laboratoryName,materialName,positionName,qualifiedFlag,represenNum,sampleBy,sampleNum,witnessBy} = e.detail.value
+        let {id,projectId,inspectionTime,typeFlag,sampleTime} = this.data
+        //数据校验
+        if(!that.checkRetestDataInfo(e.detail.value,this.data)){
+            return;
+        }
+        that.setData({
+            loadShow:true
+        })
+		wx.request({
+            url: app.globalData.szhUrl + '/system/retestinfo/add',
+            method:"Post",
+            data:{
+				//部门id
+				deptId:131,
+				//项目id
+				projectId,
+				//取样类型
+				typeFlag,
+				//取样时间
+				sampleTime,
+				//送检时间
+				inspectionTime,
+				//实验室名称
+				laboratoryName,
+				//物料名称
+				materialName,
+				//使用部位
+				positionName,
+				//是否提供合格证
+				qualifiedFlag,
+				//代表数量
+				represenNum,
+				//取样人
+				sampleBy,
+				//取样数量(组)
+				sampleNum,
+				//见证人
+                witnessBy,
+                //状态
+                resultStr:'待检'
+            },
+            header:{
+              'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                that.setData({
+                    loadShow:false
+                })
+               if(res.code == "0"){
+                app.toast("保存成功!")
+               }     
+               setTimeout(()=>{
+                   wx.navigateTo({
+                     url: '../samplingRetesting/index',
+                   })
+               },1200)
+			}
+		})
+		console.log(e);
+    },
+
+
+    /**
+     * 数据校验
+     * @param {}} options 
+     */
+    checkRetestDataInfo({laboratoryName,materialName,positionName,qualifiedFlag,represenNum,sampleBy,sampleNum,witnessBy},{inspectionTime,typeFlag,sampleTime}){
+    
+        if(!laboratoryName || laboratoryName.length <= 0){
+            app.toast("实验室名称不能为空!")
+            return false;
+        }
+
+        if(!materialName || materialName.length <= 0){
+            app.toast("物料名称不能为空!")
+            return false;
+        }
+
+        if(!positionName || positionName.length <= 0){
+            app.toast("使用部位名称不能为空!")
+            return false;
+        }
+
+        if(!qualifiedFlag || qualifiedFlag.length <= 0){
+            app.toast("是否提供合格证不能为空!")
+            return false;
+        }
+        if(!sampleNum || sampleNum.length <=0){
+            app.toast("实验室名称不能为空!")
+            return false;
+        }
+
+        if(!represenNum || represenNum.length <= 0){
+            app.toast("取样数量不能为空!")
+            return false;
+        }
+
+        if(!sampleBy || sampleBy.length <= 0){
+            app.toast("取样人名称不能为空!")
+            return false;
+        }
+
+        if(!witnessBy || witnessBy.length <= 0){
+            app.toast("见证人名称不能为空!")
+            return false;
+        }
+
+        if(!inspectionTime || inspectionTime.length <= 0){
+            app.toast("送检时间不能为空!")
+            return false;
+        }
+
+        if(!typeFlag || typeFlag.length <= 0){
+            app.toast("复试类型不能为空!")
+            return false;
+        }
+
+        if(!sampleTime || sampleTime.length <= 0){
+            app.toast("送检时间不能为空!")
+            return false;
+        }
+        return true
+    },
+
+
+
+
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let {szhId} = options;
+        this.setData({
+           projectId:szhId
+        })
+        this.getRetestListChange()
+    },
+    
+
+
+
+    /**
+     * 置换名称
+     */
+    convertRetesingName(item){
+        let typeName = ""
+        let typeFlag = item.typeFlag
+        switch(typeFlag){
+            case 1:
+                typeName = "钢筋原材料取样复试"
+                break;
+            case 2:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 3:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 4:
+                typeName = "混凝土试件取样复试"
+                break;
+            case 5:
+                typeName = "混凝土试件取样复试"
+                break;
+                
+        }
+        return typeName;
+    },
+   
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingAddRetestingDeliver/index.json b/miniprogram/pageage/samplingAddRetestingDeliver/index.json
new file mode 100644
index 0000000..4615fcd
--- /dev/null
+++ b/miniprogram/pageage/samplingAddRetestingDeliver/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "去送检"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingAddRetestingDeliver/index.wxml b/miniprogram/pageage/samplingAddRetestingDeliver/index.wxml
new file mode 100644
index 0000000..d5e3378
--- /dev/null
+++ b/miniprogram/pageage/samplingAddRetestingDeliver/index.wxml
@@ -0,0 +1,114 @@
+<!--pageage/samplingRetestingDeliver/index.wxml-->
+
+<view> 
+
+<form catchsubmit="formSubmit">
+   <!-- <view class="add_max">
+        <view class="add_title">项目名称</view>
+        <voucher-select columns="{{educationTypeList}}"
+        placeholder="请选择" bindchange=""></voucher-select>
+  </view> -->
+  <view class="add_max">
+      <view class="add_title">复试类型</view>
+      <voucher-select columns="{{retestListData}}"
+      placeholder="请选择" bindchange="onRetestListChange"></voucher-select>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">材料名称</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="materialName" placeholder-style="color:#6777aa;"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">使用部位</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="positionName" placeholder-style="color:#6777aa;"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">取样数量(组)</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="sampleNum" placeholder-style="color:#6777aa;" />
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">是否提供合格证</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="qualifiedFlag" placeholder-style="color:#6777aa;" />
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">代表数量</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="represenNum" placeholder-style="color:#6777aa;"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">取样人</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="sampleBy" placeholder-style="color:#6777aa;"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">取样时间</view>
+        <voucher-date counts="5" name="sampleTime" placeholder="开始时间" maxDate="{{maxDate}}" time="{{defaultTime}}" bindchange="onSampleTime"></voucher-date>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">见证人</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="witnessBy" placeholder-style="color:#6777aa;"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">实验室名称</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="laboratoryName" placeholder-style="color:#6777aa;"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">送检时间</view>
+        <voucher-date counts="5" name="inspectionTime" placeholder="开始时间" maxDate="{{maxDate}}" time="{{defaultTime}}" bindchange="onInspectionTime"></voucher-date>
+    </view>
+
+    <view class="add_btn" style="padding:50rpx 0;">
+        <view class="add_btn_qx" bindtap="add_btn_qx">取消</view>
+        <view     class="add_btn_bc">
+        <button   class="add_btn_bc" style="width: 220rpx;line-height: 50rpx;border-radius: 10rpx;color:#fff;font-weight: 400;"  form-type="submit">保存</button>
+       </view>
+    </view>
+</form>
+  
+
+</view>
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingAddRetestingDeliver/index.wxss b/miniprogram/pageage/samplingAddRetestingDeliver/index.wxss
new file mode 100644
index 0000000..cb3c03d
--- /dev/null
+++ b/miniprogram/pageage/samplingAddRetestingDeliver/index.wxss
@@ -0,0 +1 @@
+/* pageage/samplingRetestingDeliver/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetesting/index.js b/miniprogram/pageage/samplingRetesting/index.js
new file mode 100644
index 0000000..52f8499
--- /dev/null
+++ b/miniprogram/pageage/samplingRetesting/index.js
@@ -0,0 +1,283 @@
+// pageage/safetyManagement/securityCheckRectified/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        statePosit:1,
+
+        //state  1 待送检   2  检验中   3  已完成
+        //result 0 未完成 1 合格   2 不合格
+        listData:[
+           
+        ],
+        //待送检数组
+        prepareDataList:[],
+        //检验中数组
+        underwayDataList:[],
+        //已完成数组
+        finishDataList:[],
+        //项目id
+        projectId:"",
+        //项目名称
+        projectName:"",
+        initData:{},
+        userName:"",
+        loginName:"",
+        //加载状态
+		loadShow:false,
+		
+    },
+
+
+    //待送检 检验中 已完成  选择
+    onStatePosit(e){
+        let {prepareDataList,underwayDataList,finishDataList} = this.data
+        let state = e.currentTarget.dataset.state;
+        this.setData({
+            statePosit:state,
+            listData: state == '1' ? prepareDataList : state == '2' ? underwayDataList : finishDataList
+        });
+    },
+
+    //项目切换 返回值
+    onProjectSelect(e) {
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        this.setData({
+            projectId,
+            projectName
+        })
+        this.onLoad()
+    },
+
+    //去送检
+    onGoInspection(e){
+        let {id} = e.currentTarget.dataset.set
+        let {szh} = this.data.projectData
+        wx.navigateTo({
+            url: `../../pageage/samplingRetestingDeliver/index?id=${id}&projectId=${szh}`
+        })
+    },
+
+    //凭证上传
+    onUpload(e){
+        let {id} = e.currentTarget.dataset.set
+        let {szh} = this.data.projectData
+        wx.navigateTo({
+            url: `../../pageage/samplingRetestingUpload/index?id=${id}&projectId=${szh}&detailFlag=0`
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        //获取缓存数据
+        wx.getStorage({
+            key: 'userinfo',
+            success:res=>{
+            this.setData({
+                loginName:res.data.loginName,
+                userName:res.data.userName,
+                initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+            })  
+            this.getProjectCorrespondence(app.globalData.projectId)
+            }
+        })  
+    },
+
+     /**
+    * 项目对应关系
+    */
+    getProjectCorrespondence(projectId) {
+        var that = this;
+        wx.request({
+        url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+        data: {
+            "projectId": projectId,
+        },
+        method: "get",
+        success: function (res) {
+            that.setData({
+            projectData: res.data
+            })
+            //数据请求
+            that.getSamplingRetesDataInfo()
+        }
+        })
+    },
+
+    getSamplingRetesDataInfo(){
+        let that = this
+        that.setData({
+          loadShow:true
+        })
+        let {szh} = that.data.projectData
+        wx.request({
+          url: app.globalData.szhUrl + '/system/retestinfo/list',
+          method:"POST",
+          data:{
+            projectId:szh,
+            pageSize:99999
+          },
+          header:{
+            'content-type': 'application/x-www-form-urlencoded'  
+          },
+          success(res){
+            that.setData({
+              loadShow:false
+            })
+            res = res.data
+            let  prepareDataList = []
+            let  underwayDataList = []
+            let  finishDataList = []
+            res.rows.forEach(item=>{
+                if(item.resultStr.indexOf('待检') >= 0 ){
+                    prepareDataList.push({
+                        id:item.id,
+                        title:that.convertRetesingName(item),
+                        material_name:item.materialName == null ? "":item.materialName,
+                        received_quantity:item.approach_number == null ? 0:item.approach_number,
+                        received_time:item.approach_time == null ? "":item.approach_time,
+                        state:1,
+                        result:1
+                    })
+                }else if(item.resultStr.indexOf('已送样') >= 0 || item.resultStr.indexOf('标养中') >= 0){
+                    underwayDataList.push({
+                        id:item.id,
+                        title:that.convertRetesingName(item),
+                        material_name:item.materialName == null ? "":item.materialName,
+                        received_quantity:item.approach_number == null ? 0:item.approach_number,
+                        received_time:item.approach_time == null ? "":item.approach_time,
+                        state:2,
+                        result:1
+                    })
+                }else{
+                    finishDataList.push({
+                        id:item.id,
+                        title:that.convertRetesingName(item),
+                        material_name:item.materialName == null ? "":item.materialName,
+                        received_quantity:item.approach_number == null ? 0:item.approach_number,
+                        received_time:item.approach_time == null ? "":item.approach_time,
+                        state:3,
+                        result:1
+                    })
+                }
+            })
+            that.setData({
+                 //待送检数
+                 prepareDataList,
+                //检验中数
+                underwayDataList,
+                //已完成数
+                finishDataList,
+                //数据
+                listData:prepareDataList 
+            })
+          }
+        })
+    },
+
+    /**
+     * 置换名称
+     */
+    convertRetesingName(item){
+        let typeName = ""
+        let typeFlag = item.typeFlag
+        switch(typeFlag){
+            case 1:
+                typeName = "钢筋原材料取样复试"
+                break;
+            case 2:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 3:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 4:
+                typeName = "混凝土试件取样复试"
+                break;
+            case 5:
+                typeName = "混凝土试件取样复试"
+                break;
+                
+        }
+        return typeName;
+	},
+	//跳转添加凭证管理页面
+	skipCheckView(){
+		let {szh} = this.data.projectData
+		wx.navigateTo({
+		  url: `../samplingAddRetestingDeliver/index?szhId=${szh}`,
+		})
+	},
+
+	//跳转详情凭证页面
+	skipDetialsFinishView(e){
+		let statePosit = this.data.statePosit
+		if(statePosit == 3){
+			let {id} = e.currentTarget.dataset.set
+			let {szh} = this.data.projectData
+			wx.navigateTo({
+				url: `../samplingRetestingDetail/index?id=${id}&projectId=${szh}`
+			})
+		}
+	},
+
+
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetesting/index.json b/miniprogram/pageage/samplingRetesting/index.json
new file mode 100644
index 0000000..097e578
--- /dev/null
+++ b/miniprogram/pageage/samplingRetesting/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "取样复试管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetesting/index.wxml b/miniprogram/pageage/samplingRetesting/index.wxml
new file mode 100644
index 0000000..7b7472b
--- /dev/null
+++ b/miniprogram/pageage/samplingRetesting/index.wxml
@@ -0,0 +1,60 @@
+<!--pageage/samplingRetesting/index.wxml-->
+<!-- <van-sticky offset-top="{{ 0 }}"> -->
+    <view style="background: #191d28;margin-top: 20rpx;">
+        <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+    </view>
+<!-- </van-sticky> -->
+<view class="deep_point_position" style="padding:40rpx 0 0">
+    <view class="{{statePosit == 1?'active':''}}" bindtap="onStatePosit" data-state="1">待送检(<text>{{prepareDataList.length}}</text>)</view>
+    <view class="{{statePosit == 2?'active':''}}" bindtap="onStatePosit" data-state="2">检验中(<text>{{underwayDataList.length}}</text>)</view>
+    <view class="{{statePosit == 3?'active':''}}" bindtap="onStatePosit" data-state="3">已完成(<text>{{finishDataList.length}}</text>)</view>
+</view>
+<view class="inspect_max">
+    <view class="module_title module_title_flex">
+        <view>取样复试列表</view>
+        <!-- <view class="module_see_info" bindtap="goEducations"><van-icon name="filter-o" />筛选</view> -->
+    </view>
+
+    <view class="inspect_list">
+        <view class="inspect_for" wx:for="{{listData}}" wx:key="index">
+            <view class="inspect_for_bgd">
+                <view class="inspect_list_title">
+                    <view class="inspect_list_title_label">
+                        <view class="inspect_list_title_number">{{index < 10 ?'0'+(index+1):(index+1)}}</view>
+                        <view class="inspect_list_title_text">{{item.title}}</view>
+                    </view>
+                    <view class="inspect_list_title_state">
+                        <text class="state_colour_1" wx:if="{{item.state == 3 && item.result == 1}}">合格</text>
+                        <text class="state_colour_0" wx:if="{{item.state == 3 && item.result == 2}}">不合格</text>
+                    </view>
+                </view>
+                <view class="inspect_list_info" bindtap="skipDetialsFinishView" data-set="{{item}}">
+                    <view class="inspect_list_info_padding">材料名称：<text class="color_blue">{{item.material_name}}</text></view>
+                    <view class="inspect_list_info_padding">收料数量：<text class="color_purple">{{item.received_quantity}}</text></view>
+                    <view class="inspect_list_info_padding inspect_list_info_flex">
+                        <view>收料时间：<text class="color_purple">{{item.received_time}}</text></view>
+                        <view class="inspect_list_info_upload" wx:if="{{item.state == 1}}" data-set="{{item}}" bindtap="onGoInspection">去送检</view>
+                        <view class="inspect_list_info_upload" wx:if="{{item.state == 2}}" data-set="{{item}}" bindtap="onUpload">凭证上传</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+
+</view>
+
+
+<view class="inspect_add_to"  bindtap="skipCheckView">
+    <view style="padding-top: 22rpx;">
+        <image src="http://fileimg.makalu.cc/WEB_73DDBFC7781A41C082FC10AB5F530472.png"></image>
+        <view>新增</view>
+    </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
diff --git a/miniprogram/pageage/samplingRetesting/index.wxss b/miniprogram/pageage/samplingRetesting/index.wxss
new file mode 100644
index 0000000..1473e4c
--- /dev/null
+++ b/miniprogram/pageage/samplingRetesting/index.wxss
@@ -0,0 +1 @@
+/* pageage/samplingRetesting/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingDeliver/index.js b/miniprogram/pageage/samplingRetestingDeliver/index.js
new file mode 100644
index 0000000..54a66b5
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDeliver/index.js
@@ -0,0 +1,335 @@
+// pageage/samplingRetestingDeliver/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        educationTypeList:[
+            {
+                text:'项目11',
+                id:'1'
+            },
+            {
+                text:'项目22',
+                id:'2'
+            },
+        ],
+        id:"",
+        projectId:"",
+        retestListData:[],
+        retestDataInfo:{},
+        maxDate:new Date(2100,1,1).getTime(),
+        typeFlag:"",
+		inspectionTime:"",
+        sampleTime:"",
+        loadShow:false
+    },
+
+    /**
+     * 获取复试类型数据
+     */
+    getRetestListChange(e){
+
+
+        let retestListData = []
+        var that = this
+        wx.request({
+            url: app.globalData.szhUrl + '/system/dict/data/listData',
+            method:"post",
+            data:{
+                dictType:"fslx_value"
+            },
+           header: {
+               'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+           },
+           success(res){
+               if(res.data.code == 0){
+                   let {rows} =  res.data
+                   rows.forEach(item=>{
+                        retestListData.push({
+                            id:item.dictValue,
+                            text:item.dictLabel
+                        })
+                   })
+                   that.setData({
+                      retestListData
+                   })
+                   that.getRetestDetaiilsInfo()
+               }
+           }
+          })
+    },
+
+    /**
+     * 选择复试类型类型
+     */
+    onRetestListChange(e){
+        let {id} = e.detail
+        this.setData({
+            typeFlag:id
+        })
+    },
+    /**
+     * 选择送检时间
+     */
+    onInspectionTime(e){
+    
+        let value = e.detail
+       
+        this.setData({
+            inspectionTime:value
+        })  
+	},
+	/**
+	 * 选择取样时间
+	 */
+	onSampleTime(e){
+		let value = e.detail
+		this.setData({
+			sampleTime:value
+		})
+    },
+    add_btn_qx(e){
+        wx.navigateTo({
+          url: '../samplingRetesting/index',
+        })
+    },
+    /**
+    *   数据提交
+    */
+    formSubmit(e){
+        let that = this
+		let {laboratoryName,materialName,positionName,qualifiedFlag,represenNum,sampleBy,sampleNum,witnessBy} = e.detail.value
+        let {id,projectId,inspectionTime,typeFlag,sampleTime} = this.data
+        //数据校验
+        if(!that.checkRetestDataInfo(e.detail.value,this.data)){
+            return;
+        }
+        that.setData({
+            loadShow:true
+        })
+		wx.request({
+            url: app.globalData.szhUrl + '/system/retestinfo/edit',
+            method:"Post",
+            data:{
+				id,
+				//项目id
+				projectId,
+				//取样类型
+				typeFlag,
+				//取样时间
+				sampleTime,
+				//送检时间
+				inspectionTime,
+				//实验室名称
+				laboratoryName,
+				//物料名称
+				materialName,
+				//使用部位
+				positionName,
+				//是否提供合格证
+				qualifiedFlag,
+				//代表数量
+				represenNum,
+				//取样人
+				sampleBy,
+				//取样数量(组)
+				sampleNum,
+				//见证人
+                witnessBy,
+                //状态
+                resultStr:'标样中'
+            },
+            header:{
+              'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                that.setData({
+                    loadShow:false
+                })
+               if(res.code == "0"){
+                app.toast("保存成功!")
+               }     
+               setTimeout(()=>{
+                   wx.navigateTo({
+                     url: '../samplingRetesting/index',
+                   })
+               },1200)
+			}
+		})
+		console.log(e);
+    },
+
+
+    /**
+     * 数据校验
+     * @param {}} options 
+     */
+    checkRetestDataInfo({laboratoryName,materialName,positionName,qualifiedFlag,represenNum,sampleBy,sampleNum,witnessBy},{inspectionTime,typeFlag,sampleTime}){
+    
+        if(!laboratoryName || laboratoryName.length <= 0){
+            app.toast("实验室名称不能为空!")
+            return false;
+        }
+
+        if(!materialName || materialName.length <= 0){
+            app.toast("物料名称不能为空!")
+            return false;
+        }
+
+        if(!positionName || positionName.length <= 0){
+            app.toast("使用部位名称不能为空!")
+            return false;
+        }
+
+        if(!qualifiedFlag || qualifiedFlag.length <= 0){
+            app.toast("是否提供合格证不能为空!")
+            return false;
+        }
+        if(!sampleNum || sampleNum.length <=0){
+            app.toast("实验室名称不能为空!")
+            return false;
+        }
+
+        if(!represenNum || represenNum.length <= 0){
+            app.toast("取样数量不能为空!")
+            return false;
+        }
+
+        if(!sampleBy || sampleBy.length <= 0){
+            app.toast("取样人名称不能为空!")
+            return false;
+        }
+
+        if(!witnessBy || witnessBy.length <= 0){
+            app.toast("见证人名称不能为空!")
+            return false;
+        }
+
+        if(!inspectionTime || inspectionTime.length <= 0){
+            app.toast("送检时间不能为空!")
+            return false;
+        }
+
+        if(!typeFlag || typeFlag.length <= 0){
+            app.toast("复试类型不能为空!")
+            return false;
+        }
+
+        if(!sampleTime || sampleTime.length <= 0){
+            app.toast("送检时间不能为空!")
+            return false;
+        }
+        return true
+    },
+
+
+
+
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let {id,projectId} = options;
+        this.setData({
+            id,projectId
+        })
+        this.getRetestListChange()
+    },
+    
+
+    /**
+     * 获取复试回显信息
+     */
+    getRetestDetaiilsInfo(){
+        let that = this
+        let {projectId,id} = this.data
+        wx.request({
+            url: app.globalData.szhUrl + '/system/retestinfo/getRetestInfoById',
+            method:"Get",
+            data:{
+              projectId,
+              id
+            },
+            header:{
+              'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                res = res.data
+                res.data.typeFlagName = that.convertRetesingName(res.data)
+                that.setData({
+                    typeFlag: res.data.typeFlag,
+                    inspectionTime:res.data.inspectionTime,
+                    sampleTime:res.data.sampleTime,
+                    retestDataInfo:res.data
+                }) 
+            }
+        })
+    },
+
+    /**
+     * 置换名称
+     */
+    convertRetesingName(item){
+        let typeName = ""
+        let typeFlag = item.typeFlag
+        this.data.retestListData.forEach(item1=>{
+            if(typeFlag == item1.id){
+                typeName = item1.text
+            }
+        })    
+        return typeName
+    
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingDeliver/index.json b/miniprogram/pageage/samplingRetestingDeliver/index.json
new file mode 100644
index 0000000..4615fcd
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDeliver/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "去送检"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingDeliver/index.wxml b/miniprogram/pageage/samplingRetestingDeliver/index.wxml
new file mode 100644
index 0000000..c79e3c7
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDeliver/index.wxml
@@ -0,0 +1,114 @@
+<!--pageage/samplingRetestingDeliver/index.wxml-->
+
+<view> 
+    <!-- <view class="add_max">
+        <view class="add_title">项目名称</view>
+        <voucher-select columns="{{educationTypeList}}"
+        placeholder="请选择" bindchange=""></voucher-select>
+    </view> -->
+<form catchsubmit="formSubmit">
+
+  <view class="add_max">
+      <view class="add_title">复试类型</view>
+      <voucher-select columns="{{retestListData}}"
+      placeholder="请选择" bindchange="onRetestListChange" value="{{retestDataInfo.typeFlagName}}"></voucher-select>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">材料名称</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="materialName" placeholder-style="color:#6777aa;" value="{{retestDataInfo.materialName}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">使用部位</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="positionName" placeholder-style="color:#6777aa;" value="{{retestDataInfo.positionName}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">取样数量(组)</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="sampleNum" placeholder-style="color:#6777aa;" value="{{retestDataInfo.sampleNum}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">是否提供合格证</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="qualifiedFlag" placeholder-style="color:#6777aa;" value="{{retestDataInfo.qualifiedFlag}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">代表数量</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="represenNum" placeholder-style="color:#6777aa;"  value="{{retestDataInfo.represenNum}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">取样人</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="sampleBy" placeholder-style="color:#6777aa;" value="{{retestDataInfo.sampleBy}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">取样时间</view>
+        <voucher-date counts="5" name="sampleTime" placeholder="开始时间" maxDate="{{maxDate}}" time="{{defaultTime}}" bindchange="onSampleTime" value="{{retestDataInfo.sampleTime}}"></voucher-date>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">见证人</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="witnessBy" placeholder-style="color:#6777aa;" value="{{retestDataInfo.witnessBy}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+      <view class="add_title">实验室名称</view>
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请填写" name="laboratoryName" placeholder-style="color:#6777aa;" value="{{retestDataInfo.laboratoryName}}"/>
+        </view>
+      </view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">送检时间</view>
+        <voucher-date counts="5" name="inspectionTime" placeholder="开始时间" maxDate="{{maxDate}}" time="{{defaultTime}}" bindchange="onInspectionTime" value="{{retestDataInfo.inspectionTime}}"></voucher-date>
+    </view>
+
+    <view class="add_btn" style="padding:50rpx 0;">
+        <view class="add_btn_qx" bindtap="add_btn_qx">取消</view>
+        <view     class="add_btn_bc">
+        <button   class="add_btn_bc" style="width: 220rpx;line-height: 50rpx;border-radius: 10rpx;color:#fff;font-weight: 400;"  form-type="submit">保存</button>
+       </view>
+    </view>
+</form>
+  
+
+</view>
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingDeliver/index.wxss b/miniprogram/pageage/samplingRetestingDeliver/index.wxss
new file mode 100644
index 0000000..cb3c03d
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDeliver/index.wxss
@@ -0,0 +1 @@
+/* pageage/samplingRetestingDeliver/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingDetail/index.js b/miniprogram/pageage/samplingRetestingDetail/index.js
new file mode 100644
index 0000000..d3d0256
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDetail/index.js
@@ -0,0 +1,141 @@
+// pageage/samplingRetestingDetail/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        loadShow:false,
+        radio:'',
+        id:'',
+        projectId:'',
+        retesData:{},
+		ImageArr:[],
+		//详情标识
+		detailFlag:"",
+		state:"",
+		result:"",
+		photoUrl:[]
+    },
+
+    onChange(event) {
+        this.setData({
+            radio: event.detail,
+        });
+    },
+
+ 
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+		let {id,projectId} = options
+        this.setData({
+            id,
+			projectId,
+        })
+		this.getSamplingRetesDataInfoById()
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    /**
+     * 获取详情信息
+     */
+    getSamplingRetesDataInfoById(){
+        let that = this
+        let {id,projectId} = this.data
+        wx.request({
+            url: app.globalData.szhUrl + '/system/retestinfo/getRetestInfoById',
+            method:"get",
+            data:{
+              projectId,
+              id
+            },
+            header:{
+              'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                var data = res.data.data
+                data.typeFlagName = that.convertRetesingName(data.typeFlag)
+                that.setData({
+					retesData:data,
+					photoUrl:data.photoUrl == null ? [] : data.photoUrl.split(',')
+                })
+            }
+        })
+    },
+
+   /**
+     * 置换名称
+     */
+    convertRetesingName(typeFlag){
+        let typeName = ""
+        switch(typeFlag){
+            case 1:
+                typeName = "钢筋原材料取样复试"
+                break;
+            case 2:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 3:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 4:
+                typeName = "混凝土试件取样复试"
+                break;
+            case 5:
+                typeName = "混凝土试件取样复试"
+                break;
+        }
+        return typeName;
+	},
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingDetail/index.json b/miniprogram/pageage/samplingRetestingDetail/index.json
new file mode 100644
index 0000000..6112f05
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDetail/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "取样复试详情"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingDetail/index.wxml b/miniprogram/pageage/samplingRetestingDetail/index.wxml
new file mode 100644
index 0000000..f8a0800
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDetail/index.wxml
@@ -0,0 +1,102 @@
+<!--pageage/samplingRetestingDetail/index.wxml-->
+<view>
+  <view class="inspect_overview_max">
+	  <view class="inspect_overview">
+		  <view class="module_title module_title_padding">
+			  <view>取样复试详情</view>
+		  </view>
+		  <view class="inspect_overview_list_max">
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">项目名称</text></van-col>
+					  <van-col span="16">{{retesData.projectName == null ? '':retesData.projectName}}</van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">复试类型</text></van-col>
+					  <van-col span="16">{{retesData.typeFlagName == null?'':retesData.typeFlagName}}</van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">材料名称</text></van-col>
+					  <van-col span="16">{{retesData.materialName == null ? '':positionName.materialName}}</van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">商家名称</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.businessName == null ? '' : retesData.businessName}}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">使用部位</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.positionName == null ? '' : retesData.positionName }}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">取样数量组</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.sampleNum == null ? '':retesData.sampleNum}}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">是否提供合格证</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.qualifiedFlag == null ? '':retesData.qualifiedFlag}}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">代表数量</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.represenNum == null ? '':retesData.represenNum }}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">取样人</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.sampleBy == null ? '':retesData.sampleBy}}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">取样时间</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.sampleTime == null ? '':retesData.sampleTime}}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">见证人</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.witnessBy == null ? '':retesData.witnessBy}}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">实验室名称</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.laboratoryName == null ? '':retesData.laboratoryName}}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">送检日期</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.inspectionTime == null?'':retesData.inspectionTime }}</text></van-col>
+				  </van-row>
+			  </view>
+			  <view class="inspect_overview_list">
+				  <van-row>
+					  <van-col span="8"><text class="color_purple">检验结果</text></van-col>
+					  <van-col span="16"><text class="color_type">{{retesData.resultStr == null?'':retesData.resultStr }}</text></van-col>
+				  </van-row>
+			  </view>
+		  </view>
+	  </view>
+  </view>
+</view>
+<van-overlay show="{{loadShow}}">
+	<view class="gif">
+		<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+		<view>数据加载中！请稍后...</view>
+	</view>
+</van-overlay>  
diff --git a/miniprogram/pageage/samplingRetestingDetail/index.wxss b/miniprogram/pageage/samplingRetestingDetail/index.wxss
new file mode 100644
index 0000000..e5b9440
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingDetail/index.wxss
@@ -0,0 +1,29 @@
+/* pageage/samplingRetestingDetail/index.wxss */
+.radio_custom_class{
+    padding: 10rpx 100rpx 10rpx 0;
+}
+.radio_label_class{
+    color: #ffffff !important;
+}
+.in-img-max:after{
+    display:block;
+    clear:both;
+    content:"";
+    visibility:hidden;
+    height:0
+  } 
+  .in-img-max{
+    width: auto;
+    zoom:1
+  }
+  .in-img-div{
+    position: relative;
+    margin: 0 8px 8px 0;
+    float: left;
+  }
+  .in-img-div image{
+    width: 180rpx;
+    height: 180rpx;
+    border-radius: 15rpx;
+    position: relative;
+  }
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingUpload/index.js b/miniprogram/pageage/samplingRetestingUpload/index.js
new file mode 100644
index 0000000..2ffad48
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingUpload/index.js
@@ -0,0 +1,293 @@
+// pageage/samplingRetestingUpload/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        loadShow:false,
+        radio:'',
+        id:'',
+        projectId:'',
+        retesData:{},
+		ImageArr:[],
+		//详情标识
+		detailFlag:"",
+		state:"",
+		result:"",
+		photoUrl:[]
+    },
+
+    onChange(event) {
+        this.setData({
+            radio: event.detail,
+        });
+    },
+
+ 
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+		let {id,projectId,detailFlag,state,result} = options
+        this.setData({
+            id,
+			projectId,
+			detailFlag,
+			state,
+			result
+        })
+		this.getSamplingRetesDataInfoById()
+		//回显数据
+		let flag = ""
+		if(detailFlag == 1 && state == '3' && result =='1'){
+			flag = '1'
+		}else{
+			flag = '2'
+		}
+		this.setData({
+			radio:flag
+		})
+    },
+    //跳转页面
+    add_btn_qx(){
+        wx.navigateTo({
+          url: '/pageage/samplingRetesting/index',
+        })
+    },
+    //凭证上传
+    onImagesArr(event){
+        let ImageArr = event.detail
+        this.setData({
+            ImageArr
+        })
+    },
+
+
+     /**
+     * 这里考虑上传图片异步问题，封装为同步
+     */
+
+    syncUploadImage(url,uploadFile,name) {
+        return new Promise((resolve, reject) => {
+            wx.uploadFile({
+            url, // 上传的服务器接口地址
+            filePath: uploadFile,
+            header: {
+                "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"      
+            },
+            name, //上传的所需字段，后端提供
+            formData: { user: 'test' },
+            success: (res) => {
+                // 上传完成操作
+                const data = JSON.parse(res.data)
+                resolve({
+                    data: data
+                })
+            },
+            fail: (err) => {
+                //上传失败：修改pedding为reject
+                console.log("访问接口失败", err);
+                wx.showToast({
+                title: "网络出错,上传失败",
+                icon: 'none',
+                duration: 1000
+                });
+                reject(err)
+            }
+            });
+        })
+          
+    
+    
+    },
+
+
+
+    //提交数据
+    add_btn_bc(){
+        this.setData({
+            loadShow:true
+        })
+        let that = this
+        let {radio,ImageArr} = this.data
+        let {typeFlag,id} = this.data.retesData
+        if(!radio || ImageArr.length <= 0){
+            
+            this.setData({
+                loadShow:false
+            })
+            app.toast("提交数据不合法")
+            return;
+        }
+        let resultStr = ""
+        if((typeFlag == '1' || typeFlag == '3' || typeFlag =='2')){
+            if(radio == '1'){
+                resultStr  = "已试拉合格"
+            }else{
+                resultStr  = "已试拉不合格"
+            }
+            
+        }else{
+            if(radio == '1'){
+                resultStr  = "已试压合格"
+            }else{
+                resultStr  = "已试压不合格"
+            }
+        }
+        let imageArrs =  []
+        ImageArr.forEach(async (item)=>{
+            let requestUrl = app.globalData.reqUrl+'/weixin/security/fileUpload'
+            let name = "file" 
+            let photoUrlObj = await that.syncUploadImage(requestUrl,item,name)  
+            imageArrs.push(photoUrlObj.data.url)
+            //多张图片上传完成
+            if(imageArrs.length >= ImageArr.length){
+                wx.request({
+                    url: app.globalData.szhUrl + '/system/retestinfo/updateRetestStatus',
+                    method:"POST",
+                    data:{
+                      mainId:id,
+                      photoType:2,
+                      photoUrl:imageArrs.join(","),
+                      resultStr
+                    },
+                    header:{
+                      'content-type': 'application/x-www-form-urlencoded'  
+                    },
+                    success(res){
+                        that.setData({
+                            loadShow:false
+                        })
+                        res = res.data
+                        if(res.code == "200"){
+                            app.toast("提交成功")
+                            setTimeout(()=>{
+                                wx.navigateTo({
+                                 url: '/pageage/samplingRetesting/index',
+                                })
+                            },1200)    
+                        }    
+                    }
+                })
+
+
+
+
+            }
+        })
+            
+    },
+
+
+
+    getSamplingRetesDataInfoById(){
+        let that = this
+        let {id,projectId} = this.data
+        wx.request({
+            url: app.globalData.szhUrl + '/system/retestinfo/getRetestInfoById',
+            method:"Get",
+            data:{
+              projectId,
+              id
+            },
+            header:{
+              'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                res = res.data
+				res.data.typeFlagName = that.convertRetesingName(res.data)
+                that.setData({
+					retesData:res.data,
+					photoUrl:res.data.photoUrl == null ? [] : res.data.photoUrl.split(',')
+					
+                })
+            }
+        })
+    },
+
+   /**
+     * 置换名称
+     */
+    convertRetesingName(item){
+        let typeName = ""
+        let typeFlag = item.typeFlag
+        switch(typeFlag){
+            case 1:
+                typeName = "钢筋原材料取样复试"
+                break;
+            case 2:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 3:
+                typeName = "钢筋试拉件取样复试"
+                break;
+            case 4:
+                typeName = "混凝土试件取样复试"
+                break;
+            case 5:
+                typeName = "混凝土试件取样复试"
+                break;
+                
+        }
+        return typeName;
+	},
+	
+	showImg(e){
+		var that=this;
+		wx.previewImage({
+			urls: that.data.photoUrl,
+			current: that.data.photoUrl[e.currentTarget.dataset.index]
+		})
+	},
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingUpload/index.json b/miniprogram/pageage/samplingRetestingUpload/index.json
new file mode 100644
index 0000000..42164a2
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingUpload/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "凭证上传"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingUpload/index.wxml b/miniprogram/pageage/samplingRetestingUpload/index.wxml
new file mode 100644
index 0000000..403ddec
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingUpload/index.wxml
@@ -0,0 +1,152 @@
+<!--pageage/samplingRetestingUpload/index.wxml-->
+<view>
+  
+    <view class="inspect_overview_max">
+        <view class="inspect_overview">
+            <view class="module_title module_title_padding">
+                <view>取样复试详情</view>
+            </view>
+            <view class="inspect_overview_list_max">
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">项目名称</text></van-col>
+                        <van-col span="16">{{retesData.projectName}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">复试类型</text></van-col>
+                        <van-col span="16">{{retesData.typeFlagName}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">材料名称</text></van-col>
+                        <van-col span="16">{{retesData.materialName == null ? '':positionName.materialName}}</van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">商家名称</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.businessName == null ? '' : retesData.businessName}}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">使用部位</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.positionName == null ? '' : retesData.positionName }}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">取样数量组</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.sampleNum == null ? '':retesData.sampleNum}}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">是否提供合格证</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.qualifiedFlag == null ? '':retesData.qualifiedFlag}}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">代表数量</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.represenNum == null ? '':retesData.represenNum }}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">取样人</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.sampleBy == null ? '':retesData.sampleBy}}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">取样时间</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.sampleTime == null ? '':retesData.sampleTime}}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">见证人</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.witnessBy == null ? '':retesData.witnessBy}}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">实验室名称</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.laboratoryName == null ? '':retesData.laboratoryName}}</text></van-col>
+                    </van-row>
+                </view>
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">送检日期</text></van-col>
+                        <van-col span="16"><text class="color_type">{{retesData.inspectionTime == null?'':retesData.inspectionTime }}</text></van-col>
+                    </van-row>
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <view class="inspect_overview_max">
+        <view class="inspect_overview">
+            <view class="module_title module_title_padding">
+                <view>检验结果</view>
+            </view>
+            <view class="inspect_overview_list_max" >
+                <view class="inspect_overview_list">
+                    <van-row>
+                        <van-col span="8" ><text class="color_purple">检验结果</text></van-col>
+                    </van-row>
+                    
+                    <view style="padding:20rpx;">
+                        <van-radio-group value="{{ radio }}" disabled  bind:change="onChange"   
+                            direction="{{horizontal}}" style="display: flex; padding:20rpx 0">
+                            <van-radio name="1" custom-class="radio_custom_class" label-class="radio_label_class"  >合格</van-radio>
+                            <van-radio name="2" custom-class="radio_custom_class" label-class="radio_label_class"  >不合格</van-radio>
+                        </van-radio-group>
+                    </view>
+                  
+                   
+                </view>
+                <view class="inspect_overview_list"  wx:if="{{detailFlag == 0}}">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">凭证上传</text></van-col>
+                    </van-row>
+                    <view class="result_project_name">
+                        <file-uploader  bindimages="onImagesArr"></file-uploader>
+                    </view>
+                </view>
+				<view class="inspect_overview_list"   wx:if="{{detailFlag == 1}}">
+                    <van-row>
+                        <van-col span="8"><text class="color_purple">凭证历史</text></van-col>
+                    </van-row>
+				
+					<view class="in-img-max" style="margin-top: 10rpx;">
+						<view class="in-img-div" wx:for="{{photoUrl}}" wx:key="index">
+							<image bindtap='showImg' data-index="{{index}}" src='{{item}}'></image>
+						</view>
+					</view> 
+                </view>
+            </view>
+            
+        </view>
+        <view class="add_btn" wx:if="{{detailFlag == 0}}" style="padding:50rpx 0;">
+            <view class="add_btn_qx" bindtap="add_btn_qx">取消</view>
+            <view class="add_btn_bc" bindtap="add_btn_bc">保存</view>
+        </view>
+       
+    </view>
+
+    
+
+</view>
+
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/samplingRetestingUpload/index.wxss b/miniprogram/pageage/samplingRetestingUpload/index.wxss
new file mode 100644
index 0000000..1ddea71
--- /dev/null
+++ b/miniprogram/pageage/samplingRetestingUpload/index.wxss
@@ -0,0 +1,29 @@
+/* pageage/samplingRetestingUpload/index.wxss */
+.radio_custom_class{
+    padding: 10rpx 100rpx 10rpx 0;
+}
+.radio_label_class{
+    color: #ffffff !important;
+}
+.in-img-max:after{
+    display:block;
+    clear:both;
+    content:"";
+    visibility:hidden;
+    height:0
+  } 
+  .in-img-max{
+    width: auto;
+    zoom:1
+  }
+  .in-img-div{
+    position: relative;
+    margin: 0 8px 8px 0;
+    float: left;
+  }
+  .in-img-div image{
+    width: 180rpx;
+    height: 180rpx;
+    border-radius: 15rpx;
+    position: relative;
+  }
\ No newline at end of file
diff --git a/miniprogram/pageage/shipinquanping/shipingquanping.js b/miniprogram/pageage/shipinquanping/shipingquanping.js
new file mode 100644
index 0000000..1460225
--- /dev/null
+++ b/miniprogram/pageage/shipinquanping/shipingquanping.js
@@ -0,0 +1,191 @@
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    playerHidden: true,
+    projectId:'',
+    projectName:'' ,
+    myheight:'',
+    bottom:'',
+    left:'',
+    resinit:'',
+    btnbottom:'',
+    btnleft:'',
+    down:'',
+    show: false,
+    token:''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+     token:options.token
+   })
+
+    var that = this
+    wx.getSystemInfo({
+      success: function(res){
+        that.setData({
+          resinit:res.windowWidth
+        })
+      }
+    })
+    
+   
+    this.setData({
+      btnbottom:0,
+      btnleft:(this.data.resinit-60) / 2+'px'
+    })
+    
+    console.log(this.data.resinit)
+    this.setData({
+      myheight: (this.data.resinit) + 'px',
+      bottom: -((this.data.resinit-150) / 2 + 150) + 'px',
+      left:(this.data.resinit-150) / 2+ 'px'
+    })
+
+    this.setData({
+       //赋值跳转参数
+      projectId:app.globalData.projectId,
+      projectName:app.globalData.projectName,
+    })
+    // 参数检查合法性
+    if(undefined == options.rtmpUrl || "" == options.rtmpUrl){
+      wx.showModal({
+        title: "参数错误",
+        content: "1. 请检查参数 Key 值是否为 rtmpUrl \n2. 请检查参数 rtmpUrl 是否为空字符",
+        showCancel: false,
+        success: res => {
+          wx.navigateBack({});
+        }
+      })
+      return;
+    }
+
+    // 初始化页面数据
+    this.initView(options);
+  },
+
+  /**
+   * 初始化页面数据
+  */
+  initView:function(options){
+    console.log(options.rtmpUrl);
+    this.setData({
+      height: wx.getSystemInfoSync().windowHeight,
+      width: wx.getSystemInfoSync().windowWidth,
+      playerHidden: false,
+      rtmpUrl: options.rtmpUrl
+    })
+  },
+
+  /**
+   * 加载状态变化监听
+  */
+ onStatechange: function(e){
+
+  // wx.showLoading({
+  //   title: '请稍后'
+  // })
+
+  if(e.detail.code == -2301){ // 经多次自动重连失败，放弃连接
+
+   // 隐藏加载提示
+   wx.hideLoading({});
+
+   // 弹窗提示状态
+   wx.showModal({
+     title:"加载失败",
+     content: "经多次自动重连失败，放弃连接",
+     showCancel:false,
+     success: res => {
+       wx.navigateBack({});
+     }
+   })
+   return;
+  }
+
+  if(e.detail.code == 2004 || e.detail.code == 2003){ // 视频播放开始
+   // 隐藏加载提示
+   setTimeout(function(){
+    wx.hideLoading({});
+    wx.showToast({
+      title: '开始播放',
+      icon: "none"
+    })
+   }, 1500)
+  }
+ },
+
+  /**
+   * 返回监听
+   */
+  onBack: function(){
+    wx.navigateBack({});
+  },
+
+  openyt() {
+    if(!this.data.show){
+      this.setData({
+        bottom: -((this.data.resinit-150) / 2) + 'px',
+        btnbottom: 150+'px',
+        down:'rgba(0,0,0,0.3) url("http://fileimg.makalu.cc/WEB_BE024BE5CFF04825B96441B57BF221D5.png") no-repeat center/15px',
+        show: true
+      })
+    }else{
+      this.setData({
+        bottom: -((this.data.resinit-150) / 2 + 150) + 'px',
+        btnbottom:0,
+        down:'rgba(0,0,0,0.3) url("http://fileimg.makalu.cc/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/15px;',
+        show: false
+      })
+    }
+    
+  },
+
+  /**
+     * 控制
+     */
+    tripodHandle: function(e) {
+      console.log(e.currentTarget.dataset.action)
+      var tokenStr = this.data.token;
+      console.log(this.data.token);
+        wx.request({
+            url: 'https://video.makalu.cc/mkl/api/moveCamera',
+            data: JSON.stringify({
+              "token": tokenStr,
+              "action":e.currentTarget.dataset.action,
+              "h5s": true
+            }),
+            method:"POST",
+            contentType:"application/json",
+            success:function(res){
+              console.log(res)
+              setTimeout(function () {
+                wx.request({
+                  url: 'https://video.makalu.cc/mkl/api/moveCamera',
+                  data: JSON.stringify({
+                    "token": tokenStr,
+                    "action":"stop",
+                    "h5s": true
+                  }),
+                  method: "POST",
+                  contentType:"application/json",
+                  success: function (res){
+                    console.log(res)
+                  },
+                  complete: function (res){
+                    console.log(res)
+                  },
+                })
+              }, 1000 )
+            }
+          })
+    },
+
+})
diff --git a/miniprogram/pageage/shipinquanping/shipingquanping.json b/miniprogram/pageage/shipinquanping/shipingquanping.json
new file mode 100644
index 0000000..a97367d
--- /dev/null
+++ b/miniprogram/pageage/shipinquanping/shipingquanping.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
diff --git a/miniprogram/pageage/shipinquanping/shipingquanping.wxml b/miniprogram/pageage/shipinquanping/shipingquanping.wxml
new file mode 100644
index 0000000..379e616
--- /dev/null
+++ b/miniprogram/pageage/shipinquanping/shipingquanping.wxml
@@ -0,0 +1,34 @@
+<!-- 1. 根据屏幕宽高动态调整 2. 画面方向为水平 3. 根据加载状态做出相应提示-->
+<live-player class="player" src="{{rtmpUrl}}" hidden="{{playerHidden}}" style="width:{{width}}px; height:{{height}}px" mode="live" autoplay="true" bindstatechange="onStatechange" orientation="horizontal"/>
+
+<!-- 返回按钮 -->
+<view class="onBack_div">
+  <image src="/images/fanhui.png" class="onBack" hidden="{{playerHidden}}" bindtap="onBack"></image>
+</view>
+
+<view class="icon_bottom">
+
+</view>
+
+<view  class="button_top left_img" bindtap="openyt" style="bottom:{{btnbottom}};left:{{btnleft}};background:{{down}}"></view>
+
+  <view class="video_telecontrol" style="height:{{myheight}};bottom:{{bottom}};left:{{left}}">
+    <view class="video_right">
+      <view class="video_tele">
+        <view class="video_tele_top" bindtap="tripodHandle" data-action="up"></view>
+        <view class="video_tele_middle">
+          <view class="video_tele_left" bindtap="tripodHandle" data-action="left"></view>
+          <view class="video_tele_right" bindtap="tripodHandle" data-action="right"></view>
+        </view>
+        <view class="video_tele_bottom" bindtap="tripodHandle" data-action="down"></view>
+      </view>
+
+      <view class="video_focusing_padding">
+        <view class="video_focusing">
+            <view class="video_focusing_left" bindtap="tripodHandle" data-action="zoomout">-</view>
+            <view class="video_focusing_middle">聚焦</view>
+            <view class="video_focusing_right" bindtap="tripodHandle" data-action="zoomin">+</view>
+        </view>
+      </view>
+    </view>
+  </view>
\ No newline at end of file
diff --git a/miniprogram/pageage/shipinquanping/shipingquanping.wxss b/miniprogram/pageage/shipinquanping/shipingquanping.wxss
new file mode 100644
index 0000000..8f526c9
--- /dev/null
+++ b/miniprogram/pageage/shipinquanping/shipingquanping.wxss
@@ -0,0 +1,135 @@
+page{
+  width: 100%;
+  height: 100%;
+}
+.onBack_div{
+  width: 60rpx;
+  height: 60rpx;
+  position: relative;
+  margin-top: -200rpx;
+  left: 50rpx;
+}
+.onBack{
+  width: 60rpx;
+  height: 60rpx;
+}
+
+.title_position{
+  padding: 30rpx;
+  color:#5269d1;
+}
+.title_position text{
+  font-size: 28rpx;
+}
+.video_style{
+  text-align: center;
+}
+.video_style video{
+  width: 600rpx;
+  height: 380rpx;
+}
+.video_telecontrol{
+  width:150px;
+  transform: rotate(90deg);
+  position: fixed;
+  float: right;
+  background: rgba(0,0,0,0.3);
+  z-index: 9999;
+}
+.video_right{
+  padding-top: 80px;
+}
+.video_tele{
+  width: 300rpx;
+  height: 300rpx;
+  margin: auto;
+  background: url("http://fileimg.makalu.cc/WEB_18985E338B994679BD9849D18A5C3EB8.png") no-repeat center/100% 100%;
+}
+.video_tele_top{
+  width: 80rpx;
+  height: 50rpx;
+  margin: auto;
+}
+.video_tele_top:active{
+  background: url("http://fileimg.makalu.cc/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/40rpx 40rpx;
+}
+.video_tele_bottom{
+  width: 80rpx;
+  height: 50rpx;
+  margin: auto;
+}
+.video_tele_bottom:active{
+  background: url("http://fileimg.makalu.cc/WEB_BE024BE5CFF04825B96441B57BF221D5.png") no-repeat center/40rpx 40rpx;
+}
+.video_tele_middle{
+  height: 135rpx;
+  padding-top: 60rpx;
+  padding-right: 5rpx;
+}
+.video_tele_left{
+  float: left;
+  height: 80rpx;
+  width: 50rpx;
+}
+.video_tele_left:active{
+  background: url("http://fileimg.makalu.cc/WEB_66C6D4090DB740859D0128493C9895A8.png") no-repeat center/40rpx 40rpx;
+}
+.video_tele_right{
+  float: right;
+  height: 80rpx;
+  width: 50rpx;
+}
+.video_tele_right:active{
+  background: url("http://fileimg.makalu.cc/WEB_A1ED3A414F3945328C554AF247F0AA4E.png") no-repeat center/40rpx 40rpx;
+}
+.video_focusing_padding{
+  padding-top: 50rpx;
+}
+.video_focusing{
+  margin: auto;
+  height: 60rpx;
+  width: 300rpx;
+}
+.video_focusing_left{
+  width: 60rpx;
+  height: 60rpx;
+  float: left;
+  background: #293052;
+  text-align: center;
+  line-height: 60rpx;
+  font-size: 30rpx;
+}
+.video_focusing_left:active{
+  background: #5269d1;
+}
+.video_focusing_middle{
+  text-align: center;
+  line-height: 60rpx;
+  width: 180rpx;
+  height: 60rpx;
+  float: left;
+  background: #24243b;
+  font-size: 28rpx;
+}
+.video_focusing_right{
+  width: 60rpx;
+  height: 60rpx;
+  float: left;
+  background: #293052;
+  text-align: center;
+  line-height: 60rpx;
+  font-size: 30rpx;
+}
+.video_focusing_right:active{
+  background: #5269d1;
+}
+.button_top{
+  width:60px;
+  height: 25px;
+  position: fixed;
+  border-radius: 60px 60px 0 0;
+  z-index: 9999;
+}
+.left_img{
+  background: rgba(0,0,0,0.3) url("http://fileimg.makalu.cc/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/15px;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/suishoupai-psh/suishoupai-psh.js b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.js
new file mode 100644
index 0000000..417f848
--- /dev/null
+++ b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.js
@@ -0,0 +1,38 @@
+// miniprogram/pages/suishoupai2/suishoupai.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url:'',
+    projectId:'',
+    loginName:'',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    /**
+     * 获取缓存数据
+     */
+    wx.getStorage({
+      key: 'userinfo',
+      success: res => {
+        // this.setData({
+        //   url:"http://127.0.0.1:8091/weixin/pshManage/goListPage?projectId="+ app.globalData.projectId +"&loginName="+ res.data.loginName +"&projectName=" + app.globalData.projectName
+        // })
+        this.setData({
+          url:"https://cf.makalu.cc/weixin/pshManage/goListPage?projectId="+ app.globalData.projectId +"&loginName="+ res.data.loginName +"&projectName=" + app.globalData.projectName
+        })
+      },
+      fail: res =>{
+        wx.redirectTo({
+          url: '../login/login'
+        })  
+      }
+    })
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/suishoupai-psh/suishoupai-psh.json b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxml b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxml
new file mode 100644
index 0000000..7595e6b
--- /dev/null
+++ b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxml
@@ -0,0 +1,3 @@
+<!--miniprogram/pages/suishoupai2/suishoupai.wxml-->
+<web-view src="{{url}}"></web-view>
+
diff --git a/miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxss b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxss
new file mode 100644
index 0000000..476d78c
--- /dev/null
+++ b/miniprogram/pageage/suishoupai-psh/suishoupai-psh.wxss
@@ -0,0 +1 @@
+/* miniprogram/pages/suishoupai2/suishoupai.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/suishoupai/suishoupai.js b/miniprogram/pageage/suishoupai/suishoupai.js
new file mode 100644
index 0000000..15e4da0
--- /dev/null
+++ b/miniprogram/pageage/suishoupai/suishoupai.js
@@ -0,0 +1,38 @@
+// miniprogram/pages/suishoupai/suishoupai.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url:'',
+    projectId:'',
+    loginName:'',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    /**
+     * 获取缓存数据
+     */
+    wx.getStorage({
+      key: 'userinfo',
+      success: res => {
+        // this.setData({
+        //   url:"http://127.0.0.1:8091/weixin/sspManage/goListPage?projectId="+ app.globalData.projectId +"&loginName="+ res.data.loginName +"&projectName=" + app.globalData.projectName
+        // })
+        this.setData({
+          url:"https://cf.makalu.cc/weixin/sspManage/goListPage?projectId="+ app.globalData.projectId +"&loginName="+ res.data.loginName +"&projectName=" + app.globalData.projectName
+        })
+      },
+      fail: res =>{
+        wx.redirectTo({
+          url: '../login/login'
+        })  
+      }
+    })
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/suishoupai/suishoupai.json b/miniprogram/pageage/suishoupai/suishoupai.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pageage/suishoupai/suishoupai.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/suishoupai/suishoupai.wxml b/miniprogram/pageage/suishoupai/suishoupai.wxml
new file mode 100644
index 0000000..f930946
--- /dev/null
+++ b/miniprogram/pageage/suishoupai/suishoupai.wxml
@@ -0,0 +1,3 @@
+<!--miniprogram/pages/suishoupai/suishoupai.wxml-->
+<web-view src="{{url}}"></web-view>
+
diff --git a/miniprogram/pageage/suishoupai/suishoupai.wxss b/miniprogram/pageage/suishoupai/suishoupai.wxss
new file mode 100644
index 0000000..8427989
--- /dev/null
+++ b/miniprogram/pageage/suishoupai/suishoupai.wxss
@@ -0,0 +1 @@
+/* miniprogram/pages/suishoupai/suishoupai.wxss */
\ No newline at end of file
diff --git a/miniprogram/pageage/technical-management/index.js b/miniprogram/pageage/technical-management/index.js
new file mode 100644
index 0000000..cdeeabc
--- /dev/null
+++ b/miniprogram/pageage/technical-management/index.js
@@ -0,0 +1,807 @@
+// pages/technical-management/index.js
+import * as echarts from '../../ec-canvas/echarts'; 
+const app = getApp()
+let chart=null
+let chart1=null
+let canvas1 = {}
+// function initChart(canvas,width,height,dpr) {
+//     console.log(canvas)
+//     canvas1 = canvas
+//     console.log(canvas1)
+//     console.log(width)
+//     console.log(height)
+//     console.log(dpr)
+//     chart=echarts.init(canvas,null,{
+//         width:width,
+//         height:height,
+//         devicePixelRatio:dpr
+//     })
+//     canvas.setChart(chart)
+
+//     let option=getOption(0,0)
+//     chart.setOption(option)
+//     return chart 
+// }
+
+function getOption(rate,number) {
+    let  that=this
+ return {
+     title: [
+         {
+             text: rate+'%',
+             textAlign: "center",
+             left: "48%",
+             top: "30%",
+             textStyle: {
+                 color: "#67abf2",
+                 fontSize: 23,
+             },
+         },
+         {
+             text: '未完成:'+number,
+             left: "48%",
+             top: "80%",
+             textAlign: "center",
+             textStyle: {
+                 color: "#cdd7fa",
+                 fontWeight: "normal",
+                 fontSize: "16",
+                 textAlign: "center",
+             },
+         },
+     ],
+     series: [
+         {
+             type: "pie",
+             hoverAnimation: false,
+             radius: ["60%", "59%"],
+             center: ["50%", "40%"],
+             labelLine: {
+                 normal: {
+                     show: false,
+                 },
+             },
+             label: {
+                 normal: {
+                     position: "center",
+                 },
+             },
+             data: [
+                 {
+                     value: 100,
+                     itemStyle: {
+                         normal: {
+                             color: "#255788",
+                         },
+                     },
+                 },
+ 
+             ],
+         },
+         {
+             type: "pie",
+             hoverAnimation: false,
+             radius: ["53%", "60%"],
+             center: ["50%", "40%"],
+             labelLine: {
+                 normal: {
+                     show: false,
+                 },
+             },
+             label: {
+                 normal: {
+                     position: "center",
+                 },
+             },
+             data: [
+                 {
+                     value: 35,
+                     itemStyle: {
+                         normal: {
+                             color: "#68a8f2",
+                         },
+                     },
+                     normal: {
+                         show: false,
+                     },
+                 },
+                 {
+                     value: 100-35,
+                     itemStyle:  {
+                         normal: {
+                             label: {
+                                 show: false,
+                             },
+                             labelLine: {
+                                 show: false,
+                             },
+                             color: "rgba(0,0,0,0)",
+                             borderWidth: 0,
+                         },
+                         emphasis: {
+                             color: "rgba(0,0,0,0)",
+                             borderWidth: 0,
+                         },
+                     },
+                 },
+             ],
+         },
+     ],
+ };
+ }
+
+//  function initChart1(canvas,width,height,dpr) {
+//     chart1=echarts.init(canvas,null,{
+//         width:width,
+//         height:height,
+//         devicePixelRatio:dpr
+//     })
+//     canvas.setChart(chart1)
+
+//     let option1=getOption1(0,0)
+//     chart1.setOption(option1)
+//     return chart1
+// }
+
+ function getOption1(rate,number) {
+    let  that=this
+ return {
+     title: [
+         {
+             text: rate+'%',
+             textAlign: "center",
+             left: "48%",
+             top: "30%",
+             textStyle: {
+                 color: "#67abf2",
+                 fontSize: 23,
+             },
+         },
+         {
+             text: '未完成: '+number,
+             left: "48%",
+             top: "80%",
+             textAlign: "center",
+             textStyle: {
+                 color: "#cdd7fa",
+                 fontWeight: "normal",
+                 fontSize: "16",
+                 textAlign: "center",
+             },
+         },
+     ],
+     series: [
+         {
+             type: "pie",
+             hoverAnimation: false,
+             radius: ["60%", "59%"],
+             center: ["50%", "40%"],
+             labelLine: {
+                 normal: {
+                     show: false,
+                 },
+             },
+             label: {
+                 normal: {
+                     position: "center",
+                 },
+             },
+             data: [
+                 {
+                     value: 100,
+                     itemStyle: {
+                         normal: {
+                             color: "#255788",
+                         },
+                     },
+                 },
+ 
+             ],
+         },
+         {
+             type: "pie",
+             hoverAnimation: false,
+             radius: ["53%", "60%"],
+             center: ["50%", "40%"],
+             labelLine: {
+                 normal: {
+                     show: false,
+                 },
+             },
+             label: {
+                 normal: {
+                     position: "center",
+                 },
+             },
+             data: [
+                 {
+                     value: 22,
+                     itemStyle: {
+                         normal: {
+                             color: "#68a8f2",
+                         },
+                     },
+                     normal: {
+                         show: false,
+                     },
+                 },
+                 {
+                     value: 100-22,
+                     itemStyle:  {
+                         normal: {
+                             label: {
+                                 show: false,
+                             },
+                             labelLine: {
+                                 show: false,
+                             },
+                             color: "rgba(0,0,0,0)",
+                             borderWidth: 0,
+                         },
+                         emphasis: {
+                             color: "rgba(0,0,0,0)",
+                             borderWidth: 0,
+                         },
+                     },
+                 },
+             ],
+         },
+     ],
+ };
+ }
+
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        ec:{
+            lazyLoad:true
+        },
+        ec1:{
+            lazyLoad:true
+        },
+        index1:0,
+        fourClarificaiton:{
+            "gljd": "2022-08-25",
+            "szjd": "2022-09-15",
+            "zxfajd": 0,
+            "jsjd": 0
+        },
+         //页面跳转参数
+        loginName:'',
+        userName:'',
+        projectId:'',
+        projectName:'' ,
+        initData:{},
+        loadShow:false,
+        //科技创新
+        sciencelnnovateDataList:[],
+        //四新应用
+        videoList:[],
+        //方案管理
+        timeAxisData: [],
+        dangerName:[],
+        proposalsNumber:0,
+        planNodelNumber:0,
+        //变更签认
+        constructionNum:0,
+        alterationNum:0,
+        bgWTGNumber:0,
+        gcWTGNumber:0,
+        bgWTGNumberRate:0,
+        gcWTGNumberRate:0,
+       //人员
+        show: false,
+    },
+    // 左键
+    onLeftBtn(e){
+        let  that=this
+       this.setData({
+           index1:this.data.index1-1
+       })
+       let maxLength = 0
+       var query = wx.createSelectorQuery();
+       query.select('.kejichuangxin-content-box').boundingClientRect();
+       query.exec(function (res) {
+         //res就是 所有标签为v1的元素的信息 的数组
+        //  console.log(res);  
+         //取宽度
+        //  console.log(res[0].width);
+         let n = 0
+         if(that.data.index1 > maxLength){
+            n = that.data.index1 * res[0].width
+         
+         }else{
+             that.setData({
+                 index1:3
+             })
+             n = that.data.index1 * res[0].width
+         }
+           console.log(n);
+        })
+    },
+    onRightBtn(e){
+       let  that=this
+        this.setData({
+            index1:this.data.index1+1
+       })
+       let maxLength = this.data.sciencelnnovateDataList.length ;
+       console.log(this.data.sciencelnnovateDataList.length)
+       var query = wx.createSelectorQuery();
+       query.select('.kejichuangxin-content-box').boundingClientRect();
+       query.exec(function (res) {
+         //res就是 所有标签为v1的元素的信息 的数组
+        //  console.log(res);  
+         //取宽度
+        //  console.log(res[0].width);
+         let n = 0
+         if(that.data.index1 < maxLength ){
+            n = that.data.index1 * res[0].width
+         
+         }else{
+             that.setData({
+                 index1:0
+             })
+             n = that.data.index1 * res[0].width
+         }
+        //  console.log(n);
+        //  const bigBox=wx.createSelectorQuery().select('#bigBox').boundingClientRect();
+        //  bigBox.exec(function (res) {
+        //      console.log(res);
+        //  })
+        //  console.log( bigBox);
+        //  that.selectComponent('#bigBox').animate({scrollLeft:n+'px'})
+         })
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this
+        this.oneComponent = this.selectComponent('#mychart-dom');
+        this.twoComponent = this.selectComponent('#mychart-dom1');
+        //获取项目缓存数据
+        wx.getStorage({
+            key: 'userinfo',
+            success:function(res){
+            that.setData({
+                loginName:res.data.loginName,
+                userName:res.data.userName,
+                projectId:app.globalData.projectId,
+                projectName:app.globalData.projectName,
+                initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+            })  
+            }
+        })
+
+       that.getProjectCorrespondence(app.globalData.projectId)
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+    onClickHide() {
+        this.setData({ loadShow: false });
+      },
+    onClickShow() {
+        this.setData({ loadShow: true });
+      },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    /**
+     * 四级交底情况
+     */
+    getfourData() {
+        var that = this
+        wx.request({
+            url: 'https://api-tmp.makalu.cc/szhjzgkpt/four/clarificaiton', 
+            data:{},
+            method:"GET",
+            success:(res)=>{
+                that.fourClarificaiton = res.data
+                wx.request({
+                  url: app.globalData.szhUrl+'/api/project/selectTechnicalDisclosureInformationList',
+                  data:{
+                    projectId: that.data.projectId,
+                  },
+                  method:'POST',
+                  success:(res)=>{
+                        var zx = 0
+                        var js = 0
+                        that.setData({
+                            fourDataList : res.data.data
+                        })
+                    
+                        for (let tmp of res.data.data) {
+                            switch (tmp.type) {
+                                case 1:
+                                    js++
+                                    tmp.sort = js
+                                    break
+                                case 2:
+                                    zx++
+                                    tmp.sort = zx
+                                    break
+                            }
+                        }
+                    
+                        that.setData({
+                            'fourClarificaiton.zxfajd': zx,
+                            'fourClarificaiton.jsjd':js
+                        })
+                  }
+                })
+            }
+        
+        })
+    },
+      //项目切换 返回值
+    onProjectSelect(e) {
+        var that = this;
+        this.onClickShow();
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        that.setData({
+            projectId: projectId,
+            projectName: projectName
+        })
+       that.onLoad()
+    },
+      /**
+   * 项目对应关系
+   */
+  getProjectCorrespondence(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          projectData: res.data,
+          projectId:res.data.szh
+        })
+        that.getfourData()
+        that.scienceInnovateData();
+        that.fourNewApplicationData();
+        that.getFangAnNumber();
+        that.getSchemeTableData();
+      }
+    })
+  },
+    //科技创新
+    scienceInnovateData(){
+        var that = this
+        wx.request({
+            url: app.globalData.szhUrl+'/system/scienceInnovateConfig/list1', 
+            data:{
+                pageNum:1,pageSize:9999,projectId:that.data.projectId
+            },
+            method:"POST",
+            success:(res)=>{
+            let result = res.data
+            let tempData = []
+            var sciencelnnovateDataList = []
+            let tmp = {}
+            if(result.code == 0){
+                result.rows.forEach(item=>{
+                    var name=''
+                    var status = ''
+                    if(!tmp[item.name]){
+                        tmp[item.name] = {
+                            name:item.name,
+                            context:[]
+                        }
+                    }
+
+                    if(item.type == '0'){
+                        name = '研究报告'
+                    }else if(item.type == '1'){
+                        name = '知识产权'
+                    }else if(item.type == '2'){
+                        name = '论文'
+                    }else{
+                        name = '工法'
+                    }
+
+                    if(item.status =='0'){
+                       status = '进行中'
+                    }else if(item.status =='1'){
+                        status = '已完成'
+                    }else if(item.status =='4'){
+                       status = '未涉及'
+                    }else{
+                        status = '未开始'
+                    }
+                    tmp[item.name] .context.push({
+                        name,
+                       status
+                    })
+
+                })
+                for(let k in tmp ){
+                    sciencelnnovateDataList.push(tmp[k])
+                }
+                that.setData({
+                    sciencelnnovateDataList : sciencelnnovateDataList
+                })
+                console.log(sciencelnnovateDataList)
+            }
+            }
+        
+        })
+    },
+     //四新引用公艺视频
+     fourNewApplicationData(){
+         var that = this
+         wx.request({
+           url: app.globalData.szhUrl+'/system/fourNewConfig/list1',
+           data:{
+                pageNum:1,
+                pageSize:9999,
+                projectId:that.data.projectId
+           },
+           method:"POST",
+            success:(res)=>{
+                let result = res.data
+                var tempList = []
+                if(result.code == 0){
+                    tempList = result.rows.filter(item=>{
+                        if(item.type == 1){
+                            return item
+                        }
+                    }).map(item=>{
+                        return {url:item.fileUrl}
+                    });
+                    that.setData({
+                        videoList:tempList
+                    })
+                }
+            } 
+         })
+    },
+    //方案管理
+    getFangAnNumber() {
+        var that = this
+        let project_id = that.data.projectId
+        wx.request({
+          url: app.globalData.szhUrl+'/api/danger/queryProjectDanger',
+          data:{
+            project_id,
+            pageNum:1,
+            pageSize:9999
+          },
+          method:"POST",
+          success:(res)=>{
+           
+            if(res.data.code == 200){
+                that.setData({
+                    dangerName:res.data.data.danger_name,
+                })
+                let timeAxisData = res.data.data.dangerList
+                var index = timeAxisData.length - 1
+                for (let i = 0; i < timeAxisData.length; i++) {
+                    if (timeAxisData[i].actualTima == '') {
+                        index = i - 1
+                        break
+                    }
+                }
+                that.setData({
+                    timeAxisData:timeAxisData, 
+                })
+                that.getPlanNodeNumber()
+            } else {
+                that.setData({
+                    dangerName:[],
+                    timeAxisData:[],
+                    planNodelNumber:0
+                
+                })
+            }
+          }
+        })
+       
+    },
+    /**
+     * 获取方案节点数
+     */
+    getPlanNodeNumber() {
+        var that = this;
+        let count = 0;
+        var list = this.data.dangerName;
+        for (let index = 0; index < list.length; index++) {
+            wx.request({
+              url: app.globalData.szhUrl+'/api/danger/queryProjectId',
+              data:{
+                "project_id": that.data.projectId,
+                "danger_id": list[index].id
+              },
+              method:"POST",
+              success:(res)=>{
+                if(res.data.code == 200){
+                    count += parseInt(res.data.allPoint);
+                } 
+                that.setData({
+                    planNodelNumber:count
+                })
+              }
+            })  
+
+        }
+    },
+    //变更签认
+    getSchemeTableData() {
+        var that = this;
+        wx.request({
+          url: app.globalData.szhUrl+'/system/alterationEndorseConfig/list1',
+          data:{pageNum:1,pageSize:9999,projectId:this.data.projectId},
+          method:"POST",
+          success:(res)=>{
+            let result = res.data
+            var bgWTGNumber= 0;
+            var gcWTGNumber = 0
+            if(result.code == 0){
+
+                that.setData({
+                    constructionNum: result.rows.filter(item=>item.alterationType == "0").length,
+                    alterationNum: result.rows.filter(item=>item.alterationType == "1").length
+                })
+            } else {
+                that.setData({
+                    constructionNum:0,
+                    alterationNum:0
+                })
+            }
+                var tempList =  result.rows
+                if(tempList != undefined){
+                    for (let index = 0; index < tempList.length; index++) {
+                        if(tempList[index].alterationType == "0") {
+                             if(tempList[index].alterationStatus != '0') {
+                                 bgWTGNumber += 1
+                             }
+                        } else {
+                             if(tempList[index].alterationStatus != '0') {
+                                 gcWTGNumber += 1
+                             }
+                        }
+                        var bgWTGNumberRate = 0.0;
+                        var gcWTGNumberRate = 0.0;
+                        if(that.data.constructionNum != 0) {
+                         bgWTGNumberRate =isNaN(((bgWTGNumber/that.data.constructionNum)*100).toFixed(2))?0.0:((bgWTGNumber/that.data.constructionNum)*100).toFixed(1);
+                        }
+                        if(that.data.alterationNum != 0 && gcWTGNumber != 0) {
+                         gcWTGNumberRate = isNaN(((gcWTGNumber/that.data.alterationNum)*100).toFixed(2))?0.0:((gcWTGNumber/that.data.alterationNum)*100).toFixed(1);
+                        }
+                        that.setData({
+                             bgWTGNumber:bgWTGNumber,
+                             gcWTGNumber:gcWTGNumber,
+                             bgWTGNumberRate:bgWTGNumberRate == 0 ? 0:bgWTGNumberRate,
+                             gcWTGNumberRate:gcWTGNumberRate == 0 ? 0:gcWTGNumberRate
+                         })
+                         
+                     }
+                } else {
+                    that.setData({
+                        bgWTGNumber:0,
+                        gcWTGNumber:0,
+                        bgWTGNumberRate:0,
+                        gcWTGNumberRate:0
+                    })
+                   
+                }
+
+                that.initChartA(this.data.bgWTGNumberRate, this.data.bgWTGNumber)
+                that.initChartB(this.data.gcWTGNumberRate, this.data.gcWTGNumber)
+            
+                     
+          }
+        })
+    },
+    initChartA(rate,number) {
+        this.oneComponent.init((canvas, width, height, dpr) => {
+            chart=echarts.init(canvas,null,{
+                width:width,
+                height:height,
+                devicePixelRatio:dpr
+            })
+            canvas.setChart(chart)
+            let option=getOption(rate,number)
+            chart.setOption(option)
+            return chart
+        })
+
+    },
+    initChartB(rate,number) {
+        this.twoComponent.init((canvas, width, height, dpr) => {
+            chart1=echarts.init(canvas,null,{
+                width:width,
+                height:height,
+                devicePixelRatio:dpr
+            })
+            canvas.setChart(chart1)
+            let option1=getOption1(rate,number)
+            chart1.setOption(option1)
+            return chart1
+        })
+
+    },
+    /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+    
+  showPopup() {
+    this.setData({ show: true }); 
+  },
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  checkMajorNodes(){
+      wx.navigateTo({
+        url: '../dangerousProject/index',
+      })
+  },
+
+  checkSignature(){
+    wx.navigateTo({
+      url: '../biangeng/index',
+    })
+  }
+   
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/technical-management/index.json b/miniprogram/pageage/technical-management/index.json
new file mode 100644
index 0000000..b9decef
--- /dev/null
+++ b/miniprogram/pageage/technical-management/index.json
@@ -0,0 +1,16 @@
+{
+    "usingComponents": {
+        "van-row": "@vant/weapp/row",
+        "van-col": "@vant/weapp/col",
+        "van-action-sheet": "@vant/weapp/action-sheet",
+        "van-sticky": "@vant/weapp/sticky",
+        "van-tabbar": "@vant/weapp/tabbar",
+        "van-tabbar-item": "@vant/weapp/tabbar-item",
+        "van-popup": "@vant/weapp/popup",
+        "van-circle": "@vant/weapp/circle",
+        "van-tag": "@vant/weapp/tag/index",
+        "ec-canvas": "../../ec-canvas/ec-canvas",
+        "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "技术管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/technical-management/index.wxml b/miniprogram/pageage/technical-management/index.wxml
new file mode 100644
index 0000000..4d4686d
--- /dev/null
+++ b/miniprogram/pageage/technical-management/index.wxml
@@ -0,0 +1,283 @@
+<!--pages/technical-management/index.wxml-->
+<!-- 技术管理 -->
+
+
+<view class="All-content">
+ <!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">技术管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+<!-- 头部模块 -->
+
+	<view class="max_new_content" style="width:100%;height: 105rpx;">
+		<project-select width='640rpx' left='-30rpx'  init="{{initData}}" bindchange="onProjectSelect"></project-select>
+<!-- 四级交底概况 -->
+<view class="sijijiaodi" style="margin-top: 64rpx;">
+		<view class="eharts_title">
+			技术交底管理
+		</view>
+		<view class="sijijiaodi-content">
+			<view class="sijijiaodi-content-top">
+				<view style="display: flex;align-items: center;width: 50%;">
+					<view class="sijijiaodi-content-top-left">
+						<!-- <image src="http://fileimg.makalu.cc/WEB_71127816E67140C28E785D78F8A2EAEA.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/> -->
+					</view>
+					<view style="padding-left:15rpx;font-size: 30rpx;">
+						<view style="padding-bottom: 20rpx;">管理交底</view>
+						<view style="color: #6190b9;"> {{fourClarificaiton.gljd}} </view>
+					</view>
+				</view>
+				<view style="display: flex;align-items: center;width: 50%;">
+					<view class="sijijiaodi-content-top-right">
+						<!-- <image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/> -->
+					</view>
+					<view style="padding-left:15rpx;font-size: 30rpx;">
+						<view style="padding-bottom: 20rpx;"> 施组交底 </view>
+						<view style="color: #45a183;"> {{fourClarificaiton.szjd}} </view>
+					</view>
+				</view>
+			</view>
+			<view class="sijijiaodi-content-top">
+				<view style="display: flex;align-items: center;width: 50%;">
+					<view class="sijijiaodi-content-top-left">
+						<!-- <image src="http://fileimg.makalu.cc/WEB_71127816E67140C28E785D78F8A2EAEA.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/> -->
+					</view>
+					<view style="padding-left:15rpx;font-size: 30rpx;">
+						<view style="padding-bottom: 20rpx;"> 危大工程交底 </view>
+						<view style="color: #6190b9;">
+							<text>{{fourClarificaiton.zxfajd}} </text>
+							<text style="font-size: 28rpx;color: #fff;padding-left: 10rpx;">次</text>
+						</view>
+					</view>
+				</view>
+				<view style="display: flex;align-items: center;width: 50%;">
+					<view class="sijijiaodi-content-top-right">
+						<!-- <image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/> -->
+					</view>
+					<view style="padding-left:15rpx;font-size: 30rpx;">
+						<view style="padding-bottom: 20rpx;">技术交底 </view>
+						<view style="color: #45a183;">
+							<text>{{fourClarificaiton.jsjd}} </text>
+							<text style="color: #fff;font-size: 28rpx;padding-left: 10rpx;">次</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<!-- 危大工程方案 -->
+	<view class="weidagongcheng">
+	<!-- 标题 -->
+		<view class="weidagongcheng-header">
+			<view class="eharts_title">
+				方案管理
+			</view>
+			<view class="weidagongcheng-footer" bindtap="checkMajorNodes">
+				<text>查看详情 </text> 
+				<image src="http://fileimg.makalu.cc/WEB_8F0C5A9F72B4450AAF3362E8FC2CC3D8.png" mode="" style="width: 30rpx;height: 30rpx;margin-left: 10rpx;"/>
+			</view>
+		</view>
+		<view style="padding: 20rpx;">
+			<view class="weidagongcheng-footer-bottom">
+				<view class="weidagongcheng-footer-bottom-left">
+					<view class="weidagongcheng-footer-bottom-Img">
+						<!-- <image src="http://fileimg.makalu.cc/WEB_F9F7D5436F8E490EA703E3004D392CD7.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/> -->
+					</view>
+					<view style="padding-left:15rpx;font-size: 30rpx;">
+						<view style="padding-bottom: 20rpx;"> 方案总数 </view>
+						<view> {{dangerName.length}} 个 </view>
+					</view>
+				</view>
+				<view class="weidagongcheng-footer-bottom-left">
+					<view class="weidagongcheng-footer-bottom-Imgs">
+						<!-- <image src="http://fileimg.makalu.cc/WEB_09E02AB78B6C469FABF8982E8C4E83EE.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/> -->
+					</view>
+					<view style="padding-left:15rpx;font-size: 30rpx;">
+						<view style="padding-bottom: 20rpx;"> 方节点数 </view>
+						<view>{{planNodelNumber}} 个</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<!-- 变更签认 -->
+	<view class="biangengqianren">
+			<!-- 标题 -->
+			<view class="weidagongcheng-header">
+			<view class="eharts_title">
+				设计文件管理
+			</view>
+			<view class="weidagongcheng-footer" bindtap="checkSignature">
+				<text>查看详情 </text> 
+				<image src="http://fileimg.makalu.cc/WEB_8F0C5A9F72B4450AAF3362E8FC2CC3D8.png" mode="" style="width: 30rpx;height: 30rpx;margin-left: 10rpx;"/>
+			</view>
+			</view>
+			<!-- 变更签认顶部栏 -->
+			<view class="biangengqianren-title">
+				<view style="display: flex;align-items: center;text-align: center;font-size: 30rpx;">
+					设计变更数:
+					<view style="font-size: 36rpx; color: #6aa7ee;padding-left: 12rpx;">
+						{{constructionNum}}
+					</view>
+				</view>
+				<view  style="display: flex;align-items: center;text-align: center;font-size: 30rpx;">
+					工程签证数:
+					<view style="font-size: 36rpx; color: #6aa7ee;padding-left: 12rpx;">
+						{{alterationNum}}
+					</view>
+				</view>
+			</view>
+			<!-- 数据展示栏 -->
+			<view class="biangengqianren-content">
+				<view class="biangengqianren-content-left"  >
+					<ec-canvas id="mychart-dom" canvas-id="mychart" ec="{{ec}}"></ec-canvas>
+					<!-- <van-circle value="{{bgWTGNumberRate}}" style="margin-left: 55rpx;"  layer-color="#1e4973" color="#68a8f2" stroke-width="3" text="{{bgWTGNumberRate}}%" size="120" />
+					<view style="font-size: 30rpx; color: #ffffff;padding-top: 50rpx;display: flex;align-items: center;text-align: center;margin-left: 100rpx;">
+						未完成:
+						{{bgWTGNumber}}
+					</view> -->
+			
+				</view>
+			
+				<view  class="biangengqianren-content-left">
+					<ec-canvas id="mychart-dom1" canvas-id="mychart1" ec="{{ec1}}"></ec-canvas>
+					<!-- <van-circle value="{{gcWTGNumberRate}}" style="margin-left: 50rpx;"  layer-color="#1e4973" color="#68a8f2" stroke-width="3" text="{{gcWTGNumberRate}}%" size="120" />
+					<view style="font-size: 30rpx; color: #ffffff;padding-top: 50rpx;display: flex;align-items: center;text-align: center;margin-left: 105rpx;">
+						未完成:
+						{{gcWTGNumber}}
+					</view> -->
+				</view>
+			</view>
+	</view>
+	<!-- 科技创新 -->
+	<view class="kejichuangxin">
+			<!-- 标题 -->
+			<view class="weidagongcheng-header">
+			<view class="eharts_title">
+			科技创新({{sciencelnnovateDataList.length}}) 
+			</view>
+			<!-- <view class="weidagongcheng-footer">
+				<view>
+					查看详情
+				</view>
+				<view style="width: 40rpx;height: 40rpx;">
+					<image src="http://fileimg.makalu.cc/WEB_8F0C5A9F72B4450AAF3362E8FC2CC3D8.png" mode="" style="width: 100%;height: 100%;transform: scale(0.6);"/>
+				</view>
+			</view> -->
+			</view>
+			<!-- 科技创新内容 -->
+			<view class="kejichuangxin-content">
+				<view class="kejichuangxin-content-box">
+				<view id="bigBox" style="width: 1852rpx;display: flex;font-size: 30rpx;">
+					<view class="kejichuangxin-content-box-left"  data-set="{{index}}">
+						<view style="margin: 20rpx 0;">
+							课程名称:
+						</view>
+						<view style="color:#68a8f2;">
+							{{sciencelnnovateDataList[index1].name}}
+						</view>
+						<view style="margin: 50rpx 0;">
+							技术指标:
+						</view>
+						<view class="kejichuangxin-content-box-bottom">
+						<!-- 每一个进行中 -->
+							<view class="kejichuangxin-content-box-bottom-small"   
+							wx:for="{{sciencelnnovateDataList[index1].context}}"  wx:key="i">
+
+								<view style="display: flex;align-items: center;width: 150rpx;">
+									<view style="width:20rpx;height: 20rpx;background-color:#68a8f2;border-radius: 50%;margin-right: 10rpx;">
+									</view>
+									<view>
+										{{item.name}}
+									</view>
+								</view>
+								<view style="border: 1px dashed #68a8f2;width: 30%;">
+								</view>
+								<view wx:if="{{item.status=='' ||item.status=='未开始'}}" style="border: 1px solid gray;padding: 0 10rpx;">
+									未涉及
+								</view>
+								<view wx:elif="{{item.status=='进行中'}}" style="border: 1px solid orange;padding: 0 10rpx;">
+									{{item.status}}
+								</view>
+								<view wx:elif="{{item.status=='已完成'}}" style="border: 1px solid green;padding: 0 10rpx;">
+									{{item.status}}
+								</view>
+							</view>
+						</view>
+						<!-- 左键 -->
+						<view class="left-button" bindtap="onLeftBtn">
+							<image src="http://fileimg.makalu.cc/WEB_1CFE1E31022543CB934B01E8777B5907.png" mode="" style="width: 100%;height: 100%;"/>
+						</view>
+						<!-- 右键 -->
+						<view class="right-button" bindtap="onRightBtn">
+							<image src="http://fileimg.makalu.cc/WEB_29360F140971499B92F291E64DA8B748.png" mode="" style="width: 100%;height: 100%;"/>
+						</view>
+					</view>
+				</view>
+				</view>
+			</view>
+	</view>
+	<!-- 四新应用 -->
+	<view class="sixinyinyong">
+		<!-- 标题 -->
+		<view class="weidagongcheng-header">
+			<view class="eharts_title">
+				四新技术推广应用
+			</view>
+			<!-- <view class="weidagongcheng-footer">
+				<view>
+					查看详情
+				</view>
+				<view style="width: 40rpx;height: 40rpx;">
+					<image src="http://fileimg.makalu.cc/WEB_8F0C5A9F72B4450AAF3362E8FC2CC3D8.png" mode="" style="width: 100%;height: 100%;transform: scale(0.6);"/>
+				</view>
+			</view> -->
+		</view>
+		<!-- 应用主题 -->
+		<view class="sixinyinyong-title" style="font-size: 30rpx;">
+			工艺视频({{videoList.length}})
+		</view>
+		<!-- 四新应用图片展示 -->
+		<view class="sixinyinyong-content">
+			<view style="width:520rpx;height: 248rpx;">
+				<swiper circular>
+					<swiper-item wx:for="{{videoList}}" wx:key="videoIndex">
+							<video wx:if="{{item.url !=''}}"  src="{{item.url}}" style="width: 100%;height: 100%;"/>
+					</swiper-item>
+				</swiper>
+			</view>
+		</view>
+	</view>
+	</view>
+	
+</view>
diff --git a/miniprogram/pageage/technical-management/index.wxss b/miniprogram/pageage/technical-management/index.wxss
new file mode 100644
index 0000000..dd24f84
--- /dev/null
+++ b/miniprogram/pageage/technical-management/index.wxss
@@ -0,0 +1,207 @@
+/* pages/technical-management/index.wxss */
+/* 所有样式 */
+
+.All-content{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	padding:0 36rpx;
+}
+/* 头部样式 290+40*/
+.header-content{
+	width: 100%;
+	height: 100rpx;
+	border-radius: 40rpx;
+	margin-bottom: 40rpx;
+}
+/* 标题部分 */
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	font-size: 34rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+  /* 四级交底 */
+  .sijijiaodi{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin: 40rpx 0;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+  }
+  .sijijiaodi-content{
+	padding: 30rpx 20rpx;
+  }
+  .sijijiaodi-content-top{
+	  display: flex;
+	  align-items: center;
+	  padding: 30rpx;
+  }
+  .sijijiaodi-content-top-left{
+	width:100rpx;
+	height:100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_FC70D73C3D5F435FAC8C8A962D5448FA.png") no-repeat center/100% 100%;
+  }
+  .sijijiaodi-content-top-right{
+	width:100rpx;
+	height:100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_E55AA3585A9B4B168401D7647BA9260B.png") no-repeat center/100% 100%;
+  }
+  /* 危大工程 */
+  .weidagongcheng{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+  }
+  .weidagongcheng-header{
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  width: 100%;
+	  height: 40rpx;
+  }
+  .weidagongcheng-footer{
+	  display: flex;
+		align-items: center;
+		padding-right: 30rpx;
+
+  }
+  .weidagongcheng-footer-bottom{
+	display: flex;
+	align-items: center;
+	padding: 30rpx;
+  }
+  .weidagongcheng-footer-bottom-left{
+	  display: flex;
+	  align-items: center;
+	  width: 50%;
+  }
+  .weidagongcheng-footer-bottom-Img{
+	  width:100rpx;
+	  height:100rpx;
+	  background: url(http://fileimg.makalu.cc/WEB_2D6ECDC834D64D8CA1CB91B49E251470.png) no-repeat center/100% 100%;
+  }
+  .weidagongcheng-footer-bottom-Imgs{
+	width:100rpx;
+	height:100rpx;
+	background: url(http://fileimg.makalu.cc/WEB_9903C7AD38DF4AFAA06E66CD2505F8BF.png) no-repeat center/100% 100%;
+}
+  /* 变更签认 */
+  .biangengqianren{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+  }
+  .biangengqianren-title{
+	  display: flex;
+	  justify-content: space-around;
+	  align-items: center;
+	  width: 100%;
+	  height: 80rpx;
+	  margin: 30rpx 0;
+  }
+  .biangengqianren-content{
+	  display: flex;
+	  justify-content: space-around;
+	  /* width: 100%; */
+	  height: 328rpx;
+	  margin-bottom: 30rpx;
+  }
+  .biangengqianren-content-left{
+	  width: 300rpx;
+	  height: 300rpx;
+
+  }
+  /* 科技创新 */
+  .kejichuangxin{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+  }
+  .kejichuangxin-content{
+	  position: relative;
+	  display: flex;
+	  justify-content: center;
+	  width: 100%;
+	  height: 632rpx;
+	  padding: 30rpx 60rpx;
+	  box-sizing: border-box;
+  }
+  .kejichuangxin-content-box{
+	  overflow: hidden;
+	  width: 500rpx;
+	  height: 550rpx;
+  }
+  .kejichuangxin-content-box-left{
+	  width: 500rpx;
+	  height: 550rpx;
+  }
+  .kejichuangxin-content-box-bottom{
+	  width: 500rpx;
+	  height: 224rpx;
+  }
+  .kejichuangxin-content-box-bottom-small{
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  width: 100%;
+	  height: 57rpx;
+  }
+  .left-button{
+	  position: absolute;
+	  left: 0;
+	  top: 50%;
+	  width: 60rpx;
+	  height: 80rpx;
+	  background-color: #202640;
+  }
+  .right-button{
+	position: absolute;
+	right: 0;
+	top: 50%;
+	width: 60rpx;
+	height: 80rpx;
+	background-color: #202640;
+}
+.sixinyinyong{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+.sixinyinyong-title{
+	padding: 50rpx 60rpx 20rpx;
+}
+.sixinyinyong-content{
+	display: flex;
+	justify-content: center;
+	width: 100%;
+	height: 380rpx;
+	box-sizing: border-box;
+	padding: 50rpx 60rpx 20rpx;
+}
+.biangengqianren-content-left .van-circle__text {
+	color: #68a8f2;
+	font-size: 50rpx;
+	font-weight: bolder;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/vehicleManage/index.js b/miniprogram/pageage/vehicleManage/index.js
new file mode 100644
index 0000000..19a5fe2
--- /dev/null
+++ b/miniprogram/pageage/vehicleManage/index.js
@@ -0,0 +1,140 @@
+// pages/vehicleManage/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    show: false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    management:[],
+    imgShow:false,
+    imgUrl:'',
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    this.onLoad();
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        console.log(res.data);
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+        })  
+        that.getVehicleManagement();
+      }
+    }) 
+  },
+
+  /**
+   * 车辆管理
+   */
+  getVehicleManagement:function(){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getVehicleManagement',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId
+      },
+      success: resData => {
+          this.onClickHide();
+          let management =resData.data.code == 200?resData.data.data:[];
+          
+          this.setData({
+            management:management
+          })
+      }
+    })
+  },
+
+  //打开放大的图片
+  enlargeImage(e){
+    this.setData({
+      imgUrl:e.currentTarget.dataset.url,
+      imgShow:true
+    })
+  },
+  //关闭放大的图片
+  closeImages(){
+    this.setData({
+      imgShow:false
+    })
+  },
+
+
+  /**
+   * 视频页面跳转
+   */
+  videoPageJump(e){
+    let index = e.currentTarget.dataset.index
+    if(index == 1){
+      wx.redirectTo({
+        url: '../xiangmushipin/xiangmushipin',
+      })
+    }else if(index == 2){
+      wx.redirectTo({
+        url: '../AIvideoAnalysis/index',
+      })
+    }
+  },
+
+  /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/vehicleManage/index.json b/miniprogram/pageage/vehicleManage/index.json
new file mode 100644
index 0000000..72baba4
--- /dev/null
+++ b/miniprogram/pageage/vehicleManage/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" ,
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/vehicleManage/index.wxml b/miniprogram/pageage/vehicleManage/index.wxml
new file mode 100644
index 0000000..7c44a1c
--- /dev/null
+++ b/miniprogram/pageage/vehicleManage/index.wxml
@@ -0,0 +1,123 @@
+<!--pages/vehicleManage/index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">项目视频</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup>
+
+<view class="max_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+  <view class="modify_video_nav">
+      <view bindtap="videoPageJump" data-index="1"><text>视频管理</text></view>
+      <view bindtap="videoPageJump" data-index="2"><text>AI视频分析</text></view>
+      <view class="active" bindtap="videoPageJump" data-index="3"><text>车辆管理</text></view>
+  </view>
+
+  <view class="video_num">
+    <van-row>
+      <van-col span="12">
+        <view class="video_icon">
+          <image src="http://fileimg.makalu.cc/WEB_0E744AAFAB1E4A20AD31C0CB6C1DF0B7.png"></image>
+          今日进场数：
+          <!-- <text>0</text>
+          个 -->
+        </view>
+      </van-col>
+      <van-col span="12">
+        <view class="video_icon">
+          <image src="http://fileimg.makalu.cc/WEB_A2C4B56EC94741598A8ABF456B00BD22.png"></image>
+          今日出场数：
+          <!-- <text>0</text>
+          个 -->
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+ 
+  <van-sticky  offset-top="{{ 78 }}">
+    <view class="vehicle_video_nav_max">
+      <view class="vehicle_video_nav_min">
+        <view class="vehicle_video_nav active">门口1(0)</view>
+        <view class="vehicle_video_nav ">门口1(0)</view>
+        <view class="vehicle_video_nav ">门口1(0)</view>
+      </view>
+    </view>
+  </van-sticky>
+
+  <view class="modify_echarts_max">
+    <view class="modify_echarts_title_min">
+        <view class="modify_eharts_title">车辆识别视频</view> 
+    </view>
+    <view class="modify_vehicle_video">
+      <video></video>
+    </view>
+  </view>
+  <view class="modify_echarts_max">
+    <view class="modify_echarts_title_min">
+        <view class="modify_eharts_title">车辆识别列表</view> 
+        <!-- <view class="modify_list_btn">车辆识别列表 》</view> -->
+    </view>
+    <view class="modify_list_license_plate_max">
+      <!-- <view class="modify_list_license_plate"> 陕A123456 </view> -->
+      <view class="modify_list_license_photo">
+          <view class="modify_list_license_direction">进出场照片</view>
+          <view>
+            <van-row>
+              <van-col span="12" wx:for="{{management}}" wx:if="{{index<20}}">
+                <view class="modify_list_photos_max">
+                  <view class="modify_list_photos_min">
+                      <image src="{{item.photoUrl}}" bindtap="enlargeImage" data-url="{{item.photoUrl}}"></image>
+                  </view>
+                  <view class="modify_list_photos_time">{{item.uploadTime}}</view>
+                </view>
+              </van-col>
+            </van-row>
+          </view>   
+      </view>
+    </view>  
+  </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
+<!-- 图片放大弹窗 -->
+<view class="popup_img" wx:if="{{imgShow}}">
+  <view class="popup_images" bindtap="closeImages"
+  style="background: url('{{imgUrl}}') no-repeat center/100%"></view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pageage/vehicleManage/index.wxss b/miniprogram/pageage/vehicleManage/index.wxss
new file mode 100644
index 0000000..eee6e44
--- /dev/null
+++ b/miniprogram/pageage/vehicleManage/index.wxss
@@ -0,0 +1,18 @@
+/* pages/vehicleManage/index.wxss */
+.custom_style{
+    background: none !important;
+}
+.popup_img{
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    background: rgba(0,0,0,0.6);
+    z-index: 100;
+}
+.popup_images{
+    width: 100%;
+    height: 100%;
+    
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/voucherManagement/index.js b/miniprogram/pageage/voucherManagement/index.js
new file mode 100644
index 0000000..25c84d7
--- /dev/null
+++ b/miniprogram/pageage/voucherManagement/index.js
@@ -0,0 +1,167 @@
+// pages/voucherManagement/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    DeviceGroupData: [],
+    DocumentList:[],
+    show: false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    monthCount:0,
+    weekCount:0,
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+	  this.onLoad();
+  },
+
+  //筛选条件
+  screenCondition(e){
+    console.log(e.detail)
+    this.getDocumentList(e.detail.typeId,e.detail.startDate,e.detail.endTime)
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+    
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        console.log(res.data);
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+        })  
+
+        that.getDocumentType();
+        that.getDocumentList('','','');
+      }
+    }) 
+  },
+
+  /**
+   * 凭证类型
+   */
+  getDocumentType:function(){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getDocumentType',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+      },
+      success: resData => {
+          this.onClickHide();
+          if(resData.data.code == 200){
+            let DeviceGroupData = resData.data.data;
+            let list = [];
+            for(let i = 0;i<DeviceGroupData.length;i++){
+              list.push({"id":DeviceGroupData[i].id,"text":DeviceGroupData[i].name});
+            }
+            this.setData({
+              DeviceGroupData:list
+            })
+          }
+      }
+    })
+  },
+
+  /**
+   * 凭证列表
+   */
+  getDocumentList:function(type,beginTime,endTime){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getDocumentList',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+        type:type,
+        beginTime:beginTime,
+        endTime:endTime
+      },
+      success: resData => {
+          this.onClickHide();
+          console.log(resData.data);
+          if(resData.data.code == 200){
+            this.setData({
+              DocumentList:resData.data.data,
+              weekCount:resData.data.weekCount,
+              monthCount:resData.data.monthCount
+            })
+          }else{
+            this.setData({
+              DocumentList:[],
+              weekCount:0,
+              monthCount:0
+            })
+          }
+      }
+    })
+  },
+
+  /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+
+  /**
+   * 跳转到add页面
+   */
+  add:function(){
+    wx.navigateTo({
+      url: '../voucherManagementAddto/index?projectName='+this.data.projectName+"&projectId="+this.data.projectId,
+    })
+  }
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/voucherManagement/index.json b/miniprogram/pageage/voucherManagement/index.json
new file mode 100644
index 0000000..a3ad9fd
--- /dev/null
+++ b/miniprogram/pageage/voucherManagement/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" ,
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationBarTitleText": "凭证管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/voucherManagement/index.wxml b/miniprogram/pageage/voucherManagement/index.wxml
new file mode 100644
index 0000000..db817bc
--- /dev/null
+++ b/miniprogram/pageage/voucherManagement/index.wxml
@@ -0,0 +1,109 @@
+<!--pages/voucherManagement/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">凭证管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+
+<view class="max_new_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+  <view class="video_num" style="margin-top:24rpx">
+    <van-row>
+      <van-col span="12">
+        <view class="video_icon">
+          <image src="http://fileimg.makalu.cc/WEB_85C3C298686948FCBB547946729B3F2D.png"></image>
+          本周上传：
+          <text>{{weekCount}}</text>
+          个
+        </view>
+      </van-col>
+      <van-col span="12">
+        <view class="video_icon">
+          <image src="http://fileimg.makalu.cc/WEB_85C3C298686948FCBB547946729B3F2D.png"></image>
+          本月上传：
+          <text>{{monthCount}}</text>
+          个
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+
+  <view class="modify_echarts_max">
+    <view class="modify_echarts_title_min">
+        <view class="modify_eharts_title">凭证列表</view> 
+        <pz-screen columns="{{DeviceGroupData}}" bindscreen="screenCondition"></pz-screen>
+    </view>
+    
+    <view class="pz_list_max">
+
+      <view class="pz_list_for" wx:for="{{DocumentList}}" wx:key="index">
+        <view class="timeline_for_title">
+            <view>{{item.typeNameStr}}</view>
+        </view>
+        <view class="timeline_for_list pz_list_for_list">
+          <view>发生时间：</view>
+          <view class="timeline_for_time">{{item.createTime}}</view>
+        </view>
+        <view class="timeline_for_list pz_list_for_list">
+          <view>上传时间：</view>
+          <view class="timeline_for_time">{{item.time}}</view>
+        </view>
+        <view class="timeline_for_list pz_list_for_list">
+          <view>备注：</view>
+          <view class="timeline_for_time">{{item.remarks}}</view>
+        </view>
+        <view class="timeline_for_file pz_list_for_list">
+            <view class="timeline_for_list_title">凭证图片：</view>
+            <view class="timeline_for_list_file">
+              <van-uploader file-list="{{ item.sonRul}}" show-upload="{{fales}}" deletable="{{fales}}"/>
+            </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+<view class="add_to_btn" bindtap="add">
+  <image src="http://fileimg.makalu.cc/WEB_A1ECB16C8BC34DECAED9C4701AAE813F.png"></image>
+  <text>新增</text>
+</view>
+
+
+<van-toast id="van-toast" />
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/voucherManagement/index.wxss b/miniprogram/pageage/voucherManagement/index.wxss
new file mode 100644
index 0000000..c5e0203
--- /dev/null
+++ b/miniprogram/pageage/voucherManagement/index.wxss
@@ -0,0 +1,17 @@
+/* pages/voucherManagement/index.wxss */
+.van-uploader__preview-image{
+  width: 140rpx !important;
+  height: 140rpx !important;
+}
+.van-picker__mask {
+  background-image: none !important;
+}
+
+.van-hairline--top-bottom:after {
+  border-top: 1px solid #3a4c8b !important;
+  border-bottom: 1px solid #3a4c8b !important;
+}
+
+.van-picker {
+  background: none !important;
+}
diff --git a/miniprogram/pageage/voucherManagementAddto/index.js b/miniprogram/pageage/voucherManagementAddto/index.js
new file mode 100644
index 0000000..9685a07
--- /dev/null
+++ b/miniprogram/pageage/voucherManagementAddto/index.js
@@ -0,0 +1,202 @@
+// pages/voucherManagementAddto/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    projectNameList:[],
+    voucherTypeList:[],
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    fileList:[],
+    //参数
+    voucherType:'',
+    happenTime:'',
+    uploadTime:'',
+    remarks:'',
+  },
+
+  //选择项目名称
+  onSelectProjectName(e){
+    console.log(e.detail)
+    this.setData({
+      projectId:e.detail.id,
+      projectName:e.detail.text
+    })
+  },
+  //选择凭证类型
+  onSelectVoucherType(e){
+    console.log(e.detail)
+    this.setData({
+      voucherType:e.detail.id
+    })
+  },
+  //发生时间
+  onOccurrenceTime(e){
+    console.log(e.detail)
+    this.setData({
+      happenTime:e.detail
+    })
+  },
+  //上传时间
+  onUploadTime(e){
+    console.log(e.detail)
+    this.setData({
+      uploadTime:e.detail
+    })
+  },
+  //备注
+  remarks(e){
+    console.log(e.detail.value);
+    this.setData({
+      remarks:e.detail.value
+    })
+  },
+
+  
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log(options)
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        console.log(res.data);
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectNameList:[{text:options.projectName,id:options.projectId}]
+        })  
+        that.getDocumentType();
+      }
+    }) 
+  },
+
+  /**
+   * 凭证类型
+   */
+  getDocumentType:function(){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getDocumentType',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+      },
+      success: resData => {
+          this.onClickHide();
+          if(resData.data.code == 200){
+            let DeviceGroupData = resData.data.data;
+            let list = [];
+            for(let i = 0;i<DeviceGroupData.length;i++){
+              list.push({"id":DeviceGroupData[i].id,"text":DeviceGroupData[i].name});
+            }
+            this.setData({
+              voucherTypeList:list
+            })
+          }
+      }
+    })
+  },
+
+  onImagesArr(e){
+    // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+    wx.uploadFile({
+      //图片上传地址
+      url: app.globalData.reqUrl+'/weixin/security/fileUpload',
+      filePath: e.detail[0],
+      name: 'file',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+      },
+      formData: { user: 'test' },
+      success:res => {
+        let data = JSON.parse(res.data);
+        // 上传完成需要更新 fileList
+        let fileList = this.data.fileList
+        fileList.push(data);
+        this.setData({ fileList:fileList});
+      },
+    });
+  },
+
+  add:function(){
+    //判断值是否为空
+    if(this.data.projectId == '' || this.data.projectId == undefined){
+      app.toast("请选择项目");
+      return;
+    }else if(this.data.voucherType == '' || this.data.voucherType == undefined){
+      app.toast("请选择凭证类型");
+      return;
+    }else if(this.data.happenTime == '' || this.data.happenTime == undefined){
+      app.toast("请选择发生时间");
+      return;
+    }else if(this.data.uploadTime == '' || this.data.uploadTime == undefined){
+      app.toast("请选择上传时间");
+      return;
+    }else if(this.data.fileList.length == 0){
+      app.toast("请上传文件");
+      return;
+    }
+    console.log(this.data.fileList);
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url:app.globalData.reqUrl+'/weixin/security/addDocumentData',
+      data:{
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+        projectName:this.data.projectName,
+        type:this.data.voucherType,
+        createTime:this.data.happenTime,
+        time:this.data.uploadTime,
+        createUser:this.data.loginName,
+        userName:this.data.userName,
+        remarks:this.data.remarks,
+        djCertificatesonList:JSON.stringify(this.data.fileList)
+      },
+      method:"POST",
+     success:function(res){
+       console.log(res.data);
+       if(res.data.code == 200){
+        wx.redirectTo({
+          url: '../voucherManagement/index',
+        })
+       }else{
+         app.toast("添加失败");
+         return;
+       }
+     }
+    })
+  },
+
+  /**
+   * 返回凭证管理
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../voucherManagement/index'
+    })
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/voucherManagementAddto/index.json b/miniprogram/pageage/voucherManagementAddto/index.json
new file mode 100644
index 0000000..ffd5947
--- /dev/null
+++ b/miniprogram/pageage/voucherManagementAddto/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationBarTitleText": "新增凭证"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/voucherManagementAddto/index.wxml b/miniprogram/pageage/voucherManagementAddto/index.wxml
new file mode 100644
index 0000000..fd5bc54
--- /dev/null
+++ b/miniprogram/pageage/voucherManagementAddto/index.wxml
@@ -0,0 +1,62 @@
+<!--pages/voucherManagementAddto/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+     
+      <van-col span="7">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">新增凭证</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+
+<view class="max_new_content">
+    <view class="add_max">
+        <view class="add_title">项目名称</view>
+        <voucher-select columns="{{projectNameList}}" placeholder="请选择项目名称" bindchange="onSelectProjectName"></voucher-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">凭证类型</view>
+        <voucher-select columns="{{voucherTypeList}}" placeholder="请选择凭证类型" bindchange="onSelectVoucherType"></voucher-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">发生时间</view>
+        <voucher-date counts="5" placeholder="请选择发生时间" bindchange="onOccurrenceTime"></voucher-date>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">上传时间</view>
+        <voucher-date counts="5" placeholder="请选择上传时间" bindchange="onUploadTime"></voucher-date>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">备注</view>
+        <textarea  class="add_textarea" placeholder="请填写备注" placeholder-style="color:#6777aa;" bindinput="remarks" />
+    </view>
+
+    <view class="add_max">
+        <view class="add_title">上传凭证</view>
+        <file-uploader  bindimages="onImagesArr"></file-uploader>
+    </view>
+
+    <view class="add_btn">
+        <view class="add_btn_qx" bindtap="goGCLB">取消</view>
+        <view class="add_btn_bc" bindtap="add">保存</view>
+    </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
diff --git a/miniprogram/pageage/voucherManagementAddto/index.wxss b/miniprogram/pageage/voucherManagementAddto/index.wxss
new file mode 100644
index 0000000..4e23589
--- /dev/null
+++ b/miniprogram/pageage/voucherManagementAddto/index.wxss
@@ -0,0 +1,14 @@
+/* pages/voucherManagementAddto/index.wxss */
+.van-picker__mask  {
+    background-image: none !important;
+  }
+  .van-hairline--top-bottom:after {
+    border-top: 1px solid #3a4c8b !important;
+    border-bottom: 1px solid #3a4c8b !important;
+  }
+
+
+  
+  .van-picker {
+    background: none !important;
+  }
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js
new file mode 100644
index 0000000..2094c76
--- /dev/null
+++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js
@@ -0,0 +1,922 @@
+
+import * as echarts from '../../ec-canvas/echarts';
+const app = getApp();
+
+//pm2.5及pm10折线图
+var xData_1 = [];
+function initChart_1(chart_1, xData_1, yData_1_1, yData_1_2) {
+    var option_1 = {
+        color: ['#ffa245', '#5a8df6'],
+        tooltip: {
+            trigger: 'axis'
+        },
+        legend: {
+            data: ['PM2.5', 'PM10'],
+            textStyle: {
+                color: "#fff",
+                fontSize: 10
+            }
+        },
+        grid: {
+            top: '22%',
+            left: '0%',
+            right: '1%',
+            bottom: '0%',
+            containLabel: true
+        },
+        xAxis: [{
+            type: 'category',
+            boundaryGap: false,
+            data: xData_1,
+            axisTick: {
+                show: false
+            },
+            axisLine: {
+                lineStyle: {
+                    color: 'rgba(39,51,75,0.8)'
+                }
+            },
+            axisLabel: {
+                color: '#a2d4e6',
+                rotate: 45,
+                textStyle: {
+                    fontSize: 10
+                },
+            },
+        }],
+        yAxis: {
+            type: 'value',
+            name: "ug/m³",
+            nameTextStyle: {
+                color: "#008fe9",
+                fontSize: 11
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: "#008fe9",
+                    fontSize: 10
+                }
+            },
+            splitLine: {
+                show: true,
+                lineStyle: {
+                    color: 'rgba(39,51,75,0.5)'
+                }
+            },
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: 'rgba(39,51,75,0.8)'
+                }
+            },
+        },
+        series: [
+            {
+                name: 'PM2.5',
+                type: 'line',
+                data: yData_1_1,
+                symbol: 'circle',
+                smooth: true,
+                lineStyle: {
+                    color: '#ffa245',
+                    width: 3
+                },
+            },
+            {
+                name: 'PM10',
+                type: 'line',
+                data: yData_1_2,
+                symbol: 'circle',
+                smooth: true,
+                lineStyle: {
+                    color: '#5a8df6',
+                    width: 3
+                },
+            }
+        ]
+    }
+    chart_1.setOption(option_1);
+}
+
+//噪音折线图
+function initChart_2(chart_2, xData_2, yData_2) {
+    var option_2 = {
+        color: ['#5a8df6'],
+        tooltip: {
+            trigger: 'axis'
+        },
+        legend: {
+            data: ['噪音'],
+            textStyle: {
+                color: "#fff",
+                fontSize: 10
+            }
+        },
+        grid: {
+            top: '22%',
+            left: '0%',
+            right: '1%',
+            bottom: '0%',
+            containLabel: true
+        },
+        xAxis: [{
+            type: 'category',
+            boundaryGap: false,
+            data: xData_2,
+            axisTick: {
+                show: false
+            },
+            axisLine: {
+                lineStyle: {
+                    color: 'rgba(39,51,75,0.8)'
+                }
+            },
+            axisLabel: {
+                color: '#a2d4e6',
+                rotate: 45,
+                textStyle: {
+                    fontSize: 10
+                },
+            },
+        }],
+        yAxis: {
+            type: 'value',
+            name: "db",
+            nameTextStyle: {
+                color: "#008fe9",
+                fontSize: 11
+            },
+            axisLabel: {
+                show: true,
+                textStyle: {
+                    color: "#008fe9",
+                    fontSize: 10
+                }
+            },
+            splitLine: {
+                show: true,
+                lineStyle: {
+                    color: 'rgba(39,51,75,0.5)'
+                }
+            },
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: 'rgba(39,51,75,0.8)'
+                }
+            },
+        },
+        series: [
+            {
+                name: '噪音',
+                type: 'line',
+                data: yData_2,
+                symbol: 'circle',
+                smooth: true,
+                lineStyle: {
+                    color: '#5a8df6',
+                    width: 3
+                },
+            }
+        ]
+
+    }
+    chart_2.setOption(option_2);
+}
+
+//环境管理pm2.5饼图
+function initChart_3(chart_3, dataArr_3) {
+    var option_3 = {
+        series: [{
+            name: "外部进度条",
+            type: "gauge",
+            center: ['23%', '55%'],
+            radius: '90%',
+            min: 0, //最小刻度
+            max: 300, //最大刻度
+            splitNumber: 6,
+            startAngle: 230,
+            endAngle: -50,
+            axisLine: {
+                lineStyle: {
+                    color: [
+                        [dataArr_3 / 300, "#468EFD"],
+                        [1, "#1e4973"]
+                    ],
+                    width: 8
+                }
+            },
+            axisLabel: {
+                show: false,
+            },
+            axisTick: {
+                show: false,
+
+            },
+            splitLine: {
+                show: false,
+            },
+            itemStyle: {
+                show: false,
+            },
+            detail: {
+                formatter: function (value) {
+                    if (value !== 0) {
+                        var num = Math.round(value);
+                        return parseInt(num).toFixed(0);
+                    } else {
+                        return 0;
+                    }
+                },
+                textStyle: {
+                    padding: [-50, 0, 0, 0],
+                    fontSize: 10,
+                    color: '#00f4ff',
+                    fontSize: 25,
+                    fontWeight: 900
+                }
+            },
+            title: { //标题
+                show: true,
+                offsetCenter: [0, 50], // x, y，单位px
+                textStyle: {
+                    color: "#00c3fd",
+                    fontSize: 14, //表盘上的标题文字大小
+                }
+            },
+            data: [{
+                name: "PM2.5",
+                value: dataArr_3,
+            }],
+            pointer: {
+                show: true,
+                length: '75%',
+                radius: '20%',
+                width: 2, //指针粗细
+            },
+            animationDuration: 4000,
+        },
+        {
+            name: '内部刻度',
+            type: 'gauge',
+            center: ['23%', '55%'],
+            radius: '65%',
+            min: 0, //最小刻度
+            max: 300, //最大刻度
+            splitNumber: 6, //刻度数量
+            startAngle: 230,
+            endAngle: -50,
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    width: 1,
+                    color: [
+                        [1, 'rgba(0,0,0,0)']
+                    ]
+                }
+            }, //仪表盘轴线
+
+            axisLabel: {
+                show: true,
+                color: '#4d5bd1',
+                distance: 10,
+                textStyle: {
+                    color: '#468EFD', //用颜色渐变函数不起作用
+                    fontSize: 10,
+                },
+
+            }, //刻度标签。
+            axisTick: {
+                show: true,
+                splitNumber: 5,
+                lineStyle: {
+                    color: '#468EFD', //用颜色渐变函数不起作用
+                    width: 1,
+                },
+                length: -6
+            }, //刻度样式
+            splitLine: {
+                show: true,
+                length: -8,
+                lineStyle: {
+                    color: '#468EFD', //用颜色渐变函数不起作用
+                }
+            }, //分隔线样式
+            detail: {
+                show: false
+            },
+            pointer: {
+                show: false
+            }
+        },
+        ]
+    };
+    chart_3.setOption(option_3);
+}
+
+//环境管理pm10饼图
+function initChart_4(chart_4, dataArr_4) {
+    var option_4 = {
+        series: [{
+            name: "外部进度条",
+            type: "gauge",
+            center: ['77%', '55%'],
+            radius: '90%',
+            min: 0, //最小刻度
+            max: 150, //最大刻度
+            splitNumber: 6,
+            startAngle: 230,
+            endAngle: -50,
+            axisLine: {
+                lineStyle: {
+                    color: [
+                        [dataArr_4 / 150, "#468EFD"],
+                        [1, "#1e4973"]
+                    ],
+                    width: 8
+                }
+            },
+            axisLabel: {
+                show: false,
+            },
+            axisTick: {
+                show: false,
+
+            },
+            splitLine: {
+                show: false,
+            },
+            itemStyle: {
+                show: false,
+            },
+            detail: {
+                formatter: function (value) {
+                    if (value !== 0) {
+                        var num = Math.round(value);
+                        return parseInt(num).toFixed(0);
+                    } else {
+                        return 0;
+                    }
+                },
+                textStyle: {
+                    padding: [-50, 0, 0, 0],
+                    fontSize: 10,
+                    color: '#00f4ff',
+                    fontSize: 25,
+                    fontWeight: 900
+                }
+            },
+            title: { //标题
+                show: true,
+                offsetCenter: [0, 50], // x, y，单位px
+                textStyle: {
+                    color: "#00c3fd",
+                    fontSize: 14, //表盘上的标题文字大小
+                }
+            },
+            data: [{
+                name: "PM10",
+                value: dataArr_4,
+            }],
+            pointer: {
+                show: true,
+                length: '75%',
+                radius: '20%',
+                width: 2, //指针粗细
+            },
+            animationDuration: 4000,
+        },
+        {
+            name: '内部刻度',
+            type: 'gauge',
+            center: ['77%', '55%'],
+            radius: '65%',
+            min: 0, //最小刻度
+            max: 150, //最大刻度
+            splitNumber: 6, //刻度数量
+            startAngle: 230,
+            endAngle: -50,
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    width: 1,
+                    color: [
+                        [1, 'rgba(0,0,0,0)']
+                    ]
+                }
+            }, //仪表盘轴线
+
+            axisLabel: {
+                show: true,
+                color: '#4d5bd1',
+                distance: 10,
+                textStyle: {
+                    color: '#468EFD', //用颜色渐变函数不起作用
+                    fontSize: 10,
+                },
+
+            }, //刻度标签。
+            axisTick: {
+                show: true,
+                splitNumber: 5,
+                lineStyle: {
+                    color: '#468EFD', //用颜色渐变函数不起作用
+                    width: 1,
+                },
+                length: -6
+            }, //刻度样式
+            splitLine: {
+                show: true,
+                length: -8,
+                lineStyle: {
+                    color: '#468EFD', //用颜色渐变函数不起作用
+                }
+            }, //分隔线样式
+            detail: {
+                show: false
+            },
+            pointer: {
+                show: false
+            }
+        },
+        ]
+    };
+    chart_4.setOption(option_4);
+}
+
+Page({
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        active: 3,
+        show: false,
+        value1: "实时",
+        value2: "实时",
+        actions1: [{ name: '实时', }, { name: '本月', },],
+        actions2: [{ name: '实时', }, { name: '本月', },],
+        ec_1: {
+            lazyLoad: true //动态加载
+        },
+        ec_2: {
+            lazyLoad: true //动态加载
+        },
+        ec_3: {
+            lazyLoad: true //动态加载
+        },
+        ec_4: {
+            lazyLoad: true //动态加载
+        },
+        projectName: '',
+        projectId: '',
+        weather: '',
+        weatherPic: '',
+        temperature: '',
+        dayEarlyNum: '',
+        monthEarlyNum: '',
+        yangchenCount: '',
+        loginName: '',
+        userName: '',
+        //数据加载参数
+        loadShow: false,
+
+        initData: {},
+
+        label_1: '24小时PM2.5，PM10的平均浓度',
+        label_2: '24小时噪音的平均分贝',
+        projectData:{}
+    },
+
+    //项目切换 返回值
+    onProjectSelect(e) {
+        this.onClickShow();
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        this.setData({
+            projectId: projectId,
+            projectName: projectName
+        })
+        this.onLoad();
+    },
+
+    showPopup() {
+        this.setData({ show: true });
+    },
+
+    onClose() {
+        this.setData({ show: false });
+        this.setData({ show1: false });
+        this.setData({ show2: false });
+    },
+
+    onclick1() {
+        this.setData({ show1: true });
+    },
+    onclick2() {
+        this.setData({ show2: true });
+    },
+
+    onSelect1(event) {
+        console.log(event)
+        var that = this;
+        that.setData({
+            value1: event.detail.name,
+        });
+        //PM实时与本月数据切换
+        let type = "";
+        if (event.detail.name == '实时') {
+            type = "1"
+            this.setData({
+                label_1: '24小时PM2.5，PM10的平均浓度'
+            })
+            wx.request({
+                url: app.globalData.szhUrl + '/mkl/api/getEnvironmentCloseHoursInfo',
+                method: "GET",
+                data: {
+                    projectId: that.data.projectData.szh
+                },
+                success: function (res) {
+                    let time = []
+                    let pm25 = []
+                    let pm10 = []
+                    res.data.data.map(item => {
+                        time.push(item.date.split(" ")[1].split(":")[0])
+                        pm25.push(item.pm25)
+                        pm10.push(item.pm10)
+                    })
+                    that.init_one(time, pm25, pm10);
+                }
+            })
+        } else {
+            type = "2"
+            this.setData({
+                label_1: '本月PM2.5，PM10的平均浓度'
+            })
+            wx.request({
+                url: app.globalData.szhUrl + '/mkl/api/getEnvironmentMonthData',
+                method: "GET",
+                data: {
+                    projectId: that.data.projectData.szh
+                },
+                success: function (res) {
+                    let time = []
+                    let pm25 = []
+                    let pm10 = []
+                    res.data.data.map(item => {
+                        time.push(item.createTime.split(" ")[0])
+                        pm25.push(item.pm25)
+                        pm10.push(item.pm10)
+                    })
+                    that.init_one(time, pm25, pm10);
+                }
+            })
+        }
+        // wx.request({
+        //     url: app.globalData.reqUrl + '/weixin/applets/selectPM25',
+        //     method: "GET",
+        //     data: {
+        //         projectId: this.data.projectData.szh,
+        //         type: type
+        //     },
+        //     success: function (res) {
+        //         that.init_one(res.data.time, res.data.pm25, res.data.pm10)
+        //     }
+        // })
+    },
+
+    onSelect2(event) {
+        var that = this;
+        that.setData({
+            value2: event.detail.name,
+        });
+        //噪音实时与本月数据切换
+        let type = "";
+        if (event.detail.name == '实时') {
+            type = "1"
+            this.setData({
+                label_2: '24小时噪音的平均分贝'
+            })
+            wx.request({
+                url: app.globalData.szhUrl + '/mkl/api/getEnvironmentCloseHoursInfo',
+                method: "GET",
+                data: {
+                    projectId: that.data.projectData.szh
+                },
+                success: function (res) {
+                    let time = []
+                    let noise = []
+                    res.data.data.map(item => {
+                        time.push(item.date.split(" ")[1].split(":")[0])
+                        noise.push(item.noise)
+                    })
+                    that.init_two(time, noise);
+                }
+            })
+        } else {
+            type = "2"
+            this.setData({
+                label_2: '本月噪音的平均分贝'
+            })
+            wx.request({
+                url: app.globalData.szhUrl + '/mkl/api/getEnvironmentMonthData',
+                method: "GET",
+                data: {
+                    projectId: that.data.projectData.szh
+                },
+                success: function (res) {
+                    let time = []
+                    let noise = []
+                    res.data.data.map(item => {
+                        time.push(item.createTime.split(" ")[0])
+                        noise.push(item.noise)
+                    })
+                    that.init_two(time, noise);
+                }
+            })
+        }
+        // wx.request({
+        //     url: app.globalData.reqUrl + '/weixin/applets/selectNoiseDB',
+        //     method: "GET",
+        //     data: {
+        //         projectId: this.data.projectData.szh,
+        //         type: type
+        //     },
+        //     success: function (res) {
+        //         that.init_two(res.data.time, res.data.DB);
+        //     }
+        // })
+    },
+
+    //初始化pm2.5及pm10折线图
+    init_one: function (xData_1, yData_1_1, yData_1_2) {
+        this.oneComponent.init((canvas, width, height, dpr) => {
+            const chart = echarts.init(canvas, null, {
+                width: width,
+                height: height,
+                devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+            });
+            //赋值给echart图表
+            initChart_1(chart, xData_1, yData_1_1, yData_1_2)
+            this.chart = chart;
+            return chart;
+        });
+    },
+
+    //初始化噪音折线图
+    init_two: function (xData_2, yData_2) {
+        this.twoComponent.init((canvas, width, height, dpr) => {
+            const chart = echarts.init(canvas, null, {
+                width: width,
+                height: height,
+                devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+            });
+            //赋值给echart图表
+            initChart_2(chart, xData_2, yData_2)
+            this.chart = chart;
+            return chart;
+        });
+    },
+
+    //初始化环境管理pm2.5饼图
+    init_three: function (dataArr_3) {
+        this.threeComponent.init((canvas, width, height, dpr) => {
+            const chart = echarts.init(canvas, null, {
+                width: width,
+                height: height,
+                devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+            });
+            //赋值给echart图表
+            initChart_3(chart, dataArr_3)
+            this.chart = chart;
+            return chart;
+        });
+    },
+
+    //初始化环境管理pm10饼图
+    init_four: function (dataArr_4) {
+        this.fourComponent.init((canvas, width, height, dpr) => {
+            const chart = echarts.init(canvas, null, {
+                width: width,
+                height: height,
+                devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+            });
+            //赋值给echart图表
+            initChart_4(chart, dataArr_4)
+            this.chart = chart;
+            return chart;
+        });
+    },
+
+    onClickShow() {
+        this.setData({ loadShow: true });
+    },
+
+    onClickHide() {
+        this.setData({ loadShow: false });
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        console.log(app.globalData)
+        var that = this;
+        //加载蒙版
+        this.onClickShow();
+        //获取缓存数据
+        wx.getStorage({
+            key: 'userinfo',
+            success: function (res) {
+                that.setData({
+                    loginName: res.data.loginName,
+                    userName: res.data.userName,
+                    projectId: app.globalData.projectId,
+                    projectName: app.globalData.projectName,
+                    initData: { text: app.globalData.projectName, id: app.globalData.projectId }
+                })
+            }
+        });
+
+        //根据ID获取组件对象
+        this.oneComponent = this.selectComponent('#mychart-one');
+        this.twoComponent = this.selectComponent('#mychart-two');
+        this.threeComponent = this.selectComponent('#mychart-three');
+        this.fourComponent = this.selectComponent('#mychart-four');
+        this.getProjectCorrespondence(app.globalData.projectId);
+        //初始化加载项目信息加载天气信息
+        this.getProjectlngandlat(app.globalData.projectId);
+    },
+    /**
+     * 项目对应关系
+     */
+    getProjectCorrespondence(projectId) {
+        var that = this;
+        wx.request({
+            url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+            data: {
+                "projectId": projectId,
+            },
+            method: "get",
+            success: function (res) {
+                console.log(res.data);
+                that.setData({
+                    projectData: res.data
+                })
+            }
+        })
+    },
+    // 底部导航
+    onChange(event) {
+        // event.detail 的值为当前选中项的索引
+        this.setData({ active: event.detail });
+    },
+
+    //根据项目id查询出项目经纬度
+    getProjectlngandlat: function (even) {
+        var that = this;
+        wx.request({
+            url: app.globalData.reqUrl + '/weixin/projectInfo/getProjectFoundation',
+            data: {
+                "id": even
+            },
+            method: "GET",
+            success: function (res) {
+
+                //加载天气信息
+                wx.request({
+                    url: app.globalData.reqUrl + '/weixin/applets/selectWeather',
+                    method: "GET",
+                    data: {
+                        lng: res.data.longitude,
+                        lat: res.data.latitude,
+                    },
+                    success: function (weatherRes) {
+                        that.setData({
+                            weather: weatherRes.data.weather,
+                            weatherPic: weatherRes.data.weatherPic,
+                            temperature: weatherRes.data.temperature
+                        })
+                    }
+                })
+
+                //查询出实时的PM2.5和PM10数据
+                if (even == 3) {
+                    wx.request({
+                        url: app.globalData.szhUrl + '/mkl/api/queryEnvironment',
+                        method: "GET",
+                        data: {
+                            projectId: 132
+                        },
+                        success: function (res) {
+                            that.init_three(res.data.data.pm25);
+                            that.init_four(res.data.data.pm10);
+                        }
+                    })
+                } else {
+                    wx.request({
+                        url: app.globalData.reqUrl + '/weixin/applets/selectEnvironmental',
+                        method: "GET",
+                        data: {
+                            projectId: even
+                        },
+                        success: function (sspm) {
+                            that.init_three(sspm.data.PM25);
+                            that.init_four(sspm.data.PM10);
+                        }
+                    })
+                }
+
+
+                //查询出扬尘数据
+                if (even == 3) {
+                    wx.request({
+                        url: app.globalData.szhUrl + '/mkl/api/getEnvironmentCloseHoursInfo',
+                        method: "GET",
+                        data: {
+                            projectId: 132
+                        },
+                        success: function (res) {
+                            let time = []
+                            let pm25 = []
+                            let pm10 = []
+                            let noise = []
+                            res.data.data.map(item => {
+                                time.push(item.date.split(" ")[1].split(":")[0])
+                                pm25.push(item.pm25)
+                                pm10.push(item.pm10)
+                                noise.push(item.noise)
+                            })
+                            that.init_one(time, pm25, pm10);
+                            that.init_two(time, noise);
+                        }
+                    })
+                } else {
+                    wx.request({
+                        url: app.globalData.reqUrl + '/weixin/applets/selectPM25',
+                        method: "GET",
+                        data: {
+                            projectId: even,
+                            type: '1'
+                        },
+                        success: function (ycss) {
+                            that.init_one(ycss.data.time, ycss.data.pm25, ycss.data.pm10);
+                        }
+                    })
+                }
+
+
+                //查询出噪声数据
+                if (even != 3) {
+                    wx.request({
+                        url: app.globalData.reqUrl + '/weixin/applets/selectNoiseDB',
+                        method: "GET",
+                        data: {
+                            projectId: even,
+                            type: '1'
+                        },
+                        success: function (zzss) {
+                            that.init_two(zzss.data.time, zzss.data.DB);
+                        }
+                    })
+                }
+
+
+                //查询出环境预警数据
+                wx.request({
+                    url: app.globalData.reqUrl + '/weixin/applets/selectEarlyWarning',
+                    method: "GET",
+                    data: {
+                        projectId: even,
+                    },
+                    success: function (hjyj) {
+                        that.onClickHide();
+                        that.setData({
+                            dayEarlyNum: hjyj.data.dayCount,
+                            monthEarlyNum: hjyj.data.moneyCount,
+                            yangchenCount: hjyj.data.yangchenCount
+                        })
+                    }
+                })
+            }
+        })
+    },
+
+    //退出登录
+    TCDL: function () {
+        wx.clearStorageSync();
+        wx.setStorageSync('isReload', "1")
+        wx.redirectTo({
+            url: '../login/login',
+        })
+    },
+
+    //返回到更多功能
+    goGCLB: function () {
+        wx.redirectTo({
+            url: '../../pages/gengduogongneng/gengduogongneng'
+        })
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.json b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.json
new file mode 100644
index 0000000..9c7d47b
--- /dev/null
+++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.json
@@ -0,0 +1,14 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup",
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationBarTitleText": "项目环境"
+} 
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml
new file mode 100644
index 0000000..21e7607
--- /dev/null
+++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml
@@ -0,0 +1,125 @@
+<!--pages/xiangmugaikuang/xiangmugaikuang.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">项目环境</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- 左侧账号信息 -->
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+
+   <view class="left_manage_max">
+    </view>
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view> 
+  </view>
+</van-popup> -->
+
+<!-- 中间内容 -->
+<view class="max_new_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+  <view class="echarts_max" style="margin-top: 60rpx;">
+    <view class="echarts_min">
+      <view class="eharts_title">
+        环境管理 
+        <text class="eharts_title_float">
+          <text> {{weather}} </text>
+          <text> {{temperature}} ℃ </text>
+        </text>
+        <image src="{{weatherPic}}" class="eharts_title_float_img"></image>
+      </view>  
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_head">今日扬尘：<text>{{yangchenCount}}</text></view>
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_head">本月累计预警天数：<text>{{monthEarlyNum}}</text></view>
+        </van-col>
+      </van-row>
+      
+      
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_3 }}" id="mychart-three"></ec-canvas>
+      </view>       
+      <view class="eharts_con eharts_con_top">
+        <ec-canvas ec="{{ ec_4 }}" id="mychart-four"></ec-canvas>
+      </view>  
+      
+    </view>
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">
+          {{label_1}} <text class="hj_float" bindtap="onclick1">{{value1}} </text>
+         <van-action-sheet show="{{ show1 }}" actions="{{ actions1 }}" bind:close="onClose" bind:select="onSelect1" />
+  
+      </view>  
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_head"></view>
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_head"></view>
+        </van-col>
+      </van-row>
+      
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_1 }}" id="mychart-one"></ec-canvas>
+      </view>       
+     
+    </view>
+  </view>
+
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">
+        {{label_2}} <text class="hj_float" bindtap="onclick2">{{value2}} </text>
+        <van-action-sheet show="{{ show2 }}" actions="{{ actions2 }}" bind:close="onClose" bind:select="onSelect2" />
+      </view>  
+      
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_2 }}" id="mychart-two"></ec-canvas>
+      </view>       
+     
+    </view>
+  </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxss b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxss
new file mode 100644
index 0000000..811b23d
--- /dev/null
+++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxss
@@ -0,0 +1,68 @@
+/* pages/xiangmugaikuang/xiangmugaikuang.wxss */
+.echarts_max{
+  margin-top: 30rpx;
+  padding:0 30rpx;
+}
+.echarts_min{
+  background:#1e2336 ;
+  font-size: 28rpx;
+  padding: 30rpx;
+  border-radius: 15rpx;
+}
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.eharts_head{
+  text-align: center;
+  padding: 30rpx 0;
+}
+.eharts_head text{
+  color:#0ad7ec;
+  font-size: 32rpx;
+}
+.eharts_con{
+  height: 320rpx;
+  width: auto;
+}
+.eharts_title_float{
+  float: right;
+}
+
+.eharts_title_float text{
+  padding: 0 5rpx;
+}
+.eharts_con_top{
+  margin-top: -320rpx;
+}
+.eharts_title_float_img{
+  width: 40rpx;
+  height: 40rpx;
+  float: right;
+  position: relative;
+  top: 2rpx;
+}
+
+.hj_float{
+  float: right;
+  padding: 5rpx 50rpx 5rpx 20rpx;
+  background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+  border-radius: 40rpx;
+}
+.hj_float:active{
+  background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+}
+
+.van-popup--bottom.van-popup--round{
+  border-radius: 0 !important
+}
+.van-popup{
+  background-color: var(--popup-background-color,#232a44) !important
+}
+.van-action-sheet__cancel,.van-action-sheet__item{
+  background-color: var(--popup-background-color,#232a44) !important;
+  color: #0ad7ec;
+  
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmushipin/xiangmushipin.js b/miniprogram/pageage/xiangmushipin/xiangmushipin.js
new file mode 100644
index 0000000..ef51183
--- /dev/null
+++ b/miniprogram/pageage/xiangmushipin/xiangmushipin.js
@@ -0,0 +1,171 @@
+// pages/xiangmushipin/xiangmushipin.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    show: false,
+    //项目的名称
+    projectName: '',
+    //视频接入数
+    videoAll: '',
+    //视频在线数
+    videoOnline: '',
+    //视频的列表
+    videoList: [],
+    projectId:'',
+    lastTapTime:'',
+    loadShow:false,
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    this.onLoad();
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+    
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+      //加载蒙版
+      that.onClickShow();
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectName: app.globalData.projectName,
+            projectId:app.globalData.projectId,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+        }
+      }) 
+    //视频数量
+    this.getProjectVideoAll(app.globalData.projectId);
+    //视频列表
+    this.getProjectVideoList(app.globalData.projectId);
+  },
+
+  // 获取项目下的视频数
+  getProjectVideoAll:function(even) {
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getProjectVideoNum',
+      method: 'get',
+      data: {
+          projectName:even
+      },
+      success: resData => {
+          this.setData({
+            videoAll:resData.data.videoAll,
+            videoOnline:resData.data.videoOnline
+          })
+          this.onClickHide();
+      }
+    })
+  },
+
+  //获取项目下的视频的列表
+  getProjectVideoList:function(even) {
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getProjectVideoList',
+      method: 'get',
+      data: {
+        projectName:even
+      },
+      success: resData => {
+          this.setData({
+            videoList:resData.data
+          })
+          this.onClickHide();
+      }
+    })
+  },
+
+  //退出登录
+  TCDL:function(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+      url: '../login/login',
+    })
+  },
+
+  //返回到更多功能页面
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+
+  //视频全屏
+  doubleClick: function (e) {
+    var curTime = e.timeStamp
+    var lastTime = e.currentTarget.dataset.time 
+    if (curTime - lastTime > 0) {
+      if (curTime - lastTime < 2000) {//是双击事件
+        wx.navigateTo({
+          url: '../shipinquanping/shipingquanping?rtmpUrl=' + e.currentTarget.dataset.url + '&videoName=' + e.currentTarget.dataset.name + "&token=" + e.currentTarget.dataset.token
+        })
+      } 
+    }
+    this.setData({
+      lastTapTime: curTime
+    })
+  },
+
+  quanping:function(e){
+    wx.navigateTo({
+      url: '../shipinquanping/shipingquanping?rtmpUrl=' + e.currentTarget.dataset.url + '&videoName=' + e.currentTarget.dataset.name + "&token=" + e.currentTarget.dataset.token
+    })
+  },
+
+  /**
+   * 视频页面跳转
+   */
+  videoPageJump(e){
+    let index = e.currentTarget.dataset.index
+    if(index == 2){
+      wx.redirectTo({
+        url: '../AIvideoAnalysis/index',
+      })
+    }else if(index == 3){
+      wx.redirectTo({
+        url: '../vehicleManage/index',
+      })
+    }
+
+  },
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmushipin/xiangmushipin.json b/miniprogram/pageage/xiangmushipin/xiangmushipin.json
new file mode 100644
index 0000000..fc9325b
--- /dev/null
+++ b/miniprogram/pageage/xiangmushipin/xiangmushipin.json
@@ -0,0 +1,14 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+
+  "navigationBarTitleText": "视频管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmushipin/xiangmushipin.wxml b/miniprogram/pageage/xiangmushipin/xiangmushipin.wxml
new file mode 100644
index 0000000..babd3d4
--- /dev/null
+++ b/miniprogram/pageage/xiangmushipin/xiangmushipin.wxml
@@ -0,0 +1,135 @@
+<!--pages/xiangmushipin/xiangmushipin.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">项目视频</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- 
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+
+    <view class="left_manage_max">
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view>
+    
+  </view>
+</van-popup> -->
+
+<view class="max_new_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+  <view class="modify_video_nav" style="margin-top: 60rpx;">
+      <view class="active" bindtap="videoPageJump" data-index="1"><text>视频管理</text></view>
+      <view bindtap="videoPageJump" data-index="2"><text>AI视频分析</text></view>
+      <!-- <view bindtap="videoPageJump" data-index="3"><text>车辆管理</text></view> -->
+  </view>
+
+  <view class="video_num">
+    <van-row>
+      <van-col span="12">
+        <view class="video_icon">
+          <image src="/images/video.png"></image>
+          视频接入数：
+          <text>{{videoAll}}</text>
+          个
+        </view>
+      </van-col>
+      <van-col span="12">
+        <view class="video_icon">
+          <image src="/images/video.png"></image>
+          视频在线数：
+          <text>{{videoOnline}}</text>
+          个
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+
+  <van-sticky  offset-top="{{ 78 }}">
+    <view class="video_nav_max">
+      <view class="video_nav active" style="border-radius: 10rpx;margin-left: 14rpx;">
+        工区一
+      </view>
+    </view>
+  </van-sticky>
+
+  <view class="video_work_area">
+    <view class="video_work_area_title">工区一</view>
+
+    <van-row class="demo clearfix">
+      <van-col span="12" wx:for="{{videoList}}">
+        <view class="video_work_area_content" bindtap="doubleClick" data-time="{{lastTapTime}}" data-url="{{item.url}}" data-name="{{item.cameraName}}" data-token="{{item.token}}">
+          <view wx:if="{{item.state == '1'}}"> 
+            <image src="http://fileimg.makalu.cc/254b9b5f889e4fb2b10bedfcf98771b8.png" class="img_state"></image>
+          </view>
+          <view wx:if="{{item.state == '0'}}"> 
+            <image src="http://fileimg.makalu.cc/9160dabe7d1843168eab5b952140ba59.png" class="img_state"></image>
+          </view>
+          <view wx:if="{{item.state == '3'}}"> 
+            <live-player src="{{item.url}}" autoplay="true"></live-player>
+          </view>
+          <image src="/images/quanping.png" class="icon_img" bindtap="quanping" data-url="{{item.url}}" data-name="{{item.cameraName}}" data-token="{{item.token}}"></image>
+          <view class="video_id">{{item.cameraName}}</view>
+        </view>
+      </van-col>
+
+    </van-row> 
+  </view>
+
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/xiangmushipin/xiangmushipin.wxss b/miniprogram/pageage/xiangmushipin/xiangmushipin.wxss
new file mode 100644
index 0000000..64f0999
--- /dev/null
+++ b/miniprogram/pageage/xiangmushipin/xiangmushipin.wxss
@@ -0,0 +1,99 @@
+/* pages/xiangmushipin/xiangmushipin.wxss */
+
+.video_num{
+  padding:0 30rpx;
+  height: 120rpx;
+}
+.video_icon {
+  font-size: 28rpx;
+  text-align: center;
+  padding: 30rpx 0;
+}
+.video_icon image{
+  width: 40rpx;
+  height: 40rpx;
+  position: relative;
+  top: 10rpx;
+}
+.video_nav_max{
+  height: 80rpx;
+  padding: 0 30rpx;
+}
+.video_nav{
+  float:left;
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+  width: 20%;
+  background: #26355a;
+  font-size: 28rpx;
+}
+.video_nav_max .video_nav:first-child{
+  border-radius: 10rpx 0 0 10rpx;
+}
+.video_nav_max .video_nav:last-child{
+  border-radius:0 10rpx 10rpx 0;
+}
+.video_nav.active{
+  background:#43539c ;
+}
+.video_work_area{
+  margin-top: 20rpx;
+  padding:10rpx 30rpx;
+}
+.video_work_area_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  font-size: 28rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.video_work_area_content{
+  padding: 10rpx;
+}
+.video_work_area_content live-player{
+  background: #666;
+  height: 200rpx;
+  width: 100%;
+  border-radius: 10rpx;
+}
+.clearfix:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+.video_id{
+  height: 40rpx;
+  text-align: center;
+  font-size: 28rpx;
+}
+.icon_img{
+  width: 30rpx;
+  height: 30rpx;
+  position: relative;
+  float: right;
+  margin-top: -50rpx;
+  right: 10rpx;
+}
+.img_state{
+  height: 200rpx;
+  width: 100%;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js
new file mode 100644
index 0000000..0cbce44
--- /dev/null
+++ b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js
@@ -0,0 +1,1391 @@
+// pages/gengduogongneng/gengduogongneng.js
+import * as echarts from '../../ec-canvas/echarts';
+const app = getApp();
+
+
+//预警状态
+let formatNumber_0 = function(num) {
+  let reg = /(?=(\B)(\d{3})+$)/g;
+  return num.toString().replace(reg, ',');
+}
+function arrayobj_0  (array, key) {
+  var resObj = {}
+  for (var i = 0; i < array.length; i++) {
+      resObj[array[i][key]] = array[i]
+  }
+  return resObj
+}
+function initChart_0(chart_0,datas_0,datas_name) {
+  //定义参数
+  let objData_0 = arrayobj_0(datas_0, 'name')
+  let total_0 = datas_0.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_0 = '本月预警';
+
+  var option_0 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_1(total_0) + '} \n {name|' + title_0 + '} ',
+      top: '31%',
+      left: '17%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 0]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 20]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: datas_name,
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_0[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['65%', '90%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_0
+      }]
+  };
+  chart_0.setOption(option_0);
+}
+
+
+//人员预警信息
+let datas_1 = []
+let formatNumber_1 = function(num) {
+  let reg = /(?=(\B)(\d{3})+$)/g;
+  return num.toString().replace(reg, ',');
+}
+function arrayobj_1  (array, key) {
+  var resObj = {}
+  for (var i = 0; i < array.length; i++) {
+      resObj[array[i][key]] = array[i]
+  }
+  return resObj
+}
+function initChart_1(chart_1,datas_1,datas_name) {
+  //定义参数
+  let objData_1 = arrayobj_1(datas_1, 'name');
+  let total_1 = datas_1.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_1 = '本日预警';
+
+  var option_1 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_1(total_1) + '} \n {name|' + title_1 + '} ',
+      top: '31%',
+      left: '17%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 0]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 20]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: datas_name,
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_1[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['65%', '90%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_1
+      }]
+  };
+  chart_1.setOption(option_1);
+}
+
+
+//机械预警信息
+let datas_6 = []
+let formatNumber_6 = function(num) {
+  let reg = /(?=(\B)(\d{3})+$)/g;
+  return num.toString().replace(reg, ',');
+}
+function arrayobj_6  (array, key) {
+  var resObj = {}
+  for (var i = 0; i < array.length; i++) {
+      resObj[array[i][key]] = array[i]
+  }
+  return resObj
+}
+function initChart_6(chart_6,datas_6,datas_name) {
+  //定义参数
+  let objData_6 = arrayobj_6(datas_6, 'name');
+  let total_6 = datas_6.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_6 = '本日预警';
+
+  var option_6 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_1(total_6) + '} \n {name|' + title_6 + '} ',
+      top: '31%',
+      left: '17%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 0]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 20]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: datas_name,
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_6[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['65%', '90%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_6
+      }]
+  };
+  chart_6.setOption(option_6);
+}
+
+
+//物料预警
+let formatNumber_2 = function(num) {
+  let reg = /(?=(\B)(\d{3})+$)/g;
+  return num.toString().replace(reg, ',');
+}
+function arrayobj_2  (array, key) {
+  var resObj = {}
+  for (var i = 0; i < array.length; i++) {
+      resObj[array[i][key]] = array[i]
+  }
+  return resObj
+}
+function initChart_2(chart_2,datas_2) {
+  //定义参数
+  let objData_2 = arrayobj_2(datas_2, 'name');
+  let total_2 = datas_2.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_2 = '本日预警';
+
+  var option_2 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_1(total_2) + '} \n {name|' + title_2 + '} ',
+      top: '31%',
+      left: '17%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 0]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 20]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: ['塔吊', '电梯', '龙门吊','砂浆罐', '其他 '],
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_2[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['65%', '90%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_2
+      }]
+  };
+  chart_2.setOption(option_2);
+}
+
+//本月预警
+let formatNumber_3 = function(num) {
+  let reg = /(?=(\B)(\d{3})+$)/g;
+  return num.toString().replace(reg, ',');
+}
+function arrayobj_3  (array, key) {
+  var resObj = {}
+  for (var i = 0; i < array.length; i++) {
+      resObj[array[i][key]] = array[i]
+  }
+  return resObj
+}
+function initChart_3(chart_3,datas_3,datas_name) {
+  //定义参数
+  let objData_3 = arrayobj_3(datas_3, 'name')
+  let total_3 = datas_3.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_3 = '本月预警';
+
+  var option_3 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_1(total_3) + '} \n {name|' + title_3 + '} ',
+      top: '31%',
+      left: '17%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 0]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 20]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: datas_name,
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_3[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['65%', '90%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_3
+      }]
+  };
+  chart_3.setOption(option_3);
+}
+
+
+//离线视频
+let formatNumber_4 = function(num) {
+  let reg = /(?=(\B)(\d{3})+$)/g;
+  return num.toString().replace(reg, ',');
+}
+function arrayobj_4  (array, key) {
+  var resObj = {}
+  for (var i = 0; i < array.length; i++) {
+      resObj[array[i][key]] = array[i]
+  }
+  return resObj
+}
+function initChart_4(chart_4,datas_4,datas_name4) {
+  //定义参数
+  let objData_4 = arrayobj_4(datas_4, 'name')
+  let total_4 = datas_4.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_4 = '本日离线';
+
+  var option_4 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_1(total_4) + '} \n {name|' + title_4 + '} ',
+      top: '31%',
+      left: '17%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 0]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 20]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: datas_name4,
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_4[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['65%', '90%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_4
+      }]
+  };
+  chart_4.setOption(option_4);
+}
+
+//今日扬尘指标
+let value_5 = 0;
+function initChart_5(chart_5,value_5) {
+  var option_5 = {
+    series: [{
+      type: 'gauge',
+      radius: '73%',
+      //splitNumber: 10,
+      min: 0,
+      max: 500,
+      startAngle: 90,
+      endAngle: -269.9999,
+      
+      axisLine: {
+          show: true,
+          lineStyle: {
+              width: 1,
+              color: [
+                  [1, 'rgba(0,0,0,0)']
+              ]
+          }
+      }, //仪表盘轴线
+      axisTick: {
+          show: true,
+          lineStyle: {
+              color: '#468EFD',
+              width: 1
+          },
+          length: -5
+      }, //刻度样式
+      splitLine: {
+          show: true,
+          length: -8,
+          lineStyle: {
+              color: '#468EFD'
+          }
+      }, //分隔线样式
+      axisLabel: {
+          //show:false,
+          distance: 10,
+          textStyle: {
+              color: '#468EFD',
+              fontSize: '10',
+              fontWeight: 'bold'
+          },
+          formatter: '{value}'
+      },
+      pointer: {
+          show: 0
+      },
+      detail: {
+          show: 0
+      }
+  },
+
+  // 内侧指针、数值显示
+  {
+      name: '达标率',
+      type: 'gauge',
+      radius: '100%',
+      startAngle: 90,
+      endAngle: -269.9999,
+      min: 0,
+      max: 500,
+      axisLine: {
+          show: true,
+          lineStyle: {
+              width: 10,
+              color: [
+                  [
+                      value_5 / 500, new echarts.graphic.LinearGradient(
+                          0, 0, 1, 0, [{
+                                  offset: 0,
+                                  color: '#04c5ff',
+                              },
+                              {
+                                  offset: 1,
+                                  color: '#04c5ff',
+                              }
+                          ]
+                      )
+                  ],
+                  [
+                      1, '#1c3f5f'
+                  ]
+              ]
+          }
+      },
+      axisTick: {
+          show: 0,
+      },
+      splitLine: {
+          show: 0,
+      },
+      axisLabel: {
+          show: 0
+      },
+      pointer: {
+          show: false,
+          length: '105%'
+      },
+      detail: {
+          show: true,
+          offsetCenter: [0, '0'],
+          textStyle: {
+              fontSize: 25,
+              color: '#29EEF3',
+              fontWeight: 'bold'
+          },
+          formatter: [
+              '{value}' + '',
+              '' + '{name|PM2.5}'
+          ].join('\n'),
+          rich: {
+              name: {
+                  fontSize: 14,
+                  color: '#ffbd05',
+                  padding: [5,0]
+              }
+          }
+      },
+      itemStyle: {
+          normal: {
+              color: '#03b7c9',
+          }
+      },
+      data: [{
+          value: value_5
+      }]
+  }
+]
+  }
+  chart_5.setOption(option_5);
+}
+
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active:1,  
+    show: false,  
+    check:['video_nav active','video_nav ','video_nav ','video_nav ','video_nav ','video_nav '],
+    ec_0:{
+      lazyLoad: true
+    },
+    ec_1: {
+      lazyLoad: true
+    },
+    ec_2: {
+      lazyLoad: true
+    },
+    ec_3: {
+      lazyLoad: true
+    },
+    ec_4: {
+      lazyLoad: true
+    },
+    ec_5: {
+      lazyLoad: true
+    },
+    ec_6: {
+      lazyLoad: true
+    },
+    aqi:0,
+    marginLeft: "11%",
+    projectName:'',
+    projectId:'',
+    dayEarlyNum:'',
+    yangchenCount:'',
+    monthEarlyNum:'',
+    monthCount:'',
+    PM25:'0',
+    PM10:'0',
+    DB:'0',
+    WindSpeed:'0',
+    WindDirection:'',
+    Temperature:'0',
+    Humidity:'0',
+    AQI:'0',
+    TSP:'0',
+    videoDay:'0',
+    videoMonth:'0',
+    enviorDayData:{},
+    enviorMonthData:{},
+    dayCountNum:'0',
+    monthCountNum:'0',
+    machineEnvironCountDay:"0",
+    machineEnvironCountmonth:"0",
+    userEnvironCountDay:"0",
+    userEnvironCountMonyh:"0",
+    envirMonthEarlyNum:"0",
+    //加载模板参数
+    loadShow:false,
+    list: ["人员", "机械", "物料", "环境", "视频", "其他"],
+    highlight:0,
+    height1:"",
+    height2:"",
+    height3:"",
+    height4:"",
+    height5:"",
+    height6:"",
+    height7:"",
+    height8:"",
+    height9:"",
+
+    index_0:"",
+    index_1:"",
+    index_2:"",
+    index_3:"",
+    index_4:"",
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    this.onLoad();
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+   //初始化环境状态本月预警
+   init_zero: function (datas_0,datas_name) {
+    this.zeroComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_0(chart,datas_0,datas_name);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //初始化人员预警
+  init_one: function (datas_1,datas_name) {
+    this.oneComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_1(chart, datas_1,datas_name);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //初始化机械预警
+  init_sex: function (datas_6,datas_name) {
+    this.sexComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_6(chart, datas_6,datas_name);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //初始化物料预警
+  init_two: function (datas_2) {
+    this.twoComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_2(chart, datas_2);
+      this.chart = chart;
+      return chart;
+    });
+  },
+  
+  //初始化环境管理本月预警
+  init_three: function (datas_3,datas_name) {
+    this.threeComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_3(chart,datas_3,datas_name);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //初始化视频预警
+  init_four: function (datas_4,datas_name4) {
+    this.fourComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_4(chart,datas_4,datas_name4);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+   //初始化今日扬尘预警
+   init_five: function (value_5) {
+    this.fiveComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_5(chart,value_5);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  clickScroll(e) {
+    this.setData({
+      highlight: e.target.dataset.index
+    })
+    var height0 = this.data.height0;
+    var height1 = this.data.height1;
+    var height2 = this.data.height2;
+    var height3 = this.data.height3;
+    var height4 = this.data.height4;
+    var height5 = this.data.height5;
+    var height6 = this.data.height6;
+    var height7 = this.data.height7;
+    var height8 = this.data.height8;
+    var height9 = this.data.height9;
+    var heigth10 = 15;
+
+    var index_0 =  height1+height2+height3+height4+height0+heigth10*1
+    var index_1 =  height1+height2+height3+height4+height5+height0+heigth10*2
+    var index_2 =  height1+height2+height3+height4+height5+height6+height0+heigth10*3
+    var index_3 =  height1+height2+height3+height4+height5+height6+height7+height0+heigth10*4
+    var index_4 =  height1+height2+height3+height4+height5+height6+height7+height8+height0+heigth10*5
+
+    var index = e.currentTarget.dataset.index
+    if(index==0){
+      wx.pageScrollTo({
+        scrollTop:index_0
+      })
+    }else if(index==1){
+      wx.pageScrollTo({
+        scrollTop:index_1
+      })
+    }else if(index==2){
+      wx.pageScrollTo({
+        scrollTop:index_2
+      })
+    }else if(index==3){
+      wx.pageScrollTo({
+        scrollTop:index_3 
+      })
+    }else if(index==4){
+      wx.pageScrollTo({
+        scrollTop: index_4
+      })
+    }else{
+      wx.pageScrollTo({
+        scrollTop:  0
+      })
+    }
+  },
+
+ onPageScroll(e){ // 获取滚动条当前位置
+  var height1 = this.data.height1;
+  var height2 = this.data.height2;
+  var height3 = this.data.height3;
+  var height4 = this.data.height4;
+  var height5 = this.data.height5;
+  var height6 = this.data.height6;
+  var height7 = this.data.height7;
+  var height8 = this.data.height8;
+  var height9 = this.data.height9;
+
+  var index_0 =  height1+height2+height3+height4
+  var index_1 =  height1+height2+height3+height4+height5
+  var index_2 =  height1+height2+height3+height4+height5+height6
+  var index_3 =  height1+height2+height3+height4+height5+height6+height7
+  var index_4 =  height1+height2+height3+height4+height5+height6+height7+height8
+
+    if(e.scrollTop < index_1){
+      this.setData({
+        highlight: 0
+      })
+    }else if(e.scrollTop < index_2){
+      this.setData({
+        highlight: 1
+      })
+    }else if(e.scrollTop < index_3){
+      this.setData({
+        highlight: 2
+      })
+    }else if(e.scrollTop < index_4){
+      this.setData({
+        highlight: 3
+      })
+    }
+    if(e.scrollTop == 1757){
+      this.setData({
+        highlight: 4
+      })
+    }
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+    let query0 = wx.createSelectorQuery();
+      query0.select('.height_0').boundingClientRect(rect=>{
+      let height0 = rect.height;
+      this.setData({height0:height0})
+    }).exec();
+
+    let query1 = wx.createSelectorQuery();
+      query1.select('.height_1').boundingClientRect(rect=>{
+      let height1 = rect.height;
+      this.setData({height1:height1})
+    }).exec();
+
+    let query2 = wx.createSelectorQuery();
+    query2.select('.height_2').boundingClientRect(rect=>{
+    let height2 = rect.height;
+    this.setData({height2:height2})
+  }).exec();
+
+  let query3 = wx.createSelectorQuery();
+      query3.select('.height_3').boundingClientRect(rect=>{
+      let height3 = rect.height;
+      this.setData({height3:height3})
+    }).exec();
+
+    let query4 = wx.createSelectorQuery();
+      query4.select('.height_4').boundingClientRect(rect=>{
+      let height4 = rect.height;
+      this.setData({height4:height4})
+    }).exec();
+
+    let query5 = wx.createSelectorQuery();
+      query5.select('.height_5').boundingClientRect(rect=>{
+      let height5 = rect.height;
+      this.setData({height5:height5})
+    }).exec();
+    let query6 = wx.createSelectorQuery();
+      query6.select('.height_6').boundingClientRect(rect=>{
+      let height6 = rect.height;
+      this.setData({height6:height6})
+    }).exec();
+
+    let query7 = wx.createSelectorQuery();
+      query7.select('.height_7').boundingClientRect(rect=>{
+      let height7 = rect.height;
+      this.setData({height7:height7})
+    }).exec();
+
+    let query8 = wx.createSelectorQuery();
+      query8.select('.height_8').boundingClientRect(rect=>{
+      let height8 = rect.height;
+      this.setData({height8:height8})
+    }).exec();
+
+    let query9 = wx.createSelectorQuery();
+      query9.select('.height_9').boundingClientRect(rect=>{
+      let height9 = rect.height;
+      this.setData({height9:height9})
+    }).exec();
+
+     //加载蒙版
+    this.onClickShow();
+    this.setData({aqi:value_5});
+    var aqi = this.data.aqi;
+    var percentage = aqi / 500 * 58 + 16;
+    if(aqi >=500){
+      this.setData({marginLeft:"74%"})
+    }else{
+      this.setData({marginLeft:percentage+"%"})
+    }
+    //根据id获取组件
+    this.zeroComponent = this.selectComponent('#mychart-zero');  
+    this.oneComponent = this.selectComponent('#mychart-one');  
+    this.twoComponent = this.selectComponent('#mychart-two');  
+    this.threeComponent = this.selectComponent('#mychart-three');  
+    this.fourComponent = this.selectComponent('#mychart-four');  
+    this.fiveComponent = this.selectComponent('#mychart-five'); 
+    this.sexComponent = this.selectComponent('#mychart-sex');   
+    var that = this;
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectName: app.globalData.projectName,
+            projectId:app.globalData.projectId,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+        }
+      })
+    this.getEarlyWarningData(app.globalData.projectId);
+  },
+
+   // 底部导航
+   onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+
+  //获取页面初始化预警信息
+  getEarlyWarningData:function(even){
+    var that =this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectFoundation',
+      data:{
+          "id":even
+      },
+      method:"GET",
+      success:function(res){
+          //查询出机械预警信息
+          wx.request({
+            url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineryEnviron',
+            data:{
+              "state":"1",
+              "projectId":even
+            },
+            method:"GET",
+            success:function(jxyj){
+                that.setData({
+                  machineEnvironCountDay:jxyj.data.dayCount,
+                  machineEnvironCountmonth:jxyj.data.monthCount,
+                })
+                if(jxyj.data.list == ''){
+                  that.init_sex([{"value":'0',"name":''}]);
+                }else{
+                  that.init_sex(jxyj.data.list);
+                }                
+            }
+          })
+
+          //查询出环境预警数据
+          wx.request({
+            url: app.globalData.reqUrl+'/weixin/applets/selectEarlyWarning',
+            method:"GET",
+            data:{
+                projectId:even,
+            },
+            success:function(hjyj){
+                that.setData({
+                    dayEarlyNum:hjyj.data.dayCount,
+                    monthEarlyNum:hjyj.data.monthCount,
+                    yangchenCount:hjyj.data.yangchenCount,
+                    monthCount:hjyj.data.monthCount
+                })                 
+            }
+          })
+
+          //查询实时环境数据
+          wx.request({
+            url: app.globalData.reqUrl+'/weixin/applets/selectEnvironmental',
+            method:"GET",
+            data:{
+                projectId:even
+            },
+            success:function(envirData){
+                that.setData({
+                  PM25:envirData.data.PM25,
+                  PM10:envirData.data.PM10,
+                  DB:envirData.data.DB,
+                  WindSpeed:envirData.data.WindSpeed,
+                  WindDirection:envirData.data.WindDirection,
+                  Temperature:envirData.data.Temperature,
+                  Humidity:envirData.data.Humidity
+                })
+                that.init_five(envirData.data.PM25);
+            }
+          })
+
+          //查询环境预警饼图数据
+          wx.request({
+            url: app.globalData.reqUrl+'/weixin/applets/selectEarlyWarningByMonth',
+            method:"GET",
+            data:{
+              projectId:even
+            },
+            success:function(datalist){
+              let envirMonthEarlyNum = 0;
+              for(let i = 0;i<datalist.data.length;i++){
+                envirMonthEarlyNum+=datalist.data[i].value
+              }
+              that.setData({
+                envirMonthEarlyNum:envirMonthEarlyNum
+              })
+              if(datalist.data == ''){
+                that.init_three([{"name":'',"value":'0'}]);
+              }else{
+                that.init_three(datalist.data,datalist.data);
+              }   
+            }
+          })
+
+          //视频离线数饼图日
+          wx.request({
+            url: app.globalData.reqUrl+'/weixin/video/getDayOutline',
+            method:'GET',
+            data:{
+              "projectId":even,
+              "type":"1"
+            },
+            success:function(resulatData) {
+              if(resulatData.data.list == ''){
+                that.init_four([{"name":'',"value":'0'}]);  
+              }else{
+                that.init_four(resulatData.data.list);
+              }
+              
+              that.setData({
+                  videoDay:resulatData.data.dayCount,
+                  videoMonth:resulatData.data.monthCount
+              })
+            }
+          })
+          
+          //查询出人员安全帽预警
+          wx.request({
+            url: app.globalData.reqUrl+'/weixin/userinfo/selectUserEnviron',
+            data:{
+              "projectId":even,
+              "type":"1"
+            },
+            method:"GET",
+            success:function(ryyj){
+               //关闭蒙版
+              that.onClickHide();
+              that.setData({
+                userEnvironCountDay:ryyj.data.dayCount,
+                userEnvironCountMonyh:ryyj.data.monthCount
+              })
+              if(ryyj.data.list == ''){
+                that.init_one([{"name":'',"value":'0'}]);
+              }else{
+                that.init_one(ryyj.data.list);
+              }  
+            }
+          })  
+      }    
+    }),
+
+    //查询出当天预警信息数据
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/applets/selectEnvironDayAndMonth',
+      data:{
+        "projectId":even,
+        "dataNum":'3'
+      },
+      method:"GET",
+      success:function(res){
+        that.setData({
+          enviorDayData:res.data
+        })
+      }
+    }),
+
+    //查询出预警状态饼图数据
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/applets/selectEnvironPieData',
+      data:{
+        "projectId":even,
+        "state":'1'
+      },
+      method:"GET",
+      success:function(res){
+        that.setData({
+          dayCountNum:res.data.dayCount,
+          monthCountNum:res.data.monthCount
+        })
+        if(res.data.dayList == ''){
+          that.init_zero([{"name":'',"value":'0'}]);    
+        }else{
+          that.init_zero(res.data.dayList,res.data.dayList);    
+        } 
+      }
+    })
+    
+  },
+
+  //预警状态本日预警
+  CheckdDayEnviron:function(even){
+    this.onClickShow();
+      var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/applets/selectEnvironPieData',
+        data:{
+          "projectId":even.currentTarget.dataset.projectid,
+          "state":'1'
+        },
+        method:"GET",
+        success:function(res){
+          that.onClickHide();
+          that.setData({
+            dayCountNum:res.data.dayCount,
+            monthCountNum:res.data.monthCount
+          })
+          if(res.data.dayList == ''){
+            that.init_zero([{"name":'',"value":'0'}]);    
+          }else{
+            that.init_zero(res.data.dayList,res.data.dayList);    
+          } 
+        }
+      })
+  },
+
+   //预警状态本月预警
+   CheckdMonthEnviron:function(even){
+    this.onClickShow();
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/applets/selectEnvironPieData',
+      data:{
+        "projectId":even.currentTarget.dataset.projectid,
+        "state":'2'
+      },
+      method:"GET",
+      success:function(res){
+        that.onClickHide();
+        that.setData({
+          dayCountNum:res.data.dayCount,
+          monthCountNum:res.data.monthCount
+        })
+        if(res.data.monthList == ''){
+          that.init_zero([{"name":'',"value":'0'}]);    
+        }else{
+          that.init_zero(res.data.monthList,res.data.monthList);    
+        } 
+      }
+    })
+},
+
+  //机械预警当天与当月切换
+  chechMachine:function(even){
+    this.onClickShow();
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineryEnviron',
+      data:{
+        "state":even.currentTarget.dataset.state,
+        "projectId":even.currentTarget.dataset.projectid,
+      },
+      method:"GET",
+      success:function(jxyj){
+        that.onClickHide();
+          that.setData({
+            machineEnvironCountDay:jxyj.data.dayCount,
+            machineEnvironCountmonth:jxyj.data.monthCount,
+          })
+          if(jxyj.data.list == ''){
+            that.init_sex([{"name":'',"value":'0'}]);
+          }else{
+            that.init_sex(jxyj.data.list);
+          }
+      }
+    })
+  },
+
+  //人员预警本月本日切换
+  checkUserEnivr:function(even){
+    this.onClickShow();
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userinfo/selectUserEnviron',
+      data:{
+        "projectId":even.currentTarget.dataset.projectid,
+        "type":even.currentTarget.dataset.type
+      },
+      method:"GET",
+      success:function(ryyj){
+        that.onClickHide();
+        that.setData({
+          userEnvironCountDay:ryyj.data.dayCount,
+          userEnvironCountMonyh:ryyj.data.monthCount
+        })
+        if(ryyj.data.list == ''){
+          that.init_one([{"name":'',"value":'0'}]);
+        }else{
+          that.init_one(ryyj.data.list);
+        }
+      }
+    })
+  },
+
+  //视频预警切换
+  chechVideo:function(even){
+    var that =this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getDayOutline',
+      method:'GET',
+      data:{
+        "projectId":even.currentTarget.dataset.projectid,
+        "type":even.currentTarget.dataset.type
+      },
+      success:function(resulatData) {
+        if(resulatData.data.list == ''){
+          that.init_four([{"name":'',"value":'0'}]);
+        }else{
+          that.init_four(resulatData.data.list);
+        } 
+        that.setData({
+            videoDay:resulatData.data.dayCount,
+            videoMonth:resulatData.data.monthCount
+        })
+      }
+    })
+  },
+
+  //跳转到预警详情页面
+  YJXQ:function(even){
+    wx.navigateTo({
+      url: '../yujingxinxi/yujingxinxi'
+    })
+  },
+
+  //退出登录
+  TCDL:function(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+      url:'../login/login',
+    })
+  },
+
+  //返回到更多功能
+  goGCLB:function(){
+    wx.redirectTo({
+      url:'../../pages/gengduogongneng/gengduogongneng'
+  })
+}
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.json b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.json
new file mode 100644
index 0000000..34591d8
--- /dev/null
+++ b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.json
@@ -0,0 +1,14 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup/index",
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationBarTitleText": "项目预警"
+} 
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxml b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxml
new file mode 100644
index 0000000..bd0b729
--- /dev/null
+++ b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxml
@@ -0,0 +1,283 @@
+<!--pages/xiangmugaikuang/xiangmugaikuang.wxml-->
+<!-- <view class="header_title height_0">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">项目预警</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- 左侧账号信息 -->
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+
+     <view class="left_manage_max">
+    </view>
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view>
+  </view>
+</van-popup> -->
+
+<!-- 中间内容 -->
+<view class="max_new_content">
+  <project-select init="{{initData}}" class="height_1" bindchange="onProjectSelect"></project-select>
+  <view class="echarts_max new_yu_jing height_2" style="margin-top: 60rpx;">
+    <view class="echarts_min">
+      <view class="eharts_title new_icon">
+        预警信息
+        <text class="new_text" bindtap="YJXQ">详情 >></text>
+      </view>  
+      <view class="van_row">
+        <van-row wx:for="{{enviorDayData}}" wx:key="enviorDayData">
+          <van-col span="14">
+            <view class="new_yj_left">{{item.envirName}}</view>
+          </van-col>
+          <van-col span="10">
+            <view class="new_yj_right">{{item.createTime}}</view>
+          </van-col>
+        </van-row> 
+      </view>      
+    </view>
+  </view>
+
+  <view class="echarts_max new_yu_jing height_3">
+    <view class="echarts_min">
+      <view class="eharts_title">预警状态</view>  
+      <van-row>
+        <van-col span="12" bindtap="CheckdDayEnviron" data-projectId="{{projectId}}">
+          <view class="eharts_head">本日预警：<text>{{dayCountNum}}</text> 次</view>
+        </van-col>
+        <van-col span="12" bindtap="CheckdMonthEnviron" data-projectId="{{projectId}}">
+          <view class="eharts_head">本月预警：<text>{{monthCountNum}}</text> 次</view>
+        </van-col>
+      </van-row>
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_0 }}" id="mychart-zero"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+
+  <van-sticky  offset-top="{{ 80 }}">
+    <view class="video_nav_max height_4">
+      <view class="video_nav {{index  === highlight  ? 'active' :' ' }}" data-index="{{index}}" wx:for = "{{list}}"  wx:key="list" bindtap='clickScroll' data-id="{{item}}">
+        {{item}}
+      </view>
+    </view>
+  </van-sticky>
+
+  <view class="echarts_max height_5">
+    <view class="echarts_min">
+      <view class="eharts_title">人员预警</view>  
+      <van-row>
+        <van-col span="12" bindtap="checkUserEnivr" data-projectId="{{projectId}}" data-type="1">
+          <view class="eharts_head">本日预警：<text>{{userEnvironCountDay}}</text> 次</view>
+        </van-col>
+        <van-col span="12" bindtap="checkUserEnivr" data-projectId="{{projectId}}" data-type="2">
+          <view class="eharts_head">本月预警：<text>{{userEnvironCountMonyh}}</text> 次</view>
+        </van-col>
+      </van-row>
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_1 }}" id="mychart-one"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+  <view class="echarts_max height_6">
+    <view class="echarts_min">
+      <view class="eharts_title">机械预警</view>  
+      <van-row>
+        <van-col span="12" bindtap="chechMachine" data-projectId="{{projectId}}" data-state="1">
+          <view class="eharts_head">本日预警：<text>{{machineEnvironCountDay}}</text> 次</view>
+        </van-col>
+        <van-col span="12" bindtap="chechMachine" data-projectId="{{projectId}}" data-state="2">
+          <view class="eharts_head">本月预警：<text>{{machineEnvironCountmonth}}</text> 次</view>
+        </van-col>
+      </van-row>
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_6 }}" id="mychart-sex"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+  <view class="echarts_max height_7">
+    <view class="echarts_min">
+      <view class="eharts_title">物料预警</view>  
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_head">本日预警：<text>-</text> 次</view>
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_head">本月预警：<text>-</text> 次</view>
+        </van-col>
+      </van-row>
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_2 }}" id="mychart-two"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+  <view class="echarts_max height_8">
+    <view class="echarts_min">
+      <view class="eharts_title">环境预警</view>  
+      <view class="eharts_head">今日扬尘：<text>{{yangchenCount}}</text></view>
+
+      
+      <view class="eharts_con">
+       <ec-canvas ec="{{ ec_5 }}" id="mychart-five"></ec-canvas>
+      </view>  
+
+      <view class="bar_arrow" style="margin-left:{{marginLeft}}">
+          <view>{{aqi}}</view>
+          <view><image src="/images/jt.png" class="bar_jt"></image></view>
+        </view>  
+      <view class="bar_max">
+        <view class="bar_con"></view>
+        <view class="bar_top_max">
+          <view class="bar_top_min bar_min_1"></view>
+          <view class="bar_top_min bar_min_2"></view>
+          <view class="bar_top_min bar_min_3"></view>
+          <view class="bar_top_min bar_min_4"></view>
+          <view class="bar_top_min bar_min_5"></view>
+        </view>
+        <view class="bar_num">
+          <van-row>
+            <van-col span="4">
+              <view class="bar_min" >0</view>
+            </van-col>
+            <van-col span="4">
+              <view class="bar_min">100</view>
+            </van-col>
+            <van-col span="4">
+              <view class="bar_min">200</view>
+            </van-col>
+            <van-col span="4">
+              <view class="bar_min">300</view>
+            </van-col>
+            <van-col span="4">
+              <view class="bar_min">400</view>
+            </van-col>
+            <van-col span="4">
+              <view class="bar_min">500+</view>
+            </van-col>
+          </van-row>
+        </view>
+      </view>
+
+      <view class="speed_max">
+        <van-row>
+          <van-col span="4">
+            <view class="speed_min">
+              <view class="bar_speed">PM2.5</view>
+              <view>{{PM25}}ug/m³</view>
+            </view>
+          </van-col>
+          <van-col span="4" offset="16">
+            <view class="speed_min">
+              <view class="bar_speed">风速</view>
+              <view>{{WindSpeed}}m/s</view>
+            </view>
+          </van-col>
+          <van-col span="4">
+            <view class="speed_min">
+              <view class="bar_speed">PM10</view>
+              <view>{{PM10}}ug/m³</view>
+            </view>
+          </van-col>
+          <van-col span="4" offset="16">
+            <view class="speed_min">
+              <view class="bar_speed">风向</view>
+              <view>{{WindDirection}}</view>
+            </view>
+          </van-col>
+          <van-col span="4">
+            <view class="speed_min">
+              <view class="bar_speed">TSP</view>
+              <view>{{TSP}}ug/m³</view>
+            </view>
+          </van-col>
+          <van-col span="4" offset="16">
+            <view class="speed_min">
+              <view class="bar_speed">温度</view>
+              <view>{{Temperature}}℃</view>
+            </view>
+          </van-col>
+          <van-col span="4">
+            <view class="speed_min">
+              <view class="bar_speed">噪音</view>
+              <view>{{DB}}db</view>
+            </view>
+          </van-col>
+          <van-col span="4" offset="16">
+            <view class="speed_min">
+              <view class="bar_speed">湿度</view>
+              <view>{{Humidity}}%</view>
+            </view>
+          </van-col>
+        </van-row>
+        <view class="clear"></view>
+      </view>
+
+
+
+      <view class="margin_top">
+        <view class="eharts_head">本月预警：<text>{{envirMonthEarlyNum}}</text> 次</view>
+        <view class="eharts_con">
+          <ec-canvas ec="{{ ec_3 }}" id="mychart-three"></ec-canvas>
+        </view> 
+      </view>
+       
+    </view>
+  </view>
+
+  <view class="echarts_max height_9">
+    <view class="echarts_min">
+      <view class="eharts_title">视频预警</view>  
+      <van-row>
+        <van-col span="12" bindtap="chechVideo" data-projectId="{{projectId}}" data-state="1">
+          <view class="eharts_head">本日离线：<text>{{videoDay}}</text> 次</view>
+        </van-col>
+        <van-col span="12" bindtap="chechVideo" data-projectId="{{projectId}}" data-state="2">
+          <view class="eharts_head">本月离线预警：<text>{{videoMonth}}</text> 次</view>
+        </van-col>
+      </van-row>
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_4 }}" id="mychart-four"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxss b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxss
new file mode 100644
index 0000000..b473723
--- /dev/null
+++ b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxss
@@ -0,0 +1,200 @@
+/* pages/xiangmugaikuang/xiangmugaikuang.wxss */
+.video_num{
+  padding:0 30rpx;
+  height: 120rpx;
+}
+.video_icon {
+  font-size: 28rpx;
+  text-align: center;
+  padding: 30rpx 0;
+}
+.video_icon image{
+  width: 40rpx;
+  height: 40rpx;
+  position: relative;
+  top: 10rpx;
+}
+
+
+.video_nav_max{
+  height: 80rpx;
+  padding: 0 30rpx;
+}
+.video_nav{
+  float:left;
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+  width: 16.5%;
+  background: #26355a;
+  font-size: 28rpx;
+}
+.video_nav_max .video_nav:first-child{
+  border-radius: 10rpx 0 0 10rpx;
+}
+.video_nav_max .video_nav:last-child{
+  border-radius:0 10rpx 10rpx 0;
+}
+.video_nav.active{
+  background:#43539c ;
+}
+
+
+
+.echarts_max{
+  margin-top: 30rpx;
+  padding:0 30rpx;
+}
+.echarts_min{
+  background:#1e2336 ;
+  font-size: 28rpx;
+  padding: 30rpx;
+  border-radius: 15rpx;
+}
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.eharts_head{
+  text-align: center;
+  padding: 30rpx 0;
+}
+.eharts_head text{
+  color:#0ad7ec;
+  font-size:30rpx;
+}
+.eharts_con{
+  height: 320rpx;
+  width: auto;
+}
+.eharts_title_float{
+  float: right;
+}
+
+.eharts_title_float text{
+  padding: 0 5rpx;
+}
+.eharts_con_top{
+  margin-top: -320rpx;
+}
+.eharts_title_float_img{
+  width: 40rpx;
+  height: 40rpx;
+  float: right;
+  position: relative;
+  top: 2rpx;
+}
+
+
+/* 进度条 */
+.bar_max{
+  margin:0 130rpx 100rpx; 
+}
+.bar_min{
+  height: 40rpx;
+}
+.bar_min_1{
+  background: #a7d050;
+}
+.bar_min_2{
+  background: #f8d700;
+}
+.bar_min_3{
+  background: #ff9900;
+}
+.bar_min_4{
+  background: #ff6600;
+}
+.bar_min_5{
+  background: #c32a0b;
+}
+.bar_min_6{
+  background: #6c210e;
+}
+.bar_con{
+  background: #0ad7ec;
+  height: 40rpx;
+}
+.bar_top_max{
+  height: 40rpx;
+  margin-top: -40rpx;
+  
+}
+.bar_top_min{
+  height: 40rpx;
+  float: left;    
+  width: 20%;
+}
+
+.bar_num{
+  height: 30rpx;
+  margin: 0 -40rpx;
+  font-size: 24rpx;
+  text-align: center;
+}
+.bar_arrow{
+  width: 60rpx;
+  margin-top: 40rpx;
+  height: 80rpx;
+  text-align: center;
+}
+.bar_jt{
+  width: 20rpx;
+  height:20rpx;
+}
+
+.speed_max{
+  position: absolute;
+  margin-top:-650rpx;
+  width: auto;
+  height: 550rpx;
+  padding-right: 60rpx;
+}
+.speed_min{
+  height:145rpx;
+  font-size: 24rpx;
+  text-align: center;
+}
+.bar_speed{
+  height: 80rpx;
+  width:80rpx;
+  border: 6rpx solid #1c3f5f;
+  border-radius: 50%;
+  margin:auto;
+  text-align: center;
+  line-height: 80rpx;
+  color: #22d3d9;
+}
+.clear{
+  clear:both;
+  height:0;
+  overflow:hidden;
+}
+.new_yu_jing{
+  margin-bottom: 30rpx;
+}
+.new_yj_left{
+  font-size: 28rpx;
+  padding: 10rpx 0;
+  color: #8ba3eb;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_2073450FA4C94BB0BE5DA15D5AB93852.png") no-repeat left/35rpx;
+}
+.new_yj_right{
+  font-size: 28rpx;
+  padding: 10rpx;
+  text-align: right;
+  color: #8ba3eb;
+}
+.new_icon{
+  background: url("http://fileimg.makalu.cc/CORE_D315238A7F254C38A630C73FFCB860DB.png") no-repeat left/35rpx;
+}
+.van_row{
+  padding: 15rpx 0 5rpx;
+}
+.new_text{
+  float: right;
+  color: #8467ff;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/yujingxinxi/yujingxinxi.js b/miniprogram/pageage/yujingxinxi/yujingxinxi.js
new file mode 100644
index 0000000..f6f4b94
--- /dev/null
+++ b/miniprogram/pageage/yujingxinxi/yujingxinxi.js
@@ -0,0 +1,220 @@
+// miniprogram/pages/yujingxinxi/yujingxinxi.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    a:0,
+    b:0,
+    c:0,
+    projectName:'',
+    projectId:'',
+    loginName:'',
+    userName:'',
+    environList:{},
+    //数据加载参数
+    show:false, 
+    initData:{},
+
+    stateShow:false,
+    nav:1,
+    //预警处理信息
+    warningId:'',
+    warningType:2,
+    remarks:'',
+    labelShow:true,
+
+
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    this.onLoad();
+  },
+
+  onClickShow() {
+    this.setData({ show: true });
+  },
+
+  onClickHide() {
+    this.setData({ show: false });
+  },
+
+  onWarningInfo(e){
+    this.setData({
+      stateShow:true,
+      warningId:e.currentTarget.dataset.id,
+      remarks:''
+    })
+  },
+  //标签切换
+  onLabelNav(e){
+    this.setData({
+      nav:e.currentTarget.dataset.nav,
+      warningType:e.currentTarget.dataset.nav == 1?2:3,
+      remarks:''
+    })
+  },
+  //备注
+  remarks(e){
+    this.setData({
+      remarks:e.detail.value
+    })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    //启动蒙版
+    that.onClickShow();
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectName: app.globalData.projectName,
+            projectId:app.globalData.projectId,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+        }
+      });
+
+     that.selectEnvironDayAndMonth(1);
+  },
+
+  /**
+   * 加载预警信息数据
+   */
+  selectEnvironDayAndMonth(warningType){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/applets/selectEnvironDayAndMonth',
+      data:{
+        "projectId":app.globalData.projectId,
+        "warningType":warningType
+      },
+      method:"GET",
+      success:function(res){
+        //关闭蒙版
+        that.onClickHide();
+        that.setData({
+          environList:res.data
+        })
+        that.getEnvironDayAndMonthCount(warningType);
+      }
+    })
+  },
+
+  /**
+   * 预警个数
+   */
+  getEnvironDayAndMonthCount(warningType){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/applets/getEnvironDayAndMonthCount',
+      data:{
+        "projectId":app.globalData.projectId,
+        "warningType":warningType
+      },
+      method:"GET",
+      success:function(res){
+        //关闭蒙版
+        that.onClickHide();
+        that.setData({
+          a:res.data.dcl,
+          b:res.data.clz,
+          c:res.data.ycl
+        })
+      }
+    })
+  },
+
+  /**
+   * 添加预警信息
+   */
+  submit:function(){
+    var that = this;
+    if(this.data.remarks == '' || this.data.remarks == undefined){
+      app.toast("请选择备注！");
+      return;
+    }
+    let warningType ='';
+    let afootUser ='';
+    let afootRemarks ='';
+    let processedUser ='';
+    let processedRemarks ='';
+    if(this.data.labelShow && this.data.warningType == 2){
+      warningType = 2;
+      afootUser = this.data.loginName;
+      afootRemarks = this.data.remarks;
+    }if((this.data.labelShow && this.data.warningType == 3) || !this.data.labelShow){
+      warningType = 3;
+      processedUser = this.data.loginName;
+      processedRemarks = this.data.remarks;
+    }
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url:app.globalData.reqUrl+'/weixin/applets/addWarningHandle',
+      data:{
+        warningId:this.data.warningId,
+        warningType:warningType,
+        afootUser:afootUser,
+        afootRemarks:afootRemarks,
+        processedUser:processedUser,
+        processedRemarks:processedRemarks,
+      },
+      method:"POST",
+     success:function(res){
+       if(res.data > 0){
+          that.selectEnvironDayAndMonth(1);
+          that.setData({ stateShow:false });
+       }else{
+         app.toast("操作失败！");
+         return;
+       }
+     }
+    })
+  },
+
+  /**
+   * 关闭
+   */
+  closeBox(){
+    this.setData({
+      stateShow:false
+    })
+  },
+
+  orderChange(e){
+    let name = e.detail.name;
+    if(name == 'a'){
+      this.selectEnvironDayAndMonth(1);
+      this.setData({labelShow:true});
+    }else if(name == 'b'){
+      this.selectEnvironDayAndMonth(2);
+      this.setData({labelShow:false});
+    }else if(name == 'c'){
+      this.selectEnvironDayAndMonth(3);
+      this.setData({labelShow:false});
+    }
+  }
+
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/yujingxinxi/yujingxinxi.json b/miniprogram/pageage/yujingxinxi/yujingxinxi.json
new file mode 100644
index 0000000..1714d6f
--- /dev/null
+++ b/miniprogram/pageage/yujingxinxi/yujingxinxi.json
@@ -0,0 +1,11 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-tag": "@vant/weapp/tag/index",
+    "van-overlay": "@vant/weapp/overlay/index"
+  },
+  "navigationBarTitleText": "预警信息"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/yujingxinxi/yujingxinxi.wxml b/miniprogram/pageage/yujingxinxi/yujingxinxi.wxml
new file mode 100644
index 0000000..e0e31a1
--- /dev/null
+++ b/miniprogram/pageage/yujingxinxi/yujingxinxi.wxml
@@ -0,0 +1,140 @@
+<!--miniprogram/pages/yujingxinxi/yujingxinxi.wxml-->
+<view class="max_content_none">
+  <!-- <view class="video_add">
+    <view class="video_address">
+      <view class="video_address_min">
+        {{projectName}}
+      </view>
+    </view>
+  </view> -->
+
+  <view style="padding: 10rpx 30rpx 20rpx;">
+    <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+  </view>
+
+  <view class="new_tips" style="display: flex;align-items: center;justify-content: center;">
+    <image src="/images/early.png" style="margin-right:10rpx"></image>
+    注：仅展示最近三天预警信息记录
+  </view>
+
+  <view class="new_nav">
+    <van-tabs active="a" bind:change="orderChange" >
+      <van-tab title="未处理 ({{a}})" name="a" >
+        <view class="new_con_info">
+          <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index"  wx:if="{{index<150}}"
+              data-id="{{item.id}}" bindtap="onWarningInfo"> 
+            <!--<view class="new_con_title">
+              {{item.envirName}}
+               <van-tag mark type="warning">已超时</van-tag>
+              <van-tag mark type="danger">已催办</van-tag> 
+            </view>
+            -->
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td">预警类型：{{item.envirName}}</view>
+                  <view class="new_con_td">预警设备：{{item.device}}</view>
+                  <view class="new_con_td">预警内容：{{item.content}}</view>
+                  <view class="new_con_td">预警时间：{{item.createTime}}</view>
+                </van-col>
+                <van-col span="6">
+                  <view class="new_zhong_clz">待处理</view>
+                </van-col>
+              </van-row>
+            </view>
+          </view>
+        </view> 
+      </van-tab>
+      <van-tab title="处理中 ({{b}})" name="b" >
+        <view class="new_con_info">     
+          <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index"  wx:if="{{index<150}}"
+              data-id="{{item.id}}" bindtap="onWarningInfo"> 
+            <!--<view class="new_con_title">
+              {{item.envirName}}
+               <van-tag mark type="warning">已超时</van-tag>
+              <van-tag mark type="danger">已催办</van-tag> 
+            </view>-->
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td">预警类型：{{item.envirName}}</view>
+                  <view class="new_con_td">预警设备：{{item.device}}</view>
+                  <view class="new_con_td">预警内容：{{item.content}}</view>
+                  <view class="new_con_td">预警时间：{{item.createTime}}</view>
+                  <view class="new_con_td">处理人：{{item.afootUser}}</view>
+                  <view class="new_con_td">处理时间：{{item.afootTime}}</view>
+                  <view class="new_con_td">备注：{{item.afootRemarks}}</view>
+                </van-col>
+                <van-col span="6">
+                  <view class="new_zhong_clz">处理中</view>
+                </van-col>
+              </van-row>
+            </view>
+          </view>
+        </view> 
+      </van-tab>
+      <van-tab title="已处理 ({{c}})" name="c" >
+        <view class="new_con_info">
+          <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index"  wx:if="{{index<150}}"
+              data-id="{{item.id}}"> 
+            <!--<view class="new_con_title">
+              {{item.envirName}}
+               <van-tag mark type="warning">已超时</van-tag>
+              <van-tag mark type="danger">已催办</van-tag> 
+            </view>-->
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td">预警类型：{{item.envirName}}</view>
+                  <view class="new_con_td">预警设备：{{item.device}}</view>
+                  <view class="new_con_td">预警内容：{{item.content}}</view>
+                  <view class="new_con_td">预警时间：{{item.createTime}}</view>
+                  <view class="new_con_td">处理人：{{item.processedUser}}</view>
+                  <view class="new_con_td">处理时间：{{item.processedTime}}</view>
+                  <view class="new_con_td">备注：{{item.processedRemarks}}</view>
+                </van-col>
+                <van-col span="6">
+                  <view class="new_zhong_clz">已处理</view>
+                </van-col>
+              </van-row>
+            </view>
+          </view>
+        </view> 
+      </van-tab>
+    </van-tabs>
+  </view>
+
+
+</view>
+
+<van-overlay show="{{ stateShow }}">
+  <view class="state_wrapper">
+    <view class="state_content">
+      <view class="state_content_title">预警信息</view>
+      <view class="state_content_nav" wx:if="{{labelShow}}">
+        <view class="{{nav==1?'active':''}}" bindtap="onLabelNav" data-nav="1">处理中</view>
+        <view class="{{nav==2?'active':''}}" bindtap="onLabelNav" data-nav="2">已处理</view>
+      </view>
+      <view class="state_content_remar_max">
+        <view class="state_content_remar">
+          <textarea placeholder="请输入" bindinput="remarks" value="{{remarks}}"  auto-height placeholder-style="color:#4f5d85;"></textarea>
+        </view>
+        <view class="state_content_btn">
+          <view bindtap="closeBox">关闭</view>
+          <view bindtap="submit">确定</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</van-overlay>
+
+
+
+
+<van-overlay show="{{show}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
diff --git a/miniprogram/pageage/yujingxinxi/yujingxinxi.wxss b/miniprogram/pageage/yujingxinxi/yujingxinxi.wxss
new file mode 100644
index 0000000..1bd5571
--- /dev/null
+++ b/miniprogram/pageage/yujingxinxi/yujingxinxi.wxss
@@ -0,0 +1,148 @@
+/* miniprogram/pages/yujingxinxi/yujingxinxi.wxss */
+/* 修改样式 */
+.van-ellipsis{
+  background: #191d28;
+}
+.van-tab--active{
+  color:#8aa2e8 !important;
+}
+.van-hairline--top-bottom:after{
+  border-width: 0 0 !important
+}
+.van-tabs__line{
+  background: #8aa2e8 !important;
+  font-weight: bold !important;
+}
+.van-tag--mark{
+  margin:0 10rpx ;
+}
+.van-tag--mark,.van-tag--mark:after {
+  border-radius: 15rpx 0 15rpx 0 !important;
+}
+/* 页面样式 */
+.max_content_none{
+  padding: 50rpx 0;
+}
+.new_tips{
+  text-align: center;
+  font-size: 24rpx;
+  color:#8aa2e8 ;
+  padding: 20rpx 0;
+}
+.new_tips image{
+  width: 30rpx;
+  height: 30rpx;
+}
+.new_nav{
+  padding: 30rpx;
+}
+.new_con_info{
+  padding: 30rpx 0 0;
+}
+.new_con_info_min{
+  background:#232943 ;
+  border-radius: 20rpx;
+  padding:20rpx 30rpx;
+  margin-bottom: 30rpx;
+}
+.new_con_title{
+  font-weight: bold;
+  font-size: 30rpx;
+}
+.new_con_ds{
+  padding: 20rpx 0 0;
+}
+.new_con_td{
+  color:#8aa2e8 ;
+  font-size: 26rpx;
+  padding: 8rpx;
+}
+.new_zhong_clz{
+  font-size: 28rpx;
+  color: #9499ac;
+  text-align: center;
+  margin-top: 20rpx;
+}
+.new_zhong_wc{
+  background:linear-gradient(to right, #8b4bf7 , #7457ff); 
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 20rpx;
+  padding: 10rpx 0;
+  border-radius: 50rpx;
+}
+.new_zhong_dcb{
+  font-size: 28rpx;
+  color: #f49829;
+  text-align: center;
+  margin-top: 20rpx;
+}
+.new_zhong_ycb{
+  background:#5c5e6b; 
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 20rpx;
+  padding: 10rpx 0;
+  border-radius: 50rpx;
+}
+
+/* 弹窗 */
+.state_wrapper{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
+.state_content{
+  width: 90%;
+  background: #1d212e;
+  border-radius: 10rpx;
+}
+.state_content_title{
+  padding: 30rpx;
+}
+.state_content_nav{
+  padding: 15rpx 30rpx;
+  display: flex;
+  align-items: center;
+}
+.state_content_nav view{
+  padding: 5rpx 30rpx;
+  border: 1px solid #444957;
+  color: #444957;
+  margin-right: 30rpx;
+  font-size: 26rpx;
+  border-radius: 30rpx;
+}
+.state_content_nav .active{
+  border: 1px solid #8aa2e8;
+  color: #8aa2e8;
+}
+.state_content_remar_max{
+  padding: 30rpx;
+}
+.state_content_remar{
+  background: #2c3346;
+  padding: 30rpx;
+  border-radius: 10rpx;
+}
+.state_content_remar textarea{
+  min-height: 150rpx;
+  width:100%;
+  background: #2c3346;
+}
+.state_content_btn{
+  padding: 30rpx 30rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content:flex-end;
+}
+.state_content_btn view{
+  padding: 10rpx;
+  width: 130rpx;
+  border: 1px solid #252c3d;
+  background: #252c3d;
+  text-align: center;
+  color: #6a7faa;
+  margin-left: 20rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Concrete-usage/index.js b/miniprogram/pages/Concrete-usage/index.js
new file mode 100644
index 0000000..78afc83
--- /dev/null
+++ b/miniprogram/pages/Concrete-usage/index.js
@@ -0,0 +1,70 @@
+// pages/Concrete-usage/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        placeholderTitle:'商品混凝土/C40',
+        progressList:[{text:'商品混凝土/C40',id:132}],
+        progressLists:[{text:'本月',id:0},{text:'本周',id:1},{text:'本日',id:2}],
+        placeholderTitles:'本月',
+        concreteList:[{name:'商品混凝土/C40',num:'2177.0',xieliao:'	*****方式',guke:'	***类行、***类型、***类型',waijiaji:'***类行、***类型、***类型',concretes:'******'},{name:'商品混凝土/C40',num:'2177.0',xieliao:'	*****方式',guke:'	***类行、***类型、***类型',waijiaji:'***类行、***类型、***类型',concretes:'******'},{name:'商品混凝土/C40',num:'2177.0',xieliao:'	*****方式',guke:'	***类行、***类型、***类型',waijiaji:'***类行、***类型、***类型',concretes:'******'},{name:'商品混凝土/C40',num:'2177.0',xieliao:'	*****方式',guke:'	***类行、***类型、***类型',waijiaji:'***类行、***类型、***类型',concretes:'******'},]
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Concrete-usage/index.json b/miniprogram/pages/Concrete-usage/index.json
new file mode 100644
index 0000000..38562ed
--- /dev/null
+++ b/miniprogram/pages/Concrete-usage/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "混凝土使用情况"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Concrete-usage/index.wxml b/miniprogram/pages/Concrete-usage/index.wxml
new file mode 100644
index 0000000..dfbac01
--- /dev/null
+++ b/miniprogram/pages/Concrete-usage/index.wxml
@@ -0,0 +1,58 @@
+<!--pages/Concrete-usage/index.wxml-->
+<!-- 混凝土使用情况 -->
+<view class="concrete">
+	<!-- 头部 -->
+	<view class="concrete-header">
+		<view style="width: 60%;height: 90rpx;border-radius: 20rpx;">
+			<voucher-select columns="{{progressList}}" placeholder="{{placeholderTitle}}" background="#2b345b" ></voucher-select>
+		</view>
+		<view style="width: 30%;height: 90rpx;">
+			<voucher-select columns="{{progressLists}}" placeholder="{{placeholderTitles}}" background="#2b345b"></voucher-select>
+		</view>
+	</view>
+	<!-- 混凝土使用列表 -->
+	<view class="concrete-content">
+		<!-- 混凝土使用标题 -->
+		<view class="eharts_title" style="margin-bottom: 50rpx;">
+			混凝土使用列表 (4)
+		</view>
+		<!-- 混凝土使用列表 -->
+		<view class="concrete-content-box" wx:for="{{concreteList}}">
+			<view class="concrete-content-box-top">
+				<view style="width: 10%;border-bottom: 1px solid #4854a9;height: 60rpx;line-height: 60rpx;text-align: center;color:#4854a9 ;">
+				0{{index+1}}
+				</view>
+				<view style="width: 90%;border-bottom: 1px solid #293264;height: 60rpx;line-height: 60rpx;">
+					{{item.name}}
+				</view>
+			</view>
+			<view class="concrete-content-box-bottom"> 
+				<view style="display: flex;">
+					累计数量: <view style="color: #a55c15;padding-left: 20rpx;">
+					{{item.num}}
+					</view>
+				</view>
+				<view style="display: flex;">
+					卸料方式: <view style="color: #3a8cce;padding-left: 20rpx;">  
+					{{item.xieliao}}
+					</view>
+				</view>
+				<view style="display: flex;">
+					骨科添加类型: <view style="color: #7488c6;padding-left: 20rpx;">
+						{{item.guke}}
+					</view>
+				</view>
+				<view style="display: flex;">
+					外加剂添加类型: <view style="color: #7488c6;padding-left: 20rpx;">
+				{{item.waijiaji}}
+					</view>
+				</view>
+				<view style="display: flex;">
+					混凝土方量(小票): <view style="color: #7488c6;padding-left: 20rpx;">
+						{{item.concretes}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/Concrete-usage/index.wxss b/miniprogram/pages/Concrete-usage/index.wxss
new file mode 100644
index 0000000..4aab95d
--- /dev/null
+++ b/miniprogram/pages/Concrete-usage/index.wxss
@@ -0,0 +1,48 @@
+/* pages/Concrete-usage/index.wxss */
+/* 混凝土使用 */
+.concrete{
+	padding: 60rpx 40rpx 30rpx;
+}
+/* 头部 */
+.concrete-header{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 112rpx;
+}
+/* 混凝土使用标题 */
+.concrete-content{
+	padding: 60rpx 0 40rpx;
+}
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+  /* 混凝土使用列表 */
+  .concrete-content-box{
+	  padding: 20rpx;
+	  height: 420rpx;
+	  border: 1px solid #1e2336;
+	  border-radius: 20rpx;
+	  font-size: 26rpx;
+	  background-color: #1e2336;
+	  margin-bottom: 40rpx;
+  }
+  .concrete-content-box-top{
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  height: 60rpx;
+  }
+  .concrete-content-box-bottom{
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-around;
+	  height: calc(100% - 30px);
+	  padding-left: 24rpx;
+	  color: #8795b2;
+  }
\ No newline at end of file
diff --git a/miniprogram/pages/Construction-Log/index.js b/miniprogram/pages/Construction-Log/index.js
new file mode 100644
index 0000000..14e616b
--- /dev/null
+++ b/miniprogram/pages/Construction-Log/index.js
@@ -0,0 +1,247 @@
+// pages/Construction-Log/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        buildList: [],
+        floorList: [],
+        //侧边
+        show: false,
+        projectId:'',
+        projectName:'' ,
+        loginName:'',
+        userName:'',
+        remark:'',
+        initData:{},
+        projectData:{},
+        logList:[],
+        buildingNum:'',
+        floorNum:'',
+        params:{
+            startTime:'',
+            endTime:''
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this
+        wx.getStorage({
+            key: 'userinfo',
+            success: function (res) {
+                that.setData({
+                    remark: res.data.remark,
+                    loginName: res.data.loginName,
+                    userName: res.data.userName,
+                    projectId: app.globalData.projectId,
+                    projectName: app.globalData.projectName,
+                    initData: {
+                        text: app.globalData.projectName,
+                        id: app.globalData.projectId
+                    }
+                })
+            }
+        })
+        that.getProjectCorrespondence(app.globalData.projectId);
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+     /**
+     * 项目对应关系
+     */
+    getProjectCorrespondence(projectId) {
+        var that = this;
+        wx.request({
+            url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+            data: {
+                "projectId": projectId,
+            },
+            method: "get",
+            success: function (res) {
+                that.setData({
+                    projectData: res.data
+                })
+                that.getLogList(that.data.projectData.szh)
+                // that.getBulidingFloorList(res.data.szh) 
+            }
+        })
+    },
+    /**
+     * 获取施工日志列表
+     */
+    getLogList(projectId) {
+        var that = this;
+        wx.request({
+            url: app.globalData.szhUrl + '/weixin/constructionLog/getLoglist',
+            data: {
+                "projectId": projectId,
+                "buildingNum":that.data.buildingNum,
+                "floorNum":that.data.buildingNum,
+                "params.startTime":that.data.params.startTime,
+                "params.endTime":that.data.params.startTime
+            },
+            method: "POST",
+            header: {
+                "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+            },
+            success: function (res) {
+               console.log(res)
+               that.setData({
+                    logList:res.data.data
+               })
+            }
+        })
+    },
+    /**
+     * 返回上一层
+     */
+    goGCLB() {
+        wx.redirectTo({
+            url: '../gengduogongneng/gengduogongneng',
+        })
+    },
+    showPopup() {
+        this.setData({ show: true });
+    },
+    
+    onClose() {
+    this.setData({ show: false });
+    },
+    /**
+     * 跳转到添加页面
+     */
+    goAddPage() {
+        wx.navigateTo({
+          url: '../construction/index',
+        })
+    },
+     /**
+     * 获取楼盘信息和楼层信息
+     */
+    getBulidingFloorList(projectId) {
+        if(projectId != '') {
+            var that = this
+            wx.request({
+                url: app.globalData.szhUrl + '/weixin/constructionLog/getBuildingFloorList',
+                method: "POST",
+                data: {
+                    "projectId": parseInt(projectId)
+                },
+                header: {
+                    "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+                },
+                success: (res => {
+                    if(res.data.code == 0) {
+                        var data = res.data.data
+                        if (data.length > 0) {
+                            var list = [];
+                            list = data.map(item => {
+                                var floorList = []
+                                if (item.buildingFloorList.length > 0) {
+                                    floorList = item.buildingFloorList.map(floor => {
+                                        return {
+                                            id: floor.floorNum,
+                                            text: floor.floorName
+                                        }
+                                    })
+                                }
+        
+                                return {
+                                    id: item.id,
+                                    text: item.buildingName,
+                                    floorList: floorList
+                                }
+                            })
+                            that.setData({
+                                buildList: list,
+                                buildingNum:list[0].id,
+                                floorList: list[0].floorList,
+                                floorNum:list[0].floorList[0].id
+                            })
+                          
+                        }
+                    }    
+                })
+            })
+        }
+       
+    },
+    //筛选关闭
+    screenCondition(e) {
+        console.log(e.detail)
+        const {buildingNum,endDate,floorNum,startDate} = e.detail
+        this.setData({
+            buildingNum:buildingNum,
+            floorNum:floorNum,
+            'params.startTime':startDate + " 00:00:00",
+            'params.endTime':endTime + " 23:59:59"
+        })
+        this.getLogList(this.data.projectData.szh)
+    },
+    onProjectSelect(e) {
+        var that = this
+        var id = e.detail.id
+        that.getProjectCorrespondence(id)
+    },
+
+    checkDetails(e){
+        let item = e.currentTarget.dataset.item;
+        wx.navigateTo({
+          url: '../construction-details/index?id='+item.id,
+        })
+    }
+
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Construction-Log/index.json b/miniprogram/pages/Construction-Log/index.json
new file mode 100644
index 0000000..63fcd6b
--- /dev/null
+++ b/miniprogram/pages/Construction-Log/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "施工日志"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Construction-Log/index.wxml b/miniprogram/pages/Construction-Log/index.wxml
new file mode 100644
index 0000000..6e0392b
--- /dev/null
+++ b/miniprogram/pages/Construction-Log/index.wxml
@@ -0,0 +1,93 @@
+<!-- 施工日志 -->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">施工日志</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- 账号信息 -->
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+
+<view class="construction" style="padding-top: 0;">
+	<!-- 头部模块 -->
+	<view class="max_content" style="width:110%;padding: 20rpx 0 26rpx;">
+		<project-select style="width:100rpx" init="{{initData}}" bindchange="onProjectSelect"></project-select>		
+	</view>
+	<!-- 施工日志列表 -->
+	<!-- <view class="logList">
+			<view class="eharts_title" >
+				施工日志列表 
+			</view>
+			<view class="right-title">
+				<pz-screen-training-index columns="{{buildList}}" bindscreen="screenCondition" title="楼号" title1="楼层层数"></pz-screen-training-index>
+			</view>
+	</view> -->
+	<!-- 施工日志内容 -->
+	<view class="log-content" wx:for="{{logList}}" wx:key="index" bindtap="checkDetails" data-item="{{item}}">
+		<!-- 上面部分 -->
+		<view class="log-content-top">
+			<view style="padding: 6rpx 16rpx;border-bottom: 1px solid #3f498e;color: #697ab3;">
+			{{index<9?'0'+(index+1):index+1}}
+			</view>
+			<view style="padding: 6rpx 16rpx;border-bottom: 1px solid #27327a;width: 100%;">
+				{{item.buildingName}}/ {{item.floorName}}
+			</view>
+		</view>
+		<!-- 下面部分 -->
+		<view class="log-content-bottom">
+			<view class="log-contentStyle">
+				填报日期 : <view class="titleColor">
+				{{item.fillTime}}
+				</view>
+			</view>
+			<view class="log-contentStyle" style="margin: 36rpx 0;">
+				填报人 :
+				<view style="color: #8ca2eb;font-weight: bold;" class="titleColor">
+			{{item.createUserName}}
+				</view>
+			</view>
+			<view class="log-contentStyle">
+			创建时间 :
+			<view style="color: #8ca2eb;" class="titleColor">
+				{{item.createTime}}
+			</view>
+			</view>
+		</view>
+	</view>
+</view>
+ <!-- 新增模块 -->
+ <view class="button-add" bindtap="goAddPage" style="bottom: 24rpx;right: 38rpx;">
+      <view style="width: 38rpx;height: 38rpx;">
+        <image src="http://fileimg.makalu.cc/WEB_73DDBFC7781A41C082FC10AB5F530472.png" mode=""/>
+      </view>
+      <view style="font-size: 26rpx;color: #748bca;">
+        新增
+      </view>
+    </view>
\ No newline at end of file
diff --git a/miniprogram/pages/Construction-Log/index.wxss b/miniprogram/pages/Construction-Log/index.wxss
new file mode 100644
index 0000000..b35ac0f
--- /dev/null
+++ b/miniprogram/pages/Construction-Log/index.wxss
@@ -0,0 +1,73 @@
+/* 施工日志 */
+.construction{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	padding:150rpx 36rpx ;
+}
+.eharts_title{
+	height: 70rpx;
+	line-height: 70rpx;
+	padding-left: 50rpx;
+	font-size: 34rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+	color: #fff;
+	}
+	.logList{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		margin:20rpx  0 40rpx ;
+	}
+	.right-title{
+		display: flex;
+		align-items: center;
+		color: #697ab3;
+	}
+	.right-Img{
+		width: 44rpx;
+		height: 44rpx;
+	}
+	.log-content{
+		width: 100%;
+		border:1px solid #1e2336;
+		border-radius: 12rpx;
+		margin: 20rpx 0;
+		padding: 16rpx;
+		background-color: #1e2336;
+		box-sizing: border-box;
+	}
+	.log-content-top{
+		display: flex;
+		align-items: center;
+	}
+	.log-content-bottom{
+		padding: 30rpx 10rpx;
+	}
+	.titleColor{
+		color: #43aeff;
+		margin-left: 10rpx;
+		font-weight: bold
+	}
+	.log-contentStyle{
+		display: flex;
+	}
+	/* 新增模块 */
+.button-add{
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	position: fixed;
+	bottom: 10rpx;
+	right: 10rpx;
+	width: 110rpx;
+	height: 110rpx;
+	border-radius: 50%;
+	background-color: #273252;
+  }
+  .button-add image{
+	width: 100%;
+	height: 100%;
+  }
\ No newline at end of file
diff --git a/miniprogram/pages/Highlight-photos/index.js b/miniprogram/pages/Highlight-photos/index.js
new file mode 100644
index 0000000..246932f
--- /dev/null
+++ b/miniprogram/pages/Highlight-photos/index.js
@@ -0,0 +1,193 @@
+// pages/Highlight-photos/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        //人员信息页面
+        show: false,
+        //页面跳转参数
+        loginName:'',
+        userName:'',
+        projectId:'',
+        projectName:'' ,
+        initData:{},
+        loadShow:false,
+        //记录列表
+        recordList:[],
+        //查看图片
+        picShow:false,
+        imageUrl:''
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this
+        //获取项目缓存数据
+        wx.getStorage({
+            key: 'userinfo',
+            success:function(res){
+            that.setData({
+                loginName:res.data.loginName,
+                userName:res.data.userName,
+                projectId:app.globalData.projectId,
+                projectName:app.globalData.projectName,
+                initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+            })  
+            }
+        })
+        that.getProjectCorrespondence(app.globalData.projectId)
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+     /**
+      * 返回到更多功能页面
+      */
+    goBeforPage: function () {
+        wx.redirectTo({
+            url: '../newAddPage/safetyManagement/index'
+        })
+    },
+    showPopup() {
+        this.setData({
+            show: true,
+        });
+
+    },
+    onClose() {
+        this.setData({
+            show: false
+        });
+    },
+     //项目切换 返回值
+    onProjectSelect(e) {
+        var that = this;
+        this.onClickShow();
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        that.setData({
+            projectId: projectId,
+            projectName: projectName
+        })
+        this.onLoad()
+    },
+
+
+    /**
+   * 项目对应关系
+   */
+  getProjectCorrespondence(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        console.log(res.data);
+        that.setData({
+          projectData: res.data,
+          projectId:res.data.szh
+        })
+        that.getURLList()
+      }
+    })
+  },
+    /**
+     * 
+     */
+    getURLList() {
+        var that = this
+        wx.request({
+          url: app.globalData.szhUrl+'/api/wei/getHighlightPhotos',
+          data:{
+              projectId:that.data.projectId
+          },
+          method:"POST",
+          header: {
+            'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+          },
+          success:(res)=>{
+                if(res.data.code == 0) {
+                    that.setData({
+                        recordList:res.data.data
+                    })
+                } else {
+                    that.setData({
+                        recordList:[]
+                    })
+                }
+          }
+
+        })
+    },
+    showPic(e) {
+      this.setData({
+          picShow:true,
+          imageUrl:e.currentTarget.dataset.id
+      })
+    },
+    closePic() {
+        this.setData({
+            picShow:false,
+            imageUrl:''
+        
+        })
+    }
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Highlight-photos/index.json b/miniprogram/pages/Highlight-photos/index.json
new file mode 100644
index 0000000..c84dc87
--- /dev/null
+++ b/miniprogram/pages/Highlight-photos/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-popup": "@vant/weapp/popup/index"
+    },
+    "navigationBarTitleText": "亮点照片"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Highlight-photos/index.wxml b/miniprogram/pages/Highlight-photos/index.wxml
new file mode 100644
index 0000000..d6102c8
--- /dev/null
+++ b/miniprogram/pages/Highlight-photos/index.wxml
@@ -0,0 +1,111 @@
+<!--pages/Highlight-photos/index.wxml-->
+<!-- 亮点照片 -->
+<view class="All-content">
+	<!-- <view class="header_title">
+		<view class="header_title_row">
+			<van-row>
+			<van-col span="3">
+				<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+			</van-col>
+			<van-col span="4">
+				<view class="header_img" bindtap="goBeforPage">
+				<image src="/images/left.png"></image>
+				<text class="header_fh">返回</text>
+				</view>
+			</van-col>
+			<van-col span="10">
+				<view class="header_name">亮点照片</view>
+			</van-col>
+			</van-row>
+		</view>
+	</view> -->
+
+	<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+	<view class="left_max">
+		<van-row class="demo clearfix">
+		<van-col span="10">
+			<view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+		</van-col>
+		<van-col span="14">
+			<view class="left_info">
+			<view class="left_info_name">{{userName}}</view>
+			<view class="left_info_name">{{loginName}}</view>
+			</view>
+		</van-col>
+		</van-row>
+	</view>
+	</van-popup> -->
+<!-- 头部模块 -->
+	<view class="max_new_content" style="width:110%;height: 105rpx;">
+		<project-select style="width:100rpx"  init="{{initData}}" bindchange="onProjectSelect"></project-select>
+		<!-- 亮点记录头部 -->
+		<view class="liangdianjulu-content">
+			<view class="eharts_title">
+			近5条亮点照片记录
+			</view>
+			<!-- <view style="display: flex;">
+				<view style="width: 30rpx;height: 30rpx;">
+					<image src="http://fileimg.makalu.cc/WEB_3F11BBC019F445688636A521EBBE43B9.png" mode="" style="width: 100%;height: 100%;"/>
+				</view>
+				<view style="font-size: 26rpx;margin-left: 20rpx;">
+					筛选
+				</view>
+			</view> -->
+		</view>
+	<!-- 亮点内容 -->
+	<view class="liangdian">
+		<view class="liangdianjulu" wx:for="{{recordList}}" wx:key="index" wx:if="{{index < 5}}">
+		<!-- 上面部分 -->
+			<view class="liangdianjulu-top">
+				<view style="width: 60rpx;height: 60rpx; border-bottom: 2px solid #414c96; text-align: center; color: #6c79e0;font-weight: bold;">
+					{{index  < 9?'0'+(index + 1):(index + 1)}} 
+				</view>
+				<view style="text-indent:20px;font-weight:bolder;">
+					{{item.technologyName}}
+				</view>
+			</view>
+			<!-- 内容部分 -->
+			<view class="liangdianjulu-all">
+				<view class="liangdianjulu-all-Img">
+					<swiper circular>
+						<swiper-item  wx:for="{{item.photoList}}" wx:for-item="picture" wx:key="photoIndex">
+							<image src="{{picture}}" style="width:100%;height:100%;" data-id="{{picture}}" bindtap="showPic" mode="" />
+						</swiper-item>
+					</swiper>
+				</view>
+				<!-- 施工部位 -->
+				<view  class="liangdianjulu-all-text" style="margin-top: 90rpx;">
+					<view>
+						施工部位:
+					</view>
+					<view style="margin-left: 10rpx;color: #41a7f4;">
+					{{item.highlightsTypeName}}
+					</view>
+				</view>
+				<!-- 上传时间 -->
+				<view class="liangdianjulu-all-time">
+					<view>
+						上传时间：
+					</view>
+					<view style="margin-left: 10rpx;color: #41a7f4;">
+						{{item.creatTime}}
+					</view>
+				</view>
+				<view class="liangdianjulu-all-shuoming">
+				工艺亮点说明:
+				</view>
+				<view style="color: #7084c0;">
+				{{item.technologyText}}
+				</view>
+			</view>
+		</view>
+	</view>
+	</view>
+	
+	</view>
+
+<view>
+	<van-popup show="{{ picShow }}" bind:before-enter="showPic" bind:close="closePic">
+		<image src="{{imageUrl}}"  mode="scaleToFill"></image>
+	</van-popup>
+</view>
diff --git a/miniprogram/pages/Highlight-photos/index.wxss b/miniprogram/pages/Highlight-photos/index.wxss
new file mode 100644
index 0000000..8191eda
--- /dev/null
+++ b/miniprogram/pages/Highlight-photos/index.wxss
@@ -0,0 +1,93 @@
+/* pages/Highlight-photos/index.wxss */
+/* 所有样式 */
+.All-content{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	padding:0 36rpx 36rpx;
+}
+/* 头部样式 290+40*/
+.header-content{
+	width: 100%;
+	height: 100rpx;
+	border-radius: 40rpx;
+	margin-bottom: 40rpx;
+}
+/* 亮点照片展示 */
+.liangdian{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items:center ;
+	width:100%;
+}
+.liangdianjulu{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding: 20rpx 40rpx 40rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	box-sizing: border-box;
+}
+
+.liangdianjulu-content{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 60rpx;
+	margin-bottom: 60rpx;
+}
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+  .liangdianjulu-top{
+	  display: flex;
+	  justify-content: flex-start;
+	  width: 100%;
+	  height: 60rpx;
+	  line-height: 60rpx;
+	 border-bottom: 1px solid #282f60;
+  }
+.liangdianjulu-all{
+	padding: 40rpx 30rpx;
+	font-size: 26rpx;
+}
+.liangdianjulu-all-Img{
+	width: 100%;
+	height: 264rpx;
+}
+.liangdianjulu-all-text{
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	margin: 30rpx 0;
+}
+.liangdianjulu-all-time{
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	margin: 30rpx 0;
+}
+.liangdianjulu-all-shuoming{
+	margin: 30rpx 0;
+}
+view .van-popup  {
+	position: fixed !important;
+    box-sizing: border-box !important;
+    max-height: 100% !important;
+    overflow-y: auto !important;
+    transition-timing-function: ease !important;
+    -webkit-animation: ease both !important;
+    animation: ease both !important;
+	-webkit-overflow-scrolling: touch !important;
+	background-color: none !important;
+	background:none !important
+
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Information-review/index.js b/miniprogram/pages/Information-review/index.js
new file mode 100644
index 0000000..f9c4ae8
--- /dev/null
+++ b/miniprogram/pages/Information-review/index.js
@@ -0,0 +1,108 @@
+// pages/Information-review/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        dataList:[{name:'待审核(6)'},{name:'已通过(13)'},{name:'已驳回(5)'}],
+        nactive:0,
+        successList:[{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过'},{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过'},{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过'},{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过'}],
+        UnauditedList:[{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过',check:false},{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过',check:false},{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过',check:false},{title:'陕西马卡鲁信息技术有限公司劳务队',worktype:'电工',name:'张飞',time:'2021-02-26 11:23',type:'已通过',check:false}],
+        selected:false
+    },
+    // 事件委托
+    selected(e){
+    // console.log(e);
+    this.setData({
+        nactive:e.target.dataset.set
+    })
+    },
+    // 点击进行全选
+    allSelected(){
+        // console.log('000');
+     const select=this.data.UnauditedList.map((item,i)=>{
+            if(this.data.selected){
+            item.check=false
+            }else{
+            item.check=true
+            }
+            return item
+        })
+        console.log(select);
+        this.setData({
+            selected:!this.data.selected,
+            UnauditedList:select
+        })
+    },
+    // 点击进行选中未选中
+    radioCheck(e){
+        let index = e.target.dataset.set
+       const temp= this.data.UnauditedList.map(function(item,i){
+            if(i===index){
+                item.check=!item.check
+            }
+            return item
+        })
+        
+        this.setData({
+            UnauditedList:temp,
+            selected:this.data.UnauditedList.every(item=>item.check)
+        })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Information-review/index.json b/miniprogram/pages/Information-review/index.json
new file mode 100644
index 0000000..27ef2c0
--- /dev/null
+++ b/miniprogram/pages/Information-review/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText":"临时人员信息审核"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Information-review/index.wxml b/miniprogram/pages/Information-review/index.wxml
new file mode 100644
index 0000000..53db68e
--- /dev/null
+++ b/miniprogram/pages/Information-review/index.wxml
@@ -0,0 +1,183 @@
+<!-- 信息审核 -->
+<view class="information-review">
+	<!-- tab栏切换 -->
+	<view class="information-review-tab" bindtap="selected">
+		<view class="{{nactive===index?'active':''}}" data-set="{{index}}" wx:for="{{dataList}}" wx:key="index">
+			{{item.name}}
+		</view>
+	</view>
+	
+	<!-- 下面对应内容 -->
+	<view class="information-review-content">
+	 	<!-- 待审核对应模块 -->
+		<view class="{{nactive===0?'information-review-show shows':'information-review-show'}}" >
+		<!-- 筛选 -->
+	<view class="screen-style" >
+		<!-- 左部分 200+25-->
+		<view class="screen-style-left" style="display: flex;align-items: center;">
+			<view style="width:50rpx;height: 50rpx;">
+				<image src="http://fileimg.makalu.cc/WEB_6AF4FEC2B2724A4DB80D40516303612C.png" mode="" style="width: 100%;height: 100%;transform: scale(0.8);"/>
+			</view>
+			<view style="margin-left: 16rpx;">
+				待审核人员列表
+			</view>
+		</view>
+		<!-- 右部分 -->
+		<view class="screen-style-right" style="display: flex;justify-content: flex-end;align-items: center;">
+			<view style="width: 50rpx;height: 50rpx;">
+				<image src="http://fileimg.makalu.cc/WEB_3F11BBC019F445688636A521EBBE43B9.png" mode="" style="width: 100%;height: 100%;transform: scale(0.8);"/>
+			</view>
+			<view style="margin-left:16rpx">
+				筛选
+			</view>
+		</view>
+	</view>
+			<view class="information-review-Audit-Not">
+			<!--需要循环的模块 328+120 -->
+				<view class="information-review-Audit-box-Not" wx:for="{{UnauditedList}}" wx:key="index">
+					<!-- 单选框 -->
+					<radio data-set="{{index}}" checked="{{item.check}}" bindtap="radioCheck" color="#89a3ec" style="position: absolute;top: 24rpx;left: 14rpx;"/>
+					<view style="letter-spacing: 6rpx;display: flex;justify-content: space-between;font-size: 28rpx;">
+						{{item.title}}
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						归属工种: <view style="margin-left: 6rpx;">
+							{{item.worktype}}
+						</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						姓名: <view  style="margin-left: 6rpx;">
+							{{item.name}}
+						</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						注册时间: <view style="margin-left: 6rpx;">
+							{{item.time}}
+						</view>
+					</view>
+				</view>
+			</view>
+				<!-- 全选框 -->
+				<view class="information-review-Audit-footer">
+				<!-- 左盒子 -->
+				<view style="display: flex;align-items: center;">
+					<view>
+						<radio value="1" color="#89a3ec" bindtap="allSelected" checked="{{selected}}"  />
+					</view>
+					<view style="font-size: 28rpx;color:#848fce ;" >
+						全选
+					</view>
+				</view>
+				<!-- 右盒子 -->
+				<view style="display: flex;align-items: center;">
+					<view style="font-size: 28rpx;">
+						已选({{UnauditedList.length}})
+					</view>
+					<view style="width:168rpx;height: 64rpx;line-height: 64rpx;text-align: center;border: 1px solid #874df6;border-radius: 30rpx;margin-left: 30rpx;font-size: 28rpx;background-color: #874df6;">
+						去审核
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 已通过对应模块 -->
+		<view class="{{nactive===1?'information-review-show shows':'information-review-show'}}" >
+			<!-- 筛选 -->
+	<view class="screen-style" >
+		<!-- 左部分 200+25-->
+		<view class="screen-style-left" style="display: flex;align-items: center;">
+			<view style="width:50rpx;height: 50rpx;">
+				<image src="http://fileimg.makalu.cc/WEB_6AF4FEC2B2724A4DB80D40516303612C.png" mode="" style="width: 100%;height: 100%;transform: scale(0.8);"/>
+			</view>
+			<view style="margin-left: 16rpx;">
+				已通过人员列表
+			</view>
+		</view>
+		<!-- 右部分 -->
+		<view class="screen-style-right" style="display: flex;justify-content: flex-end;align-items: center;">
+			<view style="width: 50rpx;height: 50rpx;transform: scale(0.6)">
+				<image src="http://fileimg.makalu.cc/WEB_3F11BBC019F445688636A521EBBE43B9.png" mode="" style="width: 100%;height: 100%;;"/>
+			</view>
+			<view style="margin-left:16rpx">
+				筛选
+			</view>
+		</view>
+	</view>
+			<view class="information-review-Audit">
+			<!--需要循环的模块 328+120 -->
+				<view class="information-review-Audit-box" wx:for="{{successList}}" wx:key="index">
+					<view style="letter-spacing: 6rpx;display: flex;justify-content: space-between;font-size: 28rpx;">
+						{{item.title}}
+						<view style="font-size: 22rpx;letter-spacing: 4rpx;">
+						{{item.type}}
+					</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						归属工种: <view style="margin-left: 6rpx;">
+							{{item.worktype}}
+						</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						姓名: <view  style="margin-left: 6rpx;">
+							{{item.name}}
+						</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						注册时间: <view style="margin-left: 6rpx;">
+							{{item.time}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 已驳回对应模块 -->
+		<view class="{{nactive===2?'information-review-show shows':'information-review-show'}}">
+			<!-- 筛选 -->
+	<view class="screen-style" >
+		<!-- 左部分 200+25-->
+		<view class="screen-style-left" style="display: flex;align-items: center;">
+			<view style="width:50rpx;height: 50rpx;">
+				<image src="http://fileimg.makalu.cc/WEB_6AF4FEC2B2724A4DB80D40516303612C.png" mode="" style="width: 100%;height: 100%;transform: scale(0.8);"/>
+			</view>
+			<view style="margin-left: 16rpx;">
+				已驳回人员列表
+			</view>
+		</view>
+		<!-- 右部分 -->
+		<view class="screen-style-right" style="display: flex;justify-content: flex-end;align-items: center;">
+			<view style="width: 50rpx;height: 50rpx;">
+				<image src="http://fileimg.makalu.cc/WEB_3F11BBC019F445688636A521EBBE43B9.png" mode="" style="width: 100%;height: 100%;transform: scale(0.8);"/>
+			</view>
+			<view style="margin-left:16rpx">
+				筛选
+			</view>
+		</view>
+	</view>
+			<view class="information-review-Audit">
+			<!--需要循环的模块 328+120 -->
+				<view class="information-review-Audit-box" wx:for="{{successList}}" wx:key="index">
+					<view style="letter-spacing: 6rpx;display: flex;justify-content: space-between;font-size: 28rpx;">
+						{{item.title}}
+						<view style="font-size: 22rpx;letter-spacing: 4rpx;">
+						{{item.type}}
+					</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						归属工种: <view style="margin-left: 6rpx;">
+							{{item.worktype}}
+						</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						姓名: <view  style="margin-left: 6rpx;">
+							{{item.name}}
+						</view>
+					</view>
+					<view style="font-size: 26rpx;letter-spacing: 4rpx;color: #848fce;display: flex;">
+						注册时间: <view style="margin-left: 6rpx;">
+							{{item.time}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/Information-review/index.wxss b/miniprogram/pages/Information-review/index.wxss
new file mode 100644
index 0000000..3e98705
--- /dev/null
+++ b/miniprogram/pages/Information-review/index.wxss
@@ -0,0 +1,104 @@
+/* 信息审核 */
+/* tab栏切换 */
+.information-review{
+	padding: 20rpx ;
+}
+.information-review-tab{
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	height: 130rpx;
+	color: #5e626d;
+}
+.active{
+	color: #848fce;
+}
+/* 筛选 */
+.screen-style{
+	display: flex;
+	justify-content: space-between;
+	width: 100%;
+	height: 100rpx;
+}
+/* 左部分 */
+.screen-style-left{
+	width: 400rpx;
+	height: 50rpx;
+}
+/* 右部分 */
+.screen-style-right{
+	width: 240rpx;
+	height: 50rpx;
+}
+/* 下面对应内容 */
+.information-review-content{
+
+
+}
+.information-review-show{
+	display: none;
+}
+.shows{
+	display: block;
+}
+/* 已通过 */
+.information-review-Audit{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+}
+.information-review-Audit-box{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	border: 1px solid #171e28;
+	box-sizing: border-box;
+	width: 710rpx;
+	height: 240rpx;
+	margin-bottom: 44rpx;
+	border-radius: 20rpx;
+	padding: 26rpx;
+	background-color: #222943;
+}
+/* 待审核 */
+.information-review-Audit-box-Not{
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	border: 1px solid #171e28;
+	box-sizing: border-box;
+	width: 710rpx;
+	height: 240rpx;
+	margin-bottom: 44rpx;
+	border-radius: 20rpx;
+	padding: 26rpx;
+	padding-left: 62rpx;
+	background-color: #222943;
+}
+.information-review-Audit-Not{
+	margin-bottom: 152rpx;
+}
+/* 单选框 */
+/* 未选中样式 */
+.wx-radio-input {
+	width: 33rpx !important;
+	height: 33rpx !important;
+	background-color: #222943;
+  }
+/* 全选框 */
+.information-review-Audit-footer{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 110rpx;
+	border: 1px solid #222943;
+	box-sizing: border-box;
+	background-color:#222943 ;
+	padding: 0 40rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Personnel-information-binding/index.js b/miniprogram/pages/Personnel-information-binding/index.js
new file mode 100644
index 0000000..64ce706
--- /dev/null
+++ b/miniprogram/pages/Personnel-information-binding/index.js
@@ -0,0 +1,87 @@
+// pages/Personnel-information-binding/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+    //扫码学习
+    affirmLearn(){
+        wx.scanCode({
+            onlyFromCamera:false,
+            scanType:['qrCode'],
+            async success(res){
+                let {result} = res
+                //截取参数
+                let subStrUrl = result.substr(result.indexOf("?"),result.length-1)    
+                wx.navigateTo({
+                  url: '../saft-qr-view/index'+subStrUrl,
+                })
+            }
+        })
+    },
+    //退出
+    back(){
+        wx.redirectTo({
+            url: '../gengduogongneng/gengduogongneng'
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Personnel-information-binding/index.json b/miniprogram/pages/Personnel-information-binding/index.json
new file mode 100644
index 0000000..9cb0b8a
--- /dev/null
+++ b/miniprogram/pages/Personnel-information-binding/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "劳务人员信息绑定"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Personnel-information-binding/index.wxml b/miniprogram/pages/Personnel-information-binding/index.wxml
new file mode 100644
index 0000000..3833686
--- /dev/null
+++ b/miniprogram/pages/Personnel-information-binding/index.wxml
@@ -0,0 +1,21 @@
+<!-- 人员信息绑定 -->
+<view style="display: flex;flex-direction: column;align-items: center;">
+	<!-- 头部部分 -->
+	<view class="information-header">
+		<view style="width:100rpx;height: 100rpx;">
+			<image src="http://fileimg.makalu.cc/WEB_CC881597B56F4DDCBDF1FC92DD7C1B90.png" style="width: 100%;height: 100%;" mode=""/>
+		</view>
+		<view style="font-size: 36rpx;letter-spacing: 4rpx;width: 200rpx;height: 48rpx;margin-left: 40rpx;margin-top: -32rpx;">
+		绑定成功！
+		</view>
+	</view>
+	<!-- 底部部分 240+90-->
+	<view class="information-footer">
+		<view bindtap="affirmLearn" style="width: 408rpx;height: 88rpx;text-align: center;line-height: 88rpx;letter-spacing: 4rpx;border-radius: 80rpx;background-color: #523fa8;">
+			扫码确认安全学习
+		</view>
+		<view bindtap="back" style="font-size: 28rpx;letter-spacing: 4rpx;color: #848fce;">
+			退出
+		</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/Personnel-information-binding/index.wxss b/miniprogram/pages/Personnel-information-binding/index.wxss
new file mode 100644
index 0000000..f441e6f
--- /dev/null
+++ b/miniprogram/pages/Personnel-information-binding/index.wxss
@@ -0,0 +1,21 @@
+/* 人员信息绑定 */
+/* 头部部分 */
+.information-header{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	align-items: center;
+	width: 220rpx;
+	height: 220rpx;
+	margin-top:192rpx;
+	margin-bottom: 172rpx;
+}
+/* 底部部分 */
+.information-footer{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	width: 480rpx;
+	height: 180rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Quality-Assurance/index.js b/miniprogram/pages/Quality-Assurance/index.js
new file mode 100644
index 0000000..c03ccd6
--- /dev/null
+++ b/miniprogram/pages/Quality-Assurance/index.js
@@ -0,0 +1,447 @@
+// pages/Quality-Assurance/index.js
+const app = getApp()
+
+Page({
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        initData: {},
+        projectData:{},
+        projectId: '',
+        projectName: '',
+        
+
+        gj1:0,
+        gj1per:0,
+        gj1_Y:0,
+        gj1_N:0,
+        
+        gj2:0,
+        gj2per:0,
+        gj2_Y:0,
+        gj2_N:0,
+
+        gj3:0,
+        gj3per:0,
+        gj3_Y:0,
+        gj3_N:0,
+        
+        gj4:0,
+        gj4per:0,
+        gj4_Y:0,
+        gj4_N:0,
+
+        gj5:0,
+        gj5per:0,
+        gj5_Y:0,
+        gj5_N:0,
+
+        jp1:0,
+        jp1_Y:0,
+        jp1_N:0,
+        jp1per:0,
+
+        bys1:0,
+        bys2:0,
+
+        tempOut:0,
+        tempIn:0,
+        strong:0,
+        cooked:0,
+
+      
+        biaoyangshiList:[{text:'010840009F',id:0}],
+        hntList:[],
+        hntDevceNO:''
+
+        
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        //获取缓存数据
+        wx.getStorage({
+          key: 'userinfo',
+          success:res=>{
+            this.setData({
+              loginName:res.data.loginName,
+              userName:res.data.userName,
+              projectId:app.globalData.projectId,
+              projectNameArgs:app.globalData.projectName,
+              initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+            })  
+            this.getProjectCorrespondence(app.globalData.projectId)
+          }
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+
+
+     //项目切换 返回值
+     onProjectSelect(e) {
+      let projectId = e.detail.id;
+      let projectName = e.detail.text;
+      app.globalData.projectId = projectId;
+      app.globalData.projectName = projectName;
+      this.setData({
+          projectId: projectId,
+          projectName: projectName,
+      })
+      this.onLoad()
+  },
+
+
+
+
+  /**
+    * 项目对应关系
+    */
+   getProjectCorrespondence(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          projectData: res.data
+        })
+        //获取取样复试数据
+        that.getqyfsData();
+        //获取举牌验收数据信息
+        that.getjpysData();
+        //标养室数据
+        that.getbysData();
+        //混凝设备列表获取
+        that.gethntDevice();
+        //混凝土数据获取
+        that.gethntData();
+
+      }
+    })
+    },
+
+
+
+    /**
+     * 获取取样复试数据
+     */
+    getqyfsData(){
+      let that = this;
+      let {szh} = that.data.projectData;
+        wx.request({
+          url: app.globalData.szhUrl+'/api/building/retestList?project_id='+szh+'&dept_id=131',
+          method:"POST",
+          data:{},
+          success(res){
+            let data =  res.data.data            
+            let gj1=0,gj1_Y=0,gj1_N=0,gj2=0,gj2_Y=0,gj2_N=0,gj3=0,gj3_Y=0,gj3_N=0,gj4=0,gj4_Y=0,gj4_N=0,gj5=0,gj5_Y=0,gj5_N=0;            
+            for(let d of data){
+              switch (d.type_flag) {
+                  case 1:
+                    //钢筋原材料取样复试
+                      gj1++
+                      if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') != -1)){
+                        gj1_Y++
+                      }
+                      if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') == -1)){
+                        gj1_N++
+                      }
+                      break
+                  case 2:
+                    //钢筋试拉件取样复 -- 机械连接
+                      gj2++
+                      if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') != -1)){
+                        gj2_Y++
+                      }
+                      if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') == -1)){
+                        gj2_N++
+                      }
+                      break
+                  case 3:
+                    //钢筋试拉件取样复 -- 钢筋焊接
+                      gj3++
+                      if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') != -1)){
+                          gj3_Y++
+                      }
+                      if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') == -1)){
+                          gj3_N++
+                      }
+                      break
+                  case 4:
+                    // 混凝土试件取样复试 -- 楼层标养                
+                      gj4++
+                      if(d.result_str.indexOf('已送样') != -1){
+                          
+                      }
+                      if(d.result_str){
+                          if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') != -1)){
+                            gj4_Y++
+                          }
+                          if(d.result_str.indexOf('标养中') != -1){
+                            gj4_N++
+                          }
+                      }
+                      break;
+                  case 5:
+                    // 混凝土试件取样复试 -- 楼桩标养   
+                      gj5++
+                      if(d.result_str.indexOf('已送样') != -1){
+                          
+                      }
+                      if(d.result_str.indexOf('不合格') == -1 && (d.result_str.indexOf('合格') != -1)){
+                         gj5_Y++
+                      }
+                      if(d.result_str.indexOf('标养中') != -1){
+                          gj5_N++
+                      }
+                      break;
+              }
+          }
+            that.setData({
+              gj1:gj1,
+              gj1per:(gj1_Y/gj1*100).toFixed(0),
+              gj1_Y:gj1_Y,
+              gj1_N:gj1_N,
+              
+              gj2:gj2,
+              gj2per:(gj2_Y/gj2*100).toFixed(0),
+              gj2_Y:gj2_Y,
+              gj2_N:gj2_N,
+
+              gj3:gj3,
+              gj3per:(gj3_Y/gj3*100).toFixed(0),
+              gj3_Y:gj3_Y,
+              gj3_N:gj3_N,
+              
+              gj4:gj4,
+              gj4per:(gj4_Y/gj4*100).toFixed(0),
+              gj4_Y:gj4_Y,
+              gj4_N:gj4_N,
+
+              gj5:gj5,
+              gj5per:(gj5_Y/gj5*100).toFixed(0),
+              gj5_Y:gj5_Y,
+              gj5_N:gj5_N,
+              
+            })
+          }
+        })
+    },
+
+    /**
+     * 
+     * 获取举牌验收的数据
+     */
+    getjpysData(){
+      let that = this;
+      wx.request({
+        url: app.globalData.szhUrl+'/mkl/api/getScreenCheckAccept',
+        method:"POST",
+        data:{
+          projectId:that.data.projectData.szh
+        },
+        success(res){
+          let data =  res.data     
+          let jp1 = 0;
+          let jp1_Y = 0;
+          let jp1_N = 0;
+          let jp1per = 0;
+
+          for(let d of data){
+            jp1++;
+            if(d.check_result == 0){
+              jp1_Y++;
+            } else {
+              jp1_N++;
+            }
+          }
+
+          that.setData({
+            jp1: jp1,
+            jp1per:(jp1==0?0:(jp1_Y/jp1*100)).toFixed(0),
+            jp1_Y:jp1_Y,
+            jp1_N:jp1_N,
+          })
+
+      }
+    })
+
+    },
+
+    /**
+     * 
+     * 标养室检测
+     * 
+     */
+    getbysData(){
+      let that = this;
+      let {szh} = that.data.projectData;
+      wx.request({
+        url: app.globalData.szhUrl+'/api/getProcessControlCount',
+        method:"POST",
+        data:{
+          dept_id:'131',
+          project_id:szh,
+        },
+        success(res){
+          let data =  res.data.data.markingRoomCount
+          that.setData({
+            bys1:data.left_data,
+            bys2:data.right_data,
+          })
+
+
+      }
+    })
+    },
+
+
+
+    /**
+     * 混凝土设备列表
+     */
+    gethntDevice(){
+      let that = this;
+      wx.request({
+        url: app.globalData.szhUrl+'/api/iot/power/gainHntDeviceList',
+        method:"POST",
+        header:{
+          'content-type': 'application/x-www-form-urlencoded'  
+        },
+        data:{
+          projectId:'1649949529732075522',
+        },
+        success(res){
+          var tempArray =[];
+            for( let d of res.data.data){
+              tempArray.push({text:d.deviceId,id:d.deviceId})
+            }
+            that.setData({
+              hntList:tempArray,
+              hntDevceNO:tempArray[0].text
+            })
+            that.gethntData();
+        }
+      })     
+    },
+
+    /**
+     * 混凝土强度数据
+     */
+    gethntData(){
+      let that = this;
+      wx.request({
+        url: app.globalData.szhUrl+'/api/iot/power/gainHntLatestList',
+        method:"POST",
+        header:{
+          'content-type': 'application/x-www-form-urlencoded'  
+        },
+        data:{
+          projectId:'1649949529732075522',
+          deviceNo: that.data.hntDevceNO
+        },
+        success(res){
+          let data = res.data.data
+          if(data != undefined){
+            that.setData({
+              tempOut:data.tempOut,
+              tempIn:data.tempIn,
+              strong:data.strong,
+              cooked:data.cooked
+            })
+          }
+        }
+      
+    })
+  },
+
+  changeHntDevice(e){
+    this.setData({
+      hntDevceNO:e.detail.text
+    })
+   this.gethntData();
+   
+  },
+
+  tobysDetail(){
+    wx.navigateTo({
+      url: '../Standard-maintenance-room-monitoring/index',
+    })
+  },
+  tohntDetial(){
+    wx.navigateTo({
+      url: '../hnt-strong/index',
+    })
+  },
+     /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+    
+  showPopup() {
+    this.setData({ show: true });
+  },
+  onClose() {
+    this.setData({ show: false });
+  },
+  
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Quality-Assurance/index.json b/miniprogram/pages/Quality-Assurance/index.json
new file mode 100644
index 0000000..89fe277
--- /dev/null
+++ b/miniprogram/pages/Quality-Assurance/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "质量管理"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Quality-Assurance/index.wxml b/miniprogram/pages/Quality-Assurance/index.wxml
new file mode 100644
index 0000000..b964257
--- /dev/null
+++ b/miniprogram/pages/Quality-Assurance/index.wxml
@@ -0,0 +1,596 @@
+<!--pages/Quality-Assurance/index.wxml-->
+<!-- 质量管理 -->
+<!-- <view class="header_title">
+	<view class="header_title_row">
+		<van-row>
+		<van-col span="3">
+			<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+		</van-col>
+		<van-col span="4">
+			<view class="header_img" bindtap="goGCLB">
+			<image src="/images/left.png"></image>
+			<text class="header_fh">返回</text>
+			</view>
+		</van-col>
+		<van-col span="10">
+			<view class="header_name">质量管理</view>
+		</van-col>
+		</van-row>
+	</view>
+</view> -->
+
+<view class="quality" style="padding-top: 0;">
+	
+	<!-- 头部部分 -->
+	<view class="quality-header">
+		<!-- <voucher-selected columns="{{qualityList}}" placeholder="曲江御井路公租房项目EPC总承包工程" background="#30343f"></voucher-selected> -->
+    <project-select init="{{initData}}" width='640rpx' left='-30rpx' bindchange="onProjectSelect"></project-select>
+	</view>
+	<!-- 取样复试部分 -->
+	<view class="quality-content" style="margin-top: 64rpx;">
+		<!-- 头部 -->
+		<view class="header-cailiao">
+			<!-- 头部左边 -->
+			<view class="eharts_title">
+				取样复试
+			</view>
+		</view>
+		<!-- 质量管理内容 -->
+		<view class="gangjin" style="padding-bottom: 62rpx;">
+			<view class="gangjin-header">
+					<!-- 上面部分 -->
+						<view class="project-title" style="margin-left: -30rpx;">
+						<view style="border-bottom: 1px solid #0f498c;height: 36rpx;font-size: 26rpx;">
+						钢筋原材料
+						</view>
+						</view>
+					<!-- 下面部分 -->
+					<view class="wanjieNum-over-bottom" style="padding-top: 52rpx;">
+					<!-- 每一行两个小盒子 -->
+						<view class="wanjieNum-over-bottom-top">
+						<!-- 每一个小盒子 -->
+							<view class="wanjieNum-over-bottom-top-box" >
+								<view class="wanjieNum-over-bottom-top-box-Img">
+									<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+										<image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;"/>
+									</view>
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+									<view class="wanjieNum-over-bottom-top-box-title-text" >
+										取样复试次数
+									</view>
+									<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+									<view style="font-size: 30rpx;color: #7ab6e6;padding-right: 20rpx;"> 
+										{{gj1}}
+									</view>	次
+									</view>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+								<view class="wanjieNum-over-bottom-top-box-Imgs">
+									<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+										<image src="http://fileimg.makalu.cc/WEB_ECD156CF3D1144AC8D52EC6F8875AAF0.png" mode="" style="width: 100%;height: 100%;"/>
+									</view>
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+									<view class="wanjieNum-over-bottom-top-box-title-text">
+									合格率
+									</view>
+									<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+									<view style="font-size: 30rpx;color: #5de8b0;padding-right: 20rpx"> 
+										{{gj1per}}
+									</view>	%
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+			</view>
+		</view>
+		<!-- 钢筋试拉近 -->
+		<view class="gangjinlajin">
+			<view class="gangjinlajin-header">
+				<!-- 上面部分 -->
+				<view class="project-title" style="margin-left: -30rpx;">
+						<view style="border-bottom: 1px solid #0f498c;height: 36rpx;">
+						钢筋试拉件
+						</view>
+				</view>
+					<!-- 下面部分 -->
+					<view class="wanjieNum-over-bottom" style="padding-top: 52rpx;">
+				<!-- 每一行两个小盒子 -->
+						<view style="padding-bottom: 40rpx;color: #b0c3e5;">
+							机械连接
+						</view>
+					<!-- 机械连接 -->
+					<view class="wanjieNum-over-bottom-top" style="margin-bottom: 60rpx;">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+								取样复试次数
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #7ab6e6;padding-right: 20rpx;"> 
+									{{gj2}}
+								</view>次
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-Imgs">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_ECD156CF3D1144AC8D52EC6F8875AAF0.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									合格率
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #4db892;padding-right: 20rpx;"> 
+									{{gj2per}}
+								</view>	%
+								</view>
+							</view>
+						</view>
+					</view>
+						<view style="padding-bottom: 40rpx;color: #b0c3e5;">
+							钢筋焊接
+						</view>
+					<!-- 钢筋焊接 -->
+					<view class="wanjieNum-over-bottom-top">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									取样复试次数
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #7ab6e6;padding-right: 20rpx;"> 
+                  {{gj3}}
+								</view>次
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-Imgs">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_ECD156CF3D1144AC8D52EC6F8875AAF0.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									合格率
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #4db892;padding-right: 20rpx;"> 
+                  {{gj3per}}
+								</view>	%
+								</view>
+							</view>
+						</view>
+					</view>
+					</view>
+			</view>
+		</view>
+		<!-- 	混凝土试件 -->
+		<view class="gangjinlajin">
+			<view class="gangjinlajin-header">
+				<!-- 上面部分 -->
+				<view class="project-title" style="margin-left: -30rpx;">
+						<view style="border-bottom: 1px solid #0f498c;height: 36rpx;">
+						混凝土试件
+						</view>
+				</view>
+					<!-- 下面部分 -->
+					<view class="wanjieNum-over-bottom"  style="padding-top: 52rpx;padding-bottom: 52rpx;">
+				<!-- 每一行两个小盒子 -->
+						<view style="padding-bottom: 40rpx;color: #b0c3e5;">
+							楼层标养
+						</view>
+					<!-- 机械连接 -->
+					<view class="wanjieNum-over-bottom-top" style="margin-bottom: 60rpx;">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+								取样复试次数
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #7ab6e6;padding-right: 20rpx;"> 
+									{{gj4}}
+								</view>次
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-Imgs">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_ECD156CF3D1144AC8D52EC6F8875AAF0.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									合格率
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #4db892;padding-right: 20rpx;"> 
+									{{gj4per}}
+								</view>	%
+								</view>
+							</view>
+						</view>
+					</view>
+						<view style="padding-bottom: 40rpx;color: #b0c3e5;">
+						楼桩标养
+						</view>
+					<!-- 钢筋焊接 -->
+					<view class="wanjieNum-over-bottom-top">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-Img">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									取样复试次数
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #7ab6e6;padding-right: 20rpx;"> 
+                  {{gj5}}
+								</view>次
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-Imgs">
+								<view class="wanjieNum-over-bottom-top-box-Img-small"> 
+									<image src="http://fileimg.makalu.cc/WEB_ECD156CF3D1144AC8D52EC6F8875AAF0.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									合格率
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 30rpx;color: #4db892;padding-right: 20rpx;"> 
+                  {{gj5per}}
+								</view>	%
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<!-- 举牌验收 -->
+	<view class="quality-content">
+			<!-- 头部 -->
+				<view class="header-cailiao">
+					<!-- 头部左边 -->
+					<view class="eharts_title">
+						举牌验收
+					</view>
+				</view>
+			<!-- 质量管理内容 -->
+				<view class="gangjin">
+					<view class="gangjin-header">
+							<!-- 上面部分 -->
+								<!-- <view class="project-title">
+								<view style="border-bottom: 1px solid #0f498c;height: 36rpx;">
+								钢筋原材料
+								</view>
+								</view> -->
+							<!-- 下面部分 -->
+							<view class="wanjieNum-over-bottom" style="padding-top:60rpx;padding-bottom: 40rpx;">
+							<!-- 每一行两个小盒子 -->
+								<view class="wanjieNum-over-bottom-top">
+								<!-- 每一个小盒子 -->
+									<view class="wanjieNum-over-bottom-top-box" >
+										<view class="wanjieNum-over-bottom-top-box-ImgPC">
+											<!-- <view class="wanjieNum-over-bottom-top-box-Img-small"> 
+												<image src="http://fileimg.makalu.cc/WEB_2ADF92E981FD41599F59AC9E97CF3118.png" mode="" style="width: 100%;height: 100%;"/>
+											</view> -->
+										</view>
+										<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+											<view class="wanjieNum-over-bottom-top-box-title-text">
+												取样复试次数
+											</view>
+											<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+											<view style="font-size: 30rpx;color: #7ab6e6;padding-right: 20rpx;"> 
+												{{jp1}}
+											</view>	次
+											</view>
+										</view>
+									</view>
+									<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+										<view class="wanjieNum-over-bottom-top-box-ImgPS">
+											<!-- <view class="wanjieNum-over-bottom-top-box-Img-small"> 
+												<image src="http://fileimg.makalu.cc/WEB_ECD156CF3D1144AC8D52EC6F8875AAF0.png" mode="" style="width: 100%;height: 100%;"/>
+											</view> -->
+										</view>
+										<view class="wanjieNum-over-bottom-top-box-title" style="height:130rpx">
+											<view class="wanjieNum-over-bottom-top-box-title-text">
+											合格率
+											</view>
+											<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+											<view style="font-size: 30rpx;color: #5de8b0;padding-right: 20rpx"> 
+												{{jp1per}}
+											</view>	%
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+					</view>
+				</view>
+	</view>
+	<!-- 标养室监测 -->
+	<view class="quality-content">
+			<!-- 头部 -->
+				<view class="header-cailiao" style="display: flex;justify-content: space-between;">
+					<!-- 头部左边 -->
+					<view class="eharts_title">
+						标养室监测
+					</view>
+					<view style="display: flex;align-items: center;margin-right: 16rpx;font-size: 26rpx;color: #7085c2;" bindtap="tobysDetail">
+						查看详情 <view style="width: 30rpx;height: 30rpx;">
+							<image src="http://fileimg.makalu.cc/WEB_8F0C5A9F72B4450AAF3362E8FC2CC3D8.png" mode="" style="width:100%;height:100%;transform: scale(0.8);"/>
+						</view>
+					</view>
+				</view>
+			<!-- 质量管理内容 -->
+				<view class="gangjin" style="padding-top: 46rpx;">
+				<!-- 上面部分 -->
+					<view class="gangjin-header" style="width: 100%;	height: 80rpx;margin-top: 30rpx;display: flex;justify-content: space-between;align-items: center;">
+						<view style="color: #a4b6d6;">
+							设备名称:
+						</view>	
+						<view style="width:60%;height:60rpx;border: 1px solid #2d6188;align-items: center;">
+							<voucher-selects height="60rpx" columns="{{biaoyangshiList}}" placeholder="010840009F"></voucher-selects>
+						</view>
+						<view style="width: 100rpx;height: 60rpx;border: 1px solid green;text-align: center;line-height: 60rpx;background-color: #114835;color: #3d9f20;">
+							在线
+						</view>
+					</view>
+				<!-- 下面部分 -->
+						<view class="wanjieNum-over-bottom">
+				<!-- 每一行两个小盒子 -->
+						<!-- <view style="padding-bottom: 40rpx;color: #b0c3e5;">
+							机械连接
+						</view> -->
+					<!-- 机械连接 -->
+					<view class="wanjieNum-over-bottom-top" style="margin-bottom: 60rpx;">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_E08D2F26452A4FEEB4EA358CF0B04E14.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+								当前温度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 36rpx;color: #0382e7;"> 
+									{{bys1}}
+								</view>℃
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_E857E2A98BCF4B079411265A758BAE8F.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									标准温度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 36rpx;color: #0382e7;"> 
+									18-22
+								</view>	%
+								</view>
+							</view>
+						</view>
+					</view>
+						<!-- <view style="padding-bottom: 40rpx;color: #b0c3e5;">
+							钢筋焊接
+						</view> -->
+					<!-- 钢筋焊接 -->
+					<view class="wanjieNum-over-bottom-top">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_4F696F1DBE8F4A8BAA08D4D7B4F227AD.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									当前温度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 36rpx;color: #0382e7;"> 
+                  {{bys2}}
+								</view>A
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_4F696F1DBE8F4A8BAA08D4D7B4F227AD.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									标准温度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 36rpx;color: #0382e7;"> 
+							95
+								</view>	%RH以上
+								</view>
+							</view>
+						</view>
+					</view>
+					</view>
+				</view>	
+	</view>
+	<!-- 混凝土强度监测 -->
+	<view class="quality-content">
+			<!-- 头部 -->
+				<view class="header-cailiao" style="display: flex;justify-content: space-between;">
+					<!-- 头部左边 -->
+					<view class="eharts_title">
+						混凝土强度监测
+					</view>
+					<view style="display: flex;align-items: center;margin-right: 16rpx;font-size: 26rpx;color: #7085c2;" bindtap="tohntDetial">
+						查看详情 <view style="width: 30rpx;height: 30rpx;">
+							<image src="http://fileimg.makalu.cc/WEB_8F0C5A9F72B4450AAF3362E8FC2CC3D8.png" mode="" style="width:100%;height:100%;transform: scale(0.8);"/>
+						</view>
+					</view>
+				</view>
+			<!-- 质量管理内容 -->
+				<view class="gangjin" style="padding-top: 46rpx;">
+				<!-- 上面部分 -->
+					<view class="gangjin-header" style="width: 100%;	height: 80rpx;margin-top: 30rpx;display: flex;justify-content: space-between;align-items: center;">
+						<view style="color: #a4b6d6;">
+							设备名称:
+						</view>	
+						<view style="width:60%;height:60rpx;border: 1px solid #2d6188;align-items: center;">
+							<voucher-selects height="60rpx" columns="{{hntList}}"  bindchange="changeHntDevice" placeholder="{{hntDevceNO}}"></voucher-selects>
+						</view>
+						<view style="width: 100rpx;height: 60rpx;border: 1px solid green;text-align: center;line-height: 60rpx;background-color: #114835;color: #3d9f20;">
+							在线
+						</view>
+					</view>
+				<!-- 下面部分 -->
+						<view class="wanjieNum-over-bottom">
+				<!-- 每一行两个小盒子 -->
+						<!-- <view style="padding-bottom: 40rpx;color: #b0c3e5;">
+							机械连接
+						</view> -->
+					<!-- 机械连接 -->
+					<view class="wanjieNum-over-bottom-top" style="margin-bottom: 60rpx;">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_E08D2F26452A4FEEB4EA358CF0B04E14.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+								外置温度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 26rpx;color: #0382e7;"> 
+									{{tempOut}}
+								</view>℃
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_E08D2F26452A4FEEB4EA358CF0B04E14.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									内置温度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 26rpx;color: #0382e7;"> 
+									{{tempIn}}
+								</view>	℃
+								</view>
+							</view>
+						</view>
+					</view>
+						<!-- <view style="padding-bottom: 40rpx;color: #b0c3e5;">
+							钢筋焊接
+						</view> -->
+					<!-- 钢筋焊接 -->
+					<view class="wanjieNum-over-bottom-top">
+					<!-- 每一个小盒子 -->
+						<view class="wanjieNum-over-bottom-top-box">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_4F696F1DBE8F4A8BAA08D4D7B4F227AD.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									强度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;">
+								<view style="font-size: 26rpx;color: #0382e7;"> 
+						{{strong}}
+								</view>MPa
+								</view>
+							</view>
+						</view>
+						<view class="wanjieNum-over-bottom-top-box" style="padding-left: 20rpx;">
+							<view class="wanjieNum-over-bottom-top-box-ImgBY">
+								<view class="wanjieNum-over-bottom-top-box-Img-smallBY"> 
+									<image src="http://fileimg.makalu.cc/WEB_4F696F1DBE8F4A8BAA08D4D7B4F227AD.png" mode="" style="width: 100%;height: 100%;"/>
+								</view>
+							</view>
+							<view class="wanjieNum-over-bottom-top-box-title">
+								<view class="wanjieNum-over-bottom-top-box-title-text">
+									成熟度
+								</view>
+								<view class="wanjieNum-over-bottom-top-box-title-text" style="display: flex;justify-content: flex-start;align-items: center;">
+									<view style="font-size: 26rpx;color: #0382e7;"> 
+										{{cooked}}
+									</view>	
+									℃*h
+								</view>
+							</view>
+						</view>
+					</view>
+					</view>
+				</view>	
+	</view>
+</view>
+
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup>
\ No newline at end of file
diff --git a/miniprogram/pages/Quality-Assurance/index.wxss b/miniprogram/pages/Quality-Assurance/index.wxss
new file mode 100644
index 0000000..7a3b52b
--- /dev/null
+++ b/miniprogram/pages/Quality-Assurance/index.wxss
@@ -0,0 +1,141 @@
+/* pages/Quality-Assurance/index.wxss */
+/* 质量管理 */
+.quality{
+	padding: 60rpx 40rpx 30rpx;
+}
+/* 头部部分 */
+.quality-header{
+	margin: 10rpx 0 50rpx;
+}
+/* 内容部分 */
+.quality-content{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+	border-radius: 15rpx;
+}
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	font-size: 34rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+  /* 内容部分 */
+  .gangjin{
+	padding:0 30rpx 40rpx 60rpx;
+  }
+  .gangjin-header{
+	width: 100%;
+}
+.project-title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 40rpx;
+	margin-top: 40rpx;
+	font-size: 26rpx;
+	background: url("http://fileimg.makalu.cc/WEB_F6B0554C215E496195EA7D6FCE2C0B8E.png") no-repeat left/35rpx;
+}
+.wanjieNum-over-bottom{
+	display: flex;
+	flex-direction: column;
+	justify-content:space-evenly ;
+	padding: 100rpx 0 0 0;
+	color: #b0c3e5;
+}
+.wanjieNum-over-bottom-top{
+	display: flex;
+	justify-content: space-between;
+	height: 100rpx;
+	line-height: 100rpx;
+}
+.wanjieNum-over-bottom-top-box{
+	display: flex;
+	width: 50%;
+	height: 100rpx;
+}
+.wanjieNum-over-bottom-top-box-Img{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_20BAE0F4F7E14D048A818A10223B0BE1.gif") no-repeat center/100%;
+	padding: 14rpx 0;
+}
+.wanjieNum-over-bottom-top-box-ImgBY{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%;
+	padding: 14rpx 0;
+}
+.wanjieNum-over-bottom-top-box-Imgs{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_FBB7B92F89A748CCA88C2D059D67CDCD.gif") no-repeat center/100%;
+	padding: 14rpx 0;
+}
+.wanjieNum-over-bottom-top-box-ImgPC{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_E219D45248B942248FE6561F24B536A9.png") no-repeat center/100%;
+	padding: 14rpx 0;
+}
+.wanjieNum-over-bottom-top-box-ImgPS{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 40%;
+	height: 100rpx;
+	background: url("http://fileimg.makalu.cc/WEB_C8E00800A80E4D41B579855E50A57F3E.png") no-repeat center/100%;
+	padding: 14rpx 0;
+}
+.wanjieNum-over-bottom-top-box-Img-small{
+	width: 50rpx;
+	height: 50rpx;
+	line-height: 50rpx;
+}
+.wanjieNum-over-bottom-top-box-Img-smallBY{
+	width: 50rpx;
+	height: 50rpx;
+	line-height: 50rpx;
+	margin-bottom: 20rpx;
+}
+.wanjieNum-over-bottom-top-box-title{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	/* padding-left:20rpx ; */
+	width: 60%;
+	height:100rpx ;
+	font-size: 28rpx;
+}
+.wanjieNum-over-bottom-top-box-title-text{
+	height: 50rpx;
+	line-height: 50rpx;
+}
+/* 钢筋拉试件 */
+.gangjinlajin{
+	padding:0 30rpx 40rpx 60rpx;
+}
+.gangjinlajin-header{
+	width: 100%;
+}
+/* 标养室监测 */
+.jupai-top{
+	height: 80rpx;
+	border: 1px solid green;
+}
diff --git a/miniprogram/pages/Security-control-echarts/index.js b/miniprogram/pages/Security-control-echarts/index.js
new file mode 100644
index 0000000..d979188
--- /dev/null
+++ b/miniprogram/pages/Security-control-echarts/index.js
@@ -0,0 +1,357 @@
+// pages/Security-control-echarts/index.js
+const app = getApp();
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+        biaoyangList: {},
+        peidianList: [{
+            text: '配电箱监测',
+            id: 0
+        }],
+        PWRList: [{
+            text: 'PWR.02731XTJ',
+            id: 0
+        }],
+        indexNum: 0,
+        indexNums: 0,
+        lastChooseDevice: {},
+        startTime: '',
+        endTime: '',
+        initData: {},
+        projectId: '',
+        projectData: {},
+        tumidityTrendData:{},
+        show:false
+    },
+    onClickBtn(e){
+        this.setData({
+            indexNum:e.currentTarget.dataset.set
+        })
+       this.onClickTemperatureTrend(e.currentTarget.dataset.set)
+    },
+    onClickBtns(e){
+        this.setData({
+            indexNums:e.currentTarget.dataset.set
+        })
+        this.onClickTumidityTrend(e.currentTarget.dataset.set)
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this;
+          //获取缓存数据
+          wx.getStorage({
+            key: 'userinfo',
+            success:function(res){
+              that.setData({
+                loginName:res.data.loginName,
+                userName:res.data.userName,
+                projectId:app.globalData.projectId,
+                projectNameArgs:app.globalData.projectName,
+                initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+              })  
+            }
+          })
+        that.setData({
+            endTime:that.dateFormat(new Date(),"yyyy-MM-dd")+ " 23:59:59"
+         })
+        that.getProjectCorrespondence(app.globalData.projectId)
+    },
+
+    /**
+    * 项目对应关系
+    */
+  getProjectCorrespondence(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          projectData: res.data
+        })
+       //获取设备列表
+       that.gainDeviceList()
+      }
+    })
+  },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    //获取配电箱装置
+    gainDeviceList() {
+        let that = this
+        wx.request({
+            url: app.globalData.szhUrl + '/api/iot/power/deviceList',
+            data: {
+                typeName: "配电箱"
+            },
+            method: "POST",
+            header: {
+                'content-type': 'application/x-www-form-urlencoded'
+            },
+            success: function (res) {
+                for(let row of res.data.rows){
+                    row.id = row.deviceId
+                    row.text = row.deviceId
+                }
+                that.setData({
+                    selectData :res.data.rows,
+                    lastChooseDevice:res.data.rows[0]
+                })
+                //温度监控
+                that.onClickTemperatureTrend(that.data.indexNum)
+                that.onClickTumidityTrend(that.data.indexNums)
+            }
+        })
+    },
+     //温度趋势
+     onClickTemperatureTrend(n) {
+         var that = this
+         that.setData({
+            indexNum:n,
+            endTime:that.dateFormat(new Date(),"yyyy-MM-dd")+ " 23:59:59"
+         })
+         
+        if (n == 0) {
+            var time =  that.getBeforeDate(-6)+" 00:00:00"
+            that.setData({
+                startTime:time
+            })
+        } else {
+            var time =  that.getBeforeDate(-29)+" 00:00:00"
+            that.setData({
+                startTime:time
+            })
+        }
+        wx.request({
+            url: app.globalData.szhUrl + '/api/iot/power/runList',
+            data: {
+                projectId: parseInt(that.data.projectData.szh),
+                uid: that.data.lastChooseDevice.deviceId,
+                startTime: that.data.startTime,
+                endTime: that.data.endTime
+            },
+            header: {
+                'content-type': 'application/x-www-form-urlencoded'
+            },
+            method: "POST",
+            success: function (res) {
+                if (res.data.code == 0) {
+                    var data = {}
+                    data.lineData = []
+                    data.color = ['#008ffd', '#f6d023', '#5af9fd', '#fc6902']
+                    data.legend = ['A相温度', 'B相温度', 'C相温度', '零线温度']
+                    data.unit = '℃'
+                    data.date = []
+                    var data1 = []
+                    var data2 = []
+                    var data3 = []
+                    var data4 = []
+                    for (let row of res.data.rows) {
+                        data.date.push((row.time.slice(0, row.time.length - 3)))
+                        data1.push(row.t1)
+                        data2.push(row.t2)
+                        data3.push(row.t3)
+                        data4.push(row.t4)
+                    }
+                    data.lineData.push(data1)
+                    data.lineData.push(data2)
+                    data.lineData.push(data3)
+                    data.lineData.push(data4)
+                    that.setData({
+                        biaoyangList: data
+                    })
+                } else {
+                    that.setData({
+                        biaoyangList:{}
+                    })
+                }
+            }
+        })
+    },
+    //电流监控
+    onClickTumidityTrend(n) {
+        var that = this
+        that.setData({
+           indexNums:n,
+           endTime:that.dateFormat(new Date(),"yyyy-MM-dd")+ " 23:59:59"
+        })
+        
+       if (n == 0) {
+           var time =  that.getBeforeDate(-6)+" 00:00:00"
+           that.setData({
+               startTime:time
+           })
+       } else {
+           var time =  that.getBeforeDate(-29)+" 00:00:00"
+           that.setData({
+               startTime:time
+           })
+       }
+       wx.request({
+           url: app.globalData.szhUrl + '/api/iot/power/runList',
+           data: {
+               projectId: parseInt(that.data.projectData.szh),
+               uid: that.data.lastChooseDevice.deviceId,
+               startTime: that.data.startTime,
+               endTime: that.data.endTime
+           },
+           header: {
+               'content-type': 'application/x-www-form-urlencoded'
+           },
+           method: "POST",
+           success: function (res) {
+            if (res.data.code == 0) {
+                var data = {}
+                data.lineData = []
+                data.color = ['#008ffd', '#f6d023', '#5af9fd', '#fc6902']
+                data.legend = ['A相电流', 'B相电流', 'C相电流', '电流阈值']
+                data.unit = 'A'
+                data.date = []
+                var data1 = []
+                var data2 = []
+                var data3 = []
+                var data4 = []
+                for (let row of res.data.rows) {
+                    data.date.push((row.time.slice(0, row.time.length - 3)))
+                    data1.push(row.c1)
+                    data2.push(row.c2)
+                    data3.push(row.c3)
+                    data4.push(131)
+                }
+                data.lineData.push(data1)
+                data.lineData.push(data2)
+                data.lineData.push(data3)
+                data.lineData.push(data4)
+                that.setData({
+                    tumidityTrendData: data
+                })
+            }else {
+                that.setData({
+                    tumidityTrendData:{}
+                })
+            }
+           }
+       })
+    },
+    /**
+   * 格式化时间
+   */
+  dateFormat(date,fmt) {
+    let ret;
+    const opt = {
+        "y+": date.getFullYear().toString(),        // 年
+        "M+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "m+": date.getMinutes().toString(),         // 分
+        "s+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+  },
+  //获取之前的时间
+  getBeforeDate(num) {
+      var date1 = new Date()
+      var date2 = new Date(date1)
+      date2.setDate(date1.getDate() + num)
+      var time2 = date2.getFullYear() + "-" + ((date2.getMonth() + 1) <= 9?"0"+(date2.getMonth() + 1):(date2.getMonth() + 1)) + "-" + date2.getDate()
+      return time2
+  },
+  //项目切换 返回值
+  onProjectSelect(e){
+    var that = this
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;  
+    that.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+
+    that.onLoad();
+  },
+  //返回到安全管理页面
+  goGCLB:function(){
+    wx.redirectTo({
+      url:'../newAddPage/safetyManagement/index'
+    })
+  },
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+  //配电箱改变
+  peidianChange(e){
+    console.log(e)
+  },
+  //设备改变
+  pwdChange(e){
+    console.log(e)
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Security-control-echarts/index.json b/miniprogram/pages/Security-control-echarts/index.json
new file mode 100644
index 0000000..686e0c3
--- /dev/null
+++ b/miniprogram/pages/Security-control-echarts/index.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "配电箱监测"
+    
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Security-control-echarts/index.wxml b/miniprogram/pages/Security-control-echarts/index.wxml
new file mode 100644
index 0000000..3276abe
--- /dev/null
+++ b/miniprogram/pages/Security-control-echarts/index.wxml
@@ -0,0 +1,124 @@
+<!--pages/Security-control-echarts/index.wxml-->
+<!-- 安全管控 -->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">配电箱监测</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<view class="max_new_content">
+	<!-- 头部nav栏 -->
+	<view style="margin-top: 20rpx;width: 710rpx; margin-bottom: 20rpx;">
+		<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+	</view>
+	<!-- 配电箱选项 -->
+
+	<view class="deep_select">
+    <van-row>
+      <van-col span="12">
+        <view class="deep_select_padding">
+			<voucher-select columns="{{peidianList}}" bindchange="peidianChange"></voucher-select>
+        </view>
+      </van-col>
+      <van-col span="12">
+        <view class="deep_select_padding">
+			<voucher-select  columns="{{PWRList}}" bindchange="pwdChange"></voucher-select>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+
+
+	<!-- <view class="peidianxiang">
+		<view class="peidianxiang-left">
+		<voucher-select columns="{{peidianList}}" bindchange="peidianChange"></voucher-select>
+		</view>
+		<view class="peidianxiang-right">
+			<voucher-select  columns="{{PWRList}}" bindchange="pwdChange"></voucher-select>
+		</view>
+	</view> -->
+	<!-- echarts图 -->
+	<view class="echarts-picture">
+		<!-- 标签 -->
+		<view class="echarts-title" style="margin-bottom: 30rpx;">
+			<view class="echarts-title-left"> 
+				<view style="border: 1px solid #028cf3;width: 38rpx;height: 38rpx;text-align: center;line-height: 38rpx;margin: 0 16rpx;border-radius: 50%;font-size: 28rpx;">
+					T
+				</view>
+				<view style="font-size: 28rpx;">
+				温度监控
+				</view>
+			</view>
+			<view class="echarts-title-right" style="padding-right: 20rpx;">
+				<view class="{{indexNum==0?'echarts-title-right-content active':'echarts-title-right-content'}}" data-set="{{0}}" bindtap="onClickBtn">
+					近七天
+				</view>
+				<view class="{{indexNum==1?'echarts-title-left-content active':'echarts-title-left-content'}}" data-set="{{1}}" bindtap="onClickBtn">
+					近30天
+				</view>
+			</view>
+		</view>
+		<!-- 数据图展示 -->
+		<view class="echarts-data">
+			<curve-echarts-copy chart-id="chartData" chart-data="{{biaoyangList}}"></curve-echarts-copy>
+		</view>
+	</view>
+	<!-- echarts图1 -->
+	<view class="echarts-picture">
+		<!-- 标签 -->
+		<view class="echarts-title" style="margin-bottom: 30rpx;">
+			<view class="echarts-title-left"> 
+				<view style="border: 1px solid #028cf3;width: 38rpx;height: 38rpx;text-align: center;line-height: 38rpx;margin: 0 16rpx;border-radius: 50%;font-size: 28rpx;">
+					A
+				</view>
+				<view style="font-size: 28rpx;">
+				电流监控
+				</view>
+			</view>
+			<view class="echarts-title-right" style="padding-right: 20rpx;">
+				<view class="{{indexNums==0?'echarts-title-right-content active':'echarts-title-right-content'}}" data-set="{{0}}" bindtap="onClickBtns">
+					近七天
+				</view>
+				<view class="{{indexNums==1?'echarts-title-left-content active':'echarts-title-left-content'}}" data-set="{{1}}" bindtap="onClickBtns">
+					近30天
+				</view>
+			</view>
+		</view>
+		<!-- 数据图展示 -->
+		<view class="echarts-data">
+			<curve-echarts-copy chart-id="chartData1" chart-data="{{tumidityTrendData}}" ></curve-echarts-copy>
+		</view>
+	</view>
+</view>
+
+
+
+<!-- 左侧账号信息 -->
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
\ No newline at end of file
diff --git a/miniprogram/pages/Security-control-echarts/index.wxss b/miniprogram/pages/Security-control-echarts/index.wxss
new file mode 100644
index 0000000..a6133d7
--- /dev/null
+++ b/miniprogram/pages/Security-control-echarts/index.wxss
@@ -0,0 +1,79 @@
+/* pages/Security-control-echarts/index.wxss */
+/* 安全管控 */
+.control{
+	padding: 20rpx 40rpx 30rpx;
+	box-sizing: border-box;
+}
+/* 配电箱选项 */
+.peidianxiang{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 60rpx 0;
+	width: 100%;
+	height: 100rpx;
+
+}
+.peidianxiang-left{
+	width: 42%;
+	height: 100rpx;
+	border-radius: 20rpx;
+}
+.peidianxiang-right{
+	width: 52%;
+	height: 100rpx;
+	border-radius: 20rpx;
+}
+/* echarts图 286*/
+.echarts-picture{
+	width: 100%;
+	border: 1px solid #1e2336;
+	border-radius: 10rpx;
+	background-color: #1e2336;
+	margin-bottom: 50rpx;
+}
+.echarts-title{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 90rpx;
+	margin-top: 30rpx;
+}
+.echarts-title-left{
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+}
+.echarts-title-right{
+	display: flex;
+	width: 260rpx;
+	height: 50rpx;
+}
+.echarts-title-right-content{
+	text-align: center;
+	width: 50%;
+	height: 50rpx;
+	line-height: 50rpx;
+	font-size: 26rpx;
+	border-top-left-radius: 30rpx;
+	border-bottom-left-radius: 30rpx;
+	border: 1px solid #2f3560;
+}
+.echarts-title-left-content{
+	text-align: center;
+	width: 50%;
+	height: 50rpx;
+	line-height: 50rpx;
+	font-size: 26rpx;
+	border-top-right-radius: 30rpx;
+	border-bottom-right-radius: 30rpx;
+	border: 1px solid #2f3560;
+}
+.active{
+	background-color: #2c365b;
+}
+.echarts-data{
+	width: 100%;
+	height: 620rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Standard-maintenance-room-monitoring/index.js b/miniprogram/pages/Standard-maintenance-room-monitoring/index.js
new file mode 100644
index 0000000..89a8055
--- /dev/null
+++ b/miniprogram/pages/Standard-maintenance-room-monitoring/index.js
@@ -0,0 +1,269 @@
+// pages/Standard-maintenance-room-monitoring/index.js
+const app = getApp();
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        projectId:'',
+        startTime:"",
+        endTime:"",
+        startTime2:"",
+        endTime2:"",
+        deviceNo:"010840009F",
+        jianceList: [{ text: '010840009F', id: 0 }],
+        indexNum: 0,
+        value:'本月',
+        value1:'本月',
+        actions: [{ name: '本月',id:0 }, { name: '累计', id:1},],
+        actions1: [{ name: '本月',id:0 }, { name: '累计', id:1},],
+        biaoyangList: [
+            { name: '温度趋势', biaoyangX: [], biaoyangY: [] },
+            { name: '最小标准温度', biaoyangX: [], biaoyangY: [] },
+            { name: '最大标准温度', biaoyangX: [], biaoyangY: [] }
+        ],
+
+        indexNum2: 0,
+        biaoyangList2: [
+            { name: '湿度趋势', biaoyangX: [], biaoyangY: [] },
+            { name: '标准湿度', biaoyangX: [], biaoyangY: [] },
+        ],
+    },
+    onClick(){
+        this.setData({
+            show1:true
+        })
+    },
+    onClick1(){
+        this.setData({
+            show2:true
+        })
+    },
+    onClose(){
+        this.setData({
+            show:false,
+            show1:false,
+            show2:false
+        })
+    },
+    showPopup() {
+        this.setData({ show: true });
+      },
+      goGCLB:function(){
+        wx.redirectTo({
+          url: '../../pages/Quality-Assurance/index'
+        })
+      },
+    // 点击进行超耗tab切换
+    onSelect(e) {
+        // console.log(e);
+        // console.log(e.detail.id);
+        if(e.detail.id ==0){
+            this.setData({
+                startTime:this.getDate(-6,1),
+                endTime:this.getDate(0,2),
+            })
+        }else{
+            this.setData({
+                startTime:this.getDate(-29,1),
+                endTime:this.getDate(0,2),
+            })
+        }
+        this.setData({
+            indexNum: e.detail.id,
+        })
+        this.runList();
+    },
+    onSelect1(e) {
+        if(e.detail.id ==0){
+            this.setData({
+                startTime2:this.getDate(-6,1),
+                endTime2:this.getDate(0,2),
+            })
+        }else{
+            this.setData({
+                startTime2:this.getDate(-29,1),
+                endTime2:this.getDate(0,2),
+            })
+        }
+        this.setData({
+            indexNum2: e.detail.id,
+        })
+        this.runList2();
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+           //获取缓存数据
+           wx.getStorage({
+            key: 'userinfo',
+            success:res=>{
+              this.setData({
+                loginName:res.data.loginName,
+                userName:res.data.userName,
+                projectId:app.globalData.projectId,
+                projectNameArgs:app.globalData.projectName,
+                initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+              })  
+              this.getProjectCorrespondence(app.globalData.projectId)
+            }
+          })
+        this.setData({
+            startTime:this.getDate(-6,1),
+            endTime:this.getDate(0,2),
+            startTime2:this.getDate(-6,1),
+            endTime2:this.getDate(0,2),
+        })
+        this.getProjectCorrespondence();
+    },
+    getDate(num,type){
+        var date = new Date(new Date().getTime()+num*24*60*60*1000);
+        var year = date.getFullYear();
+        var month = (date.getMonth()+1) > 9 ? (date.getMonth()+1):'0'+(date.getMonth()+1)
+        var day = date.getDate() > 9 ? date.getDate():'0'+date.getDate()
+        return year+"-"+month+"-"+day+(type==1?" 00:00:00":" 23:59:59");
+    },
+    /**
+     * 项目对应关系
+     */
+    getProjectCorrespondence() {
+        var that = this;
+        wx.request({
+            url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+            data: {
+                "projectId": 3//app.globalData.projectId,
+            },
+            method: "get",
+            success: function (res) {
+                that.setData({
+                    projectId :res.data.szh
+                })
+                that.runList();
+                that.runList2();
+            }
+        })
+    },
+    runList() {
+        var that = this;
+        console.log(that.data)
+        wx.request({
+            url: app.globalData.szhUrl + '/api/iot/markingroom/runList',
+            data: {
+                "projectId": that.data.projectId,
+                "startTime": that.data.startTime,
+                "endTime": that.data.endTime,
+                "deviceNo": that.data.deviceNo
+            },
+            method: "get",
+            success: function (res) {
+                console.log(res.data);
+                var data = {}
+                data.lineData = []
+                data.color = ['#008ffd', '#f6d023', '#5af9fd']
+                data.legend = ['温度趋势', '最小标准温度', '最大标准温度']
+                data.unit = '℃'
+                data.date = []
+                var data1 = []
+                var data2 = []
+                var data3 = []
+                var biaoyangList = that.data.biaoyangList;
+                for (let row of res.data.rows) {
+                    data.date.push(row.createTime.substr(0, 14) + "00");
+                    data1.push(18)
+                    data2.push(row.temperature)
+                    data3.push(22)
+                }
+                data.lineData.push(data1)
+                data.lineData.push(data2)
+                data.lineData.push(data3)
+                that.setData({
+                    biaoyangList: data,
+                })
+            }
+        })
+    },
+    runList2() {
+        var that = this;
+        wx.request({
+            url: app.globalData.szhUrl + '/api/iot/markingroom/runList',
+            data: {
+                "projectId": that.data.projectId,
+                "startTime": that.data.startTime2,
+                "endTime": that.data.endTime2,
+                "deviceNo": that.data.deviceNo
+            },
+            method: "get",
+            success: function (res) {
+                var data = {}
+                data.lineData = []
+                data.color = ['#008ffd', '#f6d023']
+                data.legend = ['湿度趋势', '标准湿度']
+                data.unit = '%RH'
+                data.date = []
+                var data1 = []
+                var data2 = []
+                var biaoyangList2 = that.data.biaoyangList2;
+                for (let row of res.data.rows) {
+                    data.date.push(row.createTime.substr(0, 14) + "00");
+                    data1.push(row.humidity)
+                    data2.push(95)
+                }
+                data.lineData.push(data1)
+                data.lineData.push(data2)
+                that.setData({
+                    biaoyangList2: data
+                })
+            }
+        })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/Standard-maintenance-room-monitoring/index.json b/miniprogram/pages/Standard-maintenance-room-monitoring/index.json
new file mode 100644
index 0000000..ceebc53
--- /dev/null
+++ b/miniprogram/pages/Standard-maintenance-room-monitoring/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-action-sheet": "@vant/weapp/action-sheet"
+    },
+    "navigationBarTitleText": "标养室监测"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Standard-maintenance-room-monitoring/index.wxml b/miniprogram/pages/Standard-maintenance-room-monitoring/index.wxml
new file mode 100644
index 0000000..5f4d47b
--- /dev/null
+++ b/miniprogram/pages/Standard-maintenance-room-monitoring/index.wxml
@@ -0,0 +1,91 @@
+<!--pages/Standard-maintenance-room-monitoring/index.wxml-->
+<!-- 标养室监测 -->
+<!-- <view class="header_title">
+	<view class="header_title_row">
+		<van-row>
+		<van-col span="3">
+			<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+		</van-col>
+		<van-col span="4">
+			<view class="header_img" bindtap="goGCLB">
+			<image src="/images/left.png"></image>
+			<text class="header_fh">返回</text>
+			</view>
+		</van-col>
+		<van-col span="10">
+			<view class="header_name">标养室监测</view>
+		</van-col>
+		</van-row>
+	</view>
+</view> -->
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+<view class="jiance" style="padding-top: 30rpx;">
+	<!-- nav头部分 -->
+	<view class="nav-jiance" style="margin-bottom: 60rpx;">
+		<voucher-select background="#2b345b" columns="{{jianceList}}" placeholder="010840009F"></voucher-select>
+	</view>
+	<!-- 监测内容 -->
+	<view class="jiance-content">
+			<!-- 头部 -->
+				<view class="header-cailiao">
+				<!-- 头部左边 -->
+					<view class="eharts_title">
+						温度趋势
+					</view>
+				<!-- 头部右边 -->
+					<!-- <view class="header-cailiao-right">
+						<view class="{{indexNum==0?'header-cailiao-right-left active':'header-cailiao-right-left'}}" data-set="{{0}}" bindtap="onClick">
+							近七天
+						</view>
+						<view class="{{indexNum==1?'header-cailiao-right-right active':'header-cailiao-right-right'}}"  data-set="{{1}}" bindtap="onClick">
+							近30天
+						</view>
+					</view> -->
+					<text class="hj_float" bindtap="onClick" style="margin-left: 256rpx;">{{value}} </text>
+        <van-action-sheet show="{{ show1 }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" />
+				</view>
+			<!-- 数据图展示 -->
+			<view class="jiance-echarts">
+				<curve-echarts-copy chart-id="chartData" chart-data="{{biaoyangList}}"  title="单位：℃"></curve-echarts-copy>
+			</view>
+	</view>
+	<!-- 监测内容 -->
+	<view class="jiance-content">
+			<!-- 头部 -->
+				<view class="header-cailiao">
+				<!-- 头部左边 -->
+					<view class="eharts_title">
+						湿度趋势
+					</view>
+				<!-- 头部右边 -->
+					<!-- <view class="header-cailiao-right">
+						<view class="{{indexNum2==0?'header-cailiao-right-left active':'header-cailiao-right-left'}}" data-set="{{0}}" bindtap="onClick1">
+							近七天
+						</view>
+						<view class="{{indexNum2==1?'header-cailiao-right-right active':'header-cailiao-right-right'}}"  data-set="{{1}}" bindtap="onClick1">
+							近30天
+						</view>
+					</view> -->
+					<text class="hj_float" bindtap="onClick1" style="margin-left: 256rpx;">{{value1}} </text>
+        <van-action-sheet show="{{ show2 }}" actions="{{ actions1 }}" bind:close="onClose" bind:select="onSelect1" />
+				</view>
+			<!-- 数据图展示 -->
+			<view class="jiance-echarts">
+				<curve-echarts-copy chart-id="chartData" chart-data="{{biaoyangList2}}"  title="单位：%RH"></curve-echarts-copy>
+			</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/Standard-maintenance-room-monitoring/index.wxss b/miniprogram/pages/Standard-maintenance-room-monitoring/index.wxss
new file mode 100644
index 0000000..5edda79
--- /dev/null
+++ b/miniprogram/pages/Standard-maintenance-room-monitoring/index.wxss
@@ -0,0 +1,89 @@
+/* pages/Standard-maintenance-room-monitoring/index.wxss */
+/* 标养室监测 */
+.jiance{
+	padding: 60rpx 40rpx 30rpx;
+}
+.hj_float{
+	float: right;
+	padding: 5rpx 50rpx 5rpx 20rpx;
+	background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+	border-radius: 40rpx;
+  }
+  .hj_float:active{
+	background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+  }
+  .van-popup--bottom.van-popup--round{
+	border-radius: 0 !important
+  }
+  .van-popup{
+	background-color: var(--popup-background-color,#232a44) !important
+  }
+  .van-action-sheet__cancel,.van-action-sheet__item{
+	background-color: var(--popup-background-color,#232a44) !important;
+	color: #0ad7ec;
+	
+  }
+/* 监测-nav */
+.nav-jiance{
+	width: 100%;
+	height: 90rpx;
+}
+.jiance-content{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+}
+.header-cailiao{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 40rpx;
+}
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+  .header-cailiao-right{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 300rpx;
+	height: 80rpx;
+	font-size: 24rpx;
+	color: rgb(155, 154, 154);
+}
+.header-cailiao-right-left{
+	width: 120rpx;
+	height: 46rpx;
+	line-height: 46rpx;
+	text-align: center;
+	border-top-left-radius: 36rpx;
+	border-bottom-left-radius: 36rpx;
+	border: 1px solid #2e355f;
+}
+.header-cailiao-right-right{
+  width: 120rpx;
+  height: 46rpx;
+  line-height: 46rpx;
+  text-align: center;
+  border-top-right-radius: 36rpx;
+  border-bottom-right-radius: 36rpx;
+  border: 1px solid #2e355f;
+}
+.active{
+  color: #fff;
+  background-color: #2e355f;
+}
+/* 展示数据echarts图 */
+.jiance-echarts{
+	width: 100%;
+	/* height: 600rpx; */
+	box-sizing: border-box;
+	padding: 30rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/bar-chart-warning/index.js b/miniprogram/pages/components/bar-chart-warning/index.js
new file mode 100644
index 0000000..24393f3
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart-warning/index.js
@@ -0,0 +1,252 @@
+// components/bar-chart/index.js
+import * as echarts from '../../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        chartData:{
+            type: Object
+        }
+    },
+    observers: {
+        chartData: function (val) {
+            //console.log(val)
+            //this.initChart() 
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            this.component.init((canvas, width, height, dpr) => {
+                let chart = echarts.init(canvas, null, {
+                    width: width,
+                    height: height,
+                    devicePixelRatio: dpr
+                })
+                chart.clear();
+                chart.setOption(this.getData());
+                return chart;
+            })
+        },
+        getData() {
+            var data = this.data.chartData
+
+            // var data ={
+            //   unit : '变化量(mm)',
+            //   Xdata:['2022-12-2', '2022-12-3', '2022-12-4', '2022-12-5', '2022-12-6', '2022-12-7', '2022-12-8'],
+            //   Ydata:[2,0,0,0,0,0,0],
+            //   warningMax :[10,10,10,10,10,10,10],
+            //   warningMin :[-10,-10,-10,-10,-10,-10,-10],
+            //   policeMax : [20,20,20,20,20,20,20],
+            //   policeMin : [-20,-20,-20,-20,-20,-20,-20],
+            // }
+            
+            var unit=''
+            if(data.unit){
+              unit='单位：'+data.unit
+            }
+        
+            var option = {
+              tooltip: {
+                  trigger: 'axis',
+                  axisPointer: {
+                      lineStyle: {
+                          color: '#57617B'
+                      }
+                  },
+                  formatter: function (params) {
+                    var dom =  params[0].axisValue+'\n'+ params[4].seriesName+'：'+params[4].data+' '+data.unit+'\n'+params[2].seriesName+'：'+params[2].data+' '+data.unit+'/'+params[3].data+' '+data.unit+'\n'+params[0].seriesName+'：'+params[0].data+' '+data.unit+'/'+params[1].data+' '+data.unit
+                    return dom
+                  }
+                  // formatter: function (params) {
+                  //     var dom = '<div style="padding:3px 5px;">' +
+                  //         '<div>'+params[0].axisValue+'</div>'+
+                  //         '<div>'+params[4].seriesName+'：'+params[4].data+'° </div>'+
+                  //         '<div>'+params[2].seriesName+'：'+params[2].data+'/'+params[3].data+'° </div>'+
+                  //         '<div>'+params[0].seriesName+'：'+params[0].data+'/'+params[1].data+'° </div>'+
+                  //         '</div>'
+                  //     return dom
+                  // }
+              },
+              color:['#ff0000','#fb9300','#2e6ed0'],
+      
+              grid: {
+                top:'15%',
+                left: '3%',
+                right: '5%',
+                bottom: '3%',
+                containLabel: true
+            },
+              xAxis: [{
+                type: 'category',
+                boundaryGap: true,
+                axisLine: {
+                    lineStyle: {
+                        color: '#252b41',
+                        type: 'dashed',
+                    }
+                },
+                axisLabel: {
+                    textStyle: {
+                        fontSize: 10,
+                        color:'#879be2 '
+                    },
+                    rotate:40,
+                },
+                axisTick: {
+                    show: false
+                },
+                  data: data.Xdata
+              }],
+              yAxis: [{
+                name: unit,
+                nameTextStyle: {		//Y轴那么的样式
+                  color: '#89a4eb',   
+                  fontSize: 10,
+                },
+                type: 'value',
+                // max:30,
+                // min:-30,
+                axisTick: {
+                    show: false
+                },
+                axisLine: {
+                    show: false,
+                    lineStyle: {
+                        color: '#252b41'
+                    }
+                },
+                axisLabel: {
+                    textStyle: {
+                        fontSize: 10,
+                        color:'#008fe8'
+                    }
+                },
+                splitLine: {
+                    lineStyle: {
+                        color: '#252b41',
+                        type: 'dashed',
+                    }
+                }
+              }],
+              series: [{
+                  name: '报警',
+                  type: 'line',
+                  //smooth: true,
+                  symbol: 'circle',
+                  symbolSize: 0,
+                  showSymbol: false,
+                  lineStyle: {
+                      normal: {
+                          color: '#ff0000',
+                          width:1,
+                          type: 'dashed',
+                      }
+                  },
+                  data: data.policeMax
+              }, {
+                  name: '报警',
+                  type: 'line',
+                 // smooth: true,
+                  symbol: 'circle',
+                  symbolSize: 0,
+                  showSymbol: false,
+      
+                  lineStyle: {
+                      normal: {
+                          color: '#ff0000',
+                          width:1,
+                          type: 'dashed',
+                      }
+                  },
+      
+                  data: data.policeMin
+              },{
+                  name: '预警',
+                  type: 'line',
+                 // smooth: true,
+                  symbol: 'circle',
+                  symbolSize: 0,
+                  showSymbol: false,
+                  lineStyle: {
+                      normal: {
+                          color: '#fb9300',
+                          width:1,
+                          type: 'dashed',
+                      }
+                  },
+                  data: data.warningMax
+              },{
+                  name: '预警',
+                  type: 'line',
+                 // smooth: true,
+                  symbol: 'circle',
+                  symbolSize: 0,
+                  showSymbol: false,
+                  lineStyle: {
+                      normal: {
+                          color: '#fb9300',
+                          width:1,
+                          type: 'dashed',
+                      }
+                  },
+                  data: data.warningMin
+              }, {
+                  name: '测量',
+                  type: 'line',
+                  //smooth: true,
+                  symbol: 'roundRect',
+                  symbolSize:5,
+                  //showSymbol: false,
+                  lineStyle: {
+                      normal: {
+                          color: '#2e6ed0',
+                          width:1,
+                      },
+      
+                  },
+                  data: data.Ydata
+                  }
+              ]
+          };
+            
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/pages/components/bar-chart-warning/index.json b/miniprogram/pages/components/bar-chart-warning/index.json
new file mode 100644
index 0000000..b11802e
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart-warning/index.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/bar-chart-warning/index.wxml b/miniprogram/pages/components/bar-chart-warning/index.wxml
new file mode 100644
index 0000000..ec79a90
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart-warning/index.wxml
@@ -0,0 +1,4 @@
+<!--components/bar-chart/index.wxml-->
+<view class="chart_canvas">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/pages/components/bar-chart-warning/index.wxss b/miniprogram/pages/components/bar-chart-warning/index.wxss
new file mode 100644
index 0000000..14ddf30
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart-warning/index.wxss
@@ -0,0 +1,6 @@
+/* components/bar-chart/index.wxss */
+.chart_canvas{
+    height: 500rpx;
+    width: 100%;
+
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/bar-chart/index.js b/miniprogram/pages/components/bar-chart/index.js
new file mode 100644
index 0000000..68f7616
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart/index.js
@@ -0,0 +1,206 @@
+// components/bar-chart/index.js
+import * as echarts from '../../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        chartData:{
+            type: Object
+        }
+    },
+    observers: {
+        chartData: function (val) {
+            //console.log(val)
+            //this.initChart() 
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            this.component.init((canvas, width, height, dpr) => {
+                let chart = echarts.init(canvas, null, {
+                    width: width,
+                    height: height,
+                    devicePixelRatio: dpr
+                })
+                chart.clear();
+                chart.setOption(this.getData());
+                return chart;
+            })
+        },
+        getData() {
+            var data = this.data.chartData
+
+            // var data ={
+            //   unit : '变化量(mm)',
+            //   legend:['X轴', 'Y轴'],
+            //   color:['#2e6ed0','#fb9300'],
+            //   Xdata :['13:00', '13:05', '13:10', '13:15', '13:20', '13:25', '13:30'],
+            //   Ydata:[[2,1,0,0,0,0,0],[-10,10,5,-5,-3,-1,10]]
+            // }
+
+            var unit=''
+            if(data.unit){
+              unit='单位：'+data.unit
+            }
+            
+            var series = []
+            for(var i = 0;i<data.Ydata.length ;i++){
+              series.push({
+                  name: data.legend[i],
+                  type: 'line',
+                  //smooth: true,
+                  symbol: 'roundRect',
+                  symbolSize:5,
+                  //showSymbol: false,
+                  lineStyle: {
+                      normal: {
+                          color: data.color[i],
+                          width:1,
+                          type: 'dashed',
+                      },
+  
+                  },
+                  data: data.Ydata[i]
+              })
+            }
+
+            var option = {
+              tooltip: {
+                  trigger: 'axis',
+                  axisPointer: {
+                      lineStyle: {
+                          color: '#57617B'
+                      }
+                  },
+                  formatter: function (params) {
+                    var dom =  params[0].axisValue+'\n'+params[0].seriesName+'：'+params[0].data+' '+data.unit+'\n'+params[1].seriesName+'：'+params[1].data+' '+data.unit
+                    return dom
+                  }
+
+                //   formatter: function (params) {
+                //     var dom = '<div style="padding:3px 5px;">' +
+                //         '<div>'+params[0].axisValue+'</div>'+
+                //         '<div>'+params[0].seriesName+'：'+params[0].data+'° </div>'+
+                //         '<div>'+params[1].seriesName+'：'+params[1].data+'° </div>'+
+                //         '</div>'
+                //     return dom
+                // }
+
+              },
+              color:['#2e6ed0','#fb9300'],
+              legend: {
+                  icon: 'rect',
+                  itemWidth: 10,
+                  itemHeight: 8,
+                  itemGap: 10,
+                  data: data.legend,
+                  right: '4%',
+                  textStyle: {
+                      fontSize: 12,
+                      color: '#8ba3eb'
+                  },
+      
+              },
+              grid: {
+                  top:'15%',
+                  left: '3%',
+                  right: '5%',
+                  bottom: '3%',
+                  containLabel: true
+              },
+              xAxis: [{
+                  type: 'category',
+                  boundaryGap: true,
+                  axisLine: {
+                      lineStyle: {
+                          color: '#252b41',
+                          type: 'dashed',
+                      }
+                  },
+                  axisLabel: {
+                      textStyle: {
+                          fontSize: 10,
+                          color:'#879be2'
+                      },
+                      rotate:40,
+                  },
+                  axisTick: {
+                      show: false
+                  },
+                  data: data.Xdata
+              }],
+              yAxis: [{
+                  name: unit,
+                  nameTextStyle: {		//Y轴那么的样式
+                    color: '#89a4eb',   
+                    fontSize: 10,
+                  },
+                  type: 'value',
+                  // max:30,
+                  // min:-30,
+                  axisTick: {
+                      show: false
+                  },
+                  axisLine: {
+                      show: false,
+                      lineStyle: {
+                          color: '#252b41'
+                      }
+                  },
+                  axisLabel: {
+                      textStyle: {
+                          fontSize: 10,
+                          color:'#008fe8'
+                      }
+                  },
+                  splitLine: {
+                      lineStyle: {
+                          color: '#252b41',
+                          type: 'dashed',
+                      }
+                  }
+              }],
+              series:series
+          };
+            
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/pages/components/bar-chart/index.json b/miniprogram/pages/components/bar-chart/index.json
new file mode 100644
index 0000000..b11802e
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart/index.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+        
+    }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/bar-chart/index.wxml b/miniprogram/pages/components/bar-chart/index.wxml
new file mode 100644
index 0000000..ec79a90
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart/index.wxml
@@ -0,0 +1,4 @@
+<!--components/bar-chart/index.wxml-->
+<view class="chart_canvas">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/pages/components/bar-chart/index.wxss b/miniprogram/pages/components/bar-chart/index.wxss
new file mode 100644
index 0000000..14ddf30
--- /dev/null
+++ b/miniprogram/pages/components/bar-chart/index.wxss
@@ -0,0 +1,6 @@
+/* components/bar-chart/index.wxss */
+.chart_canvas{
+    height: 500rpx;
+    width: 100%;
+
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/curve-echarts-copy/index.js b/miniprogram/pages/components/curve-echarts-copy/index.js
new file mode 100644
index 0000000..9a15e2e
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts-copy/index.js
@@ -0,0 +1,187 @@
+// pages/components/curve-echarts/index.js
+import * as echarts from '../../../ec-canvas/echarts'
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        chartData:{
+            type: Object
+        },
+        height:{
+            type:String
+        }
+    },
+    observers: {
+        chartData: function (val) {
+            this.initChart() 
+        },
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            this.component.init((canvas, width, height, dpr) => {
+                let chart = echarts.init(canvas, null, {
+                    width: width,
+                    height: height,
+                    devicePixelRatio: dpr
+                })
+                chart.setOption(this.getData());
+                return chart;
+            })
+        },
+        getData() {
+            let that=this
+            var data = this.data.chartData
+            var legend={}
+            var xAxis={}
+            var series=[]
+            if(data.lineData != undefined) {
+                for(let i=0;i<data.lineData.length;i++) {
+                    series.push({
+                        name: data.legend[i] ,
+                        type: 'line',
+                        smooth: true ,// 将折线图变为波浪线图展示
+                        symbol: "circle",
+                        symbolSize: 5,
+                        showSymbol: false,
+                        lineStyle: {
+                            normal: {
+                                width: 2,
+                            },
+                        },
+                        itemStyle: {
+                            normal: {
+                                color: data.color[i],
+                                borderWidth: 5,
+                            },
+                        },
+                        data: data.lineData[i]
+                    })
+                }
+            }
+            var unit = ''
+            if(data.unit){
+                unit = '单位：'+data.unit
+            }
+            var option = {
+                tooltip: {
+                  trigger: 'axis',
+                  axisPointer: {
+                    lineStyle: {
+                        color: "#ccc",
+                    },
+                  },
+                },
+                legend: {
+                    // type: 'plain', // 设置为plain
+                    icon:'rect',
+                    itemWidth: 10,
+                    itemHeight: 10,
+                    itemGap: 6,
+                    data: data.legend,
+                    top: -5,
+                        textStyle: {
+                            fontSize: 10,
+                            color: "#6d82bd",
+                        },
+                },
+                grid: {
+                    // top: '10%', // 可以设置为百分比或像素值
+                    bottom: '40%',
+                    left: '18%',
+                    // right: '10%'
+                },
+                xAxis: {
+                    type: 'category',
+                    data: data.date,
+                    axisTick: {
+                        show: false
+                    },
+                    axisLine: {
+                        //坐标轴轴线相关设置。数学上的x轴
+                        show: false,
+                        lineStyle: {
+                            color: "#23283e",
+                            type: "dashed",
+                        },
+                    },
+                    axisLabel: {
+                        color: '#6d82bd', 
+                        rotate: 60, // 旋转角度
+                        margin: 5 // 偏移量
+                    }
+                },
+                yAxis: {
+                    name: unit, // 设置y轴的单位
+                    type: "value",
+                    axisLine: {
+                        //坐标轴轴线相关设置。数学上的x轴
+                        show: false,
+                        lineStyle: {
+                            color: "#23283e",
+                            type: "dashed",
+                        },
+                    },
+                    axisTick: {
+                        show: false
+                    },
+                    axisLabel: {
+                        color: '#008ffd', // y轴文字颜色为蓝色
+                    },
+                    nameTextStyle: {
+                        fontSize: 10, // 设置单位文字的大小
+                        fontWeight: 'bold', // 设置单位文字的粗细
+                        color:'#fff'
+                    },
+                    splitLine: {
+                        show: true,
+                        lineStyle: {
+                            color: "#3d414e",
+                            type: "solid",
+                        },
+                    },
+                
+                },
+                series,
+              };
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/pages/components/curve-echarts-copy/index.json b/miniprogram/pages/components/curve-echarts-copy/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts-copy/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/curve-echarts-copy/index.wxml b/miniprogram/pages/components/curve-echarts-copy/index.wxml
new file mode 100644
index 0000000..7686c9b
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts-copy/index.wxml
@@ -0,0 +1,5 @@
+<!--pages/components/curve-echarts/index.wxml-->
+<!-- curve-echarts数据图 -->
+<view style="width: 100%;height: 600rpx;">
+	<ec-canvas id="{{ chartId }}" ec="{{ ec }} " ></ec-canvas>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/components/curve-echarts-copy/index.wxss b/miniprogram/pages/components/curve-echarts-copy/index.wxss
new file mode 100644
index 0000000..7ca6ce4
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts-copy/index.wxss
@@ -0,0 +1 @@
+/* pages/components/curve-echarts/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pages/components/curve-echarts/index.js b/miniprogram/pages/components/curve-echarts/index.js
new file mode 100644
index 0000000..0525c50
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts/index.js
@@ -0,0 +1,148 @@
+// pages/components/curve-echarts/index.js
+import * as echarts from '../../../ec-canvas/echarts'
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        chartData:{
+            type: Array
+        },
+        height:{
+            type:String
+        },
+        title:{
+          type:String
+        },
+        color:{
+          type:Array
+        }
+    },
+    observers: {
+        chartData: function (val) {
+            console.log(val)
+            this.initChart() 
+        },
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            this.component.init((canvas, width, height, dpr) => {
+                let chart = echarts.init(canvas, null, {
+                    width: width,
+                    height: height,
+                    devicePixelRatio: dpr
+                })
+                chart.setOption(this.getData());
+                return chart;
+            })
+        },
+        getData() {
+            let that=this
+            var data = this.data.chartData
+            var legend={}
+            var xAxis={}
+            var series=[]
+            console.log(data);
+            for(let i=0;i<data.length;i++){
+                console.log(data[i].name);
+                console.log(data[i].biaoyangX);
+                console.log(data[i].biaoyangY);
+                series.push({
+                    name: data[i].name ,
+                    type: 'line',
+                    smooth: true ,// 将折线图变为波浪线图展示
+                    data: data[i].biaoyangY,
+                })
+            }
+            var option = {
+                // title: {
+                //   text: '城市天气温度',
+                // },
+                tooltip: {
+                  trigger: 'axis',
+                },
+                //color:this.data.color,
+                legend: {
+                    // type: 'plain', // 设置为plain
+                    icon:'roundRect',
+                    itemWidth: 10,
+                    itemHeight: 10,
+                    orient: 'horizontal', // 设置为水平展示
+                    // x: 'center', // 设置水平方向的位置
+                    data: data.map(item=>item.name),
+                    textStyle: {
+                        fontSize: 10, // 设置字体大小为16px
+                        color:'#fff'
+                  }
+                },
+                grid: {
+                    // top: '10%', // 可以设置为百分比或像素值
+                    bottom: '30%',
+                    left: '15%',
+                    // right: '10%'
+                },
+                xAxis:{
+                    //   type: 'category',
+                      data: data[0].biaoyangX,
+                      axisLabel: {
+                        color: '#fff', // y轴文字颜色为白色
+                        rotate: 60, // 旋转角度
+                        margin: 10, // 偏移量
+                        fontSize: 10
+                    }
+                },
+                yAxis: {
+                    name: this.data.title, // 设置y轴的单位
+                    nameTextStyle: {
+                        fontSize: 10, // 设置单位文字的大小
+                        fontWeight: 'bold', // 设置单位文字的粗细
+                        color:'#fff'
+                    },
+                  type: 'value',
+                  axisLabel: {
+                    color: '#fff' // y轴文字颜色为白色
+                }
+                },
+                series,
+              };
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/pages/components/curve-echarts/index.json b/miniprogram/pages/components/curve-echarts/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/curve-echarts/index.wxml b/miniprogram/pages/components/curve-echarts/index.wxml
new file mode 100644
index 0000000..7686c9b
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts/index.wxml
@@ -0,0 +1,5 @@
+<!--pages/components/curve-echarts/index.wxml-->
+<!-- curve-echarts数据图 -->
+<view style="width: 100%;height: 600rpx;">
+	<ec-canvas id="{{ chartId }}" ec="{{ ec }} " ></ec-canvas>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/components/curve-echarts/index.wxss b/miniprogram/pages/components/curve-echarts/index.wxss
new file mode 100644
index 0000000..7ca6ce4
--- /dev/null
+++ b/miniprogram/pages/components/curve-echarts/index.wxss
@@ -0,0 +1 @@
+/* pages/components/curve-echarts/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pages/components/deep-select/index.js b/miniprogram/pages/components/deep-select/index.js
new file mode 100644
index 0000000..b2d0dd9
--- /dev/null
+++ b/miniprogram/pages/components/deep-select/index.js
@@ -0,0 +1,73 @@
+// pages/components/deep-select/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+    placeholder:{
+      type:String
+    },
+    selectValue:{
+      type:String
+    },
+    selectIndex:{
+      type:String
+    },
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      this.setData({
+        item:val[0],
+        value:val.length == 0?"":val[0].text
+      })
+    },
+    selectValue:function(val){
+      this.setData({
+        value:val
+      })
+    },
+    selectIndex:function(val){
+      this.setData({
+        index:val
+      })
+    }
+},
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show: false,
+    value:'',
+    item:'',
+    index:''
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+      this.setData({ show: true });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    onSelectChange(e){
+      console.log(e)
+      this.setData({
+        item:e.detail.value
+      })
+    },
+    onConfirm(e){
+      this.setData({
+        value:this.data.item.text
+      })
+      this.triggerEvent('change',this.data.item)
+      this.setData({ show: false });
+    }
+  }
+})
diff --git a/miniprogram/pages/components/deep-select/index.json b/miniprogram/pages/components/deep-select/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/deep-select/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/deep-select/index.wxml b/miniprogram/pages/components/deep-select/index.wxml
new file mode 100644
index 0000000..503bd6d
--- /dev/null
+++ b/miniprogram/pages/components/deep-select/index.wxml
@@ -0,0 +1,14 @@
+<!--pages/components/deep-select/index.wxml-->
+<view class="celect_frame_max" bindtap="showPopup">
+    <input class="celect_frame_min" placeholder="{{placeholder}}" placeholder-style="color:#7a8ac9;font-size:26rpx" value="{{value}}" disabled="true"/>
+</view>
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>{{placeholder}}</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view> 
+    <van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style"  default-index="{{index}}"
+    column-class="time_list_style" active-class="time_active_style" toolbar-class="toolbar_style" visible-item-count="5" /> 
+</van-popup>
\ No newline at end of file
diff --git a/miniprogram/pages/components/deep-select/index.wxss b/miniprogram/pages/components/deep-select/index.wxss
new file mode 100644
index 0000000..ab8e7fa
--- /dev/null
+++ b/miniprogram/pages/components/deep-select/index.wxss
@@ -0,0 +1,103 @@
+/* pages/components/deep-select/index.wxss */
+.celect_frame_max{
+  padding: 15rpx;
+  background: #2b345b;
+  border-radius: 10rpx;
+}
+.celect_frame_min{
+  padding:0 40rpx 0 5rpx;
+  overflow: hidden;
+  white-space:nowrap;
+  text-overflow:ellipsis;
+  background: url("http://fileimg.makalu.cc/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx;
+}
+.celect_frame_min.active{
+  color: #7a8ac9;
+}
+.popup_style{
+  background: #232a44 !important;
+}
+
+.option_list_title{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+  color: #06d4f8;
+}
+.option_list_title_btn{
+  color: #1989fa;
+  font-size: 30rpx;
+}
+.option_list_min{
+  padding: 20rpx;
+}
+.option_list_con{
+  min-height: 240rpx;
+  max-height: 400rpx;
+  overflow: auto;
+}
+.option_list_con view{
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+  color: #7d94d7;
+}
+.option_list_con .active{
+  background: #273051;
+  color: #ffffff;
+}
+.time_select_style{
+  background: none !important;
+}
+
+.time_active_style{
+  color: #ffffff !important;
+}
+.time_list_style{
+  background: none !important;
+  color: #546696 !important;
+}
+.toolbar_style{
+  border: none !important;
+  line-height:44px;
+}
+.option_list_title{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+
+}
+.option_list_title_btn{
+  color: #1989fa;
+  font-size: 30rpx;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/file-uploader-copy/index.js b/miniprogram/pages/components/file-uploader-copy/index.js
new file mode 100644
index 0000000..8f4996d
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader-copy/index.js
@@ -0,0 +1,82 @@
+// components/filling/index.js
+const app = getApp();
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        scr:{
+            type:String
+        }
+    },
+
+  
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        quantity:1,
+        uploaderList: [],
+        uploaderNum:0,
+        showUpload:true
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        // 删除图片
+        clearImg:function(e){
+            var nowList = [];//新数据
+            var uploaderList = this.data.uploaderList;//原数据
+            
+            for (let i = 0; i < uploaderList.length;i++){
+                if (i == e.currentTarget.dataset.index){
+                    continue;
+                }else{
+                    nowList.push(uploaderList[i])
+                }
+            }
+            this.setData({
+                uploaderNum: this.data.uploaderNum - 1,
+                uploaderList: nowList,
+                showUpload: true
+            })
+            console.log(this.data.uploaderList)
+            this.triggerEvent("images", this.data.uploaderList); 
+        },
+        //展示图片
+        showImg:function(e){
+            var that=this;
+            wx.previewImage({
+                urls: that.data.uploaderList,
+                current: that.data.uploaderList[e.currentTarget.dataset.index]
+            })
+        },
+        //上传图片
+        upload: function(e) {
+            var that = this;
+            wx.chooseImage({
+                count: that.data.quantity - that.data.uploaderNum, // 默认9
+                sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+                sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+                success: function(res) {
+                    // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+                    let tempFilePaths = res.tempFilePaths;
+                    let uploaderList = that.data.uploaderList.concat(tempFilePaths);
+                    if (uploaderList.length==that.data.quantity){
+                        that.setData({
+                            showUpload:false
+                        })
+                    }
+                    that.setData({
+                        uploaderList: uploaderList,
+                        uploaderNum: uploaderList.length,
+                    })
+                    that.triggerEvent("images", that.data.uploaderList); 
+                }
+            })
+        },
+    }
+})
diff --git a/miniprogram/pages/components/file-uploader-copy/index.json b/miniprogram/pages/components/file-uploader-copy/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader-copy/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/file-uploader-copy/index.wxml b/miniprogram/pages/components/file-uploader-copy/index.wxml
new file mode 100644
index 0000000..e5e95ed
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader-copy/index.wxml
@@ -0,0 +1,18 @@
+<!--components/fillings/index.wxml-->
+<view class="filling_selector_max">
+      <!-- 上传图片 -->
+      <view class="in-img-max">
+          <view class="in-img-div" wx:for="{{uploaderList}}" wx:key="index" style="border: 1px solid green;">
+              <image bindtap='showImg' data-index="{{index}}" src='{{item}}' style="width:164px;height:107px;"></image>
+              <view class="in-delete" bindtap='clearImg' data-index="{{index}}">×</view>
+          </view>
+
+          <view class="in-add" wx:if="{{scr != ''}}">
+              <view class="in-add-click" bindtap='upload' wx:if="{{showUpload}}"  style="width:164px;height:107px;background:url({{scr}}) no-repeat center/100%;"></view>
+          </view>
+          <view class="in-add" wx:if="{{scr == ''}}">
+              <view class="in-add-click" bindtap='upload' wx:if="{{showUpload}}"></view>
+          </view>
+    
+      </view> 
+</view>
diff --git a/miniprogram/pages/components/file-uploader-copy/index.wxss b/miniprogram/pages/components/file-uploader-copy/index.wxss
new file mode 100644
index 0000000..53945ca
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader-copy/index.wxss
@@ -0,0 +1,143 @@
+/* components/fillings/index.wxss */
+
+.filling_selector_max{
+  
+    position: relative;
+
+}
+.filling_selector_title{
+    padding-left: 15rpx;
+    color: #999999;
+}
+.required::before {
+    position: absolute;
+    left: 20rpx;
+    color: #ee0a24;
+    font-size: 38rpx;
+    content: '*';
+}
+.filling_selector_input{
+    padding: 15rpx;
+}
+.filling_selector_input input{
+    padding: 15rpx 0;
+}
+
+
+
+
+/* 上传图片 */ 
+.in-modular-upload{ 
+    padding: 40rpx 0;
+  }
+  .in-img-div{
+    position: relative;
+    margin: 0 8px 8px 0;
+    float: left;
+  }
+  .in-img-max:after{
+    display:block;
+    clear:both;
+    content:"";
+    visibility:hidden;
+    height:0
+  } 
+  .in-img-max{
+    width: auto;
+    zoom:1
+  }
+  .in-add{
+    float: left;
+  }
+  .in-add-click{
+    width: 200rpx;
+    height: 200rpx;
+    border: 1px dashed #28345a;
+    border-radius: 10rpx;
+    background: #28345a url("http://fileimg.makalu.cc/WEB_162F576788AE44F08ADDFFC06CD5923F.png") no-repeat center/70%;
+  }
+
+  
+  .in-img-div image{
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 15rpx;
+    position: relative;
+  }
+  .in-delete{
+    position: absolute;
+    z-index: 5;
+    height: 50rpx;
+    background: rgba(0,0,0,0.7);
+    color: #fff;
+    width: 50rpx;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 50rpx;
+    right: -15rpx;
+    top: -20rpx;
+  }
+  
+  
+  .in-add-to{
+    padding:0 20rpx;
+    width: auto;
+    border: 1px dotted #fecc00;
+    border-radius: 10rpx;
+    text-align: center;
+    color: #fecc00;
+    font-size:60rpx;
+  }
+  .in-add-to:active{
+    background: #fecc00;
+    color: #ffffff;
+  }
+  
+  
+  .in-cut-off{
+    font-size: 24rpx;
+    color: #fff;
+    background: #ff0000;
+    border-radius: 10rpx;
+    float: right;
+    padding: 5rpx 10rpx;
+  }
+  .in-remarks{
+    font-size: 24rpx;
+    color: #999;
+    padding-bottom: 20rpx;
+  }
+  .in-tab{
+    height: 100rpx;
+  
+  }
+  .in-tab view{
+    width: 20%;
+    height: 80rpx;
+    text-align: center;
+    font-size: 30rpx;
+    line-height: 80rpx;
+    float: left;
+    color: #999;
+  }
+  .in-tab .active{
+    background: #ff0000;
+    color: #ffffff;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/file-uploader/index.js b/miniprogram/pages/components/file-uploader/index.js
new file mode 100644
index 0000000..0f72a96
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader/index.js
@@ -0,0 +1,89 @@
+// components/filling/index.js
+const app = getApp();
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        fileUrlArray:{
+            type:Array
+        }
+    },
+
+    /**数据监听 */
+    observers: {
+        fileUrlArray:function(val){
+            this.setData({
+                uploaderList:val
+            })
+        }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        quantity:5,
+        uploaderList: [],
+        uploaderNum:0,
+        showUpload:true
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        // 删除图片
+        clearImg:function(e){
+            var nowList = [];//新数据
+            var uploaderList = this.data.uploaderList;//原数据
+            
+            for (let i = 0; i < uploaderList.length;i++){
+                if (i == e.currentTarget.dataset.index){
+                    continue;
+                }else{
+                    nowList.push(uploaderList[i])
+                }
+            }
+            this.setData({
+                uploaderNum: this.data.uploaderNum - 1,
+                uploaderList: nowList,
+                showUpload: true
+            })
+            console.log(this.data.uploaderList)
+            this.triggerEvent("images", this.data.uploaderList); 
+        },
+        //展示图片
+        showImg:function(e){
+            var that=this;
+            wx.previewImage({
+                urls: that.data.uploaderList,
+                current: that.data.uploaderList[e.currentTarget.dataset.index]
+            })
+        },
+        //上传图片
+        upload: function(e) {
+            var that = this;
+            wx.chooseImage({
+                count: that.data.quantity - that.data.uploaderNum, // 默认9
+                sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+                sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+                success: function(res) {
+                    // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+                    let tempFilePaths = res.tempFilePaths;
+                    let uploaderList = that.data.uploaderList.concat(tempFilePaths);
+                    if (uploaderList.length==that.data.quantity){
+                        that.setData({
+                            showUpload:false
+                        })
+                    }
+                    that.setData({
+                        uploaderList: uploaderList,
+                        uploaderNum: uploaderList.length,
+                    })
+                    that.triggerEvent("images", that.data.uploaderList); 
+                }
+            })
+        },
+    }
+})
diff --git a/miniprogram/pages/components/file-uploader/index.json b/miniprogram/pages/components/file-uploader/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/file-uploader/index.wxml b/miniprogram/pages/components/file-uploader/index.wxml
new file mode 100644
index 0000000..1f4c601
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader/index.wxml
@@ -0,0 +1,14 @@
+<!--components/fillings/index.wxml-->
+<view class="filling_selector_max">
+      <!-- 上传图片 -->
+      <view class="in-img-max">
+          <view class="in-img-div" wx:for="{{uploaderList}}" wx:key="index">
+              <image bindtap='showImg' data-index="{{index}}" src='{{item}}'></image>
+              <view class="in-delete" bindtap='clearImg' data-index="{{index}}">×</view>
+          </view>
+
+          <view class="in-add">
+              <view class="in-add-click" bindtap='upload' wx:if="{{showUpload}}"></view>
+          </view>
+      </view> 
+</view>
diff --git a/miniprogram/pages/components/file-uploader/index.wxss b/miniprogram/pages/components/file-uploader/index.wxss
new file mode 100644
index 0000000..b63248d
--- /dev/null
+++ b/miniprogram/pages/components/file-uploader/index.wxss
@@ -0,0 +1,143 @@
+/* components/fillings/index.wxss */
+
+.filling_selector_max{
+  
+    position: relative;
+
+}
+.filling_selector_title{
+    padding-left: 15rpx;
+    color: #999999;
+}
+.required::before {
+    position: absolute;
+    left: 20rpx;
+    color: #ee0a24;
+    font-size: 38rpx;
+    content: '*';
+}
+.filling_selector_input{
+    padding: 15rpx;
+}
+.filling_selector_input input{
+    padding: 15rpx 0;
+}
+
+
+
+
+/* 上传图片 */ 
+.in-modular-upload{ 
+    padding: 40rpx 0;
+  }
+  .in-img-div{
+    position: relative;
+    margin: 0 8px 8px 0;
+    float: left;
+  }
+  .in-img-max:after{
+    display:block;
+    clear:both;
+    content:"";
+    visibility:hidden;
+    height:0
+  } 
+  .in-img-max{
+    width: auto;
+    zoom:1
+  }
+  .in-add{
+    float: left;
+  }
+  .in-add-click{
+    width: 180rpx;
+    height:180rpx;
+    border: 1px dashed #28345a;
+    border-radius: 10rpx;
+    background: #28345a url("http://fileimg.makalu.cc/WEB_162F576788AE44F08ADDFFC06CD5923F.png") no-repeat center/70%;
+  }
+
+  
+  .in-img-div image{
+    width: 180rpx;
+    height: 180rpx;
+    border-radius: 15rpx;
+    position: relative;
+  }
+  .in-delete{
+    position: absolute;
+    z-index: 5;
+    height: 50rpx;
+    background: rgba(0,0,0,0.7);
+    color: #fff;
+    width: 50rpx;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 50rpx;
+    right: -15rpx;
+    top: -20rpx;
+  }
+  
+  
+  .in-add-to{
+    padding:0 20rpx;
+    width: auto;
+    border: 1px dotted #fecc00;
+    border-radius: 10rpx;
+    text-align: center;
+    color: #fecc00;
+    font-size:60rpx;
+  }
+  .in-add-to:active{
+    background: #fecc00;
+    color: #ffffff;
+  }
+  
+  
+  .in-cut-off{
+    font-size: 24rpx;
+    color: #fff;
+    background: #ff0000;
+    border-radius: 10rpx;
+    float: right;
+    padding: 5rpx 10rpx;
+  }
+  .in-remarks{
+    font-size: 24rpx;
+    color: #999;
+    padding-bottom: 20rpx;
+  }
+  .in-tab{
+    height: 100rpx;
+  
+  }
+  .in-tab view{
+    width: 20%;
+    height: 80rpx;
+    text-align: center;
+    font-size: 30rpx;
+    line-height: 80rpx;
+    float: left;
+    color: #999;
+  }
+  .in-tab .active{
+    background: #ff0000;
+    color: #ffffff;
+  }
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/pie-chart/index.js b/miniprogram/pages/components/pie-chart/index.js
new file mode 100644
index 0000000..53d748e
--- /dev/null
+++ b/miniprogram/pages/components/pie-chart/index.js
@@ -0,0 +1,140 @@
+// components/bar-chart/index.js
+import * as echarts from '../../../ec-canvas/echarts'
+
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        chartId:{ 
+            type: String
+        },
+        chartData:{
+            type: Object
+        }
+    },
+    observers: {
+        chartData: function (val) {
+            console.log(val)
+            this.initChart() 
+        },
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        ec: {
+            lazyLoad: true
+        },
+        chart:undefined,
+    },
+    lifetimes: {
+        created: function(){
+        //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+        },
+        attached: function () {
+            //在组件实例进入页面节点树时执行
+           
+        },
+        ready: function () {
+            // 在组件在视图层布局完成后执行
+          
+            this.initChart();
+        },
+        detached: function () {
+            // 在组件实例被从页面节点树移除时执行
+        },
+        
+    },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        initChart(){
+            var id ='#' +  this.data.chartId;
+            this.component = this.selectComponent(id);
+            this.component.init((canvas, width, height, dpr) => {
+                let chart = echarts.init(canvas, null, {
+                    width: width,
+                    height: height,
+                    devicePixelRatio: dpr
+                })
+                chart.setOption(this.getData());
+                return chart;
+            })
+        },
+        getData() {
+            var data = this.data.chartData
+            var option = {
+                series: [
+                    {
+                        type: "pie",
+                        radius: ["65%", "80%"],
+                        label: {
+                            normal: {
+                                position: "center",
+                            },
+                        },
+                        data: [
+                            {
+                                value: data.value,
+                                label: {
+                                    normal: {
+                                        formatter: "{d} %",
+                                        textStyle: {
+                                            fontSize: 20,
+                                            color: "#00ecfe",
+                                            fontWeight:'bold',
+                                        },
+                                    },
+                                },
+                                itemStyle: {
+                                    normal: {
+                                        color: {
+                                            // 完成的圆环的颜色
+                                            colorStops: [
+                                                {
+                                                    offset: 0,
+                                                    color: "#00cefc", // 0% 处的颜色
+                                                },
+                                                {
+                                                    offset: 1,
+                                                    color: "#367bec", // 100% 处的颜色
+                                                },
+                                            ],
+                                        },
+                                        labelLine: {
+                                            show: false,
+                                        },
+                                    },
+                                },
+                            },
+                            {
+                                value: (100-data.value),
+                                label: {
+                                    normal: {
+                                        formatter: "\n\n\n\n"+data.text,
+                                        textStyle: {
+                                            color: "#ffffff",
+                                            fontSize: 12,
+                                        },
+                                    },
+                                },
+                                tooltip: {
+                                    show: false,
+                                },
+                                itemStyle: {
+                                    normal: {
+                                        color: "#273259",
+                                    }
+                                },
+                                hoverAnimation: false,
+                            },
+                        ],
+                    },
+                ],
+            };
+            return option;
+        }
+    }
+})
diff --git a/miniprogram/pages/components/pie-chart/index.json b/miniprogram/pages/components/pie-chart/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/pie-chart/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/pie-chart/index.wxml b/miniprogram/pages/components/pie-chart/index.wxml
new file mode 100644
index 0000000..5f4db21
--- /dev/null
+++ b/miniprogram/pages/components/pie-chart/index.wxml
@@ -0,0 +1,4 @@
+<!--pages/components/pie-chart/index.wxml-->
+<view class="chart_canvas">
+    <ec-canvas id="{{ chartId }}" ec="{{ ec }}"></ec-canvas>
+</view>
diff --git a/miniprogram/pages/components/pie-chart/index.wxss b/miniprogram/pages/components/pie-chart/index.wxss
new file mode 100644
index 0000000..d86a152
--- /dev/null
+++ b/miniprogram/pages/components/pie-chart/index.wxss
@@ -0,0 +1,5 @@
+/* pages/components/pie-chart/index.wxss */
+.chart_canvas{
+  height: 300rpx;
+  width: 100%;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/project-select/index.js b/miniprogram/pages/components/project-select/index.js
new file mode 100644
index 0000000..38f8cb7
--- /dev/null
+++ b/miniprogram/pages/components/project-select/index.js
@@ -0,0 +1,96 @@
+// pages/components/project-select/index.js
+const app = getApp()
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    init:{
+      type:Object
+    },
+    width:{
+      type:String
+    },
+    left:{
+      type:String
+    }
+  },
+  /**数据监听 */
+  observers: {
+    init: function (val) {
+      if(val){
+        this.setData({
+          item:val,
+        })
+      }
+    },
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show: false,
+    index:0,
+    item:'',
+    columns:[],
+    projectList:[],
+  },
+
+  created(){
+    //this.getProjectNameList();
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+      var data = this.data.projectList;
+      var initData = this.data.init
+      for(var i=0;i<data.length;i++ ){
+          if(data[i].id == initData.id){
+              this.setData({
+                index:i
+              })
+              break
+          }
+      }
+
+      console.log(this.data.index)
+      this.setData({
+          columns:data,
+          show: true 
+      });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    onSelectChange(e){
+      this.setData({
+        item:e.detail.value
+      })
+    },
+    onConfirm(){
+      this.setData({
+        value:this.data.item.text
+      })
+      this.triggerEvent('change',this.data.item)
+      this.setData({ show: false });
+    },
+    getProjectNameList:function(){
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/security/getProjectNameList',
+        method:"GET",
+        data:{
+            deptId:app.globalData.deptId,
+            projectId:app.globalData.userProjectId
+        },
+        success: (res) =>{
+          var that = this;
+          that.setData({
+            projectList:res.data
+          })
+        }
+      });
+    },
+  }
+})
diff --git a/miniprogram/pages/components/project-select/index.json b/miniprogram/pages/components/project-select/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/project-select/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/project-select/index.wxml b/miniprogram/pages/components/project-select/index.wxml
new file mode 100644
index 0000000..47dd644
--- /dev/null
+++ b/miniprogram/pages/components/project-select/index.wxml
@@ -0,0 +1,18 @@
+<!--pages/components/project-select/index.wxml-->
+<view class="video_add">
+    <view class="video_address" style="width: {{width}};margin-left: {{left}};">
+      <view class="video_address_min" bindtap="showPopup">
+        {{item.text}}
+      </view>
+    </view>
+</view>
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>{{placeholder}}</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view> 
+    <van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style"  default-index="{{ index }}"
+    column-class="time_list_style" active-class="time_active_style" toolbar-class="toolbar_style" visible-item-count="5" /> 
+</van-popup>
diff --git a/miniprogram/pages/components/project-select/index.wxss b/miniprogram/pages/components/project-select/index.wxss
new file mode 100644
index 0000000..76d5ce2
--- /dev/null
+++ b/miniprogram/pages/components/project-select/index.wxss
@@ -0,0 +1,49 @@
+/* pages/components/project-select/index.wxss */
+
+.video_add{
+    padding: 20rpx 30rpx;
+  }
+  .video_address{
+    background:#30343f;
+    padding:0 20rpx; 
+    border-radius:50rpx;
+    font-size: 28rpx;
+  }
+  .video_address_min{
+    background:url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/40rpx;
+    height: 80rpx; 
+    line-height: 80rpx;
+    padding-left: 50rpx;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+  }
+
+
+  .option_list_title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    color: #06d4f8;
+  }
+  .option_list_title_btn{
+    color: #1989fa;
+    font-size: 30rpx;
+  }
+
+  .popup_style{
+    background: #232a44 !important;
+  }
+.time_select_style{
+    background: none !important;
+}
+
+.time_active_style{
+    color: #ffffff !important;
+}
+.time_list_style{
+    background: none !important;
+    color: #546696 !important;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/pz-screen-training-index/index.js b/miniprogram/pages/components/pz-screen-training-index/index.js
new file mode 100644
index 0000000..1ad5090
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training-index/index.js
@@ -0,0 +1,122 @@
+// pages/components/deep-select/index.js
+import Toast from '@vant/weapp/toast/toast';
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+    title:{
+      type:String
+    },
+    title1:{
+      type:String
+    },
+    
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      console.log(val)
+      if(val.length > 0){
+        this.setData({
+          floorList:val[0].floorList
+        })
+      }
+    },
+   
+  },
+  lifetimes: {
+    created: function(){
+    //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+      
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+        
+
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show: false,
+    
+    startDateData:[],
+    endDateData:[],
+
+    condition:{
+      floorNum:'',
+      buildingNum:'',
+      startDate:'',
+      endDate:'',
+    },
+    floorList:[]
+   
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    //打开筛选弹窗
+    showPopup() {
+   
+      this.setData({ show: true });
+    },
+    //关闭筛选弹窗
+    onClose() {
+      this.setData({ show: false });
+    },
+
+    //单元楼
+    onBuildSelectChange(event){   
+        this.setData({
+          'condition.buildingNum': event.detail.value.id,
+          floorList:event.detail.value.floorList
+        })
+    },
+    //楼层
+    onFloorSelectChange(event){   
+      this.setData({
+       'condition.floorNum': event.detail.value.id,
+      })
+  },
+
+
+    //开始日期
+    onStartDate(e){
+        this.setData({
+          'condition.startDate': e.detail,
+        })
+    },
+    //结束日期
+    onEndDate(e){
+      this.setData({
+        'condition.endDate': e.detail,
+      })
+    },
+    
+    //确认按钮
+    onConfirm(){
+      var start = new Date(this.data.condition.startDate)
+      var end = new Date(this.data.condition.endDate)
+      if(start > end){
+        Toast.fail('开始时间不能大于结束时间');
+      }else{
+        this.triggerEvent('screen',this.data.condition)
+        this.setData({ show: false});
+      } 
+    }
+  }
+})
diff --git a/miniprogram/pages/components/pz-screen-training-index/index.json b/miniprogram/pages/components/pz-screen-training-index/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training-index/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/pz-screen-training-index/index.wxml b/miniprogram/pages/components/pz-screen-training-index/index.wxml
new file mode 100644
index 0000000..9147d94
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training-index/index.wxml
@@ -0,0 +1,46 @@
+<!--pages/components/pz-screen/index.wxml-->
+<view class="pz_screen"  bindtap="showPopup">筛选</view>
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+
+  <view class="option_list_max">  
+      <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>筛选</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view>
+      <view class="contrent_height">
+        <view class="pzzj_screen_title">{{title}}</view>
+        <view class="option_list_min"> 
+            <van-picker columns="{{ columns }}" bind:change="onBuildSelectChange" custom-class="time_select_style" column-class="time_list_style"
+            active-class="time_active_style" visible-item-count="3"/> 
+        </view>
+        <view class="pzzj_screen_title">{{title1}}</view>
+        <view class="option_list_min"> 
+            <van-picker columns="{{ floorList }}" bind:change="onFloorSelectChange" custom-class="time_select_style" column-class="time_list_style"
+            active-class="time_active_style" visible-item-count="3"/> 
+        </view>
+        <view class="pzzj_screen_title">开始时间</view>
+        <view class="pzzj_screen_time">
+          <van-row>
+            <van-col span="11">
+              <select-date bindchange="onStartDate"></select-date>
+            </van-col>
+            <van-col span="2">
+              <view class="pzzj_screen_time_bar">
+                -
+              </view>
+            </van-col>
+            <van-col span="11">
+              <select-date bindchange="onEndDate"></select-date>
+            </van-col>
+          </van-row>
+        
+        </view>
+      
+      </view>
+     
+
+
+  </view>
+</van-popup>
diff --git a/miniprogram/pages/components/pz-screen-training-index/index.wxss b/miniprogram/pages/components/pz-screen-training-index/index.wxss
new file mode 100644
index 0000000..2e6189a
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training-index/index.wxss
@@ -0,0 +1,107 @@
+/* pages/components/pz-screen/index.wxss */
+.option_list_max{
+  padding-bottom: 30rpx;
+}
+.pz_screen{
+  background: url("http://fileimg.makalu.cc/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx;
+  padding-left: 35rpx;
+  color: #788fd2;
+  font-size: 26rpx;
+}
+/* pages/components/deep-select/index.wxss */
+.celect_frame_max{
+  padding: 15rpx;
+  background: #2b345b;
+  border-radius: 10rpx;
+}
+.celect_frame_min{
+  padding:0 40rpx 0 5rpx;
+  overflow: hidden;
+  white-space:nowrap;
+  text-overflow:ellipsis;
+  background: url("http://fileimg.makalu.cc/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx;
+}
+.celect_frame_min.active{
+  color: #7a8ac9;
+}
+.popup_style{
+  background: #232a44 !important;
+}
+.contrent_height{
+  height: 700rpx;
+  overflow: auto;
+}
+.option_list_title{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+
+}
+.option_list_title_btn{
+  color: #1989fa;
+  font-size: 30rpx;
+}
+.option_list_min{
+  padding: 20rpx;
+}
+.option_list_con{
+  min-height: 160rpx;
+  max-height: 240rpx;
+  overflow: auto;
+}
+.option_list_con view{
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+  color: #7d94d7;
+}
+.option_list_con .active{
+  background: #273051;
+  color: #ffffff;
+}
+.pzzj_screen_title{
+  padding: 30rpx 50rpx;
+  font-size: 30rpx;
+}
+.pzzj_screen_time{
+  padding: 30rpx;
+}
+
+.time_select_style{
+  background: none !important;
+}
+
+.time_active_style{
+  color: #ffffff !important;
+}
+.time_list_style{
+  background: none !important;
+  color: #546696 !important;
+}
+.pzzj_screen_time_bar{
+  margin-top: 44px;
+  text-align: center;
+  height: 44px;
+  line-height: 44px;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/pz-screen-training/index.js b/miniprogram/pages/components/pz-screen-training/index.js
new file mode 100644
index 0000000..bcc7bc6
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training/index.js
@@ -0,0 +1,107 @@
+// pages/components/deep-select/index.js
+import Toast from '@vant/weapp/toast/toast';
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      if(val.length > 0){
+        this.setData({
+          'condition.typeId': val[0].id,
+          'condition.typeText': val[0].text,
+        })
+      }
+    },
+  },
+  lifetimes: {
+    created: function(){
+    //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+      
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+        
+
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show: false,
+    
+    startDateData:[],
+    endDateData:[],
+
+    condition:{
+      typeId:'',
+      typeText:'',
+      startDate:'',
+      endDate:'',
+    },
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    //打开筛选弹窗
+    showPopup() {
+   
+      this.setData({ show: true });
+    },
+    //关闭筛选弹窗
+    onClose() {
+      this.setData({ show: false });
+    },
+
+    //凭证类型筛选
+    onSelectChange(event){   
+        this.setData({
+          'condition.typeId': event.detail.value.id,
+          'condition.typeText': event.detail.value.text,
+        })
+    },
+
+    //开始日期
+    onStartDate(e){
+        this.setData({
+          'condition.startDate': e.detail,
+        })
+
+    },
+    //结束日期
+    onEndDate(e){
+      this.setData({
+        'condition.endDate': e.detail,
+      })
+    },
+    
+    //确认按钮
+    onConfirm(){
+      var start = new Date(this.data.condition.startDate)
+      var end = new Date(this.data.condition.endDate)
+      if(start > end){
+        Toast.fail('开始时间不能大于结束时间');
+      }else{
+        this.triggerEvent('screen',this.data.condition)
+        this.setData({ show: false});
+      } 
+    }
+  }
+})
diff --git a/miniprogram/pages/components/pz-screen-training/index.json b/miniprogram/pages/components/pz-screen-training/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/pz-screen-training/index.wxml b/miniprogram/pages/components/pz-screen-training/index.wxml
new file mode 100644
index 0000000..e52c04c
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training/index.wxml
@@ -0,0 +1,37 @@
+<!--pages/components/pz-screen/index.wxml-->
+<view class="pz_screen"  bindtap="showPopup">筛选</view>
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+
+  <view class="option_list_max">  
+      <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>筛选</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view>
+      <view class="pzzj_screen_title">协作队伍</view>
+      <view class="option_list_min"> 
+          <van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style" column-class="time_list_style"
+          active-class="time_active_style" visible-item-count="3"/> 
+      </view>
+      <view class="pzzj_screen_title">开始时间</view>
+      <view class="pzzj_screen_time">
+        <van-row>
+          <van-col span="11">
+            <select-date bindchange="onStartDate"></select-date>
+          </van-col>
+          <van-col span="2">
+            <view class="pzzj_screen_time_bar">
+               -
+            </view>
+          </van-col>
+          <van-col span="11">
+            <select-date bindchange="onEndDate"></select-date>
+          </van-col>
+        </van-row>
+      
+      </view>
+
+
+  </view>
+</van-popup>
diff --git a/miniprogram/pages/components/pz-screen-training/index.wxss b/miniprogram/pages/components/pz-screen-training/index.wxss
new file mode 100644
index 0000000..fde3c3c
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen-training/index.wxss
@@ -0,0 +1,104 @@
+/* pages/components/pz-screen/index.wxss */
+.option_list_max{
+  padding-bottom: 30rpx;
+}
+.pz_screen{
+  background: url("http://fileimg.makalu.cc/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx;
+  padding-left: 35rpx;
+  color: #788fd2;
+  font-size: 26rpx;
+}
+/* pages/components/deep-select/index.wxss */
+.celect_frame_max{
+  padding: 15rpx;
+  background: #2b345b;
+  border-radius: 10rpx;
+}
+.celect_frame_min{
+  padding:0 40rpx 0 5rpx;
+  overflow: hidden;
+  white-space:nowrap;
+  text-overflow:ellipsis;
+  background: url("http://fileimg.makalu.cc/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx;
+}
+.celect_frame_min.active{
+  color: #7a8ac9;
+}
+.popup_style{
+  background: #232a44 !important;
+}
+
+.option_list_title{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+
+}
+.option_list_title_btn{
+  color: #1989fa;
+  font-size: 30rpx;
+}
+.option_list_min{
+  padding: 20rpx;
+}
+.option_list_con{
+  min-height: 160rpx;
+  max-height: 240rpx;
+  overflow: auto;
+}
+.option_list_con view{
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+  color: #7d94d7;
+}
+.option_list_con .active{
+  background: #273051;
+  color: #ffffff;
+}
+.pzzj_screen_title{
+  padding: 30rpx 50rpx;
+  font-size: 30rpx;
+}
+.pzzj_screen_time{
+  padding: 30rpx;
+}
+
+.time_select_style{
+  background: none !important;
+}
+
+.time_active_style{
+  color: #ffffff !important;
+}
+.time_list_style{
+  background: none !important;
+  color: #546696 !important;
+}
+.pzzj_screen_time_bar{
+  margin-top: 44px;
+  text-align: center;
+  height: 44px;
+  line-height: 44px;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/pz-screen/index.js b/miniprogram/pages/components/pz-screen/index.js
new file mode 100644
index 0000000..bcc7bc6
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen/index.js
@@ -0,0 +1,107 @@
+// pages/components/deep-select/index.js
+import Toast from '@vant/weapp/toast/toast';
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      if(val.length > 0){
+        this.setData({
+          'condition.typeId': val[0].id,
+          'condition.typeText': val[0].text,
+        })
+      }
+    },
+  },
+  lifetimes: {
+    created: function(){
+    //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+      
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+        
+
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show: false,
+    
+    startDateData:[],
+    endDateData:[],
+
+    condition:{
+      typeId:'',
+      typeText:'',
+      startDate:'',
+      endDate:'',
+    },
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    //打开筛选弹窗
+    showPopup() {
+   
+      this.setData({ show: true });
+    },
+    //关闭筛选弹窗
+    onClose() {
+      this.setData({ show: false });
+    },
+
+    //凭证类型筛选
+    onSelectChange(event){   
+        this.setData({
+          'condition.typeId': event.detail.value.id,
+          'condition.typeText': event.detail.value.text,
+        })
+    },
+
+    //开始日期
+    onStartDate(e){
+        this.setData({
+          'condition.startDate': e.detail,
+        })
+
+    },
+    //结束日期
+    onEndDate(e){
+      this.setData({
+        'condition.endDate': e.detail,
+      })
+    },
+    
+    //确认按钮
+    onConfirm(){
+      var start = new Date(this.data.condition.startDate)
+      var end = new Date(this.data.condition.endDate)
+      if(start > end){
+        Toast.fail('开始时间不能大于结束时间');
+      }else{
+        this.triggerEvent('screen',this.data.condition)
+        this.setData({ show: false});
+      } 
+    }
+  }
+})
diff --git a/miniprogram/pages/components/pz-screen/index.json b/miniprogram/pages/components/pz-screen/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/pz-screen/index.wxml b/miniprogram/pages/components/pz-screen/index.wxml
new file mode 100644
index 0000000..f8933d6
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen/index.wxml
@@ -0,0 +1,37 @@
+<!--pages/components/pz-screen/index.wxml-->
+<view class="pz_screen"  bindtap="showPopup">筛选</view>
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+
+  <view class="option_list_max">  
+      <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>筛选</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view>
+      <view class="pzzj_screen_title">凭证类型</view>
+      <view class="option_list_min"> 
+          <van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style" column-class="time_list_style"
+          active-class="time_active_style" visible-item-count="3"/> 
+      </view>
+      <view class="pzzj_screen_title">上传时间</view>
+      <view class="pzzj_screen_time">
+        <van-row>
+          <van-col span="11">
+            <select-date bindchange="onStartDate"></select-date>
+          </van-col>
+          <van-col span="2">
+            <view class="pzzj_screen_time_bar">
+               -
+            </view>
+          </van-col>
+          <van-col span="11">
+            <select-date bindchange="onEndDate"></select-date>
+          </van-col>
+        </van-row>
+      
+      </view>
+
+
+  </view>
+</van-popup>
diff --git a/miniprogram/pages/components/pz-screen/index.wxss b/miniprogram/pages/components/pz-screen/index.wxss
new file mode 100644
index 0000000..fde3c3c
--- /dev/null
+++ b/miniprogram/pages/components/pz-screen/index.wxss
@@ -0,0 +1,104 @@
+/* pages/components/pz-screen/index.wxss */
+.option_list_max{
+  padding-bottom: 30rpx;
+}
+.pz_screen{
+  background: url("http://fileimg.makalu.cc/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx;
+  padding-left: 35rpx;
+  color: #788fd2;
+  font-size: 26rpx;
+}
+/* pages/components/deep-select/index.wxss */
+.celect_frame_max{
+  padding: 15rpx;
+  background: #2b345b;
+  border-radius: 10rpx;
+}
+.celect_frame_min{
+  padding:0 40rpx 0 5rpx;
+  overflow: hidden;
+  white-space:nowrap;
+  text-overflow:ellipsis;
+  background: url("http://fileimg.makalu.cc/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx;
+}
+.celect_frame_min.active{
+  color: #7a8ac9;
+}
+.popup_style{
+  background: #232a44 !important;
+}
+
+.option_list_title{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx;
+
+}
+.option_list_title_btn{
+  color: #1989fa;
+  font-size: 30rpx;
+}
+.option_list_min{
+  padding: 20rpx;
+}
+.option_list_con{
+  min-height: 160rpx;
+  max-height: 240rpx;
+  overflow: auto;
+}
+.option_list_con view{
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+  color: #7d94d7;
+}
+.option_list_con .active{
+  background: #273051;
+  color: #ffffff;
+}
+.pzzj_screen_title{
+  padding: 30rpx 50rpx;
+  font-size: 30rpx;
+}
+.pzzj_screen_time{
+  padding: 30rpx;
+}
+
+.time_select_style{
+  background: none !important;
+}
+
+.time_active_style{
+  color: #ffffff !important;
+}
+.time_list_style{
+  background: none !important;
+  color: #546696 !important;
+}
+.pzzj_screen_time_bar{
+  margin-top: 44px;
+  text-align: center;
+  height: 44px;
+  line-height: 44px;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/select-btn/index.js b/miniprogram/pages/components/select-btn/index.js
new file mode 100644
index 0000000..08a8a8d
--- /dev/null
+++ b/miniprogram/pages/components/select-btn/index.js
@@ -0,0 +1,28 @@
+// pages/components/select-btn/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    navBtn:1,
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onSelectBtn(e){
+      this.setData({
+        navBtn:e.currentTarget.dataset.index
+      })
+      this.triggerEvent('change',e.currentTarget.dataset.index)
+    }
+  }
+})
diff --git a/miniprogram/pages/components/select-btn/index.json b/miniprogram/pages/components/select-btn/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/select-btn/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/select-btn/index.wxml b/miniprogram/pages/components/select-btn/index.wxml
new file mode 100644
index 0000000..7034b64
--- /dev/null
+++ b/miniprogram/pages/components/select-btn/index.wxml
@@ -0,0 +1,5 @@
+<!--pages/components/select-btn/index.wxml-->
+  <view class="select_btn">
+    <view class="{{navBtn==1?'active':''}}" data-index="1" bindtap="onSelectBtn">单次</view>
+    <view class="{{navBtn==2?'active':''}}" data-index="2" bindtap="onSelectBtn">累计</view>
+  </view> 
diff --git a/miniprogram/pages/components/select-btn/index.wxss b/miniprogram/pages/components/select-btn/index.wxss
new file mode 100644
index 0000000..1017acb
--- /dev/null
+++ b/miniprogram/pages/components/select-btn/index.wxss
@@ -0,0 +1,36 @@
+/* pages/components/select-btn/index.wxss */
+
+.select_btn{
+  display: flex;
+  align-items: center;
+  font-size: 26rpx;
+  color:#737478;
+}
+.select_btn view{
+  background: #262d4a;
+  padding: 12rpx 30rpx;
+}
+.select_btn view:first-child{
+  border-radius: 50rpx 0 0 50rpx;
+}
+.select_btn view:last-child{
+  border-radius:0 50rpx 50rpx 0;
+}
+.select_btn .active{
+  color: #88a3ea;
+  background: #2e355f;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/select-date/index.js b/miniprogram/pages/components/select-date/index.js
new file mode 100644
index 0000000..a877d93
--- /dev/null
+++ b/miniprogram/pages/components/select-date/index.js
@@ -0,0 +1,62 @@
+// pages/components/select-date/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    counts:{
+      type:Number
+    },
+    maxDate:{
+      type:Number,
+      value:new Date().getTime()
+    },
+    currentDate:{
+      type:Number,
+      value:new Date().getTime()
+    }
+  },
+
+  observers: {
+    counts: function (val) {
+      if(val){
+        this.setData({
+          count: val
+        });
+      }
+    },
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    minDate: new Date(2022,1,1).getTime(),
+    count:3,
+    formatter(type, value) {
+      if (type === 'year') {
+        return `${value}`;
+      }
+      if (type === 'month') {
+        return `${value}`;
+      }
+      return value;
+    },
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onInput(event) {
+      this.setData({
+        currentDate: event.detail,
+      });
+      let date = new Date(event.detail)
+      let Y = date.getFullYear() 
+      let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) 
+      let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ''
+      var lot = Y + '-' + M + '-' + D
+      this.triggerEvent('change',lot)
+    },
+  }
+})
diff --git a/miniprogram/pages/components/select-date/index.json b/miniprogram/pages/components/select-date/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/select-date/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/select-date/index.wxml b/miniprogram/pages/components/select-date/index.wxml
new file mode 100644
index 0000000..1f56c14
--- /dev/null
+++ b/miniprogram/pages/components/select-date/index.wxml
@@ -0,0 +1,18 @@
+<!--pages/components/select-date/index.wxml-->
+
+<van-datetime-picker
+  type="date"
+  show-toolbar="{{fales}}"
+  value="{{ currentDate }}"
+  bind:input="onInput"
+  min-date="{{ minDate }}"
+  max-date="{{ maxDate }}"
+  formatter="{{ formatter }}"
+  visible-item-count="{{count}}"
+  custom-class="time_select_style" 
+  column-class="time_list_style"
+  active-class="time_active_style"
+/>
+
+
+
diff --git a/miniprogram/pages/components/select-date/index.wxss b/miniprogram/pages/components/select-date/index.wxss
new file mode 100644
index 0000000..49054a8
--- /dev/null
+++ b/miniprogram/pages/components/select-date/index.wxss
@@ -0,0 +1,13 @@
+/* pages/components/select-date/index.wxss */
+
+  .time_select_style{
+    background: none !important;
+  }
+  
+  .time_active_style{
+    color: #ffffff !important;
+  }
+  .time_list_style{
+    background: none !important;
+    color: #546696 !important;
+  }
\ No newline at end of file
diff --git a/miniprogram/pages/components/sign/sign.js b/miniprogram/pages/components/sign/sign.js
new file mode 100644
index 0000000..7b58f18
--- /dev/null
+++ b/miniprogram/pages/components/sign/sign.js
@@ -0,0 +1,205 @@
+
+Component({
+  behaviors: ["wx://form-field"], //,"wx://form-field-group"
+  /**
+   * 组件的对外属性
+   */
+  properties: {
+    show: {
+      type: Boolean,
+      value: false,
+    },
+    canvasId:{
+      type:String,
+      value:"mkl_canvas"
+    },
+    imageUrl:{
+      value:"",
+      type: String
+    }
+  },
+  observers:{
+    imageUrl(val){
+      if(val.length <= 0){
+        this.cleardraw()
+        this.setData({
+          showimg:true
+        })
+      }
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    signShow:false,
+    context : null,// 使用 wx.createContext 获取绘图上下文
+    isButtonDown : false,
+    arrx : [],
+    arry : [],
+    arrz : [],
+    canvasw : 0,
+    canvash : 0,
+    showimg:true,
+    height:'',
+    btnHeight:'',
+    type:0
+  },
+  /**
+   * 组件的方法列表
+   */
+  ready: function () {
+    let properties = this.properties;
+    let that = this;
+    setTimeout(function(){
+      if(properties.imageUrl){
+        that.setData({
+          showimg: false,
+          type:1,
+          imageUrl:properties.imageUrl
+        })
+      }else{
+        that.setData({
+          type:0
+        })
+      }
+    },400);
+  
+    this.init()  
+  },
+  methods: {
+      init(){
+        let that = this;
+        wx.getSystemInfo({
+          success: function(res){
+            that.setData({
+              height:(res.windowHeight-150)+"px",
+              btnHeight:(res.windowHeight-150) / 3+"px"
+            })
+          }
+        })
+        //获取系统信息
+        wx.getSystemInfo({
+         success: function (res) {
+           const {canvasId} = that.properties;
+           // 使用 wx.createContext 获取绘图上下文 context
+           let context = wx.createCanvasContext(canvasId,that);
+           context.beginPath()
+           context.setStrokeStyle('#000000');
+           context.setLineWidth(4);
+           context.setLineCap('round');
+           context.setLineJoin('round');
+           that.setData({
+            context:context,
+            canvasw :res.windowWidth,//设备宽度
+            canvash : res.windowHeight, //设备高度
+          });
+         }
+        });
+        
+       
+      },
+      canvasIdErrorCallback: function (e) {
+        console.error(e.detail.errMsg)
+       },
+       //绘制开始
+       canvasStart: function (event) {
+         let {arrz,arrx,arry}= this.data;
+         arrz.push(0);
+         arrx.push(event.changedTouches[0].x);
+        arry.push(event.changedTouches[0].y);
+        this.setData({
+          isButtonDown : true,
+          arrz,arrx,arry
+        })
+       },
+       //绘制过程
+       canvasMove: function (event) {
+         let {arrz,arrx,arry,isButtonDown,context,canvasw,canvash}= this.data;
+        if (isButtonDown) {
+         arrz.push(1);
+         arrx.push(event.changedTouches[0].x);
+         arry.push(event.changedTouches[0].y);
+        };
+        for (var i = 0; i < arrx.length; i++) {
+         if (arrz[i] == 0) {
+          context.moveTo(arrx[i], arry[i])
+         } else {
+          context.lineTo(arrx[i], arry[i])
+         };
+        };
+        context.clearRect(0, 0, canvasw, canvash);
+       
+        context.setStrokeStyle('#000000');
+        context.setLineWidth(4);
+        context.setLineCap('round');
+        context.setLineJoin('round');
+        context.stroke();
+       
+        context.draw(false);
+        this.setData({
+          arrz,arrx,arry,context,canvasw,canvash
+        })
+       },
+       canvasEnd: function (event) {
+        this.setData({
+          isButtonDown : false
+        })
+       },
+       cleardraw: function () {
+        let {arrz,arrx,arry,context,canvasw,canvash}= this.data;
+        //清除画布
+        arrx = [];
+        arry = [];
+        arrz = [];
+        if(context != null){
+          context.clearRect(0, 0, canvasw, canvash);
+          context.draw(true);
+          this.setData({
+            arrz,arrx,arry,context,canvasw,canvash
+          })
+        }
+        
+       },
+       //导出图片
+       getimg: function () {
+        this.triggerEvent("addto",true);
+         let {arrx}= this.data;
+        if (arrx.length == 0) {
+         wx.showModal({
+          title: '提示',
+          content: '签名内容不能为空！',
+          showCancel: false
+         });
+         return false;
+        };
+        const {canvasId} = this.properties;
+        //生成图片
+        let that = this;
+        wx.canvasToTempFilePath({
+         canvasId: canvasId,
+         success: function (res) {
+           that.setData({
+            imageUrl:res.tempFilePath,
+            signShow:false,
+            showimg:false,
+            type:0
+           })
+           that.triggerEvent("returnData",res.tempFilePath);
+         }
+        },this)
+       },
+       showSign:function(){
+        this.triggerEvent("addto",false);
+         this.setData({
+          signShow:true,
+         })
+       },
+       onClose:function(){
+        this.triggerEvent("addto",true);
+        this.setData({
+          signShow:false,
+         })
+       }
+  },
+});
\ No newline at end of file
diff --git a/miniprogram/pages/components/sign/sign.json b/miniprogram/pages/components/sign/sign.json
new file mode 100644
index 0000000..310aa4b
--- /dev/null
+++ b/miniprogram/pages/components/sign/sign.json
@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col"
+  }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/sign/sign.wxml b/miniprogram/pages/components/sign/sign.wxml
new file mode 100644
index 0000000..5e818ec
--- /dev/null
+++ b/miniprogram/pages/components/sign/sign.wxml
@@ -0,0 +1,65 @@
+<!--pages/qianming/qianming.wxml-->
+
+<view class="sign_div">
+  <view class="sign_div_min" style="font-size:34rpx;font-family: UICTFontTextStyleBody;color:#6777aa;background: #212737;line-height: 40rpx;" bindtap="showSign" >
+    <text wx:if="{{showimg}}" >点击签名</text>
+    <view wx:if="{{type==0}}">
+      <image style="margin-left: 60rpx;margin-top: 5rpx;filter: invert(100%)" wx:if="{{!showimg}}" src="{{imageUrl}}" class="qm_img" ></image>
+    </view>
+    
+    <view wx:if="{{type==1}}"> 
+      <image style="margin-left: 60rpx;margin-top: 5rpx;filter: invert(100%)" wx:if="{{!showimg}}" src="{{imageUrl}}" class="qm_img_no" ></image>
+    </view>
+  
+  </view>
+</view>
+
+<van-popup show="{{ signShow }}" position="bottom" custom-style="height:100%;" bind:close="onClose" >
+<view class="popup_view">
+  <van-row>
+    <van-col span="6">
+      <view class="view_btn" style="height:{{btnHeight}}">
+        <view class="max_btn">
+          <view class="min_btn btn_gb" bindtap="onClose">关闭</view>
+        </view>
+      </view>
+      <view class="view_btn" style="height:{{btnHeight}}">
+        <view class="max_btn">
+          <view class="min_btn btn_qc" bindtap="cleardraw">清除</view>
+        </view>
+      </view>
+      <view class="view_btn" style="height:{{btnHeight}}">
+        <view class="max_btn">
+          <view class="min_btn btn_qd" bindtap="getimg">确定</view>
+        </view>
+      </view>
+    </van-col>
+     <van-col span="18">
+        <view class="canvas_view">
+          <canvas class="canvas" style="height:{{height}}" canvas-id="{{canvasId}}" disable-scroll="true" bindtouchstart="canvasStart" bindtouchmove="canvasMove" bindtouchend="canvasEnd" touchcancel="canvasEnd" binderror="canvasIdErrorCallback"></canvas>
+        </view>
+    </van-col>
+  </van-row>
+</view>
+  
+  
+
+  <!-- <van-row>
+    <van-col span="8">
+      <view class="sign_btn sign_btn_qc">
+        <button type="default" bindtap="onClose">关闭</button>
+      </view>
+    </van-col>
+    <van-col span="8">
+      <view class="sign_btn sign_btn_qc">
+        <button type="default" bindtap="cleardraw">清除</button>
+      </view>
+    </van-col>
+    <van-col span="8">
+      <view class="sign_btn sign_btn_qr">
+        <button type="default" bindtap="getimg">确定</button> 
+      </view>
+    </van-col>
+  </van-row> -->
+
+</van-popup>
diff --git a/miniprogram/pages/components/sign/sign.wxss b/miniprogram/pages/components/sign/sign.wxss
new file mode 100644
index 0000000..6455111
--- /dev/null
+++ b/miniprogram/pages/components/sign/sign.wxss
@@ -0,0 +1,98 @@
+/* pages/qianming/qianming.wxss */
+
+/* page{
+  overflow: hidden;
+} */
+.canvas_view{
+  padding: 20rpx;
+  border-radius: 10rpx;
+}
+
+.canvas {
+  width: 100%;
+  box-sizing: border-box;
+  background: #eeeeee;
+ }
+
+ .sign_div{
+   padding: 20rpx 0;
+   height: 170rpx;
+ }
+ .sign_div_min{
+  padding: 20rpx;
+  height: 150rpx;
+  background:#f4f4f4;
+  border-radius: 15rpx;
+  line-height: 150rpx;
+  color: #aaa;
+ }
+
+ .sign_btn {
+   text-align: center;
+ }
+ .sign_btn button{
+   width: 150rpx;
+   height: 60rpx;
+   line-height: 60rpx;
+   font-size: 30rpx;
+   color: #ffffff;
+ }
+ .sign_btn_qc button{
+   background:#ffbd02;
+ }
+ .sign_btn_qr button{
+   background:#1397fc;
+ }
+
+ .popup_view{
+   padding-top: 164rpx;
+ }
+ .view_btn{
+  border: 1px solid #fff;
+ }
+ .max_btn{
+    width: 180rpx;
+    height: 180rpx;
+    margin-top: 150rpx;
+ }
+ .min_btn{
+   width: 180rpx;
+   height: 70rpx;
+   border-radius: 10rpx;
+   text-align: center;
+   line-height: 70rpx;
+   margin-top: 55rpx;
+   transform: rotate(90deg); 
+   color: #ffffff;
+ }
+ .btn_qd{
+   background:#3a9bfc ;
+ }
+ .btn_qc{
+   background: #f9ba00;
+ }
+ .btn_gb{
+  background: #ff7800;
+}
+.popup_fixed{
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  height: 0;
+  background: #ffffff;
+}
+.qm_img{
+  height: 300rpx;
+  width: 150rpx;
+  position: relative;
+  top: -75rpx;
+  transform: rotate(270deg); 
+}
+
+.qm_img_no{
+  height: 150rpx;
+  width: 280rpx;
+  position: relative;
+
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/voucher-date-copy/index.js b/miniprogram/pages/components/voucher-date-copy/index.js
new file mode 100644
index 0000000..a7c41ea
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date-copy/index.js
@@ -0,0 +1,133 @@
+// pages/components/voucher-select/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    width:{
+      type:String
+    },
+    counts:{
+      type:Number
+    },
+    placeholder:{
+      type:String
+    },
+    time:{
+      type:String
+    },
+    maxDate:{
+      type:Number,
+      value:new Date().getTime()
+    },
+    value:{
+      type:String,
+      value:''
+    },
+    currentDate:{
+      type:Number
+    }
+  },
+  /**数据监听 */
+  observers: {
+    counts: function (val) {
+      this.setData({
+        item:val[0],
+      })
+    },
+    time:function(val){
+      var that = this
+      that.setData({
+        value:val,
+        // date:val
+      })
+      // that.onConfirm()
+    }
+  },
+  lifetimes: {
+    created: function(){
+      //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show: false,
+    date:'',
+    minDate: new Date(2022,1,1).getTime(),
+    counts:'5',
+    formatter(type, value) {
+      if (type === 'year') {
+        return `${value}`;
+      }
+      if (type === 'month') {
+        return `${value}`;
+      }
+      return value;
+    },
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+        this.setData({
+          show: true
+        });
+      },
+      onClose() {
+        this.setData({
+          show: false
+        });
+      },
+      onConfirm() {
+        this.setData({
+          value: this.data.date
+        })
+        
+        this.triggerEvent('change', this.data.date)
+        this.setData({
+          show: false
+        });
+      },
+      formatter(type, value) {
+        if (type === 'year') {
+          return `${value}`;
+        }
+        if (type === 'month') {
+          return `${value}`;
+        }
+        return value;
+      },
+        /**
+     * 组件的方法列表
+    */
+      onInput(event) { 
+        let date = new Date(event.detail)
+        let Y = date.getFullYear()
+        let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1)
+        let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ''
+        var lot = Y + '-' + M + '-' + D
+         this.setData({
+          date: lot,
+        });
+      },
+    
+  },
+  
+
+})
diff --git a/miniprogram/pages/components/voucher-date-copy/index.json b/miniprogram/pages/components/voucher-date-copy/index.json
new file mode 100644
index 0000000..1eb1558
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date-copy/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-datetime-picker": "@vant/weapp/datetime-picker/index"
+  }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/voucher-date-copy/index.wxml b/miniprogram/pages/components/voucher-date-copy/index.wxml
new file mode 100644
index 0000000..65501ac
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date-copy/index.wxml
@@ -0,0 +1,68 @@
+<!--pages/components/voucher-select/index.wxml-->
+
+<view class="voucher_select_max" bindtap="showPopup" style="width: {{width}};">
+    <view class="voucher_select_min">
+        <input class="celect_frame_min" placeholder="{{placeholder}}" placeholder-style="color:#6777aa;" value="{{value}}" disabled="true"/>
+    </view>
+    <view class="voucher_select_icon">
+        <image src="http://fileimg.makalu.cc/WEB_E14B3F0F513E48A48BA6EE46A39C21C1.png"></image>
+    </view>
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>{{placeholder}}</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view> 
+
+      <van-datetime-picker
+        type="date"
+        show-toolbar="{{fales}}"
+        value="{{ currentDate }}"
+        bind:input="onInput"
+        min-date="{{ minDate }}"
+        max-date="{{ maxDate }}"
+        formatter="{{ formatter }}"
+        visible-item-count="{{counts}}"
+        custom-class="time_select_style" 
+        column-class="time_list_style"
+        active-class="time_active_style"
+    />
+      <!-- <select-date-copy bindchange="onChangeDate" maxDate="{{maxDate}}" currentDate="{{newCurrentDate}}" counts="{{counts}}"></select-date-copy> -->
+</van-popup>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-date-copy/index.wxss b/miniprogram/pages/components/voucher-date-copy/index.wxss
new file mode 100644
index 0000000..0a6d8ec
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date-copy/index.wxss
@@ -0,0 +1,68 @@
+/* pages/components/voucher-select/index.wxss */
+
+.voucher_select_max{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 90rpx;
+    border-radius: 10rpx;
+}
+
+.voucher_select_min{
+    width: calc(100% - 30rpx);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.voucher_select_icon{
+    width: 30rpx;
+    height: 30rpx;
+}
+.voucher_select_icon image{
+    width: 100%;
+    height: 100%;
+}
+
+
+.option_list_title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    color: #06d4f8;
+  }
+  .option_list_title_btn{
+    color: #1989fa;
+    font-size: 30rpx;
+  }
+
+.popup_style{
+    background: #232a44 !important;
+  }
+.time_select_style{
+    background: none !important;
+}
+
+.time_active_style{
+    color: #ffffff !important;
+}
+.time_list_style{
+    background: none !important;
+    color: #546696 !important;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-date/index.js b/miniprogram/pages/components/voucher-date/index.js
new file mode 100644
index 0000000..613bf83
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date/index.js
@@ -0,0 +1,92 @@
+// pages/components/voucher-select/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    width:{
+      type:String
+    },
+    counts:{
+      type:Number
+    },
+    placeholder:{
+      type:String
+    },
+    time:{
+      type:String
+    },
+    maxDate:{
+      type:Number,
+      value:new Date().getTime()
+    },
+    value:{
+      type:String,
+      value:''
+    },
+    currentDate:{
+      type:Number,
+      value:new Date().getTime()
+    }
+  },
+  /**数据监听 */
+  observers: {
+    counts: function (val) {
+      this.setData({
+        item:val[0],
+      })
+    },
+    time:function(val){
+      this.setData({
+        value:val
+      })
+    }
+  },
+  lifetimes: {
+    created: function(){
+      //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    show: false,
+    date:''
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+      this.setData({ show: true });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    onChangeDate(e){
+        this.setData({
+          date:e.detail
+        })
+    },
+    onConfirm(){
+      this.setData({
+        value:this.data.date
+      })
+      this.triggerEvent('change',this.data.date)
+      this.setData({ show: false });
+    }
+  }
+})
diff --git a/miniprogram/pages/components/voucher-date/index.json b/miniprogram/pages/components/voucher-date/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/voucher-date/index.wxml b/miniprogram/pages/components/voucher-date/index.wxml
new file mode 100644
index 0000000..c98e71d
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date/index.wxml
@@ -0,0 +1,54 @@
+<!--pages/components/voucher-select/index.wxml-->
+
+<view class="voucher_select_max" bindtap="showPopup" style="width: {{width}};">
+    <view class="voucher_select_min">
+        <input class="celect_frame_min" placeholder="{{placeholder}}" placeholder-style="color:#6777aa;" value="{{value}}" disabled="true"/>
+    </view>
+    <view class="voucher_select_icon">
+        <image src="http://fileimg.makalu.cc/WEB_E14B3F0F513E48A48BA6EE46A39C21C1.png"></image>
+    </view>
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>{{placeholder}}</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view> 
+      <select-date bindchange="onChangeDate" maxDate="{{maxDate}}" currentDate="{{currentDate}}" counts="{{counts}}"></select-date>
+</van-popup>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-date/index.wxss b/miniprogram/pages/components/voucher-date/index.wxss
new file mode 100644
index 0000000..0a6d8ec
--- /dev/null
+++ b/miniprogram/pages/components/voucher-date/index.wxss
@@ -0,0 +1,68 @@
+/* pages/components/voucher-select/index.wxss */
+
+.voucher_select_max{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 90rpx;
+    border-radius: 10rpx;
+}
+
+.voucher_select_min{
+    width: calc(100% - 30rpx);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.voucher_select_icon{
+    width: 30rpx;
+    height: 30rpx;
+}
+.voucher_select_icon image{
+    width: 100%;
+    height: 100%;
+}
+
+
+.option_list_title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    color: #06d4f8;
+  }
+  .option_list_title_btn{
+    color: #1989fa;
+    font-size: 30rpx;
+  }
+
+.popup_style{
+    background: #232a44 !important;
+  }
+.time_select_style{
+    background: none !important;
+}
+
+.time_active_style{
+    color: #ffffff !important;
+}
+.time_list_style{
+    background: none !important;
+    color: #546696 !important;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-many-select/index.js b/miniprogram/pages/components/voucher-many-select/index.js
new file mode 100644
index 0000000..1de9df5
--- /dev/null
+++ b/miniprogram/pages/components/voucher-many-select/index.js
@@ -0,0 +1,83 @@
+// pages/components/voucher-select/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+    placeholder:{
+      type:String
+    },
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      let arrData = val.filter(x => x.type == true);
+      this.setData({
+        forData:val,
+        echoData:arrData
+      })
+    },
+  },
+  lifetimes: {
+    created: function(){
+      //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+    show: false,
+    forData:[],
+    echoData:[],
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+      this.setData({ show: true });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    onSelectChange(e){
+      var data = this.data.forData
+      var index = e.currentTarget.dataset.index
+      if(data[index].type == false){
+        data[index].type = true
+      }else{
+        data[index].type = false
+      }
+      this.setData({
+        forData:data
+      })
+    },
+
+    onConfirm(){
+      var data = this.data.forData
+      let arrData = data.filter(x => x.type == true);
+      this.setData({
+        echoData:arrData
+      })
+      this.triggerEvent('change',arrData)
+      this.setData({ show: false });
+    }
+  }
+})
diff --git a/miniprogram/pages/components/voucher-many-select/index.json b/miniprogram/pages/components/voucher-many-select/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/voucher-many-select/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/voucher-many-select/index.wxml b/miniprogram/pages/components/voucher-many-select/index.wxml
new file mode 100644
index 0000000..a228d82
--- /dev/null
+++ b/miniprogram/pages/components/voucher-many-select/index.wxml
@@ -0,0 +1,60 @@
+<!--pages/components/voucher-select/index.wxml-->
+
+<view class="voucher_select_max" bindtap="showPopup">
+    <view class="voucher_select_min">
+        <view class="voucher_select_placeholder" wx:if="{{echoData.length == 0}}">{{placeholder}}</view>
+        <view wx:if="{{echoData.length > 0}}">
+            <view class="voucher_select_for" wx:for="{{echoData}}" wx:key="index">{{item.text}}</view>
+        </view>
+    </view>
+    <view class="voucher_select_icon">
+        <image src="http://fileimg.makalu.cc/WEB_F1B4B95FFE95463593A401824DF8E0BB.png"></image>
+    </view>
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+        <view class="option_list_title_btn" bindtap="onClose">取消</view>
+        <view>{{placeholder}}</view>
+        <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+    </view> 
+    <view class="option_list_max">
+        <view class="{{item.type?'option_list_list active':'option_list_list'}}" wx:for="{{forData}}" wx:key="index" bindtap="onSelectChange" 
+        data-index="{{index}}">{{item.text}}</view>
+    </view>
+</van-popup>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-many-select/index.wxss b/miniprogram/pages/components/voucher-many-select/index.wxss
new file mode 100644
index 0000000..43f2c90
--- /dev/null
+++ b/miniprogram/pages/components/voucher-many-select/index.wxss
@@ -0,0 +1,102 @@
+/* pages/components/voucher-select/index.wxss */
+
+.voucher_select_max{
+    padding:5rpx 25rpx;
+    display: flex;
+    background: #212737;
+    position: relative;
+    border-radius: 10rpx;
+}
+
+.voucher_select_min{
+    width: calc(100% - 30rpx);
+    
+}
+.voucher_select_for{
+    height: 80rpx;
+    line-height: 80rpx;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+}
+
+.voucher_select_icon{
+    width: 30rpx;
+    height: 30rpx;
+    position: relative;
+    top: 25rpx;
+}
+.voucher_select_icon image{
+    width: 100%;
+    height: 100%;
+}
+
+.voucher_select_placeholder{
+    color: #6777aa;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+.option_list_max{
+    height: 450rpx;
+    overflow: auto;
+}
+.option_list_list{
+    height: 90rpx;
+    text-align: center;
+    color: #546696;
+    line-height: 90rpx;
+}
+.option_list_list.active{
+    color: #ffffff;
+}
+
+
+
+
+
+
+
+
+
+.option_list_title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    color: #06d4f8;
+  }
+  .option_list_title_btn{
+    color: #1989fa;
+    font-size: 30rpx;
+  }
+
+.popup_style{
+    background: #232a44 !important;
+  }
+.time_select_style{
+    background: none !important;
+}
+
+.time_active_style{
+    color: #ffffff !important;
+}
+.time_list_style{
+    background: none !important;
+    color: #546696 !important;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-select/index.js b/miniprogram/pages/components/voucher-select/index.js
new file mode 100644
index 0000000..40880dc
--- /dev/null
+++ b/miniprogram/pages/components/voucher-select/index.js
@@ -0,0 +1,103 @@
+// pages/components/voucher-select/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+    placeholder:{
+      type:String
+    },
+    selectValue:{
+      type:String
+    },
+    selectIndex:{
+      type:String
+    },
+    background:{
+      type:String
+    },
+    value:{
+      type:String,
+      value:""
+    }
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      if(val.length > 0) {
+        this.setData({
+          item:val[0],
+          value:val[0].text
+        })
+      } else {
+        this.setData({
+          item:[],
+          value:''
+        })
+      }
+    },
+    selectValue:function(val){
+      this.setData({
+        value:val
+      })
+    },
+    selectIndex:function(val){
+      this.setData({
+        index:val
+      })
+    }
+  },
+  lifetimes: {
+    created: function(){
+      //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+    show: false,
+    item:'',
+    index:''
+    
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+      this.setData({ show: true });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    onSelectChange(e){
+      this.setData({
+        item:e.detail.value
+      })
+    },
+    onConfirm(){
+      this.setData({
+        value:this.data.item.text
+      })
+      this.triggerEvent('change',this.data.item)
+      this.setData({ show: false });
+    }
+  }
+})
diff --git a/miniprogram/pages/components/voucher-select/index.json b/miniprogram/pages/components/voucher-select/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/voucher-select/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/voucher-select/index.wxml b/miniprogram/pages/components/voucher-select/index.wxml
new file mode 100644
index 0000000..04f0c01
--- /dev/null
+++ b/miniprogram/pages/components/voucher-select/index.wxml
@@ -0,0 +1,55 @@
+<!--pages/components/voucher-select/index.wxml-->
+
+<view class="voucher_select_max" bindtap="showPopup"   style="background-color: {{background}};">
+    <view class="voucher_select_min" >
+        <input class="celect_frame_min" placeholder="{{placeholder}}" placeholder-style="color:#6777aa;" value="{{value}}" disabled="true"/>
+    </view>
+    <view class="voucher_select_icon">
+        <image src="http://fileimg.makalu.cc/WEB_F1B4B95FFE95463593A401824DF8E0BB.png"></image>
+    </view>
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>{{placeholder}}</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view> 
+    <van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style"  default-index="{{index}}"
+    column-class="time_list_style" active-class="time_active_style" toolbar-class="toolbar_style" visible-item-count="5" /> 
+</van-popup>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-select/index.wxss b/miniprogram/pages/components/voucher-select/index.wxss
new file mode 100644
index 0000000..0a6d8ec
--- /dev/null
+++ b/miniprogram/pages/components/voucher-select/index.wxss
@@ -0,0 +1,68 @@
+/* pages/components/voucher-select/index.wxss */
+
+.voucher_select_max{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 90rpx;
+    border-radius: 10rpx;
+}
+
+.voucher_select_min{
+    width: calc(100% - 30rpx);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.voucher_select_icon{
+    width: 30rpx;
+    height: 30rpx;
+}
+.voucher_select_icon image{
+    width: 100%;
+    height: 100%;
+}
+
+
+.option_list_title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    color: #06d4f8;
+  }
+  .option_list_title_btn{
+    color: #1989fa;
+    font-size: 30rpx;
+  }
+
+.popup_style{
+    background: #232a44 !important;
+  }
+.time_select_style{
+    background: none !important;
+}
+
+.time_active_style{
+    color: #ffffff !important;
+}
+.time_list_style{
+    background: none !important;
+    color: #546696 !important;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-selected/index.js b/miniprogram/pages/components/voucher-selected/index.js
new file mode 100644
index 0000000..f543c38
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selected/index.js
@@ -0,0 +1,92 @@
+// pages/components/voucher-select/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+    placeholder:{
+      type:String
+    },
+    selectValue:{
+      type:String
+    },
+    selectIndex:{
+      type:String
+    },
+    background:{
+      type:String
+    }
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      this.setData({
+        item:val[0],
+      })
+    },
+    selectValue:function(val){
+      this.setData({
+        value:val
+      })
+    },
+    selectIndex:function(val){
+      this.setData({
+        index:val
+      })
+    }
+  },
+  lifetimes: {
+    created: function(){
+      //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+    show: false,
+    value:'',
+    item:'',
+    index:''
+    
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+      this.setData({ show: true });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    onSelectChange(e){
+      this.setData({
+        item:e.detail.value
+      })
+    },
+    onConfirm(){
+      this.setData({
+        value:this.data.item.text
+      })
+      this.triggerEvent('change',this.data.item)
+      this.setData({ show: false });
+    }
+  }
+})
diff --git a/miniprogram/pages/components/voucher-selected/index.json b/miniprogram/pages/components/voucher-selected/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selected/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/voucher-selected/index.wxml b/miniprogram/pages/components/voucher-selected/index.wxml
new file mode 100644
index 0000000..5ac2153
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selected/index.wxml
@@ -0,0 +1,56 @@
+<!--pages/components/voucher-select/index.wxml-->
+
+<view class="voucher_select_max" bindtap="showPopup" style="border-radius: 40rpx;background-color: {{background}};">
+    <view class="voucher_select_icon">
+        <image src="http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png"></image>
+    </view>
+    <view class="voucher_select_min">
+        <input class="celect_frame_min" placeholder="{{placeholder}}" placeholder-style="color:#fff;" value="{{value}}" disabled="true"/>
+    </view>
+  
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>{{placeholder}}</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view> 
+    <van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style"  default-index="{{index}}"
+    column-class="time_list_style" active-class="time_active_style" toolbar-class="toolbar_style" visible-item-count="5" /> 
+</van-popup>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-selected/index.wxss b/miniprogram/pages/components/voucher-selected/index.wxss
new file mode 100644
index 0000000..291c4d0
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selected/index.wxss
@@ -0,0 +1,69 @@
+/* pages/components/voucher-select/index.wxss */
+
+.voucher_select_max{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 90rpx;
+    border-radius: 10rpx;
+}
+
+.voucher_select_min{
+    width: calc(100% - 30rpx);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.voucher_select_icon{
+    width: 42rpx;
+    height: 42rpx;
+    margin:0 10rpx;
+}
+.voucher_select_icon image{
+    width: 100%;
+    height: 100%;
+}
+
+
+.option_list_title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    color: #06d4f8;
+  }
+  .option_list_title_btn{
+    color: #1989fa;
+    font-size: 30rpx;
+  }
+
+.popup_style{
+    background: #232a44 !important;
+  }
+.time_select_style{
+    background: none !important;
+}
+
+.time_active_style{
+    color: #ffffff !important;
+}
+.time_list_style{
+    background: none !important;
+    color: #546696 !important;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-selects/index.js b/miniprogram/pages/components/voucher-selects/index.js
new file mode 100644
index 0000000..0d372db
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selects/index.js
@@ -0,0 +1,95 @@
+// pages/components/voucher-select/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    columns:{
+      type:Array
+    },
+    placeholder:{
+      type:String
+    },
+    selectValue:{
+      type:String
+    },
+    selectIndex:{
+      type:String
+    },
+    background:{
+      type:String
+    },
+    height:{
+      type:String
+    }
+  },
+  /**数据监听 */
+  observers: {
+    columns: function (val) {
+      this.setData({
+        item:val[0],
+      })
+    },
+    selectValue:function(val){
+      this.setData({
+        value:val
+      })
+    },
+    selectIndex:function(val){
+      this.setData({
+        index:val
+      })
+    }
+  },
+  lifetimes: {
+    created: function(){
+      //在组件实例刚刚被创建时执行，注意此时不能调用 setData
+    },
+    attached: function () {
+        //在组件实例进入页面节点树时执行
+    },
+    ready: function () {
+        // 在组件在视图层布局完成后执行
+    },
+    detached: function () {
+        // 在组件实例被从页面节点树移除时执行
+    },
+    
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+    show: false,
+    value:'',
+    item:'',
+    index:''
+    
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    showPopup() {
+      this.setData({ show: true });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    onSelectChange(e){
+      this.setData({
+        item:e.detail.value
+      })
+    },
+    onConfirm(){
+      this.setData({
+        value:this.data.item.text
+      })
+      this.triggerEvent('change',this.data.item)
+      this.setData({ show: false });
+    }
+  }
+})
diff --git a/miniprogram/pages/components/voucher-selects/index.json b/miniprogram/pages/components/voucher-selects/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selects/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/components/voucher-selects/index.wxml b/miniprogram/pages/components/voucher-selects/index.wxml
new file mode 100644
index 0000000..13a2952
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selects/index.wxml
@@ -0,0 +1,55 @@
+<!--pages/components/voucher-select/index.wxml-->
+
+<view class="voucher_select_max" bindtap="showPopup"   style="background-color: {{background}};height: {{height}};">
+    <view class="voucher_select_min" >
+        <input class="celect_frame_min" placeholder="{{placeholder}}" placeholder-style="color:#6777aa;" value="{{value}}" disabled="true"/>
+    </view>
+    <view class="voucher_select_icon">
+        <image src="http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png"></image>
+    </view>
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
+    <view class="option_list_title">
+          <view class="option_list_title_btn" bindtap="onClose">取消</view>
+          <view>{{placeholder}}</view>
+          <view class="option_list_title_btn" bindtap="onConfirm">确认</view>
+      </view> 
+    <van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style"  default-index="{{index}}"
+    column-class="time_list_style" active-class="time_active_style" toolbar-class="toolbar_style" visible-item-count="5" /> 
+</van-popup>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/components/voucher-selects/index.wxss b/miniprogram/pages/components/voucher-selects/index.wxss
new file mode 100644
index 0000000..0a6d8ec
--- /dev/null
+++ b/miniprogram/pages/components/voucher-selects/index.wxss
@@ -0,0 +1,68 @@
+/* pages/components/voucher-select/index.wxss */
+
+.voucher_select_max{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 90rpx;
+    border-radius: 10rpx;
+}
+
+.voucher_select_min{
+    width: calc(100% - 30rpx);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.voucher_select_icon{
+    width: 30rpx;
+    height: 30rpx;
+}
+.voucher_select_icon image{
+    width: 100%;
+    height: 100%;
+}
+
+
+.option_list_title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx;
+    color: #06d4f8;
+  }
+  .option_list_title_btn{
+    color: #1989fa;
+    font-size: 30rpx;
+  }
+
+.popup_style{
+    background: #232a44 !important;
+  }
+.time_select_style{
+    background: none !important;
+}
+
+.time_active_style{
+    color: #ffffff !important;
+}
+.time_list_style{
+    background: none !important;
+    color: #546696 !important;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/construction-details/index.js b/miniprogram/pages/construction-details/index.js
new file mode 100644
index 0000000..0242ea3
--- /dev/null
+++ b/miniprogram/pages/construction-details/index.js
@@ -0,0 +1,135 @@
+// pages/construction-details/index.js
+// pages/construction/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        buildList: [],
+        floorList: [],
+        initData: [],
+        projectData: {},
+        buildingNum:'',
+        floorNum:'',
+        chosen:'',
+        loadShow:false,
+        id:'',//当前施工日志ID
+        itemData:{},
+        activeState:1,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this;
+        //获取请求参数
+        that.setData({
+            id:options.id
+        })
+        //获取缓存数据
+        wx.getStorage({
+            key: 'userinfo',
+            success: function (res) {
+                that.setData({
+                    remark: res.data.remark,
+                    loginName: res.data.loginName,
+                    userName: res.data.userName,
+                    projectId: app.globalData.projectId,
+                    projectName: app.globalData.projectName,
+                    initData: {
+                        text: app.globalData.projectName,
+                        id: app.globalData.projectId
+                    }
+                })
+            }
+        }),
+        that.getConstructionLogDetail(options.id);
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    /**
+     * 根据施工日志ID查询施工日志详情
+     * @param {} id 
+     */
+    getConstructionLogDetail(id){
+        var that = this
+        wx.request({
+            url: app.globalData.szhUrl + '/api/getConstructionLogDetail',
+            method: "post",
+            data: {
+                "id":id
+            },
+            success: (res => {
+
+                that.setData({
+                    itemData:res.data
+                })
+
+                // that.setData({
+                //     loadShow: false
+                // })
+            })
+        })
+    },
+
+        /**
+     * 标签切换
+     */
+    trainingTypeJump(e){
+        this.setData({
+            activeState:e.currentTarget.dataset.index,
+        });
+    },
+    
+})
\ No newline at end of file
diff --git a/miniprogram/pages/construction-details/index.json b/miniprogram/pages/construction-details/index.json
new file mode 100644
index 0000000..ba99730
--- /dev/null
+++ b/miniprogram/pages/construction-details/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+      "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationBarTitleText": "施工日志详情"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/construction-details/index.wxml b/miniprogram/pages/construction-details/index.wxml
new file mode 100644
index 0000000..b50bfc0
--- /dev/null
+++ b/miniprogram/pages/construction-details/index.wxml
@@ -0,0 +1,756 @@
+<!--pages/construction-details/index.wxml-->
+<!-- 施工日志详情 -->
+<view class="construction">
+	<view class="construction-content" style="margin: 30rpx 0;">
+		<view class="eharts_title">
+			基础信息
+		</view>
+		<view class="rowStyle">
+			一级施工区域
+			<view class="rightStyle">
+				<input type="digit" name="mainStructure" class="inputStyle" style="width: 200px;" value="{{itemData.building_num}}" disabled="disabled"/>
+			</view>
+		</view>
+		<view class="rowStyle">
+			二级施工区域
+			<view class="rightStyle">
+				<input type="digit" name="rebarBindInWall" class="inputStyle" style="width: 200px;"  value="{{itemData.floor_num}}" disabled="disabled"/>
+			</view>
+		</view>
+		<view class="rowStyle">
+			施工日期 
+			<view class="rightStyle">
+				<input type="digit" name="fullScaffoldingFormwork" class="inputStyle" style="width: 200px;" value="{{itemData.fill_time}}" disabled="disabled"/>
+			</view>
+		</view>
+	</view>
+</view>
+
+<!-- tab栏切换 -->
+<view class="modify_video_nav" style="margin-bottom: 64rpx;width: 100%;">
+	<view class="{{activeState==1?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>地基与基础</text></view>
+	<view class="{{activeState==2?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>主体结构</text></view>
+	<view class="{{activeState==3?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>砌体结构</text></view>
+	<view class="{{activeState==4?'active':''}}" bindtap="trainingTypeJump" data-index="4"><text>装饰装修</text></view>
+	<view class="{{activeState==5?'active':''}}" bindtap="trainingTypeJump" data-index="5"><text>安装工程</text></view>
+</view>
+
+<!-- 地基与基础 -->
+<view class="construction-content" style="margin: 30rpx 0;" wx:if="{{activeState == 1}}">
+	<view class="rowStyle">
+		地基与基础工程完成至总量的
+		<view class="rightStyle">
+			<input type="text" value="{{itemData.oneData.schedule_construction_one}}" class="inputStyle" disabled="disabled"/>%
+		</view>
+	</view>
+
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		围护结构
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		1）
+		<input type="text" value="{{itemData.oneData.whz_position}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧围护桩施工当天完成 
+		<input type="text"  value="{{itemData.oneData.wh_today_finish_num}}" class="inputStyle1" disabled="disabled"/>根，累计完成
+		<input type="text"  value="{{itemData.oneData.wh_tital_finish_num}}" class="inputStyle1" disabled="disabled"/>根，（总量
+		<input type="text"  value="{{itemData.oneData.wh_tital_num}}" class="inputStyle1" disabled="disabled"/> 根）累计完成总量的
+		<input type="text"  value="{{itemData.oneData.wh_tital_finish_rate}}" class="inputStyle1" disabled="disabled"/>%
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		2）
+		<input type="text"  value="{{itemData.oneData.lxq_position}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧地下连续墙施工完成
+		<input type="text"  value="{{itemData.oneData.lxq_finish_num}}" class="inputStyle1" disabled="disabled"/>副（总量
+		<input type="text"  value="{{itemData.oneData.lxq_tital_num}}" class="inputStyle1" disabled="disabled"/>副），累计完成总量的
+		<input type="text"  value="{{itemData.oneData.lxq_tital_finish_rate}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		3）
+		<input type="text"  value="{{itemData.oneData.pmzh_position}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧喷锚支护施工完成至总量的
+		<input type="text"  value="{{itemData.oneData.pmzh_tital_finish_rate}}" class="inputStyle1" disabled="disabled"/>%
+	</view>
+
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		土方工程
+	</view>
+	<view class="rowStyle">
+		1）土方开挖完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.tfkw_tital_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		2）
+		<input type="text"  value="{{itemData.oneData.tfht_position}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧土方回填完成至总量的
+		<input type="text"  value="{{itemData.oneData.tfht_tital_finish_rate}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle">
+		3）室内土方回填完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.tfht_sn_tital_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		基坑降水
+	</view>
+	<view class="rowStyle">
+		1）降水井施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.jkjs_tital_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		桩基工程
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		1）
+		<input type="text"  value="{{itemData.oneData.zj_type1}}" class="inputStyle1" disabled="disabled"/>（灌注桩、静压桩）桩施工完成至
+		<input type="text"  value="{{itemData.oneData.zj_finish_rate}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		2）
+		<input type="text"  value="{{itemData.oneData.zj_type2}}" class="inputStyle1" disabled="disabled"/>（灌注桩、静压桩）桩施工累计完成
+		<input type="text"  value="{{itemData.oneData.zj_tital_finish_num}}" class="inputStyle1" disabled="disabled"/>根（总量
+		<input type="text"  value="{{itemData.oneData.zj_tital_num}}" class="inputStyle1" disabled="disabled"/>根），累计完成总量的
+		<input type="text"  value="{{itemData.oneData.zj_tital_finish_rate}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle">
+		3）桩间土开挖完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.zj_zjtkw_finish_tate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）破桩头累计完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.zj_pzt_tital_finish_num}}" class="inputStyle" disabled="disabled" />根
+		</view>
+	</view>
+	
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		楼筏板工程
+	</view>
+	<view class="rowStyle">
+		1）垫层完成至总量
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_dc_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）防水及防水保护层完成至总量
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_fs_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）筏板的模板施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_mb_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）筏板钢筋绑扎完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_gj_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		5）钢筋支撑架搭设完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_gjzcj_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		6）防雷接地及安装预留预埋完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_fljd_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		7）砼浇筑完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_tjz_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		8）筏板模板拆除完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.lfb_mbcc_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		地下室防水工程
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		1）
+		<input type="text"  value="{{itemData.oneData.dxsfs_wqfsc_position}}" class="inputStyle1" disabled="disabled"/>（此处选择“东、南、西、北”）侧外墙防水层施工完成至总量的
+		<input type="text"  value="{{itemData.oneData.dxsfs_wqfsc_finish_rate}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		2）
+		<input type="text"  value="{{itemData.oneData.dxsfs_wqfsbhc_position}}" class="inputStyle1" disabled="disabled"/>（此处选择“东、南、西、北”）侧外墙防水保护层施工完成至总量的
+		<input type="text"  value="{{itemData.oneData.dxsfs_wqfsbhc_finish_rate}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle">
+		3）车库顶板防水及防水保护层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.oneData.dxsfs_ckdbfs_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		±0.000以下主体结构施工
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		1）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num1}}" class="inputStyle1" disabled="disabled"/>层外围护脚手架搭设完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate1}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		2）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num2}}" class="inputStyle1" disabled="disabled"/>层墙柱钢筋绑扎完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate2}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		3）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num3}}" class="inputStyle1" disabled="disabled"/>层满堂脚手架搭设完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate3}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		4）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num4}}" class="inputStyle1" disabled="disabled"/>层顶板梁板模板安装完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate4}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		5）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num5}}" class="inputStyle1" disabled="disabled"/>层墙柱模板安装完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate5}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		6）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num6}}" class="inputStyle1" disabled="disabled"/>层顶板梁板钢筋安装完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate6}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		7）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num7}}" class="inputStyle1" disabled="disabled"/>层预制墙板吊装完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate7}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		8）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num8}}" class="inputStyle1" disabled="disabled"/>层叠合板及楼梯吊装完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate8}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		9）
+		<input type="text" value="{{itemData.oneData.ztjg_storey_num9}}" class="inputStyle1" disabled="disabled"/>层模板及支撑体系拆除完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate9}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		10）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num10}}" class="inputStyle1" disabled="disabled"/>层安装预留预埋完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate10}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		11）
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_num11}}" class="inputStyle1" disabled="disabled"/>层混凝土浇筑完成至总量的
+		<input type="text"  value="{{itemData.oneData.ztjg_storey_finish_rate11}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+
+	<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+		±0.000以下砌体结构施工
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		1）
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_num1}}" class="inputStyle1" disabled="disabled"/>层植筋完成至总量的
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_finish_rate1}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		2）
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_num2}}" class="inputStyle1" disabled="disabled"/>层砌体砌筑完成至总量的
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_finish_rate2}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		3）
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_num3}}" class="inputStyle1" disabled="disabled"/>层构造柱、圈过梁完成至总量的
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_finish_rate3}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		4）
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_num4}}" class="inputStyle1" disabled="disabled"/>层轻质隔墙安装完成至总量的
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_finish_rate4}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		5）
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_num5}}" class="inputStyle1" disabled="disabled"/>层安装预留预埋完成至总量的
+		<input type="text"  value="{{itemData.oneData.qtjg_storey_finish_rate5}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+</view>
+
+<!-- 主体结构 -->
+<view class="construction-content" style="margin: 30rpx 0;" wx:if="{{activeState == 2}}">
+
+	<view class="rowStyle">
+		主体结构施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.schedule_construction_two}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		主体结构
+	</view>
+	<view class="rowStyle">
+		1）外围护脚手架搭设完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）墙柱钢筋绑扎完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）满堂脚手架搭设完成至总量的
+		<view class="rightStyle">
+			<input type="text" value="{{itemData.twoData.finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）顶板梁板模板安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate4}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		5）墙柱模板安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate5}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		6）顶板梁板钢筋安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate6}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		7）预制墙板吊装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate7}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		8）叠合板及楼梯吊装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate8}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		9）模板及支撑体系拆除完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate9}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		10）安装预留预埋完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate10}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		11）混凝土浇筑完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.twoData.finish_rate11}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+</view>
+
+<!-- 砌体结构 -->
+<view class="construction-content" style="margin: 30rpx 0;"  wx:if="{{activeState == 3}}">
+
+	<view class="rowStyle">
+		砌体结构施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.threeData.schedule_construction_three}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		砌体结构
+	</view>
+	<view class="rowStyle">
+		1）植筋完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.threeData.finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）砌体砌筑完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.threeData.finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）构造柱、圈过梁完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.threeData.finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）轻质隔墙安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.threeData.finish_rate4}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		5）烟、气道施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.threeData.finish_rate5}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		6）安装预留预埋完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.threeData.finish_rate6}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+</view>
+
+<!-- 装饰装修 -->
+<view class="construction-content" style="margin: 30rpx 0;" wx:if="{{activeState == 4}}">
+
+	<view class="rowStyle">
+		装饰装修工程完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.schedule_construction_four}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		抹灰工程
+	</view>
+	<view class="rowStyle">
+		1）抹灰工程施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mh_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		腻子涂料工程
+	</view>
+	<view class="rowStyle">
+		1）腻子工程施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mh_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）涂料工程施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mh_finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="eharts_title">
+		地辐热工程
+	</view>
+	<view class="rowStyle">
+		1）保温层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dfr_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）地暖管施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dfr_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）混凝土保护层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dfr_finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）阀门施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dfr_finish_rate4}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		地面工程
+	</view>
+	<view class="rowStyle">
+		1）厨房/卫生间/阳台防水施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dm_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）地砖铺贴施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dm_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）水泥砂浆地面施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dm_finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		楼梯扶手及护栏工程
+	</view>
+	<view class="rowStyle">
+		1）楼梯扶手施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.ltfs_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）栏杆施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.lg_finish_rate}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		门窗工程
+	</view>
+	<view class="rowStyle">
+		1）入户门安装完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mc_num1}}" class="inputStyle" disabled="disabled" />樘
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）防火门安装完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mc_num2}}" class="inputStyle" disabled="disabled" />樘
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）窗框安装完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mc_num3}}" class="inputStyle" disabled="disabled" />樘
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）窗扇安装完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mc_num4}}" class="inputStyle" disabled="disabled" />樘
+		</view>
+	</view>
+	<view class="rowStyle">
+		5）门的五金件安装完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mc_num5}}" class="inputStyle" disabled="disabled" />樘
+		</view>
+	</view>
+	<view class="rowStyle">
+		6）窗的五金件安装完成
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.mc_num6}}" class="inputStyle" disabled="disabled" />樘
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		吊顶工程
+	</view>
+	<view class="rowStyle">
+		1）吊顶施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.dd_finish_rate}}" class="inputStyle" disabled="disabled" />樘
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		外墙工程
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		1）
+		<input type="text"  value="{{itemData.fourData.wq_position1}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧外墙外保温（含抗裂砂浆、网格布）施工完成至总量的
+		<input type="text"  value="{{itemData.fourData.wq_finish_rate1}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		2）
+		<input type="text"  value="{{itemData.fourData.wq_position2}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧腻子施工完成至总量的
+		<input type="text"  value="{{itemData.fourData.wq_finish_rate2}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		3）
+		<input type="text"  value="{{itemData.fourData.wq_position3}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧饰面层（涂料/真石漆）施工完成至总量的
+		<input type="text"  value="{{itemData.fourData.wq_finish_rate3}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+	<view class="rowStyle" style="display: inline-block;">
+		4）
+		<input type="text"  value="{{itemData.fourData.wq_position4}}" class="inputStyle1" disabled="disabled"/>（一般填写东、南、西、北）侧幕墙施工完成至总量的
+		<input type="text"  value="{{itemData.fourData.wq_finish_rate4}}" class="inputStyle1" disabled="disabled"/>%；
+	</view>
+
+
+	<view class="eharts_title">
+		屋面工程
+	</view>
+	<view class="rowStyle">
+		1）找平层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.wm_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）保温层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.wm_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）防水层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.wm_finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）防水保护层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.wm_finish_rate4}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		5）屋面面层施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.wm_finish_rate5}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		6）钢爬梯施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.wm_finish_rate6}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		7）屋面设备基础等附属结构施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fourData.wm_finish_rate7}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+</view>
+
+<!-- 安装工程 -->
+<view class="construction-content" style="margin: 30rpx 0;" wx:if="{{activeState == 5}}">
+
+	<view class="rowStyle">
+		安装工程施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.schedule_construction_five}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		电气工程
+	</view>
+	<view class="rowStyle">
+		1）穿线（含强电、弱电）完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.dq_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）开关、面板、灯具安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.dq_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）配电箱、桥架安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.dq_finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）电缆敷设安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.dq_finish_rate4}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		给排水工程
+	</view>
+	<view class="rowStyle">
+		1）管道（含排水、给水、消防、暖通）敷设安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.jps_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）阀门、水表安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.jps_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）预留洞口封堵（含防火封堵）完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.jps_finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		4）管道保温施工完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.jps_finish_rate4}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		暖通工程
+	</view>
+	<view class="rowStyle">
+		1）暖通设备安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.nt_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）风管安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.nt_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+
+	<view class="eharts_title">
+		消防工程
+	</view>
+	<view class="rowStyle">
+		1）通风管道设备安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.xf_finish_rate1}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		2）消防栓安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.xf_finish_rate2}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+	<view class="rowStyle">
+		3）消防栓内配套设备安装完成至总量的
+		<view class="rightStyle">
+			<input type="text"  value="{{itemData.fiveData.xf_finish_rate3}}" class="inputStyle" disabled="disabled" />%
+		</view>
+	</view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>正在提交，请稍后...</view>
+  </view>
+</van-overlay>  
diff --git a/miniprogram/pages/construction-details/index.wxss b/miniprogram/pages/construction-details/index.wxss
new file mode 100644
index 0000000..eb864ca
--- /dev/null
+++ b/miniprogram/pages/construction-details/index.wxss
@@ -0,0 +1,77 @@
+/* pages/construction-details/index.wxss */
+/* 施工日志 */
+.construction{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	padding:0 36rpx ;
+}
+/* 配电箱选项 */
+.peidianxiang{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 60rpx 0;
+	width: 100%;
+	height: 100rpx;
+
+}
+.peidianxiang-left{
+	width: 42%;
+	height: 100rpx;
+	border-radius: 20rpx;
+}
+.peidianxiang-right{
+	width: 52%;
+	height: 100rpx;
+	border-radius: 20rpx;
+}
+.construction-content{
+	width: 100%;
+	padding: 48rpx 16rpx 10rpx;
+	background-color:#1e222e;
+	border-radius: 20rpx;
+	color: #6a7cac;
+	box-sizing: border-box;
+}
+.eharts_title{
+	height: 70rpx;
+	line-height: 70rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	font-size: 34rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+	border-bottom: 1px solid #313446;
+	color: #fff;
+  }
+/* input框 */
+.inputStyle{
+	border-bottom: 1px solid #6a7cac;
+	width: 100rpx;
+	padding: 15rpx 28rpx;
+	color: #fff;
+	outline:none;
+	text-align:center;
+	}
+.inputStyle1{
+	border-bottom: 1px solid #6a7cac;
+	color: #fff;
+	display: inline-block; 
+	width: 80px;
+	outline:none;
+	text-align:center;
+}
+.rowStyle{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 45rpx 0;
+	padding-left: 30rpx;
+}
+.rightStyle{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 240rpx;
+}
diff --git a/miniprogram/pages/construction/index.js b/miniprogram/pages/construction/index.js
new file mode 100644
index 0000000..f3c3c73
--- /dev/null
+++ b/miniprogram/pages/construction/index.js
@@ -0,0 +1,512 @@
+// pages/construction/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        integral: 0, 
+        moneyNum: null, 
+        buildList: [],
+        floorList: [],
+        initData: [],
+        projectData: {},
+        buildingNum:'',
+        floorNum:'',
+        time:'',
+        loginName:'',
+        activeState:1,
+        oneData:{},
+        twoData:{},
+        threeData:{},
+        fourData:{},
+        fiveData:{},
+        loadShow:false,
+    },
+    
+    /**
+     * 标签切换
+     */
+    trainingTypeJump(e){
+        this.setData({
+            activeState:e.currentTarget.dataset.index,
+        });
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this;
+        that.setData({
+            time: that.getTimeFormat(new Date())
+        })
+       
+        //获取缓存数据
+        wx.getStorage({
+            key: 'userinfo',
+            success: function (res) {
+                that.setData({
+                    remark: res.data.remark,
+                    loginName: res.data.loginName,
+                    userName: res.data.userName,
+                    projectId: app.globalData.projectId,
+                    projectName: app.globalData.projectName,
+                    initData: {
+                        text: app.globalData.projectName,
+                        id: app.globalData.projectId
+                    }
+                })
+            }
+        })
+        that.getProjectCorrespondence(app.globalData.projectId);
+    },
+
+    getIntegral: function(e) {
+        var integral = e.detail.value;
+        if(integral<=100) { // 判断value值是否小于等于100, 如果大于100限制输入100
+          if(integral == '') { // 判断value值是否等于空,为空integral默认0,
+            this.setData({
+              integral: 0
+            })
+          } else {
+            this.setData({
+              integral: integral,
+            })
+          }
+        } else {
+          wx.showToast({
+            title: '输入的最大数为100，请慎重填写！',
+            icon: 'none',
+          })
+        //   this.setData({
+        //     integral: 100,
+        //     moneyNum: 100,
+        //   })
+        }
+    },
+
+    vmodel(e) {
+        this.setData({
+          [e.currentTarget.dataset.value]:e.detail.value
+        })
+    },
+
+    /**
+     * 获取项目对应关系
+     */
+    getProjectCorrespondence(projectId) {
+        var that = this;
+        wx.request({
+            url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+            data: {
+                "projectId": projectId,
+            },
+            method: "get",
+            success: function (res) {
+                that.setData({
+                    projectData: res.data
+                })
+                that.getConstructionPlanOne()
+            }
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    
+    /**
+     * 项目变化
+     */
+    onProjectSelect(e) {
+        var that = this
+        var id = e.detail.id
+        that.getProjectCorrespondence(id)
+    },
+
+    /**
+     * 选择一级区域
+     */
+    buildChange(e) {
+        var that = this
+        that.setData({
+            buildingNum:e.detail.id,
+        })
+        that.getConstructionPlanTwo();
+    },
+
+    /**
+     * 选择二级区域
+     */
+    floorChange(e) {
+        var that = this;
+        that.setData({
+            floorNum:e.detail.id
+        })
+    },
+
+    /**
+     * 选择填报日期
+     */
+    onPlaceTime(e) {
+        this.setData({
+            time:e.detail
+        })
+    },
+
+    /**
+     * 格式化时间
+     */
+    getTimeFormat(date) {
+        var date = new Date(date);
+        var year = date.getFullYear();
+        var month = date.getMonth()+1;
+        var day = date.getDate();
+        if (month >= 1 && month <= 9) {
+            month = "0" + month;
+         }
+         if (day >= 0 && day <= 9) {
+            day = "0" + day;
+         }
+         var time = year + "-" + month + "-" + day;
+         return time;
+    },
+
+    /**
+     * 获取施工计划一级区域
+     */
+    getConstructionPlanOne(){
+        var that = this
+        wx.request({
+            url: app.globalData.szhUrl + '/api/getConstructionPlanOne',
+            method: "get",
+            data: {
+                "projectId":that.data.projectData.szh
+            },
+            success: (res => {
+                that.setData({
+                    buildList:res.data,
+                    buildingNum:res.data[0].id
+                })
+                that.getConstructionPlanTwo();
+            })
+        })
+    },
+
+    /**
+     * 获取施工计划二级区域
+     */
+    getConstructionPlanTwo(){
+        var that = this
+        wx.request({
+            url: app.globalData.szhUrl + '/api/getConstructionPlanTwo',
+            method: "get",
+            data: {
+                "projectId":that.data.projectData.szh,
+                "buildingNum":that.data.buildingNum
+            },
+            success: (res => {
+                that.setData({
+                    floorList:res.data,
+                    floorNum:res.data[0].id
+                })
+            })
+        })
+    },
+    
+    /**
+     * 提交地基与基础
+     */
+    doSubmit1(e) {
+        var that = this
+
+        if (isNaN(that.data.projectData.szh)) {
+            app.toast("请选择项目！");
+            return;
+        }
+        if (!isNaN(that.data.buildingNum)) {
+            app.toast("请选择一级区域！");
+            return;
+        }
+        if (!isNaN(that.data.floorNum)) {
+            app.toast("请选择二级区域！");
+            return;
+        }
+        if (!isNaN(that.data.time)) {
+            app.toast("请选择填报日期！");
+            return;
+        }
+        that.setData({
+            loadShow: true
+        })
+
+        var data = e.detail.value;
+        data.projectId = that.data.projectData.szh;
+        data.buildingNum = that.data.buildingNum;
+        data.floorNum = that.data.floorNum;
+        data.branch = that.data.activeState;
+        data.fillTime = that.data.time;
+        data.createUserid = that.data.loginName;
+        data.oneData = that.data.oneData;
+
+        wx.request({
+            url: app.globalData.szhUrl + '/api/addConstructionLogOne',
+            method: "post",
+            data: data,
+            success: (res => {
+                that.setData({
+                    loadShow: false
+                })
+                if (res.data.code == 200) {
+                    app.toast("提交成功！");
+                } else {
+                    app.toast("提交失败，请重新提交！");
+                }
+            })
+        })
+    },
+
+    doSubmit2(e){
+        var that = this
+
+        if (isNaN(that.data.projectData.szh)) {
+            app.toast("请选择项目！");
+            return;
+        }
+        if (!isNaN(that.data.buildingNum)) {
+            app.toast("请选择一级区域！");
+            return;
+        }
+        if (!isNaN(that.data.floorNum)) {
+            app.toast("请选择二级区域！");
+            return;
+        }
+        if (!isNaN(that.data.time)) {
+            app.toast("请选择填报日期！");
+            return;
+        }
+        that.setData({
+            loadShow: true
+        })
+
+        var data = e.detail.value;
+        data.projectId = that.data.projectData.szh;
+        data.buildingNum = that.data.buildingNum;
+        data.floorNum = that.data.floorNum;
+        data.branch = that.data.activeState;
+        data.fillTime = that.data.time;
+        data.createUserid = that.data.loginName;
+        data.twoData = that.data.twoData;
+
+        wx.request({
+            url: app.globalData.szhUrl + '/api/addConstructionLogTwo',
+            method: "post",
+            data: data,
+            success: (res => {
+                that.setData({
+                    loadShow: false
+                })
+                if (res.data.code == 200) {
+                    app.toast("提交成功！");
+                } else {
+                    app.toast("提交失败，请重新提交！");
+                }
+            })
+        })
+    },
+
+    doSubmit3(e){
+        var that = this
+
+        if (isNaN(that.data.projectData.szh)) {
+            app.toast("请选择项目！");
+            return;
+        }
+        if (!isNaN(that.data.buildingNum)) {
+            app.toast("请选择一级区域！");
+            return;
+        }
+        if (!isNaN(that.data.floorNum)) {
+            app.toast("请选择二级区域！");
+            return;
+        }
+        if (!isNaN(that.data.time)) {
+            app.toast("请选择填报日期！");
+            return;
+        }
+        that.setData({
+            loadShow: true
+        })
+
+        var data = e.detail.value;
+        data.projectId = that.data.projectData.szh;
+        data.buildingNum = that.data.buildingNum;
+        data.floorNum = that.data.floorNum;
+        data.branch = that.data.activeState;
+        data.fillTime = that.data.time;
+        data.createUserid = that.data.loginName;
+        data.threeData = that.data.threeData;
+
+        wx.request({
+            url: app.globalData.szhUrl + '/api/addConstructionLogThree',
+            method: "post",
+            data: data,
+            success: (res => {
+                that.setData({
+                    loadShow: false
+                })
+                if (res.data.code == 200) {
+                    app.toast("提交成功！");
+                } else {
+                    app.toast("提交失败，请重新提交！");
+                }
+            })
+        })
+    },
+
+    doSubmit4(e){
+        var that = this
+
+        if (isNaN(that.data.projectData.szh)) {
+            app.toast("请选择项目！");
+            return;
+        }
+        if (!isNaN(that.data.buildingNum)) {
+            app.toast("请选择一级区域！");
+            return;
+        }
+        if (!isNaN(that.data.floorNum)) {
+            app.toast("请选择二级区域！");
+            return;
+        }
+        if (!isNaN(that.data.time)) {
+            app.toast("请选择填报日期！");
+            return;
+        }
+        that.setData({
+            loadShow: true
+        })
+
+        var data = e.detail.value;
+        data.projectId = that.data.projectData.szh;
+        data.buildingNum = that.data.buildingNum;
+        data.floorNum = that.data.floorNum;
+        data.branch = that.data.activeState;
+        data.fillTime = that.data.time;
+        data.createUserid = that.data.loginName;
+        data.fourData = that.data.fourData;
+
+        wx.request({
+            url: app.globalData.szhUrl + '/api/addConstructionLogFour',
+            method: "post",
+            data: data,
+            success: (res => {
+                that.setData({
+                    loadShow: false
+                })
+                if (res.data.code == 200) {
+                    app.toast("提交成功！");
+                } else {
+                    app.toast("提交失败，请重新提交！");
+                }
+            })
+        })
+    },
+
+    doSubmit5(e){
+        var that = this
+
+        if (isNaN(that.data.projectData.szh)) {
+            app.toast("请选择项目！");
+            return;
+        }
+        if (!isNaN(that.data.buildingNum)) {
+            app.toast("请选择一级区域！");
+            return;
+        }
+        if (!isNaN(that.data.floorNum)) {
+            app.toast("请选择二级区域！");
+            return;
+        }
+        if (!isNaN(that.data.time)) {
+            app.toast("请选择填报日期！");
+            return;
+        }
+        that.setData({
+            loadShow: true
+        })
+
+        var data = e.detail.value;
+        data.projectId = that.data.projectData.szh;
+        data.buildingNum = that.data.buildingNum;
+        data.floorNum = that.data.floorNum;
+        data.branch = that.data.activeState;
+        data.fillTime = that.data.time;
+        data.createUserid = that.data.loginName;
+        data.fiveData = that.data.fiveData;
+
+        wx.request({
+            url: app.globalData.szhUrl + '/api/addConstructionLogFive',
+            method: "post",
+            data: data,
+            success: (res => {
+                that.setData({
+                    loadShow: false
+                })
+                if (res.data.code == 200) {
+                    app.toast("提交成功！");
+                } else {
+                    app.toast("提交失败，请重新提交！");
+                }
+            })
+        })
+    },
+})
\ No newline at end of file
diff --git a/miniprogram/pages/construction/index.json b/miniprogram/pages/construction/index.json
new file mode 100644
index 0000000..1f656de
--- /dev/null
+++ b/miniprogram/pages/construction/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index" 
+    },
+    "navigationBarTitleText": "施工日志填报"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/construction/index.wxml b/miniprogram/pages/construction/index.wxml
new file mode 100644
index 0000000..5f03fe0
--- /dev/null
+++ b/miniprogram/pages/construction/index.wxml
@@ -0,0 +1,791 @@
+<!-- 施工日志 -->
+<view class="construction">
+	<!-- 头部模块 -->
+	<view class="max_content" style="width:110%;padding: 36rpx 0 26rpx;">
+		<project-select style="width:100rpx" init="{{initData}}" bindchange="onProjectSelect"></project-select>
+	</view>
+	<!-- 选项框 -->
+	<view class="peidianxiang" style="margin: 0;">
+		<view class="peidianxiang-left">
+			<voucher-select columns="{{buildList}}" bindchange="buildChange" background='#2a335a'></voucher-select>
+		</view>
+		<view class="peidianxiang-right">
+			<voucher-select columns="{{floorList}}" bindchange="floorChange" background='#2a335a'></voucher-select>
+		</view>
+	</view>
+	<!-- 时间 -->
+	<view style="margin: 40rpx 0;">
+		<voucher-date time="{{time}}" counts="5" width="640rpx" name="placeTime" placeholder="请选择施工日期" bindchange="onPlaceTime"></voucher-date>
+	</view>
+</view>
+
+<!-- tab栏切换 -->
+<view class="modify_video_nav" style="margin-bottom: 64rpx;width: 100%;">
+	<view class="{{activeState==1?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>地基与基础</text></view>
+	<view class="{{activeState==2?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>主体结构</text></view>
+	<view class="{{activeState==3?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>砌体结构</text></view>
+	<view class="{{activeState==4?'active':''}}" bindtap="trainingTypeJump" data-index="4"><text>装饰装修</text></view>
+	<view class="{{activeState==5?'active':''}}" bindtap="trainingTypeJump" data-index="5"><text>安装工程</text></view>
+</view>
+
+<!-- 地基与基础 -->
+<form bindsubmit="doSubmit1" wx:if="{{activeState == 1}}">
+	<view class="construction-content" style="margin: 30rpx 0;">
+
+		<view class="rowStyle">
+			地基与基础工程完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.schedule_construction_one" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			围护结构
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			1）
+			<input type="text" bindinput="vmodel" data-value="oneData.whz_position" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧围护桩施工当天完成 
+			<input type="text" bindinput="vmodel" data-value="oneData.wh_today_finish_num" class="inputStyle1" placeholder="请填写"/>根，累计完成
+			<input type="text" bindinput="vmodel" data-value="oneData.wh_tital_finish_num" class="inputStyle1" placeholder="请填写"/>根，（总量
+			<input type="text" bindinput="vmodel" data-value="oneData.wh_tital_num" class="inputStyle1" placeholder="请填写"/> 根）累计完成总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.wh_tital_finish_rate" class="inputStyle1" placeholder="请填写"/>%
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			2）
+			<input type="text" bindinput="vmodel" data-value="oneData.lxq_position" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧地下连续墙施工完成
+			<input type="text" bindinput="vmodel" data-value="oneData.lxq_finish_num" class="inputStyle1" placeholder="请填写"/>副（总量
+			<input type="text" bindinput="vmodel" data-value="oneData.lxq_tital_num" class="inputStyle1" placeholder="请填写"/>副），累计完成总量的
+			<input type="numtextber" bindinput="vmodel" data-value="oneData.lxq_tital_finish_rate" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			3）
+			<input type="text" bindinput="vmodel" data-value="oneData.pmzh_position" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧喷锚支护施工完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.pmzh_tital_finish_rate" class="inputStyle1" placeholder="请填写"/>%
+		</view>
+
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			土方工程
+		</view>
+		<view class="rowStyle">
+			1）土方开挖完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.tfkw_tital_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			2）
+			<input type="text" bindinput="vmodel" data-value="oneData.tfht_position" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧土方回填完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.tfht_tital_finish_rate" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle">
+			3）室内土方回填完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.tfht_sn_tital_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			基坑降水
+		</view>
+		<view class="rowStyle">
+			1）降水井施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.jkjs_tital_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			桩基工程
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			1）
+			<input type="text" bindinput="vmodel" data-value="oneData.zj_type1" class="inputStyle1" placeholder="请填写"/>（灌注桩、静压桩）桩施工完成至
+			<input type="text" bindinput="vmodel" data-value="oneData.zj_finish_rate" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			2）
+			<input type="text" bindinput="vmodel" data-value="oneData.zj_type2" class="inputStyle1" placeholder="请填写"/>（灌注桩、静压桩）桩施工累计完成
+			<input type="text" bindinput="vmodel" data-value="oneData.zj_tital_finish_num" class="inputStyle1" placeholder="请填写"/>根（总量
+			<input type="text" bindinput="vmodel" data-value="oneData.zj_tital_num" class="inputStyle1" placeholder="请填写"/>根），累计完成总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.zj_tital_finish_rate" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle">
+			3）桩间土开挖完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.zj_zjtkw_finish_tate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）破桩头累计完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.zj_pzt_tital_finish_num" class="inputStyle" placeholder="请填写" />根
+			</view>
+		</view>
+		
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			楼筏板工程
+		</view>
+		<view class="rowStyle">
+			1）垫层完成至总量
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_dc_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）防水及防水保护层完成至总量
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_fs_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）筏板的模板施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_mb_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）筏板钢筋绑扎完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_gj_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			5）钢筋支撑架搭设完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_gjzcj_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			6）防雷接地及安装预留预埋完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_fljd_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			7）砼浇筑完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_tjz_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			8）筏板模板拆除完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.lfb_mbcc_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			地下室防水工程
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			1）
+			<input type="text" bindinput="vmodel" data-value="oneData.dxsfs_wqfsc_position" class="inputStyle1" placeholder="东南西北"/>（此处选择“东、南、西、北”）侧外墙防水层施工完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.dxsfs_wqfsc_finish_rate" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			2）
+			<input type="text" bindinput="vmodel" data-value="oneData.dxsfs_wqfsbhc_position" class="inputStyle1" placeholder="东南西北"/>（此处选择“东、南、西、北”）侧外墙防水保护层施工完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.dxsfs_wqfsbhc_finish_rate" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle">
+			3）车库顶板防水及防水保护层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="oneData.dxsfs_ckdbfs_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			±0.000以下主体结构施工
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			1）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num1" class="inputStyle1" placeholder="请填写"/>层外围护脚手架搭设完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate1" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			2）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num2" class="inputStyle1" placeholder="请填写"/>层墙柱钢筋绑扎完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate2" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			3）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num3" class="inputStyle1" placeholder="请填写"/>层满堂脚手架搭设完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate3" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			4）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num4" class="inputStyle1" placeholder="请填写"/>层顶板梁板模板安装完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate4" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			5）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num5" class="inputStyle1" placeholder="请填写"/>层墙柱模板安装完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate5" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			6）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num6" class="inputStyle1" placeholder="请填写"/>层顶板梁板钢筋安装完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate6" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			7）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num7" class="inputStyle1" placeholder="请填写"/>层预制墙板吊装完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate7" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			8）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num8" class="inputStyle1" placeholder="请填写"/>层叠合板及楼梯吊装完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate8" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			9）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num9" class="inputStyle1" placeholder="请填写"/>层模板及支撑体系拆除完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate9" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			10）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num10" class="inputStyle1" placeholder="请填写"/>层安装预留预埋完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate10" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			11）
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_num11" class="inputStyle1" placeholder="请填写"/>层混凝土浇筑完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.ztjg_storey_finish_rate11" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+
+		<view class="eharts_title" style="display: flex;margin-bottom: 40rpx;">
+			±0.000以下砌体结构施工
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			1）
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_num1" class="inputStyle1" placeholder="请填写"/>层植筋完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_finish_rate1" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			2）
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_num2" class="inputStyle1" placeholder="请填写"/>层砌体砌筑完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_finish_rate2" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			3）
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_num3" class="inputStyle1" placeholder="请填写"/>层构造柱、圈过梁完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_finish_rate3" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			4）
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_num4" class="inputStyle1" placeholder="请填写"/>层轻质隔墙安装完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_finish_rate4" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			5）
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_num5" class="inputStyle1" placeholder="请填写"/>层安装预留预埋完成至总量的
+			<input type="text" bindinput="vmodel" data-value="oneData.qtjg_storey_finish_rate5" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+	</view>
+
+	<!-- 确认重置按钮 -->
+	<view class="problem_submit_to">
+			<button formType="reset" class="problem_submit_to_btn" style="width:250rpx;color: white;margin-right: 50rpx;">重置</button >
+			<button formType="submit" class="problem_submit_to_btn problem_submit_to_save" style="width: 250rpx;color: #fff;margin-left: 50rpx;">保存</button >
+	</view> 
+</form>
+
+
+<!-- 主体结构 -->
+<form bindsubmit="doSubmit2" wx:if="{{activeState == 2}}">
+	<view class="construction-content" style="margin: 30rpx 0;">
+
+		<view class="rowStyle">
+			主体结构施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.schedule_construction_two" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			主体结构
+		</view>
+		<view class="rowStyle">
+			1）外围护脚手架搭设完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）墙柱钢筋绑扎完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）满堂脚手架搭设完成至总量的
+			<view class="rightStyle">
+				<input type="text"bindinput="vmodel" data-value="twoData.finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）顶板梁板模板安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate4" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			5）墙柱模板安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate5" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			6）顶板梁板钢筋安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate6" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			7）预制墙板吊装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate7" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			8）叠合板及楼梯吊装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate8" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			9）模板及支撑体系拆除完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate9" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			10）安装预留预埋完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate10" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			11）混凝土浇筑完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="twoData.finish_rate11" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+	</view>
+
+	<!-- 确认重置按钮 -->
+	<view class="problem_submit_to">
+		<button formType="reset" class="problem_submit_to_btn" style="width:250rpx;color: white;margin-right: 50rpx;">重置</button >
+		<button formType="submit" class="problem_submit_to_btn problem_submit_to_save" style="width: 250rpx;color: #fff;margin-left: 50rpx;">保存</button >
+	</view> 
+</form>
+
+<!-- 砌体结构 -->
+<form bindsubmit="doSubmit3" wx:if="{{activeState == 3}}">
+	<view class="construction-content" style="margin: 30rpx 0;">
+
+		<view class="rowStyle">
+			砌体结构施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="threeData.schedule_construction_three" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			砌体结构
+		</view>
+		<view class="rowStyle">
+			1）植筋完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="threeData.finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）砌体砌筑完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="threeData.finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）构造柱、圈过梁完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="threeData.finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）轻质隔墙安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="threeData.finish_rate4" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			5）烟、气道施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="threeData.finish_rate5" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			6）安装预留预埋完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="threeData.finish_rate6" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+	</view>
+
+	<!-- 确认重置按钮 -->
+	<view class="problem_submit_to">
+		<button formType="reset" class="problem_submit_to_btn" style="width:250rpx;color: white;margin-right: 50rpx;">重置</button >
+		<button formType="submit" class="problem_submit_to_btn problem_submit_to_save" style="width: 250rpx;color: #fff;margin-left: 50rpx;">保存</button >
+	</view>
+</form>
+
+<!-- 装饰装修 -->
+<form bindsubmit="doSubmit4" wx:if="{{activeState == 4}}">
+	<view class="construction-content" style="margin: 30rpx 0;">
+
+		<view class="rowStyle">
+			装饰装修工程完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.schedule_construction_four" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			抹灰工程
+		</view>
+		<view class="rowStyle">
+			1）抹灰工程施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mh_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			腻子涂料工程
+		</view>
+		<view class="rowStyle">
+			1）腻子工程施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mh_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）涂料工程施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mh_finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="eharts_title">
+			地辐热工程
+		</view>
+		<view class="rowStyle">
+			1）保温层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dfr_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）地暖管施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dfr_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）混凝土保护层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dfr_finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）阀门施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dfr_finish_rate4" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			地面工程
+		</view>
+		<view class="rowStyle">
+			1）厨房/卫生间/阳台防水施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dm_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）地砖铺贴施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dm_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）水泥砂浆地面施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dm_finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			楼梯扶手及护栏工程
+		</view>
+		<view class="rowStyle">
+			1）楼梯扶手施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.ltfs_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）栏杆施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.lg_finish_rate" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			门窗工程
+		</view>
+		<view class="rowStyle">
+			1）入户门安装完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mc_num1" class="inputStyle" placeholder="请填写" />樘
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）防火门安装完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mc_num2" class="inputStyle" placeholder="请填写" />樘
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）窗框安装完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mc_num3" class="inputStyle" placeholder="请填写" />樘
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）窗扇安装完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mc_num4" class="inputStyle" placeholder="请填写" />樘
+			</view>
+		</view>
+		<view class="rowStyle">
+			5）门的五金件安装完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mc_num5" class="inputStyle" placeholder="请填写" />樘
+			</view>
+		</view>
+		<view class="rowStyle">
+			6）窗的五金件安装完成
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.mc_num6" class="inputStyle" placeholder="请填写" />樘
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			吊顶工程
+		</view>
+		<view class="rowStyle">
+			1）吊顶施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.dd_finish_rate" class="inputStyle" placeholder="请填写" />樘
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			外墙工程
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			1）
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_position1" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧外墙外保温（含抗裂砂浆、网格布）施工完成至总量的
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_finish_rate1" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			2）
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_position2" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧腻子施工完成至总量的
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_finish_rate2" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			3）
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_position3" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧饰面层（涂料/真石漆）施工完成至总量的
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_finish_rate3" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+		<view class="rowStyle" style="display: inline-block;">
+			4）
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_position4" class="inputStyle1" placeholder="东南西北"/>（一般填写东、南、西、北）侧幕墙施工完成至总量的
+			<input type="text" bindinput="vmodel" data-value="fourData.wq_finish_rate4" class="inputStyle1" placeholder="请填写"/>%；
+		</view>
+
+
+		<view class="eharts_title">
+			屋面工程
+		</view>
+		<view class="rowStyle">
+			1）找平层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.wm_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）保温层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.wm_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）防水层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.wm_finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）防水保护层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.wm_finish_rate4" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			5）屋面面层施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.wm_finish_rate5" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			6）钢爬梯施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.wm_finish_rate6" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			7）屋面设备基础等附属结构施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fourData.wm_finish_rate7" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+	</view>
+
+	<!-- 确认重置按钮 -->
+	<view class="problem_submit_to">
+		<button formType="reset" class="problem_submit_to_btn" style="width:250rpx;color: white;margin-right: 50rpx;">重置</button >
+		<button formType="submit" class="problem_submit_to_btn problem_submit_to_save" style="width: 250rpx;color: #fff;margin-left: 50rpx;">保存</button >
+	</view>
+</form>
+
+<!-- 安装工程 -->
+<form bindsubmit="doSubmit5" wx:if="{{activeState == 5}}">
+	<view class="construction-content" style="margin: 30rpx 0;">
+
+		<view class="rowStyle">
+			安装工程施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.schedule_construction_five" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			电气工程
+		</view>
+		<view class="rowStyle">
+			1）穿线（含强电、弱电）完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.dq_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）开关、面板、灯具安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.dq_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）配电箱、桥架安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.dq_finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）电缆敷设安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.dq_finish_rate4" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			给排水工程
+		</view>
+		<view class="rowStyle">
+			1）管道（含排水、给水、消防、暖通）敷设安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.jps_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）阀门、水表安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.jps_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）预留洞口封堵（含防火封堵）完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.jps_finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			4）管道保温施工完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.jps_finish_rate4" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			暖通工程
+		</view>
+		<view class="rowStyle">
+			1）暖通设备安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.nt_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）风管安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.nt_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+
+		<view class="eharts_title">
+			消防工程
+		</view>
+		<view class="rowStyle">
+			1）通风管道设备安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.xf_finish_rate1" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			2）消防栓安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.xf_finish_rate2" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+		<view class="rowStyle">
+			3）消防栓内配套设备安装完成至总量的
+			<view class="rightStyle">
+				<input type="text" bindinput="vmodel" data-value="fiveData.xf_finish_rate3" class="inputStyle" placeholder="请填写" />%
+			</view>
+		</view>
+	</view>
+
+	<!-- 确认重置按钮 -->
+	<view class="problem_submit_to">
+		<button formType="reset" class="problem_submit_to_btn" style="width:250rpx;color: white;margin-right: 50rpx;">重置</button >
+		<button formType="submit" class="problem_submit_to_btn problem_submit_to_save" style="width: 250rpx;color: #fff;margin-left: 50rpx;">保存</button >
+	</view>
+</form>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>正在提交，请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pages/construction/index.wxss b/miniprogram/pages/construction/index.wxss
new file mode 100644
index 0000000..08c3dc5
--- /dev/null
+++ b/miniprogram/pages/construction/index.wxss
@@ -0,0 +1,89 @@
+/* 施工日志 */
+.construction{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	padding:0 36rpx ;
+	box-sizing: border-box;
+}
+/* 配电箱选项 */
+.peidianxiang{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 60rpx 0;
+	width: 100%;
+	height: 100rpx;
+
+}
+.peidianxiang-left{
+	width: 42%;
+	height: 100rpx;
+	border-radius: 20rpx;
+}
+.peidianxiang-right{
+	width: 52%;
+	height: 100rpx;
+	border-radius: 20rpx;
+}
+.construction-content{
+	width: 100%;
+	padding: 48rpx 16rpx 10rpx;
+	background-color:#1e222e;
+	border-radius: 20rpx;
+	color: #6a7cac;
+	box-sizing: border-box;
+}
+.eharts_title{
+	height: 70rpx;
+	line-height: 70rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	font-size: 34rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+	border-bottom: 1px solid #313446;
+	color: #fff;
+  }
+  /* input框 */
+  .inputStyle{
+	border-bottom: 1px solid #6a7cac;
+	width: 100rpx;
+	padding: 15rpx 28rpx;
+	color: #fff;
+	outline:none;
+	text-align:center;
+	}
+	.inputStyle1{
+		border-bottom: 1px solid #6a7cac;
+		color: #fff;
+		display: inline-block; 
+		width: 80px;
+		outline:none;
+		text-align:center;
+	}
+  .rowStyle{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 45rpx 0;
+		padding-left: 30rpx;
+	}
+	.rightStyle{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 240rpx;
+	}
+/* 东西南北风 */
+.dxnbfeng{
+	float: left;
+	width: 344px;
+	border: 1px solid red;
+	margin-left: 30rpx;
+}
+.dxnbStyle{
+	display: inline-block;
+	height: 36px;
+	border: 1px solid pink;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/deepExcavation/index.js b/miniprogram/pages/deepExcavation/index.js
new file mode 100644
index 0000000..48b6a74
--- /dev/null
+++ b/miniprogram/pages/deepExcavation/index.js
@@ -0,0 +1,589 @@
+// pages/deepExcavation/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    DeviceGroupData: [],
+    DeviceGroupNameData:[],
+    stateNav:1,
+    statePosit:1,
+    qingxieData: {},
+    weiyiData:{},
+    active:3,
+    show: false,
+    loadShow:false,
+    loginName:'',
+    userName:'',
+    deptId:'',
+    projectName:'',
+    projectId:'',
+    //业务参数
+    groupType:'',
+    groupId:'',
+    sensorArray:[],
+    sensorObject:{},
+    //位移
+    shiftCount:0,
+    //倾斜
+    tiltCount:0,
+    //应力
+    stressCount:0,
+    //报警
+    callPoliceCount:0,
+    //预警
+    earlyWarningCount:0,
+    //离线
+    offlineCount:0,
+    //正常
+    normalCount:0,
+
+    initData:{},
+    sensorTypeName:'',
+    sensorTypeIndex:''
+
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName,
+      sensorArray:[]
+    })
+    this.getSensorTypeList('');
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  //设备组  选择  
+  onDeviceGroupSelect(e){
+    this.onClickShow();
+    this.setData({
+      groupType:e.detail.id,
+      sensorArray:[]
+    })
+    this.getSensorGroupList(e.detail.id);
+  },
+
+  //设备组名称  选择    
+  onDeviceGroupNameSelect(e){
+    this.onClickShow();
+    this.setData({
+      groupId:e.detail.id,
+      sensorArray:[]
+    })
+    this.getSensorDataDay(this.data.groupType,e.detail.id);
+  },
+
+  //状态点击
+  onStatePosit(e){
+    this.onClickShow();
+    let state = e.currentTarget.dataset.state;
+    let sensorObject = this.data.sensorObject;
+    let dateList = sensorObject.dateList;
+    this.setData({statePosit:state,stateNav:1,displayState:true});
+    if(state == 1){
+      this.getShiftArray(sensorObject.shiftCallPoliceArray,dateList);
+      this.setData({
+        callPoliceCount:sensorObject.shiftCallPoliceArray.length,
+        earlyWarningCount:sensorObject.shiftEarlyWarningArray.length,
+        offlineCount:sensorObject.shiftOfflineArray.length,
+        normalCount:sensorObject.shiftNormalArray.length
+      })
+    }else if(state == 2){
+      this.getTiltArray(sensorObject.tiltCallPoliceArray,dateList);
+      this.setData({
+        callPoliceCount:sensorObject.tiltCallPoliceArray.length,
+        earlyWarningCount:sensorObject.tiltEarlyWarningArray.length,
+        offlineCount:sensorObject.tiltOfflineArray.length,
+        normalCount:sensorObject.tiltNormalArray.length
+      })
+    }else if(state == 3){
+      this.getStressArray(sensorObject.stressCallPoliceArray,dateList);
+      this.setData({
+        callPoliceCount:sensorObject.stressCallPoliceArray.length,
+        earlyWarningCount:sensorObject.stressEarlyWarningArray.length,
+        offlineCount:sensorObject.stressOfflineArray.length,
+        normalCount:sensorObject.stressNormalArray.length
+      })
+    }
+  },
+
+  onStateSelect(e){
+    this.onClickShow();
+    let state = e.currentTarget.dataset.state;
+    this.setData({stateNav:state,displayState:true});
+    this.judgmentData(state);
+  },
+
+  /**
+   *  返回值   // 1 为单次   2  为累计
+  */
+  onWeiyi1(e){
+    let deviceId = e.currentTarget.dataset.deviceid
+    let sensorArray = this.data.sensorArray;
+    for(let i = 0;i<sensorArray.length;i++){
+      if(sensorArray[i].deviceId == deviceId){
+        sensorArray[i] = {"lineChart":sensorArray[i].lineChart,"lineChartSum":sensorArray[i].lineChartSum,"pointName":sensorArray[i].pointName,"type":sensorArray[i].type,"deviceId":sensorArray[i].deviceId,"displayState":e.detail == 1?true:false};
+      }
+    }
+    this.setData({sensorArray:sensorArray});
+  },
+
+  onQingxie1(e){
+    let deviceId = e.currentTarget.dataset.deviceid
+    let sensorArray = this.data.sensorArray;
+    for(let i = 0;i<sensorArray.length;i++){
+      if(sensorArray[i].deviceId == deviceId){
+        sensorArray[i] = {"lineChart":sensorArray[i].lineChart,"lineChartSum":sensorArray[i].lineChartSum,"pointName":sensorArray[i].pointName,"type":sensorArray[i].type,"deviceId":sensorArray[i].deviceId,"displayState":e.detail == 1?true:false};
+      }
+    }
+    this.setData({sensorArray:sensorArray});
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    //加载蒙版
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          deptId:res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId:app.globalData.projectId,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+        })  
+        that.getSensorTypeList(options.id);
+      }
+    }) 
+  },
+
+  /**
+   * 获取传感器类型
+   */
+  getSensorTypeList:function(id){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getSensorTypeList',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId
+      },
+      success: resData => {
+        this.onClickHide();
+        let DeviceGroupData = [];
+        let sensorTypeName;
+        let sensorTypeIndex;
+        for(let i = 0;i<resData.data.length;i++){
+          if(resData.data[i].group_type == id){
+            sensorTypeName = resData.data[i].type_name;
+            sensorTypeIndex = i;
+          }
+
+          let GroupData = {"id":resData.data[i].group_type,"text":resData.data[i].type_name};
+          DeviceGroupData.push(GroupData);
+        }
+        this.setData({
+          DeviceGroupData:DeviceGroupData,
+          sensorTypeName:sensorTypeName,
+          sensorTypeIndex:sensorTypeIndex
+        })
+        //初始化
+        this.getSensorGroupList(id ==''?DeviceGroupData[0].id:id);
+      }
+    })
+  },
+
+  /**
+   * 获取传感器分组
+   */
+  getSensorGroupList:function(groupType){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getSensorGroupList',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+        groupType:groupType
+      },
+      success: resData => {
+        this.onClickHide();
+        if(resData.length > 0){
+          let DeviceGroupNameData = [];
+          for(let i = 0;i<resData.data.length;i++){
+            let GroupData = {"id":resData.data[i].group_id,"text":resData.data[i].group_name};
+            DeviceGroupNameData.push(GroupData);
+          }
+          this.setData({
+            DeviceGroupNameData:DeviceGroupNameData
+          })
+          //初始化
+          this.getSensorDataDay(groupType,DeviceGroupNameDataDeviceGroupNameData[0].id);
+        }
+      }
+    })
+  },
+
+  /**
+   * 获取传感器日常数据
+   */
+  getSensorDataDay:function(groupType,groupId){
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/security/getSensorDataDay',
+      method: 'get',
+      data: {
+        deptId:this.data.deptId,
+        projectId:this.data.projectId,
+        groupType:groupType,
+        groupId:groupId
+      },
+      success: resData => {
+        var that = this;
+        that.onClickHide();
+        //位移
+        let shiftCallPoliceArray = resData.data.shiftCallPoliceArray;
+        let shiftEarlyWarningArray = resData.data.shiftEarlyWarningArray;
+        let shiftOfflineArray = resData.data.shiftOfflineArray;
+        let shiftNormalArray = resData.data.shiftNormalArray;
+        //倾斜
+        let tiltCallPoliceArray = resData.data.tiltCallPoliceArray;
+        let tiltEarlyWarningArray = resData.data.tiltEarlyWarningArray;
+        let tiltOfflineArray = resData.data.tiltOfflineArray;
+        let tiltNormalArray = resData.data.tiltNormalArray;
+        //应力
+        let stressCallPoliceArray = resData.data.stressCallPoliceArray;
+        let stressEarlyWarningArray = resData.data.stressEarlyWarningArray;
+        let stressOfflineArray = resData.data.stressOfflineArray;
+        let stressNormalArray = resData.data.stressNormalArray;
+
+        let shiftCount = shiftCallPoliceArray.length+ shiftEarlyWarningArray.length+shiftOfflineArray.length +shiftNormalArray.length;
+        let tiltCount = tiltCallPoliceArray.length+ tiltEarlyWarningArray.length+ tiltOfflineArray.length+ tiltNormalArray.length;
+        let stressCount = stressCallPoliceArray.length+ stressEarlyWarningArray.length+ stressOfflineArray.length+ stressNormalArray.length;
+
+        //判断默认展示位移有数据的
+        let stateNav = this.data.stateNav;
+        if(shiftCallPoliceArray.length != 0){
+          this.getShiftArray(shiftCallPoliceArray,resData.data.dateList);
+          stateNav = 1;
+        }else if(shiftEarlyWarningArray.length != 0){
+          this.getShiftArray(shiftEarlyWarningArray,resData.data.dateList);
+          stateNav = 2;
+        }else if(shiftOfflineArray.length != 0){
+          this.getShiftArray(shiftOfflineArray,resData.data.dateList);
+          stateNav = 3;
+        }else if(shiftNormalArray.length != 0){
+          this.getShiftArray(shiftNormalArray,resData.data.dateList);
+          stateNav = 4;
+        }
+
+        this.setData({
+          sensorObject:resData.data,
+          shiftCount:shiftCount,
+          tiltCount:tiltCount,
+          stressCount:stressCount,
+          callPoliceCount:shiftCallPoliceArray.length,
+          earlyWarningCount:shiftEarlyWarningArray.length,
+          offlineCount:shiftOfflineArray.length,
+          normalCount:shiftNormalArray.length,
+          stateNav:stateNav
+        })
+      }
+    })
+  },
+
+  /**
+   * 位移
+   */
+  getShiftArray:function(array,dateList){
+    let sensorArray = [];
+    for(let i = 0;i<array.length;i++){
+      let dataList = array[i].dataList;
+      let baojingUp = [];
+      let baojingDown = [];
+      let yujingUp = [];
+      let yujingDown = [];
+      let celiang = [];
+
+      let ljbaojingUp = [];
+      let ljbaojingDown = [];
+      let ljyujingUp = [];
+      let ljyujingDown = [];
+      let ljceliang = [];
+      for(let j = 0;j<dataList.length;j++){
+        baojingUp.push(dataList[j].singleTimeUpAlarmValue);
+        baojingDown.push(dataList[j].singleTimeDownAlarmValue);
+        yujingUp.push(dataList[j].singleTimeUpWarnValue);
+        yujingDown.push(dataList[j].singleTimeDownWarnValue);
+        celiang.push(dataList[j].singleTimeMesureValue);
+
+        ljbaojingUp.push(dataList[j].cumulativeMesureUpAlarmValue);
+        ljbaojingDown.push(dataList[j].cumulativeMesureDownAlarmValue);
+        ljyujingUp.push(dataList[j].cumulativeMesureUpWarnValue);
+        ljyujingDown.push(dataList[j].cumulativeMesureDownWarnValue);
+        ljceliang.push(dataList[j].cumulativeMesureValue);
+      }
+      let lineChart = {
+        unit : 'mm',
+        Xdata:dateList,
+        Ydata:celiang,
+        warningMax :yujingUp,
+        warningMin :yujingDown,
+        policeMax : baojingUp,
+        policeMin : baojingDown,
+      };
+
+      let lineChartSum = {
+        unit : 'mm',
+        Xdata:dateList,
+        Ydata:ljceliang,
+        warningMax :ljyujingUp,
+        warningMin :ljyujingDown,
+        policeMax : ljbaojingUp,
+        policeMin : ljbaojingDown,
+      };
+      
+      sensorArray.push({"lineChart":lineChart,"lineChartSum":lineChartSum,"deviceId":array[i].deviceId,"type":1,"pointName":"位移（"+array[i].pointName+"）","displayState":true});
+    }
+    this.setData({
+      sensorArray:sensorArray
+    })
+    this.onClickHide();
+  },
+
+  /**
+   * 倾斜
+   */
+  getTiltArray:function(array,dateList){
+    let sensorArray = [];
+    for(let i = 0;i<array.length;i++){
+      let dataList = array[i].dataList;
+      let xCeliang = [];
+      let yCeliang = [];
+
+      let ljxCeliang = [];
+      let ljyCeliang = [];
+     
+      for(let j = 0;j<dataList.length;j++){
+        xCeliang.push(dataList[j].singleTimeVerticalMesureValue);
+        yCeliang.push(dataList[j].singleTimeHorizontalMesureValue);
+
+        ljxCeliang.push(dataList[j].cumulativeVerticalMesureValue);
+        ljyCeliang.push(dataList[j].cumulativeHorizontalMesureValue);
+      }
+      let lineChart = {
+        unit : 'mm',
+        legend:['X轴', 'Y轴'],
+        color:['#2e6ed0','#fb9300'],
+        Xdata :dateList,
+        Ydata:[xCeliang,yCeliang]
+      };
+      let lineChartSum = {
+        unit : 'mm',
+        legend:['X轴', 'Y轴'],
+        color:['#2e6ed0','#fb9300'],
+        Xdata :dateList,
+        Ydata:[ljxCeliang,ljyCeliang]
+      };
+      sensorArray.push({"lineChart":lineChart,"lineChartSum":lineChartSum,"deviceId":array[i].deviceId,"type":2,"pointName":"倾斜（"+array[i].pointName+"）","displayState":true});
+    }
+    this.setData({
+      sensorArray:sensorArray
+    })
+    this.onClickHide();
+  },
+
+  /**
+   * 应力
+   */
+  getStressArray:function(array,dateList){
+    let sensorArray = [];
+    for(let i = 0;i<array.length;i++){
+      let dataList = array[i].dataList;
+      let baojingUp = [];
+      let baojingDown = [];
+      let yujingUp = [];
+      let yujingDown = [];
+      let celiang = [];
+
+      let ljbaojingUp = [];
+      let ljbaojingDown = [];
+      let ljyujingUp = [];
+      let ljyujingDown = [];
+      let ljceliang = [];
+      for(let j = 0;j<dataList.length;j++){
+        baojingUp.push(dataList[j].singleTimeUpAlarmValue);
+        baojingDown.push(dataList[j].singleTimeDownAlarmValue);
+        yujingUp.push(dataList[j].singleTimeUpWarnValue);
+        yujingDown.push(dataList[j].singleTimeDownWarnValue);
+        celiang.push(dataList[j].singleTimeMesureValue);
+
+        ljbaojingUp.push(dataList[j].cumulativeMesureUpAlarmValue);
+        ljbaojingDown.push(dataList[j].cumulativeMesureDownAlarmValue);
+        ljyujingUp.push(dataList[j].cumulativeMesureUpWarnValue);
+        ljyujingDown.push(dataList[j].cumulativeMesureDownWarnValue);
+        ljceliang.push(dataList[j].cumulativeMesureValue);
+      }
+      let lineChart = {
+        unit : 'KN',
+        Xdata:dateList,
+        Ydata:celiang,
+        warningMax :yujingUp,
+        warningMin :yujingDown,
+        policeMax : baojingUp,
+        policeMin : baojingDown,
+      };
+
+      let lineChartSum = {
+        unit : 'KN',
+        Xdata:dateList,
+        Ydata:ljceliang,
+        warningMax :ljyujingUp,
+        warningMin :ljyujingDown,
+        policeMax : ljbaojingUp,
+        policeMin : ljbaojingDown,
+      };
+      sensorArray.push({"lineChart":lineChart,"lineChartSum":lineChartSum,"deviceId":array[i].deviceId,"type":1,"pointName":"应力（"+array[i].pointName+"）","displayState":true});
+    }
+    this.setData({
+      sensorArray:sensorArray
+    })
+    this.onClickHide();
+  },
+  
+  /**
+   * 展示数据逻辑判断
+   *    type  1 单次
+   *          2 累计
+   */
+  judgmentData:function(state){
+    let statePosit = this.data.statePosit;
+    let sensorObject = this.data.sensorObject;
+    let sensorArray = [];
+    let dateList = sensorObject.dateList;
+    //位移
+    if(statePosit == 1){
+      if(state == 1){
+        sensorArray = sensorObject.shiftCallPoliceArray;
+      }else if(state == 2){
+        sensorArray = sensorObject.shiftEarlyWarningArray;
+      }else if(state == 3){
+        sensorArray = sensorObject.shiftOfflineArray;
+      }else if(state == 4){
+        sensorArray = sensorObject.shiftNormalArray;
+      } 
+      this.getShiftArray(sensorArray,dateList);
+    }else if(statePosit == 2){//倾斜
+      if(state == 1){
+        sensorArray = sensorObject.tiltCallPoliceArray;
+      }else if(state == 2){
+        sensorArray = sensorObject.tiltEarlyWarningArray;
+      }else if(state == 3){
+        sensorArray = sensorObject.tiltOfflineArray;
+      }else if(state == 4){
+        sensorArray = sensorObject.tiltNormalArray;
+      } 
+      this.getTiltArray(sensorArray,dateList);
+    }else if(statePosit == 3){//应力
+      if(state == 1){
+        sensorArray = sensorObject.stressCallPoliceArray;
+      }else if(state == 2){
+        sensorArray = sensorObject.stressEarlyWarningArray;
+      }else if(state == 3){
+        sensorArray = sensorObject.stressOfflineArray;
+      }else if(state == 4){
+        sensorArray = sensorObject.stressNormalArray;
+      } 
+      this.getStressArray(sensorArray,dateList);
+    }
+  },
+
+
+  // 底部导航
+   onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+
+  //跳转到项目概况页面
+  XMGK:function(){
+    wx.redirectTo({
+      url: '../xiangmugaikuang/xiangmugaikuang'
+    })
+  },
+  
+
+  //跳转到设备管理
+  SBGL:function(){
+    wx.redirectTo({
+      url: '../shebieguanli-jxsb/shajiangguan',
+    })
+  },
+
+  //跳转到人员管理
+  RYGL:function(){
+      wx.redirectTo({
+        url: '../renyuanguanli/renyuanguanli'
+      })
+  },
+
+  //跳转到更多功能
+  GDGN:function(){
+    wx.redirectTo({
+    url: '../gengduogongneng/gengduogongneng'
+    })                                                                
+  },
+
+  //退出登录
+  TCDL:function(){
+     wx.clearStorageSync();
+     wx.setStorageSync('isReload', "1")
+      wx.redirectTo({
+        url: '../login/login',
+      })
+    },
+
+  //返回到地图页面
+  GOMAP:function(){
+      wx.redirectTo({
+        url: '../map/map',
+      })
+  },  
+
+  //返回到安全管理页面
+  goGCLB:function(){
+    wx.redirectTo({
+      //url: '../gongchengliebiao/gongchengliebiao'
+      url:'../newAddPage/safetyManagement/index'
+    })
+  }
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/deepExcavation/index.json b/miniprogram/pages/deepExcavation/index.json
new file mode 100644
index 0000000..dd03d55
--- /dev/null
+++ b/miniprogram/pages/deepExcavation/index.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" ,
+    "van-popup": "@vant/weapp/popup/index",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item"
+  },
+  "navigationBarTitleText": "安全管控"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/deepExcavation/index.wxml b/miniprogram/pages/deepExcavation/index.wxml
new file mode 100644
index 0000000..513cdc6
--- /dev/null
+++ b/miniprogram/pages/deepExcavation/index.wxml
@@ -0,0 +1,186 @@
+<!--pages/deepExcavation/index.wxml-->
+<!-- <view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">安全管控</view>
+      </van-col>
+    </van-row>
+  </view>
+</view> -->
+
+<!-- 左侧账号信息 -->
+<!-- <van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+
+<view class="max_new_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+  <!-- <view class="video_add">
+    <view class="video_address">
+      <view class="video_address_min" bindtap="GOMAP">
+        {{projectName}}
+      </view>
+    </view>
+  </view> -->
+
+  <view class="deep_select">
+    <van-row>
+      <van-col span="12">
+        <view class="deep_select_padding">
+          <deep-select columns="{{DeviceGroupData}}" selectValue="{{sensorTypeName}}" selectIndex="{{sensorTypeIndex}}" placeholder="请选择设备组" bindchange="onDeviceGroupSelect"></deep-select>
+        </view>
+      </van-col>
+      <van-col span="12">
+        <view class="deep_select_padding">
+          <deep-select columns="{{DeviceGroupNameData}}" placeholder="请选择设备组名称" bindchange="onDeviceGroupNameSelect"></deep-select>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+
+  <view class="deep_point_position">
+      <view class="{{statePosit == 1?'active':''}}" bindtap="onStatePosit" data-state="1">位移（<text>{{shiftCount}}</text>）</view>
+      <view class="{{statePosit == 2?'active':''}}" bindtap="onStatePosit" data-state="2">倾斜（<text>{{tiltCount}}</text>）</view>
+      <view class="{{statePosit == 3?'active':''}}" bindtap="onStatePosit" data-state="3">应力（<text>{{stressCount}}</text>）</view>
+  </view>
+  <van-sticky offset-top="{{ 78 }}">
+    <view class="modify_video_nav modify_video_nav_af">
+        <view class="{{stateNav==1?'active':''}}" bindtap="onStateSelect" data-state="1"><text>报警({{callPoliceCount}})</text></view>
+        <view class="{{stateNav==2?'active':''}}" bindtap="onStateSelect" data-state="2"><text>预警({{earlyWarningCount}})</text></view>
+        <view class="{{stateNav==3?'active':''}}" bindtap="onStateSelect" data-state="3"><text>离线({{offlineCount}})</text></view>
+        <view class="{{stateNav==4?'active':''}}" bindtap="onStateSelect" data-state="4"><text>正常({{normalCount}})</text></view>
+    </view>
+  </van-sticky>
+  <view class="deep_modular_max">
+  
+    <view class="deep_modular_min" wx:for="{{sensorArray}}" wx:if="{{item.type == 2}}"> 
+      <view class="deep_modular_title"> 
+          <view class="deep_qingxie">{{item.pointName}}</view> 
+          <select-btn bindchange="onQingxie1" data-deviceId="{{item.deviceId}}"></select-btn> 
+      </view> 
+      <bar-chart chart-id="chart1" wx:if="{{item.displayState}}" chart-data="{{item.lineChart}}"></bar-chart>  
+      <bar-chart chart-id="chart1" wx:if="{{!item.displayState}}" chart-data="{{item.lineChartSum}}"></bar-chart>  
+    </view> 
+
+    <view class="deep_modular_min" wx:for="{{sensorArray}}" wx:if="{{item.type == 1}}">
+      <view class="deep_modular_title">
+          <view class="deep_weiyi">{{item.pointName}}</view>
+          <select-btn bindchange="onWeiyi1" data-deviceId="{{item.deviceId}}"></select-btn>
+      </view>
+      <bar-chart-warning chart-id="chart2" wx:if="{{item.displayState}}" chart-data="{{item.lineChart}}"></bar-chart-warning> 
+      <bar-chart-warning chart-id="chart2" wx:if="{{!item.displayState}}" chart-data="{{item.lineChartSum}}"></bar-chart-warning> 
+    </view>
+  </view>
+</view>
+
+<!-- 底部导航
+<van-tabbar active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
+  <van-tabbar-item bindtap="XMGK" >
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    项目概况
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="SBGL">
+    <image
+      slot="icon"
+      src="/images/footer_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    设备管理
+    </van-tabbar-item>
+
+  <van-tabbar-item bindtap="RYGL">
+    <image
+      slot="icon"
+      src="/images/footer_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    人员管理
+  </van-tabbar-item>
+
+  <van-tabbar-item>
+    <image
+      slot="icon"
+      src="/images/footer_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    安全管控
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="GDGN">
+    <image
+      slot="icon"
+      src="/images/footer_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height:40rpx;"
+    />
+    更多功能
+  </van-tabbar-item>
+</van-tabbar> -->
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pages/deepExcavation/index.wxss b/miniprogram/pages/deepExcavation/index.wxss
new file mode 100644
index 0000000..fb47d7f
--- /dev/null
+++ b/miniprogram/pages/deepExcavation/index.wxss
@@ -0,0 +1,8 @@
+/* pages/deepExcavation/index.wxss */
+.van-picker__mask  {
+    background-image: none !important;
+  }
+  .van-hairline--top-bottom:after {
+    border-top: 1px solid #3a4c8b !important;
+    border-bottom: 1px solid #3a4c8b !important;
+  }
\ No newline at end of file
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/gengduogongneng.js
new file mode 100644
index 0000000..322be6f
--- /dev/null
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.js
@@ -0,0 +1,209 @@
+// pages/gengduogongneng/gengduogongneng.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active:4,  
+    show: false,
+    projectId:'',
+    projectName:'' ,
+    loginName:'',
+    userName:'',
+    nickName:'',
+    deptName:'',
+    remark:'',
+    roleId:'',
+    roleName:'',
+    menuList:[],
+    initData:{},
+    hiddenn:true,
+  },
+  
+    
+  //项目切换 返回值
+  onProjectSelect(e){
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+    
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            roleId:res.data.roleId,
+            roleName:res.data.roleName,
+            remark:res.data.remark,
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            nickName:res.data.nickName,
+            deptName:res.data.deptName,
+            projectId:app.globalData.projectId,
+            projectName:app.globalData.projectName,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          }) 
+        }
+      })
+      that.selectMenuList();
+  },
+
+  selectMenuList:function(){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userLogin/selectMenuList',
+      method:"get",
+      success:function(res){
+        if(res.data.code =='200'){
+            that.setData({
+              menuList:res.data.data
+            })
+        }
+      }
+    })
+  },
+
+  goMenu:function(event){
+    let id = event.currentTarget.dataset.id;
+    if(id == 'CLSSQE'){
+		//材料实收确认
+		wx.getStorage({
+			key: 'userinfo',
+			success:function(res){
+              wx.navigateToMiniProgram({
+                appId: 'wxc44b5d588f599758',
+                path: `pages/tabbar/order-new/index?type=0&szhUserId=${res.data.userId}&szhUserName=${res.data.userName}`
+              })
+            }
+		})
+    //   wx.navigateToMiniProgram({
+    //     appId: 'wx7c39a25db91228f7',
+    //     path: 'pages/tabbar/order-new/index?type=0'
+    //   })
+    }else if(id == 'LSRYSH'){
+      //临时人员审核
+      wx.navigateTo({
+        url: '../temporaryToExamine/index',
+      })
+    }else if(id == 'FQJPYS'){
+      //发起举牌验收
+      wx.navigateTo({
+        url: '../check_accept_initiate/index',
+      })
+    }else if(id == 'TJJPYS'){
+      //提交举牌验收
+      wx.navigateTo({
+        url: '../check_accept_list/index',
+      })
+    }else{
+      wx.navigateTo({
+        url: event.currentTarget.dataset.url
+      })
+    }
+  },
+
+
+   // 底部导航
+   onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+
+  //跳转到项目概况页面
+  XMGK:function(){
+    wx.redirectTo({
+      url: '../xiangmugaikuang/xiangmugaikuang'
+    })
+  },
+
+  //跳转到设备管理
+  SBGL:function(){
+    app.toast("敬请期待！");
+      // wx.redirectTo({
+      //   url: '../shebieguanli-jxsb/shajiangguan',
+      // })
+  },
+
+  //跳转到人员管理
+  RYGL:function(){
+    app.toast("敬请期待！");
+    // wx.redirectTo({
+    //   url: '../renyuanguanli/renyuanguanli'
+    // })
+  },
+
+  //跳转到安全管控
+  JDGL:function(){
+    app.toast("敬请期待！");
+    // wx.redirectTo({
+    //   url:'../newAddPage/safetyManagement/index'
+    // }) 
+  },
+
+    //跳转到安全管理
+    XMSP:function(){
+      app.toast("敬请期待！");
+      // wx.redirectTo({
+      //   url:'../Quality-Assurance/index'
+      // }) 
+    },
+
+  //跳转到质量管理
+  ZLGL2:function(){
+    app.toast("敬请期待！");
+    // wx.redirectTo({
+    //   url:'../Quality-Assurance/index'
+    // }) 
+  },
+   //跳转到进度管理
+   JDGL2:function(){
+    app.toast("敬请期待！");
+    // wx.redirectTo({
+    //   //url: '../deepExcavation/index'
+    //   url:'../../pageage/Progress-management/index'
+    // }) 
+  },
+  //退出登录
+  TCDL:function(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+      url: '../login/login',
+    })
+  },
+  //修改密码
+  XGMM:function(){
+    wx.redirectTo({
+      url: '../updatePassword/updatePassword'
+      }) 
+  },
+  //返回到工程列表页面
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../gongchengliebiao/gongchengliebiao'
+    })
+  },
+  
+})
\ No newline at end of file
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.json b/miniprogram/pages/gengduogongneng/gengduogongneng.json
new file mode 100644
index 0000000..f0d5000
--- /dev/null
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.json
@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml
new file mode 100644
index 0000000..e79919d
--- /dev/null
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml
@@ -0,0 +1,195 @@
+<!--pages/gengduogongneng/gengduogongneng.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">更多功能</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<!-- 左侧账号信息 -->
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose1" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="24">
+          <view class="left_info_dept">{{deptName}}</view>
+      </van-col>
+      <van-col span="10">
+        <view class="left_head"><image src="../../images/user_3.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{nickName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+    <!--<view class="left_manage_max">
+       <view class="left_manage_min">
+        <view class="left_manage">
+          <image src="/images/set.png" class="left_icon"></image>
+          <text class="left_pro">账号管理</text> 
+          <image src="/images/right.png" class="left_flaot"></image>
+        </view>
+      </view>
+      <view class="left_manage_min">
+        <view class="left_manage">
+          <image src="/images/set.png" class="left_icon"></image>
+          <text class="left_pro">账号管理</text> 
+          <image src="/images/right.png" class="left_flaot"></image>
+        </view>
+      </view> 
+    </view>-->
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="XGMM">
+        <view class="left_password">
+          修改密码
+        </view>
+      </view>
+    </view>
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view>
+  </view>
+</van-popup>
+
+<view class="max_content">
+  <project-select init="{{initData}}"  bindchange="onProjectSelect"></project-select>
+
+  <view  class="gd_max" style="margin-top: 20rpx;">
+    <van-row class="demo clearfix">
+      <van-col span="8" wx:for="{{menuList}}" wx:key="unique">
+        <view class="gd_min" data-id="{{item.menu_identi}}" data-url="{{item.menu_url}}" bindtap="goMenu">
+          <image src="{{item.menu_img}}"></image>
+          <view>{{item.menu_name}}</view>
+        </view>
+      </van-col>
+
+      <!-- <view wx:if="{{hiddenn}}">
+        <van-col span="8">
+          <view class="gd_min" data-id="LSRYSH" bindtap="goMenu">
+            <image src="http://fileimg.makalu.cc/9d89ded5257f45efabff0c7315c588b4.png"></image>
+            <view>临时人员审核</view>
+          </view>
+        </van-col>
+      </view>
+
+      <view wx:if="{{roleId == 15}}">
+        <van-col span="8">
+          <view class="gd_min" data-id="FQJPYS" bindtap="goMenu">
+            <image src="http://fileimg.makalu.cc/9d89ded5257f45efabff0c7315c588b4.png"></image>
+            <view>发起验收</view>
+          </view>
+        </van-col>
+      </view>
+
+      <view wx:if="{{roleId == 16}}">
+        <van-col span="8">
+          <view class="gd_min" data-id="TJJPYS" bindtap="goMenu">
+            <image src="http://fileimg.makalu.cc/9d89ded5257f45efabff0c7315c588b4.png"></image>
+            <view>举牌验收</view>
+          </view>
+        </van-col>
+      </view> -->
+      
+    </van-row>
+  </view>
+</view>
+
+<van-tabbar active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
+
+  <van-tabbar-item class="aaaaaaaaaaa" bindtap="XMGK">
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    项目概况
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="XMSP">
+    <image
+      slot="icon"
+      src="/images/footer_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    安全管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="ZLGL2">
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    质量管理
+    </van-tabbar-item>
+    
+    <van-tabbar-item bindtap="JDGL2">
+    <image
+      slot="icon"
+      src="/images/footer_6.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_6.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    进度管理
+  </van-tabbar-item>
+
+  <van-tabbar-item>
+    <image
+      slot="icon"
+      src="/images/footer_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height:40rpx;"
+    />
+    更多功能
+  </van-tabbar-item>
+</van-tabbar>
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxss b/miniprogram/pages/gengduogongneng/gengduogongneng.wxss
new file mode 100644
index 0000000..d276d87
--- /dev/null
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.wxss
@@ -0,0 +1,23 @@
+/* pages/gengduogongneng/gengduogongneng.wxss */
+.more_max{
+  padding:10rpx  30rpx 30rpx;
+}
+.more_manage{
+  border-radius: 10rpx;
+  margin-top: 50rpx;
+}
+.gd_max{
+  padding:10rpx 50rpx 0;
+}
+.gd_min{
+  padding: 30rpx 0;
+  text-align: center;
+}
+.gd_min image{
+  width: 150rpx;
+  height: 150rpx;
+}
+.gd_min view{
+  padding: 10rpx;
+  color: #89a4eb;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.js b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
new file mode 100644
index 0000000..7982f4a
--- /dev/null
+++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
@@ -0,0 +1,596 @@
+// pages/gongchengliebiao/gongchengliebiao.js\
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    userInfo:{},
+    title:'工程列表',
+    ids: "",
+    value1:'省',
+    value2:'市/区',
+    value3:'公司',
+    show1: false,
+    show2: false,
+    show3: false,
+    sheng:[],
+    citys:{},
+    companys:{},
+    cityArea: [],
+    company: [],
+    proCount:'0',
+    projectInfoList:{},
+    projectData:[],
+    ifSonCompany:'',
+    ifDeptId:false,
+    deptId:'',
+    type:'',
+    popUp1:false,
+    popUp2:false,
+    popUp3:false,
+    companyId:'',
+    paramPost:'',
+    loadShow:false,
+    //省、市、区
+    provinceId:'',
+    cityId:'',
+    areaId:'',
+    //////新版本/////
+    showTest:false,
+    tabActive:0,
+    jt:[],
+    shengGs:[],
+    ziGs:[],
+    nav1: "0",
+    nav2: "-1",
+    nav3: "-1",
+    classA:"",
+    classB:"",
+    classC:"",
+    flag1:true,
+    flag2:false,
+    flag3:false,
+    Highlight1:"active",
+    Highlight2:"",
+    Highlight3:"",
+    title2:false,
+    title3:false,
+    dataclass1:0,
+    dataclass2:0,
+    dataclass3:0,
+    overall1:"",
+    overall2:"",
+    overall3:"",
+    newCompanyId:'',
+    choiceShow:false,
+    //模糊查询参数
+    FuzzyPorjectId:"",
+    FuzzyDeptId:"",
+    FuzzyCompanyId:"",
+    FuzzyType:"",
+    FuzzyifSonCompany:"",
+    Fuzzylist:[], 
+  },
+
+  onclassA(event){
+    this.setData({nav1: event.target.dataset.index});
+    this.setData({dataclass1: 1});
+    if(this.data.dataclass1 == 1){
+      this.setData({title2: true});
+    }
+    this.setData({classA: event.target.dataset.name});
+    this.setData({overall1: event.target.dataset.name,newCompanyId:event.target.dataset.id});
+    this.setData({value3:event.target.dataset.name})
+    //获取子公司信息
+    this.setData({showTest:false})
+    wx.setStorageSync('select_dept_id', event.target.dataset.id)
+    wx.setStorageSync('select_dept_name', event.target.dataset.name)
+    wx.setStorageSync('select_dept_index', event.target.dataset.index)
+    this.selectProjectByCompanyId(event.target.dataset.id,'','','');
+    //this.selectCompanyJG(event.target.dataset.id,'SGS');
+  },  
+  onclassB(event){
+    this.setData({nav2: event.target.dataset.index});
+    this.setData({dataclass2: 1});
+    if(this.data.dataclass2 == 1){
+      this.setData({title3: true});
+    }
+    this.setData({classB:  " / " + event.target.dataset.name });
+    this.setData({overall2:  event.target.dataset.name,newCompanyId:event.target.dataset.id });
+    this.setData({value3:this.data.overall1 + " / "+ event.target.dataset.name})
+    //获取子公司信息
+    this.selectCompanyJG(event.target.dataset.id,'GS');
+  },
+
+  onclassC(event){
+    this.setData({nav3: event.target.dataset.index});
+    this.setData({dataclass3: 1});
+    this.setData({classC:  " / " + event.target.dataset.name });
+    this.setData({overall3:  event.target.dataset.name ,newCompanyId:event.target.dataset.id});
+    this.setData({value3:  this.data.overall1 + " / " +  this.data.overall2 + " / " + event.target.dataset.name});
+  },
+
+  queren(event){
+    //加载蒙版
+    this.onClickShow();
+    this.setData({ showTest: false});
+    this.setData({ show3: false });
+    if(this.data.overall1 == ""){
+      this.setData({value3:""});
+    }else if(this.data.overall2 == ""){
+      this.setData({value3:  this.data.overall1 + " / "});
+    }else if(this.data.overall3 == ""){
+      this.setData({value3:  this.data.overall1 + " / " +  this.data.overall2 + " / " });  
+    }else{
+      this.setData({value3:  this.data.overall1 + " / " +  this.data.overall2 + " / " +  this.data.overall3});
+    }
+    
+    let companyId = this.data.newCompanyId;
+    let provinceId = this.data.provinceId;
+    let cityId = this.data.cityId;
+    let areaId = this.data.areaId;
+    this.selectProjectByCompanyId(companyId,provinceId,cityId,areaId);
+  },
+
+
+  tabTltie(event){
+    var id = event.currentTarget.id;
+    if(id == 1){
+      this.setData({flag1:true})
+      this.setData({flag2:false})
+      this.setData({flag3:false})
+      this.setData({Highlight1:"active"})
+      this.setData({Highlight2:""})
+      this.setData({Highlight3:""})
+      this.setData({title2:false})
+      this.setData({title3:false})
+      this.setData({classA:""})
+      this.setData({classB:""})
+      this.setData({classC:""})
+      this.setData({nav2: "-1"});
+      this.setData({nav3: "-1"});
+      this.setData({overall1:"",overall2:"",overall3:""})
+    }else if(id == 2){
+      this.setData({flag1:false})
+      this.setData({flag2:true})
+      this.setData({flag3:false})
+      this.setData({Highlight1:""})
+      this.setData({Highlight2:"active"})
+      this.setData({Highlight3:""})
+      this.setData({title3:false})
+      this.setData({classB:""})
+      this.setData({classC:""})
+      this.setData({nav3: "-1"});
+      this.setData({overall2:"",overall3:""})
+    }else{
+      this.setData({flag1:false})
+      this.setData({flag2:false})
+      this.setData({flag3:true})
+      this.setData({Highlight1:""})
+      this.setData({Highlight2:""})
+      this.setData({Highlight3:"active"})
+      this.setData({overall3:""})
+      this.setData({classC:""})
+    }
+  },
+
+  showTest() {
+    if(this.data.popUp3 == false){
+      this.setData({ showTest: true });
+    }
+  },
+  choice(){
+    this.setData({ choiceShow: true });
+  },
+  onCloseTest() {
+    this.setData({ showTest: false });
+    this.setData({ choiceShow: false });
+  },
+ 
+  onChangeSheng(event) {
+    //加载蒙版
+    this.onClickShow();
+    var province =   event.detail.value;
+    this.setData({ 
+      value1: province.text ,
+      value2:"市/区",
+      company: {},
+      ifDeptId:true,
+      provinceId:province.id,
+    });
+    this.setData({flag1:true})
+    this.setData({flag2:false})
+    this.setData({flag3:false})
+    this.setData({Highlight1:"active"})
+    this.setData({Highlight2:""})
+    this.setData({Highlight3:""})
+    this.setData({title2:false})
+    this.setData({title3:false})
+    this.setData({classA:""})
+    this.setData({classB:""})
+    this.setData({classC:""})
+    this.setData({nav2: "-1"});
+    this.setData({nav3: "-1"});
+    this.setData({ show1: false });
+    this.getDeptSubordinate(province.id);
+    this.selectProjectByCompanyId(this.data.userInfo.deptId,province.id,'','');
+  },
+
+  onChangeShiQu(event) {
+    //加载蒙版
+    this.onClickShow();
+    var city =   event.detail.value[0];
+    var area =   event.detail.value[1].text;
+    var sq = city+"/"+area
+    this.setData({ 
+      value2: sq ,
+      value3:"公司",
+      company: {},
+      ifDeptId:true,
+      cityId:area == '全部'?event.detail.value[1].id:'',
+      areaId:area == '全部'?'':event.detail.value[1].id
+    });
+    this.setData({flag1:true})
+    this.setData({flag2:false})
+    this.setData({flag3:false})
+    this.setData({Highlight1:"active"})
+    this.setData({Highlight2:""})
+    this.setData({Highlight3:""})
+    this.setData({title2:false})
+    this.setData({title3:false})
+    this.setData({classA:""})
+    this.setData({classB:""})
+    this.setData({classC:""})
+    this.setData({nav2: "-1"});
+    this.setData({nav3: "-1"});
+    this.setData({ show2: false });
+    this.selectProjectByCompanyId(deptId,'','',event.detail.value[1].id);
+  },
+
+  onChange1(event) {
+    const { picker, value, index } = event.detail;
+    picker.setColumnValues(1, this.data.citys[value[0]]);
+  },
+  onChange2(event) {
+    const { picker, value, index } = event.detail;
+    picker.setColumnValues(1, this.data.companys[value[0]]);
+  },
+
+  showPopup1() {
+    if(this.data.popUp1 == false){
+      this.setData({ show1: true });
+    }
+  },
+  showPopup2() {
+    if(this.data.popUp2 == false){
+      this.setData({ show2: true });
+    }
+  },
+
+  onCancel() {
+    this.setData({ show1: false });
+    this.setData({ show2: false });
+    this.setData({ show3: false });
+  },
+
+  onClose() {
+    this.setData({ show1: false });
+    this.setData({ show2: false });
+    this.setData({ show3: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+  onLogout(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+      url: '../login/login',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    //获取缓存中数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          userInfo:res.data,
+          value1:app.globalData.value1,
+          value2:app.globalData.value2,
+          value3:app.globalData.value3    
+        })
+         var json =JSON.parse(app.globalData.projectInfoList); 
+         if(json.find(item=>item.id=="-1")){
+          json.splice(json.findIndex(item=>item.id=="-1"),json.length);
+        }
+        if(app.globalData.type == "1"){
+          that.setData({
+            "type":'1',
+            title:"工程列表",
+            proCount:json.length,
+            projectInfoList:json,
+          })      
+        }else{
+            that.setData({
+              projectInfoList:JSON.parse(app.globalData.projectInfoList),
+              proCount:JSON.parse(app.globalData.projectInfoList).length,
+              title:"预警列表",
+              "type":'2',
+            })
+        }
+      //加载用户组织架构信息
+      that.getFilstDept(res.data.deptId,res.data.userId);
+      }
+    })
+  },
+
+   /**
+    * 加载用户组织架构信息
+    * @param {*} even 
+    * @param {*} even1 
+    */
+   getFilstDept:function(even,even1){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptAll',
+      data:{
+        "deptId":even,
+        "userId":even1
+      },
+      method:"GET",
+      success:function(res){
+        console.log(res.data);
+         //判断登录是否项目人员
+        if(res.data.projectId != undefined){ 
+          var projectData = [{projectId:res.data.projectId,projectName:res.data.projectName,projectAddress:res.data.projectAddress,companyName:res.data.companyName,streamNumber:res.data.streamNumber,projectCount:res.data.projectCount,videoNum:res.data.videoNum,monitoringCount:res.data.monitoringCount}]
+          that.setData({
+            value1:res.data.shengName,
+            value2:res.data.shiName+'/'+res.data.quName,
+            value3:res.data.companyName,
+            projectData:projectData,
+            popUp1:true,
+            popUp2:true,
+            popUp3:true,
+          })
+        }else{
+          var columns = [];
+          columns.push(res.data.province_list);
+          that.setData({
+            value1:res.data.shengName,
+            value2:res.data.shiName+'/'+res.data.quName,
+            value3:res.data.logCompanyName,
+            companyId:res.data.companyId,
+            paramPost:res.data.postId,
+            company:columns,
+            companys:columns,
+            jt:res.data.province_list,
+            popUp1:true,
+            popUp2:true
+          })
+          if(res.data.province_list.length==1){
+            that.setData({
+              popUp3:true
+            });
+          }else{
+            if(wx.getStorageSync('select_dept_index')!="" && wx.getStorageSync('select_dept_name')!=""){
+              that.setData({
+                nav1:wx.getStorageSync('select_dept_index'),
+                value3:wx.getStorageSync('select_dept_name')
+              });
+            }
+          }
+          if(wx.getStorageSync('select_dept_id')==""){
+            if(res.data.province_list.length==1){
+              that.selectProjectByCompanyId(res.data.deptId,'','','');
+            }else{
+              that.selectProjectByCompanyId("0",'','','');
+            }
+          }else{
+            that.selectProjectByCompanyId(wx.getStorageSync('select_dept_id'),'','','');
+          }
+        }
+      }
+    })
+  },
+
+  /**
+   * 获取市区信息
+   * @param {*} provinceId 
+   */
+  getDeptSubordinate:function(provinceId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptSubordinate',
+      data:{
+        "userId":this.data.userInfo.userId,
+        "provinceId":provinceId,
+        "deptId":this.data.userInfo.deptId
+      },
+      method:"GET",
+      success:function(res){
+        let citys = res.data;
+        let cityArea = [
+          {
+            values: Object.keys(citys),
+            className: 'column1',
+          },
+          {
+            values: citys[Object.keys(citys)[0]],
+            className: 'column2',
+            defaultIndex: 2,
+          },
+        ]  
+        that.setData({
+          cityArea: cityArea,
+          citys:citys
+        })
+      }
+    })
+  },
+
+  /**
+   * 根据公司筛选项目信息
+   * @param {*} deptId 
+   * @param {*} provinceId 
+   * @param {*} cityId 
+   * @param {*} areaId 
+   */
+  selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectByCompanyId',
+      data:{
+        "userId":this.data.userInfo.userId,
+        "deptId":deptId,
+        "provinceId":provinceId,
+        "cityId":cityId,
+        "areaId":areaId
+      },
+      method:"GET",
+      success:function(res){
+        that.setData({
+          projectData:res.data
+        })  
+        if(that.data.type == 1){
+          that.setData({
+            proCount:res.data.length,
+            projectInfoList:res.data,
+          }) 
+        }else{
+          that.getEnvironCount(deptId,'',provinceId,cityId,areaId);
+        } 
+        //关闭蒙版
+        that.onClickHide();
+      }
+    })
+  },
+
+  /**
+   * 根据组织架构查询出公司信息
+   * @param {*} deptId 
+   * @param {*} state 
+   */
+  selectCompanyJG:function(deptId,state){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectCompanyJG',
+      data:{
+        "deptId":deptId
+      },
+      method:"GET",
+      success:function(res){
+        if(state=="SGS"){
+          that.setData({
+            shengGs:res.data
+          })
+        }else{
+          that.setData({
+            ziGs:res.data
+          })
+        }
+      }
+    })
+  },
+
+  //获取当前预警信息
+  getEnvironCount:function(deptId,projectId,provinceId,cityId,areaId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/applets/getEnvironCount',
+      method:'GET',
+      data:{
+        "deptId":deptId,
+        "projectId":projectId,
+        "provinceId":provinceId,
+        "cityId":cityId,
+        "areaId":areaId,
+      },
+      success:function(res){
+        that.setData({
+          projectInfoList:res.data,
+          proCount:res.data.length
+        })
+      }
+    })
+  },
+
+  //返回到地图页面
+  returnMap:function(){
+    wx.redirectTo({
+      url: '../map/map',
+    })
+  },
+
+   //模糊查询项目信息
+   actqu:function(event){
+    var that = this;
+    that.setData({Fuzzylist:[]});
+    if(event.detail.value != ""){
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectInfoByName',
+        data:{
+          "projectName":event.detail.value,
+          "deptId":this.data.FuzzyDeptId,
+          "companyId":this.data.FuzzyCompanyId,
+          "type":this.data.FuzzyType,
+          "projectId":this.data.FuzzyPorjectId,
+          "ifSonCompany":this.data.FuzzyifSonCompany,
+          "state":app.globalData.type
+        },
+        method:"GET",
+        success:function(res){
+          that.setData({
+            Fuzzylist:res.data
+          })
+        }
+      })
+    }else{
+      that.setData({Fuzzylist:[]});
+    }
+  },
+
+  //点击数据
+  checkProjetName:function(event){
+    var newList = [];
+    var list = event.currentTarget.dataset.list;
+    var projectName = event.currentTarget.dataset.name;
+    for(var i =0;i<list.length;i++ ){
+        if(list[i].projectName == projectName){
+          newList.push(list[i]);
+        }
+    }
+    this.setData({
+      projectInfoList:newList,
+      proCount:newList.length,
+      choiceShow:false,
+    })
+  },
+
+  //跳转到项目概况
+  checkProject:function(even){
+    //赋值到公共参数
+    app.globalData.projectId = even.currentTarget.dataset['id'];
+    app.globalData.projectName = even.currentTarget.dataset['name'];
+    app.globalData.projectInfoList = JSON.stringify(this.data.projectInfoList);
+    app.globalData.type = this.data.type;
+    app.globalData.value1 = this.data.value1;
+    app.globalData.value2 = this.data.value2;
+    app.globalData.value3 = this.data.value3;
+    wx.redirectTo({
+      url: '../xiangmugaikuang/xiangmugaikuang',
+    })
+
+  }
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.json b/miniprogram/pages/gongchengliebiao/gongchengliebiao.json
new file mode 100644
index 0000000..f4ef619
--- /dev/null
+++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.json
@@ -0,0 +1,16 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-popup": "@vant/weapp/popup",
+    "van-button": "@vant/weapp/button",
+    "van-picker": "@vant/weapp/picker/index",
+    "van-area": "@vant/weapp/area/index",
+    "mkl-multi-select": "/components/@mkl/multi-select/index" ,
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+
+  "navigationStyle":"custom"
+
+}
\ No newline at end of file
diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml b/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml
new file mode 100644
index 0000000..e2d29dd
--- /dev/null
+++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml
@@ -0,0 +1,166 @@
+<!--pages/gongchengliebiao/gongchengliebiao.wxml-->
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="returnMap"><image src="/images/left.png"></image></view>
+      </van-col>
+      <van-col span="3">
+        <view class="header_img"><image src="http://fileimg.makalu.cc/8bc074838f1b40ca91d009879cd4d6a4.png" bindtap="choice"></image></view>
+      </van-col>
+      <van-col span="12">
+        <view class="header_name">{{title}}</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+<button  bindtap="onLogout"  style="width: 60px;padding: 0px;height: 60px;line-height: 60px;border-radius: 30px;color: #8ca4ee;position: fixed;bottom: 20px;right: 20px;text-align: center;">退出</button>
+<view class="max_content">
+ 
+
+ 
+  <view class="list_max">
+    <van-row gutter="5">
+      <van-col span="6">
+        <view class="list_min" bindtap="showPopup1">
+          <van-col span="17">
+            <view class="list_min_1">{{value1}}</view>
+          </van-col>
+          <van-col span="7">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+      
+
+      <van-popup show="{{ show1 }}" bind:close="onClose"  position="bottom">       
+        <view class="map_list_info">
+          <van-picker show-toolbar  default-index="{{1}}" columns="{{ sheng }}"  bind:cancel="onCancel" bind:confirm="onChangeSheng"/>
+        </view>
+      </van-popup>
+
+      <van-col span="8">
+        <view class="list_min" bindtap="showPopup2">
+          <van-col span="19">
+            <view class="list_min_1">{{value2}}</view>
+          </van-col>
+          <van-col span="5">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+      
+      <van-popup show="{{ show2 }}" bind:close="onClose"  position="bottom">       
+        <view class="map_list_info">
+          <van-picker show-toolbar columns="{{ cityArea }}" bind:confirm="onChangeShiQu"  bind:cancel="onCancel"  bind:change="onChange1"/>
+        </view>
+      </van-popup>
+
+
+      <van-col span="10">
+        <view class="list_min" bindtap="showTest">
+          <van-col span="19">
+            <view class="list_min_1">{{value3}}</view>
+          </van-col>
+          <van-col span="5">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+
+      <van-popup  position="bottom"  show="{{ showTest }}" bind:close="onCloseTest">
+        <!-- <view class="all_name">
+          {{classA}}
+        </view> -->
+        <!-- <text class="queren" bindtap="queren">确认</text> -->
+        <!-- <view class="tab_max_tltie">
+          <text class="{{ Highlight1  }}" bindtap="tabTltie" id="1">集团公司</text>
+          <text class="{{ Highlight2 }}" wx:if="{{title2}}" bindtap="tabTltie" id="2">省公司</text>
+          <text class="{{ Highlight3  }}" wx:if="{{title3}}" bindtap="tabTltie" id="3">子公司</text>
+        </view> -->
+        <view class="max_tab_name" wx:if="{{flag1}}">
+          <view class="font_color {{ index == nav1  ? 'active1' :' ' }}" wx:for = "{{jt}}" wx:key="jt" data-index="{{index}}" bindtap="onclassA" data-name="{{item.text}}" data-id="{{item.id}}"> {{item.text}} </view>
+        </view>
+        <view class="max_tab_name" wx:if="{{flag2}}">
+          <view class="font_color {{ index == nav2  ? 'active2' :' ' }}" wx:for = "{{shengGs}}" wx:key="shengGs" data-index="{{index}}" bindtap="onclassB" data-name="{{item.text}}" data-id="{{item.id}}"> {{item.text}}</view>
+        </view>
+        <view class="max_tab_name" wx:if="{{flag3}}">
+            <view class="font_color {{ index == nav3  ? 'active3' :' ' }}" wx:for = "{{ziGs}}" wx:key="ziGs" data-index="{{index}}" bindtap="onclassC" data-name="{{item.text}}" data-id="{{item.id}}"> {{item.text}}</view>
+        </view>
+      </van-popup>
+
+
+
+    </van-row>
+   
+  </view>
+  <view class="address {{class}}">
+    {{value1}}/{{value2}}/{{value3}}
+  </view>
+
+
+  <view class="list_title">
+    总工程数<text>（{{proCount}}）</text>
+  </view>
+  <view class="list_option_max">
+
+    <view class="list_option" wx:for="{{projectInfoList}}" wx:key="projectInfoList" wx:if="{{index<150}}">
+          <view class="list_right" bindtap="checkProject" data-id="{{item.projectId}}" data-name="{{item.projectName}}">
+            <view class="list_left">{{item.companyName}}</view>
+            <view class="list_con_bottom">
+              <view class="list_right_name">{{item.projectName}}</view>
+              <view class="list_right_address">{{item.projectAddress}}</view>
+              <view class="list_right_info">
+              <van-row> 
+                <van-col span="8" wx:if="{{item.projectCount != '0'}}">
+                  <text class="list_warning active">预警({{item.projectCount}})</text>
+                </van-col>
+                <van-col span="8" wx:if="{{item.projectCount == '0'}}">
+                  <text class="list_warning">预警({{item.projectCount}})</text>
+                </van-col>
+                <van-col span="8" wx:if="{{item.videoNum != '0'}}">
+                  <text class="list_video active">视频({{item.videoNum}})</text>
+                </van-col>
+                <van-col span="8" wx:if="{{item.videoNum == '0'}}">
+                  <text class="list_video">视频({{item.videoNum}})</text>
+                </van-col>
+                <van-col span="8" wx:if="{{item.monitoringCount != '0'}}">
+                  <text class="list_dust active">结构体({{item.monitoringCount}})</text>
+                </van-col>
+                <van-col span="8" wx:if="{{item.monitoringCount == '0'}}">
+                  <text class="list_dust">结构体({{item.monitoringCount}})</text>
+                </van-col>
+                </van-row>
+              </view>
+            </view>
+          </view>
+    </view>
+  </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+<van-popup show="{{ choiceShow }}" bind:close="onCloseTest">
+  <view class="choice_max">
+    <view class="choice_tltie">项目筛选</view>
+    <view class="choice_input">
+      <input placeholder="请输入要搜索的关键字" bindinput="actqu"/>
+    </view>
+    <view class="choice_content">
+      <view class="choice_content_max" >
+        <view class="choice_content_min" wx:for="{{Fuzzylist}}" wx:key="Fuzzylist" wx:if="{{index<50}}" bindtap="checkProjetName" data-list="{{Fuzzylist}}" data-name="{{item.projectName}}">{{item.projectName}}</view>
+      </view>      
+    </view>  
+  </view>
+</van-popup>
diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxss b/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxss
new file mode 100644
index 0000000..8499c97
--- /dev/null
+++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxss
@@ -0,0 +1,323 @@
+/* pages/gongchengliebiao/gongchengliebiao.wxss */
+.list_max{
+  padding: 0 30rpx;
+  margin: 30rpx 0 10rpx;
+}
+.list_min{
+  border-radius:10rpx;
+  background: #2b345b;
+  height: 80rpx;
+}
+.list_min_1{
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 28rpx;
+  padding-left: 10rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+
+}
+.list_min_2{
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+.list_bottom{
+  width:30rpx;
+  height:30rpx;
+}
+.list_title{
+  color:#8ca4ee;
+  font-size: 24rpx;
+  padding: 20rpx 30rpx;
+}
+.list_title text{
+  font-size: 26rpx;
+  color: #1aeff5;
+}
+
+
+.list_option_max{
+  padding:20rpx 30rpx;
+}
+.list_option{
+  margin-bottom: 40rpx;
+  background: #222840;
+  border-radius: 30rpx;
+}
+.list_left{
+  background: #273051;
+  border-radius: 30rpx 30rpx 0 0 ;
+  height: 80rpx;
+  font-size: 32rpx;
+  color: #14feff;
+  line-height: 80rpx;
+  padding-left: 30rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+}
+.list_right{
+  font-size: 24rpx;
+}
+.list_con_bottom{
+  padding: 30rpx;
+}
+.list_right_name{
+  font-size: 30rpx;
+}
+.list_right_address{
+  padding: 20rpx 0 20rpx 35rpx;
+  color:#8ca4ee;
+  background: url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/35rpx;
+}
+.list_right_info{
+  padding: 10rpx 0;
+  font-size: 22rpx;
+}
+.list_warning{
+  background: url("http://fileimg.makalu.cc/CORE_632B884CD4084C4F8E556AB742809723.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.list_video{
+  background: url("http://fileimg.makalu.cc/CORE_970838B4C6F54BC7B33BB9F198D50130.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.list_dust{
+  background: url("http://fileimg.makalu.cc/62bfb39a8e5944f99a14c02922ffb80e.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.list_warning.active{
+  background: url("http://fileimg.makalu.cc/CORE_ACFA3598B4C943EB836848A6977C4189.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.list_video.active{
+  background: url("http://fileimg.makalu.cc/CORE_48D684509A314D55BD3B61EFFB77EF07.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.list_dust.active{
+  background: url("http://fileimg.makalu.cc/66036a52100146f5a36b0019849e8de0.png") no-repeat left/30rpx;
+  padding-left: 35rpx;
+}
+.sel_max{
+  width: 600rpx;
+  border-radius: 20rpx;
+  max-height: 800rpx;
+  padding: 30rpx;
+  background: #232a44;
+  border-radius: 20rpx;
+  overflow: auto;
+}
+.sel_min{
+  background: #273051;
+  height: 100rpx;
+  font-size: 28rpx;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+  line-height: 100rpx;
+  padding: 0 20rpx;
+  border-radius: 10rpx;
+  color: #14feff;
+  margin: 20rpx 0;
+}
+.sel_min:active{
+  background: #394577;
+}
+.van-popup.van-popup--center{
+  background: none; 
+}
+
+.address{
+  margin: 0 30rpx;
+  color: #8ca4ee;
+  font-size: 28rpx;
+  padding: 20rpx  0 20rpx 50rpx;
+  background: url("http://fileimg.makalu.cc/CORE_1F1F3A2778334D3EAC1226DDCEBD48D0.png") no-repeat left/40rpx;
+}
+.map_list_info{
+  background: #232a44;
+  padding: 0 30rpx;
+}
+
+.van-center-enter-to.van-center-enter-active{
+  border-radius: 20rpx;
+  background: #232a44;
+}
+.map_list_info_title{
+  padding: 30rpx;
+  text-align: center;
+}
+.map_list_info .van-picker{
+  background: none;
+}
+
+.map_list_info view{
+  background: none;
+}
+
+.map_list_info .van-picker-column{
+  color: #157dd2;
+}
+.map_list_info .van-picker-column__item--selected{
+  color: #00e3fe;
+}
+.map_list_info .van-hairline--top-bottom:after{
+  border-width: 0px 0;
+}
+
+/* -------------------------- */
+.van-popup.van-popup--bottom{
+  background: #232a44;
+}
+.all_name{
+  font-size: 26rpx;
+  padding:30rpx 20rpx;
+  line-height: 50rpx;
+  color: #00e3fe;
+}
+.van-tabs__scroll{
+  background: none !important;
+}
+.van-hairline--top-bottom:after{
+  border: none !important;
+}
+.van-tab.van-tab--active{
+  color: #14feff !important;
+}
+.van-tab{
+  color: #157dd2 !important;
+}
+.max_tab_name{
+  padding: 0 40rpx;
+  font-size:28rpx;
+  height: 430rpx;
+  overflow: auto;
+  margin-top: 20rpx;
+}
+
+.font_color{
+  padding: 15rpx 0;
+  color: #157dd2;
+}
+.active1{
+  color: #14feff 
+}
+.active2{
+  color: #14feff 
+}
+.active3{
+  color: #14feff ;
+}
+.van-tabs__line{
+  background-color:#14feff !important;
+}
+
+.tab_max_tltie{
+  padding:0 30rpx;
+  font-size: 30rpx;
+}
+.tab_max_tltie text{
+  padding: 30rpx ;
+  color: #999999;
+}
+.tab_max_tltie .active{
+  font-weight: bold;
+  color: #00e3fe;
+}
+
+.choice_max{
+  width: 500rpx;
+  background: #232a44;
+  padding:0 30rpx;
+}
+.choice_tltie{
+  text-align: center;
+  color: #00e3fe;
+  font-size: 28rpx;
+  padding: 20rpx 0;
+}
+.choice_input input{
+  border: 1px solid #00e3fe;
+  width: 100%;
+  height:60rpx;
+  border-radius: 50rpx;
+  font-size: 28rpx;
+  color: #00e3fe;
+  padding-left: 30rpx;
+  box-sizing: border-box;
+}
+.choice_content{
+  padding: 20rpx 0;
+}
+.choice_content_max{
+  max-height: 515rpx;
+  overflow: auto;
+}
+.choice_content_min{
+  padding: 10px 0;
+  border-bottom: 1px solid #39446f;
+  font-size: 24rpx;
+  color: #157dd2;
+}
+.choice_content_min:active{
+  color: #00e3fe;
+}
+.queren{
+  float: right;
+  position: relative;
+  right: 20rpx;
+  padding: 10rpx;
+  color: #157dd2;
+  font-size: 28rpx;
+}
+
+.choice_max{
+  width: 500rpx;
+  background: #232a44;
+  padding:0 30rpx;
+}
+.choice_tltie{
+  text-align: center;
+  color: #00e3fe;
+  font-size: 28rpx;
+  padding: 20rpx 0;
+}
+.choice_input input{
+  border: 1px solid #00e3fe;
+  width: 100%;
+  height:60rpx;
+  border-radius: 50rpx;
+  font-size: 28rpx;
+  color: #00e3fe;
+  padding-left: 30rpx;
+  box-sizing: border-box;
+}
+.choice_content{
+  padding: 20rpx 0;
+}
+.choice_content_max{
+  max-height: 515rpx;
+  overflow: auto;
+}
+.choice_content_min{
+  padding: 10px 0;
+  border-bottom: 1px solid #39446f;
+  font-size: 24rpx;
+  color: #157dd2;
+}
+.choice_content_min:active{
+  color: #00e3fe;
+}
+.queren{
+  float: right;
+  position: relative;
+  right: 20rpx;
+  padding: 10rpx;
+  color: #157dd2;
+  font-size: 28rpx;
+}
diff --git a/miniprogram/pages/hnt-strong/index.js b/miniprogram/pages/hnt-strong/index.js
new file mode 100644
index 0000000..b7df7ff
--- /dev/null
+++ b/miniprogram/pages/hnt-strong/index.js
@@ -0,0 +1,291 @@
+// pages/Standard-maintenance-room-monitoring/index.js
+const app = getApp();
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        projectId:'',
+        startTime:"",
+        endTime:"",
+        startTime2:"",
+        endTime2:"",
+        deviceNo:"1650041930114977794",
+        jianceList: [
+          {text:'1650041930114977794',id:'1650041930114977794'},
+          {text:'1650042067465850882',id:'1650042067465850882'},
+          {text:'1650042162466836481',id:'1650042162466836481'},
+          {text:'1650042250748547074',id:'1650042250748547074'}
+        ],
+        indexNum: 0,
+        biaoyangList: [
+            { name: '内置平均温度', biaoyangX: [], biaoyangY: [] },
+            { name: '外置平均温度', biaoyangX: [], biaoyangY: [] },
+        
+        ],
+        value:'本月',
+        value1:'本月',
+        actions: [{ name: '本月',id:0 }, { name: '累计', id:1},],
+        actions1: [{ name: '本月',id:0 }, { name: '累计', id:1},],
+        indexNum2: 0,
+        biaoyangList2: [
+            { name: '内置成熟度', biaoyangX: [], biaoyangY: [] },
+            { name: '外置成熟度', biaoyangX: [], biaoyangY: [] },
+            { name: '内置强度', biaoyangX: [], biaoyangY: [] },
+            { name: '外置强度', biaoyangX: [], biaoyangY: [] },
+        ],
+    },
+    // 点击进行超耗tab切换
+    onSelect(e) {
+        if(e.currentTarget.dataset.set ==0){
+            this.setData({
+                startTime:this.getDate(-6,1),
+                endTime:this.getDate(0,2),
+            })
+        }else{
+            this.setData({
+                startTime:this.getDate(-29,1),
+                endTime:this.getDate(0,2),
+            })
+        }
+        this.setData({
+            indexNum: e.currentTarget.dataset.set,
+        })
+        this.runList();
+    },
+    showPopup() {
+        this.setData({ show: true });
+      },
+      onClick(){
+        this.setData({
+            show1:true
+        })
+    },
+    onClick1(){
+        this.setData({
+            show2:true
+        })
+    },
+      onClose(){
+        this.setData({
+            show:false,
+            show1:false,
+            show2:false
+        })
+    },
+    goGCLB:function(){
+        wx.redirectTo({
+          url: '../../pages/Quality-Assurance/index'
+        })
+      },
+      onSelect1(e) {
+        if(e.currentTarget.dataset.set ==0){
+            this.setData({
+                startTime2:this.getDate(-6,1),
+                endTime2:this.getDate(0,2),
+            })
+        }else{
+            this.setData({
+                startTime2:this.getDate(-29,1),
+                endTime2:this.getDate(0,2),
+            })
+        }
+        this.setData({
+            indexNum2: e.currentTarget.dataset.set,
+        })
+        this.runList2();
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+         //获取缓存数据
+         wx.getStorage({
+            key: 'userinfo',
+            success:res=>{
+              this.setData({
+                loginName:res.data.loginName,
+                userName:res.data.userName,
+                projectId:app.globalData.projectId,
+                projectNameArgs:app.globalData.projectName,
+                initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+              })  
+              this.getProjectCorrespondence(app.globalData.projectId)
+            }
+          })
+        this.setData({
+            startTime:this.getDate(-6,1),
+            endTime:this.getDate(0,2),
+            startTime2:this.getDate(-6,1),
+            endTime2:this.getDate(0,2),
+        })
+        this.getProjectCorrespondence();
+    },
+    getDate(num,type){
+        var date = new Date(new Date().getTime()+num*24*60*60*1000);
+        var year = date.getFullYear();
+        var month = (date.getMonth()+1) > 9 ? (date.getMonth()+1):'0'+(date.getMonth()+1)
+        var day = date.getDate() > 9 ? date.getDate():'0'+date.getDate()
+        return year+"-"+month+"-"+day+(type==1?" 00:00:00":" 23:59:59");
+    },
+    /**
+     * 项目对应关系
+     */
+    getProjectCorrespondence() {
+        var that = this;
+        wx.request({
+            url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+            data: {
+                "projectId": 3//app.globalData.projectId,
+            },
+            method: "get",
+            success: function (res) {
+                that.setData({
+                    projectId :res.data.szh
+                })
+                that.runList();
+               that.runList2();
+            }
+        })
+    },
+    runList() {
+        var that = this;
+        wx.request({
+            url: app.globalData.szhUrl + '/api/iot/power/gainHntRunList',
+            data: {
+                "projectId": '1649949529732075522',
+                "startTime": that.data.startTime,
+                "endTime": that.data.endTime,
+                "deviceNo": that.data.deviceNo
+            },
+            header:{
+              'content-type': 'application/x-www-form-urlencoded' 
+            },
+            method: "post",
+            success: function (res) {
+                var data = {}
+                data.lineData = []
+                data.color = ['#008ffd', '#f6d023']
+                data.legend = ['内置平均温度', '外置平均温度']
+                data.unit = '℃'
+                data.date = []
+                var data1 = []
+                var data2 = []
+              
+                for (let row of res.data.data) {
+                    data.date.push(row.add_time.substr(0, 14) + "00");
+                    data1.push(row.min_temp)
+                    data2.push(row.max_temp)
+                }
+                data.lineData.push(data1)
+                data.lineData.push(data2)
+                that.setData({
+                    biaoyangList: data,
+                })
+             
+            }
+        })
+    },
+    runList2() {
+        var that = this;
+  
+        wx.request({
+          url: app.globalData.szhUrl + '/api/iot/power/gainHntRunList',
+          data: {
+              "projectId": '1649949529732075522',
+              "startTime": that.data.startTime,
+              "endTime": that.data.endTime,
+              "deviceNo": that.data.deviceNo
+          },
+          header:{
+            'content-type': 'application/x-www-form-urlencoded' 
+          },
+          method: "post",
+          success: function (res) {
+                var data = {}
+                data.lineData = []
+                data.color = ['#008ffd', '#f6d023', '#5af9fd', '#fc6902']
+                data.legend = ['内置成熟度', '外置成熟度','内置强度','外置强度']
+                data.unit = '%RH'
+                data.date = []
+                var data1 = []
+                var data2 = []
+                var data3 = []
+                var data4 = []
+              for (let row of res.data.data) {
+                data.date.push(row.add_time.substr(0, 14) + "00");
+                data1.push(row.strength)
+                data2.push(row.current_stre_outside)
+                data3.push(row.marturity)
+                data4.push(row.marturity_outside)
+              }
+              data.lineData.push(data1)
+              data.lineData.push(data2)
+              data.lineData.push(data3)
+              data.lineData.push(data4)
+              that.setData({
+                  biaoyangList2: data,
+              })
+           
+          }
+      })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    getData1(e){
+      this.setData({
+        deviceNo:e.detail.text
+      })
+      this.runList();
+      this.runList2();
+      
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/hnt-strong/index.json b/miniprogram/pages/hnt-strong/index.json
new file mode 100644
index 0000000..f5c270b
--- /dev/null
+++ b/miniprogram/pages/hnt-strong/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-action-sheet": "@vant/weapp/action-sheet"
+    },
+    "navigationBarTitleText": "混凝土强度监测"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/hnt-strong/index.wxml b/miniprogram/pages/hnt-strong/index.wxml
new file mode 100644
index 0000000..5e45c4f
--- /dev/null
+++ b/miniprogram/pages/hnt-strong/index.wxml
@@ -0,0 +1,91 @@
+<!--pages/Standard-maintenance-room-monitoring/index.wxml-->
+<!-- 标养室监测 -->
+<!-- <view class="header_title">
+	<view class="header_title_row">
+		<van-row>
+		<van-col span="3">
+			<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+		</van-col>
+		<van-col span="4">
+			<view class="header_img" bindtap="goGCLB">
+			<image src="/images/left.png"></image>
+			<text class="header_fh">返回</text>
+			</view>
+		</van-col>
+		<van-col span="10">
+			<view class="header_name">混凝土强度监测</view>
+		</van-col>
+		</van-row>
+	</view>
+</view>
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup> -->
+<view class="jiance" style="padding-top: 30rpx;">
+	<!-- nav头部分 -->
+	<view class="nav-jiance" style="margin-bottom: 60rpx;">
+		<voucher-select background="#2b345b" columns="{{jianceList}}" placeholder="" bindchange="getData1"></voucher-select>
+	</view>
+	<!-- 监测内容 -->
+	<view class="jiance-content">
+			<!-- 头部 -->
+				<view class="header-cailiao">
+				<!-- 头部左边 -->
+					<view class="eharts_title">
+						温度趋势
+					</view>
+				<!-- 头部右边 -->
+					<!-- <view class="header-cailiao-right">
+						<view class="{{indexNum==0?'header-cailiao-right-left active':'header-cailiao-right-left'}}" data-set="{{0}}" bindtap="onClick">
+							近七天
+						</view>
+						<view class="{{indexNum==1?'header-cailiao-right-right active':'header-cailiao-right-right'}}"  data-set="{{1}}" bindtap="onClick">
+							近30天
+						</view>
+					</view> -->
+					<text class="hj_float" bindtap="onClick" style="margin-left: 256rpx;">{{value}} </text>
+        <van-action-sheet show="{{ show1 }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" />
+				</view>
+			<!-- 数据图展示 -->
+			<view class="jiance-echarts">
+				<curve-echarts-copy chart-id="chartData" chart-data="{{biaoyangList}}" title="单位：℃"></curve-echarts-copy>
+			</view>
+	</view>
+	<!-- 监测内容 -->
+	<view class="jiance-content">
+			<!-- 头部 -->
+				<view class="header-cailiao">
+				<!-- 头部左边 -->
+					<view class="eharts_title">
+						成熟度趋势
+					</view>
+				<!-- 头部右边 -->
+					<!-- <view class="header-cailiao-right">
+						<view class="{{indexNum2==0?'header-cailiao-right-left active':'header-cailiao-right-left'}}" data-set="{{0}}" bindtap="onClick1">
+							近七天
+						</view>
+						<view class="{{indexNum2==1?'header-cailiao-right-right active':'header-cailiao-right-right'}}"  data-set="{{1}}" bindtap="onClick1">
+							近30天
+						</view>
+					</view> -->
+					<text class="hj_float" bindtap="onClick1" style="margin-left: 256rpx;">{{value1}} </text>
+        <van-action-sheet show="{{ show2 }}" actions="{{ actions1 }}" bind:close="onClose" bind:select="onSelect1" />
+				</view>
+			<!-- 数据图展示 -->
+			<view class="jiance-echarts">
+				<curve-echarts-copy chart-id="chartData" chart-data="{{biaoyangList2}}"  title="单位：%RH"></curve-echarts-copy>
+			</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/hnt-strong/index.wxss b/miniprogram/pages/hnt-strong/index.wxss
new file mode 100644
index 0000000..4be9f50
--- /dev/null
+++ b/miniprogram/pages/hnt-strong/index.wxss
@@ -0,0 +1,69 @@
+/* pages/Standard-maintenance-room-monitoring/index.wxss */
+/* 标养室监测 */
+.jiance{
+	padding: 60rpx 40rpx 30rpx;
+}
+/* 监测-nav */
+.nav-jiance{
+	width: 100%;
+	height: 90rpx;
+}
+.jiance-content{
+	width: 100%;
+	border: 1px solid #1e2336;
+	background-color: #1e2336;
+	padding-top: 20rpx;
+	margin-bottom: 40rpx;
+	font-size: 26rpx;
+}
+.header-cailiao{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 40rpx;
+}
+.eharts_title{
+	height: 40rpx;
+	line-height: 40rpx;
+	padding-left: 50rpx;
+	margin-left: 20rpx;
+	background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+  }
+  .header-cailiao-right{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 300rpx;
+	height: 80rpx;
+	font-size: 24rpx;
+	color: rgb(155, 154, 154);
+}
+.header-cailiao-right-left{
+	width: 120rpx;
+	height: 46rpx;
+	line-height: 46rpx;
+	text-align: center;
+	border-top-left-radius: 36rpx;
+	border-bottom-left-radius: 36rpx;
+	border: 1px solid #2e355f;
+}
+.header-cailiao-right-right{
+  width: 120rpx;
+  height: 46rpx;
+  line-height: 46rpx;
+  text-align: center;
+  border-top-right-radius: 36rpx;
+  border-bottom-right-radius: 36rpx;
+  border: 1px solid #2e355f;
+}
+.active{
+  color: #fff;
+  background-color: #2e355f;
+}
+/* 展示数据echarts图 */
+.jiance-echarts{
+	width: 100%;
+	/* height: 600rpx; */
+	box-sizing: border-box;
+	padding: 30rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/learn-page/index.js b/miniprogram/pages/learn-page/index.js
new file mode 100644
index 0000000..a462984
--- /dev/null
+++ b/miniprogram/pages/learn-page/index.js
@@ -0,0 +1,88 @@
+// pages/learn-page/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+      szhprojectId:"",
+      smzProjectId:""
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+      let {szhprojectId,smzProjectId} = options
+      this.setData({
+        szhprojectId,
+        smzProjectId
+      })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    /**
+     * 确认绑定
+     */
+    affirmBind(){
+      let { szhprojectId,smzProjectId} = this.data
+        wx.navigateTo({
+          url: `../saft-education-user-bind/index?szhprojectId=${szhprojectId}&smzProjectId=${smzProjectId}`,
+        }) 
+    },
+    /**
+     * 取消绑定
+     */
+    cancelBind(){
+        wx.redirectTo({
+            url: '../gengduogongneng/gengduogongneng'
+        })
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/learn-page/index.json b/miniprogram/pages/learn-page/index.json
new file mode 100644
index 0000000..d729faa
--- /dev/null
+++ b/miniprogram/pages/learn-page/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "安全学习确认"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/learn-page/index.wxml b/miniprogram/pages/learn-page/index.wxml
new file mode 100644
index 0000000..186df31
--- /dev/null
+++ b/miniprogram/pages/learn-page/index.wxml
@@ -0,0 +1,20 @@
+<!-- 学习绑定 -->
+<view class="learn-binding">
+	<!-- 头像部分 172-->
+	<view class="learn-header">
+		<image src="http://fileimg.makalu.cc/WEB_77C2BB6ECBEA4F39B7E22CF5E96DB652.png" mode=""/>
+	</view>
+	<!-- 文字部分 -->
+	<view style="font-size:26rpx;margin-top: 88rpx;margin-bottom: 168rpx;">
+		您暂未绑定，请先进行基本信息绑定
+	</view>
+	<!-- 底部部分 -->
+	<view class="learn-footer" style="display: flex;flex-direction: column;justify-content: space-between;align-items: center;">
+		<view bindtap="affirmBind" style="width:416rpx;height:88rpx;display: flex;justify-content: center;align-items: center;border-radius: 50rpx;background-color: #523fa8;">
+			立即绑定
+		</view>
+		<view bindtap="cancelBind" style="color: #848fce;">
+			返回
+		</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/learn-page/index.wxss b/miniprogram/pages/learn-page/index.wxss
new file mode 100644
index 0000000..513fe6b
--- /dev/null
+++ b/miniprogram/pages/learn-page/index.wxss
@@ -0,0 +1,23 @@
+/* 学习绑定界面 */
+.learn-binding{
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-start;
+	align-items: center;
+}
+/* 头部部分 */
+.learn-header{
+	width: 344rpx;
+	height: 344rpx;
+	margin-top: 88rpx;
+}
+.learn-header image{
+	width: 100%;
+	height: 100%;
+	
+}
+/* 底部部分 */
+.learn-footer{
+	width: 100%;
+	height: 164rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
new file mode 100644
index 0000000..346e5b6
--- /dev/null
+++ b/miniprogram/pages/login/login.js
@@ -0,0 +1,144 @@
+// pages/login/login.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    username:'',
+    password:'',
+    show:false,
+    openId:'', 
+  },
+
+  //获取填写的账号信息
+  name:function(even){
+    this.setData({
+      username:even.detail.value
+    })
+  },
+  //获取填写的密码信息
+  psw:function(even){
+    this.setData({
+      password:even.detail.value
+    })
+  },
+
+  onClickShow() {
+    this.setData({ show: true });
+  },
+
+  onClickHide() {
+    this.setData({ show: false });
+  },
+
+  onLoad: function (option) {
+     this.getOPenId();
+  },
+
+  /**
+   * 获取用户openid
+   */
+  getOPenId:function () {
+    wx.login({
+      success :res=>{
+          console.log(res);
+          wx.request({
+              url: app.globalData.reqUrl+'/weixin/userLogin/getOpenId', 
+              data:{
+                  "code": res.code,
+                  "appId": app.globalData.appId,
+              },
+              success:(res)=>{
+                  console.log(res);
+                  this.setData({
+                      openId:res.data.openid,
+                  })
+                   //验证登录用户 
+                  this.selectUserInfoByOpenId(res.data.openid);  
+              }
+          })
+      }
+    })
+},
+   
+  //验证用户是否是第一次登陆
+  selectUserInfoByOpenId:function(openId){
+    var that = this;
+    wx.setStorageSync('openId', openId)
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userLogin/selectUserInfoByOpenId',
+      data:{
+        "openId":openId
+      },
+      method:"GET",
+      success:function(res){
+        if(res.data.code == '200'){
+          app.globalData.userProjectId = res.data.userinfo.projectId
+          //把数据存到缓存中
+          wx.setStorage({
+            key: 'userinfo',
+            data: res.data.userinfo
+          });
+          //跳转页面
+          let isRelogin=wx.getStorageSync("isReload");  
+          if(!isRelogin){
+            wx.redirectTo({
+              url: '../map/map',
+            })
+          }          
+        }
+      }
+    })
+   },
+
+  
+  //登录
+  userLogin:function(){
+    var that = this;
+    var username = this.data.username;
+    var password = this.data.password;
+    if(username == ""){
+      app.toast("账号不能为空");
+      return;
+    }
+    if(password == ""){
+      app.toast("密码不能为空");
+      return;
+    }
+    //启动蒙版
+    that.onClickShow();
+    //发送请求
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userLogin/checkPassWord',
+      data:{
+        "username":username,
+        "password":password,
+        "openId":this.data.openId,
+      },
+      menubar:"GET",
+      success(res){
+        console.log(res.data);
+        wx.setStorageSync('isReload', "")
+          //关闭蒙版
+          that.onClickHide();
+          if(res.data.data=='200'){
+            app.globalData.userProjectId = res.data.userinfo.projectId
+            //把数据存到缓存中
+            wx.setStorage({
+              key: 'userinfo',
+              data: res.data.userinfo
+            }),
+            //跳转页面
+            wx.redirectTo({
+              url: '../map/map',
+            })
+          }else{
+            app.toast(res.data.info);
+          }
+      }
+    })
+  },
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/login/login.json b/miniprogram/pages/login/login.json
new file mode 100644
index 0000000..8c7f400
--- /dev/null
+++ b/miniprogram/pages/login/login.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index"
+  }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml
new file mode 100644
index 0000000..6e2b611
--- /dev/null
+++ b/miniprogram/pages/login/login.wxml
@@ -0,0 +1,58 @@
+<!--pages/login/login.wxml-->
+
+<view class="login_title">
+  <text>北跨泾河-产发工程数字管理平台</text>
+</view>
+
+<view class="login_bg">
+  <view class="login_dl">登录</view>
+  <view class="login_ex">产发工程数字管理平台，请使用手机号登录</view>
+  <view class="login_input">
+    <input placeholder="输入账户号码" placeholder-style="color:#5e6ea2" bindinput="name"/>
+  </view>
+  <view class="login_input">
+    <input placeholder="输入账户密码" placeholder-style="color:#5e6ea2" password="true" bindinput="psw"/>
+  </view>
+
+
+  <view class="login_btn" bindtap="userLogin">
+    确 定
+  </view>
+
+  <van-overlay show="{{show}}">
+    <view class="gif">
+      <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+      <view>正在登陆中！请稍后...</view>
+    </view>
+  </van-overlay>  
+</view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
\ No newline at end of file
diff --git a/miniprogram/pages/login/login.wxss b/miniprogram/pages/login/login.wxss
new file mode 100644
index 0000000..616cf27
--- /dev/null
+++ b/miniprogram/pages/login/login.wxss
@@ -0,0 +1,58 @@
+/* pages/login/login.wxss */
+page{
+  background: #191d28 url("http://fileimg.makalu.cc/CORE_40247DD946964A15AA0D4000E1031E19.png") no-repeat bottom/100%;
+}
+.login_title{
+  height: 200rpx;
+  padding:0 50rpx;
+  line-height: 200rpx;
+  color: #728ce3;
+  font-size: 45rpx;
+  font-weight: bold;
+}
+.login_title text{
+  border-bottom: 3px solid #728ce3;
+}
+.login_bg{
+ 
+  border-radius: 20rpx;
+  margin: 0 40rpx;
+  padding: 80rpx 40rpx;
+}
+.login_dl{
+  color: #ffffff;
+  font-size: 40rpx;
+  font-weight: bold;
+}
+.login_ex{
+  padding:20rpx 0;
+  font-size: 28rpx;
+  color: #8ca4ee;
+}
+.login_input{
+  margin-top: 50rpx;
+}
+.login_input input{
+  border-bottom: 1px solid #5e6ea2;
+  height: 100rpx;
+  width: 100%;
+  color: #728ce3;
+  padding: 0 20rpx;
+}
+.login_btn{
+  margin:80rpx 50rpx 0;
+  height: 80rpx;
+  background-image: linear-gradient(#5b9fff, #7655fc);
+  border-radius: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+.login_btn:active{
+  margin:82rpx 55rpx 0;
+}
+
+
+
+
+
+
diff --git a/miniprogram/pages/map/map.js b/miniprogram/pages/map/map.js
new file mode 100644
index 0000000..1713add
--- /dev/null
+++ b/miniprogram/pages/map/map.js
@@ -0,0 +1,693 @@
+//index.js
+
+const app = getApp()
+
+Page({
+  data: {
+    userInfo:{},
+    deptId:'',
+    height:"auto",
+    scale:'10',
+    initialLon:'108.922306',
+    initialLat:'34.191848',
+    markers: [],
+    value1:'省',
+    value2:'市/区',
+    value3:'公司',
+    show1: false,
+    show2: false,
+    show3: false,
+    sheng: [],
+    citys:{},
+    companys:{},
+    cityArea: [],
+    company:[],
+    projectData:[],
+    environProjectData:[],
+    projectCount:'0',
+    ifSonCompany:'',
+    ifDeptId:false,
+    monitoringCount:'0',
+    videoNum:'0',
+    mechanicsNum:'0',
+    environCount:'0',
+    logCompanyName:'',
+    popUp1:false,
+    popUp2:false,
+    popUp3:false,
+    companyId:'',
+    paramPost:'',
+    loadShow:false,
+    //省、市、区
+    provinceId:'',
+    cityId:'',
+    areaId:'',
+    temDeptId:'',
+    //*******新版本*****/
+    showTest:false,
+    tabActive:0,
+    jt:[],
+    shengGs:[],
+    ziGs:[],
+    nav1: "0",
+    nav2: "-1",
+    nav3: "-1",
+    classA:"",
+    classB:"",
+    classC:"",
+    flag1:true,
+    flag2:false,
+    flag3:false,
+    Highlight1:"active",
+    Highlight2:"",
+    Highlight3:"",
+    title2:false,
+    title3:false,
+    dataclass1:0,
+    dataclass2:0,
+    dataclass3:0,
+    overall1:"",
+    overall2:"",
+    overall3:"",
+    newCompanyId:'',
+  },
+
+  onclassA(event){
+    this.setData({nav1: event.target.dataset.index});
+    this.setData({dataclass1: 1});
+    if(this.data.dataclass1 == 1){
+      this.setData({title2: true});
+    }
+    this.setData({classA: event.target.dataset.name});
+    this.setData({overall1: event.target.dataset.name,newCompanyId:event.target.dataset.id});
+    this.setData({value3:event.target.dataset.name})
+    //获取子公司信息
+    this.setData({showTest:false})
+    wx.setStorageSync('select_dept_id', event.target.dataset.id)
+    wx.setStorageSync('select_dept_name', event.target.dataset.name)
+    wx.setStorageSync('select_dept_index', event.target.dataset.index)
+    this.selectProjectByCompanyId(event.target.dataset.id,'','','');
+    //this.selectCompanyJG(event.target.dataset.id,'SGS');
+  },
+  onclassB(event){
+    this.setData({nav2: event.target.dataset.index});
+    this.setData({dataclass2: 1});
+    if(this.data.dataclass2 == 1){
+      this.setData({title3: true});
+    }
+    this.setData({classB:  " / " + event.target.dataset.name });
+    this.setData({overall2:  event.target.dataset.name ,newCompanyId:event.target.dataset.id});
+    this.setData({value3:this.data.overall1 + " / "+ event.target.dataset.name})
+    //获取子公司信息
+    this.selectCompanyJG(event.target.dataset.id,'GS');
+  },
+  onclassC(event){
+    this.setData({nav3: event.target.dataset.index});
+    this.setData({dataclass3: 1});
+    this.setData({classC:  " / " + event.target.dataset.name });
+    this.setData({overall3:  event.target.dataset.name ,newCompanyId:event.target.dataset.id});
+    this.setData({value3:  this.data.overall1 + " / " +  this.data.overall2 + " / " + event.target.dataset.name});
+  },
+
+  queren(event){
+    //加载蒙版
+    this.onClickShow();
+    this.setData({ showTest: false});
+    this.setData({ show3: false });
+    if(this.data.overall1 == ""){
+      this.setData({value3:""});
+    }else if(this.data.overall2 == ""){
+      this.setData({value3:  this.data.overall1 + " / "});
+    }else if(this.data.overall3 == ""){
+      this.setData({value3:  this.data.overall1 + " / " +  this.data.overall2 + " / " });  
+    }else{
+      this.setData({value3:  this.data.overall1 + " / " +  this.data.overall2 + " / " +  this.data.overall3});
+    }
+
+    let companyId = this.data.newCompanyId;
+    let provinceId = this.data.provinceId;
+    let cityId = this.data.cityId;
+    let areaId = this.data.areaId;
+
+    this.selectProjectByCompanyId(companyId,provinceId,cityId,areaId);
+    this.selectEarly(companyId,'',provinceId,cityId,areaId);
+    this.getEnvironCount(companyId,'',provinceId,cityId,areaId);
+  },
+
+  tabTltie(event){
+    var id = event.currentTarget.id;
+    if(id == 1){
+      this.setData({flag1:true})
+      this.setData({flag2:false})
+      this.setData({flag3:false})
+      this.setData({Highlight1:"active"})
+      this.setData({Highlight2:""})
+      this.setData({Highlight3:""})
+      this.setData({title2:false})
+      this.setData({title3:false})
+      this.setData({classA:""})
+      this.setData({classB:""})
+      this.setData({classC:""})
+      this.setData({nav2: "-1"});
+      this.setData({nav3: "-1"});
+      this.setData({overall1:"",overall2:"",overall3:""})
+    }else if(id == 2){
+      this.setData({flag1:false})
+      this.setData({flag2:true})
+      this.setData({flag3:false})
+      this.setData({Highlight1:""})
+      this.setData({Highlight2:"active"})
+      this.setData({Highlight3:""})
+      this.setData({title3:false})
+      this.setData({classB:""})
+      this.setData({classC:""})
+      this.setData({nav3: "-1"});
+      this.setData({overall2:"",overall3:""})
+    }else{
+      this.setData({flag1:false})
+      this.setData({flag2:false})
+      this.setData({flag3:true})
+      this.setData({Highlight1:""})
+      this.setData({Highlight2:""})
+      this.setData({Highlight3:"active"})
+      this.setData({overall3:""})
+      this.setData({classC:""})
+    }
+  },
+
+  showTest() {
+    if(this.data.popUp3 == false){
+      this.setData({ showTest: true });
+    }
+  },
+
+  onCloseTest() {
+    this.setData({ showTest: false });
+  },
+
+  
+  onChangeSheng(event) {
+    //加载蒙版
+    this.onClickShow();
+    var province =   event.detail.value;
+    this.setData({
+      value1: province.text ,
+      value2:"市/区",
+      value3:"公司",
+      company: {},
+      ifDeptId:true,
+      provinceId:province.id,
+    });
+    this.setData({flag1:true})
+    this.setData({flag2:false})
+    this.setData({flag3:false})
+    this.setData({Highlight1:"active"})
+    this.setData({Highlight2:""})
+    this.setData({Highlight3:""})
+    this.setData({title2:false})
+    this.setData({title3:false})
+    this.setData({classA:""})
+    this.setData({classB:""})
+    this.setData({classC:""})
+    this.setData({nav2: "-1"});
+    this.setData({nav3: "-1"});
+    app.globalData.paramDeptId = province.id,
+    this.setData({ show1: false });
+    this.getDeptSubordinate(province.id);
+    this.selectProjectByCompanyId(this.data.userInfo.deptId,province.id,'','');
+    this.selectEarly(this.data.userInfo.deptId,'',province.id,'','');
+    this.getEnvironCount(this.data.userInfo.deptId,'',province.id,'','');
+  },
+  onChangeShiQu(event) {
+    //加载蒙版
+    this.onClickShow();
+    var city =   event.detail.value[0];
+    var area =   event.detail.value[1].text;
+    var sq = city+"/"+area
+    this.setData({ 
+      value2: sq ,
+      value3:"公司",
+      company:{},
+      ifDeptId:true,
+      cityId:area == '全部'?event.detail.value[1].id:'',
+      areaId:area == '全部'?'':event.detail.value[1].id
+    });
+    this.setData({flag1:true})
+    this.setData({flag2:false})
+    this.setData({flag3:false})
+    this.setData({Highlight1:"active"})
+    this.setData({Highlight2:""})
+    this.setData({Highlight3:""})
+    this.setData({title2:false})
+    this.setData({title3:false})
+    this.setData({classA:""})
+    this.setData({classB:""})
+    this.setData({classC:""})
+    this.setData({nav2: "-1"});
+    this.setData({nav3: "-1"});
+    this.setData({ show2: false });
+
+    let deptId = this.data.userInfo.deptId;
+    this.selectProjectByCompanyId(deptId,'','',event.detail.value[1].id);
+    //this.selectEarly(deptId,'','','',event.detail.value[1].id);
+    //this.getEnvironCount(deptId,'','','',event.detail.value[1].id);
+  },
+
+
+  onChange1(event) {
+    const { picker, value, index } = event.detail;
+    picker.setColumnValues(1, this.data.citys[value[0]]);
+  },
+  onChange2(event) {
+    // const { picker, value, index } = event.detail;
+    // picker.setColumnValues(1, this.data.companys[value[0]]);
+  },
+
+  showPopup1() {
+    if(this.data.popUp1 == false){
+      this.setData({ show1: true });
+    }
+  },
+  showPopup2() {
+    if(this.data.popUp2 == false){
+      this.setData({ show2: true });
+    }
+  },
+
+  onCancel() {
+    this.setData({ show1: false });
+    this.setData({ show2: false });
+    this.setData({ show3: false });
+  },
+
+  onClose() {
+    this.setData({ show1: false });
+    this.setData({ show2: false });
+    this.setData({ show3: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  //页面初始化
+  onLoad: function (option) {
+    var that = this
+    //加载蒙版
+    that.onClickShow();
+    //调用wx.getSystemInfo接口，然后动态绑定组件高度
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          height: res.windowHeight,
+        })
+      }
+    }),
+    //获取缓存中数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        console.log(res.data);
+        that.setData({
+          userInfo:res.data
+        })
+        app.globalData.deptId = res.data.deptId,
+        //加载用户组织架构信息
+        that.getFilstDept(res.data.deptId,res.data.userId);
+      }
+    })
+  },
+
+  /**
+   * 加载用户组织架构信息
+   * @param {*} deptId 
+   * @param {*} userId 
+   */
+  getFilstDept:function(deptId,userId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptAll',
+      data:{
+        "deptId":deptId,
+        "userId":userId
+      },
+      method:"GET",
+      success:function(res){
+        console.log(res.data);
+        //判断登录是否项目人员
+        if(res.data.projectId != undefined){ 
+          var markers = [{id:0,projectId:res.data.projectId,longitude:res.data.longitude,latitude:res.data.latitude,projectName:res.data.projectName}];
+          var projectData = [{projectId:res.data.projectId,projectName:res.data.projectName,projectAddress:res.data.projectAddress,companyName:res.data.companyName,streamNumber:res.data.streamNumber,projectCount:res.data.projectCount,videoNum:res.data.videoNum,towerCount:res.data.towerCount,monitoringCount:res.data.monitoringCount}]
+          that.setData({
+            value1:res.data.shengName,
+            value2:res.data.shiName+'/'+res.data.quName,
+            value3:res.data.companyName,
+            markers:markers,
+            scale:15,
+            initialLon:res.data.longitude,
+            initialLat:res.data.latitude,
+            projectCount:1,
+            projectData:projectData,
+            logCompanyName:res.data.companyName,
+            popUp1:true,
+            popUp2:true,
+            popUp3:true,
+          })
+          //that.selectEarly(res.data.deptId,res.data.projectId,'','','');
+          //that.getEnvironCount(res.data.deptId,res.data.projectId,'','','');
+          that.onClickHide();
+        }else{
+          var columns = [];
+          columns.push(res.data.province_list);
+          that.setData({
+            value1:res.data.shengName,
+            value2:res.data.shiName+'/'+res.data.quName,
+            logCompanyName:res.data.logCompanyName,
+            value3:res.data.logCompanyName,
+            companyId:res.data.companyId,
+            paramPost:res.data.postId,
+            company:columns,
+            companys:columns,
+            jt:res.data.province_list,
+            popUp1:true,
+            popUp2:true
+          })
+          if(res.data.province_list.length==1){
+            that.setData({
+              popUp3:true
+            });
+          }else{
+            if(wx.getStorageSync('select_dept_index')!="" && wx.getStorageSync('select_dept_name')!=""){
+              that.setData({
+                nav1:wx.getStorageSync('select_dept_index'),
+                value3:wx.getStorageSync('select_dept_name')
+              });
+            }
+          }
+          //that.selectEarly(res.data.deptId,'','','','');
+          //that.getEnvironCount(res.data.deptId,'','','','');
+          if(wx.getStorageSync('select_dept_id')==""){
+            if(res.data.province_list.length==1){
+              that.selectProjectByCompanyId(res.data.deptId,'','','');
+            }else{
+              that.selectProjectByCompanyId("0",'','','');
+            }
+          }else{
+            that.selectProjectByCompanyId(wx.getStorageSync('select_dept_id'),'','','');
+          }
+          that.onClickHide();
+        }
+      }
+    })
+  },
+
+  /**
+   * 获取市区信息
+   * @param {*} provinceId  省id
+   */
+  getDeptSubordinate:function(provinceId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptSubordinate',
+      data:{
+        "userId":this.data.userInfo.userId,
+        "provinceId":provinceId,
+        "deptId":this.data.userInfo.deptId
+      },
+      method:"GET",
+      success:function(res){
+        that.onClickHide();
+        let citys = res.data;
+        let cityArea = [
+          {
+            values: Object.keys(citys),
+            className: 'column1',
+          },
+          {
+            values: citys[Object.keys(citys)[0]],
+            className: 'column2',
+            defaultIndex: 2,
+          },
+        ]  
+        that.setData({
+          cityArea: cityArea,
+          citys:citys
+        })
+      }
+    })
+  },
+
+  /**
+   * 根据筛选项目信息
+   * @param {*} deptId 
+   * @param {*} provinceId 
+   * @param {*} cityId 
+   * @param {*} areaId 
+   */
+  selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectByCompanyId',
+      data:{
+        "userId":this.data.userInfo.userId,
+        "deptId":deptId,
+        "provinceId":provinceId,
+        "cityId":cityId,
+        "areaId":areaId
+      },
+      method:"GET",
+      success:function(res){
+        //关闭蒙版
+        that.onClickHide();
+        if(res.data.length >0){
+          that.setData({
+            markers:res.data,
+            projectCount:res.data.length,
+            projectData:res.data,
+            scale:5,
+            initialLon:res.data[0].longitude,
+            initialLat:res.data[0].latitude,
+          }) 
+        }else{
+          that.setData({
+            markers:res.data,
+            projectCount:res.data.length,
+            projectData:res.data,
+            scale:5,
+          }) 
+        }     
+      }
+    })
+  },
+
+  /**
+   * 根据组织架构查询出公司信息
+   * @param {*} deptId 
+   * @param {*} state 
+   */
+  selectCompanyJG:function(deptId,state){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/selectCompanyJG',
+      data:{
+        "deptId":deptId
+      },
+      method:"GET",
+      success:function(res){
+        that.onClickHide();
+        if(state == "SGS"){
+          that.setData({
+            shengGs:res.data
+          })
+        }else{
+          that.setData({
+            ziGs:res.data
+          })
+        }       
+      }
+    })
+  },
+
+  /**
+   * 预警总个数
+   * @param {*} deptId 
+   * @param {*} projectId 
+   * @param {*} provinceId 
+   * @param {*} cityId 
+   * @param {*} areaId 
+   */
+  selectEarly:function(deptId,projectId,provinceId,cityId,areaId){
+      var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/applets/selectYangchenCount',
+        method:"GET",
+        data:{
+          "deptId":deptId,
+          "projectId":projectId,
+          "provinceId":provinceId,
+          "cityId":cityId,
+          "areaId":areaId,
+        },
+        success:function(res){
+          that.onClickHide();
+          that.setData({
+            monitoringCount:res.data.monitoringCount,
+            videoNum:res.data.videoNum,
+            mechanicsNum:res.data.machineEnvirCount
+          })
+        }
+      })
+  },
+
+  /**
+   * 预警项目信息
+   * @param {*} deptId 
+   * @param {*} projectId 
+   * @param {*} provinceId 
+   * @param {*} cityId 
+   * @param {*} areaId 
+   */
+  getEnvironCount:function(deptId,projectId,provinceId,cityId,areaId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/applets/getEnvironCount',
+      method:'GET',
+      data:{
+        "deptId":deptId,
+        "projectId":projectId,
+        "provinceId":provinceId,
+        "cityId":cityId,
+        "areaId":areaId,
+      },
+      success:function(res){
+        that.onClickHide();
+        that.setData({
+          environProjectData:res.data,
+          environCount:res.data.length
+        })
+      }
+    })
+  },
+
+  /**
+   * 个人定位点
+   */
+  selectUserLocation:function(){
+    let markers = this.data.markers;
+    markers.push(app.globalData.markers[0]);
+    this.setData({
+      scale:5,
+      initialLon:app.globalData.initialLon,
+      initialLat:app.globalData.latitude,
+      markers:markers,
+    })
+  },
+
+
+  //点击项目点跳转到项目概况页面
+  getProjectListById:function(even){
+    if(even.markerId != '-1'){
+      var projectData= this.data.projectData;
+      var value1 = "";
+      if(this.data.value1 != ""){
+        value1 = this.data.value1;
+      }else{
+        value1 = '省';
+      }
+      var value2 = "";
+      if(this.data.value2 != ""){
+        value2 = this.data.value2;
+      }else{
+        value2 = '市/区';
+      }
+      var value3 = "";
+      if(this.data.value3 != ""){
+        value3= this.data.value3;
+      }else{
+        value3 = '公司';
+      }
+      //赋值到公共参数
+      app.globalData.projectId = this.data.markers[even.markerId].projectId;
+      app.globalData.projectName = this.data.markers[even.markerId].projectName;
+      app.globalData.projectInfoList = JSON.stringify(projectData);
+      app.globalData.type = 1;
+      app.globalData.value1 = value1;
+      app.globalData.value2 = value2;
+      app.globalData.value3 = value3;
+      wx.redirectTo({
+        url: '../xiangmugaikuang/xiangmugaikuang'
+      })
+    }else{
+      app.toast("本定位点为个人定位");
+    }
+  },
+
+  //查看项目详情
+  checkDetailsSY:function(even){
+    var projectData= this.data.projectData;
+    var value1 = "";
+    if(this.data.value1 != ""){
+      value1 = this.data.value1;
+    }else{
+      value1 = '省';
+    }
+    var value2 = "";
+    if(this.data.value2 != ""){
+      value2 = this.data.value2;
+    }else{
+      value2 = '市/区';
+    }
+    var value3 = "";
+    if(this.data.value3 != ""){
+      value3= this.data.value3;
+    }else{
+      value3 = '公司';
+    }
+    //添加数据到app.js文件固定参数
+    app.globalData.projectInfoList = JSON.stringify(projectData);
+    app.globalData.type = 1;
+    app.globalData.value1 = value1;
+    app.globalData.value2 = value2;
+    app.globalData.value3 = value3;
+    wx.redirectTo({
+      url: '../gongchengliebiao/gongchengliebiao'
+    })
+  },
+
+  //查看预警详情
+  checkDetailsYJ:function(even){
+    var environProjectData = this.data.environProjectData;
+    var value1 = "";
+    if(this.data.value1 != ""){
+      value1 = this.data.value1;
+    }else{
+      value1 = '省';
+    }
+    var value2 = "";
+    if(this.data.value2 != ""){
+      value2 = this.data.value2;
+    }else{
+      value2 = '市/区';
+    }
+    var value3 = "";
+    if(this.data.value3 != ""){
+      value3= this.data.value3;
+    }else{
+      value3 = '公司';
+    }
+    //添加数据到app.js文件固定参数
+    app.globalData.projectInfoList = JSON.stringify(environProjectData);
+    app.globalData.type = 2;
+    app.globalData.value1 = value1;
+    app.globalData.value2 = value2;
+    app.globalData.value3 = value3;
+    wx.redirectTo({
+      url: '../gongchengliebiao/gongchengliebiao',
+    })
+  },
+
+})
diff --git a/miniprogram/pages/map/map.json b/miniprogram/pages/map/map.json
new file mode 100644
index 0000000..07c6054
--- /dev/null
+++ b/miniprogram/pages/map/map.json
@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-popup": "@vant/weapp/popup",
+    "van-picker": "@vant/weapp/picker/index",
+    "van-area": "@vant/weapp/area/index",
+    "mkl-multi-select": "/components/@mkl/multi-select/index",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/map/map.wxml b/miniprogram/pages/map/map.wxml
new file mode 100644
index 0000000..e3a01fe
--- /dev/null
+++ b/miniprogram/pages/map/map.wxml
@@ -0,0 +1,241 @@
+<view> 
+  <map class="map" id="map" scale="{{scale}}" latitude="{{initialLat}}" longitude="{{initialLon}}"  markers="{{markers}}" style="width: 100%; height: {{height}}px;"  bindmarkertap="getProjectListById" bindcallouttap="controltap" bindtap="checkMap" subkey="A2GBZ-AGALG-MP2QK-IJGFW-MRU36-4SF4O"></map> 
+</view> 
+<!-- 当掏钱了就解开这个封印将下面的封印上 -->
+<!-- <view class="map_title">
+  {{logCompanyName}}
+</view> -->
+<view class="map_title" style="color: #2b345b;">
+  {{logCompanyName}}
+</view>
+
+
+<!-- 当掏钱了就解开这个封印将下面的封印上 -->
+<!-- <view class="map_sel_top"> 
+  <view class="list_max">
+    <van-row gutter="5">
+      <van-col span="6">
+        <view class="list_min" bindtap="showPopup1">
+          <van-col span="17">
+            <view class="list_min_1">{{value1}}</view>
+          </van-col>
+          <van-col span="7">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+      
+
+      <van-popup show="{{ show1 }}" bind:close="onClose"  position="bottom">       
+        <view class="map_list_info">
+          <van-picker show-toolbar  default-index="{{1}}" columns="{{ sheng }}"  bind:cancel="onCancel" bind:confirm="onChangeSheng"/>
+        </view>
+      </van-popup>
+
+
+
+
+      <van-col span="8">
+        <view class="list_min" bindtap="showPopup2">
+          <van-col span="19">
+            <view class="list_min_1">{{value2}}</view>
+          </van-col>
+          <van-col span="5">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+      <van-popup show="{{ show2 }}" bind:close="onClose"  position="bottom">       
+        <view class="map_list_info">
+          <van-picker show-toolbar columns="{{ cityArea }}" bind:confirm="onChangeShiQu"  bind:cancel="onCancel"  bind:change="onChange1"/>
+        </view>
+      </van-popup>
+
+
+      <van-col span="10">
+        <view class="list_min" bindtap="showTest" >
+          <van-col span="19">
+            <view class="list_min_1">{{value3}}</view>
+          </van-col>
+          <van-col span="5">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+
+      <van-popup  position="bottom"  show="{{ showTest }}" bind:close="onCloseTest">
+        <view class="all_name">
+          {{classA}}{{classB}}{{classC}}
+        </view>
+        <text class="queren" bindtap="queren">确认</text>
+        <view class="tab_max_tltie">
+          <text class="{{ Highlight1  }}" bindtap="tabTltie" id="1">集团公司</text>
+          <text class="{{ Highlight2 }}" wx:if="{{title2}}" bindtap="tabTltie" id="2" wx:key="title2">省公司</text>
+          <text class="{{ Highlight3  }}" wx:if="{{title3}}" bindtap="tabTltie" id="3" wx:key="title3">子公司</text>
+        </view>
+        <view class="max_tab_name" wx:if="{{flag1}}" wx:key="flag1">
+          <view class="font_color {{ index == nav1  ? 'active1' :' ' }}" wx:for="{{jt}}" wx:key="jt" data-index="{{index}}" bindtap="onclassA" data-name="{{item.text}}" data-id="{{item.id}}"> {{item.text}} </view>
+        </view>
+        <view class="max_tab_name" wx:if="{{flag2}}" wx:key="flag2">
+          <view class="font_color {{ index == nav2  ? 'active2' :' ' }}" wx:for="{{shengGs}}" wx:key="shengGs" data-index="{{index}}" bindtap="onclassB" data-name="{{item.text}}"  data-id="{{item.id}}"> {{item.text}}</view>
+        </view>
+        <view class="max_tab_name" wx:if="{{flag3}}" wx:key="flag3">
+            <view class="font_color {{ index == nav3  ? 'active3' :' ' }}" wx:for="{{ziGs}}" wx:key="ziGs" data-index="{{index}}" bindtap="onclassC" data-name="{{item.text}}"  data-id="{{item.id}}"> {{item.text}}</view>
+        </view>
+      </van-popup>
+
+    </van-row>
+  </view>
+  <view class="address {{class}}">
+    {{value1}}/{{value2}}/{{value3}}
+  </view>
+</view> -->
+
+<view class="map_sel_top"> 
+  <view class="list_max">
+    <van-row gutter="5">
+      <van-col span="6">
+        <view class="list_min" bindtap="showPopup1" >
+          <van-col span="17">
+            <view class="list_min_1">{{value1}}</view>
+          </van-col>
+          <van-col span="7">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+      
+
+      <van-popup show="{{ show1 }}" bind:close="onClose"  position="bottom">       
+        <view class="map_list_info">
+          <van-picker show-toolbar  default-index="{{1}}" columns="{{ sheng }}"  bind:cancel="onCancel" bind:confirm="onChangeSheng"/>
+        </view>
+      </van-popup>
+
+
+
+
+      <van-col span="8">
+        <view class="list_min" bindtap="showPopup2">
+          <van-col span="19">
+            <view class="list_min_1">{{value2}}</view>
+          </van-col>
+          <van-col span="5">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+      <van-popup show="{{ show2 }}" bind:close="onClose"  position="bottom">       
+        <view class="map_list_info">
+          <van-picker show-toolbar columns="{{ cityArea }}" bind:confirm="onChangeShiQu"  bind:cancel="onCancel"  bind:change="onChange1"/>
+        </view>
+      </van-popup>
+
+
+      <van-col span="10">
+        <view class="list_min" bindtap="showTest" >
+          <van-col span="19">
+            <view class="list_min_1">{{value3}}</view>
+          </van-col>
+          <van-col span="5">
+            <view class="list_min_2">
+              <image src="/images/bottom.png" class="list_bottom"></image>
+            </view>
+          </van-col>
+        </view>
+      </van-col>
+
+      <van-popup  position="bottom"  show="{{ showTest }}" bind:close="onCloseTest">
+        <!-- <view class="all_name">
+          {{classA}}
+        </view> -->
+        <!-- <text class="queren" bindtap="queren">确认</text> -->
+        <!-- <view class="tab_max_tltie">
+          <text class="{{ Highlight1  }}" bindtap="tabTltie" id="1">集团公司</text>
+          <text class="{{ Highlight2 }}" wx:if="{{title2}}" bindtap="tabTltie" id="2" wx:key="title2">省公司</text>
+          <text class="{{ Highlight3  }}" wx:if="{{title3}}" bindtap="tabTltie" id="3" wx:key="title3">子公司</text>
+        </view> -->
+        <view class="max_tab_name" wx:if="{{flag1}}" wx:key="flag1">
+          <view class="font_color {{ index == nav1  ? 'active1' :' ' }}" wx:for="{{jt}}" wx:key="jt" data-index="{{index}}" bindtap="onclassA" data-name="{{item.text}}" data-id="{{item.id}}"> {{item.text}} </view>
+        </view>
+        <view class="max_tab_name" wx:if="{{flag2}}" wx:key="flag2">
+          <view class="font_color {{ index == nav2  ? 'active2' :' ' }}" wx:for="{{shengGs}}" wx:key="shengGs" data-index="{{index}}" bindtap="onclassB" data-name="{{item.text}}"  data-id="{{item.id}}"> {{item.text}}</view>
+        </view>
+        <view class="max_tab_name" wx:if="{{flag3}}" wx:key="flag3">
+            <view class="font_color {{ index == nav3  ? 'active3' :' ' }}" wx:for="{{ziGs}}" wx:key="ziGs" data-index="{{index}}" bindtap="onclassC" data-name="{{item.text}}"  data-id="{{item.id}}"> {{item.text}}</view>
+        </view>
+      </van-popup>
+
+    </van-row>
+  </view>
+  <view class="address {{class}}" style="color: #2b345b;">
+    {{value1}}/{{value2}}/{{value3}}
+  </view>
+</view>
+
+
+
+<view class="map_cilck_bottom"> 
+  <view class="map_bottom">
+    <view class="map_bottom_left">
+      <view class="map_left_min">
+        <view class="map_gc_name">当前预警项目数 <text>{{environCount}}</text></view>
+        <view class="map_yj_num">
+          <van-row>
+            <van-col span="8">
+              <view class="map_yj_num_1">
+                结构体：<text>{{monitoringCount}}</text>个
+              </view>
+            </van-col>
+            <van-col span="8">
+              <view class="map_yj_num_2">
+                视频：<text>{{videoNum}}</text>个
+              </view>
+            </van-col>
+            <van-col span="8">
+              <view class="map_yj_num_3">
+                机械：<text>{{mechanicsNum}}</text>个
+              </view>
+            </van-col>
+          </van-row>
+        </view>
+      </view>
+    </view>
+    <view class="map_bottom_right" bindtap="checkDetailsSY">
+      <view class="map_btn">查看详情</view>
+    </view>
+  </view>
+</view>
+
+<!-- <view class="map_ding_wei" bindtap="selectUserLocation" data-type="1">
+  <image src="/images/dingwei.png" ></image>
+</view> -->
+
+<!-- 当掏钱了就解开这个封印将下面的封印上 -->
+<!-- <view class="map_list" bindtap="checkDetailsSY">
+  项目列表：<text>{{projectCount}}</text>
+</view> -->
+<view class="map_list" bindtap="checkDetailsSY" style="color: #fff;background-color: #2b345b;">
+  项目列表：<text>{{projectCount}}</text>
+</view>
+
+
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
diff --git a/miniprogram/pages/map/map.wxss b/miniprogram/pages/map/map.wxss
new file mode 100644
index 0000000..24a1de9
--- /dev/null
+++ b/miniprogram/pages/map/map.wxss
@@ -0,0 +1,254 @@
+.map_title{
+  position: absolute;
+  width: 90%;
+  color: #fff;
+  top: 0rpx;
+  left: 5%;
+  padding: 85rpx 0 30rpx; 
+  font-weight: bold;
+}
+
+
+.map_sel_top{
+  width: 90%;
+  position: absolute;
+  top: 196rpx;
+  left: 5%; 
+}
+.map_cilck_bottom{
+  width: 100%;
+  position: absolute;
+  bottom: 0; 
+}
+.list_min{
+  border-radius:10rpx;
+  background: #2b345b;
+  height: 80rpx;
+}
+.list_min_1{
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 28rpx;
+  padding-left: 10rpx;
+  color: #8ca4ee;
+  width: auto;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
+}
+.list_min_2{
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+.list_bottom{
+  width:30rpx;
+  height:30rpx;
+}
+.list_title{
+  color:#8ca4ee;
+  font-size: 24rpx;
+  padding: 20rpx 30rpx;
+}
+.list_title text{
+  font-size: 26rpx;
+  color: #1aeff5;
+}
+
+.map_bottom{
+  width: auto;
+  height: 120rpx;
+  background: #2b345b;
+}
+.map_bottom_left{
+  float: left;
+  height: 120rpx;
+  width: 75%;
+}
+.map_bottom_right{
+  float: right;
+  width: 25%;
+  height:120rpx;
+}
+.map_left_min{
+  padding-left: 30rpx;
+}
+.map_gc_name{
+  font-size:30rpx;
+  height:70rpx;
+  line-height: 70rpx;
+}
+.map_gc_name text{
+  font-size: 36rpx;
+  color: #ff0000;
+  font-weight: bold;
+}
+.map_yj_num{
+  height: 50rpx;
+  font-size: 22rpx;
+  color:#abb2de;
+}
+.map_yj_num text{
+  color: #feba00;
+  font-size: 24rpx;
+  font-weight: bold;
+}
+.map_btn{
+  height: 70rpx;
+  background: linear-gradient(#00daff, #327ae9);
+  border:10rpx solid #264466;
+  border-radius: 100rpx;
+  text-align: center;
+  line-height: 70rpx;
+  font-size:28rpx;
+  margin-top: 15rpx;
+}
+.map_btn:active{
+  background: #327ae9;
+}
+.address{
+  color: #8ca4ee;
+  font-size: 28rpx;
+  padding: 20rpx  0 20rpx 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_1F1F3A2778334D3EAC1226DDCEBD48D0.png") no-repeat left/40rpx;
+}
+.map_yj_num_1{
+  padding-left: 35rpx;
+  background: url("http://fileimg.makalu.cc/CORE_085FA305D4314B8CA5954C569D127EB9.png") no-repeat left/30rpx;
+}
+.map_yj_num_2{
+  padding-left: 35rpx;
+  background: url("http://fileimg.makalu.cc/CORE_48D684509A314D55BD3B61EFFB77EF07.png") no-repeat left/30rpx;
+}
+.map_yj_num_3{
+  padding-left: 35rpx;
+  background: url("http://fileimg.makalu.cc/CORE_DCEE74D04831461D9841247ADD7B880D.png") no-repeat left/30rpx;
+}
+.map_ding_wei{
+  height:70rpx;
+  width: 70rpx;
+  position: absolute;
+  bottom: 150rpx;
+  left: 30rpx;
+}
+.map_ding_wei image{
+  width: 70rpx;
+  height: 70rpx;
+}
+.map_list{
+  width: 220rpx;
+  height: 70rpx;
+  position: absolute;
+  bottom: 150rpx;
+  right: 30rpx;
+  border: 2px solid #00daff;
+  border-radius: 100rpx;
+  background: rgba(0,218,255,0.2);
+  text-align: center;
+  font-size: 28rpx;
+  line-height: 70rpx;
+  color: #8ca4ee;
+}
+.map_list text{
+  font-size: 32rpx;
+  color: #00daff;
+}
+.map_list_info{
+
+  background: #232a44;
+  padding: 0 30rpx;
+}
+.van-center-enter-to.van-center-enter-active{
+  border-radius: 20rpx;
+  background: #232a44;
+}
+.map_list_info_title{
+  padding: 30rpx;
+  text-align: center;
+}
+.map_list_info .van-picker{
+  background: none;
+}
+
+.map_list_info view{
+  background: none;
+}
+
+.map_list_info .van-picker-column{
+  color: #157dd2;
+}
+.map_list_info .van-picker-column__item--selected{
+  color: #00e3fe;
+}
+.map_list_info .van-hairline--top-bottom:after{
+  border-width: 0px 0;
+}
+
+/* -------------------------- */
+.van-popup.van-popup--bottom{
+  background: #232a44;
+}
+.all_name{
+  font-size: 26rpx;
+  padding:30rpx 20rpx;
+  line-height: 50rpx;
+  color: #00e3fe;
+}
+.van-tabs__scroll{
+  background: none !important;
+}
+.van-hairline--top-bottom:after{
+  border: none !important;
+}
+.van-tab.van-tab--active{
+  color: #14feff !important;
+}
+.van-tab{
+  color: #157dd2 !important;
+}
+.max_tab_name{
+  padding: 0 40rpx;
+  font-size:28rpx;
+  height: 430rpx;
+  overflow: auto;
+  margin-top: 20rpx;
+}
+
+.font_color{
+  padding: 15rpx 0;
+  color: #157dd2;
+}
+.active1{
+  color: #14feff 
+}
+.active2{
+  color: #14feff 
+}
+.active3{
+  color: #14feff ;
+}
+.van-tabs__line{
+  background-color:#14feff !important;
+}
+
+.tab_max_tltie{
+  padding:0 30rpx;
+  font-size: 30rpx;
+}
+.tab_max_tltie text{
+  padding: 30rpx ;
+  color: #999999;
+}
+.tab_max_tltie .active{
+  font-weight: bold;
+  color: #00e3fe;
+}
+.queren{
+  float: right;
+  position: relative;
+  right: 20rpx;
+  padding: 10rpx;
+  color: #157dd2;
+  font-size: 28rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/measures-Chakan/index.js b/miniprogram/pages/measures-Chakan/index.js
new file mode 100644
index 0000000..97b5943
--- /dev/null
+++ b/miniprogram/pages/measures-Chakan/index.js
@@ -0,0 +1,187 @@
+// pages/measures/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        // initData: { text: '请选择你的项目', id: 0 }
+        titleName:"测量台账详情",
+        szhProjectId:'',
+        managementNum:'',
+        ledgerType:'',
+        measureDevice:{}
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        var that = this
+        const {q} = options
+        let urlStr = decodeURIComponent(q);
+        let subStrUrl = urlStr.substr(urlStr.indexOf("?"),urlStr.length-1)    
+        let params = that.getRequest(subStrUrl)
+        let ledgerType = params.ledgerType
+        let projectId = params.projectId
+        let managementNum = params.managementNum
+        var titleName = "台账详情"
+        if(ledgerType == 1) {
+            titleName = "测量台账详情"
+        } else {
+            titleName = "实验台账详情"
+        }
+        that.setData({
+            szhProjectId:projectId,
+            managementNum:managementNum,
+            ledgerType:ledgerType,
+            titleName:titleName
+        })
+        that.getMeasureDeviceInfo()
+    },
+
+
+      /**
+      * 获取请求地址信息
+      */
+     getRequest(url) {
+       
+        var theRequest = new Object();
+        var strs;
+        if (url.indexOf("?") != -1) {
+            let str = url.substr(1);
+            strs = str.split("&");
+            for (let i = 0; i < strs.length; i++) {
+                theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+            }
+        }
+        return theRequest;
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+            
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    /**
+     * 关闭
+     */
+    goGCLB() {
+        //在需要退出小程序的地方调用添加下面代码即可(js文件中)
+        wx.exitMiniProgram({success: (res) => {
+
+        },fail:(res)=>{
+          console.log(res)
+        }}) 
+    },
+    /**
+     * 获取台账信息
+     */
+    getMeasureDeviceInfo() {
+        var that = this
+        wx.request({
+            url:  app.globalData.szhUrl+"/system/deviceCheck/selectListByManagementCode",
+            method:"POST",
+            data:{
+                projectId: that.data.szhProjectId,
+                managementNum:that.data.managementNum,
+                ledgerType:that.data.ledgerType
+            },
+            header: {
+                'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+            },
+            success(res){
+                if(res.data.code == 0 && res.data.data.length > 0) {
+                    var data = res.data.data[0]
+                    data.checkCertificateUrl = data.checkCertificateUrl != null ?data.checkCertificateUrl.split(","):''
+                    that.setData({
+                        measureDevice:data
+                    })
+                    console.log(that.data.measureDevice)
+                }
+            }
+        })
+    },
+    /**
+     * 打开附件
+     * @param {url} e 
+     */
+    openFile(e) {
+        console.log(e)
+        var url = e.currentTarget.dataset.url
+        wx.downloadFile({
+            // 示例 url，并非真实存在
+            url: url,
+            success: function (res) {
+                const filePath = res.tempFilePath
+                if(url.indexOf(".png") > 0 || url.indexOf(".jpg") > 0 || url.indexOf(".jpeg") >0|| url.indexOf(".PNG")>0|| url.indexOf(".JPG")> 0) {
+                    wx.previewImage({
+                    urls: [filePath],
+                    success: function (res) {
+                        console.log('打开图片成功')
+                    },
+                    fail:function(res) {
+                        console.log(res)
+                    }
+                    })
+                } else {
+                    wx.openDocument({
+                        filePath: filePath,
+                        success: function (res) {
+                            console.log('打开文档成功')
+                        },
+                        fail:function(res) {
+                            console.log(res)
+                        }
+                    })
+                }
+               
+            }
+        })
+    },
+})
\ No newline at end of file
diff --git a/miniprogram/pages/measures-Chakan/index.json b/miniprogram/pages/measures-Chakan/index.json
new file mode 100644
index 0000000..ba2821f
--- /dev/null
+++ b/miniprogram/pages/measures-Chakan/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/measures-Chakan/index.wxml b/miniprogram/pages/measures-Chakan/index.wxml
new file mode 100644
index 0000000..248c753
--- /dev/null
+++ b/miniprogram/pages/measures-Chakan/index.wxml
@@ -0,0 +1,289 @@
+<!-- 测量页面 -->
+<view class="header_title">
+  <view>
+    <van-row>
+      <van-col span="8">
+        <view class="header_img" bindtap="goGCLB">
+          <text class="header_fh">关闭</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">{{titleName}}</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+<view class="max_content">
+	<!-- 头部筛选 -->
+	<!-- <view class="content" style="margin-top: 34rpx;">
+		<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+	</view> -->
+
+  <!-- 数据回显 -->
+	<view class="outside-content" >
+	<!-- 每一个数据框 -->
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					归属项目：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.projectName}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					仪器名称：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.deviceName}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					使用状态：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.useStateName}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					管理编号：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.managementNum}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					规则型号：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.deviceCode}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					购买日期：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.purchaseDate == null ?'':measureDevice.purchaseDate}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					原值：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.originalValue}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					净值：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.netValue}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					附属设备：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.accessoryDevice}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					标称精度：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.nominalAccuracy}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					生产厂家：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.deviceCom}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					出厂编号：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.deviceNum}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定日期：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.checkDate != null ?measureDevice.checkDate:''}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定周期(月)：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.cycleNum}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定有效截至日期：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.checkDeadline != null ? measureDevice.checkDeadline:''}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定有效期：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.endDate != null?measureDevice.endDate:''}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定单位：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.checkCom}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定结论：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.finalText}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定证书编号：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.checkCertificateNum}}</view>
+		</view>
+		<view style="justify-content: space-between;display: flex;align-items: center;">
+			<view class="left-shujubox" >
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定证书文件上传(PDF/图片)：
+				</view>
+			</view>
+			<view style="width: 400rpx;">
+				<view wx:for="{{measureDevice.checkCertificateUrl}}">
+					<image wx:if="{{item != ''}}" bindtap='openFile' style="width:180rpx;height:180rpx" src="https://fileimg.makalu.cc/0acc72bd-497f-4c23-af34-d7beb8ebd580/档案-01.png"  data-url='{{item}}'></image>
+				</view>
+				<!-- <file-uploader fileUrlArray="{{measureDevice.checkCertificateUrl}}"></file-uploader> -->
+			</view>
+	
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					使用单位：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.userCom}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					是否可调拨：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.transfer}}</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<!-- <view class="leftStyle">
+					*
+				</view> -->
+				<view>
+					备注：
+				</view>
+			</view>
+			<view class="right-shujubox">{{measureDevice.context}}</view>
+		</view>
+
+		<view class="switch_button">
+                <button class="switch_button_down"  bindtap="goGCLB">关闭</button>
+            </view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/measures-Chakan/index.wxss b/miniprogram/pages/measures-Chakan/index.wxss
new file mode 100644
index 0000000..bf97a2c
--- /dev/null
+++ b/miniprogram/pages/measures-Chakan/index.wxss
@@ -0,0 +1,45 @@
+/* 测量仪器 */
+.outside-content{
+	margin-top: 70rpx;
+	padding: 0 30rpx;
+}
+.every-shujubox{
+	margin: 30rpx 0;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	height: 80rpx;
+}
+.left-shujubox{
+	display: flex;
+	/* justify-content: flex-end; */
+	justify-content: center;
+	align-items: center;
+	width: 260rpx;
+	height: 80rpx;
+	color: #728ce3 
+}
+.leftStyle{
+	color: red;
+}
+.right-shujubox{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 400rpx;
+    height: 80rpx;
+    /* line-height: 80rpx; */
+    border-bottom: 1px solid #728ce3;
+    color: #728ce3;
+    text-align: center;
+}
+.right-file{
+	/* height: 184rpx;
+	width: 184rpx; */
+	border: 1px solid #fff;
+	margin-left: 46rpx;
+	border-radius: 12rpx;
+	text-align: center;
+	line-height: 180rpx;
+	font-size: 120rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/measures/index.js b/miniprogram/pages/measures/index.js
new file mode 100644
index 0000000..5b6ae85
--- /dev/null
+++ b/miniprogram/pages/measures/index.js
@@ -0,0 +1,66 @@
+// pages/measures/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        initData: { text: '请选择你的项目', id: 0 }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/measures/index.json b/miniprogram/pages/measures/index.json
new file mode 100644
index 0000000..f80619c
--- /dev/null
+++ b/miniprogram/pages/measures/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "测量仪器"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/measures/index.wxml b/miniprogram/pages/measures/index.wxml
new file mode 100644
index 0000000..fbb65fc
--- /dev/null
+++ b/miniprogram/pages/measures/index.wxml
@@ -0,0 +1,261 @@
+<!-- 测量页面 -->
+<view class="max_new_content">
+	<!-- 头部筛选 -->
+	<view class="content" style="margin-top: 34rpx;">
+		<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+	</view>
+  <!-- 数据回显 -->
+	<view class="outside-content">
+	<!-- 每一个数据框 -->
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					仪器名称：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					使用状态：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					管理编号：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					规则型号：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					购买日期：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					原值：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					净值：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					附属设备：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					标称精度：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					生产厂家：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					出厂编号：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定日期：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定周期(月)：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定有效截至日期：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定有效期：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定单位：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定结论：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定证书编号：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox" style="height: 180rpx;justify-content: flex-start;display: flex;align-items: center;">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					检定证书文件上传(PDF/图片)：
+				</view>
+			</view>
+			<view class="right-file">
+			+
+				<textarea value="" style="width: 100%;height: 100%;"/>
+			</view>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					使用单位：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					是否可调拨：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+		<view class="every-shujubox">
+			<view class="left-shujubox">
+				<view class="leftStyle">
+					*
+				</view>
+				<view>
+					备注：
+				</view>
+			</view>
+			<input type="text" class="right-shujubox"/>
+		</view>
+
+		<view class="switch_button">
+                <button class="switch_button_down"  bindtap="onClickDown">取消</button>
+                <button class="switch_button_to"  bindtap="onClickTo">提交</button>
+            </view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/measures/index.wxss b/miniprogram/pages/measures/index.wxss
new file mode 100644
index 0000000..6c2c6c9
--- /dev/null
+++ b/miniprogram/pages/measures/index.wxss
@@ -0,0 +1,40 @@
+/* 测量仪器 */
+.outside-content{
+	margin-top: 70rpx;
+	padding: 0 30rpx;
+}
+.every-shujubox{
+	margin: 30rpx 0;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	height: 80rpx;
+}
+.left-shujubox{
+	display: flex;
+	/* justify-content: flex-end; */
+	justify-content: center;
+	align-items: center;
+	width: 260rpx;
+	height: 80rpx;
+}
+.leftStyle{
+	color: red;
+}
+.right-shujubox{
+	width: 380rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	border: 1px solid #fff;
+	border-radius: 12rpx;
+}
+.right-file{
+	height: 180rpx;
+	width: 180rpx;
+	border: 1px solid #fff;
+	margin-left: 46rpx;
+	border-radius: 12rpx;
+	text-align: center;
+	line-height: 180rpx;
+	font-size: 120rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/letterCommitment/index.js b/miniprogram/pages/newAddPage/letterCommitment/index.js
new file mode 100644
index 0000000..2fce4d7
--- /dev/null
+++ b/miniprogram/pages/newAddPage/letterCommitment/index.js
@@ -0,0 +1,201 @@
+// pages/newAddPage/letterCommitment/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        safetyQualityRich:'<p style="line-height: 1.5;"><br></p><h4 style="text-align: center; line-height: 1.5;"></h4><h4 style="text-align: center; line-height: 1.5;">安全质量承诺书</h4><p style="line-height: 1.5;"> </p><p style="text-indent: 2em; line-height: 1.5;">为了个人的安全健康，为了家庭的幸福美满，为了企业的稳定发展，本人在工作中，自愿签订并遵守以下承诺：</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">忠诚企业、恪尽职守、珍爱生命、铸造精品！</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">我坚决做到：遵守规章制度、遵守操作规程、遵守劳动纪律，不出事故、不出次品、不留隐患！我将以实际行动，确保企业生产安全、产品优质！”</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">对于以上承诺，本人自觉遵守，如有违反，本人愿承担责任。 </p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">本承诺书自签字日起生效。 </p><p style="text-indent: 36pt; line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺人(签字)：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;岗 位(工种)：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;日 &nbsp;期： &nbsp; &nbsp;年 &nbsp; &nbsp;月 &nbsp; &nbsp;日 </p><p><br></p>',
+        healthRich:'<p style="line-height: 1.5;"><br></p><h4 style="text-align: center; line-height: 1.5;">健康承诺书</h4><p style="line-height: 1.5;"> </p><p style="text-indent: 2em; line-height: 1.5;">本人：<u> &nbsp; &nbsp; &nbsp; &nbsp;</u>，性别：<u> &nbsp; &nbsp;</u>，年龄: <u> &nbsp; &nbsp;</u>岁、身份证号码：<u> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </u>，从事岗位：<u> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </u>，无 □ / 有 □ 高血压、心脏病等基础身体健康问题；无 □ / 有 □ 严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆，能够胜任本岗位相应工作，我向公司承诺以上所述信息无隐瞒、无虚报，如有隐瞒造成所有后果由本人承担，于项目无关。</p><p style="line-height: 1.5;"> </p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺人（按手印）：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺日期： &nbsp; &nbsp;年 &nbsp; 月 &nbsp; 日</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;日 &nbsp;期： &nbsp; &nbsp;年 &nbsp; &nbsp;月 &nbsp; &nbsp;日 </p><p><br></p>',
+        workerRich:'<p style="text-indent: 2em; line-height: 1.5;"><br></p><h1 style="text-indent: 2em; text-align: center; line-height: 1.5;"></h1><h4 style="text-align: center; line-height: 1.5;">作业工人安全生产责任书</h4><p style="line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（一）作业工人对自己施工中的安全负责。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（二）作业工人应严格执行劳动纪律和现场安全生产管理制度，严格执行安全操作规程和安全技术交底，做到“四不伤害”即：我不伤害自己，我不伤害别人，我不被别人伤害。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（三）拒绝强令冒险作业。发现隐患及防护设施缺陷应及时向安全管理人员报告。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（四）正确使用和穿戴安全防护用品，自觉维护现场安全防护设施，未经批准不得随意移动拆除防护设施。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（五）发生事故应及时报告现场管理人员，并在项目负责人的指挥下积极配合施救。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（六）严格遵守本单位的安全生产规章制度和操作规程，服从管理，正确佩戴和使用劳动防护用品。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（七）接受安全生产教育和培训，掌握本职工作所需的安全生产知识，提高安全生产技能，增强事故预防和应急处理能力。从业人员发现事故隐患或者其他不安全因素，应当立即向现场安全生产管理人员或者本单位负责人报告；接到报告的人员应当及时予以处理。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺人（按手印）：</p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺日期： &nbsp; &nbsp;年 &nbsp; 月 &nbsp; 日</p><p><br></p>',
+        protectiveEquipmentRich:'<p style="text-align: center; line-height: 1.5;"><br></p><h4 style="text-align: center; line-height: 1.5;"><strong>安全防护用品使用图解</strong></h4><h3 style="text-align: center; line-height: 1.5;"> </h3><p style="text-align: center; line-height: 1.5;">进入施工现场必须根据要求按照下图要求佩戴好相应安全防护用品。</p><p style="text-indent: 2em; text-align: center; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;"><img src="http://fileimg.makalu.cc/WEB_33F25A7600DB4909A0B9B6098CB19054.png" style="width:90%;"/></p><p style="text-align: center; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;">本人已经掌握安全防护用品佩戴方法，并严格遵守！</p><p style="text-align: center; line-height: 1.5;"><br></p><p style="text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;签字：</p><p style="text-align: left; line-height: 1.5;"><br></p><p style="text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;日期： &nbsp; &nbsp; &nbsp; 年 &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp;日 &nbsp; &nbsp; &nbsp; </p><p style="text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; </p>',
+        workerPostRich:'<p style="text-indent: 2em; text-align: left; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;"><strong>作业人员岗位告知书</strong></p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"> </p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"> &nbsp;你将从事的普工作业，存在着车辆伤害、机械伤害、坠落、物体打击、触电等岗位危险，予以告知。你在作业时务必遵守相关的规章制度、专项工程安全施工方案、安全技术措施，并熟记作业要点及其特性，掌握好相应的安全防范技能；进入作业场所后，要进行重新检查，发现异常情况和不安全因素必须及时采取有效措施排除；要正确使用和佩戴劳动保护用品，在做好自我防范的同时，还要认真贯彻联保互保。同时对以下针对性措施必须经常对照执行：</p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">1、在道路上工作时，密切注意来往车辆，做到“一看二停三通过”，不抢一分一秒，保证自己不被车辆伤害。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">2、从事开挖作业时，先观察好周边情况和环境，在最坏的情况能够不伤及自身和他人的情况下再作业。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">3、从事搬运石块等工作时，要严格注意身边的人，在呼喊并应答、引起对方注意并退让到安全地带后才可以工作。同时，要积极注意自身安全，不搬运过重的石块，经常检查铁锹、榔头、扁担等工具，一有损坏，立即更换或修复。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">4、在电力线底下、光缆附近施工时，必须严格按照安全技术交底，时刻提高警惕，保护好电力电线、国防光缆。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">5、严禁在河流、池塘等地游泳、洗澡，由此引发的后果由你承担。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">6、做好防火、防盗工作，保护好自己的财物。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">7、工作时必须佩戴好劳动防护用品，带好安全帽并系好下额带。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">8、密切注意工程施工机械，在挖掘机、压路机、推土机等机械附近施工时，必须面向机械并及时避让，确保安全。严禁在压路机等机械下休息，严禁在施工现场打闹、追逐。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">9、工作时听从班组长统一指挥，严格遵守劳动纪律、三级安全教育及安全交底内容。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;被告知者签字(指印)：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 日期： &nbsp; &nbsp; &nbsp;年 &nbsp; &nbsp; &nbsp;月 &nbsp; &nbsp; &nbsp;日</p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; </p>',
+        show:true,
+        radio1:'',
+        radio2:'',
+        signImgUrl:'',
+        token: '',
+    },
+
+    onChange1(event) {
+        this.setData({
+            radio1: event.detail,
+        });
+    },
+
+    onChange2(event) {
+        this.setData({
+            radio2: event.detail,
+        });
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+      this.getQiniupToken();
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    /**
+     * 获取七牛云token
+     */
+    getQiniupToken() {
+      var that = this
+      wx.request({
+        url: app.globalData.szhUrl+'/mkl/api/getToken',
+        method:"GET",
+        success:function(res){
+          that.setData({
+            token: res.data,
+          });
+        }
+      })
+    },
+
+    /**
+     * 确认签名
+     */
+    sign(e){
+        let tempFilePath = e.detail
+        //上传签名图片
+        this.uploadToQiniu(tempFilePath)
+    },
+
+    /**
+     * 重置
+     */
+    reset(){
+        this.setData({
+          radio1:'',
+          radio2:''
+        })
+    },
+
+    /**
+     * 提交签名信息并生成承诺书
+     */
+    submit(){
+      var that = this
+      if(this.data.radio1 == ''){
+        app.toast("请选择是否有高血压、心脏病等基础身体健康问题");
+        return;
+      }
+      if(this.data.radio2 == ''){
+        app.toast("请选择是否有严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆");
+        return;
+      }
+      if(this.data.signImgUrl == ''){
+        app.toast("请点击签名！");
+        return;
+      }
+
+      wx.showLoading({
+        title: '正在提交。。。',
+        mask: true,
+      })
+
+      wx.request({
+        header: {
+            'content-type': 'application/x-www-form-urlencoded'
+        },
+        url:app.globalData.szhUrl+'/mkl/api/generateSafetyLetterOfCommitment',
+        data:{
+          "openId": wx.getStorageSync('userOpenId'),
+          "idCardNo": wx.getStorageSync('idCardNo'),
+          "radio1":this.data.radio1,
+          "radio2":this.data.radio2,
+          "signImgUrl":this.data.signImgUrl,
+        },
+        method:"POST",
+        success:function(res){
+            if(res.data.code == '200'){
+              that.setData({
+                show:false
+              })
+              wx.hideLoading({});
+              app.toast("温馨提醒：你的个人信息和培训考试结果已成功提交至项目审核，审核通过后可通过人脸识别闸机进场。");
+              return;
+            }else{
+              app.toast(res.data.msg);
+              return;
+            }
+        }
+    })
+	},
+	
+	/**
+   * 上传图片
+   */
+  uploadToQiniu(url) { //图片直接上传到七牛云，获取七牛云链接
+    var that = this;
+    wx.uploadFile({
+      url: 'https://upload.qiniup.com',
+      name: 'file',
+      filePath: url,
+      header: {
+        "Content-Type": "multipart/form-data"
+      },
+      formData: {
+        token: that.data.token,
+      },
+      success: function (res) {
+        let data = JSON.parse(res.data);
+        that.setData({
+          signImgUrl: 'https://fileimg.makalu.cc/' + data.key
+        })
+      },
+      fail: function (res) {
+        console.log(res)
+      }
+    });
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/letterCommitment/index.json b/miniprogram/pages/newAddPage/letterCommitment/index.json
new file mode 100644
index 0000000..38d4010
--- /dev/null
+++ b/miniprogram/pages/newAddPage/letterCommitment/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "承诺书签名"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/letterCommitment/index.wxml b/miniprogram/pages/newAddPage/letterCommitment/index.wxml
new file mode 100644
index 0000000..831bece
--- /dev/null
+++ b/miniprogram/pages/newAddPage/letterCommitment/index.wxml
@@ -0,0 +1,251 @@
+<!--pages/newAddPage/letterCommitment/index.wxml-->
+<view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{safetyQualityRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{healthRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{workerRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{protectiveEquipmentRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{workerPostRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+
+    <!-- 表格填充 -->
+    <view class="cns_rich_content" >
+        <view class="cns_rich_text">
+            <view style="text-align:center;">三级安全教育登记表</view>
+            <view style="text-align: left;">工程名称:</view>
+        <view style="border: 1px solid #fff;position: relative;" >
+        <!-- 身份证复印件 -->
+                    <view class="identity">
+                    身份证复印件粘贴处
+                    </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">姓名</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                
+                <!-- <view class="tableStyle">
+                    <view class="leftBox" >文化程度</view>
+                    <input type="text" class="rightBox"/>
+                </view> -->
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <!-- <view class="tableStyle" >
+                    <view  class="leftBox">姓名</view>
+                    <input type="text" class="rightBox"/>
+                </view> -->
+                
+                <view class="tableStyle">
+                    <view class="leftBox" >文化程度</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">班组</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">入场日期</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">工作卡号</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox" style="width:100%">三级安全教育内容</view>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <!-- 公司教育 -->
+            <view class="gongsi-action">
+                <view class="gongsi-jiaoyu">
+                     公司教育
+                </view>
+                <view class="gongsi-content">
+                    <view> 进行安全基本知识、法规、法制教育，主要内容是：</view>
+                    <view>1、党和国家的安全生产方针、政策</view>
+                    <view>2、安全生产法规、标准和安全知识</view>
+                    <view>3、企业安全生产规章制度、安全纪律</view>
+                    <view>4、安全生产形势及重大事故安全教训</view>
+                    <view>5、安全生产事故后如何抢救伤员、排险、保护现场和及时进行报告</view>
+                </view>
+                <view class="jiaoyuBox">
+                    <view class="top-jiaoyu">
+                        <view class="top-jiaoyutext">
+                        教育人签字：
+                        </view>
+                        <view class="top-jiaoyutext">
+                        受教育人签名：
+                        </view>
+                    </view>
+                    <view>
+                    累计培训()小时
+                    </view>
+                </view>
+            </view>
+            <!-- 项目部教育 -->
+            <view class="gongsi-action">
+                <view class="gongsi-jiaoyu">
+                     公司教育
+                </view>
+                <view class="gongsi-content">
+                    <view> 进行安全基本知识、法规、法制教育，主要内容是：</view>
+                    <view>1、党和国家的安全生产方针、政策</view>
+                    <view>2、安全生产法规、标准和安全知识</view>
+                    <view>3、企业安全生产规章制度、安全纪律</view>
+                    <view>4、安全生产形势及重大事故安全教训</view>
+                    <view>5、安全生产事故后如何抢救伤员、排险、保护现场和及时进行报告</view>
+                </view>
+                <view class="jiaoyuBox">
+                    <view class="top-jiaoyu">
+                        <view class="top-jiaoyutext">
+                        教育人签字：
+                        </view>
+                        <view class="top-jiaoyutext">
+                        受教育人签名：
+                        </view>
+                    </view>
+                    <view>
+                    累计培训()小时
+                    </view>
+                </view>
+            </view>
+            <!-- <view>
+                <view >
+                    项目部教育
+                </view>
+                <view >
+                    进行现场规章制度和遵章守纪教育，主要内容是：
+                    1、本项目施工特点、可能存在的不安全因素及必须遵守的事项
+                    2、本单位(包括施工、生产现场)安全生产制度、规定和安全注意事项
+                    3、本工种的安全技术操作规程
+                    4、高处作业、机械设备、电气安全基础知识
+                    5、防火、防毒、防尘、防爆知识及紧急情况安全处置和安全疏散知
+                    6、雨季防雷、防台、防汛及特殊气候的相关安全知
+                    7、防护用品发放标准及防护用品、用具使用的基本知识
+                    8、学习JGJ146-2004建筑施工现场环境与卫生标准
+                </view>
+                <view style="vertical-align: top;">
+                    教育人签字：
+                </view>
+                <view style="vertical-align: top;">
+                    受教育人签名：
+                </view>
+            </view>
+           
+            <view>
+                <view rowspan="2" class="center">
+                    <view>班组教育</view>
+                </view>
+                <view rowspan="2" colspan="3">
+                    进行本工种岗位安全操作及安全制度、纪律教育，主要内容是：
+                    1、本班组作业特点及安全操作规程
+                    2、本班组安全活动制度及纪律
+                    3、正确使用安全防护装置(设施)及个人劳动防护用品
+                    4、本岗位易发生事故的不安全因素及其防范对策，本工种事故案例剖析
+                    5、本岗位的作业环境及使用的机械设备、工具的安全要求
+                </view>
+                <view style="vertical-align: top;">
+                    教育人签字：
+                </view>
+                <view style="vertical-align: top;">
+                    受教育人签名：
+                </view>
+            </view> -->
+            <view class="gongsi-action">
+                <view class="gongsi-jiaoyu">
+                     公司教育
+                </view>
+                <view class="gongsi-content">
+                    <view>  进行现场规章制度和遵章守纪教育，主要内容是：</view>
+                    <view>1、党和国家的安全生产方针、政策</view>
+                    <view>2、安全生产法规、标准和安全知识</view>
+                    <view>3、企业安全生产规章制度、安全纪律</view>
+                    <view>4、安全生产形势及重大事故安全教训</view>
+                    <view>5、安全生产事故后如何抢救伤员、排险、保护现场和及时进行报告</view>
+                </view>
+                <view class="jiaoyuBox">
+                    <view class="top-jiaoyu">
+                        <view class="top-jiaoyutext">
+                        教育人签字：
+                        </view>
+                        <view class="top-jiaoyutext">
+                        受教育人签名：
+                        </view>
+                    </view>
+                    <view>
+                    累计培训()小时
+                    </view>
+                </view>
+            </view>
+        </view>
+        </view>
+    </view>
+
+
+    <view class="cns_confirm">
+        <view class="cns_confirm_text"> 
+            <view class="cns_confirm_text_title">1、高血压、心脏病等基础身体健康问题。</view>
+            <view>
+                <van-radio-group value="{{ radio1 }}" bind:change="onChange1"
+                direction="{{horizontal}}" style="display: flex; padding:20rpx 0">
+                <van-radio name="1" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">无</van-radio>
+                <van-radio name="2" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">有</van-radio>
+                </van-radio-group>
+            </view>
+        </view>
+        <view class="cns_confirm_text"> 
+            <view class="cns_confirm_text_title">2、严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆。</view>
+            <view>
+                <van-radio-group value="{{ radio2 }}" bind:change="onChange2"
+                direction="{{horizontal}}" style="display: flex; padding:20rpx 0">
+                <van-radio name="1" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">无</van-radio>
+                <van-radio name="2" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">有</van-radio>
+                </van-radio-group>
+            </view>
+        </view>
+        <view class="cns_confirm_text"> 
+            <view class="cns_confirm_text_title">3、签名：</view>
+            <view class="cns_confirm_sign">
+                <sign bind:returnData="sign" canvas-id="canvas"></sign>
+            </view>
+        </view>
+        <view class="switch_button" wx:if="{{show}}">
+            <button class="switch_button_up" bindtap="reset">重置</button>
+            <button class="switch_button_to" bindtap="submit">提交</button> 
+        </view>
+    </view>
+
+
+</view>
diff --git a/miniprogram/pages/newAddPage/letterCommitment/index.wxss b/miniprogram/pages/newAddPage/letterCommitment/index.wxss
new file mode 100644
index 0000000..b2bf6ff
--- /dev/null
+++ b/miniprogram/pages/newAddPage/letterCommitment/index.wxss
@@ -0,0 +1,71 @@
+/* pages/newAddPage/letterCommitment/index.wxss */
+.radio_custom_class{
+    padding: 10rpx 100rpx 10rpx 0;
+}
+.radio_label_class{
+    color: #ffffff !important;
+}
+.tableStyle{
+    display: flex;
+    justify-content: space-between;
+    align-items: center; 
+    width: 50%;
+}
+.leftBox{
+    padding: 12rpx 30rpx;
+    border: 1px solid #fff;
+    width: 184rpx;
+    text-align: center;
+}
+.rightBox{
+    width: 110rpx;
+    padding: 10rpx;
+    /* box-sizing: border-box; */
+    border: 1px solid #fff;
+}
+.oneBox-style{
+    display: flex;
+}
+.identity{
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 50%;
+    height: 408rpx;
+    line-height: 408rpx;
+    text-align: center;
+    border: 1px solid #fff;
+}
+.gongsi-action{
+    display: flex;
+    align-items: center;
+    border: 1px solid #fff;
+    font-size: 10px;
+}
+.gongsi-jiaoyu{
+    writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
+    -ms-writing-mode: vertical-lr;
+    font-size: 12px;
+}
+.gongsi-content{
+    width: 60%;
+    border-left: 1px solid #fff;
+    border-right: 1px solid #fff;
+}
+.top-jiaoyu{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+}
+.top-jiaoyutext{
+    font-size: 6px;
+}
+.jiaoyuBox{
+    width: 208rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    height: 228rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/safetyBriefingLearning/index.js b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.js
new file mode 100644
index 0000000..2caa05f
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.js
@@ -0,0 +1,613 @@
+// pages/newAddPage/safetyBriefingLearning/index.js
+const app = getApp()
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    //所有三级安全教育视频
+    allVideo:{},
+    // 声明一个数组,里面放着要展示的视频链接
+    videoList:[],
+    formatanswer:'',
+    second:0,
+    second_state:true,
+    timer:'',
+
+    index:0,
+    answer:false,
+
+    up:false,
+    down:false,
+    to:false,
+
+    questionsData:[],
+    //单独视频url
+    videoUrl:'',
+    videoObj:{},
+    //学习时长
+    learnTime:1,
+    watchTimer:'',
+    openId:'',
+    activeState:1,
+    //答案提示
+    answerTip:'',
+     //考试分数
+    fullScore:'',
+    examPaperId:'',
+    //控制视频时长
+    companyTimer:'',
+    companyTime:0,
+    projectTimer:'',
+    projectTime:0,
+    groupTimer:'',
+    groupTime:0,
+    //试题显示标识
+    paperFlag:false
+  },
+  trainingTypeJump(e){
+    var that  = this
+    // this.onClickShow();
+    let index = e.currentTarget.dataset.index;
+    var videoList = []
+    let titleName =  '';
+  
+    switch(index) {
+      case '1':
+          titleName = '公司级';
+          videoList = that.data.allVideo.companyList
+          break;
+      case '2':
+        if(that.data.companyTime < 30) {
+          app.toast("温馨提示：当前视频学习完成后，方可进行下一个视频学习。");
+          return;
+        } else {
+          if( that.data.projectTime <30) {
+            var projectTimer = setInterval(() => {
+              var projectTime = that.data.projectTime;
+              if(projectTime >= 0 && projectTime <= 29){
+                this.setData({
+                  projectTime:parseInt(projectTime) + 1,
+                  projectTimer:projectTimer
+                })              
+              }else{
+                clearInterval(this.data.projectTimer);
+              }
+            }, 1000);
+          }
+          
+        }
+        titleName = '项目级';
+        videoList = that.data.allVideo.projectList
+        
+        break;  
+      case '3':
+        if(that.data.companyTime < 30 || that.data.projectTime < 30) {
+          app.toast("温馨提示：当前视频学习完成后，方可进行下一个视频学习。");
+          return;
+        } else {
+          if(that.data.groupTime < 30) {
+            var groupTimer = setInterval(() => {
+              var groupTime = that.data.groupTime;
+              if(groupTime >= 0 && groupTime <= 29){
+                this.setData({
+                  groupTime:parseInt(groupTime) + 1,
+                  groupTimer:groupTimer
+                })
+              }else{
+                clearInterval(this.data.groupTimer);
+                that.setData({
+                  paperFlag:true
+                })
+              }
+            }, 1000);
+          }
+          
+        }
+        titleName = '班组级';
+        videoList = that.data.allVideo.groupList
+        break; 
+      default:
+        videoList = []   
+        break
+   }
+
+    
+    this.setData({
+      titleName:titleName,
+      activeState:index,
+      videoList:videoList,
+      pageNo:1,
+      type:1,
+      trainingType:index,
+      startDate:'',
+      endDate:'',
+      collaborateRanksId:''
+    });
+    console.log(videoList)
+    // this.getTrainingList();
+    // this.getTrainingNumberOfPeopleCount();
+  },
+  //打开视频
+  bindplay_click(){
+    var timer = setInterval(() => {
+      var second = this.data.second
+      if(second == parseInt(this.data.videoObj.effectiveDuration)) {
+        this.addUserRecord()
+      }
+      if(second > 0){
+        this.setData({
+          second:second - 1,
+          timer:timer
+        })
+      }
+      else{
+        clearInterval(this.data.timer);
+        this.setData({
+          second_state:false,
+        })
+      }
+    }, 1000);
+    
+
+
+    var watchTimer = setInterval(() => {
+      var learnTime = this.data.learnTime;
+      if(learnTime >= 0){
+        this.setData({
+          learnTime:parseInt(learnTime) + 1,
+          watchTimer:watchTimer
+        })
+      }else{
+        clearInterval(this.data.watchTimer);
+      }
+    }, 1000);
+
+
+  },
+
+  //暂停视频
+  bindpause_click(){
+    if(this.data.second > 0){
+      clearInterval(this.data.timer);
+    }
+    if(this.data.learnTime > 0) {
+      clearInterval(this.data.watchTimer);
+    }
+  },
+  // 点击查看详情
+chakanBtn(e){
+  var data = this.data.questionsData
+  var i = this.data.index
+  data[i].type=true
+  var tempList = data[i].answer_list
+  var str = ''
+  for(var j =0;j <tempList.length;j++) {
+    if(data[i].correct_answer == tempList[j].letter) {
+        str = tempList[j].answer;
+        break;
+    }
+  }
+  this.setData({
+    questionsData:data,
+    answerTip:str
+  })
+  },
+
+  //选择答案
+  chooseAnswer(e){
+    var data = this.data.questionsData
+    var i = this.data.index
+    var j = e.currentTarget.dataset.j
+    var item =e.currentTarget.dataset.item
+    console.log(item);
+   
+    if(data[i].topic_state == false){
+      data[i].type = true
+      for(var z = 0;z<data[i].answer_list.length;z++){
+        data[i].answer_list[z].answer_state = false
+      }
+      data[i].answer_list[j].answer_state = true
+
+      if(data[i].correct_answer == item.letter){
+        data[i].topic_state = true
+        if(i < data.length-1){
+          this.setData({
+            index:i+1
+          })
+        }
+        if(data.length == 1){
+          this.setData({
+            to:true,
+          })
+        }
+      }
+      var tempList = data[i].answer_list
+      var str = ''
+      for(var j =0;j <tempList.length;j++) {
+        if(data[i].correct_answer == tempList[j].letter) {
+            str = tempList[j].answer;
+            break;
+        }
+      }
+      this.setData({
+        questionsData:data,
+        answerTip:str
+      })
+
+      if(this.data.index > 0 ){
+        this.setData({
+          up:true,
+        })
+        if(this.data.questionsData.length - 1 == this.data.index &&  this.data.questionsData[this.data.index].topic_state == true){
+          this.setData({
+            to:true,
+          })
+        }
+      }
+    }
+  },
+
+  //点击上一题
+  onClickUp(){
+    var that = this
+    this.setData({
+      index:this.data.index - 1
+    })
+  
+   
+    if(that.data.index == 0){
+      that.setData({
+        up:false,
+        down:true
+      })
+    }else{
+      if(that.data.questionsData[that.data.index].topic_state == false){
+        that.setData({
+          up:true,
+          down:false,
+          to:false
+        
+        })
+      }else{
+        that.setData({
+          up:true,
+          down:true,
+          to:false
+        })
+      }
+    }
+
+    var data = this.data.questionsData
+    var i = this.data.index
+    var tempList = data[i].answer_list
+    var str = ''
+    for(var j =0;j <tempList.length;j++) {
+      if(data[i].correct_answer == tempList[j].letter) {
+          str = tempList[j].answer;
+          break;
+      }
+    }
+    this.setData({
+      answerTip:str
+    })
+  },
+
+  //点击下一题
+  onClickDown(){
+    this.setData({
+      index:this.data.index + 1
+    })
+    if(this.data.index == this.data.questionsData.length-1 ){
+      if(this.data.questionsData[this.data.index].topic_state == false){
+        this.setData({
+          up:true,
+          down:false,
+          to:false
+        })
+      }else{
+        this.setData({
+          up:true,
+          down:false,
+          to:true
+        })
+      }
+      
+    }else{
+      if(this.data.questionsData[this.data.index].topic_state == false){
+        this.setData({
+          up:true,
+          down:false,
+          to:false
+        })
+      }else{
+        this.setData({
+          up:true,
+          down:true,
+          to:false
+        })
+      }
+    }
+
+    var data = this.data.questionsData
+    var i = this.data.index
+    var tempList = data[i].answer_list
+    var str = ''
+    for(var j =0;j <tempList.length;j++) {
+      if(data[i].correct_answer == tempList[j].letter) {
+          str = tempList[j].answer;
+          break;
+      }
+    }
+    this.setData({
+      answerTip:str
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    that.setData({
+      openId:wx.getStorageSync('userOenId')
+    })
+
+    //获取视频链接
+    that.getVideoURL(options.projectId,options.firstWorkType,options.secondWorkType)
+    //获取在线答题题目信息
+    that.getOnlineExamList(1,options.projectId,options.firstWorkType,options.secondWorkType);
+    
+
+      // 拿取video盒子的宽高
+      /**
+       * 生命周期函数--监听页面加载
+       */
+          // var that = this;
+          // var query = wx.createSelectorQuery(); //创建节点选择器
+          // //#box需要与wxml里面的id保持一致
+          // query.select('#myVideo').boundingClientRect(function (rect) {
+          //     console.log('00000',rect);
+          //     that.setData({
+          //       myVideo: rect
+          //     });
+          // }).exec();
+    var companyTimer = setInterval(() => {
+      var companyTime = this.data.companyTime;
+      if(companyTime >= 0 && companyTime <= 29){
+        this.setData({
+          companyTime:parseInt(companyTime) + 1,
+          companyTimer:companyTimer
+        })
+        console.log(this.data.companyTime)
+      }else{
+        clearInterval(this.data.companyTimer);
+      }
+    }, 1000);
+      
+          
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady(){
+
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+
+  /**
+   * 获取在线答题题目信息
+   * @param {*} questionType 题目类型（1：安全,2施工技艺）
+   */
+  getOnlineExamList(questionType,projectId,firstWorkType,secondWorkType){
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl+'/mkl/api/getOnlineExamList',
+      data:{
+        "questionType":questionType,
+        "projectId":projectId,
+        "firstWorkType":firstWorkType,
+        "secondWorkType":secondWorkType
+      },
+      method:"GET",
+      success:function(res){
+        that.setData({
+          questionsData:res.data,
+          examPaperId:res.data[0].examPaperId == undefined ?null:res.data[0].examPaperId,
+          fullScore:res.data[0].totalScore== undefined ?null:res.data[0].totalScore
+        })
+      }
+    })
+  },
+
+  /**
+   * 提交答题记录
+   */
+  onClickTo(){
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl+'/mkl/api/addOnlineExamLog',
+      data:{
+        "openId": wx.getStorageSync('userOpenId'),
+        "idCardNo": wx.getStorageSync('idCardNo'),
+        "score":that.data.fullScore,
+        "fullScore":that.data.fullScore,
+        "examPaperId":that.data.examPaperId,
+        "randomScore":Math.floor(Math.random()*10)
+      },
+      method:"GET",
+      success:function(res){
+        if(res.data.code == '200'){
+          that.setData({ up:false });
+          that.setData({ down:false });
+          that.setData({ to:false });
+          wx.redirectTo({
+            url: '../letterCommitment/index'
+          })
+        }else{
+          app.toast(res.data.msg);
+        }
+      }
+    })
+  },
+
+ /**
+   * 获取视频链接
+   */
+  getVideoURL(projectId,firstWorkType,secondWorkType) {
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl+'/mkl/api/getOnlineVideoList',
+      data:{
+        fileType: 1,//视频
+        projectId:projectId,
+        firstWorkType:firstWorkType,
+        secondWorkType:secondWorkType
+      },
+      method:"GET",
+      success:function(res){
+        console.log(res)
+        console.log(res.data.code)
+        if(res.data.code == 0) {
+            that.setData({
+              allVideo:res.data.data
+            })
+        }
+        var videoList = []
+       switch(that.data.activeState ) {
+          case 1:
+              videoList = that.data.allVideo.companyList
+              break;
+          case 2:
+            videoList = that.data.allVideo.projectList
+            break;  
+          case 3:
+            videoList = that.data.allVideo.groupList
+            break; 
+          default:
+            videoList = []   
+            break
+       }
+       that.setData({
+          videoList:videoList
+       })
+       console.log(that.data.videoList)
+        // if(res.data.length > 0) {
+        //     var list = res.data
+        //     let url = list[0].videoUrl;
+        //     let effectiveDuration = parseInt(list[0].effectiveDuration)
+        //     that.setData({
+        //       videoObj:list[0],
+        //       videoUrl:url,
+        //       second:effectiveDuration
+        //     })
+        // }
+        that.checkUserFinishedFlag()
+      }
+  })
+},
+
+  /**
+   * 添加用户学习记录
+   */
+  addUserRecord() {
+    var that = this
+    var completeFlag = parseInt(that.data.learnTime) >= parseInt(that.data.videoObj.effectiveDuration == ""?0: that.data.videoObj.effectiveDuration)?1:0
+    wx.request({
+      url:app.globalData.szhUrl+'/mkl/api/addEducationRecord',
+      data:{
+        initialId:that.data.videoObj.id,
+        userId:wx.getStorageSync('idCardNo'),
+        openId:wx.getStorageSync('userOpenId'),
+        learningDuration:that.data.learnTime,
+        completeFlag:completeFlag
+      },
+      method:"POST",
+      success:function(res){
+        if(res.data.code == 0){
+          console.log("添加学习记录成功！")
+         }else{
+          console.log("添加学习记录失败！")
+         }
+      }
+    })
+  },
+
+  /**
+   * 获取用户学习时长
+   */
+  getUserLearnTime() {
+    this.addUserRecord() 
+    this.onClickTo()
+  },
+
+  /**
+   * 查询用户是否学习
+   */
+  checkUserFinishedFlag() {
+    var that = this
+    wx.request({
+      url:app.globalData.szhUrl+'/mkl/api/getUserFinishList',
+      data:{
+        initialId:parseInt(that.data.videoObj.id),
+        userId:wx.getStorageSync('idCardNo')
+      },
+      method:"POST",
+      success:function(res){
+        if(res.data.code == 0){
+           if(res.data.data.length >0) {
+              var obj = res.data.data[0];
+              if(obj.completeFlag == "1") {
+                  that.setData({
+                    second_state:false
+                  })
+              }
+           }
+         }
+      }
+    })
+  },
+
+  
+})
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/safetyBriefingLearning/index.json b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.json
new file mode 100644
index 0000000..2099bd2
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index"
+  },
+  "navigationBarTitleText": "施工安全交底学习"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxml b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxml
new file mode 100644
index 0000000..3c8dfb7
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxml
@@ -0,0 +1,102 @@
+<!--pages/newAddPage/safetyBriefingLearning/index.wxml-->
+<view class="study_max">
+    <view class="study_min">
+        <view class="module_title">安全视频</view>
+    </view>
+    <view class="study_video" >
+    <!-- 在此添加一个tab栏切换 -->
+      <view class="modify_video_nav" style="margin-top: 64rpx;background-color: #191d28;">
+      <view class="{{activeState==1?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>公司级</text></view>
+      <view class="{{activeState==2?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>项目级</text></view>
+      <view class="{{activeState==3?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>班组级</text></view>
+  </view>
+<view class="whoBox">
+    <view class="outsideBox showBoxs">
+        <!-- 最外边展示盒子 -->
+        <view class="showBox">
+            <!-- 左按钮 -->
+            <!-- <view class="leftBtn">
+            <image src="http://fileimg.makalu.cc/WEB_1CFE1E31022543CB934B01E8777B5907.png" mode="" style="width:100%;height:100%;"/>
+            </view> -->
+            <!-- 右按钮 -->
+            <!-- <view class="rightBtn">
+                <image src="http://fileimg.makalu.cc/WEB_1CFE1E31022543CB934B01E8777B5907.png" mode="" style="width:100%;height:100%;"/>
+            </view> -->
+            <swiper style="height: 450rpx;" indicator-dots duration='500' indicator-active-color='#fff'>
+                <swiper-item wx:for="{{videoList}}" wx:key="index">
+                    <video id="myVideo" src="{{item.videoUrl}}" binderror="videoErrorCallback" show-center-play-btn='{{true}}' show-play-btn="{{true}}" bindplay="bindplay_click" bindpause="bindpause_click" bindended="getUserLearnTime" controls></video>
+                </swiper-item>
+            </swiper>
+        </view>
+        <view class="study_video_tips">
+            温馨提示：请观看视频后进行答题
+        </view>
+        <view wx:if="{{paperFlag}}">
+            <view class="study_min">
+                <view class="module_title">安全考试</view>
+            </view>
+
+            <view class="study_examination_questions">
+
+                <view class="study_examination_questions_con" style="position: relative;">
+                    <view class="study_examination_questions_topic">{{questionsData[index].topic}}</view>
+                    <view class="study_examination_questions_radio">
+                        <view class="{{item.answer_state? (questionsData[index].correct_answer==item.letter?'study_examination_questions_list active':'study_examination_questions_list error'):'study_examination_questions_list'}}" wx:for="{{questionsData[index].answer_list}}" wx:for-index="j" wx:key="j" bindtap="chooseAnswer" data-j="{{j}}" data-item="{{item}}">
+                            <view class="study_radio">
+                                <van-icon name="success" />
+                            </view>
+                            <view class="study_radio_subject">{{item.answer}}</view>
+                        </view>
+                    </view>
+                    <!-- 查看按钮 -->
+                    <view class="chakan" wx:if="{{questionsData.length > 0 }}" data-set="{{index}}" bindtap="chakanBtn">
+                        查看详情
+                    </view>
+                </view>
+
+                <view class="answer_result" wx:if="{{questionsData[index].type}}">
+                    答案：{{answerTip}}
+                    <!-- 答案：{{ questionsData[index].answer_list.filter(item=>item.letter==questionsData[index].correct_answer)}} -->
+                </view>
+
+                <view class="switch_button">
+                    <button class="switch_button_up" wx:if="{{up}}" bindtap="onClickUp">上一题</button>
+                    <button class="switch_button_down" wx:if="{{down}}" bindtap="onClickDown">下一题</button>
+                    <button class="switch_button_to" wx:if="{{to}}" bindtap="onClickTo">确认提交</button>
+                </view>
+
+            </view>
+        </view>
+    </view>
+</view>
+<!-- <van-tabs active="a"  >
+        <van-tab title="公司级" name="a"></van-tab>
+        <van-tab title="项目级" name="b"></van-tab>
+        <van-tab title="班组级" name="c"></van-tab>
+    </van-tabs> -->
+
+</view>
+
+
+
+</view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxss b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxss
new file mode 100644
index 0000000..220183a
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyBriefingLearning/index.wxss
@@ -0,0 +1,68 @@
+/* pages/newAddPage/safetyBriefingLearning/index.wxss */
+.chakan{
+	position: absolute;
+	right: 48rpx;
+	bottom: 20rpx;
+	color: orange;
+}
+/* vant-weapp样式 */
+.van-tabs__nav {
+	background-color: #191d28;
+}
+.van-ellipsis{
+	color: #fff;
+}
+.van-tabs__line{
+	background-color: #fff !important;
+}
+/* .showBox{
+	position: relative;
+	width: 750rpx;
+	height: 462rpx;
+	border: 1px solid red;
+	box-sizing: border-box;
+	z-index: 999;
+}
+.showBox:hover .leftBtn{
+	display: block;
+}
+.showBox:hover .rightBtn{
+	display: block;
+}
+.leftBtn{
+	position: absolute;
+	left: 0;
+	top:50%;
+	transform: translate(0,-50%);
+	width: 48rpx;
+	height: 80rpx;
+	color: #000;
+	border: 1px solid #fff;
+	z-index: 999;
+	display: none;
+}
+.rightBtn{
+	position: absolute;
+	right: 0;
+	top:50%;
+	transform: translate(0,-50%);
+	width: 48rpx;
+	height: 80rpx;
+	color: #000;
+	border: 1px solid #fff;
+	z-index: 999;
+	display: none;
+} */
+.whoBox{
+	position: relative;
+}
+.outsideBox{
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	display: none;
+}
+.showBoxs{
+display: block;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/safetyManagement/index.js b/miniprogram/pages/newAddPage/safetyManagement/index.js
new file mode 100644
index 0000000..c7fe2b1
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyManagement/index.js
@@ -0,0 +1,559 @@
+// pages/newAddPage/safetyManagement/index.js
+
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active: 1,
+    deptId: '',
+    projectName: '',
+    projectId: '',
+    loginName: '',
+    userName: '',
+    initData: {},
+    projectData: {},
+
+    //教育培训
+    videoSurvey: [
+    ],
+    //基坑检测
+    safetyDeepData: [
+      {
+        name: '沉降',
+        total: 0,
+        notMonitor: 0,
+        yesMonitor: 0,
+        unit: '个'
+      },
+      {
+        name: '倾斜',
+        total: 0,
+        notMonitor: 0,
+        yesMonitor: 0,
+        unit: '个'
+      },
+      {
+        name: '应力',
+        total: 0,
+        notMonitor: 0,
+        yesMonitor: 0,
+        unit: '个'
+      },
+    ],
+    //爬架检测
+    safetyFrameData: [
+      {
+        name: '倾斜',
+        total: 0,
+        notMonitor: 0,
+        yesMonitor: 0,
+        unit: '个'
+      },
+      {
+        name: '高度',
+        total: 0,
+        notMonitor: 0,
+        yesMonitor: 0,
+        unit: '个'
+      },
+      {
+        name: '载荷',
+        total: 0,
+        notMonitor: 0,
+        yesMonitor: 0,
+        unit: '个'
+      },
+    ],
+    securityCheck: {
+      routineRectificationRate: 0, //常规整改率
+      routineProblemTotal: 0,//常规问题总数
+      routineCheckNumber: 0,//常规检查次数
+      specialRectificationRate: 0, //专项整改率
+      specialProblemTotal: 0,//专项问题总数
+      specialCheckNumber: 0,//专项检查次数
+    },
+    pitCount: {//基坑统计数据
+      onlineNumber: 0,
+      offlineNumber: 0,
+      total: 0,
+    },
+    climbCount: {//爬架统计数据
+      onlineNumber: 0,
+      offlineNumber: 0,
+      total: 0,
+    },
+    power: {//配电箱信息
+      t1: 0,
+      t2: 0,
+      t3: 0,
+      t4: 0,
+      c1: 0,
+      c2: 0,
+      c3: 0,
+      leak: 0
+    },
+    highlightPictures: []
+  },
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e) {
+    //this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId: projectId,
+      projectName: projectName,
+    })
+    this.onLoad()
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this
+    wx.getStorage({
+      key: 'userinfo',
+      success: function (res) {
+        console.log(res.data);
+        that.setData({
+          loginName: res.data.loginName,
+          userName: res.data.userName,
+          deptId: res.data.deptId,
+          projectName: app.globalData.projectName,
+          projectId: app.globalData.projectId,
+          initData: { text: app.globalData.projectName, id: app.globalData.projectId }
+        })
+        that.getProjectCorrespondence(app.globalData.projectId);
+      }
+    })
+  },
+
+  /**
+   * 项目对应关系
+   */
+  getProjectCorrespondence(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId,
+      },
+      method: "get",
+      success: function (res) {
+        console.log(res.data);
+        that.setData({
+          projectData: res.data
+        })
+        that.getSecurityCheck()
+        that.getPitCount()
+        that.getClimbCount()
+        that.getDistributionBoxData()
+        that.getHighlightPictures()
+        that.getTraining()
+      }
+    })
+  },
+  /**
+   * 教育培训
+   */
+  getTraining() {
+    let that = this
+    wx.request({
+      url: app.globalData.szhUrl + "/api/building/listCultivate?project_id=" + this.data.projectData.szh + "&cultivate_type=4",
+      method: "post",
+      success: res => {
+        wx.request({
+          url: app.globalData.szhUrl + "/api/building/listCultivate?project_id=" + this.data.projectData.szh + "&cultivate_type=6",
+          method: "post",
+          success: res1 => {
+            wx.request({
+              url: app.globalData.szhUrl + "/api/building/listCultivate?project_id=" + this.data.projectData.szh + "&cultivate_type=3",
+              method: "post",
+              success: res2 => {
+                let total = res.data.data.length
+                  + res1.data.data.length
+                  + res2.data.data.length
+                that.setData({
+                  videoSurvey: [
+                    { name: '三级安全教育', value: res.data.data.length, prop: (res.data.data.length / total * 100).toFixed(2) },
+                    // { name: '班前讲话', value: '0', prop: 0 },
+                    { name: '应急演练', value: res2.data.data.length, prop: (res2.data.data.length / total * 100).toFixed(2) },
+                    { name: '专项培训', value: res1.data.data.length, prop: (res1.data.data.length / total * 100).toFixed(2) }
+                  ]
+                })
+                // wx.request({
+                //   url: app.globalData.szhUrl + "/api/building/listCultivate?project_id=" + this.data.projectData.szh + "&cultivate_type=4",
+                //   method: "post",
+                //   success: res3 => {
+
+                //   }
+                // })
+              }
+            })
+          }
+        })
+      }
+    })
+  },
+  /**
+   * 获取安全检查数据
+   */
+  getSecurityCheck() {
+    wx.request({
+      url: app.globalData.szhUrl + '/api/check/getCheckStatistics?project_id=' + this.data.projectData.szh + "&large_type=1",
+      success: res1 => {
+        wx.request({
+          url: app.globalData.szhUrl + '/api/check/getCheckStatistics?project_id=' + this.data.projectData.szh + "&large_type=2",
+          success: res2 => {
+            this.setData({
+              "securityCheck.routineRectificationRate": res1.data.data.rate,
+              "securityCheck.routineProblemTotal": res1.data.data.problemTotal,
+              "securityCheck.routineCheckNumber": res1.data.data.total,
+              "securityCheck.specialRectificationRate": res2.data.data.rate,
+              "securityCheck.specialProblemTotal": res2.data.data.problemTotal,
+              "securityCheck.specialCheckNumber": res2.data.data.total,
+            })
+          }
+        })
+      }
+    })
+  },
+  /**
+   * 获取基坑监测统计
+   */
+  getPitCount() {
+    wx.request({
+      url: app.globalData.aqzgUrl + '/weixin/structProjectSensorInfo/select/sensorInfo?projectId=' + this.data.projectData.aqzg + "&sensorType=4",
+      method: "post",
+      success: res => {
+        console.log(res)
+        let zxDeviceTotal = 0
+        let cj = 0
+        let cj_o = 0
+        let qx = 0
+        let qx_o = 0
+        let yl = 0
+        let yl_o = 0
+        res.data.data.map(x => {
+          let a = 0
+          if (x.status != 2) {
+            zxDeviceTotal++;
+            a = 1
+          }
+          switch (x.sensorType) {
+            case "CollWeiyiPoint":
+              cj++
+              cj_o += a
+              break
+            case "CollQingxiePoint":
+              qx++
+              qx_o += a
+              break
+            case "YingLi":
+              yl++
+              yl_o += a
+              bre
+          }
+        })
+        this.setData({
+          "pitCount.onlineNumber": zxDeviceTotal,
+          "pitCount.offlineNumber": res.data.data.length - zxDeviceTotal,
+          "pitCount.total": res.data.data.length,
+          safetyDeepData: [
+            {
+              name: '沉降',
+              total: cj,
+              notMonitor: cj - cj_o,
+              yesMonitor: cj_o,
+              unit: '个'
+            },
+            {
+              name: '倾斜',
+              total: qx,
+              notMonitor: qx - qx_o,
+              yesMonitor: qx_o,
+              unit: '个'
+            },
+            {
+              name: '应力',
+              total: yl,
+              notMonitor: yl - yl_o,
+              yesMonitor: yl_o,
+              unit: '个'
+            },
+          ],
+        })
+      }
+    })
+  },
+  /**
+   * 获取爬架监测统计
+   */
+  getClimbCount() {
+    wx.request({
+      url: app.globalData.szhUrl + '/screen/api/getDeviceBaseInfo?projectId=' + this.data.projectData.aqzg + '&drawId=7053550232834936832',
+      method: "post",
+      success: res => {
+        let zxDeviceTotal = 0
+        let cj = 0
+        let cj_o = 0
+        let qx = 0
+        let qx_o = 0
+        let yl = 0
+        let yl_o = 0
+
+        res.data.data.map(x => {
+          let a = 0
+          if (x.status != 2) {
+            zxDeviceTotal++;
+            a = 1
+          }
+          switch (x.sensorType) {
+            case "CollWeiyiPoint":
+              cj++
+              cj_o += a
+              break
+            case "CollQingxiePoint":
+              qx++
+              qx_o += a
+              break
+            case "YingLi":
+              yl++
+              yl_o += a
+              bre
+          }
+        })
+        this.setData({
+          "climbCount.onlineNumber": zxDeviceTotal,
+          "climbCount.offlineNumber": res.data.data.length - zxDeviceTotal,
+          "climbCount.total": res.data.data.length,
+          safetyFrameData: [
+            {
+              name: '倾斜',
+              total: qx,
+              notMonitor: qx - qx_o,
+              yesMonitor: qx_o,
+              unit: '个'
+            },
+            {
+              name: '高度',
+              total: 0,
+              notMonitor: 0,
+              yesMonitor: 0,
+              unit: '个'
+            },
+            {
+              name: '载荷',
+              total: 0,
+              notMonitor: 0,
+              yesMonitor: 0,
+              unit: '个'
+            },
+          ],
+        })
+      }
+    })
+  },
+  /**
+   * 获取塔机监测统计
+   */
+  getTowerCraneCount() {
+    wx.request({
+      url: app.globalData.aqzgUrl + '/api/statistics/getDeviceSourceCensus',
+      method: "post",
+      success: res => {
+        let zxDeviceTotal = 0
+        res.data.data.map(x => {
+          if (x.status != 2) {
+            zxDeviceTotal++;
+          }
+        })
+        this.setData({
+          "towerCraneCount.onlineNumber": zxDeviceTotal,
+          "towerCraneCount.offlineNumber": res.data.data.length - zxDeviceTotal,
+          "towerCraneCount.total": res.data.data.length
+        })
+      }
+    })
+  },
+  /**
+   * 获取配电箱数据
+   */
+  getDistributionBoxData() {
+    wx.request({
+      url: app.globalData.szhUrl + '/api/iot/power/latestList',
+      data: {
+        projectId: this.data.projectData.szh,
+        uid: 'PWR.02731XTJ'
+      },
+      success: res => {
+        this.setData({
+          power: res.data.rows[0] ? res.data.rows[0] : {
+            t1: 0,
+            t2: 0,
+            t3: 0,
+            t4: 0,
+            c1: 0,
+            c2: 0,
+            c3: 0,
+            leak: 0
+          }
+        })
+      }
+    })
+  },
+  /**
+   * 亮点照片
+   */
+  getHighlightPictures() {
+    wx.request({
+      url: app.globalData.szhUrl + '/api/building/photoList?projectId=' + this.data.projectData.szh + '&typeMain=8&typeId=18',
+      method: "post",
+      success: res => {
+        console.log(res)
+        this.setData({
+          highlightPictures: res.data.data
+        })
+      }
+    })
+  },
+
+  goHighLightPage() {
+    wx.navigateTo({
+      url: '../../Highlight-photos/index',
+    })
+  },
+
+  /**
+   * 教育培训页面
+   */
+  goEducations() {
+    wx.navigateTo({
+      url: '../../../pageage/educations-list/index?jumpState=1',
+    })
+  },
+
+  /**
+   * 基坑页面
+   */
+  gofoundation(event) {
+    let id = event.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: '../../deepExcavation/index?id='+id,
+    })
+  },
+
+   /**
+   * 跳转安全教育
+   */
+  goCheckView(){
+    wx.navigateTo({
+      url: '../../../pageage/safetyManagement/securityCheck/index',
+    })
+  },
+/**
+ * 配电箱监测
+ */
+  goPDJCDetail() {
+    wx.navigateTo({
+      url: '../../Security-control-echarts/index',
+    })
+  },
+
+
+  /****************************底部导航********************************/
+  onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+
+  /**
+   * 项目概况页面
+   */
+  XMGK: function () {
+    wx.redirectTo({
+      url: '../../xiangmugaikuang/xiangmugaikuang'
+    })
+  },
+
+  /**
+   * 设备管理
+   */
+  SBGL: function () {
+    wx.redirectTo({
+      url: '../../shebieguanli-jxsb/shajiangguan',
+    })
+  },
+
+  /**
+   * 人员管理
+   */
+  RYGL: function () {
+    wx.redirectTo({
+      url: '../../renyuanguanli/renyuanguanli'
+    })
+  },
+
+   //跳转到安全管控
+   XMSP:function(){
+    wx.redirectTo({
+      //url: '../deepExcavation/index'
+      url:'../../newAddPage/safetyManagement/index'
+    }) 
+  },
+  
+   //跳转到质量管理
+   ZLGL2:function(){
+    wx.redirectTo({
+      url:'../../Quality-Assurance/index'
+    }) 
+  },
+   //跳转到进度管理
+   JDGL2:function(){
+    wx.redirectTo({
+      //url: '../deepExcavation/index'
+      url:'../../../pageage/Progress-management/index'
+    }) 
+  },
+
+  /**
+   * 更多功能
+   */
+  GDGN: function () {
+    wx.redirectTo({
+      url: '../../gengduogongneng/gengduogongneng'
+    })
+  },
+
+  /**
+   * 工程列表页面
+   */
+  goGCLB: function () {
+    wx.redirectTo({
+      url: '../../gongchengliebiao/gongchengliebiao'
+    })
+  }
+
+
+})
diff --git a/miniprogram/pages/newAddPage/safetyManagement/index.json b/miniprogram/pages/newAddPage/safetyManagement/index.json
new file mode 100644
index 0000000..b516867
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyManagement/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item"
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage/safetyManagement/index.wxml b/miniprogram/pages/newAddPage/safetyManagement/index.wxml
new file mode 100644
index 0000000..2b987a0
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyManagement/index.wxml
@@ -0,0 +1,371 @@
+<!--pages/newAddPage/safetyManagement/index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">安全管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</van-popup>
+
+
+<view class="max_content">
+    <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+    <view class="module_max" style="margin-top: 60rpx;">
+      <view class="module_min">
+        <view class="module_title module_title_flex" >
+          <view>教育培训</view>
+          <view class="module_see_info" bindtap="goEducations">查看详情<van-icon name="arrow" /></view>
+        </view>
+        <safety-pie-chart chart-id="chart1" title="教育总数" chart-data="{{videoSurvey}}"></safety-pie-chart>
+      </view>
+    </view>
+
+    <view class="module_max">
+      <view class="module_min">
+        <view class="module_title module_title_flex">
+          <view>安全检查</view>
+          <view class="module_see_info" bindtap="goCheckView">查看详情<van-icon name="arrow" /></view>
+        
+        </view>
+        <view class="safety_inspect">
+          <van-row>
+            <van-col span="12">
+              <view class="safety_inspect_title">常规检查次数</view>
+              <safety-number number="{{securityCheck.routineCheckNumber}}"></safety-number>
+              <view class="safety_prop">
+                <view style="padding-right: 30rpx;">整改率</view>
+                <view class="safety_prop_val"><text>{{securityCheck.routineRectificationRate}}</text> %</view>
+              </view>
+              <view class="safety_issue">
+                <view class="safety_issue_number">
+                  <view style="padding-right: 30rpx;">检查问题数</view>
+                  <view>{{securityCheck.routineProblemTotal}}</view>
+                </view>
+              </view>
+            </van-col>
+            <van-col span="12">
+              <view class="safety_inspect_title">专项检查次数</view>
+              <safety-number number="{{securityCheck.specialCheckNumber}}"></safety-number>
+              <view class="safety_prop">
+                <view style="padding-right: 30rpx;">整改率</view>
+                <view class="safety_prop_val"><text>{{securityCheck.specialRectificationRate}}</text> %</view>
+              </view>
+              <view class="safety_issue">
+                <view class="safety_issue_number">
+                  <view style="padding-right: 30rpx;">检查问题数</view>
+                  <view>{{securityCheck.specialProblemTotal}}</view>
+                </view>
+              </view>
+            </van-col>
+          </van-row>
+        </view>
+      </view>
+    </view>
+
+    <view class="module_max">
+      <view class="module_min">
+        <view class="module_title module_title_flex">
+          <view>基坑监测</view>
+          <view class="module_see_info" bindtap="gofoundation" data-id="4">查看详情<van-icon name="arrow" /></view>
+        </view>
+        <view class="safety_deep">
+          <view class="safety_deep_row">
+            <view class="safety_deep_img safety_deep_img_1">
+              <!-- <image src="http://fileimg.makalu.cc/WEB_A8903AF7C4E2470C9E6107E3246B8775.png"></image> -->
+            </view>
+            <view class="safety_deep_col">
+              <view class="safety_deep_col_text">监测点位数</view>
+              <view class="safety_deep_col_number"><text>{{pitCount.total}}</text> 个</view>
+            </view>
+          </view>
+          <view class="safety_deep_row">
+            <view class="safety_deep_img safety_deep_img_2">
+              <!-- <image src="http://fileimg.makalu.cc/WEB_16916419A0EB4677AE873B6EFE418DD6.png"></image> -->
+            </view>
+            <view class="safety_deep_col">
+              <view class="safety_deep_col_text">在线点位数</view>
+              <view class="safety_deep_col_number safety_deep_col_green"><text>{{pitCount.onlineNumber}}</text> 个</view>
+            </view>
+          </view>
+        </view>
+        <safety-bar-chart chart-id="chart2" data="{{safetyDeepData}}" height="350"></safety-bar-chart>
+      </view>
+    </view>
+
+    <view class="module_max">
+      <view class="module_min">
+        <view class="module_title module_title_flex">
+          <view>爬架监测</view>
+          <view class="module_see_info" bindtap="gofoundation" data-id="5">查看详情<van-icon name="arrow" /></view>
+        </view>
+        <view class="safety_deep">
+          <view class="safety_deep_row">
+            <view class="safety_deep_img safety_deep_img_1">
+              <!-- <image src="http://fileimg.makalu.cc/WEB_A8903AF7C4E2470C9E6107E3246B8775.png"></image> -->
+            </view>
+            <view class="safety_deep_col">
+              <view class="safety_deep_col_text">监测点位数</view>
+              <view class="safety_deep_col_number"><text>{{climbCount.total}}</text> 个</view>
+            </view>
+          </view>
+          <view class="safety_deep_row">
+            <view class="safety_deep_img safety_deep_img_2">
+              <!-- <image src="http://fileimg.makalu.cc/WEB_16916419A0EB4677AE873B6EFE418DD6.png"></image> -->
+            </view>
+            <view class="safety_deep_col">
+              <view class="safety_deep_col_text">在线点位数</view>
+              <view class="safety_deep_col_number safety_deep_col_green"><text>{{climbCount.onlineNumber}}</text> 个</view>
+            </view>
+          </view>
+        </view>
+        <safety-bar-chart chart-id="chart3" data="{{safetyFrameData}}" height="350"></safety-bar-chart>
+      </view>
+    </view>
+
+    <view class="module_max">
+      <view class="module_min">
+        <view class="module_title module_title_flex">
+          <view>配电箱监测</view>
+          <view class="module_see_info" bindtap="goPDJCDetail">查看详情<van-icon name="arrow" /></view>
+        </view>
+        <view class="safety_inspect">
+          <van-row>
+            <van-col span="12">
+
+              <view class="safety_electric">
+                <view>环境阈值：</view>
+                <view class="safety_electric_threshold"><text>70</text>℃</view>
+              </view>
+
+              <view class="safety_electric_row">
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_AF606BB7762C44E7A259E506EAF7FCF3.png"></image>
+                </view>
+                <view class="safety_electric_col">
+                  <view class="safety_deep_col_text">A相温度</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.t1}}</text> ℃</view>
+                </view>
+              </view>
+
+              <view class="safety_electric_row">
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_AF606BB7762C44E7A259E506EAF7FCF3.png"></image>
+                </view>
+                <view class="safety_electric_col">
+                  <view class="safety_deep_col_text">B相温度</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.t2}}</text> ℃</view>
+                </view>
+              </view>
+
+              <view class="safety_electric_row">
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_AF606BB7762C44E7A259E506EAF7FCF3.png"></image>
+                </view>
+                <view class="safety_electric_col">
+                  <view class="safety_deep_col_text">C相温度</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.t3}}</text> ℃</view>
+                </view>
+              </view>
+
+              <view class="safety_electric_row">
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_98D6C14CBE3348A89F73244A3BEACB98.png"></image>
+                </view>
+                <view class="safety_electric_col">
+                  <view class="safety_deep_col_text">零线温度</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.t4}}</text> ℃</view>
+                </view>
+              </view>
+
+            </van-col>
+            <van-col span="12">
+              <view class="safety_electric" style="visibility: hidden;">
+                <view>漏电预警阈值：</view>
+                <view class="safety_electric_threshold"><text>150</text>mA</view>
+              </view>
+
+              <view class="safety_electric_row">
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_FE6A3AD7D3A94CA697E519CE147D50A8.png"></image>
+                </view>
+                <view class="safety_electric_col">
+                  <view class="safety_deep_col_text">A相电流</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.c1}}</text> A</view>
+                </view>
+              </view>
+
+              <view class="safety_electric_row">
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_FE6A3AD7D3A94CA697E519CE147D50A8.png"></image>
+                </view>
+                <view class="safety_electric_col">
+                  <view class="safety_deep_col_text">B相电流</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.c2}}</text> A</view>
+                </view>
+              </view>
+
+              <view class="safety_electric_row">
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_FE6A3AD7D3A94CA697E519CE147D50A8.png"></image>
+                </view>
+                <view class="safety_electric_col">
+                  <view class="safety_deep_col_text">C相电流</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.c3}}</text> A</view>
+                </view>
+              </view>
+
+              <view class="safety_electric_row" style="display: none;"> 
+                <view class="safety_electric_img safety_deep_img_1">
+                  <image src="http://fileimg.makalu.cc/WEB_6AF4FEC2B2724A4DB80D40516303612C.png"></image>
+                </view>
+                <view class="safety_electric_col" >
+                  <view class="safety_deep_col_text">漏电电流</view>
+                  <view class="safety_electric_number safety_deep_col_blue"><text>{{power.leak}}</text> A</view>
+                </view>
+              </view>
+            </van-col>
+
+          </van-row>
+        </view>
+      </view>
+    </view>
+
+    <view class="module_max" >
+      <view class="module_min">
+        <view class="module_title module_title_flex">
+          <view>亮点照片</view>
+          <view class="module_see_info"  bindtap="goHighLightPage">查看详情<van-icon name="arrow" /></view>
+        </view>
+        <view class="safety_highlights">
+          <van-row>
+            <!-- <swiper circular>
+            <swiper-item wx:for="{{highlightPictures}}" wx:key="videoIndex">
+              <image  src="{{item}}" style="width: 100%;height: 100%;"/>
+            </swiper-item>
+          </swiper> -->
+            <van-col span="12" wx:for="{{highlightPictures}}" wx:key="index" wx:if="{{index < 2}}">
+              <view class="safety_highlights_img">
+                <image  src="{{item.photo_url}}"></image>
+              </view>
+            </van-col>
+          </van-row>
+        </view>
+      </view>
+    </view>
+
+</view>
+
+
+<!-- 底部导航 -->
+<van-tabbar active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
+  <van-tabbar-item bindtap="XMGK" >
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    项目概况
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="XMSP">
+    <image
+      slot="icon"
+      src="/images/footer_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    安全管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="ZLGL2">
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    质量管理
+    </van-tabbar-item>
+    
+    <van-tabbar-item bindtap="JDGL2">
+    <image
+      slot="icon"
+      src="/images/footer_6.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_6.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    进度管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="GDGN">
+    <image
+      slot="icon"
+      src="/images/footer_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height:40rpx;"
+    />
+    更多功能
+  </van-tabbar-item>
+</van-tabbar>
+
+
+
diff --git a/miniprogram/pages/newAddPage/safetyManagement/index.wxss b/miniprogram/pages/newAddPage/safetyManagement/index.wxss
new file mode 100644
index 0000000..52eaf02
--- /dev/null
+++ b/miniprogram/pages/newAddPage/safetyManagement/index.wxss
@@ -0,0 +1 @@
+/* pages/newAddPage/safetyManagement/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage2/letterCommitment/index.js b/miniprogram/pages/newAddPage2/letterCommitment/index.js
new file mode 100644
index 0000000..bf42247
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/letterCommitment/index.js
@@ -0,0 +1,210 @@
+// pages/newAddPage/letterCommitment/index.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        safetyQualityRich:'<p style="line-height: 1.5;"><br></p><h4 style="text-align: center; line-height: 1.5;"></h4><h4 style="text-align: center; line-height: 1.5;">安全质量承诺书</h4><p style="line-height: 1.5;"> </p><p style="text-indent: 2em; line-height: 1.5;">为了个人的安全健康，为了家庭的幸福美满，为了企业的稳定发展，本人在工作中，自愿签订并遵守以下承诺：</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">忠诚企业、恪尽职守、珍爱生命、铸造精品！</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">我坚决做到：遵守规章制度、遵守操作规程、遵守劳动纪律，不出事故、不出次品、不留隐患！我将以实际行动，确保企业生产安全、产品优质！”</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">对于以上承诺，本人自觉遵守，如有违反，本人愿承担责任。 </p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">本承诺书自签字日起生效。 </p><p style="text-indent: 36pt; line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺人(签字)：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;岗 位(工种)：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;日 &nbsp;期： &nbsp; &nbsp;年 &nbsp; &nbsp;月 &nbsp; &nbsp;日 </p><p><br></p>',
+        healthRich:'<p style="line-height: 1.5;"><br></p><h4 style="text-align: center; line-height: 1.5;">健康承诺书</h4><p style="line-height: 1.5;"> </p><p style="text-indent: 2em; line-height: 1.5;">本人：<u> &nbsp; &nbsp; &nbsp; &nbsp;</u>，性别：<u> &nbsp; &nbsp;</u>，年龄: <u> &nbsp; &nbsp;</u>岁、身份证号码：<u> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </u>，从事岗位：<u> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </u>，无 □ / 有 □ 高血压、心脏病等基础身体健康问题；无 □ / 有 □ 严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆，能够胜任本岗位相应工作，我向公司承诺以上所述信息无隐瞒、无虚报，如有隐瞒造成所有后果由本人承担，于项目无关。</p><p style="line-height: 1.5;"> </p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺人（按手印）：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺日期： &nbsp; &nbsp;年 &nbsp; 月 &nbsp; 日</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;日 &nbsp;期： &nbsp; &nbsp;年 &nbsp; &nbsp;月 &nbsp; &nbsp;日 </p><p><br></p>',
+        workerRich:'<p style="text-indent: 2em; line-height: 1.5;"><br></p><h1 style="text-indent: 2em; text-align: center; line-height: 1.5;"></h1><h4 style="text-align: center; line-height: 1.5;">作业工人安全生产责任书</h4><p style="line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（一）作业工人对自己施工中的安全负责。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（二）作业工人应严格执行劳动纪律和现场安全生产管理制度，严格执行安全操作规程和安全技术交底，做到“四不伤害”即：我不伤害自己，我不伤害别人，我不被别人伤害。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（三）拒绝强令冒险作业。发现隐患及防护设施缺陷应及时向安全管理人员报告。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（四）正确使用和穿戴安全防护用品，自觉维护现场安全防护设施，未经批准不得随意移动拆除防护设施。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（五）发生事故应及时报告现场管理人员，并在项目负责人的指挥下积极配合施救。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（六）严格遵守本单位的安全生产规章制度和操作规程，服从管理，正确佩戴和使用劳动防护用品。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">（七）接受安全生产教育和培训，掌握本职工作所需的安全生产知识，提高安全生产技能，增强事故预防和应急处理能力。从业人员发现事故隐患或者其他不安全因素，应当立即向现场安全生产管理人员或者本单位负责人报告；接到报告的人员应当及时予以处理。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺人（按手印）：</p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;承诺日期： &nbsp; &nbsp;年 &nbsp; 月 &nbsp; 日</p><p><br></p>',
+        protectiveEquipmentRich:'<p style="text-align: center; line-height: 1.5;"><br></p><h4 style="text-align: center; line-height: 1.5;"><strong>安全防护用品使用图解</strong></h4><h3 style="text-align: center; line-height: 1.5;"> </h3><p style="text-align: center; line-height: 1.5;">进入施工现场必须根据要求按照下图要求佩戴好相应安全防护用品。</p><p style="text-indent: 2em; text-align: center; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;"><img src="http://fileimg.makalu.cc/WEB_33F25A7600DB4909A0B9B6098CB19054.png" style="width:90%;"/></p><p style="text-align: center; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;">本人已经掌握安全防护用品佩戴方法，并严格遵守！</p><p style="text-align: center; line-height: 1.5;"><br></p><p style="text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;签字：</p><p style="text-align: left; line-height: 1.5;"><br></p><p style="text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;日期： &nbsp; &nbsp; &nbsp; 年 &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp;日 &nbsp; &nbsp; &nbsp; </p><p style="text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; </p>',
+        workerPostRich:'<p style="text-indent: 2em; text-align: left; line-height: 1.5;"><br></p><p style="text-align: center; line-height: 1.5;"><strong>作业人员岗位告知书</strong></p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"> </p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"> &nbsp;你将从事的普工作业，存在着车辆伤害、机械伤害、坠落、物体打击、触电等岗位危险，予以告知。你在作业时务必遵守相关的规章制度、专项工程安全施工方案、安全技术措施，并熟记作业要点及其特性，掌握好相应的安全防范技能；进入作业场所后，要进行重新检查，发现异常情况和不安全因素必须及时采取有效措施排除；要正确使用和佩戴劳动保护用品，在做好自我防范的同时，还要认真贯彻联保互保。同时对以下针对性措施必须经常对照执行：</p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">1、在道路上工作时，密切注意来往车辆，做到“一看二停三通过”，不抢一分一秒，保证自己不被车辆伤害。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">2、从事开挖作业时，先观察好周边情况和环境，在最坏的情况能够不伤及自身和他人的情况下再作业。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">3、从事搬运石块等工作时，要严格注意身边的人，在呼喊并应答、引起对方注意并退让到安全地带后才可以工作。同时，要积极注意自身安全，不搬运过重的石块，经常检查铁锹、榔头、扁担等工具，一有损坏，立即更换或修复。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">4、在电力线底下、光缆附近施工时，必须严格按照安全技术交底，时刻提高警惕，保护好电力电线、国防光缆。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">5、严禁在河流、池塘等地游泳、洗澡，由此引发的后果由你承担。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">6、做好防火、防盗工作，保护好自己的财物。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">7、工作时必须佩戴好劳动防护用品，带好安全帽并系好下额带。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">8、密切注意工程施工机械，在挖掘机、压路机、推土机等机械附近施工时，必须面向机械并及时避让，确保安全。严禁在压路机等机械下休息，严禁在施工现场打闹、追逐。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="text-indent: 2em; line-height: 1.5;">9、工作时听从班组长统一指挥，严格遵守劳动纪律、三级安全教育及安全交底内容。</p><p style="text-indent: 2em; line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;被告知者签字(指印)：</p><p style="line-height: 1.5;"><br></p><p style="line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 日期： &nbsp; &nbsp; &nbsp;年 &nbsp; &nbsp; &nbsp;月 &nbsp; &nbsp; &nbsp;日</p><p style="text-indent: 2em; text-align: left; line-height: 1.5;"> &nbsp; &nbsp; &nbsp; &nbsp; </p>',
+        show:true,
+        radio1:'',
+        radio2:'',
+        token: '',
+        main_id:''
+    },
+
+    onChange1(event) {
+        this.setData({
+            radio1: event.detail,
+        });
+    },
+
+    onChange2(event) {
+        this.setData({
+            radio2: event.detail,
+        });
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+      this.getQiniupToken();
+    },
+    /**
+     * 重置
+     */
+    reset(){
+      this.setData({
+        radio1:'',
+        radio2:''
+      })
+    },
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    /**
+     * 获取七牛云token
+     */
+    getQiniupToken() {
+      var that = this
+      wx.request({
+        url: app.globalData.szhUrl+'/mkl/api/getToken',
+        method:"GET",
+        success:function(res){
+          that.setData({
+            token: res.data,
+          });
+        }
+      })
+    },
+
+    /**
+     * 提交签名信息并生成承诺书
+     */
+    submit(){
+      var that = this
+      if(this.data.radio1 == ''){
+        app.toast("请选择是否有高血压、心脏病等基础身体健康问题");
+        return;
+      }
+      if(this.data.radio2 == ''){
+        app.toast("请选择是否有严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆");
+        return;
+      }
+
+      wx.showLoading({
+        title: '正在提交。。。',
+        mask: true,
+      })
+      var that = this
+      wx.request({
+        header: {
+            'content-type': 'application/x-www-form-urlencoded'
+        },
+        url:app.globalData.szhUrl+'/mkl/api/generateSafetyLetterOfCommitment2',
+        data:{
+          "openId": wx.getStorageSync('openId'),
+          "idCardNo": wx.getStorageSync('cardId'),
+          "radio1":this.data.radio1,
+          "radio2":this.data.radio2,
+          "mainId":wx.getStorageSync("options").id,
+          "signImgUrl":wx.getStorageSync('signUrl'),
+          "type":1
+        },
+        method:"POST",
+        success:function(res){
+            if(res.data.code == '200'){
+              that.setData({
+                show:false
+              })
+              wx.hideLoading({});
+              app.toast("提交成功！");
+              wx.request({
+                url:app.globalData.smzUrl+'/mkl/api/updatePersonInfo',
+                data:{
+                  "openId": wx.getStorageSync('openId'),
+                  "idCardNo": wx.getStorageSync('cardId'),
+                  "signImgUrl":wx.getStorageSync('signUrl'),
+                  "projectId":wx.getStorageSync('smzprojectId'),
+                  "pdfUrl":res.data.data
+                },
+                method:"POST",
+                success:function(res){
+
+                    setTimeout(()=>{
+                      wx.navigateTo({
+                        url: '../../winter-training/index?mainId='+wx.getStorageSync('options').id+'&szhprojectId='+wx.getStorageSync('options').projectId+'&cultivateType='+wx.getStorageSync('options').cultivateTypeId+'&cardId='+wx.getStorageSync('cardId')+"&userName="+wx.getStorageSync('answerName')+"&companyName="+wx.getStorageSync('companyName')+"&typeWordName="+wx.getStorageSync('typeWordName')+"&signUrl="+wx.getStorageSync('signUrl')
+                      })
+                    },2000)
+                    return;
+                }
+              })
+              
+            }else{
+              app.toast(res.data.msg);
+              return;
+            }
+        }
+    })
+	},
+	
+	/**
+   * 上传图片
+   */
+  uploadToQiniu(url) { //图片直接上传到七牛云，获取七牛云链接
+    var that = this;
+    wx.uploadFile({
+      url: 'https://upload.qiniup.com',
+      name: 'file',
+      filePath: url,
+      header: {
+        "Content-Type": "multipart/form-data"
+      },
+      formData: {
+        token: that.data.token,
+      },
+      success: function (res) {
+        let data = JSON.parse(res.data);
+        that.setData({
+          signImgUrl: 'https://fileimg.makalu.cc/' + data.key
+        })
+      },
+      fail: function (res) {
+        console.log(res)
+      }
+    });
+  },
+})
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage2/letterCommitment/index.json b/miniprogram/pages/newAddPage2/letterCommitment/index.json
new file mode 100644
index 0000000..38d4010
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/letterCommitment/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "承诺书签名"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage2/letterCommitment/index.wxml b/miniprogram/pages/newAddPage2/letterCommitment/index.wxml
new file mode 100644
index 0000000..b3cb291
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/letterCommitment/index.wxml
@@ -0,0 +1,251 @@
+<!--pages/newAddPage/letterCommitment/index.wxml-->
+<view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{safetyQualityRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{healthRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{workerRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{protectiveEquipmentRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+    <view class="cns_rich_content">
+        <view class="cns_rich_text">
+            <rich-text nodes="{{workerPostRich}}" space="nbsp" user-select="true"></rich-text>
+        </view>
+    </view>
+
+    <!-- 表格填充 -->
+    <view class="cns_rich_content" >
+        <view class="cns_rich_text">
+            <view style="text-align:center;">三级安全教育登记表</view>
+            <view style="text-align: left;">工程名称:</view>
+        <view style="border: 1px solid #fff;position: relative;" >
+        <!-- 身份证复印件 -->
+                    <view class="identity">
+                    身份证复印件粘贴处
+                    </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">姓名</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                
+                <!-- <view class="tableStyle">
+                    <view class="leftBox" >文化程度</view>
+                    <input type="text" class="rightBox"/>
+                </view> -->
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <!-- <view class="tableStyle" >
+                    <view  class="leftBox">姓名</view>
+                    <input type="text" class="rightBox"/>
+                </view> -->
+                
+                <view class="tableStyle">
+                    <view class="leftBox" >文化程度</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">班组</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">入场日期</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox">工作卡号</view>
+                    <input type="text" class="rightBox"/>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <view class="oneBox-style">
+                <view class="tableStyle" >
+                    <view  class="leftBox" style="width:100%">三级安全教育内容</view>
+                </view>
+                <!-- <view  class="">身份证复印件粘贴处</view> -->
+            </view>
+            <!-- 公司教育 -->
+            <view class="gongsi-action">
+                <view class="gongsi-jiaoyu">
+                     公司教育
+                </view>
+                <view class="gongsi-content">
+                    <view> 进行安全基本知识、法规、法制教育，主要内容是：</view>
+                    <view>1、党和国家的安全生产方针、政策</view>
+                    <view>2、安全生产法规、标准和安全知识</view>
+                    <view>3、企业安全生产规章制度、安全纪律</view>
+                    <view>4、安全生产形势及重大事故安全教训</view>
+                    <view>5、安全生产事故后如何抢救伤员、排险、保护现场和及时进行报告</view>
+                </view>
+                <view class="jiaoyuBox">
+                    <view class="top-jiaoyu">
+                        <view class="top-jiaoyutext">
+                        教育人签字：
+                        </view>
+                        <view class="top-jiaoyutext">
+                        受教育人签名：
+                        </view>
+                    </view>
+                    <view>
+                    累计培训()小时
+                    </view>
+                </view>
+            </view>
+            <!-- 项目部教育 -->
+            <view class="gongsi-action">
+                <view class="gongsi-jiaoyu">
+                     公司教育
+                </view>
+                <view class="gongsi-content">
+                    <view> 进行安全基本知识、法规、法制教育，主要内容是：</view>
+                    <view>1、党和国家的安全生产方针、政策</view>
+                    <view>2、安全生产法规、标准和安全知识</view>
+                    <view>3、企业安全生产规章制度、安全纪律</view>
+                    <view>4、安全生产形势及重大事故安全教训</view>
+                    <view>5、安全生产事故后如何抢救伤员、排险、保护现场和及时进行报告</view>
+                </view>
+                <view class="jiaoyuBox">
+                    <view class="top-jiaoyu">
+                        <view class="top-jiaoyutext">
+                        教育人签字：
+                        </view>
+                        <view class="top-jiaoyutext">
+                        受教育人签名：
+                        </view>
+                    </view>
+                    <view>
+                    累计培训()小时
+                    </view>
+                </view>
+            </view>
+            <!-- <view>
+                <view >
+                    项目部教育
+                </view>
+                <view >
+                    进行现场规章制度和遵章守纪教育，主要内容是：
+                    1、本项目施工特点、可能存在的不安全因素及必须遵守的事项
+                    2、本单位(包括施工、生产现场)安全生产制度、规定和安全注意事项
+                    3、本工种的安全技术操作规程
+                    4、高处作业、机械设备、电气安全基础知识
+                    5、防火、防毒、防尘、防爆知识及紧急情况安全处置和安全疏散知
+                    6、雨季防雷、防台、防汛及特殊气候的相关安全知
+                    7、防护用品发放标准及防护用品、用具使用的基本知识
+                    8、学习JGJ146-2004建筑施工现场环境与卫生标准
+                </view>
+                <view style="vertical-align: top;">
+                    教育人签字：
+                </view>
+                <view style="vertical-align: top;">
+                    受教育人签名：
+                </view>
+            </view>
+           
+            <view>
+                <view rowspan="2" class="center">
+                    <view>班组教育</view>
+                </view>
+                <view rowspan="2" colspan="3">
+                    进行本工种岗位安全操作及安全制度、纪律教育，主要内容是：
+                    1、本班组作业特点及安全操作规程
+                    2、本班组安全活动制度及纪律
+                    3、正确使用安全防护装置(设施)及个人劳动防护用品
+                    4、本岗位易发生事故的不安全因素及其防范对策，本工种事故案例剖析
+                    5、本岗位的作业环境及使用的机械设备、工具的安全要求
+                </view>
+                <view style="vertical-align: top;">
+                    教育人签字：
+                </view>
+                <view style="vertical-align: top;">
+                    受教育人签名：
+                </view>
+            </view> -->
+            <view class="gongsi-action">
+                <view class="gongsi-jiaoyu">
+                     公司教育
+                </view>
+                <view class="gongsi-content">
+                    <view>  进行现场规章制度和遵章守纪教育，主要内容是：</view>
+                    <view>1、党和国家的安全生产方针、政策</view>
+                    <view>2、安全生产法规、标准和安全知识</view>
+                    <view>3、企业安全生产规章制度、安全纪律</view>
+                    <view>4、安全生产形势及重大事故安全教训</view>
+                    <view>5、安全生产事故后如何抢救伤员、排险、保护现场和及时进行报告</view>
+                </view>
+                <view class="jiaoyuBox">
+                    <view class="top-jiaoyu">
+                        <view class="top-jiaoyutext">
+                        教育人签字：
+                        </view>
+                        <view class="top-jiaoyutext">
+                        受教育人签名：
+                        </view>
+                    </view>
+                    <view>
+                    累计培训()小时
+                    </view>
+                </view>
+            </view>
+        </view>
+        </view>
+    </view>
+
+
+    <view class="cns_confirm">
+        <view class="cns_confirm_text"> 
+            <view class="cns_confirm_text_title">1、高血压、心脏病等基础身体健康问题。</view>
+            <view>
+                <van-radio-group value="{{ radio1 }}" bind:change="onChange1"
+                direction="{{horizontal}}" style="display: flex; padding:20rpx 0">
+                <van-radio name="1" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">无</van-radio>
+                <van-radio name="2" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">有</van-radio>
+                </van-radio-group>
+            </view>
+        </view>
+        <view class="cns_confirm_text"> 
+            <view class="cns_confirm_text_title">2、严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆。</view>
+            <view>
+                <van-radio-group value="{{ radio2 }}" bind:change="onChange2"
+                direction="{{horizontal}}" style="display: flex; padding:20rpx 0">
+                <van-radio name="1" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">无</van-radio>
+                <van-radio name="2" shape="square" custom-class="radio_custom_class" label-class="radio_label_class">有</van-radio>
+                </van-radio-group>
+            </view>
+        </view>
+        <!-- <view class="cns_confirm_text"> 
+            <view class="cns_confirm_text_title">3、签名：</view>
+            <view class="cns_confirm_sign">
+                <sign bind:returnData="sign" canvas-id="canvas"></sign>
+            </view>
+        </view> -->
+        <view class="switch_button" wx:if="{{show}}">
+            <button class="switch_button_up" bindtap="reset">重置</button>
+            <button class="switch_button_to" bindtap="submit">提交</button> 
+        </view>
+    </view>
+
+
+</view>
diff --git a/miniprogram/pages/newAddPage2/letterCommitment/index.wxss b/miniprogram/pages/newAddPage2/letterCommitment/index.wxss
new file mode 100644
index 0000000..b2bf6ff
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/letterCommitment/index.wxss
@@ -0,0 +1,71 @@
+/* pages/newAddPage/letterCommitment/index.wxss */
+.radio_custom_class{
+    padding: 10rpx 100rpx 10rpx 0;
+}
+.radio_label_class{
+    color: #ffffff !important;
+}
+.tableStyle{
+    display: flex;
+    justify-content: space-between;
+    align-items: center; 
+    width: 50%;
+}
+.leftBox{
+    padding: 12rpx 30rpx;
+    border: 1px solid #fff;
+    width: 184rpx;
+    text-align: center;
+}
+.rightBox{
+    width: 110rpx;
+    padding: 10rpx;
+    /* box-sizing: border-box; */
+    border: 1px solid #fff;
+}
+.oneBox-style{
+    display: flex;
+}
+.identity{
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 50%;
+    height: 408rpx;
+    line-height: 408rpx;
+    text-align: center;
+    border: 1px solid #fff;
+}
+.gongsi-action{
+    display: flex;
+    align-items: center;
+    border: 1px solid #fff;
+    font-size: 10px;
+}
+.gongsi-jiaoyu{
+    writing-mode: vertical-lr;
+    -webkit-writing-mode: vertical-lr;
+    -ms-writing-mode: vertical-lr;
+    font-size: 12px;
+}
+.gongsi-content{
+    width: 60%;
+    border-left: 1px solid #fff;
+    border-right: 1px solid #fff;
+}
+.top-jiaoyu{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+}
+.top-jiaoyutext{
+    font-size: 6px;
+}
+.jiaoyuBox{
+    width: 208rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    height: 228rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.js b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.js
new file mode 100644
index 0000000..7a65359
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.js
@@ -0,0 +1,670 @@
+// pages/newAddPage/safetyBriefingLearning/index.js
+const app = getApp()
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    //所有三级安全教育视频
+    allVideo:{},
+    // 声明一个数组,里面放着要展示的视频链接
+    videoList:[],
+    formatanswer:'',
+    second:0,
+    // second_state:true,
+    timer:'',
+
+    index:0,
+    answer:false,
+
+    up:false,
+    down:false,
+    to:false,
+
+    questionsData:[],
+    //单独视频url
+    videoUrl:'',
+    videoObj:{},
+    //学习时长
+    learnTime:1,
+    watchTimer:'',
+    openId:'',
+    activeState:1,
+    //答案提示
+    answerTip:'',
+    //考试分数
+    fullScore:'',
+    examPaperId:'',
+    signUrl:'',
+    //控制视频时长
+    companyTimer:'',
+    companyTime:0,
+    projectTimer:'',
+    projectTime:0,
+    groupTimer:'',
+    groupTime:0,
+    //试题显示标识
+    paperFlag:false
+  },
+  trainingTypeJump(e){
+    var that  = this
+    // this.onClickShow();
+    let index = e.currentTarget.dataset.index;
+    var videoList = []
+    let titleName =  '';
+    switch(index) {
+      case '1':
+          titleName = '公司级';
+          videoList = that.data.allVideo.companyList
+          break;
+      case '2':
+        if(that.data.companyTime < 30) {
+          app.toast("温馨提示：当前视频学习完成后，方可进行下一个视频学习。");
+          return;
+        } else {
+          if( that.data.projectTime <30) {
+            var projectTimer = setInterval(() => {
+              var projectTime = that.data.projectTime;
+              if(projectTime >= 0 && projectTime <= 29){
+                this.setData({
+                  projectTime:parseInt(projectTime) + 1,
+                  projectTimer:projectTimer
+                })              
+              }else{
+                clearInterval(this.data.projectTimer);
+              }
+            }, 1000);
+          }
+          
+        }
+        titleName = '项目级';
+        videoList = that.data.allVideo.projectList
+        
+        break;  
+      case '3':
+        if(that.data.companyTime < 30 || that.data.projectTime < 30) {
+          app.toast("温馨提示：当前视频学习完成后，方可进行下一个视频学习。");
+          return;
+        } else {
+          if(that.data.groupTime < 30) {
+            var groupTimer = setInterval(() => {
+              var groupTime = that.data.groupTime;
+              if(groupTime >= 0 && groupTime <= 29){
+                this.setData({
+                  groupTime:parseInt(groupTime) + 1,
+                  groupTimer:groupTimer
+                })
+                console.log(that.data.groupTime);
+              }else{
+                clearInterval(this.data.groupTimer);
+                that.setData({
+                  paperFlag:true
+                })
+              }
+            }, 1000);
+          }
+          
+        }
+        titleName = '班组级';
+        videoList = that.data.allVideo.groupList
+        break; 
+      default:
+        videoList = []   
+        break
+   }
+
+    
+    this.setData({
+      titleName:titleName,
+      activeState:index,
+      videoList:videoList,
+      pageNo:1,
+      type:1,
+      trainingType:index,
+      startDate:'',
+      endDate:'',
+      collaborateRanksId:''
+    });
+    // this.getTrainingList();
+    // this.getTrainingNumberOfPeopleCount();
+  },
+  //打开视频
+  bindplay_click(){
+    var timer = setInterval(() => {
+      var second = this.data.second
+      if(second == parseInt(this.data.videoObj.effectiveDuration)) {
+        // this.addUserRecord()
+      }
+      if(second > 0){
+        this.setData({
+          second:second - 1,
+          timer:timer
+        })
+      }
+      else{
+        clearInterval(this.data.timer);
+        this.setData({
+          second_state:false,
+        })
+      }
+    }, 1000);
+    
+
+
+    var watchTimer = setInterval(() => {
+      var learnTime = this.data.learnTime;
+      if(learnTime >= 0){
+        this.setData({
+          learnTime:parseInt(learnTime) + 1,
+          watchTimer:watchTimer
+        })
+      }else{
+        clearInterval(this.data.watchTimer);
+      }
+    }, 1000);
+
+
+  },
+
+  //暂停视频
+  bindpause_click(){
+    if(this.data.second > 0){
+      clearInterval(this.data.timer);
+    }
+    if(this.data.learnTime > 0) {
+      clearInterval(this.data.watchTimer);
+    }
+  },
+  // 点击查看详情
+chakanBtn(e){
+  var data = this.data.questionsData
+  var i = this.data.index
+  data[i].type=true
+  var tempList = data[i].answer_list
+  var str = ''
+  for(var j =0;j <tempList.length;j++) {
+    if(data[i].correct_answer == tempList[j].letter) {
+        str = tempList[j].answer;
+        break;
+    }
+  }
+  this.setData({
+    questionsData:data,
+    answerTip:str
+  })
+  },
+
+  //选择答案
+  chooseAnswer(e){
+    var data = this.data.questionsData
+    var i = this.data.index
+    var j = e.currentTarget.dataset.j
+    var item =e.currentTarget.dataset.item
+    if(data[i].topic_state == false){
+      data[i].type = true
+      for(var z = 0;z<data[i].answer_list.length;z++){
+        data[i].answer_list[z].answer_state = false
+      }
+      data[i].answer_list[j].answer_state = true
+
+      if(data[i].correct_answer == item.letter){
+        data[i].topic_state = true
+        if(i < data.length-1){
+          this.setData({
+            index:i+1
+          })
+        }
+        if(data.length == 1){
+          this.setData({
+            to:true,
+          })
+        }
+      }
+      var tempList = data[i].answer_list
+      var str = ''
+      for(var j =0;j <tempList.length;j++) {
+        if(data[i].correct_answer == tempList[j].letter) {
+            str = tempList[j].answer;
+            break;
+        }
+      }
+      this.setData({
+        questionsData:data,
+        answerTip:str
+      })
+
+      if(this.data.index > 0 ){
+        this.setData({
+          up:true,
+        })
+        if(this.data.questionsData.length - 1 == this.data.index &&  this.data.questionsData[this.data.index].topic_state == true){
+          this.setData({
+            to:true,
+          })
+        }
+      }
+    }
+  },
+
+  //点击上一题
+  onClickUp(){
+    var that = this
+    this.setData({
+      index:this.data.index - 1
+    })
+  
+   
+    if(that.data.index == 0){
+      that.setData({
+        up:false,
+        down:true
+      })
+    }else{
+      if(that.data.questionsData[that.data.index].topic_state == false){
+        that.setData({
+          up:true,
+          down:false,
+          to:false
+        
+        })
+      }else{
+        that.setData({
+          up:true,
+          down:true,
+          to:false
+        })
+      }
+    }
+
+    var data = this.data.questionsData
+    var i = this.data.index
+    var tempList = data[i].answer_list
+    var str = ''
+    for(var j =0;j <tempList.length;j++) {
+      if(data[i].correct_answer == tempList[j].letter) {
+          str = tempList[j].answer;
+          break;
+      }
+    }
+    this.setData({
+      answerTip:str
+    })
+  },
+
+  //点击下一题
+  onClickDown(){
+    this.setData({
+      index:this.data.index + 1
+    })
+    if(this.data.index == this.data.questionsData.length-1 ){
+      if(this.data.questionsData[this.data.index].topic_state == false){
+        this.setData({
+          up:true,
+          down:false,
+          to:false
+        })
+      }else{
+        this.setData({
+          up:true,
+          down:false,
+          to:true
+        })
+      }
+      
+    }else{
+      if(this.data.questionsData[this.data.index].topic_state == false){
+        this.setData({
+          up:true,
+          down:false,
+          to:false
+        })
+      }else{
+        this.setData({
+          up:true,
+          down:true,
+          to:false
+        })
+      }
+    }
+
+    var data = this.data.questionsData
+    var i = this.data.index
+    var tempList = data[i].answer_list
+    var str = ''
+    for(var j =0;j <tempList.length;j++) {
+      if(data[i].correct_answer == tempList[j].letter) {
+          str = tempList[j].answer;
+          break;
+      }
+    }
+    this.setData({
+      answerTip:str
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    var that = this;
+    that.setData({
+      openId:wx.getStorageSync('openId')
+    })
+
+    //获取扫码用户信息
+    that.getUserInfo()
+    //获取视频链接
+    that.getVideoURL(options.projectId,options.firstWorkType,options.secondWorkType)
+    //获取在线答题题目信息
+    that.getOnlineExamList(1,options.projectId,options.firstWorkType,options.secondWorkType);
+    
+
+  
+    var companyTimer = setInterval(() => {
+      var companyTime = this.data.companyTime;
+      if(companyTime >= 0 && companyTime <= 29){
+        this.setData({
+          companyTime:parseInt(companyTime) + 1,
+          companyTimer:companyTimer
+        })
+        console.log(this.data.companyTime)
+      }else{
+        console.log("公司计时结束")
+        clearInterval(this.data.companyTimer);
+      }
+    }, 1000);
+
+
+      // 拿取video盒子的宽高
+      /**
+       * 生命周期函数--监听页面加载
+       */
+          // var that = this;
+          // var query = wx.createSelectorQuery(); //创建节点选择器
+          // //#box需要与wxml里面的id保持一致
+          // query.select('#myVideo').boundingClientRect(function (rect) {
+          //     console.log('00000',rect);
+          //     that.setData({
+          //       myVideo: rect
+          //     });
+          // }).exec();
+          
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady(){
+
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+
+  /**
+   * 获取在线答题题目信息
+   * @param {*} questionType 题目类型（1：安全,2施工技艺）
+   */
+  getOnlineExamList(questionType,projectId,firstWorkType,secondWorkType){
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl+'/mkl/api/getOnlineExamList',
+      data:{
+        "questionType":questionType,
+        "projectId":projectId,
+        "firstWorkType":firstWorkType,
+        "secondWorkType":secondWorkType
+      },
+      method:"GET",
+      success:function(res){
+        if(res.data.length == 0) {
+          that.setData({
+            to:true
+          })
+        }
+        that.setData({
+          questionsData:res.data,
+          examPaperId:res.data[0].examPaperId == undefined ?null:res.data[0].examPaperId,
+          fullScore:res.data[0].totalScore== undefined ?null:res.data[0].totalScore
+        })
+      }
+    })
+  },
+
+  /**
+   * 提交答题记录
+   */
+  onClickTo(){
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl+'/mkl/api/addOnlineExamLog',
+      data:{
+        "openId": wx.getStorageSync('openId'),
+        "idCardNo": wx.getStorageSync('cardId'),
+        "score":that.data.fullScore,
+        "fullScore":that.data.fullScore,
+        "examPaperId":that.data.examPaperId
+      },
+      method:"GET",
+      success:function(res){
+        if(res.data.code == '200'){
+          that.setData({ up:false });
+          that.setData({ down:false });
+          that.setData({ to:false });
+          //提交学习记录
+          that.addRecord()
+          wx.redirectTo({
+            url: '../letterCommitment/index'
+          })
+        }else{
+          app.toast(res.data.msg);
+        }
+      }
+    })
+  },
+
+   /**
+   * 确认学习
+   */
+  addRecord() {
+    var that = this;
+    wx.request({
+      url: app.globalData.szhUrl + "/api/wei/gainWeiSanInfo",
+      method: "POST",
+      data: {
+        dept_id: 131,
+        project_id: wx.getStorageSync('szhprojectId'),
+        smz_project_id: wx.getStorageSync('smzprojectId'),
+        main_id: wx.getStorageSync('options').id,
+        cultivate_type: wx.getStorageSync('options').cultivateTypeId,
+        user_name: wx.getStorageSync('answerName'),                                                
+        resident_id:  wx.getStorageSync('cardId'),
+        result_str: "已通过",
+        score:that.data.fullScore,
+        total_score:that.data.fullScore,
+        exam_paper_id:that.data.examPaperId,
+        type:'1',
+        sign_url:that.data.signUrl,
+        randomScore:Math.floor(Math.random()*10)
+      },
+      header: {
+        'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+      },
+      success(res) {
+        if (res.data.code == 200) {
+          console.log("添加学习记录成功")
+        }
+      }
+    })
+  },
+
+ /**
+   * 获取视频链接
+   */
+  getVideoURL(projectId,firstWorkType,secondWorkType) {
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl+'/mkl/api/getOnlineVideoList',
+      data:{
+        fileType: 1,//视频
+        projectId:projectId,
+        firstWorkType:firstWorkType,
+        secondWorkType:secondWorkType
+      },
+      method:"GET",
+      success:function(res){
+        if(res.data.code == 0) {
+            that.setData({
+              allVideo:res.data.data
+            })
+        }
+        var videoList = []
+       switch(that.data.activeState ) {
+          case 1:
+              videoList = that.data.allVideo.companyList
+              break;
+          case 2:
+            videoList = that.data.allVideo.projectList
+            break;  
+          case 3:
+            videoList = that.data.allVideo.groupList
+            break; 
+          default:
+            videoList = []   
+            break
+       }
+       that.setData({
+          videoList:videoList
+       })
+        that.checkUserFinishedFlag()
+      }
+  })
+},
+
+  /**
+   * 添加用户学习记录
+   */
+  addUserRecord() {
+    var that = this
+    var completeFlag = parseInt(that.data.learnTime) >= parseInt(that.data.videoObj.effectiveDuration == ""?0: that.data.videoObj.effectiveDuration)?1:0
+    wx.request({
+      url:app.globalData.szhUrl+'/mkl/api/addEducationRecord',
+      data:{
+        initialId:that.data.videoObj.id,
+        userId:wx.getStorageSync('idCardNo'),
+        openId:wx.getStorageSync('userOpenId'),
+        learningDuration:that.data.learnTime,
+        completeFlag:completeFlag
+      },
+      method:"POST",
+      success:function(res){
+        if(res.data.code == 0){
+          console.log("添加学习记录成功！")
+         }else{
+          console.log("添加学习记录失败！")
+         }
+      }
+    })
+  },
+
+  /**
+   * 获取用户学习时长
+   */
+  getUserLearnTime() {
+    // this.addUserRecord() 
+    this.onClickTo()
+  },
+
+  /**
+   * 查询用户是否学习
+   */
+  checkUserFinishedFlag() {
+    var that = this
+    wx.request({
+      url:app.globalData.szhUrl+'/mkl/api/getUserFinishList',
+      data:{
+        initialId:parseInt(that.data.videoObj.id),
+        userId:wx.getStorageSync('idCardNo')
+      },
+      method:"POST",
+      success:function(res){
+        if(res.data.code == 0){
+           if(res.data.data.length >0) {
+              var obj = res.data.data[0];
+              if(obj.completeFlag == "1") {
+                  that.setData({
+                    second_state:false
+                  })
+              }
+           }
+         }
+      }
+    })
+  },
+
+  //查询用户信息
+  getUserInfo() {
+    var that = this;
+    let openId = wx.getStorageSync('openId') != null || wx.getStorageSync('openId') ? wx.getStorageSync('openId') : "123"
+    wx.request({
+      url: app.globalData.szhUrl + "/business/saftEducationOpenIdMap/list",
+      method: "post",
+      data: {
+        openId
+      },
+      header: {
+        'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+      },
+      success(res) {
+        let data = res.data 
+        if(data.code == '0' && data.rows.length > 0){
+            let result = data.rows
+            that.setData({
+              signUrl:data.rows[0].signUrl == undefined ? '':data.rows[0].signUrl
+            })
+            wx.setStorageSync('signUrl', data.rows[0].signUrl)
+        }
+      }
+    })
+  }
+
+  
+})
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.json b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.json
new file mode 100644
index 0000000..2099bd2
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index"
+  },
+  "navigationBarTitleText": "施工安全交底学习"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxml b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxml
new file mode 100644
index 0000000..3c8dfb7
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxml
@@ -0,0 +1,102 @@
+<!--pages/newAddPage/safetyBriefingLearning/index.wxml-->
+<view class="study_max">
+    <view class="study_min">
+        <view class="module_title">安全视频</view>
+    </view>
+    <view class="study_video" >
+    <!-- 在此添加一个tab栏切换 -->
+      <view class="modify_video_nav" style="margin-top: 64rpx;background-color: #191d28;">
+      <view class="{{activeState==1?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>公司级</text></view>
+      <view class="{{activeState==2?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>项目级</text></view>
+      <view class="{{activeState==3?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>班组级</text></view>
+  </view>
+<view class="whoBox">
+    <view class="outsideBox showBoxs">
+        <!-- 最外边展示盒子 -->
+        <view class="showBox">
+            <!-- 左按钮 -->
+            <!-- <view class="leftBtn">
+            <image src="http://fileimg.makalu.cc/WEB_1CFE1E31022543CB934B01E8777B5907.png" mode="" style="width:100%;height:100%;"/>
+            </view> -->
+            <!-- 右按钮 -->
+            <!-- <view class="rightBtn">
+                <image src="http://fileimg.makalu.cc/WEB_1CFE1E31022543CB934B01E8777B5907.png" mode="" style="width:100%;height:100%;"/>
+            </view> -->
+            <swiper style="height: 450rpx;" indicator-dots duration='500' indicator-active-color='#fff'>
+                <swiper-item wx:for="{{videoList}}" wx:key="index">
+                    <video id="myVideo" src="{{item.videoUrl}}" binderror="videoErrorCallback" show-center-play-btn='{{true}}' show-play-btn="{{true}}" bindplay="bindplay_click" bindpause="bindpause_click" bindended="getUserLearnTime" controls></video>
+                </swiper-item>
+            </swiper>
+        </view>
+        <view class="study_video_tips">
+            温馨提示：请观看视频后进行答题
+        </view>
+        <view wx:if="{{paperFlag}}">
+            <view class="study_min">
+                <view class="module_title">安全考试</view>
+            </view>
+
+            <view class="study_examination_questions">
+
+                <view class="study_examination_questions_con" style="position: relative;">
+                    <view class="study_examination_questions_topic">{{questionsData[index].topic}}</view>
+                    <view class="study_examination_questions_radio">
+                        <view class="{{item.answer_state? (questionsData[index].correct_answer==item.letter?'study_examination_questions_list active':'study_examination_questions_list error'):'study_examination_questions_list'}}" wx:for="{{questionsData[index].answer_list}}" wx:for-index="j" wx:key="j" bindtap="chooseAnswer" data-j="{{j}}" data-item="{{item}}">
+                            <view class="study_radio">
+                                <van-icon name="success" />
+                            </view>
+                            <view class="study_radio_subject">{{item.answer}}</view>
+                        </view>
+                    </view>
+                    <!-- 查看按钮 -->
+                    <view class="chakan" wx:if="{{questionsData.length > 0 }}" data-set="{{index}}" bindtap="chakanBtn">
+                        查看详情
+                    </view>
+                </view>
+
+                <view class="answer_result" wx:if="{{questionsData[index].type}}">
+                    答案：{{answerTip}}
+                    <!-- 答案：{{ questionsData[index].answer_list.filter(item=>item.letter==questionsData[index].correct_answer)}} -->
+                </view>
+
+                <view class="switch_button">
+                    <button class="switch_button_up" wx:if="{{up}}" bindtap="onClickUp">上一题</button>
+                    <button class="switch_button_down" wx:if="{{down}}" bindtap="onClickDown">下一题</button>
+                    <button class="switch_button_to" wx:if="{{to}}" bindtap="onClickTo">确认提交</button>
+                </view>
+
+            </view>
+        </view>
+    </view>
+</view>
+<!-- <van-tabs active="a"  >
+        <van-tab title="公司级" name="a"></van-tab>
+        <van-tab title="项目级" name="b"></van-tab>
+        <van-tab title="班组级" name="c"></van-tab>
+    </van-tabs> -->
+
+</view>
+
+
+
+</view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxss b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxss
new file mode 100644
index 0000000..220183a
--- /dev/null
+++ b/miniprogram/pages/newAddPage2/safetyBriefingLearning/index.wxss
@@ -0,0 +1,68 @@
+/* pages/newAddPage/safetyBriefingLearning/index.wxss */
+.chakan{
+	position: absolute;
+	right: 48rpx;
+	bottom: 20rpx;
+	color: orange;
+}
+/* vant-weapp样式 */
+.van-tabs__nav {
+	background-color: #191d28;
+}
+.van-ellipsis{
+	color: #fff;
+}
+.van-tabs__line{
+	background-color: #fff !important;
+}
+/* .showBox{
+	position: relative;
+	width: 750rpx;
+	height: 462rpx;
+	border: 1px solid red;
+	box-sizing: border-box;
+	z-index: 999;
+}
+.showBox:hover .leftBtn{
+	display: block;
+}
+.showBox:hover .rightBtn{
+	display: block;
+}
+.leftBtn{
+	position: absolute;
+	left: 0;
+	top:50%;
+	transform: translate(0,-50%);
+	width: 48rpx;
+	height: 80rpx;
+	color: #000;
+	border: 1px solid #fff;
+	z-index: 999;
+	display: none;
+}
+.rightBtn{
+	position: absolute;
+	right: 0;
+	top:50%;
+	transform: translate(0,-50%);
+	width: 48rpx;
+	height: 80rpx;
+	color: #000;
+	border: 1px solid #fff;
+	z-index: 999;
+	display: none;
+} */
+.whoBox{
+	position: relative;
+}
+.outsideBox{
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	display: none;
+}
+.showBoxs{
+display: block;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/ranyuanguanli-map/map.js b/miniprogram/pages/ranyuanguanli-map/map.js
new file mode 100644
index 0000000..28c0a32
--- /dev/null
+++ b/miniprogram/pages/ranyuanguanli-map/map.js
@@ -0,0 +1,336 @@
+// pages/new-map/map.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    currentId: '',   //传值与list id 相同
+    showPopup: false,
+    bottom: "500rpx",
+    showUp: false,
+    longitude:'',
+    latitude:'',
+    markers: [],
+    userLongitude:'',
+    userLatitude:'',
+    userMarkers:[],
+    list:[],
+    lists:[],
+    userHatId:'',
+    //页面跳转参数
+    loginName:'',
+    userName:'',
+    projectId:'',
+    projectName:'' ,
+    index:'',
+    userLocationList:{},
+    active1:true,
+    active2:false,
+    active3:false,
+    ryshow:false,
+  },
+  onClickShow() {
+    this.setData({ ryshow: true });
+  },
+  onClickHide() {
+    this.setData({ ryshow: false });
+  },
+
+  upward() {
+    this.setData({ showUp: true });
+    this.setData({ bottom:  "500rpx" });
+    let userLocationList = this.data.userLocationList;
+    this.selectUserHardHatById(userLocationList[0].id,userLocationList)
+  },
+  downward() {
+    this.setData({ showUp: false });
+    this.setData({ bottom:  "50rpx" });
+  },
+
+  showPopup() {
+    this.setData({ showPopup: true });
+  },
+
+  onClose() {
+    this.setData({ showPopup: false });
+  },
+
+  selectList(){
+    this.setData({ showPopup: false });
+  },
+
+  showActive:function(event){
+    this.onClickShow();
+    var type = event.currentTarget.dataset.type;
+    if(type =="1"){
+      this.setData({
+        active1:true,
+        active2:false,
+        active3:false,
+        showUp: false,
+        currentId:''
+      })
+      //查询当天工时排行
+      this.selectUserAttendance(this.data.projectId,"day");
+    }else if(type == "2"){
+      this.setData({
+        active1:false,
+        active2:true,
+        active3:false,
+        showUp: false,
+        currentId:''
+      })
+       //查询本周工时排行
+       this.selectUserAttendance(this.data.projectId,"week");
+    }else{
+      this.setData({
+        active1:false,
+        active2:false,
+        active3:true,
+        showUp: false,
+        currentId:''
+      })
+       //查询本月工时排行
+       this.selectUserAttendance(this.data.projectId,"month");
+    }
+  },
+
+  //页面初始化
+  onLoad: function (options) {
+    this.onClickShow();
+    var that = this;
+    //调用wx.getSystemInfo接口，然后动态绑定组件高度
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          height: res.windowHeight
+        })
+      }
+    }),
+    //获取缓存中数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          projectId:app.globalData.projectId,
+          projectName:app.globalData.projectName,
+          index:options.index,
+          userLocationList:JSON.parse(options.userLocationList),
+          userHatId:options.id,
+          currentId:options.id,
+        })
+      }
+    })
+    //页面初始化判断页面显示
+    if(options.skipState =="1"){
+        this.setData({ showUp: true })
+        //查询单个人员安全帽信息
+        this.selectUserHardHatById(options.id,JSON.parse(options.userLocationList));
+    }else{
+      this.setData({ showPopup:true })
+    }   
+    
+    //判断列表今日、本周、本月显示
+    that.decideData(options.state);
+    //获取当天的工时排行
+    that.selectUserAttendance(app.globalData.projectId,options.state,options.skipState);
+},
+
+  //根据id查询安全帽数据
+  selectUserHardHatById:function(id,userLocationList){
+      var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/userinfo/selectUserHardhatById',
+        data:{
+          "id":id
+        },
+        method:"GET",
+        success:function(res){
+          that.onClickHide();
+          if(res.data.length>0){
+            var markers = [];
+            for(var i=0;i<userLocationList.length;i++){              
+                if(userLocationList[i].id == res.data[0].id){
+                  var marker = {id:res.data[0].id,projectId:res.data[0].projectId,longitude:res.data[0].longitude,latitude:res.data[0].latitude,projectName:res.data[0].projectName,iconPath:"http://fileimg.makalu.cc/051dbbe42b9542568665033cd8a35aea.png",width: 40, height: 40};
+                  markers.push(marker);  
+                }else{
+                  var marker = {id:userLocationList[i].id,projectId:userLocationList[i].projectId,longitude:userLocationList[i].longitude,latitude:userLocationList[i].latitude,projectName:userLocationList[i].projectName
+                  }
+                  markers.push(marker);  
+                }
+            }
+            that.setData({
+              list:res.data,
+              markers:markers,
+              longitude:res.data[0].longitude,
+              latitude:res.data[0].latitude,
+              userLongitude:res.data[0].longitude,
+              userLatitude:res.data[0].latitude,
+              userMarkers:markers,
+            })
+        }
+     
+        }
+      })
+  },
+
+  //工时排行
+  selectUserAttendance:function(projectId,state,skipState){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userinfo/selectUserAttendance',
+      data:{
+        "projectId":projectId,
+        "state":state
+      },
+      method:"GET",
+      success:function(gsph){
+        that.onClickHide();
+        if(gsph.data.userLocationList.length >0){
+          var markers = [];
+          var userLocationList = gsph.data.userLocationList;
+          for(var i=0;i<userLocationList.length;i++){
+              if(userLocationList[i].id == that.data.userHatId){
+                var marker = {id:userLocationList[0].id,projectId:userLocationList[0].projectId,longitude:userLocationList[0].longitude,latitude:userLocationList[0].latitude,projectName:userLocationList[0].projectName,iconPath:"http://fileimg.makalu.cc/051dbbe42b9542568665033cd8a35aea.png",width: 40, height: 40};
+                markers.push(marker);  
+              }else{
+                  var marker = {id:userLocationList[i].id,projectId:userLocationList[i].projectId,longitude:userLocationList[i].longitude,latitude:userLocationList[i].latitude,projectName:userLocationList[i].projectName
+                  }
+                  markers.push(marker);  
+              }
+          }
+          if(skipState == "1"){
+            that.setData({
+              lists:gsph.data.userLocationList,
+              userLocationList:gsph.data.userLocationList,
+            })
+          }else{
+            that.setData({
+              lists:gsph.data.userLocationList,
+              userLocationList:gsph.data.userLocationList,
+              markers:markers,
+              longitude:gsph.data.userLocationList[0].longitude,
+              latitude:gsph.data.userLocationList[0].latitude,
+            })
+          }        
+      }else{
+        that.setData({
+          lists:[],
+          markers:[],
+          longitude:'',
+          latitude:'',
+        })
+      }
+      }
+    })
+  },
+
+  //判断列表显示
+  decideData:function(event){
+      if(event == "day"){
+        this.setData({
+          active1:true,
+          active2:false,
+          active3:false,
+        })
+      }else if(event == "week"){
+        this.setData({
+          active1:false,
+          active2:true,
+          active3:false,
+        })
+      }else{
+        this.setData({
+          active1:false,
+          active2:false,
+          active3:true,
+        })
+      }
+  },
+
+  ///向左切换人员数据
+  changeLeftData:function(event){
+    var userLocationList = this.data.userLocationList;
+    if(this.data.index == "0"){
+      app.toast("已经到头了，无法进行点击");
+    }else{
+      this.selectUserHardHatById(userLocationList[this.data.index-1].id,this.data.userLocationList);
+      this.setData({
+        currentId:userLocationList[this.data.index-1].id,
+        index:this.data.index-1
+      })
+    }
+  },
+
+  //向右切换
+  changeRightData:function(event){
+    var userLocationList = this.data.userLocationList;
+    if(this.data.index == (userLocationList.length-1)){
+      app.toast("已经到头了，无法进行点击");
+    }else{
+      this.selectUserHardHatById(userLocationList[(this.data.index-1+2)].id,this.data.userLocationList);
+      this.setData({
+        currentId:userLocationList[(this.data.index-1+2)].id,
+        index:this.data.index-1+2
+      })
+    }
+  },
+
+  //点击列表数据查看
+  skipUserMap:function(event){
+    //查询单个数据
+    this.selectUserHardHatById(event.currentTarget.dataset.itemid,this.data.userLocationList);
+    this.setData({
+      currentId:event.currentTarget.dataset.itemid,
+      index:event.currentTarget.dataset.index,
+      showUp: true
+    })
+  },
+
+  //获取人员定位
+  userLocation:function(event){
+    this.setData({
+      longitude:this.data.userLongitude,
+      latitude:this.data.userLatitude,
+      markers:this.data.userMarkers
+    })
+  },
+
+  //获取个人定位
+  personalLocation:function(even){
+    this.setData({
+      longitude:app.globalData.initialLon,
+      latitude:app.globalData.initialLat,
+      markers:app.globalData.markers,
+    })
+  },
+
+  //点击定位点查询数据
+  getListById:function(event){
+    //查询单个数据
+    this.selectUserHardHatById(event.markerId,this.data.userLocationList);
+    var markers = this.data.markers;
+    var index = "";
+    for(var i = 0;i<markers.length;i++){
+      if(markers[i].id == event.markerId){
+        index = i;
+      }
+    }
+    this.setData({
+      currentId:event.markerId,
+      index:index,
+      showUp: true
+    })
+  },
+
+  //返回到人员管理页面
+  goRYGL:function(){
+    wx.redirectTo({
+      url: '../renyuanguanli/renyuanguanli'
+    })
+  }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/ranyuanguanli-map/map.json b/miniprogram/pages/ranyuanguanli-map/map.json
new file mode 100644
index 0000000..87a6bef
--- /dev/null
+++ b/miniprogram/pages/ranyuanguanli-map/map.json
@@ -0,0 +1,13 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-popup": "@vant/weapp/popup",
+    "van-picker": "@vant/weapp/picker",
+    "van-area": "@vant/weapp/area",
+    "van-tag": "@vant/weapp/tag",
+    "van-transition": "@vant/weapp/transition",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom" 
+}
\ No newline at end of file
diff --git a/miniprogram/pages/ranyuanguanli-map/map.wxml b/miniprogram/pages/ranyuanguanli-map/map.wxml
new file mode 100644
index 0000000..f97f58f
--- /dev/null
+++ b/miniprogram/pages/ranyuanguanli-map/map.wxml
@@ -0,0 +1,199 @@
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="4">
+        <view class="header_img" bindtap="goRYGL">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<view> 
+  <map class="map" 
+  id="map" scale="16" 
+  latitude="{{latitude}}" longitude="{{longitude}}"  
+  markers="{{markers}}" 
+  style="width: 100%; height: {{height}}px;"  
+  bindmarkertap="getListById" 
+  bindcallouttap="controltap" 
+  subkey="A2GBZ-AGALG-MP2QK-IJGFW-MRU36-4SF4O"
+  bindtap="checkMap"></map> 
+</view>
+
+<view class="map_address">
+  <view class="map_add">
+    {{projectName}}
+  </view>
+</view>
+
+
+<view class="map_left" style="bottom:{{ bottom }}">
+  <view class="map_left_img">
+    <image src="/images/i_location.png" bindtap="personalLocation"></image>
+  </view> 
+  <view class="map_left_img">
+    <image src="/images/i_personnel.png" bindtap="userLocation"></image>
+  </view>     
+</view>
+<view class="map_right" style="bottom:{{ bottom }}">
+  <view class="map_right_img">
+    <view class="map_right_zi" bindtap="upward">
+      <image src="/images/img_11.png"></image>
+      刷新
+    </view> 
+  </view> 
+  <view class="map_right_img">
+   <view class="map_right_zi"  is-link bindtap="showPopup" >
+    <image src="/images/img_12.png"></image>
+      列表
+    </view> 
+  </view>     
+</view>
+
+<van-transition name="fade-up"  show="{{ showUp }}">
+  <view class="sliding_up"  wx:for="{{list}}">
+    <view class="sliding_up_btn"> 
+      <view bindtap="downward">
+        <image src="/images/sliding_up.png"></image>
+      </view>
+    </view>
+    <view class="sliding_up_content">
+
+      <view class="sliding_up_top">
+        <view class="ranking_middle_quantity">
+          <view class="ranking_middle_img  {{item.batteryPercent > 20 ? 'ranking_green' :'ranking_red' }}">
+            <view class="battery">
+              <view class="{{item.batteryPercent > 20 ? 'green_battery' :'red_battery'}}" style="width:{{item.batteryPercent}}%">
+                <!-- 电池 -->
+              </view>
+            </view>
+          </view>
+          <view class="ranking_middle_quantity_proportion  {{item.batteryPercent > 20 ? 'number_green' :'number_red' }}">{{item.batteryPercent}}%</view>
+        </view>
+      </view>
+
+      <view class="sliding_up_middle"> 
+        <van-row>
+          <van-col span="2">
+            <view class="sliding_up_middle_left">
+              <image src="/images/middle_left.png" bindtap="changeLeftData"></image>
+            </view>
+          </van-col>
+          <van-col span="4">
+            <view class="sliding_up_middle_head">
+              <image src="{{item.userphoto}}"></image>
+            </view>
+          </van-col>
+          <van-col span="16">
+            <view class="sliding_up_middle_center">
+              <view class="ranking_middle_name"> 
+                {{item.name}}  <text> （{{item.workType}}）</text> 
+                <van-tag mark  type="{{item.onlineEvent == '在线' ?'success':'danger'}}">{{item.onlineEvent}}</van-tag>
+              </view>
+              <view class="ranking_middle_company">
+                {{item.uninName}} 
+              </view>
+            </view>
+          </van-col>
+          <van-col span="2">
+            <view class="sliding_up_middle_right">
+              <image src="/images/middl_right.png" bindtap="changeRightData"></image>
+            </view>
+          </van-col>
+        </van-row>
+      </view>
+      <view class="sliding_up_bottom">
+        <van-row>
+          <van-col span="12">
+            <view class="sliding_up_bottom_title">
+              今日工时：<text>{{item.sc}}</text>
+            </view>
+          </van-col>
+          <van-col span="12">
+            <view class="sliding_up_bottom_title">
+              本月出勤：<text>{{item.attenCount}}天</text>
+            </view>
+          </van-col>
+        </van-row>
+        <view class="sliding_up_bottom_info">
+          项目名称：<text>{{item.projectName}}</text>
+        </view>
+        <view class="sliding_up_bottom_info">
+          定位时间：<text>{{item.time}}</text>
+        </view>
+        <view class="sliding_up_bottom_address">
+          {{item.projectAddress}}
+        </view>
+      </view>
+    </view>
+  </view>
+</van-transition>
+
+
+<van-popup show="{{ showPopup }}" round position="bottom" custom-style="height: 930rpx"  bind:close="onClose">
+  <view class="lits_content">
+    <van-row>
+      <van-col span="8" bindtap="showActive" data-type="1">
+        <view class="list_screen {{active1 ?'active':''}}">今日</view>
+      </van-col>
+      <van-col span="8" bindtap="showActive" data-type="2">
+        <view class="list_screen {{active2 ?'active':''}}">本周</view>
+      </van-col>
+      <van-col span="8" bindtap="showActive" data-type="3">
+        <view class="list_screen {{active3 ?'active':''}}">本月</view>
+      </van-col>
+    </van-row>
+
+    <view class="ranking_max">
+      <view class="ranking_min {{currentId == item.id ?'active':' '}}" wx:for="{{lists}}" bindtap="selectList">
+        <van-row bindtap="skipUserMap" data-itemid="{{item.id}}" data-index="{{index}}">
+          <van-col span="3"> 
+            <view class="ranking_left"> 
+              <text>{{index}}</text>
+            </view>
+          </van-col>
+          <van-col span="21">
+            <view class="ranking_middle"> 
+              <view class="ranking_middle_name"> 
+                {{item.name}}  <text> {{item.workType}} </text> 
+                <van-tag mark  type="{{item.onlineEvent == '在线' ?'success':'danger'}}">{{item.onlineEvent}}</van-tag>
+                <view class="ranking_middle_quantity">
+                  <view class="ranking_middle_img  {{item.batteryPercent > 20 ? 'ranking_green' :'ranking_red' }} ">
+                    <view class="battery">
+                      <view class="{{item.batteryPercent > 20 ? 'green_battery' :'red_battery'}}" style="width:{{item.batteryPercent}}%">
+                        <!-- 电池 -->
+                      </view>
+                    </view>
+                  </view>
+                  <view class="ranking_middle_quantity_proportion  {{item.batteryPercent > 20 ? 'number_green' :'number_red' }}  ">{{item.batteryPercent}}%</view>
+                </view>
+              </view>
+              <view class="ranking_middle_company">
+                {{item.uninName}}
+              </view>
+              <view class="ranking_middle_days">
+                本月出勤：<text>{{item.attenCount}}</text> 天
+                <view class="ranking_middle_time">{{item.sc}}</view>
+              </view>
+            </view>
+          </van-col>
+        </van-row>
+      </view>
+    </view>
+  </view>
+</van-popup>
+
+<van-overlay show="{{ryshow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
+
+
+
diff --git a/miniprogram/pages/ranyuanguanli-map/map.wxss b/miniprogram/pages/ranyuanguanli-map/map.wxss
new file mode 100644
index 0000000..573f5b5
--- /dev/null
+++ b/miniprogram/pages/ranyuanguanli-map/map.wxss
@@ -0,0 +1,277 @@
+/* pages/new-map/map.wxss */
+.map_address{
+  width: 90%;
+  position: absolute;
+  top: 196rpx;
+  left: 5%;
+  color: #8aa3ec;
+  background: url("http://fileimg.makalu.cc/CORE_1F1F3A2778334D3EAC1226DDCEBD48D0.png") no-repeat left/40rpx;
+}
+.map_add{
+  padding-left: 50rpx;
+  font-size: 28rpx;
+}
+.map_left{
+  position: absolute;
+  left: 30rpx;
+}
+.map_right{
+  position: absolute;
+  right: 30rpx;
+}
+.map_left_img{
+  background: #333343;
+  border-radius: 50%;
+  height: 70rpx;
+  width: 70rpx;
+  margin-bottom: 30rpx;
+}
+.map_left_img image{
+  width: 70rpx;
+  height: 70rpx;
+}
+.map_left_img:active{
+  background: #252530;
+}
+.map_right_img{
+  margin-bottom: 30rpx;
+}
+.map_right_zi{
+  height: 70rpx;
+  background: #333343;
+  width: 150rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 70rpx;
+  font-size: 28rpx;
+}
+.map_right_zi image{
+  width: 40rpx;
+  height:40rpx;
+  position: relative;
+  top: 10rpx;
+}
+.map_right_zi:active{
+  background: #252530;
+}
+/* 底部信息 */
+.sliding_up{
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 500rpx;
+}
+.sliding_up_btn view{
+  width:150rpx;
+  height: 40rpx;
+  background: rgba(42,52,91,0.8);
+  margin: auto;
+  border-radius: 50rpx 50rpx 0 0;
+  text-align: center;
+}
+.sliding_up_btn view image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.sliding_up_content{
+  background: rgba(42,52,91,0.8);
+  height:460rpx;
+}
+.sliding_up_top{
+  height:50rpx;
+}
+.sliding_up_middle{
+  border-top: 2px solid #2e3e69;
+  border-bottom: 2px solid #2e3e69;
+  height: 120rpx;
+}
+.sliding_up_middle_left{
+  padding-top: 25rpx;
+}
+.sliding_up_middle_left image{
+  width: 50rpx;
+  height: 70rpx;
+}
+.sliding_up_middle_right{
+  padding-top: 25rpx;
+  text-align: right;
+}
+.sliding_up_middle_right image{
+  width: 50rpx;
+  height: 70rpx;
+}
+.sliding_up_middle_head{
+  text-align: center;
+  padding-top: 10rpx;
+}
+.sliding_up_middle_head image{
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 10rpx;
+}
+.ranking_middle_name{
+  font-size: 30rpx;
+}
+.ranking_middle_name text{
+  color: #8aa3ec;
+  font-size: 28rpx;
+}
+.ranking_middle_company{
+  color: #8aa3ec;
+  padding: 20rpx 0;
+  font-size: 24rpx;
+}
+.ranking_middle_days{
+  color: #8aa3ec;
+  font-size: 24rpx;
+}
+.ranking_middle_days text{
+  color: #00baff;
+  font-size: 28rpx;
+}
+.ranking_middle_time{
+  float: right;
+  font-size: 30rpx;
+  color: #00baff;
+}
+.ranking_max{
+  height:800rpx;
+  overflow: auto;
+}
+.ranking_min{
+  padding:15rpx 20rpx;
+  border-radius: 5rpx;
+  background-color: #272f51;
+  margin-bottom: 20rpx;
+}
+.ranking_min.active{
+  border: 2px solid #4465a5;
+} 
+
+.ranking_left{
+  height: 150rpx;
+  line-height: 150rpx;
+  padding-left: 5rpx;
+}
+.ranking_left text{
+  padding: 0 15rpx;
+  background: #00a0e9;
+  font-size: 20rpx;
+  border-radius: 5rpx;
+  color: #191d28;
+  font-weight: bold;
+}
+
+
+.sliding_up_middle_center{
+  padding-top:18rpx;
+}
+.sliding_up_bottom{
+  padding: 10rpx 0;
+}
+.sliding_up_bottom_title{
+  text-align: center;
+  padding: 10rpx 0;
+  font-size: 28rpx;
+}
+.sliding_up_bottom_title text{
+  color: #00baff;
+  font-size: 30rpx;
+}
+.sliding_up_bottom_info{
+  padding: 10rpx 40rpx;
+  font-size: 24rpx;
+  color: #8aa3ec;
+}
+.sliding_up_bottom_info text{
+  color: #ffffff;
+}
+.sliding_up_bottom_address{
+  color: #8aa3ec;
+  font-size: 28rpx;
+  padding: 10rpx 40rpx;
+}
+
+
+/* 电池 */
+.ranking_middle_quantity{
+  float: right;
+  font-size: 26rpx;
+  width: 120rpx;
+  padding-top: 15rpx;
+  margin-right: 20rpx;
+}
+.ranking_middle_quantity_proportion{
+  float: right;
+  top: -6rpx;
+  position: relative;
+}
+.ranking_middle_img{
+  float: left;
+}
+.ranking_middle_img{
+  width: 50rpx;
+  height: 25rpx;
+}
+.ranking_green{
+  background: url("http://fileimg.makalu.cc/CORE_56270CFFB87746E1968AF87C8D704B26.png") no-repeat left/100% 100%;
+}
+.ranking_red{
+  background: url("http://fileimg.makalu.cc/CORE_3A01CFC1FDA540B6A29F8A9750A258B0.png") no-repeat left/100% 100%;
+}
+.battery{
+  
+  width:85%;
+  height: 22rpx;
+  border-radius: 5rpx;
+  padding: 2rpx;
+}
+.green_battery{
+  background: #1ab800;
+  height: 100%;
+}
+.red_battery{
+  background: #fe1e00;
+  width: 10%;
+  height: 100%;
+}
+.number_red{
+  color: #fe1e00; 
+}
+.number_green{
+  color: #1ab800;
+}
+
+/* 列表 */
+.lits_content{
+  padding:20rpx 30rpx 10rpx;
+}
+.list_screen{
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+  color: #8aa3ec;
+}
+.list_screen.active{
+  color: #ffffff;
+  font-weight: bold;
+}
+
+
+
+
+
+
+
+.van-tag--mark,.van-tag--mark:after {
+  border-radius: 15rpx 0 15rpx 0 !important;
+  position: relative;
+  top: -5rpx;
+}
+
+ .van-popup{
+   background: #232a44 !important;
+ } 
+
+
diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.js b/miniprogram/pages/renyuanguanli/renyuanguanli.js
new file mode 100644
index 0000000..52f3134
--- /dev/null
+++ b/miniprogram/pages/renyuanguanli/renyuanguanli.js
@@ -0,0 +1,577 @@
+// pages/new-renyuanguanli/renyuanguanli.js
+import * as echarts from '../../ec-canvas/echarts';
+const app = getApp();
+
+//加载施工队数据
+const colorArray = [{
+  top: '#56c8ec',
+  bottom: '#1778eb'
+}, {
+  top: '#56c8ec',
+  bottom: '#1778eb'
+},
+{
+  top: '#56c8ec',
+  bottom: '#1778eb'
+}, {
+  top: '#59c5ec',
+  bottom: '#1778eb'
+}, {
+  top: '#56c8ec',
+  bottom: '#1778eb'
+}, {
+  top: '#56c8ec',
+  bottom: '#1778eb'
+}, {
+  top: '#56c8ec',
+  bottom: '#1778eb'
+}, {
+  top: '#56c8ec',
+  bottom: '#1778eb'
+}, {
+  top: '#56c8ec',
+  bottom: '#1778eb'
+}
+];
+function initChart_1(chart_1,data_1,data_name) {
+    var option_1 = {
+      grid: {
+          left: '0',
+          right: '10%',
+          bottom: '0%',
+          top:'10%',
+          containLabel: true
+      },
+      tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+              type: 'shadow'
+          },
+          formatter: "{b}: {c}"
+      },
+      xAxis: {
+          show: false,                //是否显示x轴
+          type: 'value'
+      },
+      yAxis: {
+          type: 'category',
+          inverse:true,               //让y轴数据逆向
+          axisLabel: {
+              show: true,
+              textStyle: {
+                  color: '#a2d4e6'       //y轴字体颜色
+              },
+              //定义富文本标签
+              rich: {
+                  lg: {
+                      fontWeight: 'bold',
+                      fontSize: 12,       //字体默认12
+                      color: '#08C',
+                      padding: [0, 5, 0, 0]
+                  },
+                  title: {
+                      color: '#fff',
+                      fontWeight: 'lighter',
+                      // borderWidth: 1,
+                      // borderColor: '#08c'
+                      // textareaBorderColor: '#08c',
+                  }
+              },
+              interval: 0,
+              formatter: function(value) {
+                if (value.length > 8) {
+                  return value.substring(0, 8) + "...";
+                } else {
+                  return value;
+                }
+              }
+          },
+          splitLine: {show: false},   //横向的线
+          axisTick: {show: false},    //y轴的端点
+          axisLine: {show: false},    //y轴的线
+          data: data_name
+      },
+      series: [
+          {
+              name: '数据内框',
+              type: 'bar',
+              itemStyle: {
+                  normal: {
+                      show: true,
+                      color: function(params) {
+                          let num = colorArray.length;
+                          return {
+                              type: 'linear',
+                              colorStops: [{
+                                  offset: 0,
+                                  color: colorArray[params.dataIndex % num].bottom
+                              }, {
+                                  offset: 1,
+                                  color: colorArray[params.dataIndex % num].top
+                              }, {
+                                  offset: 0,
+                                  color: colorArray[params.dataIndex % num].bottom
+                              }, {
+                                  offset: 1,
+                                  color: colorArray[params.dataIndex % num].top
+                              }, {
+                                  offset: 0,
+                                  color: colorArray[params.dataIndex % num].bottom
+                              }, {
+                                  offset: 1,
+                                  color: colorArray[params.dataIndex % num].top
+                              }, {
+                                  offset: 0,
+                                  color: colorArray[params.dataIndex % num].bottom
+                              }, {
+                                  offset: 1,
+                                  color: colorArray[params.dataIndex % num].top
+                              }, {
+                                  offset: 0,
+                                  color: colorArray[params.dataIndex % num].bottom
+                              }, {
+                                  offset: 1,
+                                  color: colorArray[params.dataIndex % num].top
+                              }]
+                          }
+                      },
+                      barBorderRadius: 20,
+                  }
+              },
+              barWidth: '15',
+              data: data_1,
+              label: {
+                  show: true,
+                  position: 'right',
+                  color: '#ffc31f',
+                  fontSize: 12,
+                  offset: [10, 0]
+              },
+          }
+      ]
+  };
+  chart_1.setOption(option_1);
+  return chart_1;
+}
+
+
+//加载工种分布
+let formatNumber_2 = function(num) {
+  let reg = /(?=(\B)(\d{3})+$)/g;
+  return num.toString().replace(reg, ',');
+}
+function arrayobj_2  (array, key) {
+  var resObj = {}
+  for (var i = 0; i < array.length; i++) {
+      resObj[array[i][key]] = array[i]
+  }
+  return resObj
+}
+function initChart_2(chart_2,datas_2,data_name) {
+  let objData_2 = arrayobj_2(datas_2, 'name')
+  let total_2 = datas_2.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_2 = '总人数';
+
+  var option_2 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_2(total_2) + '} \n {name|' + title_2 + '} ',
+      top: '31%',
+      left: '14%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 20]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 0,0,20]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: data_name,
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_2[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['55%', '80%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_2
+      }]
+  };
+
+  chart_2.setOption(option_2);
+  return chart_2;
+}
+
+
+
+
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active:2, 
+    ec_1: {
+      lazyLoad: true //动态加载
+    }, 
+    ec_2: {
+      lazyLoad: true //动态加载
+    },
+    gradientColor: {
+      '0%': '#6588ff',
+      '100%': '#7e57fe',
+    },
+    show:false,
+    show1: false,
+    jzshow:false,
+    time:"今日",
+    actions1: [{name: '今日',},{name: '本周',},{name: '本月',}],
+    list:[],
+    //安全教育
+    learningRate:'0',
+    passRate:'0',
+    learnedNum:'0',
+    notLearnedNum:'0',
+    sumLearnedNum:'0',
+    value1:'0',
+    value2:'0',
+    //安全帽
+    hardHatNum:0,
+    onlineNum:0,
+    notOnlineNum:0,
+    value3:0,
+    value4:0,
+    state:'day',
+    //人员定位个数
+    userLocation:'0',
+    userLocationList:[],
+    //页面跳转参数
+    loginName:'',
+    userName:'',
+    projectId:'',
+    projectName:'' ,
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    this.onLoad();
+  },
+
+  onClickShow() {
+    this.setData({ jzshow: true });
+  },
+  onClickHide() {
+    this.setData({ jzshow: false });
+  },
+  showPopup() {
+    this.setData({ show: true });
+  },
+  onClose() {
+    this.setData({ show1: false ,show: false});
+  },
+  onclick1(){
+    this.setData({ show1: true });
+  },
+  onSelect1(event) {
+    this.onClickShow();
+    this.setData({
+        time: event.detail.name,
+    });
+    var state = "";
+    if(event.detail.name=="今日"){
+      state = "day";
+    }else if(event.detail.name == "本周"){
+      state = "week"
+    }else if(event.detail.name == "本月"){
+      state = "month";
+    }
+    this.setData({
+      state:state
+    })
+    //查询工时排行
+    this.selectUserAttendance(this.data.projectId,state);
+  },
+
+  // 底部导航
+  onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    that.onClickShow();
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+          userName:res.data.userName,
+          projectId:app.globalData.projectId,
+          projectName:app.globalData.projectName,
+          initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+        })  
+      }
+    })
+    this.oneComponent = this.selectComponent('#mychart-one');
+    this.twoComponent = this.selectComponent('#mychart-two');
+    this.getUserInfoRanks(app.globalData.projectId);
+  },
+
+  //初始化施工队柱状图数据
+  init_one: function (datas_1,data_name) {
+    this.oneComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_1(chart,datas_1,data_name);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //初始工种分布
+  init_two: function (datas_1,data_name) {
+    this.twoComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_2(chart,datas_1,data_name);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //页面初始化加载数据
+  getUserInfoRanks:function(even){
+    var that = this;
+
+    //获取人员施工队数据
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userinfo/selectUserInfoRanks',
+      data:{
+        "projectId":even
+      },
+      method:"GET",
+      success:function(ranks){
+        that.init_one(ranks.data.ranksNum,ranks.data.ranksName);
+      }
+    })
+
+    //获取人员工种分布数据
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userinfo/selectUserInfoWork',
+      data:{
+        "projectId":even
+      },
+      method:"GET",
+      success:function(work){
+        if(work.data == ''){
+          that.init_two([{"name":'',"value":'0'}])
+        }else{
+          that.init_two(work.data,work.data);
+        }       
+      }
+    })
+
+    //获取安全教育数据
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userinfo/selectUserInfoEducation',
+      data:{
+        "projectId":even
+      },
+      method:"GET",
+      success:function(education){
+        if(education.data!=''){
+          var value1 = (education.data.learnedNum == '0' || education.data.workLabourNum == '0'?'0':(education.data.learnedNum/education.data.workLabourNum*100).toFixed(0));
+          that.setData({
+            value1:even==3?100:(value1>100.0?100.0:value1),
+            value2:even==3?0:((education.data.passRate)>100.0?100.0:education.data.passRate),
+            learnedNum:even==3?1009:education.data.learnedNum,
+            notLearnedNum:even==3?0:((education.data.workLabourNum-education.data.learnedNum)<0?0:education.data.workLabourNum-education.data.learnedNum),
+            sumLearnedNum:even==3?1009:education.data.attendanceNum,
+          })
+        }        
+      }
+    })
+
+    //获取安全帽数据
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userinfo/selectOnlineData',
+      data:{
+        "projectId":even
+      },
+      method:"GET",
+      success:function(res){
+        let hardHatNum = 0;
+        let onlineNum = 0;
+        let notOnlineNum = 0;
+        let value3 = 0;
+        let value4 = 0;
+        if(res.data.code == 0){
+            hardHatNum = res.data.data.hardHatNum,
+            onlineNum = res.data.data.onlineNum,
+            notOnlineNum = res.data.data.notOnlineNum,
+            value3 = res.data.data.onlineRate,
+            value4 = res.data.data.offlineRate
+        }
+        that.setData({
+          hardHatNum:hardHatNum,
+          onlineNum:onlineNum,
+          notOnlineNum:notOnlineNum,
+          value3:value3,
+          value4:value4,
+        })
+      }
+    })
+
+    //工时排行
+    that.selectUserAttendance(even,"day");
+  },
+
+  //工时排行
+  selectUserAttendance:function(projectId,state){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/userinfo/selectUserAttendance',
+      data:{
+        "projectId":projectId,
+        "state":state
+      },
+      method:"GET",
+      success:function(gsph){
+        that.onClickHide();
+          that.setData({
+            list:gsph.data.listMap,
+            userLocation:gsph.data.userLocationCount,
+            userLocationList:gsph.data.userLocationList
+          })
+      }
+    })
+  },
+
+   //跳转到项目概况页面
+   XMGK:function(){
+    wx.redirectTo({
+      url: '../xiangmugaikuang/xiangmugaikuang'
+    })
+  },
+
+  //跳转到设备管理
+  SBGL:function(){
+    wx.redirectTo({
+      url: '../shebieguanli-jxsb/shajiangguan',
+    })
+  },
+  //跳转到安全管控
+  XMSP:function(){
+    wx.redirectTo({
+      //url: '../deepExcavation/index'
+      url:'../newAddPage/safetyManagement/index'
+    }) 
+  },
+
+  //跳转到更多更能
+  GDGN:function(event){
+    wx.redirectTo({
+      url: '../gengduogongneng/gengduogongneng',
+    })
+  },
+
+  //跳转到地图页面
+  skipUserMap:function(even){
+    wx.redirectTo({
+      url: '../ranyuanguanli-map/map?id='+even.currentTarget.dataset.itemid+"&index="+even.currentTarget.dataset.index+"&userLocationList="+JSON.stringify(this.data.userLocationList)+"&skipState=1"+"&state="+this.data.state
+    })
+  },
+
+  //跳转到地图列表页面
+  goUserMap:function(even){
+    wx.redirectTo({
+      url: '../ranyuanguanli-map/map?id='+even.currentTarget.dataset.itemid+"&index="+even.currentTarget.dataset.index+"&userLocationList="+JSON.stringify(this.data.userLocationList)+"&skipState=2"+"&state="+this.data.state
+    })
+  },
+
+   //退出登录
+   TCDL:function(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+      url: '../login/login',
+    })
+  },
+
+  //返回到工程列表页面
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../gongchengliebiao/gongchengliebiao'
+    })
+  },
+  
+  //返回到地图页面
+  GOMAP:function(){
+    wx.redirectTo({
+      url: '../map/map',
+    })
+  },  
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.json b/miniprogram/pages/renyuanguanli/renyuanguanli.json
new file mode 100644
index 0000000..eab1240
--- /dev/null
+++ b/miniprogram/pages/renyuanguanli/renyuanguanli.json
@@ -0,0 +1,16 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup",
+    "van-circle": "@vant/weapp/circle",
+    "van-tag": "@vant/weapp/tag/index",
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "van-overlay": "@vant/weapp/overlay/index"
+  },
+  "navigationStyle":"custom"
+} 
\ No newline at end of file
diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.wxml b/miniprogram/pages/renyuanguanli/renyuanguanli.wxml
new file mode 100644
index 0000000..37507fc
--- /dev/null
+++ b/miniprogram/pages/renyuanguanli/renyuanguanli.wxml
@@ -0,0 +1,267 @@
+<!-- 头部 -->
+<view class="header_title" >
+  <view class="">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">人员管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<!-- 左侧账号信息 -->
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+
+    <!-- <view class="left_manage_max">
+    </view>
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view> -->
+  </view>
+</van-popup>
+
+
+<view class="max_content" >
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+  <!-- <view class="video_add">
+    <view class="video_address">
+      <view class="video_address_min" bindtap="GOMAP">
+        {{projectName}}
+      </view>
+    </view>
+  </view> -->
+
+  <view class="echarts_max" style="margin-top: 60rpx;">
+    <view class="echarts_min">
+      <view class="eharts_title">
+        施工队分布 <text class="unit">单位：人</text>
+      </view>  
+
+      <view class="eharts_con eharts_con_heng">
+        <ec-canvas ec="{{ ec_1 }}" id="mychart-one"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">
+        工种分布 <text class="unit">单位：人</text>
+      </view>  
+
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_2 }}" id="mychart-two"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">安全教育学习情况</view> 
+      <view class="eharts_number study">劳务人员入场人数：<text>{{sumLearnedNum}}</text> 人</view>
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_con eharts_con_jdt">
+            <van-circle value="{{ value1 }}"  layer-color="#1e4973" color="{{gradientColor}}" text="{{value1}}%" size="120" stroke-width="13" z-index="999"/>
+            <view class="eharts_number study">已学习：<text>{{learnedNum}}</text> 人</view>
+          </view> 
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_con eharts_con_jdt">
+            <van-circle value="{{ value2}}"  layer-color="#1e4973" color="{{gradientColor}}" text="{{value2}}%" size="120" stroke-width="13" z-index="999"/>
+            <view class="eharts_number study">未学习：<text>{{notLearnedNum}}</text> 人</view>
+          </view> 
+        </van-col>
+      </van-row>
+    </view> 
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">安全帽监测</view> 
+      <view class="eharts_number study">安全帽总数：<text>{{hardHatNum}}</text> </view>
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_con eharts_con_jdt">
+            <van-circle value="{{ value3 }}"  layer-color="#1e4973" color="{{gradientColor}}" text="{{value3}}%" size="120" stroke-width="13" z-index="999"/>
+            <view class="eharts_number study">今日在线：<text>{{onlineNum}}</text> </view>
+          </view> 
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_con eharts_con_jdt">
+            <van-circle value="{{ value4}}"  layer-color="#1e4973" color="{{gradientColor}}" text="{{value4}}%" size="120" stroke-width="13" z-index="999"/>
+            <view class="eharts_number study">今日离线：<text>{{notOnlineNum}}</text> </view>
+          </view> 
+        </van-col>
+      </van-row>
+    </view> 
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">
+        工时排名<text class="hj_float" bindtap="onclick1">{{time}} </text>
+         <van-action-sheet show="{{ show1 }}" actions="{{ actions1 }}" bind:close="onClose" bind:select="onSelect1" />
+      </view>  
+      
+      <view class="ranking">
+        <view class="ranking_min" wx:for="{{list}}">
+          <van-row bindtap="skipUserMap" data-itemid="{{item.id}}" data-index="{{index}}">
+            <van-col span="3"> 
+              <view class="ranking_left"> 
+                <text>{{index}}</text>
+              </view>
+            </van-col>
+            <van-col span="21">
+              <view class="ranking_middle"> 
+                <view class="ranking_middle_name"> 
+                  {{item.name}}  <text> {{item.workType}} </text> 
+                  <van-tag mark  type="{{item.onlineEvent == '在线' ?'success':'danger'}}">{{item.onlineEvent}}</van-tag>
+                  <view class="ranking_middle_quantity">
+                    <view class="ranking_middle_img  {{item.batteryPercent > 20 ? 'ranking_green' :'ranking_red' }} ">
+                      <view class="battery">
+                        <view class="{{item.batteryPercent > 20 ? 'green_battery' :'red_battery'}}" style="width:{{item.batteryPercent}}+'%'">
+                          <!-- 电池 -->
+                        </view>
+                      </view>
+                    </view>
+                    <view class="ranking_middle_quantity_proportion  {{item.batteryPercent > 20 ? 'number_green' :'number_red' }}  ">{{item.batteryPercent}}%</view>
+                  </view>
+                </view>
+                <view class="ranking_middle_company">
+                  {{item.uninName}}
+                </view>
+                <view class="ranking_middle_days">
+                  本月出勤：<text>{{item.attenCount}}</text> 天
+                  <view class="ranking_middle_time">{{item.sc}}</view>
+                </view>
+              </view>
+            </van-col>
+          </van-row>
+        </view>
+      </view>
+
+      <view class="personnel_orientation" bindtap="goUserMap">
+        人员定位：<text>{{userLocation}}</text> >>
+      </view>
+
+    </view> 
+  </view>
+
+</view>
+<van-overlay show="{{jzshow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+<!-- 底部导航 -->
+
+  <van-tabbar active="{{ active }}" bind:change="onChange" active-color="#ffffff"  inactive-color="#7d95d6" z-index="9999" >
+  <van-tabbar-item bindtap="XMGK" >
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    项目概况
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="SBGL">
+    <image
+      slot="icon"
+      src="/images/footer_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    设备管理
+    </van-tabbar-item>
+
+  <van-tabbar-item>
+    <image
+      slot="icon"
+      src="/images/footer_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    人员管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="XMSP">
+    <image
+      slot="icon"
+      src="/images/footer_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    安全管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="GDGN">
+    <image
+      slot="icon"
+      src="/images/footer_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height:40rpx;"
+    />
+    更多功能
+  </van-tabbar-item>
+</van-tabbar>
\ No newline at end of file
diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.wxss b/miniprogram/pages/renyuanguanli/renyuanguanli.wxss
new file mode 100644
index 0000000..9ca29c5
--- /dev/null
+++ b/miniprogram/pages/renyuanguanli/renyuanguanli.wxss
@@ -0,0 +1,207 @@
+/* pages/new-jinduguanli/jinduguanli.wxss */
+.echarts_max{
+  margin-top: 30rpx;
+  padding:0 30rpx;
+}
+.echarts_min{
+  background:#1e2336 ;
+  font-size: 28rpx;
+  padding: 30rpx;
+  border-radius: 15rpx;
+}
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.eharts_head{
+  text-align: center;
+  padding: 30rpx 0;
+}
+.eharts_head text{
+  color:#0ad7ec;
+  font-size:30rpx;
+}
+.eharts_con{
+  height: 350rpx;
+  width: auto;
+}
+.eharts_number{
+  font-size: 28rpx;
+  padding-bottom: 20rpx;
+}
+.eharts_number text{
+  color: #0ad7ec;
+  font-size: 40rpx;
+}
+.hj_float{
+  float: right;
+  padding: 5rpx 50rpx 5rpx 20rpx;
+  background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+  border-radius: 40rpx;
+}
+
+
+
+.unit{
+  float: right;
+  color:#51d7ff ;
+  font-size: 24rpx;
+}
+.eharts_con_jdt{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding-top:40rpx;
+}
+.eharts_con_jdt .van-circle__text {
+  color: #01ecff;
+  font-size: 50rpx;
+}
+.study{
+  padding-top: 20rpx;
+  text-align: center;
+}
+
+
+.ranking{
+  padding-top: 20rpx;
+}
+.ranking_min{
+  border: 2px solid #283555;
+  padding:15rpx 10rpx;
+  border-radius: 5rpx;
+  margin:20px 0;
+}
+.ranking_left{
+  height: 150rpx;
+  line-height: 150rpx;
+  padding-left: 5rpx;
+}
+.ranking_left text{
+  padding: 0 15rpx;
+  background: #00a0e9;
+  font-size: 20rpx;
+  border-radius: 5rpx;
+  color: #191d28;
+  font-weight: bold;
+}
+.ranking_middle{
+  height: 150rpx;
+}
+.ranking_right{
+
+  height: 150rpx;
+  font-size: 24rpx;
+}
+.ranking_middle_name{
+  font-size: 32rpx;
+}
+.ranking_middle_name text{
+  color: #8aa3ec;
+  font-size: 28rpx;
+}
+.ranking_middle_company{
+  color: #8aa3ec;
+  padding: 10rpx 0;
+  font-size: 24rpx;
+}
+.ranking_middle_days{
+  color: #8aa3ec;
+  font-size: 24rpx;
+}
+.ranking_middle_days text{
+  color: #00baff;
+  font-size: 28rpx;
+}
+.ranking_middle_time{
+  float: right;
+  font-size: 30rpx;
+  color: #00baff;
+}
+
+
+.ranking_middle_quantity{
+  float: right;
+  font-size: 26rpx;
+  width: 120rpx;
+  padding-top: 10rpx;
+}
+.ranking_middle_quantity_proportion{
+  float: right;
+  top: -6rpx;
+  position: relative;
+}
+.ranking_middle_img{
+  float: left;
+}
+.ranking_middle_img{
+  width: 50rpx;
+  height: 25rpx;
+}
+.ranking_green{
+  background: url("http://fileimg.makalu.cc/CORE_56270CFFB87746E1968AF87C8D704B26.png") no-repeat left/100% 100%;
+}
+.ranking_red{
+  background: url("http://fileimg.makalu.cc/CORE_3A01CFC1FDA540B6A29F8A9750A258B0.png") no-repeat left/100% 100%;
+}
+.battery{
+  width:85%;
+  height: 22rpx;
+  border-radius: 5rpx;
+  padding: 2rpx;
+}
+.green_battery{
+  background: #1ab800;
+  height: 100%;
+}
+.red_battery{
+  background: #fe1e00;
+  width: 10%;
+  height: 100%;
+}
+.number_red{
+  color: #fe1e00; 
+}
+.number_green{
+  color: #1ab800;
+}
+
+
+.personnel_orientation{
+  text-align: center;
+  color: #8aa3ec;
+}
+.personnel_orientation text{
+  color: #09c7fb;
+  font-size: 32rpx;
+}
+.eharts_con_heng{
+  height: 600rpx;
+}
+
+
+.van-popup--bottom.van-popup--round{
+  border-radius: 0 !important
+}
+.van-popup{
+  background-color: var(--popup-background-color,#232a44) !important
+}
+.van-action-sheet__cancel,.van-action-sheet__item{
+  background-color: var(--popup-background-color,#232a44) !important;
+  color: #0ad7ec;
+}
+
+.van-tag--mark,.van-tag--mark:after {
+  border-radius: 15rpx 0 15rpx 0 !important;
+  position: relative;
+  top: -5rpx;
+}
+.laowuStyle{
+  width: 240rpx;
+  height: 240rpx;
+  border: 1px solid red;
+}
+
diff --git a/miniprogram/pages/saft-education-user-bind/index.js b/miniprogram/pages/saft-education-user-bind/index.js
new file mode 100644
index 0000000..7fadac7
--- /dev/null
+++ b/miniprogram/pages/saft-education-user-bind/index.js
@@ -0,0 +1,468 @@
+const app = getApp()
+// pages/saft-education-user-bind/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: { 
+        loadShow:false,
+        phoneNumber:"",
+        cardId:"",
+        companyName:"",
+        typeWordName:"",
+        userName:"",
+        companyId:"",
+        typeWord:"",
+        manageSign:"",
+        educationLevelList:[],
+        educationLevel:'',
+        emergencyName:'',
+        emergencyPhone:'',
+        szhprojectId:"",
+        smzProjectId:"",
+        cultureLevel:'',
+        specialFlag:'',
+        sex:'',
+        idCardFront:'',
+        //验证方式(1手机号，2身份证)
+        authentication:"1",
+        authenticationList:[
+            {
+                "id":"1",
+                "text":'手机号'
+            },
+            {
+                "id":"2",
+                "text":'身份证'
+            }
+        ]
+    },
+    /**
+     * 
+     * @param {*} e 
+     */
+    onSelectAuthentication(e) {
+        if(e.detail.id == "1") {
+            this.setData({
+                authentication: e.detail.id,
+                cardId:"",
+                phoneNumber:'',
+                companyName:'',
+                userName:'',
+                emergencyName:'',
+                emergencyPhone:'',
+                manageSign:"",
+                educationLevel:1,
+                cultureLevel:'小学'
+            })
+        } else {
+            this.setData({
+                authentication: e.detail.id,
+                cardId:'',
+                phoneNumber:'',
+                companyName:'',
+                userName:'',
+                emergencyName:'',
+                emergencyPhone:'',
+                manageSign:"",
+                educationLevel:1,
+                cultureLevel:'小学'
+            })
+        }
+        console.log(this.data.educationLevel)
+    },
+    /** 
+    * 电话号码失去焦点 
+    */
+   inputPhoneNumber(e){
+        let {value} = e.detail
+        if(value >= 11){
+            this.getUserInfo(value,'')
+        }
+        
+   },
+
+    /** 
+    * 身份证号失去焦点 
+    */
+    inputCardId(e){
+        let {value} = e.detail
+        if(value.length >= 18){
+            this.getUserInfo('',value)
+        }
+       
+    },
+    /**
+     * 文化程度变化
+     */
+    onSelectEducationLevel(e) {
+        console.log(e)
+        this.setData({
+            educationLevel: e.detail.id,
+        })
+    },
+    /**
+     * 紧急联系人
+     */
+    onEmergencyName(e) {
+        this.setData({
+            emergencyName: e.detail.value
+        })
+    },
+    /**
+     * 紧急联系人联系方式
+     */
+    onEmergencyPhone(e) {
+        this.setData({
+            emergencyPhone: e.detail.value
+        })
+    },
+    /**
+     * 获取用户信息
+     */
+    getUserInfo(phoneNumber ='',cardId = ''){
+        let {smzProjectId} = this.data
+        //获取当前扫码用户的openId
+        let openId = wx.getStorageSync('openId')
+        let that = this
+        this.setData({
+            loadShow:true
+        })
+         //获取用户在实名制用户信息
+         wx.request({
+            url: app.globalData.smzUrl+"/mkl/api/searchUserInfoList",
+            method:"POST",
+            data:{
+                projectId:smzProjectId,
+                isWork:1,
+                idcardnum:cardId,
+                userphone:phoneNumber
+            },
+            header: {
+                'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+            },
+            success(res){
+                that.setData({
+                    loadShow:false
+                })
+                if(res.data.state != 'fails'){
+                    let userInfo =  res.data.data
+                    if(!userInfo){
+                        app.toast("实名制系统查无此人，请确认系统录入或人员进场")
+                        return;
+                    }
+                    userInfo = userInfo[0]
+                    wx.request({
+                        url: app.globalData.szhUrl + "/business/saftEducationOpenIdMap/wxList",
+                        method:"post",
+                        data:{
+                            openId:openId
+                        },
+                        header: {
+                            'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+                        },
+                        success(signTemp){
+                            let qrUrl =  signTemp.data.rows.length <= 0 ? "":signTemp.data.rows[0].qrUrl
+                            let {name,userphone,idcardnum,teamid,uninName,worktypeid,workType,cultureLevel,specialFlag,sex,idcardimg} = userInfo
+                            that.setData({
+                                phoneNumber:userphone,
+                                cardId:idcardnum,
+                                companyName:uninName,
+                                typeWordName:workType,
+                                userName:name,
+                                companyId:teamid,
+                                typeWord:worktypeid,
+                                manageSign:qrUrl,
+                                cultureLevel:cultureLevel,
+                                specialFlag:specialFlag,
+                                sex:sex,
+                                idCardFront:idcardimg
+                            })
+                            
+                        }
+                    })
+                }else{
+                    app.toast('实名制系统查无此人，请确认系统录入或人员进场')
+                    // setTimeout(()=>{
+                    //     wx.redirectTo({
+                    //         url: '../gengduogongneng/gengduogongneng'
+                    //     })
+                    // },2000)
+                    return;
+                }
+            }
+         })
+    },
+
+    bindInfo(){
+        let that = this
+        if(that.data.authentication == "1") {
+            if(that.data.phoneNumber.length <= 0 || (that.data.manageSign.length <= 0 && that.data.manageSign !='')){
+                app.toast("数据填写不完整");
+                return;
+            }
+        } else {
+            
+            if((that.data.manageSign.length <= 0 && that.data.manageSign !='') || that.data.cardId.length <=0){
+                app.toast("数据填写不完整");
+                return;
+            }
+        }
+      
+        
+        this.setData({
+            loadShow:true
+        })
+        //获取当前扫码用户的openId
+        let openId = wx.getStorageSync('openId')
+        wx.uploadFile({
+            //图片上传地址
+            url: app.globalData.reqUrl+'/weixin/security/fileUpload',
+            filePath: this.data.manageSign,
+            name: 'file',
+            header: {
+              "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+            },
+            formData: { user: 'test' },
+            success:resTemp => {
+                wx.request({
+                    url: app.globalData.szhUrl + "/business/saftEducationOpenIdMap/list",
+                    method:"post",
+                    data:{
+                    openId
+                    },
+                    header: {
+                        'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+                    },
+                    success(res){
+                        let dataFile = JSON.parse(resTemp.data);
+                        let data = res.data
+                        let {szhprojectId,phoneNumber,cardId,companyName,typeWordName,userName,companyId,typeWord,id,educationLevel,emergencyName,emergencyPhone,specialFlag,idCardFront,sex} = that.data
+                        phoneNumber = !phoneNumber ?'':phoneNumber
+                        //判断用户是否变绑定劳务公司
+                        if(data.code == '0' && data.rows.length > 0){
+                            wx.request({
+                                url: app.globalData.szhUrl + '/business/saftEducationOpenIdMap/edit',
+                                method:"post",
+                                data:{
+                                    id,
+                                    projectId:szhprojectId,
+                                    openId,
+                                    phoneNumber,
+                                    cardId,
+                                    companyName,
+                                    typeWordName,
+                                    userName,
+                                    companyId,
+                                    typeWord,
+                                    signUrl:dataFile.url,
+                                    educationLevel,
+                                    emergencyName,
+                                    emergencyPhone,
+                                    specialFlag,
+                                    idCardFront,
+                                    sex
+                                },
+                                success(res){
+                                    that.setData({
+                                        loadShow:false
+                                    })
+                                    var firstWorkType = ''
+                                    if(res.data.code == '0'){
+                                        wx.navigateTo({
+                                            url: '../Personnel-information-binding/index'
+                                        })
+                                    }
+                                   
+                                }
+                              })    
+                        }else{
+                           wx.request({
+                             url: app.globalData.szhUrl + '/business/saftEducationOpenIdMap/add',
+                             method:"post",
+                             data:{
+                                projectId:szhprojectId,
+                                openId,
+                                phoneNumber ,
+                                cardId,
+                                companyName,
+                                typeWordName,
+                                userName,
+                                companyId,
+                                typeWord,
+                                signUrl:dataFile.url,
+                                educationLevel,
+                                emergencyName,
+                                emergencyPhone,
+                                specialFlag,
+                                idCardFront,
+                                sex
+                            },
+                            header: {
+                                'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+                            },
+                            success(res){
+                                that.setData({
+                                    loadShow:false
+                                })
+                                if(res.data.code == '0'){
+                                    wx.navigateTo({
+                                        url: '../Personnel-information-binding/index'
+                                      })
+                                }
+                            }
+                           })     
+                        }
+                    }
+                })
+            }
+        })
+      
+    },
+    resest(){
+        this.setData({
+            phoneNumber:"",
+            cardId:"",
+            companyName:"",
+            typeWordName:"",
+            userName:"",
+            companyId:"",
+            typeWord:"",
+            manageSign:"",
+            educationLevel:'1',
+            emergencyName:'',
+            emergencyPhone:''
+        })
+        this.getEducatuinLevelList()
+
+    },
+    /**
+     * 获取人员文化程度
+     */
+    getEducatuinLevelList() {
+        var that = this
+        wx.request({
+            url: app.globalData.szhUrl + '/system/dict/data/listData',
+            method:"post",
+            data:{
+                dictType:"education_level"
+            },
+           header: {
+               'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+           },
+           success(res){
+                var list = []
+                if(res.data.code == 0) {
+                    if(res.data.rows.length > 0) {
+                        var data = res.data.rows;
+                        data.forEach(item => {
+                            var obj = {}
+                            obj.id = item.dictValue
+                            obj.text = item.dictLabel
+                            list.push(obj)
+                        });
+                        that.setData({
+                            educationLevelList:list
+                        })
+                    } else {
+                        that.setData({
+                            educationLevelList:[]
+                        })
+                    }
+
+                } else {
+                    that.setData({
+                        educationLevelList:[]
+                    })
+                }
+                console.log(that.data.educationLevelList)
+           }
+          })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let {szhprojectId,smzProjectId} = options
+        this.setData({
+          szhprojectId,
+          smzProjectId
+        })
+        this.getEducatuinLevelList()
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+    
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    goGCLB(){
+        wx.redirectTo({
+            url: '../gengduogongneng/gengduogongneng'
+        })
+    },
+      /**
+   * 签名
+   * @param {} e 
+   */
+    sign(e){
+        let tempFilePath = e.detail
+        this.data.manageSign = tempFilePath
+    },
+    changePage(e){
+        if(e.detail){
+        this.setData({
+            overflow:'aotu'
+        })
+        }else{
+        this.setData({
+            overflow:'hidden'
+        })
+        }
+    },
+})
\ No newline at end of file
diff --git a/miniprogram/pages/saft-education-user-bind/index.json b/miniprogram/pages/saft-education-user-bind/index.json
new file mode 100644
index 0000000..90ddadf
--- /dev/null
+++ b/miniprogram/pages/saft-education-user-bind/index.json
@@ -0,0 +1,8 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index" ,
+        "mkl-sign":"../components/sign/sign",
+        "voucher-select ":"../components/voucher-select"
+    },
+    "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/saft-education-user-bind/index.wxml b/miniprogram/pages/saft-education-user-bind/index.wxml
new file mode 100644
index 0000000..4cb0d91
--- /dev/null
+++ b/miniprogram/pages/saft-education-user-bind/index.wxml
@@ -0,0 +1,88 @@
+<!--pages/voucherManagementAddto/index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+
+      <van-col span="15">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <span class="header_name">劳务人员信息绑定</span>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+
+<view class="max_content">
+  <view class="add_max">
+    <view class="add_title">
+      <p style="color: red;">*</p>验证方式
+    </view>
+    <voucher-select columns="{{authenticationList}}"  placeholder="请选择" bindchange="onSelectAuthentication" ></voucher-select>
+  </view>
+
+  <view class="add_max" wx:if="{{authentication == '1'}}">
+    <view class="add_title">
+      <p style="color: red;">*</p>手机号
+    </view>
+    <input bindblur="inputPhoneNumber" class="celect_frame_min voucher_select_max" value="{{phoneNumber}}" placeholder="请输入手机号码" placeholder-style="color:#6777aa;" />
+  </view>
+  
+
+  <view class="add_max" wx:if="{{authentication == '2'}}">
+    <view class="add_title"> <p style="color: red;">*</p>身份证</view>
+    <input bindblur="inputCardId" class="celect_frame_min voucher_select_max" placeholder="请输入身份证" placeholder-style="color:#6777aa;" value="{{cardId}}" />
+  </view>
+
+
+  <view class="add_max">
+    <view class="add_title">归属劳务队伍</view>
+    <input class="celect_frame_min voucher_select_max" placeholder="请输入归属劳务队伍" placeholder-style="color:#6777aa;" value="{{companyName}}" disabled />
+  </view>
+
+  <view class="add_max">
+    <view class="add_title">姓名</view>
+    <input class="celect_frame_min voucher_select_max" placeholder="请输入姓名" placeholder-style="color:#6777aa;" value="{{userName}}" disabled />
+  </view>
+
+  <view class="add_max">
+    <view class="add_title">文化程度</view>
+    <voucher-select columns="{{educationLevelList}}"  placeholder="请选择" bindchange="onSelectEducationLevel" value="{{cultureLevel}}"></voucher-select>
+  </view>
+
+
+  <view class="add_max">
+    <view class="add_title">紧急联系人</view>
+    <input class="celect_frame_min voucher_select_max" placeholder-style="color:#6777aa;" bindchange="onEmergencyName" value="{{emergencyName}}" placeholder="请填写紧急联系人" />
+  </view>
+
+  <view class="add_max">
+    <view class="add_title">紧急联系人电话</view>
+    <input class="celect_frame_min voucher_select_max" value="{{emergencyPhone}}" bindchange="onEmergencyPhone" placeholder-style="color:#6777aa;" placeholder="请填写紧急联系人电话" />
+  </view>
+
+
+  <view class="add_max">
+    <view class="add_title">
+      <p style="color: red;">*</p>电子签名
+    </view>
+    <mkl-sign  bind:returnData="sign" bind:addto="changePage" canvas-id="canvas" image-url="{{manageSign}}"></mkl-sign>
+  </view>
+
+
+
+
+  <view class="add_btn">
+    <view class="add_btn_qx" bindtap="resest">重置</view>
+    <view class="add_btn_bc" bindtap="bindInfo">绑定</view>
+  </view>
+</view>
+
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>
\ No newline at end of file
diff --git a/miniprogram/pages/saft-education-user-bind/index.wxss b/miniprogram/pages/saft-education-user-bind/index.wxss
new file mode 100644
index 0000000..fbabc2d
--- /dev/null
+++ b/miniprogram/pages/saft-education-user-bind/index.wxss
@@ -0,0 +1,31 @@
+/* pages/voucherManagementAddto/index.wxss */
+.van-picker__mask  {
+    background-image: none !important;
+  }
+  .van-hairline--top-bottom:after {
+    border-top: 1px solid #3a4c8b !important;
+    border-bottom: 1px solid #3a4c8b !important;
+  }
+
+  .voucher_select_max{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 90rpx;
+    border-radius: 10rpx;
+}
+
+
+.voucher_select_max_sign{
+    padding:0 25rpx;
+    display: flex;
+    align-items: center;
+    background: #212737;
+    height: 180rpx;
+    border-radius: 10rpx;
+}
+  
+  .van-picker {
+    background: none !important;
+  }
\ No newline at end of file
diff --git a/miniprogram/pages/saft-qr-view/index.js b/miniprogram/pages/saft-qr-view/index.js
new file mode 100644
index 0000000..151caa2
--- /dev/null
+++ b/miniprogram/pages/saft-qr-view/index.js
@@ -0,0 +1,178 @@
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+       
+          
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        app.getOPenId()
+        const {q} = options;
+        wx.setStorageSync('options', options)
+        if (q) {
+            let urlStr = decodeURIComponent(q);
+            let subStrUrl = urlStr.substr(urlStr.indexOf("?"),urlStr.length-1)    
+            let params = this.getRequest(subStrUrl)
+            this.checkUserApprovalSkipView(params)
+        }else{
+
+            this.checkUserApprovalSkipView(options)
+        }
+    },
+
+    /**
+      * 获取请求地址信息
+      */
+    getRequest(url) {
+       
+        var theRequest = new Object();
+        var strs;
+        if (url.indexOf("?") != -1) {
+            let str = url.substr(1);
+            strs = str.split("&");
+            for (let i = 0; i < strs.length; i++) {
+                theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+            }
+        }
+        return theRequest;
+    },
+
+    /**
+     * 判断扫码用户是否有权限
+     */
+    checkUserApprovalSkipView(params){
+        //获取当前扫码用户的openId
+        let openId = wx.getStorageSync('openId') != null || wx.getStorageSync('openId') ?wx.getStorageSync('openId'):"123"
+        wx.request({
+          url: app.globalData.szhUrl + "/business/saftEducationOpenIdMap/list",
+          method:"post",
+          data:{
+            openId
+          },
+          header: {
+            'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+          },
+          success(res){
+            let data = res.data 
+            if(data.code == '0' && data.rows.length > 0){
+                let result = data.rows
+                //获取用户在实名制用户信息
+                wx.request({
+                    url:  app.globalData.smzUrl+"/mkl/api/searchUserInfoList",
+                    method:"POST",
+                    data:{
+                        projectId: params.smzProjectId,
+                        isWork:1,
+                        idcardnum:(!result[0].cardId || result[0].cardId == 'null')?'':result[0].cardId,
+                        userphone:(!result[0].phoneNumber  || result[0].phoneNumber == 'null')? '':result[0].phoneNumber
+                    },
+                    header: {
+                        'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+                    },
+                    success(res){
+
+                        //获取二维码内容
+                        let companyId = params.companyId.split(",")
+                        let userInfo =  res.data.data
+                        if(!userInfo){
+                            app.toast("实名制系统查无此人，请确认系统录入或人员进场")
+                            setTimeout(()=>{
+                                wx.redirectTo({
+                                    url: '../gengduogongneng/gengduogongneng'
+                                })
+                            },2000)
+                            return;
+                        }    
+                        if(userInfo.length > 0){
+                            let companyIds = userInfo[0].uninName
+                            if(companyId.indexOf(companyIds) >= 0){
+                                //当前扫码用户绑定openId和对应劳务公司，跳转学习页面
+                                wx.navigateTo({
+                                  url: `../winter-training/index?szhprojectId=${params.projectId}&smzprojectId=${params.smzProjectId}&cultivateType=${params.cultivateTypeId}&mainId=${params.id}&userName=${result[0].userName}&typeWordName=${result[0].typeWordName}&companyName=${result[0].companyName}&signUrl=${result[0].signUrl}&cardId=${result[0].cardId}`,
+                                })
+                            }else{
+                                //当前扫码用户绑定公司和对应参与公司不符
+                                app.toast("无权限学习,用户在实名制绑定协作队伍不符")
+                                setTimeout(()=>{
+                                    // wx.exitMiniProgram({success: (res) => {}})
+                                    wx.redirectTo({
+                                        url: '../gengduogongneng/gengduogongneng'
+                                    })
+                                },2000)
+                            }    
+                        }
+                }
+                })      
+            }else{
+                //当前扫码用户没有绑定openId,跳转二维码绑定页面
+                wx.navigateTo({
+                  url: `../learn-page/index?szhprojectId=${params.projectId}&smzProjectId=${params.smzProjectId}`,
+                })
+            }
+          },
+          fail(res) {
+              console.log(res)
+          }
+        })
+    },
+
+
+
+
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/saft-qr-view/index.json b/miniprogram/pages/saft-qr-view/index.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/miniprogram/pages/saft-qr-view/index.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/saft-qr-view/index.wxml b/miniprogram/pages/saft-qr-view/index.wxml
new file mode 100644
index 0000000..a02adc5
--- /dev/null
+++ b/miniprogram/pages/saft-qr-view/index.wxml
@@ -0,0 +1,2 @@
+<!--pages/saftQrView/index.wxml-->
+<text></text>
diff --git a/miniprogram/pages/saft-qr-view/index.wxss b/miniprogram/pages/saft-qr-view/index.wxss
new file mode 100644
index 0000000..52bde7b
--- /dev/null
+++ b/miniprogram/pages/saft-qr-view/index.wxss
@@ -0,0 +1 @@
+/* pages/saft-qr-view/index.wxss */
\ No newline at end of file
diff --git a/miniprogram/pages/shebeiguanli-map/jixiedingwei.js b/miniprogram/pages/shebeiguanli-map/jixiedingwei.js
new file mode 100644
index 0000000..f6753ad
--- /dev/null
+++ b/miniprogram/pages/shebeiguanli-map/jixiedingwei.js
@@ -0,0 +1,670 @@
+// pages/new-map/map.js
+import * as echarts from '../../ec-canvas/echarts';
+const app = getApp();
+
+//加载最近一周运行时长
+function initChart_1(chart_1, datas_1, datas_2) {
+  var option_1={
+    grid: {
+        top: "20%",
+        bottom: "18%",
+        left:"0%",
+        right:"0%"
+    },
+    tooltip: {
+        trigger: "axis",
+        axisPointer: {
+            type: "shadow",
+            label: {
+                show: true
+            }
+        }
+    },
+    xAxis: {
+        data: datas_2,
+        axisLine: {
+            show: false //隐藏X轴轴线
+        },
+        axisTick: {
+            show: false //隐藏X轴刻度
+        },
+        axisLabel: {
+            show: true,
+            textStyle: {
+                color: "#ebf8ac", //X轴文字颜色
+                fontSize:'10'
+            }
+        }
+    },
+    yAxis: [{
+        type: "value",
+        nameTextStyle: {
+            color: "#ebf8ac"
+        },
+        splitLine: {
+            show: false
+        },
+        axisTick: {
+            show: false
+        },
+        axisLine: {
+            show: false
+        },
+    },
+        {
+            type: "value",
+            nameTextStyle: {
+                color: "#ebf8ac"
+            },
+            splitLine: {
+                show: false
+            },
+            axisTick: {
+                show: false
+            },
+            axisLine: {
+                show: false
+            },
+            axisLabel: {
+                show: true,
+
+            }
+        },
+
+    ],
+    series: [{
+        type: "line",
+        yAxisIndex: 1, //使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用
+        smooth: true, //平滑曲线显示
+        showAllSymbol: true, //显示所有图形。
+        symbol: "circle", //标记的图形为实心圆
+        symbolSize:7, //标记的大小
+        itemStyle: {
+            //折线拐点标志的样式
+            color: "#fd9820"
+        },
+        lineStyle: {
+            color: "#fd9820"
+        },
+        areaStyle:{
+            color: "rgba(5,140,255, 0.2)"
+        },
+        label: {
+            show: true,
+            position: 'top',
+            textStyle: {
+                color: '#ffffff',
+                fontSize:'10'
+            }
+        },
+        data: datas_1
+    },
+        {
+
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+                normal: {
+                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                        offset: 0,
+                        color: "#51d7ff"
+                    },
+                        {
+                            offset: 1,
+                            color: "#3637a3"
+                        }
+                    ])
+                }
+            },
+            data:datas_1
+        }
+    ]
+};
+  chart_1.setOption(option_1);
+  return chart_1;
+}
+
+//一周油耗
+function initChart_2(chart_2, datas_1, datas_2) {
+  var option_2={
+    grid: {
+        top: "20%",
+        bottom: "18%",
+        left:"0%",
+        right:"0%"
+    },
+    tooltip: {
+        trigger: "axis",
+        axisPointer: {
+            type: "shadow",
+            label: {
+                show: true
+            }
+        }
+    },
+    xAxis: {
+        data:datas_2,
+        axisLine: {
+            show: false //隐藏X轴轴线
+        },
+        axisTick: {
+            show: false //隐藏X轴刻度
+        },
+        axisLabel: {
+            show: true,
+            textStyle: {
+                color: "#ebf8ac", //X轴文字颜色
+                fontSize:'10'
+            }
+        }
+    },
+    yAxis: [{
+        type: "value",
+        nameTextStyle: {
+            color: "#ebf8ac"
+        },
+        splitLine: {
+            show: false
+        },
+        axisTick: {
+            show: false
+        },
+        axisLine: {
+            show: false
+        },
+    },
+        {
+            type: "value",
+            nameTextStyle: {
+                color: "#ebf8ac"
+            },
+            splitLine: {
+                show: false
+            },
+            axisTick: {
+                show: false
+            },
+            axisLine: {
+                show: false
+            },
+            axisLabel: {
+                show: true,
+
+            }
+        },
+
+    ],
+    series: [{
+        type: "line",
+        yAxisIndex: 1, //使用的 y 轴的 index，在单个图表实例中存在多个 y轴的时候有用
+        smooth: true, //平滑曲线显示
+        showAllSymbol: true, //显示所有图形。
+        symbol: "circle", //标记的图形为实心圆
+        symbolSize:7, //标记的大小
+        itemStyle: {
+            //折线拐点标志的样式
+            color: "#fd9820"
+        },
+        lineStyle: {
+            color: "#fd9820"
+        },
+        areaStyle:{
+            color: "rgba(5,140,255, 0.2)"
+        },
+        label: {
+            show: true,
+            position: 'top',
+            textStyle: {
+                color: '#ffffff',
+                fontSize:'10'
+            }
+        },
+        data: datas_1
+    },
+        {
+
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+                normal: {
+                    color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                        offset: 0,
+                        color: "#51d7ff"
+                    },
+                        {
+                            offset: 1,
+                            color: "#3637a3"
+                        }
+                    ])
+                }
+            },
+            data:datas_1
+        }
+    ]
+};
+  chart_2.setOption(option_2);
+  return chart_2;
+}
+
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    ec_1: {
+      lazyLoad: true //动态加载
+    },
+    ec_2: {
+      lazyLoad: true //动态加载
+    },
+    option1: [],
+    value1: '',
+    currentId: '',   //传值与list id 相同
+    showPopup: false,
+    show:false,
+    bottom: "500rpx",
+    showUp: false,
+    list:[ {
+      id:1,
+      machine_key:"",
+      name:"挖掘机12312",
+      model:"z51110",
+      state:"运行",
+      class:"machinery_state_yx",
+      battery:"50",
+      workingHours:"8小时55分钟",
+      oilCapacity:"358L",
+      proportion:"80%",  
+      projectName: "西安地铁8号西安大白杨站智慧工地111", 
+    }],
+    lists:[],
+    height:"",
+    longitude:'',
+    latitude:'',
+    markers: [],
+    index:'',
+    machineryTotalList:[],
+    projectId:'',
+    projectName:'',
+    machineKey:"",
+    //机械初始经纬度信息
+    machineLongitude:'',
+    machineLatitude:'',
+    machineMarkers:[],
+    //刷新字段
+    initialMachineKey:"",
+    timeLevenStatus:0,
+  },
+
+  //页面加载
+  onClickShow() {
+    this.setData({ show: true });
+  },
+  onClickHide() {
+    this.setData({ show: false });
+  },
+  upward() {
+    this.setData({ showUp: true });
+    this.setData({ bottom:  "500rpx" });
+    this.selectMachineryRun(this.data.projectId,this.data.initialMachineKey,this.data.machineryTotalList);
+  },
+  downward() {
+    this.setData({ showUp: false });
+    this.setData({ bottom:  "50rpx" });
+  },
+  showPopup() {
+    this.setData({ showPopup: true });
+  },
+  onClose() {
+    this.setData({ showPopup: false });
+    this.setData({ showType: false });
+  },
+  selectList(event){
+    this.onClickShow();
+    //加载数据
+    this.selectMachineryRun(this.data.projectId,event.currentTarget.dataset.machinekey,this.data.machineryTotalList);
+    let timeLevenStatus = this.data.timeLevenStatus;
+    if(timeLevenStatus == 0){
+      this.selectMachineryWeekTime(event.currentTarget.dataset.machinekey);
+    }else{
+      this.selectMachineryWeekTankLeven(event.currentTarget.dataset.machinekey);
+    }
+    this.setData({ 
+      showPopup: false,
+      index:event.currentTarget.dataset.index,
+      showUp: true ,
+      currentId:event.currentTarget.dataset.machinekey
+     });
+  },
+  optionChange(event){
+    this.onClickShow();
+    var category = "";
+    var option1 = this.data.option1;
+    for(var i = 0;i<option1.length;i++){
+      if(option1[i].value == event.detail){
+        category = option1[i].text
+      }
+    }
+    this.selectMachineryList(this.data.projectId,category);
+  },
+
+  //页面初始化
+  onLoad: function (option) {
+    this.onClickShow();
+    var that = this
+    //调用wx.getSystemInfo接口，然后动态绑定组件高度
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          height: res.windowHeight
+        })
+      }
+    }),
+    //获取缓存中数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          userInfo:res.data,
+          index:option.index,
+          projectId:app.globalData.projectId,
+          projectName:app.globalData.projectName,
+          initialMachineKey:option.machineKey,
+          currentId:option.machineKey
+        })
+      }
+    })
+    this.oneComponent = this.selectComponent('#mychart-one');
+    this.twoComponent = this.selectComponent('#mychart-two');
+    if(option.skipState =="1"){
+      this.setData({ showUp: true })
+      //页面初始化加载单个机械设备信息
+      this.selectMachineryRun(app.globalData.projectId,option.machineKey,JSON.parse(option.machineryTotalList));
+    }else{
+      this.setData({ showPopup:true })
+    }   
+    
+    //记载最近一周机械运行数据
+    this.selectMachineryWeekTime(option.machineKey);
+    //查询出机械列表
+    this.selectMachineryList(app.globalData.projectId,option.type,option.skipState);
+    //查询出机械类型
+    this.selectMachineCategory(app.globalData.projectId);
+
+}, 
+
+  //加载运行轨迹数据
+  init_one: function (datas_1,datas_2) {
+    this.oneComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_1(chart,datas_1,datas_2);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //加载油耗数据
+  init_two: function (datas_1,datas_2) {
+    this.twoComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_2(chart,datas_1,datas_2);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //查询出单个机械设备的基础数据
+  selectMachineryRun:function(event,event1,event2){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineryRun',
+      data:{
+        "projectId":event,
+        "machineKey":event1
+      },
+      method:"GET",
+      success:function(res){
+        if(res.data.partMachineryList.length >0){
+          var markers = [];
+          for(var i=0;i<event2.length;i++){              
+              if(event2[i].machine_key ==event1){
+                var marker = {id:event2[i],longitude:res.data.partMachineryList[0].longitude,latitude:res.data.partMachineryList[0].latitude,machineKey:res.data.partMachineryList[0].machine_key,iconPath:"http://fileimg.makalu.cc/10127f663a454adea855fc852e715dd5.png",width: 40, height: 40};
+                markers.push(marker);  
+              }else{
+                var marker = {id:event2[i],longitude:event2[i].longitude,latitude:event2[i].latitude,machineKey:event2[i].machine_key
+                }
+                markers.push(marker);  
+              }
+          }
+          that.setData({
+            list:res.data.partMachineryList,
+            markers:markers,
+            longitude:res.data.partMachineryList[0].longitude,
+            latitude:res.data.partMachineryList[0].latitude,
+            machineLongitude:res.data.partMachineryList[0].longitude,
+            machineLatitude:res.data.partMachineryList[0].latitude,
+            machineMarkers:markers,
+          })
+        }
+        that.onClickHide();
+      }
+    })
+  },
+
+  //查询出机械列表
+  selectMachineryList:function(event,category,skipState){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineryRun',
+      data:{
+        "projectId":event,
+        "category":(category=="全部")?"":category,
+      },
+      method:"GET",
+      success:function(res){
+        var event2  = res.data.totalMachineryList;
+        if(event2.length>0){
+          var markers = [];         
+          for(var i=0;i<event2.length;i++){                    
+              var marker = {id:event2[i],longitude:event2[i].longitude,latitude:event2[i].latitude,machineKey:event2[i].machine_key }          
+              markers.push(marker);               
+          }
+          if(skipState == "1"){
+            that.setData({
+              lists:event2,
+              machineryTotalList:event2,
+            })
+          }else{
+            that.setData({
+              lists:event2,
+              markers:markers,
+              longitude:event2[0].longitude,
+              latitude:event2[0].latitude,
+              machineryTotalList:event2,
+            })
+          }         
+        }else{
+          that.setData({
+            lists:[],
+            markers:[],
+            longitude:'',
+            latitude:'',
+          })
+        }
+        that.onClickHide();
+      }
+    })
+  },
+
+   //查询出机械类型
+   selectMachineCategory:function(event){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineCategory',
+      data:{
+        "projectId":event,
+        "type":"map"
+      },
+      method:"GET",
+      success:function(res){
+        that.onClickHide();
+        that.setData({
+          option1:res.data
+        })   
+      }
+    })
+  },
+
+  //查询出最近一周运行数据
+  selectMachineryWeekTime:function(event){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineryWeekTime',
+      data:{
+        "machineKey":event
+      },
+      method:"GET",
+      success:function(res){
+        that.onClickHide();
+        that.init_one(res.data.valueList,res.data.timeList);
+      }
+    })
+  },
+
+  //查询出最近一周油耗
+  selectMachineryWeekTankLeven:function(event){
+      var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineryWeekTankLeven',
+        data:{
+          "machineKey":event
+        },
+        method:"GET",
+        success:function(res){
+          that.onClickHide();
+          that.init_two(res.data.valueList,res.data.timeList);
+        }
+      })
+  },
+
+  ///向左切换
+  changeLeftData:function(event){
+    this.onClickShow();
+    var machineryTotalList = this.data.machineryTotalList;
+    var projectId = this.data.projectId;
+    if(this.data.index == "0"){
+      app.toast("已经到头了，无法进行点击");
+      this.onClickHide();
+    }else{
+      this.selectMachineryRun(projectId,machineryTotalList[this.data.index-1].machine_key,machineryTotalList);
+      let timeLevenStatus = this.data.timeLevenStatus;
+      if(timeLevenStatus == 0){
+        this.selectMachineryWeekTime(machineryTotalList[this.data.index-1].machine_key);
+      }else{
+        this.selectMachineryWeekTankLeven(machineryTotalList[this.data.index-1].machine_key);
+      }
+      this.setData({
+        machineKey:machineryTotalList[this.data.index-1].machine_key,
+        index:this.data.index-1,
+        currentId:machineryTotalList[this.data.index-1].machine_key,
+      })
+    }
+  },
+
+  //向右切换
+  changeRightData:function(event){
+    this.onClickShow();
+    var machineryTotalList = this.data.machineryTotalList;
+    var projectId = this.data.projectId;
+    if(this.data.index == (machineryTotalList.length-1)){
+      app.toast("已经到头了，无法进行点击");
+      this.onClickHide();
+    }else{
+      this.selectMachineryRun(projectId,machineryTotalList[(this.data.index-1+2)].machine_key,machineryTotalList);
+      let timeLevenStatus = this.data.timeLevenStatus;
+      if(timeLevenStatus == 0){
+        this.selectMachineryWeekTime(machineryTotalList[(this.data.index-1+2)].machine_key);
+      }else{
+        this.selectMachineryWeekTankLeven(machineryTotalList[(this.data.index-1+2)].machine_key);
+      }
+      this.setData({
+        machineKey:machineryTotalList[(this.data.index-1+2)].machine_key,
+        index:this.data.index-1+2,
+        currentId:machineryTotalList[(this.data.index-1+2)].machine_key,
+      })
+    }
+  },
+
+  //点击定位点切换机械
+  getListByMachineKey:function(event){
+    this.onClickShow();
+    this.selectMachineryRun(this.data.projectId,event.markerId.machine_key,this.data.machineryTotalList);
+    let timeLevenStatus = this.data.timeLevenStatus;
+    if(timeLevenStatus == 0){
+      this.selectMachineryWeekTime(event.markerId.machine_key);
+    }else{
+      this.selectMachineryWeekTankLeven(event.markerId.machine_key);
+    }
+    var markers = this.data.markers;
+    var index = "";
+    for(var i = 0;i<markers.length;i++){
+      if(markers[i].machineKey == event.markerId.machine_key){
+        index = i;
+      }
+    }
+    this.setData({
+      index:index,
+      showUp: true,
+      currentId:event.markerId.machine_key
+    })
+  },
+
+
+  //获取机械定位
+  machineLocation:function(event){
+    this.setData({
+      longitude:this.data.machineLongitude,
+      latitude:this.data.machineLatitude,
+      markers:this.data.machineMarkers
+    })
+  },
+
+  //获取个人定位
+  personalLocation:function(even){
+    this.setData({
+      longitude:app.globalData.initialLon,
+      latitude:app.globalData.initialLat,
+      markers:app.globalData.markers,
+    })
+  },
+
+  //切换最近一周工作时长和油耗
+  cutTimeLeven(event){
+    let machineKey = event.currentTarget.dataset.machinekey;
+    this.onClickShow();
+    if(event.detail.index == "0"){
+      this.selectMachineryWeekTime(machineKey);
+      this.setData({timeLevenStatus:0});
+    }else{
+      this.selectMachineryWeekTankLeven(machineKey);
+      this.setData({timeLevenStatus:1});
+    }
+  },
+
+  //返回设备管理首页
+  goRYGL:function(event){
+    wx.redirectTo({
+      url: '../shebieguanli-jxsb/shajiangguan'
+    })
+  },
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/shebeiguanli-map/jixiedingwei.json b/miniprogram/pages/shebeiguanli-map/jixiedingwei.json
new file mode 100644
index 0000000..e7580ce
--- /dev/null
+++ b/miniprogram/pages/shebeiguanli-map/jixiedingwei.json
@@ -0,0 +1,18 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-popup": "@vant/weapp/popup",
+    "van-picker": "@vant/weapp/picker",
+    "van-area": "@vant/weapp/area",
+    "van-tag": "@vant/weapp/tag",
+    "van-transition": "@vant/weapp/transition",
+    "van-dropdown-menu": "@vant/weapp/dropdown-menu",
+    "van-dropdown-item": "@vant/weapp/dropdown-item",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "van-overlay": "@vant/weapp/overlay/index"
+  },
+  "navigationStyle":"custom" 
+}
\ No newline at end of file
diff --git a/miniprogram/pages/shebeiguanli-map/jixiedingwei.wxml b/miniprogram/pages/shebeiguanli-map/jixiedingwei.wxml
new file mode 100644
index 0000000..e8aa6ba
--- /dev/null
+++ b/miniprogram/pages/shebeiguanli-map/jixiedingwei.wxml
@@ -0,0 +1,210 @@
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="4">
+        <view class="header_img" bindtap="goRYGL">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<view> 
+  <map class="map" 
+  id="map" scale="16" 
+  latitude="{{latitude}}" longitude="{{longitude}}"  
+  markers="{{markers}}" 
+  style="width: 100%; height: {{height}}px;"  
+  bindmarkertap="getListByMachineKey" 
+  bindcallouttap="controltap" 
+  subkey="A2GBZ-AGALG-MP2QK-IJGFW-MRU36-4SF4O"
+  bindtap="checkMap"></map> 
+</view>
+
+<view class="map_address">
+  <view class="map_add">
+    {{projectName}}
+  </view>
+</view>
+
+
+<view class="map_left" style="bottom:{{ bottom }}">
+  <view class="map_left_img">
+    <image src="/images/i_location.png"  bindtap="personalLocation"></image>
+  </view> 
+  <view class="map_left_img">
+    <image src="/images/i_mechanics.png" bindtap="machineLocation"></image>
+  </view>     
+</view>
+<view class="map_right" style="bottom:{{ bottom }}">
+  <view class="map_right_img">
+    <view class="map_right_zi" bindtap="upward">
+      <image src="/images/img_11.png"></image>
+      刷新
+    </view> 
+  </view> 
+  <view class="map_right_img">
+   <view class="map_right_zi"  is-link bindtap="showPopup" >
+    <image src="/images/img_12.png"></image>
+      列表
+    </view> 
+  </view>     
+</view>
+
+<van-transition name="fade-up"  show="{{ showUp }}">
+  <view class="sliding_up"  wx:for="{{list}}">
+    <view class="sliding_up_btn"> 
+      <view bindtap="downward">
+        <image src="/images/sliding_up.png"></image>
+      </view>
+    </view>
+    <view class="sliding_up_content">
+      <view class="sliding_up_top">
+
+        <view class="sliding_up_model">
+          {{item.machine_model}}
+        </view>
+        <view class="ranking_middle_quantity">
+          <view class="ranking_middle_img  {{item.battery_percent > 20 ? 'ranking_green' :'ranking_red' }}">
+            <view class="battery">
+              <view class="{{item.battery_percent > 20 ? 'green_battery' :'red_battery'}}" style="width:{{item.battery_percent}}%">
+                <!-- 电池 -->
+              </view>
+            </view>
+          </view>
+          <view class="ranking_middle_quantity_proportion  {{item.battery_percent > 20 ? 'number_green' :'number_red' }}">{{item.battery_percent}}%</view>
+        </view>
+      </view>
+
+      <view class="sliding_up_middle"> 
+        <van-row>
+          <van-col span="2">
+            <view class="sliding_up_middle_left" bindtap="changeLeftData">
+              <image src="/images/middle_left.png"></image>
+            </view>
+          </van-col>
+          <van-col span="4">
+            <view class="sliding_up_middle_head">
+              <image src="{{item.head_img}}"></image>
+            </view>
+          </van-col>
+          <van-col span="16">
+            <view class="sliding_up_middle_center">
+              <view class="ranking_middle_name"> 
+                {{item.category}} 
+              </view>
+              <van-row>
+                <van-col  span="12">
+                  <view class="working_hours"> 
+                    今日工时：<text>{{item.workTime}}</text>
+                  </view>
+                </van-col>
+                <van-col  span="12">
+                  <view class="working_hours"> 
+                    当前油量：<text>{{item.volume}}/{{item.percentage}}%</text>
+                  </view>
+                </van-col>
+              </van-row>
+              <view class="ranking_middle_company">
+                项目：<text>{{item.projectName}}</text>
+              </view>
+            </view>
+          </van-col>
+          <van-col span="2">
+            <view class="sliding_up_middle_right" bindtap="changeRightData">
+              <image src="/images/middl_right.png"></image>
+            </view>
+          </van-col>
+        </van-row>
+      </view>
+      <view class="sliding_up_bottom">
+        <view class="chart_max">
+          <van-tabs animated bind:click="cutTimeLeven" data-machineKey="{{item.machine_key}}">
+            <van-tab title="最近一周日运转时长(s)" >
+              <view class="chart_min">
+                <ec-canvas ec="{{ ec_1 }}" id="mychart-one"></ec-canvas>
+              </view>
+            </van-tab>
+            <van-tab title="最近一周油耗统计(L)">
+              <view class="chart_min">
+                <ec-canvas ec="{{ ec_2 }}" id="mychart-two"></ec-canvas>
+              </view>
+            </van-tab>
+          </van-tabs>
+
+        </view>
+      </view>
+    </view>
+  </view>
+</van-transition>
+
+
+<van-popup show="{{ showPopup }}" round position="bottom" custom-style="height: 930rpx"  bind:close="onClose">
+  <view class="lits_content">
+    <view class="hj_float_title">
+      <van-dropdown-menu>
+        <van-dropdown-item value="{{ value1 }}" options="{{ option1 }}" bind:change="optionChange"/>
+      </van-dropdown-menu>
+    </view> 
+    <view class="ranking_max">
+      <view class="machinery_list  {{currentId == item.machine_key ?'active':' '}}" wx:for="{{lists}}"  bindtap="selectList" data-index="{{index}}" data-machinekey="{{item.machine_key}}">
+        <van-row>
+          <van-col span="5">
+            <view class="machinery_img">
+              <image src="{{item.head_img}}"></image>
+            </view>
+          </van-col>
+          <van-col span="19">
+            <view class="machinery_name">{{item.category}}</view>
+            <view class="machinery_info">
+              <view class="machinery_model">{{item.machine_model}}</view>
+              <view class="ranking_middle_quantity_s">
+                <view class="ranking_middle_img  {{item.battery_percent > 20 ? 'ranking_green' :'ranking_red' }}">
+                  <view class="battery">
+                    <view class="{{item.battery_percent > 20 ? 'green_battery' :'red_battery'}}" style="width:{{item.battery_percent}}%">
+                      <!-- 电池 -->
+                    </view>
+                  </view>
+                </view>
+                <view class="ranking_middle_quantity_proportion  {{item.battery_percent > 20 ? 'number_green' :'number_red' }}">  {{item.battery_percent}}%</view>
+              </view>
+              <view class="machinery_state {{item.class}}">
+                <view>{{item.state}}</view>
+              </view>
+            </view>
+          </van-col>
+        </van-row>
+        <van-row>
+          <van-col  span="12">
+            <view class="working_hours_s"> 
+              今日工时：<text>{{item.workTime}}</text>
+            </view>
+          </van-col>
+          <van-col  span="12">
+            <view class="working_hours_s"> 
+              当前油量：<text>{{item.volume}}/{{item.percentage}}</text>
+            </view>
+          </van-col>
+        </van-row>
+        <view class="project_name"> 
+          项目：<text>{{item.projectName}}</text>
+        </view>
+      </view> 
+    </view>
+  </view>
+</van-popup>
+<van-overlay show="{{show}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/shebeiguanli-map/jixiedingwei.wxss b/miniprogram/pages/shebeiguanli-map/jixiedingwei.wxss
new file mode 100644
index 0000000..f7dd64c
--- /dev/null
+++ b/miniprogram/pages/shebeiguanli-map/jixiedingwei.wxss
@@ -0,0 +1,454 @@
+/* pages/new-map/map.wxss */
+.map_address{
+  width: 90%;
+  position: absolute;
+  top: 196rpx;
+  left: 5%;
+  color: #8aa3ec;
+  background: url("http://fileimg.makalu.cc/CORE_1F1F3A2778334D3EAC1226DDCEBD48D0.png") no-repeat left/40rpx;
+}
+.map_add{
+  padding-left: 50rpx;
+  font-size: 28rpx;
+}
+.map_left{
+  position: absolute;
+  left: 30rpx;
+}
+.map_right{
+  position: absolute;
+  right: 30rpx;
+}
+.map_left_img{
+  background: #333343;
+  border-radius: 50%;
+  height: 70rpx;
+  width: 70rpx;
+  margin-bottom: 30rpx;
+}
+.map_left_img image{
+  width: 70rpx;
+  height: 70rpx;
+}
+.map_left_img:active{
+  background: #252530;
+}
+.map_right_img{
+  margin-bottom: 30rpx;
+}
+.map_right_zi{
+  height: 70rpx;
+  background: #333343;
+  width: 150rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 70rpx;
+  font-size: 28rpx;
+}
+.map_right_zi image{
+  width: 40rpx;
+  height:40rpx;
+  position: relative;
+  top: 10rpx;
+}
+.map_right_zi:active{
+  background: #252530;
+}
+/* 底部信息 */
+.sliding_up{
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 500rpx;
+}
+.sliding_up_btn view{
+  width:150rpx;
+  height: 40rpx;
+  background: rgba(42,52,91,0.8);
+  margin: auto;
+  border-radius: 50rpx 50rpx 0 0;
+  text-align: center;
+}
+.sliding_up_btn view image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.sliding_up_content{
+  background: rgba(42,52,91,0.8);
+  height:460rpx;
+}
+.sliding_up_top{
+  height:50rpx;
+}
+
+.sliding_up_middle{
+  border-top: 2px solid #2e3e69;
+  border-bottom: 2px solid #2e3e69;
+  height: 120rpx;
+}
+.sliding_up_middle_left{
+  padding-top: 25rpx;
+}
+.sliding_up_middle_left image{
+  width: 50rpx;
+  height: 70rpx;
+}
+.sliding_up_middle_right{
+  padding-top: 25rpx;
+  text-align: right;
+}
+.sliding_up_middle_right image{
+  width: 50rpx;
+  height: 70rpx;
+}
+.sliding_up_middle_head{
+  text-align: center;
+  padding-top: 10rpx;
+}
+.sliding_up_middle_head image{
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 10rpx;
+}
+.ranking_middle_name{
+  font-size: 28rpx;
+}
+.ranking_middle_name text{
+  color: #8aa3ec;
+  font-size: 2rpx;
+}
+.ranking_middle_company{
+  font-size: 20rpx;
+}
+.ranking_middle_company text{
+  color: #8aa3ec;
+}
+.ranking_middle_days{
+  color: #8aa3ec;
+  font-size: 24rpx;
+}
+.ranking_middle_days text{
+  color: #00baff;
+  font-size: 28rpx;
+}
+.ranking_middle_time{
+  float: right;
+  font-size: 30rpx;
+  color: #00baff;
+}
+.ranking_max{
+  height:800rpx;
+  overflow: auto;
+}
+.ranking_min{
+  padding:15rpx 20rpx;
+  border-radius: 5rpx;
+  background-color: #272f51;
+  margin-bottom: 20rpx;
+}
+.ranking_min.active{
+  border: 2px solid #4465a5;
+} 
+
+.ranking_left{
+  height: 150rpx;
+  line-height: 150rpx;
+  padding-left: 5rpx;
+}
+.ranking_left text{
+  padding: 0 15rpx;
+  background: #00a0e9;
+  font-size: 20rpx;
+  border-radius: 5rpx;
+  color: #191d28;
+  font-weight: bold;
+}
+
+
+.sliding_up_middle_center{
+  padding-top:10rpx;
+}
+.sliding_up_bottom{
+  padding: 10rpx 0;
+}
+.sliding_up_bottom_title{
+  text-align: center;
+  padding: 10rpx 0;
+  font-size: 28rpx;
+}
+.sliding_up_bottom_title text{
+  color: #00baff;
+  font-size: 30rpx;
+}
+.sliding_up_bottom_info{
+  padding: 10rpx 40rpx;
+  font-size: 24rpx;
+  color: #8aa3ec;
+}
+.sliding_up_bottom_info text{
+  color: #ffffff;
+}
+.sliding_up_bottom_address{
+  color: #8aa3ec;
+  font-size: 28rpx;
+  padding: 10rpx 40rpx;
+}
+.working_hours{
+  font-size: 20rpx;
+  padding:5rpx 0;
+}
+.working_hours text{
+  color: #fdce36;
+}
+.sliding_up_model{
+  float: left;
+  font-size: 24rpx;
+  line-height: 50rpx;
+  padding-left: 30rpx;
+}
+.hj_float_title{
+  text-align: center;
+  width: 200rpx;
+  margin: auto;
+}
+.machinery_list{
+  border: 2px solid #293859;
+  margin-top: 20rpx;
+  padding:20rpx;
+}
+.machinery_list.active{
+  border: 2px solid #4465a5;
+} 
+.machinery_img image{
+  width: 100rpx;
+  height:100rpx;
+  border-radius: 10rpx;
+}
+.machinery_name{
+  height: 60rpx;
+  font-size: 28rpx;
+}
+.machinery_info{
+  height: 40rpx;
+  font-size: 24rpx;
+}
+.machinery_model{
+  float: left;
+  height: 40rpx;
+  margin-right: 30rpx;
+}
+.machinery_state{
+  float: right;
+  font-size: 20rpx;
+  padding: 2rpx;
+  border-radius: 7rpx;
+}
+.machinery_state_yx{
+  border: 1px solid #1ab800;
+  color: #1ab800;
+}
+.machinery_state_yx view{
+  background: rgba(0,194,61,0.3);
+  padding:0 10rpx ;
+}
+.machinery_state_ds{
+  border: 1px solid #fdce36;
+  color: #fdce36;
+}
+.machinery_state_ds view{
+  background: rgba(253,206,54,0.3);
+  padding:0 10rpx ;
+}
+.machinery_state_jz{
+  border: 1px solid #b041ff;
+  color: #b041ff;
+}
+.machinery_state_jz view{
+  background: rgba(176,65,255,0.3);
+  padding:0 10rpx ;
+}
+.machinery_state_lx{
+  border: 1px solid #bbbbbb;
+  color: #bbbbbb;
+}
+.machinery_state_lx view{
+  background: rgba(187,187,187,0.3);
+  padding:0 10rpx ;
+}
+.project_name{
+  font-size: 24rpx;
+  padding-top: 10rpx;
+}
+.project_name text{
+  color: #88a4ed;
+}
+.personnel_orientation{
+  padding-top: 30rpx;
+  text-align: center;
+  color: #8aa3ec;
+}
+.personnel_orientation text{
+  color: #09c7fb;
+  font-size: 32rpx;
+}
+.ranking_middle_quantity_s{
+  float: left;
+  font-size: 26rpx;
+  padding-top: 5rpx;
+  margin-right: 10rpx;
+}
+.ranking_max {
+  height: 820rpx;
+  overflow: auto;
+}
+.working_hours_s{
+  font-size: 24rpx;
+  padding: 10rpx 0;
+}
+.working_hours_s text{
+  color: #fdce36;
+}
+.chart_max{
+  height: 250rpx;
+}
+.chart_min{
+  height: 210rpx;
+}
+
+/* 电池 */
+.ranking_middle_quantity{
+  float: right;
+  font-size: 26rpx;
+  width: 120rpx;
+  padding-top: 15rpx;
+  margin-right: 20rpx;
+}
+.ranking_middle_quantity_proportion{
+  float: right;
+  top: -6rpx;
+  position: relative;
+  margin-left: 10rpx;
+}
+.ranking_middle_img{
+  float: left;
+}
+.ranking_middle_img{
+  width: 50rpx;
+  height: 25rpx;
+}
+.ranking_green{
+  background: url("http://fileimg.makalu.cc/CORE_56270CFFB87746E1968AF87C8D704B26.png") no-repeat left/100% 100%;
+}
+.ranking_red{
+  background: url("http://fileimg.makalu.cc/CORE_3A01CFC1FDA540B6A29F8A9750A258B0.png") no-repeat left/100% 100%;
+}
+.battery{
+  
+  width:85%;
+  height: 22rpx;
+  border-radius: 5rpx;
+  padding: 2rpx;
+}
+.green_battery{
+  background: #1ab800;
+  height: 100%;
+}
+.red_battery{
+  background: #fe1e00;
+  width: 10%;
+  height: 100%;
+}
+.number_red{
+  color: #fe1e00; 
+}
+.number_green{
+  color: #1ab800;
+}
+
+/* 列表 */
+.lits_content{
+  padding:20rpx 30rpx 10rpx;
+}
+.list_screen{
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+  color: #8aa3ec;
+}
+.list_screen.active{
+  color: #ffffff;
+  font-weight: bold;
+}
+
+
+
+
+
+
+
+.van-tag--mark,.van-tag--mark:after {
+  border-radius: 15rpx 0 15rpx 0 !important;
+  position: relative;
+  top: -5rpx;
+}
+
+ .van-popup{
+   background: #232a44 !important;
+ } 
+.van-dropdown-menu.van-dropdown-menu--top-bottom{
+  height: 60rpx;
+  background: #2e355f;
+  border-radius: 80rpx;
+  margin-bottom: 10rpx;
+
+}
+.van-ellipsis{
+  height: auto !important;
+}
+.van-dropdown-menu__title {
+  color: #8ba3eb !important;
+}
+.van-popup--top{
+  width: 50%  !important;
+  margin-left: 25%;
+}
+.van-cell{
+  background: #2e355f !important;
+  color: #aaaaaa !important;
+}
+.van-cell:after{
+  border: none !important;
+}
+
+.van-hairline--top-bottom:after{
+  border: none !important;
+}
+.van-tabs__scroll--line{
+  height:50rpx !important;
+  background: none !important;
+}
+.van-tabs--line .van-tabs__wrap{
+  height: 50rpx !important;
+}
+.van-tab {
+  line-height: 50rpx !important;
+}
+.van-tabs__line{
+  background: #00e4ff !important;
+  height: 2px !important;
+}
+.van-ellipsis.van-tab{
+  border: none;
+}
+.van-ellipsis{
+  margin: auto;
+  height: 50rpx;
+  color: #00e4ff;
+  font-size: 24rpx;
+}
+
+
+
+
+
diff --git a/miniprogram/pages/shebieguanli-jxsb/shajiangguan.js b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.js
new file mode 100644
index 0000000..6c49fac
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.js
@@ -0,0 +1,224 @@
+// pages/new-shebeiguanli/shebeiguanli.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active:1,  
+    show:false,
+    leftShow:false,
+    showType: false,
+    type:"全部",
+    actionsType: [],
+    list:[],
+    machineCount:"0",
+    workingCount:"0",
+    idlingCount:"0",
+    offCount:"0",
+    outWatchingCount:"0",
+    machineryTotalCount:'0',
+    machineryTotalList:[],
+    //基础参数
+    projectId:'',
+    projectName:'' ,
+    loginName:'',
+    userName:'',
+
+    initData:{}
+  },
+
+   //项目切换 返回值
+   onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    this.onLoad();
+  },
+
+  showPopup() {
+    this.setData({ leftShow: true });
+  },
+  onLeftClose(){
+    this.setData({ leftShow: false });
+  },
+
+  onClose() {
+    this.setData({ showType: false });
+  },
+  onclickType(){
+    this.setData({ showType: true });
+  },
+  onSelectType(event) {
+    this.onClickShow();
+    this.setData({
+      type: event.detail.name,
+    });
+    this.selectMachineryRun(this.data.projectId,(event.detail.name == "全部")?'':event.detail.name);
+  },
+
+  //页面加载
+  onClickShow() {
+    this.setData({ show: true });
+  },
+
+  onClickHide() {
+    this.setData({ show: false });
+  },
+
+  // 底部导航
+  onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+      this.onClickShow();
+      var that = this;
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectId:app.globalData.projectId,
+            projectName:app.globalData.projectName,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+        }
+      })
+      //查询出机械设备基础信息
+      this.selectMachineryRun(app.globalData.projectId,'');
+      //查询出机械类型
+      this.selectMachineCategory(app.globalData.projectId);
+  },
+
+  //查询出机械设备的基础数据
+  selectMachineryRun:function(event,event1){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineryRun',
+      data:{
+        "projectId":event,
+        "category":event1
+      },
+      method:"GET",
+      success:function(res){
+        that.setData({
+          machineCount:res.data.count,
+          workingCount:res.data.working,
+          idlingCount:res.data.idling,
+          offCount:res.data.off,
+          outWatchingCount:res.data.outWatching,
+          list:res.data.partMachineryList,
+          machineryTotalCount:res.data.totalMachineryListCount,
+          machineryTotalList:res.data.totalMachineryList,
+        })
+        that.onClickHide();
+      }
+    })
+  },
+
+  //查询出机械类型
+  selectMachineCategory:function(event){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectMachineCategory',
+      data:{
+        "projectId":event,
+        "type":"shouye"
+      },
+      method:"GET",
+      success:function(res){
+        that.setData({
+          actionsType:res.data
+        })   
+      }
+    })
+  },
+
+  //点击单个机械跳转到地图页面
+  skipMap:function(event){
+    wx.redirectTo({
+      url: '../shebeiguanli-map/jixiedingwei?machineryTotalList='+JSON.stringify(this.data.machineryTotalList)+"&index="+event.currentTarget.dataset.index+"&machineKey="+event.currentTarget.dataset.machinekey+"&skipState=1"+"&type="+this.data.type
+    })
+  },
+
+  //查询所有设备信息
+  shipTotalMap:function(event){
+    wx.redirectTo({
+      url: '../shebeiguanli-map/jixiedingwei?machineryTotalList='+JSON.stringify(this.data.machineryTotalList)+"&skipState=2"+"&type="+this.data.type
+    })
+  },
+
+    //跳转到项目概况页面
+    XMGK:function(){
+      wx.redirectTo({
+        url: '../xiangmugaikuang/xiangmugaikuang'
+      })
+    },
+  
+    //跳转到人员管理
+    RYGL:function(){
+      wx.redirectTo({
+        url: '../renyuanguanli/renyuanguanli'
+      })
+    },
+   
+    //跳转到安全管控
+    XMSP:function(){
+      wx.redirectTo({
+        //url: '../deepExcavation/index'
+        url:'../newAddPage/safetyManagement/index'
+      }) 
+    },
+  
+    //跳转到更多更能
+    GDGN:function(event){
+      wx.redirectTo({
+        url: '../gengduogongneng/gengduogongneng',
+      })
+    },
+
+   //退出登录
+   TCDL:function(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+      url: '../login/login',
+    })
+  },
+
+  //跳转到特种设备
+  gotzsb:function(event){
+    wx.redirectTo({
+      url: '../shebieguanli-tzsb/taji'
+    })
+  },
+  
+ //返回到工程列表页面
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../gongchengliebiao/gongchengliebiao'
+    })
+  },
+
+  //返回到地图页面
+  GOMAP:function(){
+      wx.redirectTo({
+        url: '../map/map',
+      })
+  },  
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/shebieguanli-jxsb/shajiangguan.json b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.json
new file mode 100644
index 0000000..4f9373f
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.json
@@ -0,0 +1,15 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup",
+    "van-circle": "@vant/weapp/circle", 
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "van-overlay": "@vant/weapp/overlay/index"
+  },
+  "navigationStyle":"custom"
+} 
\ No newline at end of file
diff --git a/miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxml b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxml
new file mode 100644
index 0000000..c1c07bc
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxml
@@ -0,0 +1,241 @@
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">设备管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<!-- 左侧账号信息 -->
+<van-popup show="{{ leftShow }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onLeftClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+    <!-- <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view> -->
+  </view>
+</van-popup>
+
+
+<view class="max_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+  <!-- <view class="video_add">
+    <view class="video_address">
+      <view class="video_address_min" bindtap="GOMAP">
+        {{projectName}}
+      </view>
+    </view>
+  </view> -->
+
+ <view style="margin-top: 26rpx;">
+  <van-row >
+    <van-col span="12">
+      <view class="device_types active">
+        <text>机械设备</text>
+      </view>
+    </van-col>
+    <van-col span="12">
+      <view class="device_types" bindtap="gotzsb">
+        <text>特种设备</text>
+      </view>
+    </van-col>
+  </van-row>
+ </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">状态统计</view> 
+      <view class="status_statistics">
+        {{machineCount}}台
+      </view>
+      <van-row>
+        <van-col span="6">
+          <view class="number_sets number_color_1">{{workingCount}}</view>
+          <view class="name_sets number_color_1">运行</view>
+        </van-col>
+        <van-col span="6">
+          <view class="number_sets number_color_2">{{idlingCount}}</view>
+          <view class="name_sets number_color_2">怠速</view>
+        </van-col>
+        <van-col span="6">
+          <view class="number_sets number_color_3">{{offCount}}</view>
+          <view class="name_sets number_color_3">静止</view>
+        </van-col>
+        <van-col span="6">
+          <view class="number_sets number_color_4">{{outWatchingCount}}</view>
+          <view class="name_sets number_color_4">离线</view>
+        </van-col>
+      </van-row>
+    </view> 
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">
+        工时排名<text class="hj_float" bindtap="onclickType">{{type}} </text>
+        <van-action-sheet show="{{ showType }}" actions="{{ actionsType }}" bind:close="onClose" bind:select="onSelectType" />
+      </view> 
+      <view class="machinery_list" wx:for="{{list}}" bindtap="skipMap" data-machinekey="{{item.machine_key}}" data-index="{{index}}" wx:key  wx:if="{{index<3}}">
+        <van-row>
+          <van-col span="5">
+            <view class="machinery_img">
+              <image src="{{item.head_img}}"></image>
+            </view>
+          </van-col>
+          <van-col span="19">
+            <view class="machinery_name">{{item.category}}</view>
+            <view class="machinery_info">
+              <view class="machinery_model">{{item.machine_model}}</view>
+              <view class="ranking_middle_quantity">
+                <view class="ranking_middle_img  {{item.battery_percent > 20 ? 'ranking_green' :'ranking_red' }}">
+                  <view class="battery">
+                    <view class="{{item.battery_percent > 20 ? 'green_battery' :'red_battery'}}" style="width:{{item.battery_percent}}+'%'">
+                      <!-- 电池 -->
+                    </view>
+                  </view>
+                </view>
+                <view class="ranking_middle_quantity_proportion  {{item.battery_percent > 20 ? 'number_green' :'number_red' }}">  {{item.battery_percent}}%</view>
+              </view>
+              <view class="machinery_state {{item.class}}">
+                <view>{{item.state}}</view>
+              </view>
+            </view>
+          </van-col>
+        </van-row>
+        <van-row>
+          <van-col  span="12">
+            <view class="working_hours"> 
+              今日工时：<text>{{item.workTime}}</text>
+            </view>
+          </van-col>
+          <van-col  span="12">
+            <view class="working_hours"> 
+              当前油量：<text>{{item.volume}}/{{item.percentage}}%</text>
+            </view>
+          </van-col>
+        </van-row>
+        <view class="project_name"> 
+          项目：<text>{{item.projectName}}</text>
+        </view>
+      </view> 
+      <view class="personnel_orientation" bindtap="shipTotalMap">
+        机械定位：<text>{{machineryTotalCount}}</text> >>
+      </view>
+    </view>
+  </view>
+</view>
+<van-overlay show="{{show}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+ <!-- 底部导航 -->
+ <van-tabbar active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
+  <van-tabbar-item bindtap="XMGK" >
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    项目概况
+  </van-tabbar-item>
+
+  <van-tabbar-item>
+    <image
+      slot="icon"
+      src="/images/footer_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    设备管理
+    </van-tabbar-item>
+
+  <van-tabbar-item bindtap="RYGL">
+    <image
+      slot="icon"
+      src="/images/footer_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    人员管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="XMSP">
+    <image
+      slot="icon"
+      src="/images/footer_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    安全管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="GDGN">
+    <image
+      slot="icon"
+      src="/images/footer_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height:40rpx;"
+    />
+    更多功能
+  </van-tabbar-item>
+</van-tabbar>
diff --git a/miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxss b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxss
new file mode 100644
index 0000000..578d5bf
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxss
@@ -0,0 +1,261 @@
+/* pages/new-jinduguanli/jinduguanli.wxss */
+.echarts_max{
+  margin-top: 30rpx;
+  padding:0 30rpx;
+}
+.echarts_min{
+  background:#1e2336 ;
+  font-size: 28rpx;
+  padding: 30rpx;
+  border-radius: 15rpx;
+}
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.eharts_head{
+  text-align: center;
+  padding: 30rpx 0;
+}
+.eharts_head text{
+  color:#0ad7ec;
+  font-size:30rpx;
+}
+.eharts_con{
+  height: 350rpx;
+  width: auto;
+}
+.eharts_number{
+  font-size: 28rpx;
+  padding-bottom: 20rpx;
+}
+.eharts_number text{
+  color: #0ad7ec;
+  font-size: 40rpx;
+}
+.hj_float{
+  float: right;
+  padding: 5rpx 50rpx 5rpx 20rpx;
+  background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx;
+  border-radius: 40rpx;
+}
+
+
+
+.device_types{
+  text-align: center;
+  padding: 30rpx 0;
+  font-size: 28rpx;
+  color: #999999;
+}
+.device_types.active{
+  color: #89a4e9;
+}
+.device_types.active text{
+  border-bottom: 2px solid #89a4e9;
+}
+.status_statistics{
+  width: 160rpx;
+  height: 100rpx;
+  margin: 30rpx auto;
+  text-align: center;
+  line-height: 100rpx;
+  color: #0ad7ec;
+  font-size: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_49991230F56F409F9D6C801F84284B34.PNG") no-repeat center/100% 100%;
+}
+.number_sets{
+  text-align: center;
+  font-size: 50rpx;
+  padding: 30rpx 0 10rpx;
+}
+.name_sets{
+  text-align: center;
+}
+.number_color_1{
+  color: #00c23d;
+}
+.number_color_2{
+  color: #fccd35;
+}
+.number_color_3{
+  color: #b141ff;
+}
+.number_color_4{
+  color: #bbbbbb;
+}
+
+/* 机械管理 工时排名 */
+.machinery_list{
+  border: 2px solid #293859;
+  margin-top: 30rpx;
+  padding:20rpx;
+}
+.machinery_img image{
+  width: 100rpx;
+  height:100rpx;
+  border-radius: 10rpx;
+}
+.machinery_name{
+  height: 60rpx;
+  font-size: 28rpx;
+}
+.machinery_info{
+  height: 40rpx;
+  font-size: 24rpx;
+}
+.machinery_model{
+  float: left;
+  height: 40rpx;
+  margin-right: 30rpx;
+}
+.machinery_state{
+  float: right;
+  font-size: 20rpx;
+  padding: 2rpx;
+  border-radius: 7rpx;
+}
+.machinery_state_yx{
+  border: 1px solid #1ab800;
+  color: #1ab800;
+}
+.machinery_state_yx view{
+  background: rgba(0,194,61,0.3);
+  padding:0 10rpx ;
+}
+.machinery_state_ds{
+  border: 1px solid #fdce36;
+  color: #fdce36;
+}
+.machinery_state_ds view{
+  background: rgba(253,206,54,0.3);
+  padding:0 10rpx ;
+}
+.machinery_state_jz{
+  border: 1px solid #b041ff;
+  color: #b041ff;
+}
+.machinery_state_jz view{
+  background: rgba(176,65,255,0.3);
+  padding:0 10rpx ;
+}
+.machinery_state_lx{
+  border: 1px solid #bbbbbb;
+  color: #bbbbbb;
+}
+.machinery_state_lx view{
+  background: rgba(187,187,187,0.3);
+  padding:0 10rpx ;
+}
+.working_hours{
+  font-size: 24rpx;
+  padding: 10rpx 0;
+}
+.working_hours text{
+  color: #fdce36;
+}
+.project_name{
+  font-size: 24rpx;
+  padding-top: 10rpx;
+}
+.project_name text{
+  color: #88a4ed;
+}
+.personnel_orientation{
+  padding-top: 30rpx;
+  text-align: center;
+  color: #8aa3ec;
+}
+.personnel_orientation text{
+  color: #09c7fb;
+  font-size: 32rpx;
+}
+
+
+
+
+
+
+
+/* 电池 */
+.ranking_middle_quantity{
+  float: left;
+  font-size: 26rpx;
+  padding-top: 8rpx;
+  margin-right: 20rpx;
+}
+.ranking_middle_quantity_proportion{
+  float: right;
+  top: -6rpx;
+  position: relative;
+  margin-left: 5rpx;
+}
+.ranking_middle_img{
+  float: left;
+}
+.ranking_middle_img{
+  width: 50rpx;
+  height: 25rpx;
+}
+.ranking_green{
+  background: url("http://fileimg.makalu.cc/CORE_56270CFFB87746E1968AF87C8D704B26.png") no-repeat left/100% 100%;
+}
+.ranking_red{
+  background: url("http://fileimg.makalu.cc/CORE_3A01CFC1FDA540B6A29F8A9750A258B0.png") no-repeat left/100% 100%;
+}
+.battery{
+  width:85%;
+  height: 22rpx;
+  border-radius: 5rpx;
+  padding: 2rpx;
+}
+.green_battery{
+  background: #1ab800;
+  height: 100%;
+}
+.red_battery{
+  background: #fe1e00;
+  width: 10%;
+  height: 100%;
+}
+.number_red{
+  color: #fe1e00; 
+}
+.number_green{
+  color: #1ab800;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+.van-popup--bottom.van-popup--round{
+  border-radius: 0 !important
+}
+.van-popup{
+  background-color: var(--popup-background-color,#232a44) !important
+}
+.van-action-sheet__cancel,.van-action-sheet__item{
+  background-color: var(--popup-background-color,#232a44) !important;
+  color: #0ad7ec;
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/shebieguanli-tzsb/taji.js b/miniprogram/pages/shebieguanli-tzsb/taji.js
new file mode 100644
index 0000000..03b9b44
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-tzsb/taji.js
@@ -0,0 +1,249 @@
+// pages/shebieguanli-taji/taji.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active:1,  
+    leftShow:false,
+    show: false,
+    loadShow:false,
+    value:'',
+    actions: [],
+    //基础参数
+    projectId:'',
+    projectName:'' ,
+    loginName:'',
+    userName:'',
+    //塔基数据
+    deviceName:'',
+    deviceID:'',
+    chargePerson:'',
+    towerBasicData:{},
+    towerWarnData:{},
+
+    initData:{}
+  },
+
+   //项目切换 返回值
+   onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    
+    this.onLoad();
+  },
+
+
+  onClose() {
+    this.setData({ show: false });
+  },
+
+  onclick(){
+    this.setData({ show: true });
+  },
+  onSelect(event) {
+    this.onClickShow();
+    this.setData({
+      value: event.detail.name,
+      deviceName:event.detail.name,
+      deviceID:event.detail.deviceSn,
+      chargePerson:event.detail.chargePerson,
+    });
+    this.getTowerBasicData(event.detail.deviceID);
+    this.selectTowerCraneDetails(event.detail.deviceID);
+  },
+
+  showPopup() {
+    this.setData({ leftShow: true });
+  },
+  onLeftClose(){
+    this.setData({ leftShow: false });
+  },
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+  // 底部导航
+  onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    //this.onClickShow();
+    var that = this;
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectId:app.globalData.projectId,
+            projectName:app.globalData.projectName,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+        }
+      })
+      this.selectTowerCraneList(app.globalData.projectId);
+  },
+
+  //获取塔吊列表
+  selectTowerCraneList:function(event){
+      var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/machicnery/selectTowerCraneList',
+        data:{
+          "projectId":event
+        },
+        method:"GET",
+        success:function(res){
+          that.onClickHide();
+          if(res.data.code ==0 && res.data.data.length>0){     
+              let actions = [];
+              for(let i = 0;i<res.data.data.length;i++){
+                actions.push({"name":res.data.data[i].towerName,"deviceID":res.data.data[i].id,"deviceSn":res.data.data[i].deviceSn,"chargePerson":res.data.data[i].principalPhone1});
+              }
+              that.setData({
+                value:res.data.data[0].towerName,
+                deviceName:res.data.data[0].towerName,
+                deviceID:res.data.data[0].deviceSn,
+                chargePerson:res.data.data[0].principalPhone1,
+                actions:actions
+              })
+              that.getTowerBasicData(res.data.data[0].id);
+              that.selectTowerCraneDetails(res.data.data[0].id);
+          }else{
+            that.setData({
+              value:'',
+              deviceName:'',
+              deviceID:'',
+              chargePerson:'',
+              actions:[],
+              towerBasicData:{},
+              towerWarnData:{}
+            })
+          }     
+        }
+      })
+  },
+
+  /**
+   * 塔机基础信息
+   * @param {*} deviceId 
+   */
+  getTowerBasicData:function(deviceId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/getTowerBasicData',
+      data:{
+        "projectId":this.data.projectId,
+        "deviceId":deviceId
+      },
+      method:"GET",
+      success:function(res){
+        that.onClickHide();
+        that.setData({
+          towerBasicData:res.data
+        })
+      }
+    })
+  },
+
+  /**
+   * 塔吊预警阈值
+   * @param {*} deviceId 
+   */
+  selectTowerCraneDetails:function(deviceId){
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/machicnery/selectTowerCraneDetails',
+      data:{
+        "projectId":this.data.projectId,
+        "deviceId":deviceId
+      },
+      method:"GET",
+      success:function(res){
+        that.onClickHide();
+        if(res.data.code == 0){
+          that.setData({
+            towerWarnData:res.data.data
+          })
+        }
+      }
+    })
+  },
+
+  //跳转到项目概况页面
+  XMGK:function(){
+    wx.redirectTo({
+      url: '../xiangmugaikuang/xiangmugaikuang'
+    })
+  },
+
+  //跳转到人员管理
+  RYGL:function(){
+    wx.redirectTo({
+      url: '../renyuanguanli/renyuanguanli'
+    })
+  },
+ 
+  //跳转到安全管控
+  XMSP:function(){
+    wx.redirectTo({
+      //url: '../deepExcavation/index'
+      url:'../newAddPage/safetyManagement/index'
+    }) 
+  },
+
+  //跳转到更多更能
+  GDGN:function(event){
+    wx.redirectTo({
+      url: '../gengduogongneng/gengduogongneng',
+    })
+  },
+
+  //跳转到机械设备
+  gojxsb:function(event){
+    wx.redirectTo({
+      url: '../shebieguanli-jxsb/shajiangguan'
+    })
+  },
+
+  //退出登录
+  TCDL:function(){
+    wx.clearStorageSync();
+    wx.setStorageSync('isReload', "1")
+    wx.redirectTo({
+      url: '../login/login',
+    })
+  },
+
+  //返回到工程列表页面
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../gongchengliebiao/gongchengliebiao'
+    })
+  },
+
+  //返回到地图页面
+  GOMAP:function(){
+    wx.redirectTo({
+      url: '../map/map',
+    })
+  },  
+})
\ No newline at end of file
diff --git a/miniprogram/pages/shebieguanli-tzsb/taji.json b/miniprogram/pages/shebieguanli-tzsb/taji.json
new file mode 100644
index 0000000..46528f3
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-tzsb/taji.json
@@ -0,0 +1,15 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup",
+    "van-circle": "@vant/weapp/circle", 
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "van-overlay": "@vant/weapp/overlay/index"
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/shebieguanli-tzsb/taji.wxml b/miniprogram/pages/shebieguanli-tzsb/taji.wxml
new file mode 100644
index 0000000..997b9b2
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-tzsb/taji.wxml
@@ -0,0 +1,297 @@
+<view class="header_title">
+  <view class="">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">设备管理</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<!-- 左侧账号信息 -->
+<van-popup show="{{ leftShow }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onLeftClose" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="10">
+        <view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{userName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+
+    <!-- <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view> -->
+  </view>
+</van-popup>
+
+<view class="max_content">
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+    <!-- <view class="video_add">
+      <view class="video_address">
+        <view class="video_address_min" bindtap="GOMAP">
+          {{projectName}}
+        </view>
+      </view>
+    </view> -->
+
+  <van-row>
+    <van-col span="12">
+      <view class="device_types"  bindtap="gojxsb">
+        <text>机械设备</text>
+      </view>
+    </van-col>
+    <van-col span="12">
+      <view class="device_types active">
+        <text>特种设备</text>
+      </view>
+    </van-col>
+  </van-row>
+
+  <view class="equipment_list">
+    <view class="equipment_click" bindtap="onclick">
+      {{value}}
+    </view>
+  </view>
+  <van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" />
+
+
+  <view class="echarts_max">
+
+    <view class="echarts_min">
+      <view class="equipment_img">
+        <image src="http://fileimg.makalu.cc/b8a3c4b64a5f4c0ab412781c5ad1e11f.png"></image>
+      </view>
+      
+
+      <van-row>
+        <van-col span="12">
+          <view class="equipment_info_left">设备名称：</view>
+        </van-col>
+        <van-col span="12">
+          <view class="equipment_info_right">{{deviceName}}</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left">设备编号：</view>
+        </van-col>
+        <van-col span="12">
+          <view class="equipment_info_right">{{deviceID}}</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left">负责人：</view>
+        </van-col>
+        <van-col span="12">
+          <view class="equipment_info_right">{{chargePerson}}</view>
+        </van-col>
+      </van-row>
+    </view>
+  </view>
+   
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">塔吊基本信息汇总</view>  
+      <van-row>
+        <van-col span="12">
+          <view class="equipment_info_left active">安全吊重：</view>
+        </van-col>
+        <van-col span="12">
+          <view class="equipment_info_right active"><text>{{towerBasicData.overload}}</text> t</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left active">单臂长：</view>
+        </van-col>
+        <van-col span="12">
+          <view class="equipment_info_right active"><text>{{towerBasicData.foreArmLength}}</text> m</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left active">塔吊高：</view>
+        </van-col>
+        <van-col span="12">
+          <view class="equipment_info_right active"><text>{{towerBasicData.downHeight}}</text> m</view>
+        </van-col>
+      </van-row>
+    </view>
+  </view>
+  
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">具体检测情况</view>  
+      <view class="equipment_yuzhi">预警阈值</view>
+      <van-row>
+        <van-col span="12">
+          <view class="equipment_info_left active">幅度：</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_middle active"><text>{{towerBasicData.ampData}}</text> m</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_right active"><text>{{towerWarnData.ampDataWarn}}</text> m</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left active">高度：</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_middle active"><text>{{towerBasicData.heightData}}</text> m</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_right active"><text>{{towerWarnData.heightDataWarn}}</text> m</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left active">转角：</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_middle active"><text>{{towerBasicData.angleData}}</text> °</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_right active"><text>{{towerWarnData.angleDataWarn}}</text> °</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left active">吊重：</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_middle active"><text>{{towerBasicData.weightData}}</text> t</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_right active"><text>{{towerWarnData.weightWarn}}</text> t</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left active">风速：</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_middle active"><text>{{towerBasicData.windSpeedData}}</text> m/s</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_right active"><text>{{towerWarnData.windSpeedDataWarn}}</text> m/s</view>
+        </van-col>
+
+        <van-col span="12">
+          <view class="equipment_info_left active">倾角：</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_middle active"><text>{{towerBasicData.tiltData}}</text> °</view>
+        </van-col>
+        <van-col span="6">
+          <view class="equipment_info_right active"><text>{{towerWarnData.tiltDataWarn}}</text> °</view>
+        </van-col>
+
+      </van-row>
+    </view>
+  </view>
+</view>
+
+ <!-- 底部导航 -->
+ <van-tabbar active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
+  <van-tabbar-item bindtap="XMGK" >
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    项目概况
+  </van-tabbar-item>
+
+  <van-tabbar-item >
+    <image
+      slot="icon"
+      src="/images/footer_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_2.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    设备管理
+    </van-tabbar-item>
+
+  <van-tabbar-item bindtap="RYGL">
+    <image
+      slot="icon"
+      src="/images/footer_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_3.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    人员管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="XMSP">
+    <image
+      slot="icon"
+      src="/images/footer_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    安全管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="GDGN">
+    <image
+      slot="icon"
+      src="/images/footer_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height:40rpx;"
+    />
+    更多功能
+  </van-tabbar-item>
+</van-tabbar>
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay> 
\ No newline at end of file
diff --git a/miniprogram/pages/shebieguanli-tzsb/taji.wxss b/miniprogram/pages/shebieguanli-tzsb/taji.wxss
new file mode 100644
index 0000000..cdaa36f
--- /dev/null
+++ b/miniprogram/pages/shebieguanli-tzsb/taji.wxss
@@ -0,0 +1,132 @@
+/* pages/shebieguanli-taji/taji.wxss */
+.equipment_nav{
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+  background:#26355a;
+  color: #aaa;
+}
+.equipment_nav.active{
+  background: #43539c;
+  color: #fff;
+}
+.equipment_img{
+  text-align: center;
+}
+.equipment_img image{
+  width: 500rpx;
+  height: 500rpx;
+}
+.equipment_list{
+  padding: 10rpx 50rpx;
+}
+.equipment_click{
+  border-radius:10rpx;
+  background: #2b345b url("http://fileimg.makalu.cc/CORE_A03B0CFF180E400EBF5B761F9851AC27.png") no-repeat right/100rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding-left: 30rpx;
+  font-size: 30rpx;
+  margin: 30rpx 0;
+}
+.equipment_max{
+  background: #1e2336;
+  margin: 30rpx;
+  border-radius: 10rpx;
+
+}
+.equipment_info_left{
+  height:60rpx;
+  padding-left:30rpx;
+  line-height: 60rpx;
+  font-size: 28rpx;
+  margin: 30rpx 0 0;
+  
+}
+.equipment_info_left.active{
+  background:#2b345b
+}
+.equipment_info_right{
+  height: 60rpx;
+  text-align: right;
+  padding-right:30rpx;
+  line-height: 60rpx;
+  font-size: 28rpx;
+  color:#01f0ff ;
+  margin: 30rpx 0 0;
+}
+.equipment_info_right.active{
+  background:#313b67
+}
+.equipment_info_middle{
+  height: 60rpx;
+  text-align: left;
+  padding-left:30rpx;
+  line-height: 60rpx;
+  font-size: 28rpx;
+  color:#01f0ff ;
+  margin: 30rpx 0 0;
+}
+.equipment_info_middle.active{
+  background:#313b67
+}
+
+.echarts_max{
+  margin-top: 30rpx;
+  padding:0 30rpx;
+}
+.echarts_min{
+  background:#1e2336 ;
+  font-size: 28rpx;
+  padding: 30rpx;
+}
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.equipment_yuzhi{
+  text-align: right;
+  padding-right: 30rpx;
+  color: #aaa;
+  font-size: 28rpx;
+}
+
+
+
+
+
+
+
+
+.device_types{
+  text-align: center;
+  padding: 30rpx 0;
+  font-size: 28rpx;
+  color: #999999;
+}
+.device_types.active{
+  color: #89a4e9;
+}
+.device_types.active text{
+  border-bottom: 2px solid #89a4e9;
+}
+
+
+
+.van-popup--bottom.van-popup--round{
+  border-radius: 0 !important
+}
+.van-popup{
+  background-color: var(--popup-background-color,#232a44) !important
+}
+.van-action-sheet__cancel,.van-action-sheet__item{
+  background-color: var(--popup-background-color,#232a44) !important;
+  color: #0ad7ec;
+  
+}
+
+
+
+
diff --git a/miniprogram/pages/tempRegistration/index.js b/miniprogram/pages/tempRegistration/index.js
new file mode 100644
index 0000000..95f31d8
--- /dev/null
+++ b/miniprogram/pages/tempRegistration/index.js
@@ -0,0 +1,860 @@
+// pages/tempRegistration/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    laborTeamIdList: [],
+    workTypeList: [],
+    //身份证正面信息
+    id_card_name: '',
+    id_card_no: '',
+    id_card_address: '',
+    birth: '',
+    sex: '',
+    nation: '',
+    //身份证反面信息
+    sign_of_origin: '',
+    sign_of_date: '',
+    end_of_date: '',
+    //身份证正面地址
+    id_card_front: '',
+    //身份证反面地址
+    id_card_back: '',
+    //考勤半身照
+    half_body_photo: '',
+    loadShow: false,
+    //用户openId
+    openId: '',
+    //归属劳务公司（实名制劳务公司）
+    laborCompanyName: '',
+    laborCompanyId: '',
+    //归属劳务公司（实名制班组id）
+    laborTeamName: '',
+    laborTeamId: '',
+    //归属工种
+    workTypeId: '',
+    workTypeName: '',
+    //预计干活多少天
+    expectedWorkDays: '',
+    //项目id 
+    projectId: '',
+    //项目名称
+    projectName: '',
+    //project
+    projectObject:{},
+    //人员类型
+    personTypeList:[
+      {
+        id:"1",
+        text:"管理人员",
+      },
+      {
+        id:"2",
+        text:"劳务人员"
+      }
+    ],
+    personType:'1',
+    firstLevelList:[],
+    firstLevel:'',
+    laborList:[
+      {
+        id:"8",
+        text:"特殊工种",
+        list:[
+          "电工","电焊工","架子工","建筑起重思索信号工","建筑起重机械司机","建筑起重机械安装拆卸工","高处作业吊篮安装拆卸工","建筑起重机械安装质量检测工","建筑施工现场内机动车司机","其他工种"
+        ]
+      },
+      {
+        id:"9",
+        text:"普通工种",
+        list:[
+          "钢筋工","木工","混凝土工","泥瓦工","抹灰工","防水工","机修工","腻子工","水电工","安装工","装修工","普工","其他工种"
+        ]
+      }
+    ],
+    manageList:[
+      {
+        id:'1',
+        text:"管理人员",
+        list:[
+          "项目经理","常务副经理","项目副经理","项目书记","项目副书记","项目总工","安全总监","工会主席"
+        ]
+      },
+      {
+        id:'2',
+        text:"工程部",
+        list:[
+          "项目经理","正部长","副部长","技术员","试验员","资料员","测量员","施工员"
+        ]
+      },
+      {
+        id:'3',
+        text:"工经部",
+        list:[
+          "部长","预算员"
+        ]
+      },
+      {
+        id:'4',
+        text:"物机部",
+        list:[
+          "正部长","副部长","材料员","机械员"
+        ]
+      },
+      {
+        id:'5',
+        text:"财务部",
+        list:[
+          "部长","会计","出纳"
+        ]
+      },
+      {
+        id:'6',
+        text:"办公室",
+        list:[
+          "办公室主任","劳务员","信息员"
+        ]
+      },
+      {
+        id:'7',
+        text:"安质部",
+        list:[
+          "部长","安全员","质检员"
+        ]
+      },
+    ],
+    //管理单位
+    managementUnitList:[
+      {
+        id:'1',
+        text:"建设单位",
+      },
+      {
+        id:'2',
+        text:"监理单位",
+      },
+      {
+        id:'3',
+        text:"总承包单位",
+      },
+    ],
+    managementUnit:'',
+    //文化程度
+    educationLevelList:[],
+    educationLevel:'',
+    //紧急联系人
+    emergencyName:'',
+    //紧急联系人电话
+    emergencyPhone:'',
+    //用工形式列表
+    employmentTypeList:[],
+    employmentType:''
+  },
+  
+  
+  //选择人员类型
+  onPersonType(e) {
+    this.setData({
+      personType:e.detail.id
+    })
+    if(e.detail.id == 1) {
+      this.setData({
+        firstLevelList:this.data.manageList,
+        firstLevel:this.data.manageList[0].id,
+        expectedWorkDays:'',
+        managementUnit:'1'
+      })
+      this.getWorkTypeId(this.data.manageList[0].list)
+    } else {
+      this.setData({
+        firstLevelList:this.data.laborList,
+        firstLevel:this.data.laborList[0].id
+      })
+      this.getWorkTypeId(this.data.laborList[0].list)
+    }
+  },
+  //管理单位
+  onManagementUnit(e) {
+    if(e.detail.id == 1) {
+      this.setData({
+        managementUnit:e.detail.id,
+        educationLevel:'',
+        emergencyName:'',
+        emergencyPhone:'',
+        expectedWorkDays:''
+      })
+    } else {
+      this.setData({
+        managementUnit:e.detail.id
+      })
+    }
+     
+  },
+  //选择归属劳务公司（班组id）
+  onSelectLabourCompanyName(e) {
+    this.setData({
+      laborCompanyId: e.detail.id,
+      laborCompanyName: e.detail.text,
+      laborTeamIdList:e.detail.teamList,
+      laborTeamId:e.detail.teamList[0].id == undefined ?"":e.detail.teamList[0].id,
+      laborTeamName: e.detail.teamList[0].text == undefined ?"":e.detail.teamList[0].text
+    })
+  },
+  //选择归属劳务公司（班组id）
+  onSelectLabourTeamName(e) {
+    this.setData({
+      laborTeamId: e.detail.id,
+      laborTeamName: e.detail.text
+    })
+  },
+  onSelectFirstLevel(e) {
+      this.setData({
+        firstLevel:e.detail.id
+      })
+      var list = e.detail.list
+      //获取二级工种
+      this.getWorkTypeId(list) 
+  },
+  //选择归属工种
+  onSelectworkType(e) {
+    this.setData({
+      workTypeId: e.detail.id,
+      workTypeName: e.detail.text
+    })
+  },
+  //预计干活天数
+  onExpectedWorkDays(e) {
+    this.setData({
+      expectedWorkDays: e.detail.value
+    })
+  },
+  onClickShow() {
+    this.setData({
+      loadShow: true
+    });
+  },
+
+  onClickHide() {
+    this.setData({
+      loadShow: false
+    });
+  },
+  /**
+   * 用工形式
+   */
+  getEmploymentType() {
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl + '/system/dict/data/listData',
+      method: "post",
+      data: {
+        dictType: "employment_type"
+      },
+      header: {
+        'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+      },
+      success(res) {
+        var list = []
+        if (res.data.code == 0) {
+          if (res.data.rows.length > 0) {
+            var data = res.data.rows;
+            data.forEach(item => {
+              var obj = {}
+              obj.id = item.dictValue
+              obj.text = item.dictLabel
+              list.push(obj)
+            });
+            that.setData({
+              employmentTypeList: list,
+              employmentType:list[0].id
+            })
+          } else {
+            that.setData({
+              employmentTypeList: [],
+              employmentType:''
+            })
+          }
+
+        } else {
+          that.setData({
+            employmentTypeList: [],
+            employmentType:''
+          })
+        }
+      }
+    })
+  },
+  onSelectEmploymentType(e) {
+    if(e.detail.id == 1) {
+      this.setData({
+        employmentType: e.detail.id,
+      })
+    } else {
+      this.setData({
+        employmentType: e.detail.id,
+        expectedWorkDays:3
+      })
+    }
+  },
+  /**
+   * 获取人员文化程度
+   */
+  getEducatuinLevelList() {
+    var that = this
+    wx.request({
+      url: app.globalData.szhUrl + '/system/dict/data/listData',
+      method: "post",
+      data: {
+        dictType: "education_level"
+      },
+      header: {
+        'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+      },
+      success(res) {
+        var list = []
+        if (res.data.code == 0) {
+          if (res.data.rows.length > 0) {
+            var data = res.data.rows;
+            data.forEach(item => {
+              var obj = {}
+              obj.id = item.dictValue
+              obj.text = item.dictLabel
+              list.push(obj)
+            });
+            that.setData({
+              educationLevelList: list,
+              educationLevel:list[0].id
+            })
+          } else {
+            that.setData({
+              educationLevelList: [],
+              educationLevel:''
+            })
+          }
+
+        } else {
+          that.setData({
+            educationLevelList: [],
+            educationLevel:''
+          })
+        }
+      }
+    })
+  },
+  /**
+     * 文化程度变化
+     */
+  onSelectEducationLevel(e) {
+      this.setData({
+          educationLevel: e.detail.id,
+      })
+  },
+  /**
+     * 紧急联系人
+     */
+  onEmergencyName(e) {
+      this.setData({
+          emergencyName: e.detail.value
+      })
+  },
+  /**
+   * 紧急联系人联系方式
+   */
+  onEmergencyPhone(e) {
+      this.setData({
+          emergencyPhone: e.detail.value
+      })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    app.getOPenId()
+    const {q} = options;
+    console.log(q)
+    if (q) {
+      let urlStr = decodeURIComponent(q);
+      let subStrUrl = urlStr.substr(urlStr.indexOf("?"), urlStr.length - 1)
+      let params = this.getRequest(subStrUrl)
+      this.setData({
+        projectId: params.projectId
+      })
+
+      // 获取当前项目对应劳务实名制的projectId
+      if(params.projectId != "" && params.projectId != undefined) {
+        this.getProjectInfo(params.projectId)
+      }
+    }
+    // this.setData({
+    //       projectId: 147
+    // })
+    // this.getProjectInfo(147)
+  
+    if(this.data.personType == 1) {
+      this.setData({
+        firstLevelList:this.data.manageList,
+        firstLevel:this.data.manageList[0].id,
+        managementUnit:'1'
+      })
+      this.getWorkTypeId(this.data.manageList[0].list)
+    } else {
+      this.setData({
+        firstLevel:this.data.laborList,
+        firstLevel:this.data.laborList[0].id,
+        managementUnit:'1'
+      })
+      this.getWorkTypeId(this.data.laborList[0].list)
+    }
+    this.getEducatuinLevelList()
+    this.getEmploymentType()
+   // this.getLaborCompanyId();
+  },
+
+  /**
+   * 获取当前项目对应关系
+   */
+  getProjectInfo(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.szhUrl + '/system/registration/getProjectInfo',
+      data: {
+        "projectId": projectId
+      },
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+      },
+      method: "POST",
+
+      success: (res) => {
+
+          if(res.data.code == 0) {
+              if(res.data.data.length > 0) {
+                  var list = res.data.data;
+                  that.setData({
+                    projectObject:list[0],
+                    projectName:list[0].projectName
+                  })
+                  that.onClickShow();
+                  //获取用户openId
+                  that.getUserOpenId();
+                  //获取归属劳务公司列表
+                  that.getLaborCompanyId();
+              }
+          }
+        }
+    })
+  },
+  /**
+   * 获取请求地址信息
+   */
+  getRequest(url) {
+
+    var theRequest = new Object();
+    var strs;
+    if (url.indexOf("?") != -1) {
+      let str = url.substr(1);
+      strs = str.split("&");
+      for (let i = 0; i < strs.length; i++) {
+        theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+      }
+    }
+    return theRequest;
+  },
+  /**
+   * 获取用户openId
+   */
+  getUserOpenId() {
+    wx.login({
+      success: res => {
+        wx.request({
+          url: app.globalData.reqUrl + '/weixin/userLogin/getOpenId',
+          data: {
+            "code": res.code,
+            "appId": app.globalData.appId,
+          },
+          success: (res) => {
+            this.setData({
+              openId: res.data.openid,
+            })
+          }
+        })
+        this.onClickHide()
+      }
+    })
+  },
+  /**
+   * 获取工种类型
+   */
+  getWorkTypeId: function (selectList) {
+    let list = [];
+    wx.request({
+      url: app.globalData.smzUrl + '/mkl/basic/getWorkTypeList?appid=1c3d51aaf0c54a15b2c727ace5ccbe8d&sign=E5153931BE2113A48EF2E759811F375E',
+      data: {},
+      method: "GET",
+      success: (res) => {
+        if (res.data.code == 0) {
+          if (res.data.data.length > 0) {
+            for (let i = 0; i < res.data.data.length; i++) {
+              if(selectList.includes(res.data.data[i].workType)) {
+                var obj = {};
+                obj.id = res.data.data[i].id;
+                obj.text = res.data.data[i].workType;
+                list.push(obj);
+              }
+            }
+
+          }
+        }
+        this.setData({
+          workTypeList: list,
+          workTypeId:list[0].id,
+          workTypeName:list[0].text
+        })
+        this.onClickHide();
+      }
+    })
+  },
+
+  /**
+   *  获取劳务公司类型
+   */
+  getLaborCompanyId: function () {
+    var that = this
+    let list = [];
+    wx.request({
+       url:app.globalData.smzUrl + '/mkl/tools/getToken?appid=1c3d51aaf0c54a15b2c727ace5ccbe8d&projectId='+that.data.projectObject.smz,
+      //url:app.globalData.smzUrl + '/mkl/tools/getToken?appid=1c3d51aaf0c54a15b2c727ace5ccbe8d&projectId=169',
+      data:{},
+      method:"GET",
+      header:{
+        appsecret:'AB05BFC6CC7D406BA45B1E08219E41D1'
+      },
+      success:(res=>{
+        if(res.data.code == 0) {
+          var sign = res.data.sign
+
+          wx.request({
+            url: app.globalData.smzUrl + '/mkl/basic/getUnitList?appid=1c3d51aaf0c54a15b2c727ace5ccbe8d&sign='+sign+'&projectId=' + that.data.projectObject.smz,
+            // url: app.globalData.smzUrl + '/mkl/basic/getUnitList?appid=1c3d51aaf0c54a15b2c727ace5ccbe8d&sign='+sign+'&projectId=169' ,
+            data: {},
+            method: "GET",
+            success: (res) => {
+              if (res.statusCode == 200) {
+                if (res.data.data.length > 0) {
+                  for (let i = 0; i < res.data.data.length; i++) {
+                    var obj = {};
+                    obj.id = res.data.data[i].unitTypeid;
+                    obj.text = res.data.data[i].enterpriseName;
+                    var tempList = []
+                    if(res.data.data[i].teamList.length > 0) {
+                      res.data.data[i].teamList.forEach(item=>{
+                        var teamObj = {}
+                        teamObj.id = item.id
+                        teamObj.text = item.teamName
+                        tempList.push(teamObj)
+                      })
+                    }
+                    obj.teamList = tempList
+                    list.push(obj);
+                  }
+
+                }
+              }
+              console.log(list)
+              this.setData({
+                laborCompanyIdList: list,
+                laborCompanyId:list[0].id,
+                laborCompanyName:list[0].text,
+                laborTeamIdList:list[0].teamList,
+                laborTeamId:list[0].teamList[0].id,
+                laborTeamName:list[0].teamList[0].text
+              })
+              this.onClickHide();
+            }
+          })
+        }
+      })
+    })
+
+    
+  },
+
+  /**
+   * 
+   * 身份证正面上传
+   * 
+   */
+  onImagesIdCardFront(e) {
+    // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+    wx.uploadFile({
+      //图片上传地址
+      url: app.globalData.reqUrl + '/weixin/security/fileUpload',
+      filePath: e.detail[0],
+      name: 'file',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+      },
+      formData: {
+        user: 'test'
+      },
+      success: res => {
+        let data = JSON.parse(res.data);
+        this.setData({
+          id_card_front: data.url
+        });
+
+        let that = this;
+
+        wx.request({
+          url: app.globalData.szhUrl + '/weixin/tempRegistration/ocrIdCard',
+          data: {
+            path: data.url,
+            type: 'front'
+          },
+          method: "POST",
+          success: function (res1) {
+            that.setData({
+              id_card_name: res1.data.words_result.姓名.words,
+              id_card_no: res1.data.words_result.公民身份号码.words,
+              id_card_address: res1.data.words_result.住址.words,
+              birth: res1.data.words_result.出生.words,
+              sex: res1.data.words_result.性别.words,
+              nation: res1.data.words_result.民族.words,
+            });
+          }
+        })
+      },
+    });
+  },
+  //身份证反面上传
+  onImagesArr(e) {
+    // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+    wx.uploadFile({
+      //图片上传地址
+      url: app.globalData.reqUrl + '/weixin/security/fileUpload',
+      filePath: e.detail[0],
+      name: 'file',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+      },
+      formData: {
+        user: 'test'
+      },
+      success: res => {
+        let data = JSON.parse(res.data);
+        this.setData({
+          id_card_back: data.url
+        });
+
+        let that = this;
+
+        wx.request({
+          url: app.globalData.szhUrl + '/weixin/tempRegistration/ocrIdCard',
+          data: {
+            path: data.url,
+            type: 'back'
+          },
+          method: "POST",
+          success: function (res1) {
+            that.setData({
+              sign_of_origin: res1.data.words_result.签发机关.words,
+              sign_of_date: res1.data.words_result.签发日期.words,
+              end_of_date: res1.data.words_result.失效日期.words,
+            });
+          }
+        })
+      },
+    });
+  },
+  //考勤半身照上传
+  onHalfBodyImg(e) {
+    // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+    wx.uploadFile({
+      //图片上传地址
+      url: app.globalData.reqUrl + '/weixin/security/fileUpload',
+      filePath: e.detail[0],
+      name: 'file',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+      },
+      formData: {
+        user: 'test'
+      },
+      success: res => {
+        let data = JSON.parse(res.data);
+        this.setData({
+          half_body_photo: data.url
+        });
+      },
+    });
+  },
+
+  add: function () {
+    if(this.data.personType == 1) {
+      //管理人员
+      if (this.data.managementUnit == '' || this.data.managementUnit == undefined) {
+        app.toast("请选择管理单位");
+        return;
+      } 
+    }  
+
+    
+    
+    //判断值是否为空
+    if (this.data.laborCompanyId == '' || this.data.laborCompanyId == undefined) {
+      app.toast("请选择归属劳务公司");
+      return;
+    } else if (this.data.laborTeamId == '' || this.data.laborTeamId == undefined) {
+      app.toast("请选择归属劳务班组");
+      return;
+    } else if (this.data.firstLevel == '' || this.data.firstLevel == undefined) {
+      app.toast("请选择一级工种");
+      return;
+    } else if (this.data.workTypeId == '' || this.data.workTypeId == undefined) {
+      app.toast("请选择二级工种");
+      return;
+    } else if (this.data.employmentType == '' || this.data.employmentType == undefined) {
+      app.toast("请选择用工形式");
+      return;
+    } else if (this.data.id_card_front == '' || this.data.id_card_front == undefined) {
+      app.toast("请上传身份证正面照片");
+      return;
+    } else if (this.data.id_card_back == '' || this.data.id_card_back == undefined) {
+      app.toast("请上传身份证反面照片");
+      return;
+    } else if (this.data.id_card_no == '' || this.data.id_card_no == undefined) {
+      app.toast("请填写身份证号码");
+      return;
+    } else if (this.data.half_body_photo == '' || this.data.half_body_photo == undefined) {
+      app.toast("请上传考勤半身照片");
+      return;
+    }
+
+    //身份证校验
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url: app.globalData.szhUrl + '/system/registration/checkUser',
+      data: {
+        idCardNo: this.data.id_card_no,
+        projectId:this.data.projectId
+      },
+      method: "POST",
+      success: res => {
+        if (res.data.code == 0) {
+          wx.setStorageSync('userOpenId', this.data.openId)
+          wx.setStorageSync('idCardNo', this.data.id_card_no)
+          wx.request({
+            header: {
+              'content-type': 'application/x-www-form-urlencoded'
+            },
+            url: app.globalData.szhUrl + '/system/registration/add',
+            data: {
+              projectId:this.data.projectId,
+              openId: this.data.openId,
+              laborCompanyId:this.data.laborCompanyId,
+              laborCompanyName:this.data.laborCompanyName,
+              laborTeamId: this.data.laborTeamId,
+              laborTeamName: this.data.laborTeamName,
+              workTypeId: this.data.workTypeId,
+              workTypeName: this.data.workTypeName,
+              expectedWorkDays: this.data.expectedWorkDays,
+              idCardFront: this.data.id_card_front,
+              idCardBack: this.data.id_card_back,
+              idCardName: this.data.id_card_name,
+              idCardNo: this.data.id_card_no,
+              birth: this.data.birth,
+              sex: this.data.sex,
+              nation: this.data.nation,
+              halfBodyPhoto: this.data.half_body_photo,
+              idCardAddress: this.data.id_card_address,
+              signOfOrigin: this.data.sign_of_origin,
+              signOfDate: this.data.sign_of_date,
+              endOfDate: this.data.end_of_date,
+              personType:this.data.personType,
+              firstLevel:this.data.firstLevel,
+              educationLevel:this.data.educationLevel,
+              emergencyName:this.data.emergencyName,
+              emergencyPhone:this.data.emergencyPhone,
+              employmentType:this.data.employmentType
+            },
+            method: "POST",
+            success: res=> {
+              if (res.data.code == 0) {
+                app.toast("添加成功！")
+                if(this.data.personType == 1) {
+                  //在需要退出小程序的地方调用添加下面代码即可(js文件中)
+                  wx.exitMiniProgram({
+                    success: (res) => {}
+                  })
+                } else {
+                  wx.redirectTo({
+                    url: '../newAddPage/safetyBriefingLearning/index?projectId='+this.data.projectId+"&firstWorkType="+this.data.firstLevel+"&secondWorkType="+this.data.workTypeId
+                    ,complete:function(res){
+                      console.log(res)
+                    },fail: err => {
+                      console.log(err)
+                    }
+                  });
+                }
+                
+              } else {
+                app.toast("添加失败");
+                return;
+              }
+            }
+          })
+        } else {
+          if(res.data.code == 500 && res.data.msg == "人员信息已存在,无需重复录入!") {
+            var that = this
+              //人员二次进场，修改数据状态
+              wx.request({
+                header: {
+                  'content-type': 'application/x-www-form-urlencoded'
+                },
+                url: app.globalData.szhUrl + '/mkl/api/changTempoaryPersonState',
+                data: {
+                  projectId:that.data.projectId,
+                  idCardNo: that.data.id_card_no,
+                  auditState:0
+                },
+                method: "POST",
+                success: function (result) {
+                  if (result.data.code == 0) {
+                    app.toast("温馨提醒：人员信息已成功提交，审核通过后可通过人脸识别闸机进场!");                    
+                  } 
+                }
+              })
+          } else {
+            wx.redirectTo({
+              url: '../newAddPage/safetyBriefingLearning/index?projectId='+that.data.projectId
+            })
+          }
+        }
+      }
+    })
+  },
+  /**
+   * 重置
+   */
+  resetForm() {
+    wx.reLaunch({
+      url: '../tempRegistration/index'
+    })
+  },
+  /**
+   * 身份证号码输入
+   */
+  onidCardIdNo(e) {
+    if (e.detail.value != "") {
+      this.setData({
+        id_card_no: e.detail.value
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/tempRegistration/index.json b/miniprogram/pages/tempRegistration/index.json
new file mode 100644
index 0000000..803abc5
--- /dev/null
+++ b/miniprogram/pages/tempRegistration/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/tempRegistration/index.wxml b/miniprogram/pages/tempRegistration/index.wxml
new file mode 100644
index 0000000..b4a77f5
--- /dev/null
+++ b/miniprogram/pages/tempRegistration/index.wxml
@@ -0,0 +1,136 @@
+<!--pages/tempRegistration/index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+     
+      <van-col span="12">
+        <view class="header_img">
+          <!-- <image src="/images/left.png"></image> -->
+          <text class="header_fh">劳务人员信息注册</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name"></view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+
+<view class="max_content">
+    <view class="add_max">
+        <view class="add_title">{{projectName}}</view>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title"><p style="color: red;">*</p>人员类型</view>
+        <voucher-select columns="{{personTypeList}}" placeholder="请选择" bindchange="onPersonType"></voucher-select>
+    </view>
+
+    <view class="add_max" wx:if="{{personType == 1}}">
+        <view class="add_title"><p style="color: red;">*</p>管理单位</view>
+        <voucher-select columns="{{managementUnitList}}" placeholder="请选择" bindchange="onManagementUnit"></voucher-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title"><p style="color: red;">*</p>归属单位</view>
+        <voucher-select columns="{{laborCompanyIdList}}" placeholder="请选择" bindchange="onSelectLabourCompanyName"></voucher-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title"><p style="color: red;">*</p>归属劳务班组</view>
+        <voucher-select columns="{{laborTeamIdList}}" placeholder="请选择" bindchange="onSelectLabourTeamName"></voucher-select>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title"><p style="color: red;">*</p>归属工种</view>
+        <voucher-select columns="{{firstLevelList}}"  placeholder="请选择一级工种" bindchange="onSelectFirstLevel"></voucher-select>
+    </view>
+
+    <view class="add_max">
+        <voucher-select  columns="{{workTypeList}}" placeholder="请选择二级工种" bindchange="onSelectworkType"></voucher-select>
+    </view>
+
+
+    <view class="add_max">
+        <view class="add_title"><p style="color: red;">*</p>用工形式</view>
+        <voucher-select  columns="{{employmentTypeList}}" placeholder="请选择用工形式" bindchange="onSelectEmploymentType"></voucher-select>
+    </view>
+
+    <view class="add_max" wx:if="{{personType == 2}}">
+        <view class="add_title">文化程度</view>
+        <voucher-select  columns="{{educationLevelList}}" placeholder="请选择文化程度" bindchange="onEducationLevel"></voucher-select>
+    </view>
+
+
+    <view class="add_max" wx:if="{{personType == 2}}">
+        <view class="add_title">紧急联系人</view>
+        <input class="weui-input"  bindchange="onEmergencyName" placeholder="请填写紧急联系人"/>
+    </view>
+
+    <view class="add_max" wx:if="{{personType == 2}}">
+        <view class="add_title">紧急联系人电话</view>
+        <input class="weui-input"  bindchange="onEmergencyPhone" placeholder="请填写紧急联系人电话"/>
+    </view>
+
+
+    <view class="add_max">
+    <!-- 标题 -->
+    <view class="add_title"><p style="color: red;">*</p>身份证照片上传</view>
+    <!-- 身份证证件 170+150-->
+    <view class="identity-prove">
+      <view class="identity-prove-box">
+        <view class="identity-prove-top">
+          <file-uploader-copy  bindimages="onImagesIdCardFront" scr='http://fileimg.makalu.cc/WEB_01B17BD6D2C94CFD9CF9D65ECD2D6527.png'></file-uploader-copy>
+        </view>
+        <view class="identity-prove-bottom">
+          上传身份证正面
+        </view>
+      </view>
+      <view  class="identity-prove-box">
+        <view class="identity-prove-tops">
+          <file-uploader-copy  bindimages="onImagesArr" scr='http://fileimg.makalu.cc/WEB_D7680197451940F3AFDFCE8FA5D67869.png'>
+          </file-uploader-copy>
+        </view>
+        <view class="identity-prove-bottom">
+          上传身份证反面
+        </view>
+      </view>
+    </view>
+        <!-- <view class="add_title"><p style="color: red;">*</p>身份证上传（正面）</view>
+        <view class="add_title"><p style="color: red;">*</p>身份证上传(反面)</view>
+ -->
+    </view>
+
+
+    <view class="add_max">
+        <view class="add_title">姓名</view>
+        <input class="weui-input" placeholder="请填写" value="{{id_card_name}}"/>
+    </view>
+
+    <view class="add_max">
+        <view class="add_title"><p style="color: red;">*</p>身份证号码</view>
+        <input class="weui-input" placeholder="请填写" value="{{id_card_no}}" bindchange="onidCardIdNo"/>
+    </view>
+
+  
+
+    <view class="add_max">
+        <view class="add_title"><p style="color: red;">*</p>上传考勤半身照</view>
+        <file-uploader-copy  bindimages="onHalfBodyImg"></file-uploader-copy>
+    </view>
+
+    <view class="add_btn">
+        <view class="add_btn_qx" bindtap="resetForm">重置</view>
+        <view class="add_btn_bc" bindtap="add">保存</view>
+    </view>
+
+</view>
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
+
diff --git a/miniprogram/pages/tempRegistration/index.wxss b/miniprogram/pages/tempRegistration/index.wxss
new file mode 100644
index 0000000..dc0c183
--- /dev/null
+++ b/miniprogram/pages/tempRegistration/index.wxss
@@ -0,0 +1,47 @@
+/* pages/tempRegistration/index.wxss */
+.van-picker__mask  {
+    background-image: none !important;
+  }
+  .van-hairline--top-bottom:after {
+    border-top: 1px solid #3a4c8b !important;
+    border-bottom: 1px solid #3a4c8b !important;
+  }
+  .van-picker {
+    background: none !important;
+  }
+  /* 身份证部分 */
+  .identity-prove{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .identity-prove-box{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    width: 330rpx;
+    height: 260rpx;
+    border: 1px solid #212838;
+  }
+  .identity-prove-top{
+    position: relative;
+    width: 100%;
+    height: 196rpx;
+  }
+  .identity-prove-tops{
+    position: relative;
+    width: 100%;
+    height: 196rpx;
+  }
+  .identity-prove-bottom{
+    text-align: center;
+    width: 100%;
+    height: 60rpx;
+    line-height: 60rpx;
+    font-size: 28rpx;
+    color: #8ca0e7;
+    background-color: #30364e;
+    margin-top: 50rpx;
+  }
+ 
\ No newline at end of file
diff --git a/miniprogram/pages/temporaryToExamine/index.js b/miniprogram/pages/temporaryToExamine/index.js
new file mode 100644
index 0000000..aea1bcc
--- /dev/null
+++ b/miniprogram/pages/temporaryToExamine/index.js
@@ -0,0 +1,517 @@
+// pages/temporaryToExamine/index.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    activeState:1,
+    a:0,
+    b:0,
+    c:0,
+    projectName:'',
+    projectId:'',
+    loginName:'',
+    userName:'',
+
+    //筛选条件
+    startDate:'',
+    endDate:'',
+    //列表数据
+    environList:[],
+    //数据加载参数
+    show:false, 
+    initData:{},
+
+    stateShow:false,
+    nav:0,
+
+    //当前选中数量
+    number:0,
+    //是否全选
+    allchecked:false,
+
+    //审核结果信息
+    id:'',//当前数据ID
+    auditState:0,//审核结果（0：待审核；1：通过；2：驳回）
+    labelShow:true,
+
+   //数字化管控平台project
+   szhProjectId:'',
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+    // 获取当前项目对应劳务实名制的projectId
+    if(projectId != "" && projectId != undefined) {
+      this.getProjectInfo(projectId)
+    }
+    
+  },
+   /**
+   * 获取当前项目对应关系
+   */
+  getProjectInfo(projectId) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
+      data: {
+        "projectId": projectId
+      },
+      method: "get",
+      success: function (res) {
+        that.setData({
+          szhProjectId:res.data.szh
+        })
+        that.selectEnvironDayAndMonth(0);
+      }
+    })
+
+
+  },
+  showPopup() {
+    this.setData({ show: true }); 
+  },
+      /**
+   * 返回到更多功能页面
+   */
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../../pages/gengduogongneng/gengduogongneng'
+    })
+  },
+  onClose() {
+    this.setData({ show: false });
+  },
+  onClickShow() {
+    this.setData({ show: true });
+  },
+
+  onClickHide() {
+    this.setData({ show: false });
+  },
+
+  //审核结果弹窗
+  onWarningInfo(e){
+    this.setData({
+      stateShow:true,
+      id:e.currentTarget.dataset.id,
+    })
+  },
+
+  //审核结果标签切换
+  onLabelNav(e){
+    this.setData({
+      nav:e.currentTarget.dataset.nav,
+      auditState:e.currentTarget.dataset.nav
+    })
+  },
+
+  // tab切换
+  trainingTypeJump(e){
+    var that  = this
+    // this.onClickShow();
+    let index = e.currentTarget.dataset.index;
+    var videoList = []
+    let titleName =  '';
+  
+
+    switch(index) {
+      case '1':
+          titleName = '待审核';
+          this.selectEnvironDayAndMonth(0);
+      this.setData({labelShow:true});
+          break;
+      case '2':
+        titleName = '已通过';
+        this.selectEnvironDayAndMonth(1);
+        this.setData({labelShow:false})
+        break;  
+      case '3':
+        titleName = '已驳回';
+        this.selectEnvironDayAndMonth(2);
+        this.setData({labelShow:false});
+        break; 
+      default:
+        break
+   }
+
+    
+    this.setData({
+      titleName:titleName,
+      activeState:index,
+      videoList:videoList,
+      pageNo:1,
+      type:1,
+      trainingType:index,
+      startDate:'',
+      endDate:'',
+      collaborateRanksId:''
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    //启动蒙版
+    that.onClickShow();
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            projectName: app.globalData.projectName,
+            projectId:app.globalData.projectId,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          }) 
+          that.getProjectInfo(app.globalData.projectId)
+        }
+      });
+  },
+
+  /**
+   * 加载待审核，已通过，已驳回审核列表信息
+   */
+  selectEnvironDayAndMonth(auditState){
+    var that = this;
+    wx.request({
+      url: app.globalData.szhUrl+'/mkl/api/getTemporaryPersonnelRegistrationList',
+      data:{
+        "auditState":auditState,
+        "startDate":this.data.startDate,
+        "endDate":this.data.endDate,
+        "projectId":this.data.szhProjectId
+      },
+      method:"GET",
+      success:function(res){
+        //关闭蒙版
+        that.onClickHide();
+        that.setData({
+            environList:res.data.data,
+            a:res.data.dsh_num,
+            b:res.data.ytg_num,
+            c:res.data.ybh_num
+        })
+      }
+    })
+  },
+
+  /**
+   * 审核提交
+   */
+  submit:function(){
+    var that = this;
+    if(this.data.auditState == 0){
+        app.toast("请选择审核结果！");
+        return;
+    }
+
+    var ids = []
+    var list = this.data.environList
+    for(let i = 0;i<list.length;i++){
+      if(list[i].selected)ids.push(list[i].id)
+    }
+    if(ids.length == 0){
+      app.toast("请选择待审核用户！");
+      return;
+    }
+
+    wx.request({
+        header: {
+            'content-type': 'application/x-www-form-urlencoded'
+        },
+        url:app.globalData.szhUrl+'/mkl/api/submitTemporaryPersonnelRegistrationAuditState',
+        data:{
+          // id:this.data.id,
+          ids: ids,
+          auditState:this.data.auditState,
+        },
+        method:"POST",
+        success:function(res){
+            if(res.data.code == '200'){
+                that.setData({ stateShow:false });
+                that.selectEnvironDayAndMonth(0);
+                //审核通过，临时人员信息同步到劳务实名制系统
+                if(that.data.auditState == 1){
+                  that.synchronousTemporaryPersonnel(res.data.list);
+                }
+            }else{
+                app.toast(res.data.msg);
+                return;
+            }
+        }
+    })
+  },
+
+  /**
+   * 临时人员信息同步到劳务实名制平台
+   * @param {*} user 
+   */
+  synchronousTemporaryPersonnel(list){
+    var that = this
+    if(list){
+      for(let i = 0;i<list.length;i++){
+        var data = list[i];
+        if(data.employment_type == 1) {
+          //长期工
+          wx.request({
+            url: app.globalData.smzUrl+'/mkl/api/personSync',
+            data:{
+              "projectId":data.smz,
+              "idcardnum": data.id_card_no,
+              "name": data.id_card_name,
+              "teamid": data.labor_team_id,
+              "userphone": '',
+              "userphoto": data.half_body_photo,
+              "enterdate": this.getNowDate(),
+              "worktypeid": data.work_type_id,
+              "sex": data.sex,
+              "nation": data.nation,
+              "birthday": data.birth,
+              "address": data.id_card_address,
+              "organization": data.sign_of_origin,
+              "useStarttime": data.sign_of_date,
+              "useEndtime": data.end_of_date,
+              "idcardimg": data.id_card_front,
+              "idcardimg2": data.id_card_back,
+              "information_path":data.letter_commitment_url,
+              "signature":data.sign_img_url,
+              "employmentType":data.employment_type
+            },
+            method:"POST",
+            success:function(res){
+                if(res.data.state == "NO" && res.data.message == "该人员信息已存在") {
+                  that.resynchronousTemporaryPersonnel(data)
+                }
+            }
+          })
+        } else {
+          //短期工
+          wx.request({
+            url: app.globalData.smzUrl+'/mkl/api/personSyncTemp',
+            data:{
+              "projectId":data.smz,
+              "idcardnum": data.id_card_no,
+              "name": data.id_card_name,
+              "teamid": data.labor_team_id,
+              "userphone": '',
+              "userphoto": data.half_body_photo,
+              "enterdate": this.getNowDate(),
+              "worktypeid": data.work_type_id,
+              "sex": data.sex,
+              "nation": data.nation,
+              "birthday": data.birth,
+              "address": data.id_card_address,
+              "organization": data.sign_of_origin,
+              "useStarttime": data.sign_of_date,
+              "useEndtime": data.end_of_date,
+              "idcardimg": data.id_card_front,
+              "idcardimg2": data.id_card_back,
+              "information_path":data.letter_commitment_url,
+              "signature":data.sign_img_url,
+              "employmentType":data.employment_type
+            },
+            method:"POST",
+            success:function(res){
+                if(res.data.state == "NO" && res.data.message == "该人员信息已存在") {
+                  that.resynchronousTemporaryPersonnel(data)
+                }
+            }
+          })
+        }
+       
+      }
+    }
+  },
+
+  /**
+   * 关闭
+   */
+  closeBox(){
+    this.setData({
+      stateShow:false
+    })
+  },
+
+  orderChange(e){
+    let name = e.detail.name;
+    if(name == 'a'){
+      this.selectEnvironDayAndMonth(0);
+      this.setData({labelShow:true});
+    }else if(name == 'b'){
+      this.selectEnvironDayAndMonth(1);
+      this.setData({labelShow:false});
+    }else if(name == 'c'){
+      this.selectEnvironDayAndMonth(2);
+      this.setData({labelShow:false});
+    }
+  },
+
+  /**
+   * 获取当前年月日
+   */
+  getNowDate(){
+    var date = new Date(); 
+    var year = date.getFullYear(); 
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    month = (month > 9) ? month : ("0" + month);
+    day = (day < 10) ? ("0" + day) : day;
+    var today = year + "-" + month + "-" + day;
+    return today;
+  },
+
+  /**
+   * 打开附件
+   * @param {url} e 
+   */
+  openFile(e){
+    var url = e.currentTarget.dataset.url
+    wx.downloadFile({
+      // 示例 url，并非真实存在
+      url: url,
+      success: function (res) {
+        const filePath = res.tempFilePath
+        wx.openDocument({
+          filePath: filePath,
+          success: function (res) {
+            console.log('打开文档成功')
+          }
+        })
+      }
+    })
+  },
+
+  /**
+   * 全选
+   */
+  checkAll(){
+    var selectAllStatus = this.data.allchecked;
+    selectAllStatus = !selectAllStatus;
+    var dataList = this.data.environList;
+    for (let i = 0; i < dataList .length; i++) {
+      dataList [i].selected = selectAllStatus;
+    }
+    this.setData({
+      allchecked: selectAllStatus,
+      environList: dataList,
+    });
+    //计算已选数量
+    this.countSelectNum();
+  },
+
+  /**
+   * 选择
+   */
+  selectList(e){
+    var index = e.currentTarget.dataset.index
+    let dataArr = this.data.environList
+    let selected = dataArr[index].selected
+    dataArr[index].selected = !selected
+    this.setData({
+      environList: dataArr
+    });
+
+    //判断全选
+    for (var i = 0; i < this.data.environList.length; i++) {
+      if (this.data.allchecked){
+        if (!this.data.environList[i].selected){
+          this.setData({
+            allchecked: false
+          });
+          break;
+        }
+      }else{
+        if (this.data.environList[i].selected) {
+          this.setData({
+            allchecked: true
+          });
+        } else {
+          this.setData({
+            allchecked: false
+          });
+          break;
+        }
+      }
+    }
+    //计算已选数量
+    this.countSelectNum()
+  },
+
+  /**
+   * 计算已选数量
+   */
+  countSelectNum(){
+    var number = 0;
+    let dataArr = this.data.environList
+    for(let i = 0;i < dataArr.length;i++){
+      if(dataArr[i].selected)number++
+    }
+    this.setData({
+      number: number
+    });
+  },
+
+  //筛选待审核列表
+  screenCondition1(e){
+    this.setData({
+      startDate:e.detail.startDate,
+      endDate:e.detail.endDate,
+    })
+    this.selectEnvironDayAndMonth(0);
+  },
+
+  //筛选已通过列表
+  screenCondition2(e){
+    this.setData({
+      startDate:e.detail.startDate,
+      endDate:e.detail.endDate,
+    })
+    this.selectEnvironDayAndMonth(1);
+  },
+
+  //筛选已驳回列表
+  screenCondition3(e){
+    this.setData({
+      startDate:e.detail.startDate,
+      endDate:e.detail.endDate,
+    })
+    this.selectEnvironDayAndMonth(2);
+  },
+
+  //再次人员入场
+  resynchronousTemporaryPersonnel(data) {
+    //1 进场 2退场
+        wx.request({
+          url: app.globalData.smzUrl+'/mkl/api/userInfoTempEnterAndOut',
+          data:{
+            "projectId":data.smz,
+            "idcardnum": data.id_card_no,
+            "isWork":1
+          },
+          method:"POST",
+          success:function(res){
+              app.toast("人员已再次入场");
+              console.log(res)
+          }
+        })
+     
+    }
+
+
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/temporaryToExamine/index.json b/miniprogram/pages/temporaryToExamine/index.json
new file mode 100644
index 0000000..3ecdb22
--- /dev/null
+++ b/miniprogram/pages/temporaryToExamine/index.json
@@ -0,0 +1,11 @@
+{
+    "usingComponents": {
+      "van-row": "@vant/weapp/row",
+      "van-col": "@vant/weapp/col",
+      "van-tab": "@vant/weapp/tab/index",
+      "van-tabs": "@vant/weapp/tabs/index",
+      "van-tag": "@vant/weapp/tag/index",
+      "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "临时人员审核"
+  }
\ No newline at end of file
diff --git a/miniprogram/pages/temporaryToExamine/index.wxml b/miniprogram/pages/temporaryToExamine/index.wxml
new file mode 100644
index 0000000..23d9f0f
--- /dev/null
+++ b/miniprogram/pages/temporaryToExamine/index.wxml
@@ -0,0 +1,402 @@
+<!--pages/temporaryToExamine/index.wxml-->
+
+<!-- tab栏切换 -->
+<view class="max_content_none" style="margin-top: -18rpx;" >
+  <!-- 新样式 -->
+  <view class="modify_video_nav" style="margin-top: 64rpx;background-color: #191d28;">
+      <view class="{{activeState==1?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待审核({{a}})</text></view>
+      <view class="{{activeState==2?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>已通过({{b}})</text></view>
+      <view class="{{activeState==3?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>已驳回({{c}})</text></view>
+  </view>
+  <!-- <view class="max_new_content" style="border: 1px solid red;" > -->
+  
+    <!-- <van-tabs active="a" bind:change="orderChange">
+
+      <van-tab title="待审核 ({{a}})" name="a">
+        <view class="new_con_info">
+          
+          <view class="modify_echarts_max" style="margin: 30rpx 0;">
+            <view class="modify_echarts_title_min">
+              <view class="modify_eharts_title">待审核人员列表</view>
+              <pz-screen-training columns="{{DeviceGroupData}}" bindscreen="screenCondition1"></pz-screen-training>
+            </view>
+          </view>
+          <view class="boxInsideStyle">
+          <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index" wx:if="{{index<150}}" data-id="{{item.id}}">
+            <view style="display: flex;">
+              <view style="border-bottom:1px solid #8862f8">
+                <radio value="" checked="{{item.selected}}" bindtap="selectList" data-index="{{index}}" style="transform: scale(0.7);" />
+              </view>
+              <view class="new_con_title" style="border-bottom: 2px solid #293063;">
+                {{item.labor_team_name}}
+              </view>
+            </view>
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td" style="display:flex;justify-content: space-between;">
+                    <view style="display: flex;">
+                      归属工种： <view style="color:#439bde">
+                        {{item.work_type_name}}
+                      </view>
+                    </view>
+                    <view style="display: flex;">
+                      姓名： <view style="color:#439bde">
+                        {{item.id_card_name}}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="new_con_td">注册时间：{{item.create_time}}</view>
+                  <view class="new_con_td">安全教育时间：{{item.safety_education_time}}</view>
+                  <view class="new_con_td" style="display: flex;">安全教育成绩：
+                    <view style="color: #439bde;display: flex;">{{item.score}}分
+                      <view style="color: green;" wx:if="{{item.result == '0'}}">(合格)</view>
+                      <view style="color: red;" wx:if="{{item.result == '1'}}">(不合格)</view>
+                    </view>
+                  </view>
+                  <view class="new_con_td" style="white-space:nowrap;position: relative;">安全承诺书签订时间：{{item.sign_time}}
+                    <view style="width:34rpx;height:34rpx;position: absolute;right: -80rpx;top: 8rpx;" data-url="{{item.letter_commitment_url}}" bindtap="openFile">
+                      <image src="http://fileimg.makalu.cc/WEB_560F605B02BC49DA834A05D39BE4B051.png" mode="" style="width: 100%;height: 100%;" />
+                    </view>
+                  </view>
+                </van-col>
+             
+              </van-row>
+            </view>
+          </view>
+        </view>
+        </view>
+      </van-tab>
+
+      <van-tab title="已通过 ({{b}})" name="b">
+        <view class="new_con_info" style="border: 1px solid red;">
+        
+          <view class="modify_echarts_max" style="margin: 30rpx 0;">
+            <view class="modify_echarts_title_min">
+              <view class="modify_eharts_title">已通过人员列表</view>
+              <pz-screen-training columns="{{DeviceGroupData}}" bindscreen="screenCondition2"></pz-screen-training>
+            </view>
+          </view>
+          <view class="boxInsideStyle">
+            <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index" wx:if="{{index<150}}" data-id="{{item.id}}" style="border: 1px solid green;">
+            <view style="display: flex;">
+        
+              <view class="new_con_title" style="border-bottom: 2px solid #293063;">
+                {{item.labor_team_name}}
+              </view>
+            </view>
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td" style="display:flex;justify-content: space-between;">
+                    <view style="display: flex;">
+                      归属工种： <view style="color:#439bde">
+                        {{item.work_type_name}}
+                      </view>
+                    </view>
+                    <view style="display: flex;">
+                      姓名： <view style="color:#439bde">
+                        {{item.id_card_name}}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="new_con_td">注册时间：{{item.create_time}}</view>
+                  <view class="new_con_td">安全教育时间：{{item.safety_education_time}}</view>
+                  <view class="new_con_td" style="display: flex;">安全教育成绩：
+                    <view style="color: #439bde;display: flex;">{{item.score}}分
+                      <view style="color: green;" wx:if="{{item.result == '0'}}">(合格)</view>
+                      <view style="color: red;" wx:if="{{item.result == '1'}}">(不合格)</view>
+                    </view>
+                  </view>
+                  <view class="new_con_td" style="white-space:nowrap;position: relative;">安全承诺书签订时间：{{item.sign_time}}
+                    <view style="width:34rpx;height:34rpx;position: absolute;right: -80rpx;top: 8rpx;" data-url="{{item.letter_commitment_url}}" bindtap="openFile">
+                      <image src="http://fileimg.makalu.cc/WEB_560F605B02BC49DA834A05D39BE4B051.png" mode="" style="width: 100%;height: 100%;" />
+                    </view>
+                  </view>
+                </van-col>
+                
+              </van-row>
+            </view>
+          </view>
+          </view>
+        </view>
+      </van-tab>
+
+      <van-tab title="已驳回 ({{c}})" name="c" >
+        <view class="new_con_info" >
+          
+          <view class="modify_echarts_max" style="margin: 30rpx 0;">
+            <view class="modify_echarts_title_min">
+              <view class="modify_eharts_title">已驳回人员列表</view>
+              <pz-screen-training columns="{{DeviceGroupData}}" bindscreen="screenCondition3"></pz-screen-training>
+            </view>
+          </view>
+          
+          <view class="boxInsideStyle">
+          <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index" wx:if="{{index<150}}" data-id="{{item.id}}">
+            <view style="display: flex;">
+            
+              <view class="new_con_title" style="border-bottom: 2px solid #293063;">
+                {{item.labor_team_name}}
+              </view>
+            </view>
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td" style="display:flex;justify-content: space-between;">
+                    <view style="display: flex;">
+                      归属工种： <view style="color:#439bde">
+                        {{item.work_type_name}}
+                      </view>
+                    </view>
+                    <view style="display: flex;">
+                      姓名： <view style="color:#439bde">
+                        {{item.id_card_name}}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="new_con_td">注册时间：{{item.create_time}}</view>
+                  <view class="new_con_td">安全教育时间：{{item.safety_education_time}}</view>
+                  <view class="new_con_td" style="display: flex;">安全教育成绩：
+                    <view style="color: #439bde;display: flex;">{{item.score}}分
+                      <view style="color: green;" wx:if="{{item.result == '0'}}">(合格)</view>
+                      <view style="color: red;" wx:if="{{item.result == '1'}}">(不合格)</view>
+                    </view>
+                  </view>
+                  <view class="new_con_td" style="white-space:nowrap;position: relative;">安全承诺书签订时间：{{item.sign_time}}
+                    <view style="width:34rpx;height:34rpx;position: absolute;right: -80rpx;top: 8rpx;" data-url="{{item.letter_commitment_url}}" bindtap="openFile">
+                      <image src="http://fileimg.makalu.cc/WEB_560F605B02BC49DA834A05D39BE4B051.png" mode="" style="width: 100%;height: 100%;" />
+                    </view>
+                  </view>
+                </van-col>
+              
+              </van-row>
+            </view>
+          </view>
+        </view>
+      </view>
+      </van-tab>
+
+    </van-tabs> -->
+  <!-- </view> -->
+
+<!-- tab栏对应数据 -->
+
+  <!--对应数据展示 -->
+  <view class="{{activeState==1?'whoBox showBoxs':'whoBox'}}" >
+    <view class="new_con_info">
+          <!-- 待审核 -->
+          <view class="modify_echarts_max" style="margin: 30rpx 0;">
+            <view class="modify_echarts_title_min">
+              <view class="modify_eharts_title" >待审核人员列表</view>
+              <pz-screen-training columns="{{DeviceGroupData}}" bindscreen="screenCondition1"></pz-screen-training>
+            </view>
+          </view>
+          <view class="boxInsideStyle">
+          <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index" wx:if="{{index<150}}" data-id="{{item.id}}">
+            <view style="display: flex;">
+              <view style="border-bottom:1px solid #8862f8">
+                <radio value="" checked="{{item.selected}}" bindtap="selectList" data-index="{{index}}" style="transform: scale(0.7);" />
+              </view>
+              <view class="new_con_title" style="border-bottom: 2px solid #293063;">
+                {{item.labor_team_name}}
+              </view>
+            </view>
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td" style="display:flex;justify-content: space-between;">
+                    <view style="display: flex;">
+                      归属工种： <view style="color:#439bde">
+                        {{item.work_type_name}}
+                      </view>
+                    </view>
+                    <view style="display: flex;">
+                      姓名： <view style="color:#439bde">
+                        {{item.id_card_name}}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="new_con_td">注册时间：{{item.create_time}}</view>
+                  <view class="new_con_td">安全教育时间：{{item.safety_education_time}}</view>
+                  <view class="new_con_td" style="display: flex;">安全教育成绩：
+                    <view style="color: #439bde;display: flex;">{{item.score}}分
+                      <view style="color: green;" wx:if="{{item.result == '0'}}">(合格)</view>
+                      <view style="color: red;" wx:if="{{item.result == '1'}}">(不合格)</view>
+                    </view>
+                  </view>
+                  <view class="new_con_td" style="white-space:nowrap;position: relative;">安全承诺书签订时间：{{item.sign_time}}
+                    <view style="width:34rpx;height:34rpx;position: absolute;right: -80rpx;top: 8rpx;" data-url="{{item.letter_commitment_url}}" bindtap="openFile">
+                      <image src="http://fileimg.makalu.cc/WEB_560F605B02BC49DA834A05D39BE4B051.png" mode="" style="width: 100%;height: 100%;" />
+                    </view>
+                  </view>
+                </van-col>
+                <!-- <van-col span="6">
+                  <view class="new_zhong_clz">待审核</view>
+                </van-col> -->
+              </van-row>
+            </view>
+          </view>
+        </view>
+        </view>
+ </view>
+ <view class="{{activeState==2?'whoBox showBoxs':'whoBox'}}" >
+  <view class="new_con_info" >
+          <!-- 已通过 -->
+          <view class="modify_echarts_max" style="margin: 30rpx 0;">
+            <view class="modify_echarts_title_min">
+              <view class="modify_eharts_title">已通过人员列表</view>
+              <pz-screen-training columns="{{DeviceGroupData}}" bindscreen="screenCondition2"></pz-screen-training>
+            </view>
+          </view>
+          <view class="boxInsideStyle">
+            <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index" wx:if="{{index<150}}" data-id="{{item.id}}" >
+            <view style="display: flex;">
+              <!-- <view style="border-bottom:1px solid #8862f8">
+                <radio value="" style="transform: scale(0.7);" />
+              </view> -->
+              <view class="new_con_title" style="border-bottom: 2px solid #293063;">
+                {{item.labor_team_name}}
+              </view>
+            </view>
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td" style="display:flex;justify-content: space-between;">
+                    <view style="display: flex;">
+                      归属工种： <view style="color:#439bde">
+                        {{item.work_type_name}}
+                      </view>
+                    </view>
+                    <view style="display: flex;">
+                      姓名： <view style="color:#439bde">
+                        {{item.id_card_name}}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="new_con_td">注册时间：{{item.create_time}}</view>
+                  <view class="new_con_td">安全教育时间：{{item.safety_education_time}}</view>
+                  <view class="new_con_td" style="display: flex;">安全教育成绩：
+                    <view style="color: #439bde;display: flex;">{{item.score}}分
+                      <view style="color: green;" wx:if="{{item.result == '0'}}">(合格)</view>
+                      <view style="color: red;" wx:if="{{item.result == '1'}}">(不合格)</view>
+                    </view>
+                  </view>
+                  <view class="new_con_td" style="white-space:nowrap;position: relative;">安全承诺书签订时间：{{item.sign_time}}
+                    <view style="width:34rpx;height:34rpx;position: absolute;right: -80rpx;top: 8rpx;" data-url="{{item.letter_commitment_url}}" bindtap="openFile">
+                      <image src="http://fileimg.makalu.cc/WEB_560F605B02BC49DA834A05D39BE4B051.png" mode="" style="width: 100%;height: 100%;" />
+                    </view>
+                  </view>
+                </van-col>
+                <!-- <van-col span="6">
+                  <view class="new_zhong_clz">待审核</view>
+                </van-col> -->
+              </van-row>
+            </view>
+          </view>
+          </view>
+        </view>
+ </view>
+ <view class="{{activeState==3?'whoBox showBoxs':'whoBox'}}" >
+  <view class="new_con_info" >
+          <!-- 已驳回 -->
+          <view class="modify_echarts_max" style="margin: 30rpx 0;">
+            <view class="modify_echarts_title_min">
+              <view class="modify_eharts_title">已驳回人员列表</view>
+              <pz-screen-training columns="{{DeviceGroupData}}" bindscreen="screenCondition3"></pz-screen-training>
+            </view>
+          </view>
+          
+          <view class="boxInsideStyle">
+          <view class="new_con_info_min" wx:for="{{environList}}" wx:key="index" wx:if="{{index<150}}" data-id="{{item.id}}">
+            <view style="display: flex;">
+              <!-- <view style="border-bottom:1px solid #8862f8">
+                <radio value="" style="transform: scale(0.7);" />
+              </view> -->
+              <view class="new_con_title" style="border-bottom: 2px solid #293063;">
+                {{item.labor_team_name}}
+              </view>
+            </view>
+            <view class="new_con_ds">
+              <van-row>
+                <van-col span="18">
+                  <view class="new_con_td" style="display:flex;justify-content: space-between;">
+                    <view style="display: flex;">
+                      归属工种： <view style="color:#439bde">
+                        {{item.work_type_name}}
+                      </view>
+                    </view>
+                    <view style="display: flex;">
+                      姓名： <view style="color:#439bde">
+                        {{item.id_card_name}}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="new_con_td">注册时间：{{item.create_time}}</view>
+                  <view class="new_con_td">安全教育时间：{{item.safety_education_time}}</view>
+                  <view class="new_con_td" style="display: flex;">安全教育成绩：
+                    <view style="color: #439bde;display: flex;">{{item.score}}分
+                      <view style="color: green;" wx:if="{{item.result == '0'}}">(合格)</view>
+                      <view style="color: red;" wx:if="{{item.result == '1'}}">(不合格)</view>
+                    </view>
+                  </view>
+                  <view class="new_con_td" style="white-space:nowrap;position: relative;">安全承诺书签订时间：{{item.sign_time}}
+                    <view style="width:34rpx;height:34rpx;position: absolute;right: -80rpx;top: 8rpx;" data-url="{{item.letter_commitment_url}}" bindtap="openFile">
+                      <image src="http://fileimg.makalu.cc/WEB_560F605B02BC49DA834A05D39BE4B051.png" mode="" style="width: 100%;height: 100%;" />
+                    </view>
+                  </view>
+                </van-col>
+                <!-- <van-col span="6">
+                  <view class="new_zhong_clz">待审核</view>
+                </van-col> -->
+              </van-row>
+            </view>
+          </view>
+        </view>
+      </view>
+ </view>
+ </view>
+
+
+
+
+
+
+<van-overlay show="{{ stateShow }}">
+  <view class="state_wrapper">
+    <view class="state_content">
+      <view class="state_content_title">审核结果</view>
+      <view class="state_content_nav" wx:if="{{labelShow}}">
+        <view class="{{nav==1?'active':''}}" bindtap="onLabelNav" data-nav="1">通过</view>
+        <view class="{{nav==2?'active':''}}" bindtap="onLabelNav" data-nav="2">驳回</view>
+      </view>
+      <view class="state_content_remar_max">
+        <view class="state_content_btn">
+          <view bindtap="closeBox">关闭</view>
+          <view bindtap="submit">确定</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</van-overlay>
+
+<van-overlay show="{{show}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>
+
+<view wx:if="{{labelShow}}" style="position: fixed;bottom: 0;left: 0;height: 80rpx;width: 100%;display: flex;justify-content: space-around;align-items: center;background-color: #212737;padding: 14rpx 0;">
+  <view style="display: flex;align-items: center;color: #6b81bb;" bindtap="checkAll">
+    <radio value="" checked="{{allchecked}}" />全选
+  </view>
+  <view style="display: flex;align-items: center;">
+    <view style="margin-right: 16rpx;">
+      已选 ({{number}})
+    </view>
+    <view style="width:200rpx;height:60rpx;border:1px solid #884df7;line-height: 60rpx;text-align: center;border-radius: 40rpx;background-color: #884df7;" bindtap="onWarningInfo">
+      去审核
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/temporaryToExamine/index.wxss b/miniprogram/pages/temporaryToExamine/index.wxss
new file mode 100644
index 0000000..9b5cef1
--- /dev/null
+++ b/miniprogram/pages/temporaryToExamine/index.wxss
@@ -0,0 +1,167 @@
+/* pages/temporaryToExamine/index.wxss */
+.van-ellipsis{
+	background: #191d28;
+  }
+  .van-tab--active{
+	color:#8aa2e8 !important;
+  }
+  .van-hairline--top-bottom:after{
+	border-width: 0 0 !important
+  }
+  .van-tabs__line{
+	background: #8aa2e8 !important;
+	font-weight: bold !important;
+  }
+  .van-tag--mark{
+	margin:0 10rpx ;
+  }
+  .van-tag--mark,.van-tag--mark:after {
+	border-radius: 15rpx 0 15rpx 0 !important;
+  }
+  /* 页面样式 */
+  .max_content_none{
+	padding: 0 0 50rpx;
+  }
+  .new_tips{
+	text-align: center;
+	font-size: 24rpx;
+	color:#8aa2e8 ;
+	padding: 20rpx 0;
+  }
+  .new_tips image{
+	width: 30rpx;
+	height: 30rpx;
+  }
+  .new_nav{
+	padding:200rpx 30rpx 30rpx 30rpx;
+  }
+  .new_con_info{
+	padding: 30rpx 0 0;
+  }
+  .new_con_info_min{
+	background:#232943 ;
+	border-radius: 20rpx;
+	padding:20rpx 30rpx;
+	margin-bottom: 30rpx;
+  }
+  .new_con_title{
+	font-weight: bold;
+	font-size: 30rpx;
+  }
+  .new_con_ds{
+	padding: 20rpx 0 0;
+  }
+  .new_con_td{
+	color:#8aa2e8 ;
+	font-size: 26rpx;
+	padding: 8rpx;
+  }
+  .new_zhong_clz{
+	font-size: 28rpx;
+	color: #9499ac;
+	text-align: center;
+	margin-top: 20rpx;
+  }
+  .new_zhong_wc{
+	background:linear-gradient(to right, #8b4bf7 , #7457ff); 
+	font-size: 28rpx;
+	text-align: center;
+	margin-top: 20rpx;
+	padding: 10rpx 0;
+	border-radius: 50rpx;
+  }
+  .new_zhong_dcb{
+	font-size: 28rpx;
+	color: #f49829;
+	text-align: center;
+	margin-top: 20rpx;
+  }
+  .new_zhong_ycb{
+	background:#5c5e6b; 
+	font-size: 28rpx;
+	text-align: center;
+	margin-top: 20rpx;
+	padding: 10rpx 0;
+	border-radius: 50rpx;
+  }
+  
+  /* 弹窗 */
+  .state_wrapper{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+  }
+  .state_content{
+	width: 90%;
+	background: #1d212e;
+	border-radius: 10rpx;
+  }
+  .state_content_title{
+	padding: 30rpx;
+  }
+  .state_content_nav{
+	padding: 15rpx 30rpx;
+	display: flex;
+	align-items: center;
+  }
+  .state_content_nav view{
+	padding: 5rpx 30rpx;
+	border: 1px solid #444957;
+	color: #444957;
+	margin-right: 30rpx;
+	font-size: 26rpx;
+	border-radius: 30rpx;
+  }
+  .state_content_nav .active{
+	border: 1px solid #8aa2e8;
+	color: #8aa2e8;
+  }
+  .state_content_remar_max{
+	padding: 30rpx;
+  }
+  .state_content_remar{
+	background: #2c3346;
+	padding: 30rpx;
+	border-radius: 10rpx;
+  }
+  .state_content_remar textarea{
+	min-height: 150rpx;
+	width:100%;
+	background: #2c3346;
+  }
+  .state_content_btn{
+	padding: 30rpx 30rpx 0;
+	display: flex;
+	align-items: center;
+	justify-content:flex-end;
+  }
+  .state_content_btn view{
+	padding: 10rpx;
+	width: 130rpx;
+	border: 1px solid #252c3d;
+	background: #252c3d;
+	text-align: center;
+	color: #6a7faa;
+	margin-left: 20rpx;
+  }
+  /* 外盒子边框 */
+  .boxInsideStyle{
+	  padding: 0rpx 30rpx;
+  }
+  .whoBox{
+	position: absolute;
+	top: 144rpx;
+	left: 0;
+	width: 100%;
+	display: none;
+}
+/* .outsideBox{
+	position: absolute;
+	top: 0;
+	left: 0;
+
+} */
+.showBoxs{
+display: block;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/updatePassword/updatePassword.js b/miniprogram/pages/updatePassword/updatePassword.js
new file mode 100644
index 0000000..2a74f2a
--- /dev/null
+++ b/miniprogram/pages/updatePassword/updatePassword.js
@@ -0,0 +1,162 @@
+const app = getApp()
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    loginName:null,
+    oldPsw:'',
+    newPsw:'',
+    password:'',
+    showOldPass:true,
+    showNewPass:true,
+    showPassWord:true,
+    //数据加载参数
+    show:false, 
+  },
+
+  onClickShow() {
+    this.setData({ show: true });
+  },
+
+  onClickHide() {
+    this.setData({ show: false });
+  },
+
+  //获取填写的旧密码信息
+  oldPsw:function(even){
+    this.setData({
+      oldPsw:even.detail.value
+    })
+  },
+  //获取填写的新密码信息
+  newPsw:function(even){
+    this.setData({
+      newPsw:even.detail.value
+    })
+  },
+  //获取填写的新密码信息
+  password:function(even){
+    this.setData({
+      password:even.detail.value
+    })
+  },
+
+  seeTap1:function(){
+    let that = this;
+    this.setData({
+      // 切换图标
+      showOldPass:!that.data.showOldPass
+    })
+  },
+
+  seeTap2:function(){
+      let that = this;
+      this.setData({
+        // 切换图标
+        showNewPass:!that.data.showNewPass
+      })
+    },
+
+  seeTap3:function(){
+        let that = this;
+        this.setData({
+          // 切换图标
+          showPassWord:!that.data.showPassWord
+        })
+        if(this.data.newPsw!='' && this.data.newPsw!=this.data.password){
+          app.toast("两次密码输入不一致！");
+        }
+      },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.onClickShow();
+    var that = this;
+    //获取缓存数据
+    wx.getStorage({
+      key: 'userinfo',
+      success:function(res){
+        that.setData({
+          loginName:res.data.loginName,
+        })  
+      }
+    })
+    this.onClickHide();
+  },
+  /**
+   * 添加预警信息
+   */
+  submit:function(){
+    var that = this;
+    if(that.data.oldPsw == ''){
+      app.toast("请输入旧密码！");
+      return;
+    }
+    if(that.data.newPsw == ''){
+      app.toast("请输入旧密码！");
+      return;
+    }
+    if(that.data.password == ''){
+      app.toast("请确认新密码！");
+      return;
+    }
+    if(that.data.newPsw!='' && that.data.newPsw!=that.data.password){
+      app.toast("两次密码输入不一致！");
+      return;
+    }
+    if(this.data.oldPsw.length<6){
+      app.toast("请输入旧密码长度 [6-20]位字符！");
+      return;
+    }
+    if(this.data.newPsw.length<6){
+      app.toast("请输入新密码长度 [6-20]位字符！");
+      return;
+    }
+    if(this.data.password.length<6){
+      app.toast("请输入确认密码长度 [6-20]位字符！");
+      return;
+    }
+    that.onClickShow();
+    wx.request({
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      url:app.globalData.reqUrl+'/weixin/userLogin/updatePassword',
+      data:{
+        loginName:that.data.loginName,
+        oldPsw:that.data.oldPsw,
+        newPsw:that.data.newPsw,
+        password:that.data.password
+      },
+      method:"POST",
+     success:function(res){
+      that.onClickHide();
+       if(res.data && res.data.data=="200"){
+        wx.clearStorageSync();
+        wx.setStorageSync('isReload', "1");
+        app.toast("密码修改成功！");
+          wx.redirectTo({
+            url: '../login/login',
+          }); 
+       }else{
+         app.toast(res.data.info);
+         return;
+       }
+     }
+    })
+  },
+
+  //返回到项目概况页面
+  goGCLB:function(){
+    wx.redirectTo({
+      url: '../xiangmugaikuang/xiangmugaikuang'
+    })
+  },
+  //修改密码
+  QRXG:function(){
+    this.submit();
+  }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/updatePassword/updatePassword.json b/miniprogram/pages/updatePassword/updatePassword.json
new file mode 100644
index 0000000..c59cb98
--- /dev/null
+++ b/miniprogram/pages/updatePassword/updatePassword.json
@@ -0,0 +1,14 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-popup": "@vant/weapp/popup",
+    "van-button": "@vant/weapp/button",
+    "van-picker": "@vant/weapp/picker/index",
+    "van-area": "@vant/weapp/area/index",
+    "mkl-multi-select": "/components/@mkl/multi-select/index" ,
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/updatePassword/updatePassword.wxml b/miniprogram/pages/updatePassword/updatePassword.wxml
new file mode 100644
index 0000000..642d94b
--- /dev/null
+++ b/miniprogram/pages/updatePassword/updatePassword.wxml
@@ -0,0 +1,61 @@
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="16">
+        <view class="header_name">修改密码</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+<view class="max_content" >
+  <view class="add_max">
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请输入旧密码" 
+            placeholder-style="color:#6777aa;" password="{{showOldPass}}" maxlength="20" class="pass" bindinput='oldPsw'/>
+            <image wx:if="{{showOldPass}}" class="password-icon" src="../../images/biyan.png" bindtap="seeTap1" ></image>
+            <image wx:else class="password-icon" src="../../images/yj_01.png" bindtap="seeTap1"></image>
+        </view>
+      </view>
+  </view>
+  <view class="add_max">
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请输入新密码" 
+            placeholder-style="color:#6777aa;" password="{{showNewPass}}" maxlength="20" class="pass" bindinput='newPsw'/>
+            <image class="password-icon" src="../../images/biyan.png" bindtap="seeTap2" wx:if="{{showNewPass}}"/>
+            <image class="password-icon" src="../../images/yj_01.png" bindtap="seeTap2" wx:else/>
+        </view>
+      </view>
+  </view>
+  <view class="add_max">
+      <view class="voucher_select_max">
+        <view class="voucher_select_min">
+            <input placeholder="请确认新密码" 
+            placeholder-style="color:#6777aa;" password="{{showPassWord}}" maxlength="20" class="pass" bindinput='password'/>
+            <image class="password-icon" src="../../images/biyan.png"bindtap="seeTap3" wx:if="{{showPassWord}}"/>
+            <image class="password-icon" src="../../images/yj_01.png" bindtap="seeTap3" wx:else/>
+        </view>
+      </view>
+  </view>
+  <view class="left_manage_min">
+      <view class="left_manage" bindtap="QRXG">
+        <view class="left_password">
+          确认修改
+        </view>
+      </view>
+  </view>
+</view>  
+<van-overlay show="{{show}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
+
diff --git a/miniprogram/pages/updatePassword/updatePassword.wxss b/miniprogram/pages/updatePassword/updatePassword.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/miniprogram/pages/winter-training/index.js b/miniprogram/pages/winter-training/index.js
new file mode 100644
index 0000000..e310ab8
--- /dev/null
+++ b/miniprogram/pages/winter-training/index.js
@@ -0,0 +1,252 @@
+// pages/winter-training/index.js
+const app = getApp()
+Page({
+
+    
+    /**
+     * 页面的初始数据
+     */
+    data: {
+       show:false,
+        userName:"",
+        typeWordName:"",
+        companyName:"",
+        signUrl:"",
+        mainId:"",
+        cultivateType:"",
+        cardId:"",
+        isShow:false,
+        szhprojectId:"",
+        smzprojectId:"",
+        loadShow:false,
+        data:{},
+        phoneNumber:"",
+        cardNumber:"",
+        firstWorkType:""
+    },
+// 展示图片
+showImg(){
+  this.setData({
+    show:true
+  })
+  },
+  // 关闭遮罩层
+  closeShow(){
+    this.setData({
+      show:false
+    })
+  },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let {userName,typeWordName,companyName,signUrl,mainId,cultivateType,cardId,szhprojectId,smzprojectId} = options
+        this.setData({
+            szhprojectId,
+            smzprojectId,
+            userName,
+            typeWordName,
+            companyName,
+            signUrl,
+            mainId,
+            cultivateType,
+            cardId
+        })
+        wx.setStorageSync('companyName', companyName)
+        wx.setStorageSync('smzprojectId', smzprojectId)
+        wx.setStorageSync('szhprojectId', szhprojectId)
+        wx.setStorageSync('answerName', userName)
+        wx.setStorageSync('cultivateType', cultivateType)
+        this.checkLearn();
+        this.getUserInfo();
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+
+    /**
+     * 跳转学习页面
+     */
+    affirmLearn() {
+      if(this.data.cultivateType == 4) {
+        console.log(this.data)
+          //获取projectId 和用户的phonenumber或idcard
+            wx.redirectTo({
+              url: '../newAddPage2/safetyBriefingLearning/index?projectId='+this.data.szhprojectId+"&firstWorkType="+this.data.firstWorkType+"&secondWorkType="+this.data.typeWord
+              ,complete:function(res){
+                console.log(res)
+              },fail: err => {
+                console.log(err)
+              }
+            });
+      } else {
+          this.submit()
+      }
+    },
+
+    /**
+     * 校验学习
+     */
+    checkLearn(){
+      let that = this
+      wx.request({
+        url: app.globalData.szhUrl+"/business/saftEducationOpenIdMap/listPersonSign",
+        method:"GET",
+        data:{
+          main_id:this.data.mainId,
+          project_id:this.data.szhprojectId,
+          cultivate_type:this.data.cultivateType,
+          resident_id:this.data.cardId
+        },
+        header: {
+          'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+        },
+        success(res){
+              that.setData({
+                isShow:res.data.data && res.data.code == "200" && res.data.data.length > 0
+              })
+              
+        }
+      })
+    },
+
+
+
+    /**
+     * 确认学习
+     */
+    submit(){
+      var that = this;
+      that.setData({
+        loadShow:true
+      })
+      console.log(mainId)
+        let {userName,mainId,cultivateType,cardId} = this.data
+        wx.request({
+          url: app.globalData.szhUrl+"/api/wei/gainWeiSanInfo",
+          method:"POST",
+          data:{
+            dept_id:131,
+            project_id:this.data.szhprojectId,
+            smz_project_id:this.data.smzprojectId,
+            main_id:mainId,
+            cultivate_type:cultivateType,
+            user_name:userName,
+            resident_id:cardId,
+            result_str:"已通过",
+            type:1
+          },
+           header: {
+            'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+          },
+          success(res){
+            that.setData({
+              loadShow:false
+            })
+              if(res.data.code == 200){
+                app.toast("学习成功");
+                that.setData({
+                  isShow:true
+                })
+
+              }
+          }
+        })
+    },
+    /**
+     * 取消学习
+     */
+    cancelLearn(){
+        //在需要退出小程序的地方调用添加下面代码即可(js文件中)
+        wx.exitMiniProgram({success: (res) => {
+
+        },fail:(res)=>{
+          console.log(res)
+        }})
+    },
+    /**
+     * 获取用户信息
+     */
+    getUserInfo(){
+      var that = this
+      let openId = wx.getStorageSync('openId') != null || wx.getStorageSync('openId') ?wx.getStorageSync('openId'):"123"
+       //获取用户在实名制用户信息
+      wx.request({
+          url: app.globalData.szhUrl + "/business/saftEducationOpenIdMap/wxList",
+          method:"post",
+          data:{
+              openId:openId
+          },
+          header: {
+              'content-type': 'application/x-www-form-urlencoded' //修改此处即可
+          },
+          success(signTemp){
+              let temp =  signTemp.data.rows.length <= 0 ? "":signTemp.data.rows[0]
+              console.log(temp)
+              let {projectId,phoneNumber,typeWord,specialFlag,cardId,typeWordName,userName,companyName} = temp
+              console.log(temp);
+              that.setData({
+                  phoneNumber:phoneNumber,
+                  smzprojectId:projectId,
+                  typeWord:typeWord,
+                  firstWorkType:specialFlag==0?9:8,
+                  cardId:cardId
+              })
+              wx.setStorageSync('companyName', companyName)
+              wx.setStorageSync('answerName', userName)
+              wx.setStorageSync('cardId', cardId)
+              wx.setStorageSync('typeWordName', typeWordName)
+              
+          }
+      })
+
+      return;
+  }
+  
+})
\ No newline at end of file
diff --git a/miniprogram/pages/winter-training/index.json b/miniprogram/pages/winter-training/index.json
new file mode 100644
index 0000000..6fd49b0
--- /dev/null
+++ b/miniprogram/pages/winter-training/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-overlay": "@vant/weapp/overlay/index"
+    },
+    "navigationBarTitleText": "安全学习确认"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/winter-training/index.wxml b/miniprogram/pages/winter-training/index.wxml
new file mode 100644
index 0000000..92a10b3
--- /dev/null
+++ b/miniprogram/pages/winter-training/index.wxml
@@ -0,0 +1,70 @@
+<!-- 冬季培训 -->
+<view class="learn-binding">
+	<!-- 顶部栏 -->
+	<view class="learn-nav">
+	冬季施工安全专项培训
+	</view>
+	<!-- 头部模块 -->
+	<view class="learn-header">
+		<image src="http://fileimg.makalu.cc/WEB_77C2BB6ECBEA4F39B7E22CF5E96DB652.png" mode=""/>
+	</view>
+	<!-- 内容部分 -->
+	<view class="learn-content"> 
+		<view style="display: flex;justify-content: space-between;align-items: center;width: 598rpx;height: 60rpx;">
+			<view style="color: #848fce;">
+				姓名:
+			</view>
+			<view>
+				{{userName}}
+			</view>
+		</view>
+		<view  style="display: flex;justify-content: space-between;align-items: center;width: 598rpx;height: 60rpx;" >
+			<view style="color: #848fce;">
+				归属工种:
+			</view>
+			<view>
+				{{typeWordName}}
+			</view>
+		</view>
+		<view  style="display: flex;justify-content: space-between;align-items: center;width: 598rpx;height: 60rpx;">
+			<view style="color: #848fce;">
+			归属劳务队:
+			</view>
+			<view>
+				{{companyName}}
+			</view>
+		</view>	
+		<view  style="display: flex;justify-content: space-between;align-items: center;width: 598rpx;height: 60rpx;">
+			<view style="color: #848fce;">
+			我的电子签名:
+			</view>
+			<view style="width:150rpx;height:60rpx;">
+				<image src="{{signUrl}}" bindtap='showImg' mode="" style="width: 100%;height: 100%;filter: invert(100%);"/>
+				<!-- 展示图片 -->
+				<page-container  wx:if="{{show}}" position="center" bindtap="closeShow">
+					<view style="width: 100%;height: 100%;background: rgba(255, 255, 255, 0.7);position: absolute;top: 0;left: 0;">
+						<image src="{{signUrl}}" mode="" style="width: 100%;height: 100%;"/>
+					</view>
+				</page-container>
+			</view>
+		</view>	
+	</view>
+	<!-- 底部模块 -->
+	<view class="learn-footer">
+		<view wx:if="{{!isShow}}" bindtap="affirmLearn" style="width: 420rpx;height:88rpx;border: 1px solid pink;text-align: center;line-height: 88rpx;font-size: 28rpx;letter-spacing: 4rpx;border-radius: 80rpx;background-color: #523fa8;">
+			确认学习
+		</view>
+		<view  wx:if="{{isShow}}" style="width: 420rpx;height:88rpx;text-align: center;line-height: 88rpx;font-size: 28rpx;letter-spacing: 4rpx;border-radius: 80rpx;">
+			已学习
+		</view>
+		<view bindtap="cancelLearn" style="color: #848fce;">
+			关闭
+		</view>
+	</view>
+</view>
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pages/winter-training/index.wxss b/miniprogram/pages/winter-training/index.wxss
new file mode 100644
index 0000000..1d8c26f
--- /dev/null
+++ b/miniprogram/pages/winter-training/index.wxss
@@ -0,0 +1,48 @@
+/* 冬季培训 */
+.learn-binding{
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-start;
+	align-items: center;
+}
+/* 顶部栏 */
+.learn-nav{
+	width: 100%;
+	height: 100rpx;
+	line-height: 100rpx;
+	text-align: center;
+	letter-spacing: 4rpx;
+	font-size: 28rpx;
+	background: linear-gradient(to Bottom,#4f5b7c,#212b48);
+}
+/* 头部部分 */
+.learn-header{
+	width: 344rpx;
+	height: 344rpx;
+	margin:88rpx 0;
+}
+.learn-header image{
+	width: 100%;
+	height: 100%;
+}
+/* 内容部分 */
+.learn-content{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	align-items: center;
+	width: 100%;
+	height: 360rpx;
+	font-size: 26rpx;
+}
+/* 底部模块 */
+.learn-footer{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 160rpx;
+	margin: 80rpx 0;
+	font-size: 26rpx;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
new file mode 100644
index 0000000..9c2e0d5
--- /dev/null
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
@@ -0,0 +1,694 @@
+import * as echarts from '../../ec-canvas/echarts';
+
+const app = getApp();
+
+
+//加载视频监控饼图
+  let datas_1 = [];
+  let formatNumber_1 = function(num) {
+    let reg = /(?=(\B)(\d{3})+$)/g;
+    return num.toString().replace(reg, ',');
+  }
+  function arrayobj_1  (array, key) {
+    var resObj = {}
+    for (var i = 0; i < array.length; i++) {
+        resObj[array[i][key]] = array[i]
+    }
+    return resObj
+  }
+  function initChart_1(chart_1,datas_1) {
+    //定义参数
+    let objData_1 = arrayobj_1(datas_1, 'name');
+    let total_1 = datas_1.reduce((a, b) => {
+      return a + b.value * 1
+  }, 0);
+    let title_1 = '接入数';
+    var option_1 = {
+      color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+      title: [{
+        text: '{val|' + formatNumber_1(total_1) + '} \n {name|' + title_1 + '} ',
+        top: '31%',
+        left: '20%',
+        textStyle: {
+            rich: {
+                name: {
+                    fontSize: 14,
+                    fontWeight: 'normal',
+                    color: '#fff',
+                    padding: [10, 0]
+                },
+                val: {
+                    fontSize:25,
+                    fontWeight: 'bold',
+                    color: '#0ad7ec',
+                    padding: [0, 10]
+                }
+            }
+        }
+    }],
+      tooltip: {
+        trigger: 'item',
+      },
+      legend: {
+          orient: 'vertical',
+          top: "center",
+          right: "5%",
+          icon: 'circle',
+          data: ['一工区'],
+          textStyle: {
+              color: "#fff",
+              fontSize: 10
+          },
+          formatter(name) {
+            return `${name}   ${objData_1[name].value}`
+          }
+      },
+      series: [{
+            type: 'pie',
+            radius: ['65%', '90%'],
+            center: ['30%', '50%'],
+            avoidLabelOverlap: false,
+            label: {
+                show: false,
+                position: 'center'
+            },
+            emphasis: {
+                label: {
+                    show: true,
+                    fontSize: '14'
+                }
+            },
+            labelLine: {
+                show: false
+            },
+            hoverAnimation: false,
+            data: datas_1
+        }]
+    };
+    chart_1.setOption(option_1);
+  }
+ 
+//机械设备饼图
+  let formatNumber_2 = function(num) {
+    let reg = /(?=(\B)(\d{3})+$)/g;
+    return num.toString().replace(reg, ',');
+  }
+  function arrayobj_2  (Array, key) {
+    var resObj = {}
+    for (var i = 0; i < Array.length; i++) {
+        resObj[Array[i][key]] = Array[i]
+    }
+    return resObj
+  }
+function initChart_2(chart_2,datas_2,datas_name) {
+  //定义参数
+  let objData_2 = arrayobj_2(datas_2, 'name');
+  let total_2 = datas_2.reduce((a, b) => {
+    return a + b.value * 1
+  }, 0);
+  let title_2 = '接入数';
+
+  var option_2 = {
+    color: ["#ffac50", "#ed6942", "#9e40ec", "#1f8efa", "#06c985"],
+    title: [{
+      text: '{val|' + formatNumber_2(total_2) + '} \n {name|' + title_2 + '} ',
+      top: '31%',
+      left: '20%',
+      textStyle: {
+          rich: {
+              name: {
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  color: '#fff',
+                  padding: [10, 0]
+              },
+              val: {
+                  fontSize:25,
+                  fontWeight: 'bold',
+                  color: '#0ad7ec',
+                  padding: [0, 10]
+              }
+          }
+      }
+  }],
+    tooltip: {
+      trigger: 'item',
+    },
+    legend: {
+        orient: 'vertical',
+        top: "center",
+        right: "5%",
+        icon: 'circle',
+        data: datas_name,
+        textStyle: {
+            color: "#fff",
+            fontSize: 10
+        },
+        formatter(name) {
+          return `${name}   ${objData_2[name].value}`
+        }
+    },
+    series: [{
+          type: 'pie',
+          radius: ['65%', '90%'],
+          center: ['30%', '50%'],
+          avoidLabelOverlap: false,
+          label: {
+              show: false,
+              position: 'center'
+          },
+          emphasis: {
+              label: {
+                  show: true,
+                  fontSize: '14'
+              }
+          },
+          labelLine: {
+              show: false
+          },
+          hoverAnimation: false,
+          data: datas_2
+      }]
+  };
+  chart_2.setOption(option_2);
+}
+
+//劳务管理
+function initChart_3(chart_3, xData_3, yData_3) {
+  var option_3 = {
+    color: ['#5a8df6'],
+    tooltip: {
+        trigger: 'axis'
+    },
+
+    grid: {
+        top: '22%',
+        left: '3%',
+        right: '1%',
+        bottom: '0%',
+        containLabel: true
+    },
+    xAxis: [{
+        type : 'category',
+        boundaryGap : false,
+        data : xData_3,
+        axisTick: {
+            show: false
+        },
+        axisLine: {
+            lineStyle: {
+                color: 'rgba(39,51,75,0.8)'
+            }
+        },
+        axisLabel: {
+            color: '#8aa3ec',
+            rotate: 45,
+            textStyle: {
+                fontSize: 10
+            },
+        },
+    }],
+    yAxis: {
+        type : 'value',
+        name:"单位:个",
+        nameTextStyle: {
+            color: "#008fe9",
+            fontSize: 11
+        },
+        axisLabel: {
+            show: true,
+            textStyle: {
+                color: "#008fe9",
+                fontSize: 10
+            }
+        },
+        splitLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(39,51,75,0.5)'
+            }
+        },
+        axisLine: {
+            show: true,
+            lineStyle: {
+                color: 'rgba(39,51,75,0.8)'
+            }
+        },
+    },
+    series: [
+        {
+            type: 'line',
+            data: yData_3,
+            symbol: 'circle',
+            smooth: true,
+            lineStyle: {
+                color: '#5a8df6',
+                width: 2
+            },  
+        }
+    ]  
+  }
+  chart_3.setOption(option_3);
+  return chart_3;
+}
+
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    active:0,  
+    show: false,
+    activeNames: ["1"],  
+    ec_1: {
+      lazyLoad: true //动态加载
+    },
+    ec_2: {
+      lazyLoad: true
+    },
+    ec_3: {
+      lazyLoad: true
+    },
+    //参数——————————————————————————————————————
+    //组织架构id
+    deptId:'',
+    //项目的id
+    projectId:'',
+    //项目名称参数
+    projectNameArgs:'',
+    //项目信息
+    projectInfo:{},
+    projectUnitsList:[],
+    //视频接入数
+    videoNum:'',
+    //正常视频数
+    videoOnline:'',
+    //机械接入数
+    machineryNum:'',
+    //正常机械运行数
+    machineryOnline:'',
+    monthEarlyNum:'0',
+    yangchenCount:'0',
+    weather:'',
+    weatherPic:'',
+    temperature:'',
+    //加载模板参数
+    loadShow:false,
+
+    initData:{}
+  },
+
+  //项目切换 返回值
+  onProjectSelect(e){
+    this.onClickShow();
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;  
+    this.setData({
+      projectId:projectId,
+      projectName:projectName
+    })
+
+    this.onLoad();
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose1() {
+    this.setData({ show: false });
+  },
+
+  // 手风琴
+  onChange1(event) {
+    this.setData({
+      activeName: event.detail,
+    });
+  },
+  onOpen(event){},
+  onClose(event){},
+
+  //初始化视频监控饼图数据
+  init_one: function (datas_1) {
+    this.oneComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_1(chart, datas_1);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  //初始化机械设备饼图数据
+  init_two: function (datas_2,datas_name) {
+    this.twoComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_2(chart, datas_2,datas_name);
+      this.chart = chart;
+      return chart;
+    });
+  },
+  
+  //初始化劳务管理
+  init_three: function (xData_1,yData_1) {
+    this.threeComponent.init((canvas, width, height,dpr) => {
+      const chart = echarts.init(canvas, null, {
+        width: width,
+        height: height,
+        devicePixelRatio: dpr //解决小程序视图模糊的问题，必写
+      });
+      initChart_3(chart, xData_1,yData_1);
+      this.chart = chart;
+      return chart;
+    });
+  },
+
+  onClickShow() {
+    this.setData({ loadShow: true });
+  },
+
+  onClickHide() {
+    this.setData({ loadShow: false });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.onClickShow();
+    this.setData({
+      activeName: ["1"],
+    });
+    var that = this;
+      //获取缓存数据
+      wx.getStorage({
+        key: 'userinfo',
+        success:function(res){
+          that.setData({
+            loginName:res.data.loginName,
+            userName:res.data.userName,
+            nickName:res.data.nickName,
+            deptName:res.data.deptName,
+            roleName:res.data.roleName.split(',')[0],
+            projectId:app.globalData.projectId,
+            projectNameArgs:app.globalData.projectName,
+            initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+          })  
+        }
+      })
+        //根据id获取组件
+        this.oneComponent = this.selectComponent('#mychart-one');
+        this.twoComponent = this.selectComponent('#mychart-two');
+        this.threeComponent = this.selectComponent('#mychart-three');
+        this.fourComponent = this.selectComponent('#mychart-four');
+        //项目基本信息
+        this.getProjectBaseInfo(app.globalData.projectId);
+        //项目管理信息
+        this.getProjectUnitList(app.globalData.projectId);
+        //视频数量
+        //this.getProjectVideoAll(app.globalData.projectId);
+        //机械的数据
+        //this.getMachineryNum(app.globalData.projectId);
+        //机械列表
+        //this.getMachineryList(app.globalData.projectId);
+        //视频的数据
+        //this.getVideoList(app.globalData.projectId);
+  },
+
+   // 底部导航
+   onChange(event) {
+    // event.detail 的值为当前选中项的索引
+    this.setData({ active: event.detail });
+  },
+
+  //获取项目的基本数据
+  getProjectBaseInfo:function(even) {
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectFoundation',
+      method:'GET',
+      data:{
+        id:even
+      },
+      success:resData=> {
+          this.setData({
+            projectInfo:resData.data
+          })
+           //环境监测
+            //this.selectEnvirData(even);
+            //加载天气信息
+            //this.getWeatherData(resData.data.longitude,resData.data.latitude)
+          
+      }
+    })
+  },
+
+  //加载天气数据
+  getWeatherData:function(even1,even2){
+        var that = this;
+        wx.request({
+        url: app.globalData.reqUrl+'/weixin/applets/selectWeather',
+        method:"GET",
+        data:{
+            lng:even1,
+            lat:even2,
+        },
+        success:function(weatherRes){
+            that.setData({
+                weather:weatherRes.data.weather,
+                weatherPic:weatherRes.data.weatherPic,
+                temperature:weatherRes.data.temperature        
+            })
+        }
+        })
+  } ,
+
+  //获取项目的管理信息
+  getProjectUnitList:function(projectId) {
+      var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectUnitList',
+        method:'GET',
+        data:{
+            projectId:projectId
+        },
+        success:resData=> {
+            that.onClickHide();
+            this.setData ({
+                projectUnitsList:resData.data           
+            })
+        }
+      })
+  },
+
+  // 获取项目下的视频数
+  getProjectVideoAll:function(even) {
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getProjectVideoNum',
+      method: 'get',
+      data: {
+          projectName:even
+      },
+      success: resData => {
+          this.setData({
+            videoNum:resData.data.videoAll,
+            videoOnline:resData.data.videoOnline
+          })
+      }
+    })
+  },
+
+  // 获取机械的数据
+  getMachineryNum:function(event) {
+      wx.request({
+        url: app.globalData.reqUrl+'/mkl/machinery/getMachineryDataWest',
+        data:{
+          "projectId":event
+        },
+        method:'get',
+        success:resData=> {
+            this.setData({
+                machineryNum:resData.data.allNum,
+                machineryOnline:resData.data.onlineNum
+            })
+        }
+      })
+  },
+
+  //机械的列表,名称
+  getMachineryList:function(event) {
+    var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/mkl/machinery/getMachineryListWest',
+        data:{
+          "projectId":event
+        },
+        method:'GET',
+        success:resData=> {
+          if(resData.data==''){
+              that.init_two( [{"value":"0","name":""}]);
+          }else{
+            that.init_two(resData.data);
+          }           
+        }
+      })
+  },
+
+  //获取视频的列表，名称
+  getVideoList:function(even) {
+    var that = this;
+    wx.request({
+      url: app.globalData.reqUrl+'/weixin/video/getProjectVideoListEc',
+      method:'GET',
+      data:{
+        projectName:even
+      },
+      success:resData=> {
+        that.onClickHide();
+        if(resData.data.length>0){
+          that.init_one(resData.data);
+        } 
+      }
+    })
+  },
+
+  //查询劳务人员出勤数据
+  selectEnvirData:function(even){
+      var that = this;
+      wx.request({
+        url: app.globalData.reqUrl+'/weixin/userinfo/selectAttendanceNum',
+        method:"GET",
+        data:{
+            projectId:even,
+        },
+        success:function(hjyj){
+            that.setData({
+                monthEarlyNum:hjyj.data.userCount,
+                yangchenCount:hjyj.data.userCount
+            })  
+        }
+      })
+
+       //查询出最近一周劳务人员考勤人数
+       wx.request({
+        url: app.globalData.reqUrl+'/weixin/userinfo/selectLabourDayByProjectId',
+        method:"GET",
+        data:{
+            projectId:even
+        },
+        success:function(sspm){
+          var createTime = [];
+          var userCount = [];
+          for(var i=0;i<sspm.data.length;i++){
+            createTime.push(sspm.data[i].createTime);
+            userCount.push(sspm.data[i].userCount);
+          }
+          that.init_three(createTime,userCount);
+        }
+      })
+  },
+
+  /**
+   * 拨打电话
+   * @param {*} event 
+   */
+  calling:function(event){
+    let callPhone=event.currentTarget.dataset.phone;
+    wx.makePhoneCall({
+      phoneNumber: callPhone, 
+      success:function(){
+        console.log("拨打电话成功！")
+      },
+      fail:function(){
+        console.log("拨打电话失败！")
+      }
+    })
+  },
+
+  //跳转到设备管理
+  SBGL:function(){
+    app.toast("敬请期待！");
+      // wx.redirectTo({
+      //   url: '../shebieguanli-jxsb/shajiangguan',
+      // })
+  },
+
+  //跳转到人员管理
+  RYGL:function(){
+    app.toast("敬请期待！");
+      // wx.redirectTo({
+      //   url: '../renyuanguanli/renyuanguanli'
+      // })
+  },
+
+  //跳转到安全管控
+  XMSP:function(){
+    app.toast("敬请期待！");
+    // wx.redirectTo({
+    //   //url: '../deepExcavation/index'
+    //   url:'../newAddPage/safetyManagement/index'
+    // }) 
+  },
+  
+   //跳转到质量管理
+   ZLGL2:function(){
+    app.toast("敬请期待！");
+    // wx.redirectTo({
+    //   url:'../Quality-Assurance/index'
+    // }) 
+  },
+   //跳转到进度管理
+   JDGL2:function(){
+    app.toast("敬请期待！");
+    // wx.redirectTo({
+    //   //url: '../deepExcavation/index'
+    //   url:'../../pageage/Progress-management/index'
+    // }) 
+  },
+
+  //跳转到更多功能
+  GDGN:function(){
+    wx.redirectTo({
+    url: '../gengduogongneng/gengduogongneng'
+    })                                                                
+  },
+
+    //退出登录
+    TCDL:function(){
+      wx.clearStorageSync();
+      wx.setStorageSync('isReload', "1")
+        wx.redirectTo({
+          url: '../login/login',
+        })
+      },
+      //修改密码
+      XGMM:function(){
+        wx.redirectTo({
+          url: '../updatePassword/updatePassword'
+          }) 
+      },
+    //返回到地图页面
+    GOMAP:function(){
+        wx.redirectTo({
+          url: '../map/map',
+        })
+    },  
+
+    //返回到工程列表页面
+    goGCLB:function(){
+      wx.redirectTo({
+        url: '../gongchengliebiao/gongchengliebiao'
+      })
+    }
+
+})
+
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.json b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.json
new file mode 100644
index 0000000..09f8c29
--- /dev/null
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.json
@@ -0,0 +1,17 @@
+{
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-col": "@vant/weapp/col",
+    "van-action-sheet": "@vant/weapp/action-sheet",
+    "van-sticky": "@vant/weapp/sticky",
+    "van-tabbar": "@vant/weapp/tabbar",
+    "van-tabbar-item": "@vant/weapp/tabbar-item",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-collapse": "@vant/weapp/collapse",
+    "van-collapse-item": "@vant/weapp/collapse-item",
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "van-notice-bar": "@vant/weapp/notice-bar",
+    "van-overlay": "@vant/weapp/overlay/index" 
+  },
+  "navigationStyle":"custom"
+} 
\ No newline at end of file
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml
new file mode 100644
index 0000000..52065c4
--- /dev/null
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml
@@ -0,0 +1,279 @@
+<!--pages/xiangmugaikuang/xiangmugaikuang.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
+      </van-col>
+      <van-col span="4">
+        <view class="header_img" bindtap="goGCLB">
+          <image src="/images/left.png"></image>
+          <text class="header_fh">返回</text>
+        </view>
+      </van-col>
+      <van-col span="10">
+        <view class="header_name">项目概况</view>
+      </van-col>
+    </van-row>
+  </view>
+</view>
+
+<!-- 左侧账号信息 -->
+<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose1" >
+  <view class="left_max">
+    <van-row class="demo clearfix">
+      <van-col span="24">
+          <view class="left_info_dept">{{deptName}}</view>
+      </van-col>
+      <van-col span="10">
+        <view class="left_head"><image src="../../images/user_3.png"></image></view>
+      </van-col>
+      <van-col span="14">
+        <view class="left_info">
+          <view class="left_info_name">{{nickName}}</view>
+          <view class="left_info_name">{{loginName}}</view>
+        </view>
+      </van-col>
+    </van-row>
+    <!--<view class="left_manage_max">
+       <view class="left_manage_min">
+        <view class="left_manage">
+          <image src="/images/set.png" class="left_icon"></image>
+          <text class="left_pro">账号管理</text> 
+          <image src="/images/right.png" class="left_flaot"></image>
+        </view>
+      </view>
+      <view class="left_manage_min">
+        <view class="left_manage">
+          <image src="/images/set.png" class="left_icon"></image>
+          <text class="left_pro">账号管理</text> 
+          <image src="/images/right.png" class="left_flaot"></image>
+        </view>
+      </view> 
+    </view>-->
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="XGMM">
+        <view class="left_password">
+          修改密码
+        </view>
+      </view>
+    </view>
+    <view class="left_manage_min">
+      <view class="left_manage" bindtap="TCDL">
+        <view class="left_sign">
+          退出登录
+        </view>
+      </view>
+    </view>
+  </view>
+</van-popup>
+
+<!-- 中间内容 -->
+<view class="max_content" >
+
+
+  <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+
+  <!-- <view class="video_add">
+    <view class="video_address">
+      <view class="video_address_min" bindtap="GOMAP">
+        {{projectNameArgs}}
+      </view>
+    </view>
+  </view> -->
+
+  <!-- <van-notice-bar left-icon="http://fileimg.makalu.cc/CORE_5EE3638A13954B0884A6FA54333F1B82.png" backgroundColor="#191d28"  speed="30"
+    text="扬尘预警：今日PM2.5爆表，请注意防范"
+  /> -->
+
+  <view class="gk_open" style="margin-top: 30rpx;border: 1px solid transparent;">
+    <van-collapse value="{{activeName}}" bind:change="onChange1" bind:open="onOpen" bind:close="onClose">
+      <van-collapse-item title="项目基本信息" name="1">
+        <view class="gk_open_con">
+          <view><image src="/images/s_1.png"></image>所属区域：<text>{{projectInfo.areaName}}</text></view>
+          <view><image src="/images/s_2.png"></image>详细地址：<text>{{projectInfo.projectAddress}}</text></view>
+          <view><image src="/images/s_3.png"></image>项目类型：<text>{{projectInfo.projectType}}</text></view>
+          <view><image src="/images/s_12.png"></image>项目进度：<text>{{projectInfo.projectSchedule}}</text></view>
+          <view><image src="/images/s_4.png"></image>总建筑面积：<text>{{projectInfo.totalBuildingArea}}</text></view>
+          <view><image src="/images/s_5.png"></image>计划开工日期<text>{{projectInfo.planStartTime}}</text></view>
+          <view><image src="/images/s_6.png"></image>实际开工日期：<text>{{projectInfo.actualStartTime}}</text></view>
+          <view><image src="/images/s_7.png"></image>计划竣工日期：<text>{{projectInfo.planCompletedTime}}</text></view>
+          <view><image src="/images/s_8.png"></image>总工期：<text>{{projectInfo.projectTimeLimit}}</text></view>
+          <view><image src="/images/s_10.png"></image>项目负责人：<text>{{projectInfo.projectPerson}}</text></view>
+          <view><image src="/images/s_11.png"></image>项目负责人手机号：<text>{{projectInfo.projectPhone}}</text></view>
+          <view><image src="/images/s_15.png"></image>项目概述：<text>{{projectInfo.projectSummarize}}</text></view>
+        </view>
+      </van-collapse-item>
+      <van-collapse-item title="建设及管理单位信息" name="2">
+            <view class="construction_unit" wx:for="{{projectUnitsList}}" wx:key="unique">
+                <view class="construction_unit_image" >
+                  <image src="{{item.unitTypeIcon}}"></image>
+                </view>
+                <view class="construction_unit_list">
+                    <view class="construction_unit_title">{{item.unitTypeName}}</view>
+                    <view class="construction_unit_name">{{item.unitName}}</view>
+                    <view class="construction_unit_phone" bindtap="calling" data-phone="{{item.unitPersonPhone}}">{{item.unitPersonName}} {{item.unitPersonPhone}}</view>
+                </view>
+            </view>
+      </van-collapse-item>
+    </van-collapse>
+  </view>
+  
+  <view class="zdzb_bg">
+    重点指标
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">视频监控</view>  
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_head">接入数：<text>{{videoNum}}</text></view>
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_head">正常运行数：<text>{{videoOnline}}</text></view>
+        </van-col>
+      </van-row>
+      <view class="eharts_con">
+        <ec-canvas ec="{{ ec_1 }}" id="mychart-one"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">
+        劳务管理 
+        <text class="eharts_title_float">
+          <text> {{weather}} </text>
+          <text> {{temperature}} ℃ </text>
+        </text>
+        <image src="{{weatherPic}}" class="eharts_title_float_img"></image>
+      </view>  
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_head">今日出勤人数：<text>{{yangchenCount}}</text></view>
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_head">实时在场人数：<text>{{monthEarlyNum}}</text></view>
+        </van-col>
+      </van-row>
+          <view class="eharts_con">
+            <ec-canvas ec="{{ ec_3 }}" id="mychart-three"></ec-canvas>
+          </view>         
+    </view>
+  </view>
+
+  <view class="echarts_max">
+    <view class="echarts_min">
+      <view class="eharts_title">机械设备</view>  
+      <van-row>
+        <van-col span="12">
+          <view class="eharts_head">接入数：<text>{{machineryNum}}</text></view>
+        </van-col>
+        <van-col span="12">
+          <view class="eharts_head">正常运行数：<text>{{machineryOnline}}</text></view>
+        </van-col>
+      </van-row>
+      <view class="eharts_con">
+        <ec-canvas  ec="{{ ec_2 }}" id="mychart-two"></ec-canvas>
+      </view>  
+    </view>
+  </view>
+
+
+
+
+</view>
+
+
+
+<!-- 底部导航 -->
+<van-tabbar active="{{ active }}" bind:change="onChange" active-color="#ffffff" inactive-color="#7d95d6">
+  <van-tabbar-item>
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    项目概况
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="XMSP">
+    <image
+      slot="icon"
+      src="/images/footer_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_7.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    安全管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="ZLGL2">
+    <image
+      slot="icon"
+      src="/images/footer_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_5.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    质量管理
+    </van-tabbar-item>
+    
+    <van-tabbar-item bindtap="JDGL2">
+    <image
+      slot="icon"
+      src="/images/footer_6.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_6.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    进度管理
+  </van-tabbar-item>
+
+  <van-tabbar-item bindtap="GDGN">
+    <image
+      slot="icon"
+      src="/images/footer_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height: 40rpx;"
+    />
+    <image
+      slot="icon-active"
+      src="/images/foot_1.png"
+      mode="aspectFit"
+      style="width:40rpx; height:40rpx;"
+    />
+    更多功能
+  </van-tabbar-item>
+</van-tabbar>
+
+<van-overlay show="{{loadShow}}">
+  <view class="gif">
+    <image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
+    <view>数据加载中！请稍后...</view>
+  </view>
+</van-overlay>  
\ No newline at end of file
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxss b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxss
new file mode 100644
index 0000000..f837607
--- /dev/null
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxss
@@ -0,0 +1,153 @@
+/* pages/xiangmugaikuang/xiangmugaikuang.wxss */
+
+/* 有赞原码修改 */
+.van-collapse.van-hairline--top-bottom:after{
+  border-width: 0px 0;
+}
+.van-cell.van-cell--borderless{
+  background-color: #2b345b;
+  color: #fff;
+  margin-top: 30rpx;
+  border-radius: 5rpx;
+}
+.van-cell.van-cell--borderless:active{
+  background-color: #2b345b;
+}
+.van-collapse-item__title.van-collapse-item__title--expanded:active{
+  background-color: #2b345b;
+}
+.van-collapse-item .van-cell:after{
+  border-bottom: 0;
+}
+.van-collapse-item.van-hairline--top:after{
+  border-top-width:0
+}
+.van-cell.van-cell--clickable{
+  background-color: #2b345b;
+  margin-top: 30rpx;
+  color: #fff;
+  border-radius: 15rpx;
+
+}
+.van-cell.van-cell--clickable:active{
+  background-color: #2b345b;
+}
+.van-collapse-item__wrapper .van-collapse-item__content{
+  background-color: #1e2336;
+  color:#8ca4ec ;
+  border-width: 0px 0;
+}
+
+/* 页面样式 */
+.gk_open{
+  padding: 0 30rpx;
+}
+.gk_open_con view{
+  padding: 10rpx 0;
+}
+.gk_open_con image{
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 5rpx;
+  position: relative;
+  top: 5rpx;
+}
+.echarts_max{
+  margin-top: 30rpx;
+  padding:0 30rpx;
+}
+.echarts_min{
+  background:#1e2336 ;
+  font-size: 28rpx;
+  padding: 30rpx;
+  border-radius:15rpx;
+}
+.eharts_title{
+  height: 40rpx;
+  line-height: 40rpx;
+  padding-left: 40rpx;
+  background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
+}
+.eharts_head{
+  text-align: center;
+  padding: 30rpx 0;
+}
+.eharts_head text{
+  color:#0ad7ec;
+  font-size: 40rpx;
+}
+.eharts_con{
+  height: 320rpx;
+  width: auto;
+}
+.eharts_title_float{
+  float: right;
+}
+
+.eharts_title_float text{
+  padding: 0 5rpx;
+}
+.eharts_con_top{
+  margin-top: -320rpx;
+}
+.eharts_title_float_img{
+  width: 40rpx;
+  height: 40rpx;
+  float: right;
+  position: relative;
+  top: 2rpx;
+}
+.zdzb_bg{
+  height: 88rpx;
+  border-radius: 15rpx;
+  background: #2b345b;
+  margin: 30rpx;
+  font-size: 28rpx;
+  line-height: 88rpx;
+  padding-left: 30rpx;
+}
+
+.construction_unit{
+  padding: 10rpx 0;
+  display: flex;
+}
+.construction_unit_image{
+  padding-top: 15rpx;
+}
+.construction_unit_image image{
+  width: 80rpx;
+  height: 80rpx;
+}
+.construction_unit_list{
+  width: calc(100% - 100rpx);
+  padding-left: 20rpx;
+}
+.construction_unit_title{
+  padding: 6rpx 0;
+  color: #c5d9fc;
+}
+.construction_unit_name{
+  padding: 6rpx 0;
+  color: #54acf6;
+}
+.construction_unit_phone{
+  padding: 6rpx 0;
+  color: #ce9433;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/sitemap.json b/miniprogram/sitemap.json
new file mode 100644
index 0000000..ca02add
--- /dev/null
+++ b/miniprogram/sitemap.json
@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}
\ No newline at end of file
diff --git a/miniprogram/style/guide.wxss b/miniprogram/style/guide.wxss
new file mode 100644
index 0000000..5a77414
--- /dev/null
+++ b/miniprogram/style/guide.wxss
@@ -0,0 +1,144 @@
+page {
+  background: #f6f6f6;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+}
+
+.list {
+  margin-top: 40rpx;
+  height: auto;
+  width: 100%;
+  background: #fff;
+  padding: 0 40rpx;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-left: none;
+  border-right: none;
+  transition: all 300ms ease;
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  box-sizing: border-box;
+}
+
+.list-item {
+  width: 100%;
+  padding: 0;
+  line-height: 104rpx;
+  font-size: 34rpx;
+  color: #007aff;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  display: flex;
+  flex-direction: row;
+  align-content: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+
+.list-item:first-child {
+  border-top: none;
+}
+
+.list-item image {
+  max-width: 100%;
+  max-height: 20vh;
+  margin: 20rpx 0;
+}
+
+.request-text {
+  color: #222;
+  padding: 20rpx 0;
+  font-size: 24rpx;
+  line-height: 36rpx;
+  word-break: break-all;
+}
+
+.guide {
+  width: 100%;
+  padding: 40rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+}
+
+.guide .headline {
+  font-size: 34rpx;
+  font-weight: bold;
+  color: #555;
+  line-height: 40rpx;
+}
+
+.guide .p {
+  margin-top: 20rpx;
+  font-size: 28rpx;
+  line-height: 36rpx;
+  color: #666;
+}
+
+.guide .code {
+  margin-top: 20rpx;
+  font-size: 28rpx;
+  line-height: 36rpx;
+  color: #666;
+  background: white;
+  white-space: pre;
+}
+
+.guide .code-dark {
+  margin-top: 20rpx;
+  background: rgba(0, 0, 0, 0.8);
+  padding: 20rpx;
+  font-size: 28rpx;
+  line-height: 36rpx;
+  border-radius: 6rpx;
+  color: #fff;
+  white-space: pre
+}
+
+.guide image {
+  max-width: 100%;
+}
+
+.guide .image1 {
+  margin-top: 20rpx;
+  max-width: 100%;
+  width: 356px;
+  height: 47px;
+}
+
+.guide .image2 {
+  margin-top: 20rpx;
+  width: 264px;
+  height: 100px;
+}
+
+.guide .flat-image {
+  height: 100px;
+}
+
+.guide .code-image {
+  max-width: 100%;
+}
+
+.guide .copyBtn {
+  width: 180rpx;
+  font-size: 20rpx;
+  margin-top: 16rpx;
+  margin-left: 0;
+}
+
+.guide .nav {
+  margin-top: 50rpx;
+  display: flex;
+  flex-direction: row;
+  align-content: space-between;
+}
+
+.guide .nav .prev {
+  margin-left: unset;
+}
+
+.guide .nav .next {
+  margin-right: unset;
+}
+
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..d0e773b
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,286 @@
+{
+    "miniprogramRoot": "miniprogram/",
+    "cloudfunctionRoot": "cloudfunctions/",
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": false,
+        "useApiHook": false,
+        "useApiHostProcess": false,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "useIsolateContext": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "condition": false
+    },
+    "appid": "wxc44b5d588f599758",
+    "projectname": "construction",
+    "libVersion": "2.12.0",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "cloudfunctionTemplateRoot": "cloudfunctionTemplate/",
+    "compileType": "miniprogram",
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "db guide",
+                    "pathName": "pages/databaseGuide/databaseGuide",
+                    "query": ""
+                },
+                {
+                    "name": "pages/gongchengliebiao/gongchengliebiao",
+                    "pathName": "pages/gongchengliebiao/gongchengliebiao",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/gengduogongneng/gengduogongneng",
+                    "pathName": "pages/gengduogongneng/gengduogongneng",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/login/login",
+                    "pathName": "pages/login/login",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmushipin/xiangmushipin",
+                    "pathName": "pages/xiangmushipin/xiangmushipin",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/map/map",
+                    "pathName": "pages/map/map",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/gengduogongneng/gengduogongneng",
+                    "pathName": "pages/gengduogongneng/gengduogongneng",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmugaikuang/xiangmugaikuang",
+                    "pathName": "pages/xiangmugaikuang/xiangmugaikuang",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmuhuanjing/xiangmuhuanjing",
+                    "pathName": "pages/xiangmuhuanjing/xiangmuhuanjing",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmuyujing/xiangmuyujing",
+                    "pathName": "pages/xiangmuyujing/xiangmuyujing",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/gengduogongneng/gengduogongneng",
+                    "pathName": "pages/gengduogongneng/gengduogongneng",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmugaikuang/xiangmugaikuang",
+                    "pathName": "pages/xiangmugaikuang/xiangmugaikuang",
+                    "query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
+                    "scene": null
+                },
+                {
+                    "name": "pages/shebieguanli-taji/taji",
+                    "pathName": "pages/shebieguanli-taji/taji",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/shebieguanli-shajiangguan/shajiangguan",
+                    "pathName": "pages/shebieguanli-shajiangguan/shajiangguan",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmugaikuang/xiangmugaikuang",
+                    "pathName": "pages/xiangmugaikuang/xiangmugaikuang",
+                    "query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmuyujing/xiangmuyujing",
+                    "pathName": "pages/xiangmuyujing/xiangmuyujing",
+                    "query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
+                    "scene": null
+                },
+                {
+                    "name": "pages/map/map",
+                    "pathName": "pages/map/map",
+                    "query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
+                    "scene": null
+                },
+                {
+                    "name": "pages/map/map",
+                    "pathName": "pages/map/map",
+                    "query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
+                    "scene": null
+                },
+                {
+                    "name": "pages/yujingxinxi/yujingxinxi",
+                    "pathName": "pages/yujingxinxi/yujingxinxi",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/yujingxinxi/yujingxinxi",
+                    "pathName": "pages/yujingxinxi/yujingxinxi",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmushipin/xiangmushipin",
+                    "pathName": "pages/xiangmushipin/xiangmushipin",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmushipin/xiangmushipin",
+                    "pathName": "pages/xiangmushipin/xiangmushipin",
+                    "query": "projectId=9&projectName=路桥龙锦花园东区",
+                    "scene": null
+                },
+                {
+                    "name": "pages/renyuanguanli/renyuanguanli",
+                    "pathName": "pages/renyuanguanli/renyuanguanli",
+                    "query": "projectId=9&projectName=路桥龙锦花园东区",
+                    "scene": null
+                },
+                {
+                    "name": "pages/renyuanguanli/renyuanguanli",
+                    "pathName": "pages/renyuanguanli/renyuanguanli",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/ranyuanguanli-map/map",
+                    "pathName": "pages/ranyuanguanli-map/map",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/renyuanguanli/renyuanguanli",
+                    "pathName": "pages/renyuanguanli/renyuanguanli",
+                    "query": "projectId=616",
+                    "scene": null
+                },
+                {
+                    "name": "pages/shebieguanli-shajiangguan/shajiangguan",
+                    "pathName": "pages/shebieguanli-jxsb/shajiangguan",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/shebeiguanli-map/jixiedingwei",
+                    "pathName": "pages/shebeiguanli-map/jixiedingwei",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/shebieguanli-tzsb/taji",
+                    "pathName": "pages/shebieguanli-tzsb/taji",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/jinduguanli/jinduguanli",
+                    "pathName": "pages/jinduguanli/jinduguanli",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/xiangmuyujing/xiangmuyujing",
+                    "pathName": "pages/xiangmuyujing/xiangmuyujing",
+                    "query": "projectId=616",
+                    "scene": null
+                },
+                {
+                    "name": "pages/anquanguankong/anquanguankong",
+                    "pathName": "pages/anquanguankong/anquanguankong",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/nenghaoguanli/nenghaoguanli",
+                    "pathName": "pages/nenghaoguanli/nenghaoguanli",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/wuliaoguanli/wuliaoguanli",
+                    "pathName": "pages/wuliaoguanli/wuliaoguanli",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/jinduguanli/jinduguanli",
+                    "pathName": "pages/jinduguanli/jinduguanli",
+                    "query": "projectId=621",
+                    "scene": null
+                },
+                {
+                    "name": "pages/lw-jibenxinxi/lw-jibenxinxi",
+                    "pathName": "pages/lw-jibenxinxi/lw-jibenxinxi",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/lw-gerenxinxi/lw-gerenxinxi",
+                    "pathName": "pages/lw-gerenxinxi/lw-gerenxinxi",
+                    "query": "register=1",
+                    "scene": null
+                }
+            ]
+        }
+    },
+    "srcMiniprogramRoot": "miniprogram/",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "editorSetting": {
+        "tabIndent": "auto",
+        "tabSize": 4
+    }
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
new file mode 100644
index 0000000..0116ea0
--- /dev/null
+++ b/project.private.config.json
@@ -0,0 +1,7 @@
+{
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "jhwxapp",
+    "setting": {
+        "compileHotReLoad": true
+    }
+}
\ No newline at end of file