修改 echart替换组件完成置菜单按钮需要重新设计

2024-09-04 09:45:49 +08:00
parent fd55306d1a
commit d7c3069755
12 changed files with 1346 additions and 351 deletions
--- a/pages/device/APF/comp/power.vue
+++ b/pages/device/APF/comp/power.vue
@@ -10,9 +10,9 @@
 				<view class="item item-title">功率因数</view>
 				<template v-for="(item, index) in renderData.电网侧">
 					<view class="item">{{ item.phase }}</view>
-					<view class="item">{{ (item['Apf_P_Sys(W)'] / 1000).toFixed(4) || '-' }}</view>
-					<view class="item">{{ (item['Apf_Q_Sys(Var)'] / 1000).toFixed(4) || '-' }}</view>
-					<view class="item">{{ (item['Apf_S_Sys(VA)'] / 1000).toFixed(4) || '-' }}</view>
+					<view class="item">{{ item['Apf_P_Sys(W)']=='-'?  '-':(item['Apf_P_Sys(W)'] / 1000).toFixed(4) }}</view>
+					<view class="item">{{item['Apf_Q_Sys(Var)']=='-'?  '-':(item['Apf_Q_Sys(Var)'] / 1000).toFixed(4) }}</view>
+					<view class="item">{{ item['Apf_S_Sys(VA)']=='-'?'-' :(item['Apf_S_Sys(VA)'] / 1000).toFixed(4) }}</view>
 					<view class="item">{{ item['Apf_PF_Sys(null)'] || '-' }}</view>
 				</template>
 			</view>
@@ -27,9 +27,9 @@
 				<view class="item item-title">功率因数</view>
 				<template v-for="(item, index) in renderData.负载侧">
 					<view class="item">{{ item.phase }}</view>
-					<view class="item">{{ (item['Apf_P_Load(W)'] / 1000).toFixed(4) || '-' }}</view>
-					<view class="item">{{ (item['Apf_Q_Load(Var)'] / 1000).toFixed(4) || '-' }}</view>
-					<view class="item">{{ (item['Apf_S_Load(VA)'] / 1000).toFixed(4) || '-' }}</view>
+					<view class="item">{{ item['Apf_P_Load(W)']=='-'?'-': (item['Apf_P_Load(W)'] / 1000).toFixed(4)  }}</view>
+					<view class="item">{{ item['Apf_Q_Load(Var)']=='-'? '-':(item['Apf_Q_Load(Var)'] / 1000).toFixed(4)  }}</view>
+					<view class="item">{{ item['Apf_S_Load(VA)']=='-'? '-':(item['Apf_S_Load(VA)'] / 1000).toFixed(4)  }}</view>
 					<view class="item">{{ item['Apf_PF_Load(null)'] || '-' }}</view>
 				</template>
 			</view>
--- a/pages/device/APF/comp/xieBo.vue
+++ b/pages/device/APF/comp/xieBo.vue
@@ -66,7 +66,7 @@ export default {
            //您可以通过修改 config-ucharts.js 文件中下标为 ['column'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
            opts: {
                // enableScroll: true,
-                dataLabel: false,
+                // dataLabel: false,
                color: [
                    '#1890FF',
                    '#91CB74',
@@ -78,33 +78,45 @@ export default {
                    '#9A60B4',
                    '#ea7ccc',
                ],
-                padding: [0, 10, 0, 0],
+                padding: [0, 20, 0, 0],
                legend: {
                    position: 'top',
                    float: 'left',
                },
                xAxis: {
-                    disableGrid: true,
+                    // disableGrid: true,
+					 boundaryGap: "justify",
                    itemCount: 8,
                    // scrollShow: true,
                    data: [
                        {
                            min: 0,
+							 
                        },
                    ],
+					  min: 0,
+					max: 10,
+					
                    position: 'top',
+					formatter:(value,index,opts)=>{
+						console.log(123,value,index,opts);
+					}
                },
-                yAxis: {},
+                yAxis: {
+					
+				},
                extra: {
                    bar: {
                        type: 'group',
                        width: 30,
-                        meterBorde: 1,
+                        meterBorde: 1 ,
                        meterFillColor: '#FFFFFF',
                        activeBgColor: '#000000',
                        activeBgOpacity: 0.08,
-                        seriesGap: 1,
-                        categoryGap: 4,
+						 barBorderCircle: true,
+                        seriesGap: 2,
+                        categoryGap: 6,
+						
                    },
                },
            },
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -88,6 +88,7 @@
 					:content="content"
 					@trigger="trigger"
 				/>
+			
 				<uni-popup ref="share" type="share" :safe-area="false">
 					<uni-popup-share title="分享到"></uni-popup-share>
 					<view style="height: 40rpx; background: #fff"></view>
@@ -139,7 +140,7 @@ import { manualAccess } from '@/common/api/accessBoot'
 import { MQTT_IP, MQTT_OPTIONS } from '@/common/js/mqtt.js'
 import mqtt, { log } from 'mqtt/dist/mqtt.js'
 import { base64ToPath, pathToBase64 } from 'image-tools'
-
+// import hoverMenu from '@/components/hover-menu/hover-menu.vue'
 export default {
 	components: {
 		basic,
@@ -147,6 +148,7 @@ export default {
 		power,
 		oscillogram,
 		IO,
+		hoverMenu
 	},
 	data() {
 		return {
@@ -206,6 +208,7 @@ export default {
 			basicData: [],
 			IOData: [],
 			pageOptions: {},
+			
 		}
 	},
 	methods: {
@@ -273,6 +276,9 @@ export default {
 			}
 			this.$refs.fab.close()
 		},
+		  clickItem(item) {
+		                console.log(item);
+		            },
 		// 取消调试
 		cancelDebug() {
 			this.dialogType = '取消调试'
@@ -461,12 +467,12 @@ export default {
 							if (key === 'Apf_RmsI_TolOut(A)') {
 								arr.push({
 									label: '总输出电流:',
-									value: Math.round(item.statisticalData)  + 'A',
+									value: Math.round(item.statisticalData) + 'A',
 								})
 							} else {
 								arr.push({
 									label: '电流畸变率:',
-									value:Math.round(item.statisticalData)  + '%',
+									value: Math.round(item.statisticalData) + '%',
 								})
 								// arr.push('电流畸变率:' + item.statisticalData + '%')
 							}
@@ -668,4 +674,28 @@ export default {
 		background: #f3f4f5;
 	}
 }
-</style>
+/deep/ .uni-fab__circle--rightBottom {
+	right: 8px !important;
+	bottom: 8px !important;
+}
+/deep/ .uni-fab--rightBottom {
+	right: 8px !important;
+	bottom: 8px !important;
+}
+/deep/ .uni-fab__circle {
+	width: 40px;
+	height: 40px;
+}
+
+/deep/ .uni-fab__content--flexDirectionEnd {
+	width: 40px !important;
+	// height: 50px !important;
+}
+/deep/.uni-fab__item {
+	// height: 45px;
+	width: 40px !important;
+}
+/deep/.uni-fab__item--first {
+	height: 40px !important;
+}
+</style>
--- a/pages/device/APF/report.vue
+++ b/pages/device/APF/report.vue
@@ -88,7 +88,7 @@ export default {
    onNavigationBarButtonTap(e) {
        uni.showModal({
            title: '提示',
-            content: '确定要全部标记为已读吗？',
+            content: '确定要全部标记为已读吗1？',
            success: (res) => {
                if (res.confirm) {
                    updateStatus({
--- a/pages/device/DVR/detail.vue
+++ b/pages/device/DVR/detail.vue
@@ -1,236 +1,286 @@
 <template>
-    <Cn-page :loading='loading' noPadding>
-        <view slot='body'>
-            <view class='detail'>
-                <view class="detail-header">
-                    <view class="header">
-                        <image src="http://localhost:8088/api/system-boot/image/toStream?bgImage=topology/1aca98ceb22a1fc33b81d9101275ef1.png" mode="widthFix" style="width: 100%;" />
-                    </view>
-                    <!-- <view class="des">
+	<Cn-page :loading="loading" noPadding>
+		<view slot="body">
+			<view class="detail">
+				<view class="detail-header">
+					<view class="header">
+						<image
+							src="http://localhost:8088/api/system-boot/image/toStream?bgImage=topology/1aca98ceb22a1fc33b81d9101275ef1.png"
+							mode="widthFix"
+							style="width: 100%"
+						/>
+					</view>
+					<!-- <view class="des">
                    <text>设备基础信息</text>
                    <text class="ml10">设备状态</text>
                </view> -->
-                    <view class="nav">
-                        <view class="nav-menu" :class="{ 'nav-menu-active': navMenuActive == index }"
-                            v-for="(item, index) in navMenuList" :key="index" @click="navMenuClick(index)">{{ item.text }}
-                        </view>
-                    </view>
-                </view>
-                <view class="content">
-                    <DianWang v-if="navMenuActive == 0"></DianWang>
-                    <NiBian v-else-if="navMenuActive == 1"></NiBian>
-                    <ShuChu v-else-if="navMenuActive == 2"></ShuChu>
-                    <GanJieDian v-else-if="navMenuActive == 3"></GanJieDian>
-                    <ZhuangTaiLiang v-else-if="navMenuActive == 4"> </ZhuangTaiLiang>
-                    <QiTa v-else-if="navMenuActive == 5"></QiTa>
-                    <view style="height:20rpx"></view>
-                </view>
-                <uni-fab ref="fab" direction="vertical" horizontal="right" vertical="bottom" :content="content"
-                    @trigger="trigger" />
-
-            </view>
-        </view>
-    </Cn-page>
+					<view class="nav">
+						<view
+							class="nav-menu"
+							:class="{ 'nav-menu-active': navMenuActive == index }"
+							v-for="(item, index) in navMenuList"
+							:key="index"
+							@click="navMenuClick(index)"
+							>{{ item.text }}
+						</view>
+					</view>
+				</view>
+				<view class="content">
+					<DianWang v-if="navMenuActive == 0"></DianWang>
+					<NiBian v-else-if="navMenuActive == 1"></NiBian>
+					<ShuChu v-else-if="navMenuActive == 2"></ShuChu>
+					<GanJieDian v-else-if="navMenuActive == 3"></GanJieDian>
+					<ZhuangTaiLiang v-else-if="navMenuActive == 4"> </ZhuangTaiLiang>
+					<QiTa v-else-if="navMenuActive == 5"></QiTa>
+					<view style="height: 20rpx"></view>
+				</view>
+				<uni-fab
+					ref="fab"
+					direction="vertical"
+					horizontal="right"
+					vertical="bottom"
+					:content="content"
+					@trigger="trigger"
+				/>
+			</view>
+		</view>
+	</Cn-page>
 </template>
 <script>
-import DianWang from "./comp/dianWang.vue";
-import NiBian from "./comp/niBian.vue";
-import ShuChu from "./comp/shuChu.vue";
-import GanJieDian from "./comp/ganJieDian.vue";
-import ZhuangTaiLiang from "./comp/zhuangTaiLiang.vue";
-import QiTa from "./comp/qiTa.vue";
+import DianWang from './comp/dianWang.vue'
+import NiBian from './comp/niBian.vue'
+import ShuChu from './comp/shuChu.vue'
+import GanJieDian from './comp/ganJieDian.vue'
+import ZhuangTaiLiang from './comp/zhuangTaiLiang.vue'
+import QiTa from './comp/qiTa.vue'
 import { manualAccess } from '@/common/api/accessBoot'
 export default {
-    components: {
-        DianWang,
-        NiBian,
-        ShuChu,
-        GanJieDian,
-        ZhuangTaiLiang,
-        QiTa,
-    },
-    data () {
-        return {
-            loading: false,
-            navMenuActive: 0,
-            navHeight: 0,
-			pageOptions:{},
-            navMenuList: [{
-                text: '电网数据'
-            }, {
-                text: '逆变数据'
-            }, {
-                text: '输出数据'
-            }, {
-                text: '干接点'
-            }, {
-                text: '状态量'
-            }, {
-                text: '其他'
-            }],
-            content: [{
-                iconPath: '/static/report.png',
-                text: '告警',
-            }, {
-                iconPath: '/static/record.png',
-                text: '记录',
-            }, {
-                iconPath: '/static/about.png',
-                text: '关于',
-            },
-			{
-			    iconPath: '/static/access.png',
-			    text: '接入',
-			},
-            ]
-        }
-    },
-    methods: {
-        trigger (e) {
-            console.log(e);
-            if (e.item.text === '分享') {
-                this.$refs.share.open()
-            } else if (e.item.text === '删除') {
-                uni.showModal({
-                    title: '提示',
-                    content: '确定删除该设备吗？',
-                    success: function (res) {
-                        if (res.confirm) {
-                            console.log('用户点击确定')
-                        } else if (res.cancel) {
-                            console.log('用户点击取消')
-                        }
-                    }
-                });
-            } else if (e.item.text === '下载') {
-                this.$util.toast('下载成功')
-            } else if (e.item.text === '记录') {
-                uni.navigateTo({ url: '/pages/device/DVR/record' })
-            } else if (e.item.text === '告警') {
-                uni.navigateTo({ url: '/pages/device/DVR/report' })
-            } else if (e.item.text === '关于') {
-                uni.navigateTo({ url: '/pages/device/DVR/about' })
-            } else if (e.item.text === '移交') {
-                uni.navigateTo({ url: '/pages/device/transfer' })
-            } else if (e.item.text === '反馈') {
-                uni.navigateTo({ url: '/pages/device/feedback' })
-            } else if (e.item.text === '用户') {
-                uni.navigateTo({ url: '/pages/device/user' })
-            }else if (e.item.text === '接入') {
-               manualAccess({nDid:this.pageOptions.ndid}).then((res) => {
-				this.$util.toast(res.message)
-			   })
-            }
-            this.$refs.fab.close()
-        },
-        navMenuClick (idx) {
-            this.navMenuActive = idx
-            uni.pageScrollTo({ scrollTop: 0, duration: 0 })
-        },
-        init () {
-            let userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
-            console.log(userInfo.authorities);
-            switch (userInfo.authorities) {
-                case 1:
-                    this.content.splice(0, 0, {
-                        iconPath: '/static/version.png',
-                        text: '版本',
-                    }, {
-                        iconPath: '/static/template.png',
-                        text: '模版',
-                    })
-                    break;
-                case 3:
-                    this.content.splice(1, 0, {
-                        iconPath: '/static/transfer.png',
-                        text: '移交',
-                    })
-                    break;
-                case 4:
-                    this.content.splice(0, 0, {
-                        iconPath: '/static/subordinate.png',
-                        text: '用户',
-                    }, {
-                        iconPath: '/static/delate.png',
-                        text: '删除',
-                    })
-                    break;
-                case 5:
-                    this.content.push({
-                        iconPath: '/static/feedback.png',
-                        text: '反馈',
-                    })
-                    break;
-                default:
-                    break;
+	components: {
+		DianWang,
+		NiBian,
+		ShuChu,
+		GanJieDian,
+		ZhuangTaiLiang,
+		QiTa,
+	},
+	data() {
+		return {
+			loading: false,
+			navMenuActive: 0,
+			navHeight: 0,
+			pageOptions: {},

-            }
-            setTimeout(() => {
-                // 获取nav高度
-                uni.createSelectorQuery().select('.nav').boundingClientRect((rect) => {
-                    this.navHeight = rect.height
-                }).exec()
-            }, 1000);
-        }
-    },
-    onLoad (options) {
+			navMenuList: [
+				{
+					text: '电网数据',
+				},
+				{
+					text: '逆变数据',
+				},
+				{
+					text: '输出数据',
+				},
+				{
+					text: '干接点',
+				},
+				{
+					text: '状态量',
+				},
+				{
+					text: '其他',
+				},
+			],
+			content: [
+				{
+					iconPath: '/static/report.png',
+					text: '告警',
+				},
+				{
+					iconPath: '/static/record.png',
+					text: '记录',
+				},
+				{
+					iconPath: '/static/about.png',
+					text: '关于',
+				},
+				{
+					iconPath: '/static/access.png',
+					text: '接入',
+				},
+			],
+		}
+	},
+	methods: {
+		trigger(e) {
+			console.log(e)
+			if (e.item.text === '分享') {
+				this.$refs.share.open()
+			} else if (e.item.text === '删除') {
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该设备吗？',
+					success: function (res) {
+						if (res.confirm) {
+							console.log('用户点击确定')
+						} else if (res.cancel) {
+							console.log('用户点击取消')
+						}
+					},
+				})
+			} else if (e.item.text === '下载') {
+				this.$util.toast('下载成功')
+			} else if (e.item.text === '记录') {
+				uni.navigateTo({ url: '/pages/device/DVR/record' })
+			} else if (e.item.text === '告警') {
+				uni.navigateTo({ url: '/pages/device/DVR/report' })
+			} else if (e.item.text === '关于') {
+				uni.navigateTo({ url: '/pages/device/DVR/about' })
+			} else if (e.item.text === '移交') {
+				uni.navigateTo({ url: '/pages/device/transfer' })
+			} else if (e.item.text === '反馈') {
+				uni.navigateTo({ url: '/pages/device/feedback' })
+			} else if (e.item.text === '用户') {
+				uni.navigateTo({ url: '/pages/device/user' })
+			} else if (e.item.text === '接入') {
+				manualAccess({ nDid: this.pageOptions.ndid }).then((res) => {
+					this.$util.toast(res.message)
+				})
+			}
+			this.$refs.fab.close()
+		},
+		navMenuClick(idx) {
+			this.navMenuActive = idx
+			uni.pageScrollTo({ scrollTop: 0, duration: 0 })
+		},
+		init() {
+			let userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+			console.log(userInfo.authorities)
+			switch (userInfo.authorities) {
+				case 1:
+					this.content.splice(
+						0,
+						0,
+						{
+							iconPath: '/static/version.png',
+							text: '版本',
+						},
+						{
+							iconPath: '/static/template.png',
+							text: '模版',
+						},
+					)
+					break
+				case 3:
+					this.content.splice(1, 0, {
+						iconPath: '/static/transfer.png',
+						text: '移交',
+					})
+					break
+				case 4:
+					this.content.splice(
+						0,
+						0,
+						{
+							iconPath: '/static/subordinate.png',
+							text: '用户',
+						},
+						{
+							iconPath: '/static/delate.png',
+							text: '删除',
+						},
+					)
+					break
+				case 5:
+					this.content.push({
+						iconPath: '/static/feedback.png',
+						text: '反馈',
+					})
+					break
+				default:
+					break
+			}
+			setTimeout(() => {
+				// 获取nav高度
+				uni.createSelectorQuery()
+					.select('.nav')
+					.boundingClientRect((rect) => {
+						this.navHeight = rect.height
+					})
+					.exec()
+			}, 1000)
+		},
+	},
+	onLoad(options) {
 		this.pageOptions = options
-        this.init()
-    },
-
+		this.init()
+	},
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .detail {
+	// background: $uni-theme-white;
+	.header {
+	}

-    // background: $uni-theme-white;
-    .header {}
+	.des {
+		padding: 20rpx 20rpx 0;
+		font-size: 28rpx;
+		color: #999;
+	}

-    .des {
-        padding: 20rpx 20rpx 0;
-        font-size: 28rpx;
-        color: #999;
-    }
+	// .nav {
+	//     position: sticky;
+	//     top: 0;
+	//     left: 0;
+	//     padding-top: 20rpx;
+	//     display: flex;
+	//     flex-wrap: wrap;
+	//     background: rgb(243, 244, 245);

-    // .nav {
-    //     position: sticky;
-    //     top: 0;
-    //     left: 0;
-    //     padding-top: 20rpx;
-    //     display: flex;
-    //     flex-wrap: wrap;
-    //     background: rgb(243, 244, 245);
+	//     .nav-menu {
+	//         padding: 10rpx 20rpx;
+	//         margin-left: 20rpx;
+	//         margin-bottom: 20rpx;
+	//         font-size: 28rpx;
+	//         border-radius: 8rpx;
+	//         background: $uni-theme-white;

-    //     .nav-menu {
-    //         padding: 10rpx 20rpx;
-    //         margin-left: 20rpx;
-    //         margin-bottom: 20rpx;
-    //         font-size: 28rpx;
-    //         border-radius: 8rpx;
-    //         background: $uni-theme-white;
+	//         &-active {
+	//             background: $uni-theme-color;
+	//             color: #fff;
+	//         }
+	//     }

+	// }

-    //         &-active {
-    //             background: $uni-theme-color;
-    //             color: #fff;
-    //         }
-    //     }
-
-    // }
-
-    .content {
-        box-sizing: border-box;
-        padding: 0 20rpx;
-    }
-
-    .detail-header {
-        position: sticky;
-        top: 0;
-        left: 0;
-        z-index: 2;
-        background: #f3f4f5;
-    }
-
+	.content {
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}

+	.detail-header {
+		position: sticky;
+		top: 0;
+		left: 0;
+		z-index: 2;
+		background: #f3f4f5;
+	}
 }
-</style>
+/deep/ .uni-fab__circle--rightBottom {
+	right: 8px !important;
+	bottom: 8px !important;
+}
+/deep/ .uni-fab--rightBottom {
+	right: 8px !important;
+	bottom: 8px !important;
+}
+/deep/ .uni-fab__circle {
+	width: 50px;
+	height: 54px;
+}
+
+/deep/ .uni-fab__content--flexDirectionEnd {
+	width: 50px !important;
+	// height: 50px !important;
+}
+</style>
--- a/pages/device/transfer.vue
+++ b/pages/device/transfer.vue
@@ -24,17 +24,24 @@
                </view>
            </view>
        </Cn-page>
-        <uni-popup ref="alertDialog" type="dialog">
-            <uni-popup-dialog
-                type="info"
-                cancelText="禁止"
-                confirmText="允许"
-                title="权限说明"
-                content='是否允许"灿能物联"使用相机?'
-                @confirm="handleScon"
-                @close="dialogClose"
-            ></uni-popup-dialog>
-        </uni-popup>
+       <uni-popup ref="alertDialog" type="dialog">
+       	<uni-popup-dialog
+       		style="width: 90%; margin: 5%"
+       		type="info"
+       		cancelText="禁止"
+       		confirmText="允许"
+       		title="权限说明"
+       		content='是否允许"灿能物联"使用相机?'
+       		@confirm="handleScon('camera')"
+       		@close="dialogClose"
+       	></uni-popup-dialog>
+       </uni-popup>
+       <uni-popup ref="message" type="message">
+       	<uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
+       		<view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
+       		<view style="color: #6c6c6c; margin-top: 3rpx; ">　用于相机扫描二维码!</view>
+       	</uni-popup-message>
+       </uni-popup>
    </view>
 </template>
 <script>
@@ -75,14 +82,15 @@ export default {
                plus.os.name == 'Android' &&
                plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
            ) {
-                //未授权
-
-                this.$refs.alertDialog.open()
+               //未授权
+               this.$refs.message.open()
+               this.$refs.alertDialog.open('bottom')
            } else {
                this.handleScon()
            }
        },
        handleScon() {
+			this.$refs.message.close()
            uni.scanCode({
                success: (res) => {
                    console.log(res)
@@ -98,7 +106,7 @@ export default {
                },
            })
        },
-        dialogClose() {},
+        dialogClose() {this.$refs.message.close()},
    },
    onLoad(options) {
        this.options = options
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -69,7 +69,7 @@
            </view> -->
 			<view class="mine-nav" @click="jump('setupMessage')">
 				<image mode="aspectFill" class="mine-nav-icon" src="/static/message4.png" />
-				<view class="mine-nav-label">消息配置</view>
+				<view class="mine-nav-label">推送通知设置</view>
 				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
 			</view>
 			<view
@@ -104,16 +104,22 @@
 		
 		<uni-popup ref="alertDialog" type="dialog">
 			<uni-popup-dialog
+				style="width: 90%; margin: 5%"
 				type="info"
 				cancelText="禁止"
 				confirmText="允许"
 				title="权限说明"
 				content='是否允许"灿能物联"使用相机?'
-				
-				@confirm="handleScon" 
+				@confirm="handleScon('camera')"
 				@close="dialogClose"
 			></uni-popup-dialog>
 		</uni-popup>
+		<uni-popup ref="message" type="message">
+			<uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
+				<view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
+				<view style="color: #6c6c6c; margin-top: 3rpx; ">　用于相机扫描二维码!</view>
+			</uni-popup-message>
+		</uni-popup>
 	</view>
 </template>

@@ -186,7 +192,8 @@ export default {
 					) {
 						//未授权
 					
-						this.$refs.alertDialog.open()
+					this.$refs.message.open()
+					this.$refs.alertDialog.open('bottom')
 					} else {
 						console.log(2)
 						this.handleScon()
@@ -240,6 +247,7 @@ export default {
 			}
 		},
 		handleScon(){
+			this.$refs.message.close()
 			uni.scanCode({
 			    success: (res) => {
 			        console.log('条码类型：' + res.scanType)
@@ -259,7 +267,7 @@ export default {
 			    },
 			})
 		},
-		dialogClose(){},
+		dialogClose(){this.$refs.message.close()},
 		transferDevice(id) {
 			transferDevice(id).then((res) => {
 				uni.navigateTo({ url: '/pages/mine/result?type=transferDevice&id=' + id })
@@ -353,4 +361,9 @@ export default {
 		}
 	}
 }
+/deep/ .uni-popup-message__box {
+	border-radius: 10rpx !important;
+	background-color: #fff;
+}
+</style>
 </style>
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -88,7 +88,7 @@ export default {
    onNavigationBarButtonTap(e) {
        uni.showModal({
            title: '提示',
-            content: '确定要全部标记为已读吗？',
+            content: '确定要全部标记为已读吗2？',
            success: (res) => {
                if (res.confirm) {
                    updateStatus({
--- a/pages/mine/setup.vue
+++ b/pages/mine/setup.vue
@@ -45,9 +45,11 @@
                <view class="mine-nav-label">意见反馈</view>
                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
            </view> -->
-            <view class="mine-nav" @click="jump('about')" style="border-bottom: none">
-                <view class="mine-nav-label">关于我们</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			<!-- @click="jump('about')" -->
+            <view class="mine-nav"  style="border-bottom: none">
+                <view class="mine-nav-label">版本信息</view>
+				  <view style="color: #828282;font-size: 14rpx;">当前版本V1.1.1</view>
+                <!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> -->
            </view>
            <view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none">
                <view class="mine-nav-label" style="text-align: center">退出登录</view>
--- a/pages/mine/setupMessage.vue
+++ b/pages/mine/setupMessage.vue
@@ -34,6 +34,7 @@ export default {
    methods: {
        init() {
            queryUserPushConfig().then(res => {
+				console.log(123123,res);
                this.config = res.data
                console.log(this.config)

--- a/pages/user/head.vue
+++ b/pages/user/head.vue
@@ -1,109 +1,122 @@
 <template>
-    <view>
-        <Cn-page :loading="loading">
-            <view slot="body">
-                <view class="head">
-                    <image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
-                    <image class="head-img" src="/static/head.png" v-else></image>
-                    <view class="head-setup">
-                        <view class="head-setup-item" @click="take('album')">从相册选一张</view>
-                        <view class="head-setup-item" @click="take('camera')">拍一张照片</view>
-                    </view>
-                </view>
-            </view>
-        </Cn-page>
-        <uni-popup ref="alertDialog" type="dialog">
-            <uni-popup-dialog
-                type="info"
-                cancelText="禁止"
-                confirmText="允许"
-                title="权限说明"
-                content='是否允许"灿能物联"使用相机?'
-                @confirm="handleScon('camera')"
-                @close="dialogClose"
-            ></uni-popup-dialog>
-        </uni-popup>
-    </view>
+	<view>
+		<Cn-page :loading="loading">
+			<view slot="body">
+				<view class="head">
+					<image class="head-img" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
+					<image class="head-img" src="/static/head.png" v-else></image>
+					<view class="head-setup">
+						<view class="head-setup-item" @click="take('album')">从相册选一张</view>
+						<view class="head-setup-item" @click="take('camera')">拍一张照片</view>
+					</view>
+				</view>
+			</view>
+		</Cn-page>
+
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog
+				style="width: 90%; margin: 5%"
+				type="info"
+				cancelText="禁止"
+				confirmText="允许"
+				title="权限说明"
+				content='是否允许"灿能物联"使用相机?'
+				@confirm="handleScon('camera')"
+				@close="dialogClose"
+			></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup ref="message" type="message">
+			<uni-popup-message type="info" :duration="0" style="width: 90%; margin: 5%">
+				<view style="color: #909399; font-style: 16px">相机权限使用说明:</view>
+				<view style="color: #6c6c6c; margin-top: 3rpx; ">　用于拍照上传头像!</view>
+			</uni-popup-message>
+		</uni-popup>
+	</view>
 </template>
 <script>
 import { uploadImage, getImageUrl } from '@/common/api/basic'
 import { apiUpdateUser } from '@/common/api/user'
-
 export default {
-    data() {
-        return {
-            loading: false,
-            userInfo: {},
-        }
-    },
-    methods: {
-        take(type) {
-            if (type == 'camera') {
-                if (
-                    plus.os.name == 'Android' &&
-                    plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
-                ) {
-                    //未授权
+	data() {
+		return {
+			loading: false,
+			userInfo: {},
+		}
+	},
+	methods: {
+		take(type) {
+			if (type == 'camera') {
+				if (
+					plus.os.name == 'Android' &&
+					plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
+				) {
+					//未授权
+					this.$refs.message.open()
+					this.$refs.alertDialog.open('bottom')
+				} else {
+					this.handleScon(type)
+				}
+			} else {
+				this.handleScon(type)
+			}
+		},
+		handleScon(type) {
+				this.$refs.message.close()
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['original', 'compressed'],
+				sourceType: [type],
+				success: (res) => {
+				
+					uploadImage(res.tempFilePaths[0]).then((res) => {
+						console.log(res)
+						let result = JSON.parse(res[1].data)
+						apiUpdateUser({
+							headSculpture: result.data.minFileUrl,
+						}).then((res) => {
+							console.log(res)
+							this.userInfo.headSculpture = result.data.minFileUrl
+							this.userInfo.avatar = this.$config.static + result.data.minFileUrl
+							uni.setStorageSync(this.$cacheKey.userInfo, this.userInfo)
+							this.$forceUpdate()
+						})
+					})
+				},
+			})
+		},
+		dialogClose() {this.$refs.message.close()},
+	},

-                    this.$refs.alertDialog.open()
-                } else {
-                    this.handleScon(type)
-                }
-            } else {
-                this.handleScon(type)
-            }
-        },
-        handleScon(type) {
-            uni.chooseImage({
-                count: 1,
-                sizeType: ['original', 'compressed'],
-                sourceType: [type],
-                success: (res) => {
-                    uploadImage(res.tempFilePaths[0]).then((res) => {
-                        console.log(res)
-                        let result = JSON.parse(res[1].data)
-                        apiUpdateUser({
-                            headSculpture: result.data.minFileUrl,
-                        }).then((res) => {
-                            console.log(res)
-                            this.userInfo.headSculpture = result.data.minFileUrl
-                            this.userInfo.avatar = this.$config.static + result.data.minFileUrl
-                            uni.setStorageSync(this.$cacheKey.userInfo, this.userInfo)
-                            this.$forceUpdate()
-                        })
-                    })
-                },
-            })
-        },
-        dialogClose() {},
-    },
-
-    onLoad(options) {
-        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
-    },
+	onLoad(options) {
+		this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+	},
 }
 </script>
 <style lang="scss">
 .head {
-    .head-img {
-        height: 750rpx;
-        width: 750rpx;
-    }
+	.head-img {
+		height: 750rpx;
+		width: 750rpx;
+	}

-    .head-setup {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: 750rpx;
-        padding-bottom: 60rpx;
-        background-color: #fff;
+	.head-setup {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 750rpx;
+		padding-bottom: 60rpx;
+		background-color: #fff;

-        .head-setup-item {
-            height: 100rpx;
-            line-height: 100rpx;
-            text-align: center;
-            border-top: 1rpx solid #e8e8e8;
-        }
-    }
+		.head-setup-item {
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+			border-top: 1rpx solid #e8e8e8;
+		}
+	}
+}
+/deep/ .uni-popup-message__box {
+	border-radius: 10rpx !important;
+	background-color: #fff;
 }
 </style>
--- a/yarn.lock
+++ b/yarn.lock
@@ -0,0 +1,866 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/parser@^7.23.5":
+  version "7.24.0"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac"
+  integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
+
+"@babel/runtime@^7.17.2":
+  version "7.24.0"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
+  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
+"@types/html5plus@^1.0.2":
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/@types/html5plus/-/html5plus-1.0.5.tgz#aa6fdd5adaabf0ec9227de451e1e9c0838950319"
+  integrity sha512-qt5z+3WYkARL/rWnJRcB2fCDOZLKa/hEOkse9sjA6FFkXZtKb+OPxKqo8bDgix4+ufahOff0adarVfaUaK1mfw==
+
+"@types/uni-app@^1.4.4":
+  version "1.4.8"
+  resolved "https://registry.npmjs.org/@types/uni-app/-/uni-app-1.4.8.tgz#9d34931c2841863b1b42af3964a0f910342ce9f8"
+  integrity sha512-plxwi9MvGDrekCsDKuNlCN3ZXIv9zkqHsKZJOsc8FQqLSHveDBOm11qOaswe4QyNWVHpvwZMViii/Ni1/d40LA==
+  dependencies:
+    vue "^2.6.8"
+
+"@vue/compiler-sfc@2.7.16":
+  version "2.7.16"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83"
+  integrity sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==
+  dependencies:
+    "@babel/parser" "^7.23.5"
+    postcss "^8.4.14"
+    source-map "^0.6.1"
+  optionalDependencies:
+    prettier "^1.18.2 || ^2.0.0"
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64-arraybuffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
+  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
+
+base64-js@^1.3.0, base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+bl@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
+
+callback-stream@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz#4701a51266f06e06eaa71fc17233822d875f4908"
+  integrity sha512-sAZ9kODla+mGACBZ1IpTCAisKoGnv6PykW7fPk1LrM+mMepE18Yz0515yoVcrZy7dQsTUp3uZLQ/9Sx1RnLoHw==
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "> 1.0.0 < 3.0.0"
+
+commist@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz#17811ec6978f6c15ee4de80c45c9beb77cee35d5"
+  integrity sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==
+  dependencies:
+    leven "^2.1.0"
+    minimist "^1.1.0"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+concat-stream@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+copy-text-to-clipboard@^3.0.1:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz#0202b2d9bdae30a49a53f898626dcc3b49ad960b"
+  integrity sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==
+
+core-js@^3.11.0:
+  version "3.36.0"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz#e752fa0b0b462a0787d56e9d73f80b0f7c0dde68"
+  integrity sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==
+
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
+crypto-js@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
+  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
+
+css-line-break@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
+  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
+  dependencies:
+    utrie "^1.0.2"
+
+csstype@^3.1.0:
+  version "3.1.3"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
+
+d@1, d@^1.0.1, d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
+  integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
+  dependencies:
+    es5-ext "^0.10.64"
+    type "^2.7.2"
+
+debug@^4.1.1:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+define-data-property@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
+duplexify@^3.5.1, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es5-ext@^0.10.35, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14:
+  version "0.10.64"
+  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
+  integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
+  dependencies:
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.3"
+    esniff "^2.0.1"
+    next-tick "^1.1.0"
+
+es6-iterator@^2.0.3, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-map@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  integrity sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-set@~0.1.5:
+  version "0.1.6"
+  resolved "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz#5669e3b2aa01d61a50ba79964f733673574983b8"
+  integrity sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    es6-iterator "~2.0.3"
+    es6-symbol "^3.1.3"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
+es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.1:
+  version "3.1.4"
+  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
+  integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
+  dependencies:
+    d "^1.0.2"
+    ext "^1.7.0"
+
+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
+event-emitter@^0.3.5, event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+ext@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
+  dependencies:
+    type "^2.7.2"
+
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-stream@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
+  integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==
+  dependencies:
+    extend "^3.0.0"
+    glob "^7.1.1"
+    glob-parent "^3.1.0"
+    is-negated-glob "^1.0.0"
+    ordered-read-streams "^1.0.0"
+    pumpify "^1.3.5"
+    readable-stream "^2.1.5"
+    remove-trailing-separator "^1.0.1"
+    to-absolute-glob "^2.0.0"
+    unique-stream "^2.0.2"
+
+glob@^7.1.1:
+  version "7.2.3"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
+has-property-descriptors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
+has-proto@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+hasown@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa"
+  integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==
+  dependencies:
+    function-bind "^1.1.2"
+
+help-me@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz#8f2d508d0600b4a456da2f086556e7e5c056a3c6"
+  integrity sha512-P/IZ8yOMne3SCTHbVY429NZ67B/2bVQlcYGZh2iPPbdLrEQ/qY5aGChn0YTDmt7Sb4IKRI51fypItav+lNl76w==
+  dependencies:
+    callback-stream "^1.0.2"
+    glob-stream "^6.1.0"
+    through2 "^2.0.1"
+    xtend "^4.0.0"
+
+html2canvas@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
+  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
+  dependencies:
+    css-line-break "^2.1.0"
+    text-segmentation "^1.0.3"
+
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+image-tools@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/image-tools/-/image-tools-1.4.0.tgz#66aacbafad677af7f3fd7f32f8fa1e0881b83783"
+  integrity sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+  dependencies:
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
+
+is-extglob@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-negated-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==
+
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+  dependencies:
+    is-unc-path "^1.0.0"
+
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+  dependencies:
+    unc-path-regex "^0.1.2"
+
+is-windows@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
+jsrsasign@^10.8.6:
+  version "10.9.0"
+  resolved "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.9.0.tgz#cc3f316e7e4c112a976193f9d2c93deb5a0745ee"
+  integrity sha512-QWLUikj1SBJGuyGK8tjKSx3K7Y69KYJnrs/pQ1KZ6wvZIkHkWjZ1PJDpuvc1/28c1uP0KW9qn1eI1LzHQqDOwQ==
+
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  integrity sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==
+
+minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.1.0, minimist@^1.2.0:
+  version "1.2.8"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
+mqtt-packet@^6.0.0:
+  version "6.10.0"
+  resolved "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz#c8b507832c4152e3e511c0efa104ae4a64cd418f"
+  integrity sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==
+  dependencies:
+    bl "^4.0.2"
+    debug "^4.1.1"
+    process-nextick-args "^2.0.1"
+
+mqtt@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/mqtt/-/mqtt-3.0.0.tgz#7961e5f61efba3eec37d5aa9c4cbcdeb6f841380"
+  integrity sha512-0nKV6MAc1ibKZwaZQUTb3iIdT4NVpj541BsYrqrGBcQdQ7Jd0MnZD1/6/nj1UFdGTboK9ZEUXvkCu2nPCugHFA==
+  dependencies:
+    base64-js "^1.3.0"
+    commist "^1.0.0"
+    concat-stream "^1.6.2"
+    end-of-stream "^1.4.1"
+    es6-map "^0.1.5"
+    help-me "^1.0.1"
+    inherits "^2.0.3"
+    minimist "^1.2.0"
+    mqtt-packet "^6.0.0"
+    pump "^3.0.0"
+    readable-stream "^2.3.6"
+    reinterval "^1.1.0"
+    split2 "^3.1.0"
+    websocket-stream "^5.1.2"
+    xtend "^4.0.1"
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+mutation-observer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
+  integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==
+
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+
+next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+ordered-read-streams@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
+  integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==
+  dependencies:
+    readable-stream "^2.0.1"
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+pinyin-pro@^3.13.2:
+  version "3.19.6"
+  resolved "https://registry.npmjs.org/pinyin-pro/-/pinyin-pro-3.19.6.tgz#ed5eebcd43d84f8eaa32d40452b2cca55760e58c"
+  integrity sha512-oWb34orr12+DjXf6gtGMB+gIpjRi7DZzyJE66ultbmNzVhpimM/utGtMI8GcbOy/lb26Ph/nogwNYriRPu+SGQ==
+
+postcss@^8.4.14:
+  version "8.4.35"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
+  integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+"prettier@^1.18.2 || ^2.0.0":
+  version "2.8.8"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
+process-nextick-args@^2.0.1, process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.5:
+  version "1.5.1"
+  resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+qs@^6.11.2:
+  version "6.12.0"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz#edd40c3b823995946a8a0b1f208669c7a200db77"
+  integrity sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==
+  dependencies:
+    side-channel "^1.0.6"
+
+"readable-stream@> 1.0.0 < 3.0.0", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.0.0, readable-stream@^3.4.0:
+  version "3.6.2"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
+reinterval@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz#3361ecfa3ca6c18283380dd0bb9546f390f5ece7"
+  integrity sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
+
+safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+set-function-length@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425"
+  integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==
+  dependencies:
+    define-data-property "^1.1.2"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.1"
+
+side-channel@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
+
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+split2@^3.1.0:
+  version "3.2.2"
+  resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
+  integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
+  dependencies:
+    readable-stream "^3.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b"
+  integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+text-segmentation@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
+  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
+  dependencies:
+    utrie "^1.0.2"
+
+through2-filter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
+through2@^2.0.1, through2@~2.0.0:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+to-absolute-glob@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
+  integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==
+  dependencies:
+    is-absolute "^1.0.0"
+    is-negated-glob "^1.0.0"
+
+type@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.npmjs.org/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
+
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
+
+unc-path-regex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
+
+unique-stream@^2.0.2:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
+  dependencies:
+    json-stable-stringify-without-jsonify "^1.0.1"
+    through2-filter "^3.0.0"
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+
+utrie@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
+  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
+  dependencies:
+    base64-arraybuffer "^1.0.2"
+
+vconsole@^3.15.1:
+  version "3.15.1"
+  resolved "https://registry.npmjs.org/vconsole/-/vconsole-3.15.1.tgz#569a8ab15f353259527bbcf004f02946b4482cff"
+  integrity sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    copy-text-to-clipboard "^3.0.1"
+    core-js "^3.11.0"
+    mutation-observer "^1.0.3"
+
+vue@^2.6.8:
+  version "2.7.16"
+  resolved "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9"
+  integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==
+  dependencies:
+    "@vue/compiler-sfc" "2.7.16"
+    csstype "^3.1.0"
+
+websocket-stream@^5.1.2:
+  version "5.5.2"
+  resolved "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.5.2.tgz#49d87083d96839f0648f5513bbddd581f496b8a2"
+  integrity sha512-8z49MKIHbGk3C4HtuHWDtYX8mYej1wWabjthC/RupM9ngeukU4IWoM46dgth1UOS/T4/IqgEdCDJuMe2039OQQ==
+  dependencies:
+    duplexify "^3.5.1"
+    inherits "^2.0.1"
+    readable-stream "^2.3.3"
+    safe-buffer "^5.1.2"
+    ws "^3.2.0"
+    xtend "^4.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+ws@^3.2.0:
+  version "3.3.3"
+  resolved "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
+
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==