diff --git a/androidPrivacy.json b/androidPrivacy.json
index dc53b4f..5b1694d 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,38 +1,38 @@
 {
-  "version": "2",  
-  "prompt": "template",
-  "title": "服务协议和隐私政策",
-  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://pqmcn.com:8092/#/agreement\">《服务协议》</a>和<a href=\"https://pqmcn.com:8092/#/policy\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-  "buttonAccept": "同意并接受",
-  "buttonRefuse": "暂不同意",
-  "hrefLoader": "system|default",
-  "backToExit":"false",
-  "second": {
-    "title": "确认提示",
-    "message": "　　进入应用前，你需先同意<a href=\"https://pqmcn.com:8092/#/agreement\">《用户协议》</a>和<a href=\"https://pqmcn.com:8092/#/policy\">《隐私政策》</a>，否则将退出应用。",
-    "buttonAccept": "同意并继续",
-    "buttonRefuse": "退出应用"
-  },
-  "disagreeMode":{
-    "support": false,
-    "loadNativePlugins": false,
-    "visitorEntry": false,
-    "showAlways": false 
-  },
-  "styles": {
-    "backgroundColor": "#ffffff",
-    "borderRadius":"5px",
-    "title": {
-      "color": "#111"
+    "version" : "2",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://pqmcn.com:8092/#/agreement\">《服务协议》</a>和<a href=\"https://pqmcn.com:8092/#/policy\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system|default",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://pqmcn.com:8092/#/agreement\">《用户协议》</a>和<a href=\"https://pqmcn.com:8092/#/policy\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
     },
-    "buttonAccept": {
-      "color": "#111"
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
     },
-    "buttonRefuse": {
-      "color": "#111"
-    },
-    "buttonVisitor": {
-      "color": "#111"
+    "styles" : {
+        "backgroundColor" : "#ffffff",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "#111"
+        },
+        "buttonAccept" : {
+            "color" : "#111"
+        },
+        "buttonRefuse" : {
+            "color" : "#111"
+        },
+        "buttonVisitor" : {
+            "color" : "#111"
+        }
     }
-  }
 }
diff --git a/common/api/accessBoot.js b/common/api/accessBoot.js
new file mode 100644
index 0000000..17e4bb4
--- /dev/null
+++ b/common/api/accessBoot.js
@@ -0,0 +1,13 @@
+import request from '../js/request'
+import config from '../js/config'
+
+export function manualAccess(params) {
+    return request({
+        url: '/access-boot/device/manualAccess',
+        method: 'post',
+        params: params,
+        header: {
+            'Content-Type': 'application/json',
+        },
+    })
+}
\ No newline at end of file
diff --git a/common/js/request.js b/common/js/request.js
index a834e37..25eebd7 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -27,7 +27,7 @@ export default (options = {}) => {
         }
         uni.request({
             url,
-            timeout: 5000,
+            timeout: 1000 *10,
             data: {
                 ...options.data,
             },
diff --git a/common/js/util.js b/common/js/util.js
index f0dfe09..b376076 100644
--- a/common/js/util.js
+++ b/common/js/util.js
@@ -132,7 +132,7 @@ const getUserLocation = (call) => {
         success: function (address) {
             call(address)
         },
-        fail: (err) => {
+           fail: (err) => {
             uni.showModal({
                 title: '提示',
                 content: '定位失败，请打开定位权限',
diff --git a/components/Cn-device-card/Cn-device-card.vue b/components/Cn-device-card/Cn-device-card.vue
index b719f19..c82d967 100644
--- a/components/Cn-device-card/Cn-device-card.vue
+++ b/components/Cn-device-card/Cn-device-card.vue
@@ -54,6 +54,7 @@ export default {
             return str
         },
         jump() {
+				console.log(12321,this.device);
             uni.navigateTo({
                 url:
                     '/pages/device/APF/detail?id=' +
@@ -61,7 +62,7 @@ export default {
                     '&isPrimaryUser=' +
                     this.device.isPrimaryUser +
                     '&process=' +
-                    this.device.process,
+                    this.device.process + '&ndid=' +  this.device.ndid,
             })
         },
     },
diff --git a/manifest.json b/manifest.json
index 4c33f11..277b277 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.4.5",
-    "versionCode" : 145,
+    "versionName" : "1.5.9",
+    "versionCode" : 159,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -54,7 +54,8 @@
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "targetSdkVersion" : 30
             },
             /* ios打包配置 */
             "ios" : {
@@ -114,6 +115,9 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
             }
         }
     },
@@ -139,8 +143,8 @@
             "proxy" : {
                 "/api" : {
                     "https" : true,
-                    "target" : "https://pqmcn.com:8092/api",
-                    // "target" : "http://192.168.1.115:10215",
+                    // "target" : "https://pqmcn.com:8092/api",
+                    "target" : "http://192.168.1.126:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
diff --git a/pages.json b/pages.json
index f125ae0..e7c0827 100644
--- a/pages.json
+++ b/pages.json
@@ -33,7 +33,7 @@
         {
             "path": "pages/mine/policy",
             "style": {
-                "navigationBarTitleText": "个人信息保护政策"
+                "navigationBarTitleText": "隐私政策"
             }
         },
         {
@@ -81,7 +81,7 @@
         {
             "path": "pages/mine/setupMessage",
             "style": {
-                "navigationBarTitleText": "消息配置"
+                "navigationBarTitleText": "个性化推荐"
             }
         },
         {
@@ -129,7 +129,8 @@
         {
             "path": "pages/device/APF/detail",
             "style": {
-                "navigationBarTitleText": "APF 设备名称 + 型号"
+                "navigationBarTitleText": "APF 设备名称 + 型号",
+				"enablePullDownRefresh": true
             }
         },
         {
diff --git a/pages/device/APF/comp/IO.vue b/pages/device/APF/comp/IO.vue
index a81cfd3..3ebbd2d 100644
--- a/pages/device/APF/comp/IO.vue
+++ b/pages/device/APF/comp/IO.vue
@@ -1,80 +1,92 @@
 <template>
-    <view class='basic'>
-        <view class="grid-card">
-            <view class="grid-card-title">温度</view>
-            <view class="grid-card-content-4">
-                <template v-for="item in renderData">
-                    <view class="item item-title">{{ item[0].clDid }}
-                        <template v-if="item[0].clDid "> (°C)</template>
-                    </view>
-                    <view class="item item-title">{{ item[1].clDid }}
-                        <template v-if="item[1].clDid "> (°C)</template>
-                    </view>
-                    <view class="item item-title">{{ item[2].clDid }}
-                        <template v-if="item[2].clDid "> (°C)</template>
-                    </view>
-                    <view class="item item-title">{{ item[3].clDid }}
-                        <template v-if="item[3].clDid "> (°C)</template>
-                    </view>
-                    <view class="item">{{ item[0].clDid ? item[0].value || '-' : '' }}</view>
-                    <view class="item">{{ item[1].clDid ? item[1].value || '-' : '' }}</view>
-                    <view class="item">{{ item[2].clDid ? item[2].value || '-' : '' }}</view>
-                    <view class="item">{{ item[3].clDid ? item[3].value || '-' : '' }}</view>
-                </template>
-            </view>
-        </view>
-        <!--        <view class="grid-card">-->
-        <!--            <view class="grid-card-title">干接点</view>-->
-        <!--            <view class="grid-card-content-4">-->
-        <!--                <view class="item item-title">干接点1</view>-->
-        <!--                <view class="item item-title">干接点2</view>-->
-        <!--                <view class="item item-title"></view>-->
-        <!--                <view class="item item-title"></view>-->
-        <!--                <view class="item">正常</view>-->
-        <!--                <view class="item">正常</view>-->
-        <!--                <view class="item"></view>-->
-        <!--                <view class="item"></view>-->
-        <!--            </view>-->
-        <!--        </view>-->
-    </view>
+	<view class="basic">
+		<view class="grid-card">
+			<view class="grid-card-title">温度</view>
+			<view class="grid-card-content-4">
+				<template v-for="item in renderData">
+					<view class="item item-title"
+						>{{ item[0].clDid }}
+						<template v-if="item[0].clDid"> (°C)</template>
+					</view>
+					<view class="item item-title"
+						>{{ item[1].clDid }}
+						<template v-if="item[1].clDid"> (°C)</template>
+					</view>
+					<view class="item item-title"
+						>{{ item[2].clDid }}
+						<template v-if="item[2].clDid"> (°C)</template>
+					</view>
+					<view class="item item-title"
+						>{{ item[3].clDid }}
+						<template v-if="item[3].clDid"> (°C)</template>
+					</view>
+					<view class="item">{{ item[0].clDid ? Math.round(item[0].value)  || '-' : '' }}</view>
+					<view class="item">{{ item[1].clDid ? Math.round(item[1].value)  || '-' : '' }}</view>
+					<view class="item">{{ item[2].clDid ? Math.round(item[2].value)  || '-' : '' }}</view>
+					<view class="item">{{ item[3].clDid ? Math.round(item[3].value)  || '-' : '' }}</view>
+				</template>
+			</view>
+		</view>
+		<!--        <view class="grid-card">-->
+		<!--            <view class="grid-card-title">干接点</view>-->
+		<!--            <view class="grid-card-content-4">-->
+		<!--                <view class="item item-title">干接点1</view>-->
+		<!--                <view class="item item-title">干接点2</view>-->
+		<!--                <view class="item item-title"></view>-->
+		<!--                <view class="item item-title"></view>-->
+		<!--                <view class="item">正常</view>-->
+		<!--                <view class="item">正常</view>-->
+		<!--                <view class="item"></view>-->
+		<!--                <view class="item"></view>-->
+		<!--            </view>-->
+		<!--        </view>-->
+	</view>
 </template>
 <script>
 export default {
-    data() {
-        return {}
-    },
-    props: {
-        IOData: {
-            type: Array,
-            default: () => {
-                return []
-            },
-        },
-    },
-    computed: {
-        renderData() {
-            let arr = []
-            // 把IOData转换成每4个一组的二维数组
-            for (let i = 0; i < this.IOData.length; i += 4) {
-                arr.push(this.IOData.slice(i, i + 4))
-            }
-            // 把每组的长度补齐到4
-            arr.forEach((item) => {
-                if (item.length < 4) {
-                    let length = 4 - item.length
-                    for (let i = 0; i < length; i++) {
-                        item.push({})
-                    }
-                }
-            })
-            console.warn(arr)
-            return arr
-        }
-    },
-    methods: {}
+	data() {
+		return {}
+	},
+	props: {
+		IOData: {
+			type: Array,
+			default: () => {
+				return []
+			},
+		},
+	},
+	computed: {
+		renderData() {
+			let arr = []
+			// 把IOData转换成每4个一组的二维数组
+			for (let i = 0; i < this.IOData.length; i += 4) {
+				this.IOData.slice(i, i + 4).forEach((item) => {
+				
+					if (Number.isInteger(item.value) || item.value =='') {
+					
+					}else {
+							item.value = (item.value-0).toFixed(4)
+					}
+				})
+				arr.push(this.IOData.slice(i, i + 4))
+			}
+			// 把每组的长度补齐到4
+			arr.forEach((item) => {
+				if (item.length < 4) {
+					let length = 4 - item.length
+					for (let i = 0; i < length; i++) {
+						item.push({})
+					}
+				}
+			})
+			console.warn(arr)
+			return arr
+		},
+	},
+	methods: {},
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .basic {
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/device/APF/comp/basic.vue b/pages/device/APF/comp/basic.vue
index 91b3ff3..c0f38a4 100644
--- a/pages/device/APF/comp/basic.vue
+++ b/pages/device/APF/comp/basic.vue
@@ -8,8 +8,8 @@
                 <view class="item item-title">畸变率(%)</view>
                 <template v-for="(item, index) in renderData.电网电流">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Apf_RmsI_Sys(A)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_ThdA_Sys(%)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_RmsI_Sys(A)']  }}</view>
+                    <view class="item">{{ item['Apf_ThdA_Sys(%)'] }}</view>
                 </template>
             </view>
         </view>
@@ -22,9 +22,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_PhV_Sys(V)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_Freq(Hz)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_ThdU_Sys(%)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_PhV_Sys(V)']  }}</view>
+                    <view class="item">{{ item['Apf_Freq(Hz)']  }}</view>
+                    <view class="item">{{ item['Apf_ThdU_Sys(%)']  }}</view>
                 </template>
             </view>
         </view>
@@ -36,8 +36,8 @@
                 <view class="item item-title">畸变率(%)</view>
                 <template v-for="(item, index) in renderData.负载电流">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Apf_RmsI_Load(A)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_ThdA_Load(%)'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_RmsI_Load(A)']  }}</view>
+                    <view class="item">{{ item['Apf_ThdA_Load(%)']  }}</view>
                 </template>
             </view>
         </view>
@@ -49,8 +49,8 @@
                 <view class="item item-title">负载率(%)</view>
                 <template v-for="(item, index) in renderData.补偿电流">
                     <view class="item">{{ item.phase }}</view>
-                    <view class="item">{{ item['Apf_RmsI_TolOut(A)'] || '-' }}</view>
-                    <view class="item">{{ item['load_Rate'] || '-' }}</view>
+                    <view class="item">{{ item['Apf_RmsI_TolOut(A)']  }}</view>
+                    <view class="item">{{ item['load_Rate']  }}</view>
                 </template>
             </view>
         </view>
@@ -129,11 +129,11 @@ export default {
                         return item2.phase === item.phase
                     })
                     if (index > -1) {
-                        this.renderData[key][index][item.statisticalName] = item.statisticalData || '-'
+                        this.renderData[key][index][item.statisticalName] = item.statisticalData //
                     } else {
                         this.renderData[key].push({
                             phase: item.phase,
-                            [item.statisticalName]: item.statisticalData || '-',
+                            [item.statisticalName]: item.statisticalData //,
                         })
                     }
                 })
diff --git a/pages/device/APF/comp/power.vue b/pages/device/APF/comp/power.vue
index fd46d2a..4ea8ea0 100644
--- a/pages/device/APF/comp/power.vue
+++ b/pages/device/APF/comp/power.vue
@@ -1,119 +1,117 @@
 <template>
-    <view class="basic">
-        <view class="grid-card">
-            <view class="grid-card-title">电网侧</view>
-            <view class="grid-card-content-5">
-                <view class="item item-title">名称</view>
-                <view class="item item-title">有功功率(kw)</view>
-                <view class="item item-title">无功功率(kVar)</view>
-                <view class="item item-title">视在功率(kVA)</view>
-                <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)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_Q_Sys(Var)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_S_Sys(VA)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_PF_Sys(null)'] || '-' }}</view>
-                </template>
-            </view>
-        </view>
-        <view class="grid-card">
-            <view class="grid-card-title">负载侧</view>
-            <view class="grid-card-content-5">
-                <view class="item item-title">名称</view>
-                <view class="item item-title">有功功率(kw)</view>
-                <view class="item item-title">无功功率(kVar)</view>
-                <view class="item item-title">视在功率(kVA)</view>
-                <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)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_Q_Load(Var)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_S_Load(VA)'] || '-' }}</view>
-                    <view class="item">{{ item['Apf_PF_Load(null)'] || '-' }}</view>
-                </template>
-            </view>
-        </view>
-    </view>
+	<view class="basic">
+		<view class="grid-card">
+			<view class="grid-card-title">电网侧</view>
+			<view class="grid-card-content-5">
+				<view class="item item-title">名称</view>
+				<view class="item item-title">有功功率(kw)</view>
+				<view class="item item-title">无功功率(kVar)</view>
+				<view class="item item-title">视在功率(kVA)</view>
+				<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_PF_Sys(null)'] || '-' }}</view>
+				</template>
+			</view>
+		</view>
+		<view class="grid-card">
+			<view class="grid-card-title">负载侧</view>
+			<view class="grid-card-content-5">
+				<view class="item item-title">名称</view>
+				<view class="item item-title">有功功率(kw)</view>
+				<view class="item item-title">无功功率(kVar)</view>
+				<view class="item item-title">视在功率(kVA)</view>
+				<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_PF_Load(null)'] || '-' }}</view>
+				</template>
+			</view>
+		</view>
+	</view>
 </template>
 <script>
 export default {
-    data() {
-        return {
-            renderData: {
-                电网侧: [],
-                负载侧: [],
-                未知: [],
-            },
-        }
-    },
-    props: {
-        basicData: {
-            type: Array,
-            default: () => {
-                return []
-            },
-        },
-    },
-    watch: {
-        basicData: {
-            handler: function (newVal, oldVal) {
+	data() {
+		return {
+			renderData: {
+				电网侧: [],
+				负载侧: [],
+				未知: [],
+			},
+		}
+	},
+	props: {
+		basicData: {
+			type: Array,
+			default: () => {
+				return []
+			},
+		},
+	},
+	watch: {
+		basicData: {
+			handler: function (newVal, oldVal) {
+				newVal.forEach((item) => {
+					if (item.phase === 'avg') {
+						return
+					}
+					let key = ''
+					switch (item.statisticalName) {
+						case 'Apf_P_Sys(W)':
+							key = '电网侧'
+							break
+						case 'Apf_Q_Sys(Var)':
+							key = '电网侧'
+							break
+						case 'Apf_S_Sys(VA)':
+							key = '电网侧'
+							break
+						case 'Apf_PF_Sys(null)':
+							key = '电网侧'
+							break
+						case 'Apf_P_Load(W)':
+							key = '负载侧'
+							break
+						case 'Apf_Q_Load(Var)':
+							key = '负载侧'
+							break
+						case 'Apf_S_Load(VA)':
+							key = '负载侧'
+							break
+						case 'Apf_PF_Load(null)':
+							key = '负载侧'
+							break
+						default:
+							key = '未知'
+							break
+					}
 
-                newVal.forEach(item => {
-                    if (item.phase === 'avg') {
-                        return
-                    }
-                    let key = ''
-                    switch (item.statisticalName) {
-                        case 'Apf_P_Sys(W)':
-                            key = '电网侧'
-                            break
-                        case 'Apf_Q_Sys(Var)':
-                            key = '电网侧'
-                            break
-                        case 'Apf_S_Sys(VA)':
-                            key = '电网侧'
-                            break
-                        case 'Apf_PF_Sys(null)':
-                            key = '电网侧'
-                            break
-                        case 'Apf_P_Load(W)':
-                            key = '负载侧'
-                            break
-                        case 'Apf_Q_Load(Var)':
-                            key = '负载侧'
-                            break
-                        case 'Apf_S_Load(VA)':
-                            key = '负载侧'
-                            break
-                        case 'Apf_PF_Load(null)':
-                            key = '负载侧'
-                            break
-                        default:
-                            key = '未知'
-                            break
-                    }
-
-                    let index = this.renderData[key].findIndex((item2) => {
-                        return item2.phase === item.phase
-                    })
-                    if (index > -1) {
-                        this.renderData[key][index][item.statisticalName] = item.statisticalData || '-'
-                    } else {
-                        this.renderData[key].push({
-                            phase: item.phase,
-                            [item.statisticalName]: item.statisticalData || '-',
-                        })
-                    }
-                })
-                console.log(this.renderData)
-            },
-            deep: true,
-            immediate: true,
-        },
-
-    },
-    methods: {},
+					let index = this.renderData[key].findIndex((item2) => {
+						return item2.phase === item.phase
+					})
+					if (index > -1) {
+						this.renderData[key][index][item.statisticalName] = item.statisticalData || '-'
+					} else {
+						this.renderData[key].push({
+							phase: item.phase,
+							[item.statisticalName]: item.statisticalData || '-',
+						})
+					}
+				})
+				console.log(this.renderData)
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	methods: {},
 }
 </script>
 <style lang="scss">
diff --git a/pages/device/APF/comp/xieBo.vue b/pages/device/APF/comp/xieBo.vue
index 86ea0b6..47a31d1 100644
--- a/pages/device/APF/comp/xieBo.vue
+++ b/pages/device/APF/comp/xieBo.vue
@@ -18,7 +18,7 @@
             ></uni-data-select>
         </div>
         <view class="charts-box">
-            <view class="data-time">{{ time }}</view>
+            <!-- <view class="data-time">{{ time }}</view> -->
             <qiun-data-charts type="bar" :ontouch="true" :opts="opts" :chartData="chartData" />
         </view>
     </view>
@@ -32,7 +32,7 @@ export default {
             default: () => [],
         },
         dataTime: {
-            type: String,
+            type: [String,Number],
             default: '',
         },
     },
@@ -103,8 +103,8 @@ export default {
                         meterFillColor: '#FFFFFF',
                         activeBgColor: '#000000',
                         activeBgOpacity: 0.08,
-                        seriesGap: 2,
-                        categoryGap: 6,
+                        seriesGap: 1,
+                        categoryGap: 4,
                     },
                 },
             },
@@ -163,11 +163,11 @@ export default {
                 let dataOptions = []
                 let type = [
                     {
-                        name: '电网谐波电流幅值序列',
+                        name: '谐波电流幅值序列',
                         key: 'Apf_HarmI',
                     },
                     {
-                        name: '负载谐波电压含有率序列',
+                        name: '谐波电压含有率序列',
                         key: 'Apf_HarmUR',
                     },
                 ]
@@ -183,7 +183,6 @@ export default {
                 this.dataOptions = dataOptions
                 console.log(dataOptions)
                 this.initEcharts()
-                console.log(this.dataTime)
                 this.time = this.$util.parseTime(this.dataTime - 8 * 60 * 60)
             },
             deep: true,
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index 7693006..1ea26c8 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -1,98 +1,99 @@
 <template>
-    <Cn-page :loading="loading" noPadding>
-        <view slot="body">
-            <view class="detail" :style="{ opacity: domLoading ? '0' : '1' }" style="overflow: hidden">
-                <view class="detail-header">
-                    <Cn-htmlToImg domId="header" @renderFinish="renderFinish">
-                        <view class="header" id="header" ref="header" @click="previewImg">
-                            <img
-                                :src="topoImg"
-                                style="width: 375px; display: block"
-                                mode="widthFix"
-                                @load="domLoading = false"
-                            />
-                            <view
-                                class="point"
-                                :style="{ left: item.lat + 'px', top: item.lng + 'px' }"
-                                v-for="(item, index) in topolodyData"
-                                :key="index"
-                            >
-                                <view class="grid-card mt10" style="width: fit-content">
-                                    <view class="grid-card-content-1">
-                                        <view class="item">{{ item.label }}</view>
-                                        <view class="item" v-for="(child, childIndex) in item.value" :key="childIndex">
-                                            <text>{{ child.label }}</text>
-                                            <text style="font-weight: 700">{{ child.value }}</text>
-                                        </view>
-                                    </view>
-                                </view>
-                            </view>
-                            <view class="module" v-if="IOData.length">
-                                <view class="grid-card">
-                                    <view class="grid-card-content-6">
-                                        <template v-for="(item, index) in IOData">
-                                            <view class="item">{{ item.clDid }}</view>
-                                            <view class="item" style="font-weight: 700">
-                                                {{ item.value || '-' }}
-                                                <view v-if="item.value"> °C</view>
-                                            </view>
-                                        </template>
-                                        <template v-for="(item, index) in 3 - (IOData.length % 3)">
-                                            <view class="item"></view>
-                                            <view class="item"> </view>
-                                        </template>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </Cn-htmlToImg>
-                    <!-- <view class="des">
+	<Cn-page :loading="loading" noPadding>
+		<view slot="body">
+			<view class="detail" :style="{ opacity: domLoading ? '0' : '1' }" style="overflow: hidden">
+				<view class="detail-header">
+					<Cn-htmlToImg domId="header" @renderFinish="renderFinish">
+						<view class="header" id="header" ref="header" @click="previewImg">
+							<img
+								:src="topoImg"
+								style="width: 375px; display: block"
+								mode="widthFix"
+								@load="domLoading = false"
+							/>
+							<view
+								class="point"
+								:style="{ left: item.lat + 'px', top: item.lng + 'px' }"
+								v-for="(item, index) in topolodyData"
+								:key="index"
+							>
+								<view class="grid-card mt10" style="width: fit-content">
+									<view class="grid-card-content-1">
+										<view class="item">{{ item.label }}</view>
+										<view class="item" v-for="(child, childIndex) in item.value" :key="childIndex">
+											<text>{{ child.label }}</text>
+											<text style="font-weight: 700">{{ child.value }}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="module" v-if="IOData.length">
+								<view class="grid-card">
+									<view class="grid-card-content-6">
+										<template v-for="(item, index) in IOData">
+											<view class="item">{{ item.clDid }}</view>
+											<view class="item" style="font-weight: 700">
+												{{ Math.floor(item.value) || '-' }}
+												<view v-if="item.value"> °C</view>
+											</view>
+										</template>
+										<template v-for="(item, index) in 3 - (IOData.length % 3)">
+											<view class="item"></view>
+											<view class="item"> </view>
+										</template>
+									</view>
+								</view>
+							</view>
+						</view>
+					</Cn-htmlToImg>
+					<!-- <view class="des">
                         <text>设备基础信息</text>
                         <text class="ml10">设备状态</text>
                     </view> -->
-                    <view class="nav" style="margin-top: -10rpx">
-                        <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" v-if="!loading">
-                    <view v-if="navMenuActive == 0">
-                        <basic :basicData="basicData"></basic>
-                    </view>
-                    <view v-else-if="navMenuActive == 1">
-                        <xieBo :dataTime="dataTime" :basicData="basicData"></xieBo>
-                    </view>
-                    <view v-else-if="navMenuActive == 2">
-                        <power :basicData="basicData"></power>
-                    </view>
-                    <!-- <view v-else-if="navMenuActive == 3">
+					<view class="nav" style="margin-top: -10rpx">
+						<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 style="padding: 0 20rpx">最新数据时间： {{ time }}</view>
+				<view class="content" v-if="!loading">
+					<view v-if="navMenuActive == 0">
+						<basic :basicData="basicData"></basic>
+					</view>
+					<view v-else-if="navMenuActive == 1">
+						<xieBo :dataTime="dataTime" :basicData="basicData"></xieBo>
+					</view>
+					<view v-else-if="navMenuActive == 2">
+						<power :basicData="basicData"></power>
+					</view>
+					<!-- <view v-else-if="navMenuActive == 3">
                         <oscillogram></oscillogram>
                     </view> -->
-                    <view v-else-if="navMenuActive == 3">
-                        <IO :IOData="IOData"></IO>
-                    </view>
-                    <view style="height: 20rpx"></view>
-                </view>
-                <uni-fab
-                    ref="fab"
-                    direction="vertical"
-                    horizontal="right"
-                    vertical="bottom"
-                    :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>
-                </uni-popup>
-                <!-- 完成调试输入框 -->
-                <!-- <uni-popup ref="inputDialog" type="dialog">
+					<view v-else-if="navMenuActive == 3">
+						<IO :IOData="IOData"></IO>
+					</view>
+					<view style="height: 20rpx"></view>
+				</view>
+				<uni-fab
+					ref="fab"
+					direction="vertical"
+					horizontal="right"
+					vertical="bottom"
+					: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>
+				</uni-popup>
+				<!-- 完成调试输入框 -->
+				<!-- <uni-popup ref="inputDialog" type="dialog">
                     <uni-popup-dialog
                         ref="inputClose"
                         mode="input"
@@ -103,29 +104,29 @@
                         @confirm="dialogInputConfirm"
                     ></uni-popup-dialog>
                 </uni-popup> -->
-                <!-- 输入框示例 -->
-                <uni-popup ref="inputDialog" type="dialog">
-                    <uni-popup-dialog
-                        ref="inputClose"
-                        type="info"
-                        mode="input"
-                        :title="dialogType"
-                        value="对话框预置提示内容!"
-                        placeholder="请输入内容"
-                        @confirm="dialogInputConfirm"
-                    >
-                        <uni-easyinput
-                            type="textarea"
-                            :maxlength="250"
-                            autoHeight
-                            v-model="remarkContent"
-                            placeholder="请输入备注"
-                        ></uni-easyinput>
-                    </uni-popup-dialog>
-                </uni-popup>
-            </view>
-        </view>
-    </Cn-page>
+				<!-- 输入框示例 -->
+				<uni-popup ref="inputDialog" type="dialog">
+					<uni-popup-dialog
+						ref="inputClose"
+						type="info"
+						mode="input"
+						:title="dialogType"
+						value="对话框预置提示内容!"
+						placeholder="请输入内容"
+						@confirm="dialogInputConfirm"
+					>
+						<uni-easyinput
+							type="textarea"
+							:maxlength="250"
+							autoHeight
+							v-model="remarkContent"
+							placeholder="请输入备注"
+						></uni-easyinput>
+					</uni-popup-dialog>
+				</uni-popup>
+			</view>
+		</view>
+	</Cn-page>
 </template>
 <script>
 import basic from './comp/basic.vue'
@@ -134,510 +135,537 @@ import power from './comp/power.vue'
 import oscillogram from './comp/oscillogram.vue'
 import IO from './comp/IO.vue'
 import { queryTopologyDiagram, deleteDevice, cancelDebug, finishDebug } from '@/common/api/device'
+import { manualAccess } from '@/common/api/accessBoot'
 import { MQTT_IP, MQTT_OPTIONS } from '@/common/js/mqtt.js'
-import mqtt from 'mqtt/dist/mqtt.js'
+import mqtt, { log } from 'mqtt/dist/mqtt.js'
 import { base64ToPath, pathToBase64 } from 'image-tools'
 
 export default {
-    components: {
-        basic,
-        xieBo,
-        power,
-        oscillogram,
-        IO,
-    },
-    data() {
-        return {
-            dataTime: '',
-            remarkContent: '',
-            dialogType: '',
-            domLoading: true,
-            loading: true,
-            deviceInfo: {},
-            navMenuActive: 0,
-            navHeight: 0,
-            img: '',
-            topoImg: '',
-            navMenuList: [
-                {
-                    text: '基本',
-                },
-                {
-                    text: '谐波',
-                },
-                {
-                    text: '功率',
-                },
-                // {
-                //     text: '波形',
-                // },
-                {
-                    text: '其他',
-                },
-            ],
-            content: [
-                {
-                    iconPath: '/static/report.png',
-                    text: '告警',
-                },
-                // {
-                //     iconPath: '/static/record.png',
-                //     text: '记录',
-                // },
-                {
-                    iconPath: '/static/about.png',
-                    text: '关于',
-                },
-            ],
-            client: null,
-            timer: null,
-            devId: '',
-            dictData: [],
-            isPrimaryUser: 0,
-            userInfo: {},
-            topolodyData: [],
-            basicData: [],
-            IOData: [],
-            pageOptions: {},
-        }
-    },
-    methods: {
-        trigger(e) {
-            console.log(e)
-            if (e.item.text === '分享') {
-                uni.navigateTo({ url: '/pages/device/share?id=' + this.devId })
-            } else if (e.item.text === '删除') {
-                uni.showModal({
-                    title: '提示',
-                    content: '确定删除该设备吗？',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('用户点击确定')
-                            deleteDevice(this.devId).then((res) => {
-                                uni.showToast({
-                                    title: '删除成功',
-                                    icon: 'none',
-                                })
-                                setTimeout(() => {
-                                    uni.navigateBack()
-                                }, 1500)
-                            })
-                        } else if (res.cancel) {
-                            console.log('用户点击取消')
-                        }
-                    },
-                })
-            } else if (e.item.text === '下载') {
-                this.$util.toast('下载成功')
-            } else if (e.item.text === '记录') {
-                uni.navigateTo({ url: '/pages/device/APF/record' })
-            } else if (e.item.text === '告警') {
-                uni.navigateTo({ url: '/pages/device/APF/report?id=' + this.devId })
-            } else if (e.item.text === '关于') {
-                uni.navigateTo({ url: '/pages/device/APF/about?id=' + this.devId })
-            } else if (e.item.text === '移交') {
-                uni.navigateTo({ url: '/pages/device/transfer?id=' + this.devId })
-            } else if (e.item.text === '反馈') {
-                uni.navigateTo({ url: '/pages/device/feedback' })
-            } else if (e.item.text === '用户') {
-                uni.navigateTo({ url: '/pages/device/user?id=' + this.devId + '&isPrimaryUser=' + this.isPrimaryUser })
-            } else if (e.item.text === '报表') {
-                this.$util.toast('效果是直接打开报表')
-            } else if (e.item.text === '版本') {
-                this.$util.toast('功能暂未开放')
-            } else if (e.item.text === '模版') {
-                this.$util.toast('效果是功能暂未开放直接打开报表')
-            } else if (e.item.text === '编辑') {
-                let data = JSON.parse(JSON.stringify(this.deviceInfo))
-                data.appsLineTopologyDiagramPO.forEach((item) => {
-                    delete item.value
-                })
-                uni.navigateTo({
-                    url: '/pages/device/edit?deviceInfo=' + encodeURIComponent(JSON.stringify(data)),
-                })
-            } else if (e.item.text === '取消调试') {
-                this.cancelDebug()
-            } else if (e.item.text === '完成调试') {
-                this.finishDebug()
-            }
-            this.$refs.fab.close()
-        },
-        // 取消调试
-        cancelDebug() {
-            this.dialogType = '取消调试'
-            this.$refs.inputDialog.open()
-        },
-        // 完成调试
-        finishDebug() {
-            this.dialogType = '完成调试'
-            this.$refs.inputDialog.open()
-        },
-        dialogInputClose() {
-            this.$refs.inputDialog.close()
-        },
-        dialogInputConfirm(val) {
-            if (this.dialogType == '取消调试') {
-                cancelDebug({
-                    deviceId: this.devId,
-                    remark: this.remarkContent,
-                    type: Number(this.pageOptions.process),
-                }).then((res) => {
-                    this.$util.toast(res.message)
-                    setTimeout(() => {
-                        uni.navigateBack()
-                    }, 1500)
-                })
-            } else {
-                finishDebug({
-                    deviceId: this.devId,
-                    remark: this.remarkContent,
-                    type: Number(this.pageOptions.process),
-                }).then((res) => {
-                    console.log(res)
-                    this.$util.toast(res.message)
-                    setTimeout(() => {
-                        uni.navigateBack()
-                    }, 1500)
-                })
-            }
-        },
-        navMenuClick(idx) {
-            this.navMenuActive = idx
-            uni.pageScrollTo({ scrollTop: 0, duration: 0 })
-        },
-        downloadImg() {
-            uni.downloadFile({
-                url: this.deviceInfo.filePath,
-                success: (res) => {
-                    pathToBase64(res.tempFilePath).then((res) => {
-                        this.topoImg = res
-                    })
-                },
-            })
-        },
-        init() {
-            console.log('init')
-            this.loading = true
-            this.domLoading = true
-            queryTopologyDiagram(this.devId).then((res) => {
-                res.data.filePath = this.$config.static + res.data.filePath
-                this.deviceInfo = res.data
-                this.downloadImg()
-                uni.setNavigationBarTitle({ title: this.deviceInfo.devName || '设备详情' })
-                this.topolodyData = this.topolodyData.filter((item) => {
-                    let index = this.deviceInfo.appsLineTopologyDiagramPO.findIndex((element) => {
-                        element.label = element.name
-                        item.label = element.name
-                        return element.linePostion === item.linePostion
-                    })
-                    if (index > -1) {
-                        item.lat = this.deviceInfo.appsLineTopologyDiagramPO[index].lat
-                        item.lng = this.deviceInfo.appsLineTopologyDiagramPO[index].lng
-                        return true
-                    } else {
-                        // 把多余的监测点过滤掉
-                        return false
-                    }
-                })
-                console.log(this.topolodyData)
-                if (this.client) {
-                    this.loading = false
-                } else {
-                    this.initMqtt()
-                }
-            })
-        },
-        renderFinish(e) {
-            this.img = e
-        },
-        previewImg() {
-            if (!this.img) {
-                uni.showLoading({
-                    title: '图片生成中',
-                    mask: false,
-                })
-                setTimeout(() => {
-                    this.previewImg()
-                }, 500)
-            } else {
-                uni.hideLoading()
-                base64ToPath(this.img).then((res) => {
-                    console.log(res)
-                    uni.previewImage({
-                        urls: [res],
-                    })
-                })
-            }
-        },
-        initMqtt() {
-            MQTT_OPTIONS.clientId = uni.getStorageSync('devCode')
-            // #ifdef APP-PLUS
-            this.client = mqtt.connect('wx://' + MQTT_IP, MQTT_OPTIONS)
-            // #endif
-            // #ifdef H5
-            this.client = mqtt.connect('ws://' + MQTT_IP, MQTT_OPTIONS)
-            // #endif
-            this.client
-                .on('connect', () => {
-                    console.log('连接成功')
-                    this.client.subscribe(`/zl/TemperData/${this.devId}`, (err) => {
-                        if (!err) {
-                            console.log(`订阅成功:/zl/TemperData/${this.devId}`)
-                        }
-                    })
-                    this.client.subscribe(`/zl/devData/${this.devId}`, (err) => {
-                        if (!err) {
-                            console.log(`订阅成功:/zl/devData/${this.devId}`)
+	components: {
+		basic,
+		xieBo,
+		power,
+		oscillogram,
+		IO,
+	},
+	data() {
+		return {
+			dataTime: '',
+			time: '',
+			remarkContent: '',
+			dialogType: '',
+			domLoading: true,
+			loading: true,
+			deviceInfo: {},
+			navMenuActive: 0,
+			navHeight: 0,
+			img: '',
+			topoImg: '',
+			navMenuList: [
+				{
+					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: '接入',
+				},
+			],
+			client: null,
+			timer: null,
+			devId: '',
+			dictData: [],
+			isPrimaryUser: 0,
+			userInfo: {},
+			topolodyData: [],
+			basicData: [],
+			IOData: [],
+			pageOptions: {},
+		}
+	},
+	methods: {
+		trigger(e) {
+			console.log(e)
+			if (e.item.text === '分享') {
+				uni.navigateTo({ url: '/pages/device/share?id=' + this.devId })
+			} else if (e.item.text === '删除') {
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该设备吗？',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('用户点击确定')
+							deleteDevice(this.devId).then((res) => {
+								uni.showToast({
+									title: '删除成功',
+									icon: 'none',
+								})
+								setTimeout(() => {
+									uni.navigateBack()
+								}, 1500)
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消')
+						}
+					},
+				})
+			} else if (e.item.text === '下载') {
+				this.$util.toast('下载成功')
+			} else if (e.item.text === '记录') {
+				uni.navigateTo({ url: '/pages/device/APF/record' })
+			} else if (e.item.text === '告警') {
+				uni.navigateTo({ url: '/pages/device/APF/report?id=' + this.devId })
+			} else if (e.item.text === '关于') {
+				uni.navigateTo({ url: '/pages/device/APF/about?id=' + this.devId })
+			} else if (e.item.text === '移交') {
+				uni.navigateTo({ url: '/pages/device/transfer?id=' + this.devId })
+			} else if (e.item.text === '反馈') {
+				uni.navigateTo({ url: '/pages/device/feedback' })
+			} else if (e.item.text === '用户') {
+				uni.navigateTo({ url: '/pages/device/user?id=' + this.devId + '&isPrimaryUser=' + this.isPrimaryUser })
+			} else if (e.item.text === '报表') {
+				this.$util.toast('效果是直接打开报表')
+			} else if (e.item.text === '版本') {
+				this.$util.toast('功能暂未开放')
+			} else if (e.item.text === '模版') {
+				this.$util.toast('效果是功能暂未开放直接打开报表')
+			} else if (e.item.text === '编辑') {
+				let data = JSON.parse(JSON.stringify(this.deviceInfo))
+				data.appsLineTopologyDiagramPO.forEach((item) => {
+					delete item.value
+				})
+				uni.navigateTo({
+					url: '/pages/device/edit?deviceInfo=' + encodeURIComponent(JSON.stringify(data)),
+				})
+			} else if (e.item.text === '取消调试') {
+				this.cancelDebug()
+			} else if (e.item.text === '完成调试') {
+				this.finishDebug()
+			} else if (e.item.text === '接入') {
+				manualAccess({ nDid: this.pageOptions.ndid }).then((res) => {
+					this.$util.toast(res.message)
+				})
+			}
+			this.$refs.fab.close()
+		},
+		// 取消调试
+		cancelDebug() {
+			this.dialogType = '取消调试'
+			this.$refs.inputDialog.open()
+		},
+		// 完成调试
+		finishDebug() {
+			this.dialogType = '完成调试'
+			this.$refs.inputDialog.open()
+		},
+		dialogInputClose() {
+			this.$refs.inputDialog.close()
+		},
+		dialogInputConfirm(val) {
+			if (this.dialogType == '取消调试') {
+				cancelDebug({
+					deviceId: this.devId,
+					remark: this.remarkContent,
+					type: Number(this.pageOptions.process),
+				}).then((res) => {
+					this.$util.toast(res.message)
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1500)
+				})
+			} else {
+				finishDebug({
+					deviceId: this.devId,
+					remark: this.remarkContent,
+					type: Number(this.pageOptions.process),
+				}).then((res) => {
+					console.log(res)
+					this.$util.toast(res.message)
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1500)
+				})
+			}
+		},
+		navMenuClick(idx) {
+			this.navMenuActive = idx
+			uni.pageScrollTo({ scrollTop: 0, duration: 0 })
+		},
+		downloadImg() {
+			uni.downloadFile({
+				url: this.deviceInfo.filePath,
+				success: (res) => {
+					pathToBase64(res.tempFilePath).then((res) => {
+						this.topoImg = res
+					})
+				},
+			})
+		},
+		init() {
+			console.log('init')
+			this.loading = true
+			this.domLoading = true
+			queryTopologyDiagram(this.devId).then((res) => {
+				res.data.filePath = this.$config.static + res.data.filePath
+				this.deviceInfo = res.data
+				this.downloadImg()
+				uni.setNavigationBarTitle({ title: this.deviceInfo.devName || '设备详情' })
+				this.topolodyData = this.topolodyData.filter((item) => {
+					let index = this.deviceInfo.appsLineTopologyDiagramPO.findIndex((element) => {
+						element.label = element.name
+						item.label = element.name
+						return element.linePostion === item.linePostion
+					})
+					if (index > -1) {
+						item.lat = this.deviceInfo.appsLineTopologyDiagramPO[index].lat
+						item.lng = this.deviceInfo.appsLineTopologyDiagramPO[index].lng
+						return true
+					} else {
+						// 把多余的监测点过滤掉
+						return false
+					}
+				})
+				console.log(this.topolodyData)
+				if (this.client) {
+					this.loading = false
+				} else {
+					this.initMqtt()
+				}
+			})
+		},
+		renderFinish(e) {
+			this.img = e
+		},
+		previewImg() {
+			if (!this.img) {
+				uni.showLoading({
+					title: '图片生成中',
+					mask: false,
+				})
+				setTimeout(() => {
+					this.previewImg()
+				}, 500)
+			} else {
+				uni.hideLoading()
+				base64ToPath(this.img).then((res) => {
+					console.log(res)
+					uni.previewImage({
+						urls: [res],
+					})
+				})
+			}
+		},
+		initMqtt() {
+			MQTT_OPTIONS.clientId = uni.getStorageSync('devCode')
+			// #ifdef APP-PLUS
+			this.client = mqtt.connect('wx://' + MQTT_IP, MQTT_OPTIONS)
+			// #endif
+			// #ifdef H5
+			this.client = mqtt.connect('ws://' + MQTT_IP, MQTT_OPTIONS)
+			// #endif
+			this.client
+				.on('connect', () => {
+					console.log('连接成功')
+					this.client.subscribe(`/zl/TemperData/${this.devId}`, (err) => {
+						if (!err) {
+							console.log(`订阅成功:/zl/TemperData/${this.devId}`)
+						}
+					})
+					this.client.subscribe(`/zl/devData/${this.devId}`, (err) => {
+						if (!err) {
+							console.log(`订阅成功:/zl/devData/${this.devId}`)
 
-                            // 默认推送
-                            this.client.publish(`/zl/askDevData/${this.devId}`)
-                            this.client.publish(`/zl/askTemperData/${this.devId}`)
-                            this.timer = setInterval(() => {
-                                console.log('askDevData')
-                                this.client.publish(`/zl/askDevData/${this.devId}`)
-                                this.client.publish(`/zl/askTemperData/${this.devId}`)
-                            }, 1000 * 60)
-                        }
-                    })
-                })
-                .on('reconnect', function (error) {
-                    console.log(error)
-                    console.log('正在重连...', that.topic)
-                })
-                .on('error', function (error) {
-                    console.log('连接失败...', error)
-                })
-                .on('end', function () {
-                    console.log('连接断开')
-                })
-                .on('message', (topic, message) => {
-                    console.log('接收推送信息：', message.toString(), topic)
-                    if (topic === `/zl/devData/${this.devId}`) {
-                        if ((!message.toString() || message.toString().length < 10) && this.loading) {
-                            this.$util.toast('该设备暂无数据')
-                        }
-                        this.loading = false
-                        this.handlerData(JSON.parse(message.toString()))
-                    } else if (topic === `/zl/TemperData/${this.devId}`) {
-                        // this.basicData.forEach((item) => {
-                        //     if (item.statisticalName === '温度' && item.phase === 'avg') {
-                        //         item.statisticalData = message.toString()
-                        //     }
-                        // })
-                        this.IOData = JSON.parse(message.toString())
-                        this.IOData = this.IOData.filter((item) => item.value !== 0)
-                        this.IOData.forEach((item) => {
-                            if (!item.value) {
-                                item.value = ''
-                            }
-                        })
-                    }
-                })
-        },
-        handlerData(data) {
-            this.basicData = data
-            this.topolodyData.forEach((element) => {
-                let arr = []
-                element.showKey.forEach((key) => {
-                    data.forEach((item) => {
-                        if (item.statisticalName === key && item.phase === 'avg') {
-                            if (key === 'Apf_RmsI_TolOut(A)') {
-                                arr.push({
-                                    label: '总输出电流:',
-                                    value: item.statisticalData + 'A',
-                                })
-                            } else {
-                                arr.push({
-                                    label: '电流畸变率:',
-                                    value: item.statisticalData + '%',
-                                })
-                                // arr.push('电流畸变率:' + item.statisticalData + '%')
-                            }
-                        }
-                        if (item.time) {
-                            this.dataTime = item.time.seconds
-                        }
-                    })
-                })
-                element.value = arr
-            })
-            console.log(this.topolodyData)
-            this.$forceUpdate()
-        },
-    },
-    // 页面销毁
-    onUnload() {
-        clearInterval(this.timer)
-        this.client.end()
-    },
-    onLoad(options) {
-        this.pageOptions = options
-        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
-        this.devId = options.id
-        this.isPrimaryUser = options.isPrimaryUser
-        if (this.pageOptions.process == 2 || this.pageOptions.process == 3) {
-            this.content.splice(
-                0,
-                0,
-                {
-                    iconPath: '/static/feedback.png',
-                    text: '编辑',
-                },
-                {
-                    iconPath: '/static/cancel.png',
-                    text: '取消调试',
-                },
-                {
-                    iconPath: '/static/confirm.png',
-                    text: '完成调试',
-                },
-            )
-        } else {
-            if (this.isPrimaryUser == 1) {
-                this.content.splice(
-                    0,
-                    0,
-                    {
-                        iconPath: '/static/transfer.png',
-                        text: '移交',
-                    },
-                    {
-                        iconPath: '/static/feedback.png',
-                        text: '编辑',
-                    },
-                    {
-                        iconPath: '/static/delate.png',
-                        text: '删除',
-                    },
-                )
-                if (this.userInfo.authorities === 'app_vip_user') {
-                    this.content.splice(3, 0, {
-                        iconPath: '/static/share.png',
-                        text: '分享',
-                    })
-                }
-            }
-            if (this.userInfo.authorities !== 'tourist') {
-                this.content.splice(0, 0, {
-                    iconPath: '/static/subordinate.png',
-                    text: '用户',
-                })
-            }
-        }
-        this.$util.getDictData('Line_Position').then((res) => {
-            this.topolodyData = res.map((item) => {
-                switch (item.name) {
-                    case '电网侧':
-                        item.showKey = ['Apf_ThdA_Sys(%)']
-                        break
-                    case '负载侧':
-                        item.showKey = ['Apf_ThdA_Load(%)']
-                        break
-                    case '输出侧':
-                        item.showKey = ['Apf_RmsI_TolOut(A)']
-                        break
-                    case 'PCC公共点':
-                        item.showKey = []
-                        break
-                    default:
-                        break
-                }
-                return {
-                    label: item.name,
-                    linePostion: item.id,
-                    lat: '',
-                    lng: '',
-                    showKey: item.showKey, //要展示的指标key
-                    value: [],
-                }
-            })
-        })
-        this.init()
-    },
+							// 默认推送
+							this.client.publish(`/zl/askDevData/${this.devId}`)
+							this.client.publish(`/zl/askTemperData/${this.devId}`)
+							this.timer = setInterval(() => {
+								console.log('askDevData')
+								this.client.publish(`/zl/askDevData/${this.devId}`)
+								this.client.publish(`/zl/askTemperData/${this.devId}`)
+							}, 1000 * 60)
+						}
+					})
+				})
+				.on('reconnect', function (error) {
+					console.log(error)
+					// console.log('正在重连...', that.topic)
+				})
+				.on('error', function (error) {
+					console.log('连接失败...', error)
+				})
+				.on('end', function () {
+					console.log('连接断开')
+				})
+				.on('message', (topic, message) => {
+					console.log('接收推送信息：', JSON.parse(message.toString()), topic)
+					if (topic === `/zl/devData/${this.devId}`) {
+						if ((!message.toString() || message.toString().length < 10) && this.loading) {
+							this.$util.toast('该设备暂无数据')
+						}
+						this.loading = false
+						this.handlerData(JSON.parse(message.toString()))
+					} else if (topic === `/zl/TemperData/${this.devId}`) {
+						// this.basicData.forEach((item) => {
+						//     if (item.statisticalName === '温度' && item.phase === 'avg') {
+						//         item.statisticalData = message.toString()
+						//     }
+						// })
+						this.IOData = JSON.parse(message.toString())
+						// this.IOData = this.IOData.filter((item) => item.value !== 0)
+						this.IOData.forEach((item) => {
+							if (!item.value) {
+								item.value = ''
+							} else {
+								if (!Number.isInteger(item.value)) {
+									item.value = item.value.toFixed(4)
+								}
+							}
+						})
+					}
+				})
+		},
+		handlerData(data) {
+			this.basicData = data
+
+			this.topolodyData.forEach((element) => {
+				let arr = []
+
+				element.showKey.forEach((key) => {
+					data.forEach((item) => {
+						if (item.statisticalName === key && item.phase === 'avg') {
+							if (key === 'Apf_RmsI_TolOut(A)') {
+								arr.push({
+									label: '总输出电流:',
+									value: Math.round(item.statisticalData)  + 'A',
+								})
+							} else {
+								arr.push({
+									label: '电流畸变率:',
+									value:Math.round(item.statisticalData)  + '%',
+								})
+								// arr.push('电流畸变率:' + item.statisticalData + '%')
+							}
+						}
+						if (item.time) {
+							this.dataTime = item.time.seconds
+							this.time = this.$util.parseTime(this.dataTime - 8 * 60 * 60)
+							// console.log(11111111,this.dataTime);
+						}
+					})
+				})
+				element.value = arr
+			})
+			console.log(this.topolodyData)
+			this.$forceUpdate()
+		},
+	},
+	// 页面销毁
+	onUnload() {
+		clearInterval(this.timer)
+		this.client.end()
+	},
+	// 下拉刷新
+	onPullDownRefresh() {
+		this.client.publish(`/zl/askDevData/${this.devId}`)
+		this.client.publish(`/zl/askTemperData/${this.devId}`)
+		setTimeout(() => {
+			uni.stopPullDownRefresh()
+		}, 1000)
+	},
+
+	onLoad(options) {
+		this.pageOptions = options
+		this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+		this.devId = options.id
+		this.isPrimaryUser = options.isPrimaryUser
+		if (this.pageOptions.process == 2 || this.pageOptions.process == 3) {
+			this.content.splice(
+				0,
+				0,
+				{
+					iconPath: '/static/feedback.png',
+					text: '编辑',
+				},
+				{
+					iconPath: '/static/cancel.png',
+					text: '取消调试',
+				},
+				{
+					iconPath: '/static/confirm.png',
+					text: '完成调试',
+				},
+			)
+		} else {
+			if (this.isPrimaryUser == 1) {
+				this.content.splice(
+					0,
+					0,
+					{
+						iconPath: '/static/transfer.png',
+						text: '移交',
+					},
+					{
+						iconPath: '/static/feedback.png',
+						text: '编辑',
+					},
+					{
+						iconPath: '/static/delate.png',
+						text: '删除',
+					},
+				)
+				if (this.userInfo.authorities === 'app_vip_user') {
+					this.content.splice(3, 0, {
+						iconPath: '/static/share.png',
+						text: '分享',
+					})
+				}
+			}
+			if (this.userInfo.authorities !== 'tourist') {
+				this.content.splice(0, 0, {
+					iconPath: '/static/subordinate.png',
+					text: '用户',
+				})
+			}
+		}
+		this.$util.getDictData('Line_Position').then((res) => {
+			this.topolodyData = res.map((item) => {
+				switch (item.name) {
+					case '电网侧':
+						item.showKey = ['Apf_ThdA_Sys(%)']
+						break
+					case '负载侧':
+						item.showKey = ['Apf_ThdA_Load(%)']
+						break
+					case '输出侧':
+						item.showKey = ['Apf_RmsI_TolOut(A)']
+						break
+					case 'PCC公共点':
+						item.showKey = []
+						break
+					default:
+						break
+				}
+				return {
+					label: item.name,
+					linePostion: item.id,
+					lat: '',
+					lng: '',
+					showKey: item.showKey, //要展示的指标key
+					value: [],
+				}
+			})
+		})
+		this.init()
+	},
 }
 </script>
 
 <style lang="scss">
 .detail {
-    // background: $uni-theme-white;
-    .header-bg {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background-size: 100% 100%;
-    }
+	// background: $uni-theme-white;
+	.header-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background-size: 100% 100%;
+	}
 
-    .header {
-        position: relative;
-        width: 375px;
-        margin: 0 auto;
-        overflow: hidden;
+	.header {
+		position: relative;
+		width: 375px;
+		margin: 0 auto;
+		overflow: hidden;
 
-        image {
-            image-rendering: -moz-crisp-edges;
-            image-rendering: -o-crisp-edges;
-            image-rendering: -webkit-optimize-contrast;
-            image-rendering: crisp-edges;
-            -ms-interpolation-mode: nearest-neighbor;
-        }
+		image {
+			image-rendering: -moz-crisp-edges;
+			image-rendering: -o-crisp-edges;
+			image-rendering: -webkit-optimize-contrast;
+			image-rendering: crisp-edges;
+			-ms-interpolation-mode: nearest-neighbor;
+		}
 
-        .point {
-            position: absolute;
-            color: #111;
-            z-index: 2;
-            text-align: center;
-            color: #111;
-            width: 110rpx;
-            font-size: 16rpx;
-            opacity: 0.8;
+		.point {
+			position: absolute;
+			color: #111;
+			z-index: 2;
+			text-align: center;
+			color: #111;
+			width: 110rpx;
+			font-size: 16rpx;
+			opacity: 0.8;
 
-            .grid-card-content-2,
-            .grid-card-content-1 {
-                font-size: 16rpx;
+			.grid-card-content-2,
+			.grid-card-content-1 {
+				font-size: 16rpx;
 
-                .item {
-                    min-height: unset;
-                    white-space: nowrap;
-                }
-            }
-        }
+				.item {
+					min-height: unset;
+					white-space: nowrap;
+				}
+			}
+		}
 
-        .module {
-            position: absolute;
-            bottom: 0;
-            right: 10rpx;
-            opacity: 0.8;
-            .grid-card-content-2,
-            .grid-card-content-6,
-            .grid-card-content-1 {
-                font-size: 16rpx;
+		.module {
+			position: absolute;
+			bottom: 0;
+			right: 10rpx;
+			opacity: 0.8;
+			.grid-card-content-2,
+			.grid-card-content-6,
+			.grid-card-content-1 {
+				font-size: 16rpx;
 
-                .item {
-                    min-height: unset;
-                }
-            }
-        }
-    }
+				.item {
+					min-height: unset;
+				}
+			}
+		}
+	}
 
-    .des {
-        padding: 20rpx 20rpx 0;
-        font-size: 28rpx;
-        color: #999;
-    }
+	.des {
+		padding: 20rpx 20rpx 0;
+		font-size: 28rpx;
+		color: #999;
+	}
 
-    .content {
-        box-sizing: border-box;
-        padding: 0 20rpx;
-    }
+	.content {
+		box-sizing: border-box;
+		padding: 0 20rpx;
+	}
 
-    .detail-header {
-        position: sticky;
-        top: 0;
-        left: 0;
-        z-index: 2;
-        background: #f3f4f5;
-    }
+	.detail-header {
+		position: sticky;
+		top: 0;
+		left: 0;
+		z-index: 2;
+		background: #f3f4f5;
+	}
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/device/DVR/detail.vue b/pages/device/DVR/detail.vue
index 85ba4cc..075d529 100644
--- a/pages/device/DVR/detail.vue
+++ b/pages/device/DVR/detail.vue
@@ -39,6 +39,7 @@ 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,
@@ -53,6 +54,7 @@ export default {
             loading: false,
             navMenuActive: 0,
             navHeight: 0,
+			pageOptions:{},
             navMenuList: [{
                 text: '电网数据'
             }, {
@@ -76,6 +78,10 @@ export default {
                 iconPath: '/static/about.png',
                 text: '关于',
             },
+			{
+			    iconPath: '/static/access.png',
+			    text: '接入',
+			},
             ]
         }
     },
@@ -110,6 +116,10 @@ export default {
                 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()
         },
@@ -164,6 +174,7 @@ export default {
         }
     },
     onLoad (options) {
+		this.pageOptions = options
         this.init()
     },
 
diff --git a/pages/device/list.vue b/pages/device/list.vue
index 0828068..61f9163 100644
--- a/pages/device/list.vue
+++ b/pages/device/list.vue
@@ -368,11 +368,12 @@ export default {
             this.navMenuActive = index
         },
         jump(item) {
+				console.log(12321,item);
             uni.navigateTo({
-                url: '/pages/device/APF/detail?id=' + item.equipmentId + '&isPrimaryUser=' + item.isPrimaryUser,
+                url: '/pages/device/APF/detail?id=' + item.equipmentId + '&isPrimaryUser=' + item.isPrimaryUser + '&ndid=' + item.ndid,
             })
         },
     },
 }
 </script>
-<style lang="scss"></style>
+<style lang="scss"></style>
\ No newline at end of file
diff --git a/pages/device/new.vue b/pages/device/new.vue
index 8593bd6..3c3e97e 100644
--- a/pages/device/new.vue
+++ b/pages/device/new.vue
@@ -1,561 +1,575 @@
 <template>
-    <view class="new">
-        <template v-if="type == 1">
-            <view class="content">
-                <uni-forms>
-                    <uni-forms-item label="设备识别码">
-                        <view style="display: flex">
-                            <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码" />
-                            <uni-icons
-                                type="camera"
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="scanCode"
-                            ></uni-icons>
-                        </view>
-                    </uni-forms-item>
-                </uni-forms>
-            </view>
-            <view class="btn-wrap">
-                <view class="btn-wrap-item" @click="register"> 发起注册</view>
-            </view>
-        </template>
-        <template v-else>
-            <view class="content">
-                <uni-forms>
-                    <uni-forms-item label="项目">
-                        <view style="display: flex; align-items: center">
-                            <uni-data-select
-                                v-model="formData.projectId"
-                                :localdata="projectRange"
-                                @change="queryTopologyDiagramPage"
-                                :clear="false"
-                            ></uni-data-select>
-                            <uni-icons
-                                type="plusempty"
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="createProject"
-                            ></uni-icons>
-                        </view>
-                    </uni-forms-item>
-                    <!-- <uni-forms-item label="型号">
+	<view class="new">
+		<template v-if="type == 1">
+			<view class="content">
+				<uni-forms>
+					<uni-forms-item label="设备识别码">
+						<view style="display: flex">
+							<uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码" />
+							<uni-icons
+								type="camera"
+								color="#007aff"
+								size="26"
+								class="ml20"
+								@click="scanCode"
+							></uni-icons>
+						</view>
+					</uni-forms-item>
+				</uni-forms>
+			</view>
+			<view class="btn-wrap">
+				<button class="btn-wrap-item" :loading="isLoading" :disabled='isLoading' @click="register">
+					{{ isLoading ? '注册中...' : '发起注册' }} 
+				</button>
+			</view>
+		</template>
+		<template v-else>
+			<view class="content">
+				<uni-forms>
+					<uni-forms-item label="项目">
+						<view style="display: flex; align-items: center">
+							<uni-data-select
+								v-model="formData.projectId"
+								:localdata="projectRange"
+								@change="queryTopologyDiagramPage"
+								:clear="false"
+							></uni-data-select>
+							<uni-icons
+								type="plusempty"
+								color="#007aff"
+								size="26"
+								class="ml20"
+								@click="createProject"
+							></uni-icons>
+						</view>
+					</uni-forms-item>
+					<!-- <uni-forms-item label="型号">
                         <uni-data-select v-model="formData.type" :localdata="typeRange"
                             @change="typeChange(item)"></uni-data-select>
                     </uni-forms-item> -->
-                    <!--                    <uni-forms-item label="位置">-->
-                    <!--                        <view style="display: flex;">-->
-                    <!--                            <uni-easyinput-->
-                    <!--                                :clearable="false"-->
-                    <!--                                type="textarea"-->
-                    <!--                                autoHeight-->
-                    <!--                                v-model="formData.area"-->
-                    <!--                                placeholder="请输入位置信息"-->
-                    <!--                            />-->
-                    <!--                            <uni-icons-->
-                    <!--                                type="location"-->
-                    <!--                                color="#007aff"-->
-                    <!--                                size="26"-->
-                    <!--                                class="ml20"-->
-                    <!--                                @click="chooseLocation"-->
-                    <!--                            ></uni-icons>-->
-                    <!--                        </view>-->
-                    <!--                    </uni-forms-item>-->
-                    <uni-forms-item label="拓扑图" v-if="formData.projectId">
-                        <view style="display: flex">
-                            <view style="flex: 1">
-                                <view v-if="formData.topologyDiagramUrl">
-                                    <image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix" />
-                                </view>
-                                <view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图</view>
-                            </view>
-                            <uni-icons
-                                type="image"
-                                color="#007aff"
-                                size="26"
-                                class="ml20"
-                                @click="chooseGplot"
-                            ></uni-icons>
-                        </view>
-                    </uni-forms-item>
-                    <uni-forms-item label="监测点" v-if="pointList.length && formData.topologyDiagramUrl">
-                        <view
-                            class="point-item"
-                            v-for="(item2, index2) in pointList"
-                            :key="index2"
-                            @click="editPoint(item2, index2)"
-                        >
-                            <view style="flex: 1" v-if="item2.name">{{ item2.name }}</view>
-                            <view style="flex: 1; color: #999" v-else>请选择监测点</view>
-                            <uni-icons type="compose" color="#007aff" size="26" class="ml20"></uni-icons>
-                        </view>
-                    </uni-forms-item>
-                </uni-forms>
-            </view>
-            <image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
-            <view class="btn-wrap">
-                <!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
-                <view class="btn-wrap-item" @click="submit"> 提交</view>
-            </view>
-            <uni-drawer ref="gplot" mode="right" :mask-click="false">
-                <scroll-view style="height: 100%" scroll-y="true">
-                    <view class="content">
-                        <image
-                            class="gplot gplot-box"
-                            mode="aspectFill"
-                            :class="{ 'gplot-active': key == activeGplot }"
-                            :src="item.filePath"
-                            @click="activeGplot = key"
-                            v-for="(item, key) in imageList"
-                            :key="key"
-                        />
-                        <view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50"
-                            >暂无拓扑图
-                        </view>
-                        <view class="btn-wrap">
-                            <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
-                            <view class="btn-wrap-item ml20" @click="confirmGplot"> 确定</view>
-                        </view>
-                    </view>
-                </scroll-view>
-            </uni-drawer>
-            <uni-drawer ref="point" mode="right" :mask-click="false">
-                <scroll-view style="height: 100%" scroll-y="true">
-                    <view style="background: #fff">
-                        <view class="map-pin-box">
-                            <image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl" />
+					<!--                    <uni-forms-item label="位置">-->
+					<!--                        <view style="display: flex;">-->
+					<!--                            <uni-easyinput-->
+					<!--                                :clearable="false"-->
+					<!--                                type="textarea"-->
+					<!--                                autoHeight-->
+					<!--                                v-model="formData.area"-->
+					<!--                                placeholder="请输入位置信息"-->
+					<!--                            />-->
+					<!--                            <uni-icons-->
+					<!--                                type="location"-->
+					<!--                                color="#007aff"-->
+					<!--                                size="26"-->
+					<!--                                class="ml20"-->
+					<!--                                @click="chooseLocation"-->
+					<!--                            ></uni-icons>-->
+					<!--                        </view>-->
+					<!--                    </uni-forms-item>-->
+					<uni-forms-item label="拓扑图" v-if="formData.projectId">
+						<view style="display: flex">
+							<view style="flex: 1">
+								<view v-if="formData.topologyDiagramUrl">
+									<image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix" />
+								</view>
+								<view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图</view>
+							</view>
+							<uni-icons
+								type="image"
+								color="#007aff"
+								size="26"
+								class="ml20"
+								@click="chooseGplot"
+							></uni-icons>
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="监测点" v-if="pointList.length && formData.topologyDiagramUrl">
+						<view
+							class="point-item"
+							v-for="(item2, index2) in pointList"
+							:key="index2"
+							@click="editPoint(item2, index2)"
+						>
+							<view style="flex: 1" v-if="item2.name">{{ item2.name }}</view>
+							<view style="flex: 1; color: #999" v-else>请选择监测点</view>
+							<uni-icons type="compose" color="#007aff" size="26" class="ml20"></uni-icons>
+						</view>
+					</uni-forms-item>
+				</uni-forms>
+			</view>
+			<image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
+			<view class="btn-wrap">
+				<!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
+				<view class="btn-wrap-item" @click="submit"> 提交</view>
+			</view>
+			<uni-drawer ref="gplot" mode="right" :mask-click="false">
+				<scroll-view style="height: 100%" scroll-y="true">
+					<view class="content">
+						<image
+							class="gplot gplot-box"
+							mode="aspectFill"
+							:class="{ 'gplot-active': key == activeGplot }"
+							:src="item.filePath"
+							@click="activeGplot = key"
+							v-for="(item, key) in imageList"
+							:key="key"
+						/>
+						<view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50"
+							>暂无拓扑图
+						</view>
+						<view class="btn-wrap">
+							<view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
+							<view class="btn-wrap-item ml20" @click="confirmGplot"> 确定</view>
+						</view>
+					</view>
+				</scroll-view>
+			</uni-drawer>
+			<uni-drawer ref="point" mode="right" :mask-click="false">
+				<scroll-view style="height: 100%" scroll-y="true">
+					<view style="background: #fff">
+						<view class="map-pin-box">
+							<image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl" />
 
-                            <movable-area class="map-pin-box-area">
-                                <movable-view :x="point.lat" :y="point.lng" direction="all" @change="dragPoint">
-                                    <view class="point">
-                                        {{ point.alias || point.name }}
-                                    </view>
-                                </movable-view>
-                            </movable-area>
-                        </view>
-                    </view>
-                    <view class="content">
-                        <view class="content-des">请拖动图中的文字选择监测点位置</view>
-                        <uni-forms>
-                            <uni-data-select
-                                v-model="point.position"
-                                :localdata="positionList"
-                                @change="positionChange"
-                                disabled
-                                :clear="false"
-                            ></uni-data-select>
-                            <uni-easyinput
-                                :clearable="false"
-                                class="mt20"
-                                type="text"
-                                v-model="point.alias"
-                                @change="aliasChange"
-                                placeholder="别名（非必填）"
-                            />
-                        </uni-forms>
-                        <view class="btn-wrap">
-                            <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
-                            <view class="btn-wrap-item ml20" @click="addPoint"> 确定</view>
-                        </view>
-                    </view>
-                </scroll-view>
-            </uni-drawer>
-        </template>
-    </view>
+							<movable-area class="map-pin-box-area">
+								<movable-view :x="point.lat" :y="point.lng" direction="all" @change="dragPoint">
+									<view class="point">
+										{{ point.alias || point.name }}
+									</view>
+								</movable-view>
+							</movable-area>
+						</view>
+					</view>
+					<view class="content">
+						<view class="content-des">请拖动图中的文字选择监测点位置</view>
+						<uni-forms>
+							<uni-data-select
+								v-model="point.position"
+								:localdata="positionList"
+								@change="positionChange"
+								disabled
+								:clear="false"
+							></uni-data-select>
+							<uni-easyinput
+								:clearable="false"
+								class="mt20"
+								type="text"
+								v-model="point.alias"
+								@change="aliasChange"
+								placeholder="别名（非必填）"
+							/>
+						</uni-forms>
+						<view class="btn-wrap">
+							<view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
+							<view class="btn-wrap-item ml20" @click="addPoint"> 确定</view>
+						</view>
+					</view>
+				</scroll-view>
+			</uni-drawer>
+		</template>
+	</view>
 </template>
 <script>
 import { registerDevice, getModel, addDevice, queryByTopoId } from '@/common/api/device.js'
 import { getProjectList, queryTopologyDiagramPage } from '@/common/api/project.js'
 
 export default {
-    data() {
-        return {
-            loading: false,
-            type: 1,
-            formData: {
-                nDid: '',
-                projectId: '',
-                topologyDiagramUrl: '',
-                topologyDiagram: '',
-            },
-            projectRange: [],
-            point: {},
-            pointList: [],
-            activeGplot: 0,
-            positionList: [],
-            imageList: [],
-            isAdaptive: false, // 是否适应当前项目
-            dialogOpen: false,
-            options: {},
-        }
-    },
-    onBackPress() {
-        if (this.dialogOpen) {
-            this.closeDrawer()
-            return true
-        } else if (this.type === 3) {
-            return false
-        } else if (this.type === 2) {
-            this.type = 1
-            return true
-        } else {
-            return false
-        }
-    },
-    onLoad(o) {
-        this.options = o
-        let dictData = uni.getStorageSync(this.$cacheKey.dictData)
-        dictData.forEach((item) => {
-            if (item.code == 'Line_Position') {
-                this.positionList = item.children.map((item) => {
-                    return {
-                        ...item,
-                        text: item.name,
-                        value: item.id,
-                    }
-                })
-            }
-        })
-    },
-    onShow() {
-        let engineering = uni.getStorageSync(this.$cacheKey.engineering)
-        getProjectList({
-            pageNum: 1,
-            pageSize: 9999,
-            engineeringId: engineering.id,
-        }).then((res) => {
-            console.log(res)
-            let arr = [
-                ...res.data.records.map((item) => {
-                    return {
-                        ...item,
-                        text: item.name,
-                        value: item.id,
-                    }
-                }),
-            ]
-            this.projectRange = arr
-        })
-    },
-    methods: {
-        createProject() {
-            uni.navigateTo({
-                url: '/pages/project/new?from=newDevice',
-            })
-        },
-        resize() {
-            console.log(this.$refs['gplot-image'])
-        },
-        confirmGplot() {
-            this.formData.topologyDiagramUrl = this.imageList[this.activeGplot].filePath
-            this.formData.topologyDiagram = this.imageList[this.activeGplot].id
-            this.pointList.forEach((item) => {
-                console.log(item.position)
-                this.imageList[this.activeGplot].csLineTopologyTemplateVOList.forEach((item3) => {
-                    console.log(item3.linePostion)
-                    if (item3.linePostion === item.position) {
-                        item.lat = item3.lat
-                        item.lng = item3.lng
-                    }
-                })
-            })
-            console.log(this.pointList)
-            this.$forceUpdate()
-            this.closeDrawer()
-            this.$nextTick(() => {
-                this.resize()
-            })
-        },
-        queryTopologyDiagramPage() {
-            setTimeout(() => {
-                if (!this.formData.projectId) {
-                    return
-                }
-                queryTopologyDiagramPage({
-                    projectId: this.formData.projectId,
-                }).then((res) => {
-                    this.imageList = res.data.records.map((item) => {
-                        return {
-                            ...item,
-                            filePath: this.$config.static + item.filePath,
-                        }
-                    })
-                    this.activeGplot = 0
-                    if (this.imageList.length) {
-                        this.confirmGplot()
-                    } else {
-                        this.formData.topologyDiagramUrl = ''
-                        this.formData.topologyDiagram = ''
-                    }
-                })
-            }, 100)
-        },
-        aliasChange(e) {
-            this.$forceUpdate()
-        },
-        positionChange(e) {
-            console.log(e)
-        },
-        projectChange(e) {},
-        scanCode() {
-            uni.scanCode({
-                success: (res) => {
-                    console.log('条码类型：' + res.scanType)
-                    console.log('条码内容：' + res.result)
-                    let content = JSON.parse(res.result)
-                    console.log(content)
-                    if (content.type === 'NDID') {
-                        this.formData.nDid = content.data
-                        this.register()
-                    }
-                },
-            })
-        },
-        register() {
-            if (!this.formData.nDid) {
-                return this.$util.toast('请输入设备识别码')
-            }
-            registerDevice(this.formData.nDid, Number(this.options.type)).then((res) => {
-                getModel(this.formData.nDid).then((res) => {
-                    console.log(res)
-                    this.pointList = res.data.map((item) => {
-                        return {
-                            lat: 0,
-                            lng: 0,
-                            ...item,
-                        }
-                    })
-                    this.type = 2
-                })
-            })
-        },
-        chooseLocation() {
-            uni.chooseLocation({
-                success: function (res) {
-                    this.address = res.name
-                    console.log('位置名称：' + res.name)
-                    console.log('详细地址：' + res.address)
-                    console.log('纬度：' + res.latitude)
-                    console.log('经度：' + res.longitude)
-                },
-            })
-        },
-        chooseGplot() {
-            this.$refs.gplot.open()
-            this.dialogOpen = true
-        },
-        closeDrawer() {
-            this.$refs.gplot.close()
-            this.$refs.point.close()
-            this.dialogOpen = false
-        },
-        add() {
-            this.$refs.point.open()
-        },
-        addPoint() {
-            if (!this.point.position) {
-                this.$util.toast('请选择监测点')
-                return
-            }
-            if (this.point.alias) {
-                this.point.name = this.point.alias
-            } else {
-                this.positionList.forEach((item) => {
-                    if (item.id == this.point.position) {
-                        this.point.name = item.name
-                    }
-                })
-            }
-            if (this.point.coordinate) {
-                this.point.lat = this.point.coordinate.x
-                this.point.lng = this.point.coordinate.y
-            }
-            this.pointList[this.editIndex] = this.point
-            console.log(this.pointList)
-            this.closeDrawer()
-        },
-        deletePoint(index) {
-            this.pointList.splice(index, 1)
-        },
-        editPoint(item, index) {
-            this.point = item
-            console.log(this.point)
-            this.editIndex = index
-            if (!this.point.alias) {
-                let every = this.positionList.every((item) => item.name != this.point.name)
-                console.log(every)
-                if (every) {
-                    this.point.alias = this.point.name
-                } else {
-                    this.point.alias = ''
-                }
-            }
-            this.dialogOpen = true
-            this.$refs.point.open()
-            this.$forceUpdate()
-        },
-        dragPoint(e) {
-            console.log(e)
-            this.point.coordinate = {
-                x: e.detail.x,
-                y: e.detail.y,
-            }
-            // this.point.lat = e.detail.x
-            // this.point.lng = e.detail.y
-        },
-        submit() {
-            if (!this.formData.projectId) {
-                return this.$util.toast('请选择项目')
-            }
-            if (!this.formData.topologyDiagram) {
-                return this.$util.toast('请选择拓扑图')
-            }
-            // 检查pointLlist监测点是否重复，并给出提示
-            let arr = []
-            this.pointList.forEach((item) => {
-                arr.push(item.position)
-            })
-            let set = new Set(arr)
-            if (set.size !== arr.length) {
-                this.$util.toast('监测点不能重复')
-                return
-            }
-            addDevice({
-                ...this.formData,
-                list: this.pointList,
-                ndid: this.formData.nDid,
-                process: Number(this.options.type),
-            }).then((res) => {
-                console.log(res)
-                this.$util.toast('提交成功')
-                setTimeout(() => {
-                    this.type = 3
-                    uni.navigateBack({ delta: 1 })
-                }, 1500)
-            })
-        },
-    },
+	data() {
+		return {
+			loading: false,
+			type: 1,
+			formData: {
+				nDid: '',
+				projectId: '',
+				topologyDiagramUrl: '',
+				topologyDiagram: '',
+			},
+			projectRange: [],
+			point: {},
+			isLoading: false,
+			pointList: [],
+			activeGplot: 0,
+			positionList: [],
+			imageList: [],
+			isAdaptive: false, // 是否适应当前项目
+			dialogOpen: false,
+			options: {},
+		}
+	},
+	onBackPress() {
+		if (this.dialogOpen) {
+			this.closeDrawer()
+			return true
+		} else if (this.type === 3) {
+			return false
+		} else if (this.type === 2) {
+			this.type = 1
+			return true
+		} else {
+			return false
+		}
+	},
+	onLoad(o) {
+		this.options = o
+		let dictData = uni.getStorageSync(this.$cacheKey.dictData)
+		dictData.forEach((item) => {
+			if (item.code == 'Line_Position') {
+				this.positionList = item.children.map((item) => {
+					return {
+						...item,
+						text: item.name,
+						value: item.id,
+					}
+				})
+			}
+		})
+	},
+	onShow() {
+		let engineering = uni.getStorageSync(this.$cacheKey.engineering)
+		getProjectList({
+			pageNum: 1,
+			pageSize: 9999,
+			engineeringId: engineering.id,
+		}).then((res) => {
+			console.log(res)
+			let arr = [
+				...res.data.records.map((item) => {
+					return {
+						...item,
+						text: item.name,
+						value: item.id,
+					}
+				}),
+			]
+			this.projectRange = arr
+		})
+	},
+	methods: {
+		createProject() {
+			uni.navigateTo({
+				url: '/pages/project/new?from=newDevice',
+			})
+		},
+		resize() {
+			console.log(this.$refs['gplot-image'])
+		},
+		confirmGplot() {
+			this.formData.topologyDiagramUrl = this.imageList[this.activeGplot].filePath
+			this.formData.topologyDiagram = this.imageList[this.activeGplot].id
+			this.pointList.forEach((item) => {
+				console.log(item.position)
+				this.imageList[this.activeGplot].csLineTopologyTemplateVOList.forEach((item3) => {
+					console.log(item3.linePostion)
+					if (item3.linePostion === item.position) {
+						item.lat = item3.lat
+						item.lng = item3.lng
+					}
+				})
+			})
+			console.log(this.pointList)
+			this.$forceUpdate()
+			this.closeDrawer()
+			this.$nextTick(() => {
+				this.resize()
+			})
+		},
+		queryTopologyDiagramPage() {
+			setTimeout(() => {
+				if (!this.formData.projectId) {
+					return
+				}
+				queryTopologyDiagramPage({
+					projectId: this.formData.projectId,
+				}).then((res) => {
+					this.imageList = res.data.records.map((item) => {
+						return {
+							...item,
+							filePath: this.$config.static + item.filePath,
+						}
+					})
+					this.activeGplot = 0
+					if (this.imageList.length) {
+						this.confirmGplot()
+					} else {
+						this.formData.topologyDiagramUrl = ''
+						this.formData.topologyDiagram = ''
+					}
+				})
+			}, 100)
+		},
+		aliasChange(e) {
+			this.$forceUpdate()
+		},
+		positionChange(e) {
+			console.log(e)
+		},
+		projectChange(e) {},
+		scanCode() {
+			uni.scanCode({
+				success: (res) => {
+					console.log('条码类型：' + res.scanType)
+					console.log('条码内容：' + res.result)
+					let content = JSON.parse(res.result)
+					console.log(content)
+					if (content.type === 'NDID') {
+						this.formData.nDid = content.data
+						this.register()
+					}
+				},
+			})
+		},
+		register() {
+			if (!this.formData.nDid) {
+				return this.$util.toast('请输入设备识别码')
+			}
+			this.isLoading=true
+			registerDevice(this.formData.nDid, Number(this.options.type)).then((res) => {
+				getModel(this.formData.nDid).then((res) => {
+					console.log(res)
+					this.pointList = res.data.map((item) => {
+						return {
+							lat: 0,
+							lng: 0,
+							...item,
+						}
+					})
+					this.type = 2
+					
+						this.isLoading=false
+					
+				}).catch(()=>{
+	
+					this.isLoading=false
+			})
+				
+			}).catch(()=>{
+	
+					this.isLoading=false
+			})
+		},
+		chooseLocation() {
+			uni.chooseLocation({
+				success: function (res) {
+					this.address = res.name
+					console.log('位置名称：' + res.name)
+					console.log('详细地址：' + res.address)
+					console.log('纬度：' + res.latitude)
+					console.log('经度：' + res.longitude)
+				},
+			})
+		},
+		chooseGplot() {
+			this.$refs.gplot.open()
+			this.dialogOpen = true
+		},
+		closeDrawer() {
+			this.$refs.gplot.close()
+			this.$refs.point.close()
+			this.dialogOpen = false
+		},
+		add() {
+			this.$refs.point.open()
+		},
+		addPoint() {
+			if (!this.point.position) {
+				this.$util.toast('请选择监测点')
+				return
+			}
+			if (this.point.alias) {
+				this.point.name = this.point.alias
+			} else {
+				this.positionList.forEach((item) => {
+					if (item.id == this.point.position) {
+						this.point.name = item.name
+					}
+				})
+			}
+			if (this.point.coordinate) {
+				this.point.lat = this.point.coordinate.x
+				this.point.lng = this.point.coordinate.y
+			}
+			this.pointList[this.editIndex] = this.point
+			console.log(this.pointList)
+			this.closeDrawer()
+		},
+		deletePoint(index) {
+			this.pointList.splice(index, 1)
+		},
+		editPoint(item, index) {
+			this.point = item
+			console.log(this.point)
+			this.editIndex = index
+			if (!this.point.alias) {
+				let every = this.positionList.every((item) => item.name != this.point.name)
+				console.log(every)
+				if (every) {
+					this.point.alias = this.point.name
+				} else {
+					this.point.alias = ''
+				}
+			}
+			this.dialogOpen = true
+			this.$refs.point.open()
+			this.$forceUpdate()
+		},
+		dragPoint(e) {
+			console.log(e)
+			this.point.coordinate = {
+				x: e.detail.x,
+				y: e.detail.y,
+			}
+			// this.point.lat = e.detail.x
+			// this.point.lng = e.detail.y
+		},
+		submit() {
+			if (!this.formData.projectId) {
+				return this.$util.toast('请选择项目')
+			}
+			if (!this.formData.topologyDiagram) {
+				return this.$util.toast('请选择拓扑图')
+			}
+			// 检查pointLlist监测点是否重复，并给出提示
+			let arr = []
+			this.pointList.forEach((item) => {
+				arr.push(item.position)
+			})
+			let set = new Set(arr)
+			if (set.size !== arr.length) {
+				this.$util.toast('监测点不能重复')
+				return
+			}
+			addDevice({
+				...this.formData,
+				list: this.pointList,
+				ndid: this.formData.nDid,
+				process: Number(this.options.type),
+			}).then((res) => {
+				console.log(res)
+				this.$util.toast('提交成功')
+				setTimeout(() => {
+					this.type = 3
+					uni.navigateBack({ delta: 1 })
+				}, 1500)
+			})
+		},
+	},
 }
 </script>
 <style lang="scss">
 .new {
-    padding: 34rpx;
+	padding: 34rpx;
 
-    .new-btn {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin: 80rpx auto 0;
-        width: 320rpx;
-        background: $uni-theme-color;
-        color: #fff;
-        height: 80rpx;
-        border-radius: 12rpx;
-    }
+	.new-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 80rpx auto 0;
+		width: 320rpx;
+		background: $uni-theme-color;
+		color: #fff;
+		height: 80rpx;
+		border-radius: 12rpx;
+	}
 
-    .content {
-        .content-des {
-            font-size: 28rpx;
-            color: #666;
-            margin-bottom: 20rpx;
-        }
+	.content {
+		.content-des {
+			font-size: 28rpx;
+			color: #666;
+			margin-bottom: 20rpx;
+		}
 
-        margin-bottom: 20rpx;
-        padding: 34rpx;
-        background: $uni-theme-white;
-        border-radius: 12rpx;
-    }
+		margin-bottom: 20rpx;
+		padding: 34rpx;
+		background: $uni-theme-white;
+		border-radius: 12rpx;
+	}
 
-    .gplot {
-        position: relative;
-        width: 100%;
-        height: 188rpx;
-    }
+	.gplot {
+		position: relative;
+		width: 100%;
+		height: 188rpx;
+	}
 
-    .gplot-empty {
-        margin: 0 auto;
-        border: 1px dashed #dcdfe6;
-        color: #999;
-        height: 188rpx;
-    }
+	.gplot-empty {
+		margin: 0 auto;
+		border: 1px dashed #dcdfe6;
+		color: #999;
+		height: 188rpx;
+	}
 
-    .gplot-box {
-        height: 280rpx;
-        margin: 0 auto;
-    }
+	.gplot-box {
+		height: 280rpx;
+		margin: 0 auto;
+	}
 
-    .gplot-active::after {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        box-sizing: border-box;
-        border: 8rpx solid $uni-theme-color;
-        // background: rgba(3, 3, 3, .5);
-    }
+	.gplot-active::after {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
+		border: 8rpx solid $uni-theme-color;
+		// background: rgba(3, 3, 3, .5);
+	}
 
-    .btn-wrap {
-        margin-top: 40rpx;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+	.btn-wrap {
+		margin-top: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 
-        .btn-wrap-item {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex: 1;
-            background: $uni-theme-color;
-            color: #fff;
-            height: 80rpx;
-            border-radius: 12rpx;
-        }
-    }
+		.btn-wrap-item {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex: 1;
+			background: $uni-theme-color;
+			color: #fff;
+			height: 80rpx;
+			border-radius: 12rpx;
+		}
+	}
 }
 
 .map-pin-box {
-    position: relative;
-    width: 375px;
-    margin: 0 auto;
+	position: relative;
+	width: 375px;
+	margin: 0 auto;
 
-    .map-pin-box-area {
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
-    }
+	.map-pin-box-area {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+	}
 
-    .point {
-        white-space: nowrap;
-        font-size: 24rpx;
-    }
+	.point {
+		white-space: nowrap;
+		font-size: 24rpx;
+	}
 }
 
 /deep/ .uni-drawer__content {
-    width: 100vw !important;
+	width: 100vw !important;
 }
 
 .point-item {
-    height: 72rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-top: 2rpx solid #e5e5e5;
-    border-color: rgb(229, 229, 229);
+	height: 72rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-top: 2rpx solid #e5e5e5;
+	border-color: rgb(229, 229, 229);
 }
 
 .point-item:first-of-type {
-    border-top: none;
+	border-top: none;
 }
 
 .gplot-image {
-    position: absolute;
-    left: -9999px;
-    width: 375px;
+	position: absolute;
+	left: -9999px;
+	width: 375px;
 }
 </style>
diff --git a/pages/device/transfer.vue b/pages/device/transfer.vue
index 2ab7cf8..0617867 100644
--- a/pages/device/transfer.vue
+++ b/pages/device/transfer.vue
@@ -1,29 +1,47 @@
 <template>
-    <Cn-page :loading="loading" beforeRender>
-        <view slot="body">
-            <view class="transfer">
-                <!-- <div class="transfer-img" ref="qrCodeUrl" /> -->
-                <!-- <uqrcode ref="uqrcode" canvas-id="qrcode" :value="content" :options="{ margin: 10 }"></uqrcode> -->
-                <uqrcode ref="uqrcode" canvas-id="qrcode" :value="content" size="200"
-                         @complete="complete"
-                         :loading="false"></uqrcode>
-                <view style="height: 200rpx"></view>
-                <view class="transfer-text ">请让接收人员扫码接收</view>
-                <view class="transfer-btn">
-                    <button class="transfer-btn-item" style="background-color: #fff; color: #111" @click="back">
-                        返回
-                    </button>
-                    <button class="transfer-btn-item ml20" @click="scan">扫一扫</button>
+    <view>
+        <Cn-page :loading="loading" beforeRender>
+            <view slot="body">
+                <view class="transfer">
+                    <!-- <div class="transfer-img" ref="qrCodeUrl" /> -->
+                    <!-- <uqrcode ref="uqrcode" canvas-id="qrcode" :value="content" :options="{ margin: 10 }"></uqrcode> -->
+                    <uqrcode
+                        ref="uqrcode"
+                        canvas-id="qrcode"
+                        :value="content"
+                        size="200"
+                        @complete="complete"
+                        :loading="false"
+                    ></uqrcode>
+                    <view style="height: 200rpx"></view>
+                    <view class="transfer-text">请让接收人员扫码接收</view>
+                    <view class="transfer-btn">
+                        <button class="transfer-btn-item" style="background-color: #fff; color: #111" @click="back">
+                            返回
+                        </button>
+                        <button class="transfer-btn-item ml20" @click="scan">扫一扫</button>
+                    </view>
                 </view>
             </view>
-        </view>
-    </Cn-page>
+        </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>
+    </view>
 </template>
 <script>
 // import QRCode from 'qrcodejs2'
 // import UQRCode from '@/uni_modules/Sansnn-uQRCode/js_sdk/uqrcode/uqrcode.js';
 
-import {transferDevice} from "@/common/api/device";
+import { transferDevice } from '@/common/api/device'
 
 export default {
     data() {
@@ -38,10 +56,10 @@ export default {
             this.loading = false
         },
         back() {
-            uni.navigateBack({delta: 1})
+            uni.navigateBack({ delta: 1 })
         },
         home() {
-            uni.navigateBack({delta: 1})
+            uni.navigateBack({ delta: 1 })
         },
         transferDevice(userId) {
             transferDevice(this.options.id, userId).then((res) => {
@@ -53,6 +71,18 @@ export default {
             })
         },
         scan() {
+            if (
+                plus.os.name == 'Android' &&
+                plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
+            ) {
+                //未授权
+
+                this.$refs.alertDialog.open()
+            } else {
+                this.handleScon()
+            }
+        },
+        handleScon() {
             uni.scanCode({
                 success: (res) => {
                     console.log(res)
@@ -68,6 +98,7 @@ export default {
                 },
             })
         },
+        dialogClose() {},
     },
     onLoad(options) {
         this.options = options
diff --git a/pages/index/comp/device.vue b/pages/index/comp/device.vue
index 252c787..b71e3e9 100644
--- a/pages/index/comp/device.vue
+++ b/pages/index/comp/device.vue
@@ -133,6 +133,7 @@ export default {
     },
     computed: {
         deviceListFilter() {
+		
             let arr = this.store.data.filter((item) => {
                 if (this.select.projectName && this.select.projectType) {
                     return item.project === this.select.projectName && item.type === this.select.projectType
@@ -144,9 +145,11 @@ export default {
                     return true
                 }
             })
+			
             if (this.transfer || this.share) {
+				
                 return arr.filter((item) => {
-                    return item.isPrimaryUser === '1' && item.process == 4
+                    return item.isPrimaryUser === '1' //&& item.process == 4
                 })
             } else {
                 return arr
@@ -330,8 +333,9 @@ export default {
             this.navMenuActive = index
         },
         jump(item) {
+		
             uni.navigateTo({
-                url: '/pages/device/APF/detail?id=' + item.equipmentId + '&isPrimaryUser=' + item.isPrimaryUser,
+                url: '/pages/device/APF/detail?id=' + item.equipmentId + '&isPrimaryUser=' + item.isPrimaryUser+ '&ndid=' + item.ndid,
             })
         },
     },
diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue
index a86f803..bf48026 100644
--- a/pages/index/comp/indexGongCheng.vue
+++ b/pages/index/comp/indexGongCheng.vue
@@ -1,132 +1,168 @@
 <template>
-    <view class="index-zhuyonghu">
-        <template v-if="devCount.engineeringListLength > 1">
-            <view class="canneng-index-title mb20">所有工程设备统计</view>
-            <view class="header">
-                <view class="header-item" @click="jump('allEngineering')">
-                    <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                    <view class="header-item-label">设备总数</view>
-                </view>
-                <view class="header-item" @click="jump('onLineDevs')">
-                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                    <view class="header-item-label">在线设备</view>
-                </view>
-                <view class="header-item" @click="jump('offLineDevs')">
-                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                    <view class="header-item-label">离线设备</view>
-                </view>
-            </view>
-            <view class="mt20"></view>
-        </template>
-        <view class="canneng-index-title mb20">当前工程设备统计</view>
-        <view class="header">
-            <view class="header-item" @click="jump('nowEngineering')">
-                <view class="header-item-value"
-                    >{{ devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0 }}
-                </view>
-                <view class="header-item-label">设备总数</view>
-            </view>
-            <view class="header-item" @click="jump('currentOnLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('currentOffLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-        </view>
-        <view class="canneng-index-title mt20">常用功能</view>
-        <view style="padding: 20rpx 20rpx 0">
-            <Cn-grid title="" :auto-fill="false">
-                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice(4)"></Cn-grid-item>
-                <Cn-grid-item
-                    src="/static/device2.png"
-                    text="功能调试"
-                    @click="registerDevice(2)"
-                    v-if="config.feature"
-                ></Cn-grid-item>
-                <Cn-grid-item
-                    src="/static/device2.png"
-                    text="出厂调试"
-                    @click="registerDevice(3)"
-                    v-if="config.factory"
-                ></Cn-grid-item>
-                <Cn-grid-item background="#fff" v-if="!config.feature"></Cn-grid-item>
-                <Cn-grid-item background="#fff" v-if="!config.factory"></Cn-grid-item>
-                <Cn-grid-item background="#fff"></Cn-grid-item>
-                <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
-                <!--                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>-->
-            </Cn-grid>
-        </view>
-    </view>
+	<view class="index-zhuyonghu">
+		<template v-if="devCount.engineeringListLength > 1">
+			<view class="canneng-index-title mb20">所有工程设备统计</view>
+			<view class="header">
+				<view class="header-item" @click="jump('allEngineering')">
+					<view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+					<view class="header-item-label">设备总数</view>
+				</view>
+				<view class="header-item" @click="jump('onLineDevs')">
+					<view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+					<view class="header-item-label">在线设备</view>
+				</view>
+				<view class="header-item" @click="jump('offLineDevs')">
+					<view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+					<view class="header-item-label">离线设备</view>
+				</view>
+			</view>
+			<view class="mt20"></view>
+		</template>
+		<view class="canneng-index-title mb20">当前工程设备统计</view>
+		<view class="header">
+			<view class="header-item" @click="jump('nowEngineering')">
+				<view class="header-item-value"
+					>{{ devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0 }}
+				</view>
+				<view class="header-item-label">设备总数</view>
+			</view>
+			<view class="header-item" @click="jump('currentOnLineDevs')">
+				<view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
+				<view class="header-item-label">在线设备</view>
+			</view>
+			<view class="header-item" @click="jump('currentOffLineDevs')">
+				<view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
+				<view class="header-item-label">离线设备</view>
+			</view>
+		</view>
+		<view class="canneng-index-title mt20">常用功能</view>
+		<view style="padding: 20rpx 20rpx 0">
+			<Cn-grid title="" :auto-fill="false">
+				<Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice(4)"></Cn-grid-item>
+				<Cn-grid-item
+					src="/static/device2.png"
+					text="功能调试"
+					@click="registerDevice(2)"
+					v-if="config.feature"
+				></Cn-grid-item>
+				<Cn-grid-item
+					src="/static/device2.png"
+					text="出厂调试"
+					@click="registerDevice(3)"
+					v-if="config.factory"
+				></Cn-grid-item>
+				<Cn-grid-item background="#fff" v-if="!config.feature"></Cn-grid-item>
+				<Cn-grid-item background="#fff" v-if="!config.factory"></Cn-grid-item>
+				<Cn-grid-item background="#fff"></Cn-grid-item>
+				<!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
+				<!--                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>-->
+			</Cn-grid>
+		</view>
+		<uni-popup ref="popup" type="dialog" @maskClick="maskClick">
+			<uni-popup-dialog
+				mode="base"
+				type="info" 
+				content="请选择设备类型"
+				:duration="0"
+				confirmText="直连设备"
+				cancelText="网关接入"
+				cancelColor="#007aff"
+				@close="close"
+				@confirm="confirm"
+			></uni-popup-dialog>
+		</uni-popup>
+	</view>
 </template>
 <script>
 export default {
-    data() {
-        return {
-            loading: true,
-            config: {
-                feature: true,
-                factory: true,
-            },
-        }
-    },
-    props: {
-        devCount: {
-            type: Object,
-            default: {},
-        },
-    },
-    created() {
-        this.init()
-    },
-    methods: {
-        init() {
-            console.log('工程init')
-            let serverConfig = uni.getStorageSync(this.$cacheKey.serverConfig)
-            serverConfig && (this.config = serverConfig)
-        },
-        submitFeedBack() {
-            uni.navigateTo({ url: '/pages/home/feedback' })
-        },
-        registerDevice(type) {
-            uni.showModal({
-                title: '提示',
-                content: '请选择设备类型',
-                confirmText: '直连设备',
-                cancelText: '网关接入',
-                cancelColor: '#007aff',
-                success: ({ confirm, cancel }) => {
-                    if (confirm) {
-                        if (this.devCount.engineeringListLength > 0) {
-                            uni.navigateTo({
-                                url: '/pages/device/new?type=' + type,
-                            })
-                        } else {
-                            uni.navigateTo({
-                                url: '/pages/engineering/new?from=index&type=' + type,
-                            })
-                        }
-                    } else if (cancel) {
-                        // uni.navigateTo({
-                        //     url: '/pages/gateway/list',
-                        // })
-                        this.$util.toast('功能正在开发，敬请期待')
-                    }
-                },
-            })
-        },
-        registerGateway() {
-            uni.navigateTo({
-                url: '/pages/gateway/new',
-            })
-        },
-        jump(type) {
-            uni.navigateTo({
-                url: '/pages/device/list?type=' + type,
-            })
-        },
-    },
+	data() {
+		return {
+			loading: true,
+			config: {
+				feature: true,
+				factory: true,
+			},
+			type: 0,
+		}
+	},
+	props: {
+		devCount: {
+			type: Object,
+			default: {},
+		},
+	},
+	created() {
+		this.init()
+	},
+	methods: {
+		init() {
+			console.log('工程init')
+			let serverConfig = uni.getStorageSync(this.$cacheKey.serverConfig)
+			serverConfig && (this.config = serverConfig)
+		},
+		submitFeedBack() {
+			uni.navigateTo({ url: '/pages/home/feedback' })
+		},
+		registerDevice(type) {
+			this.type = type
+			this.$refs.popup.open()
+			// uni.showModal({
+			//     title: '提示',
+			//     content: '请选择设备类型',
+			//     confirmText: '直连设备',
+			//     cancelText: '网关接入',
+			//     cancelColor: '#007aff',
+			//     success: ({ confirm, cancel }) => {
+			//         if (confirm) {
+			//             if (this.devCount.engineeringListLength > 0) {
+			//                 uni.navigateTo({
+			//                     url: '/pages/device/new?type=' + type,
+			//                 })
+			//             } else {
+			//                 uni.navigateTo({
+			//                     url: '/pages/engineering/new?from=index&type=' + type,
+			//                 })
+			//             }
+			//         } else if (cancel) {
+			//             // uni.navigateTo({
+			//             //     url: '/pages/gateway/list',
+			//             // })
+			//             this.$util.toast('功能正在开发，敬请期待')
+			//         }
+			//     },
+			// })
+		},
+		maskClick() {
+			this.$refs.popup.close()
+		},
+		close() {
+			this.$util.toast('功能正在开发，敬请期待')
+			this.$refs.popup.close()
+		},
+		confirm(value) {
+			if (this.devCount.engineeringListLength > 0) {
+				uni.navigateTo({
+					url: '/pages/device/new?type=' + this.type,
+				})
+			} else {
+				uni.navigateTo({
+					url: '/pages/engineering/new?from=index&type=' + this.type,
+				})
+			}
+
+			this.$refs.popup.close()
+		},
+		registerGateway() {
+			uni.navigateTo({
+				url: '/pages/gateway/new',
+			})
+		},
+		jump(type) {
+			uni.navigateTo({
+				url: '/pages/device/list?type=' + type,
+			})
+		},
+	},
 }
 </script>
 <style lang="scss"></style>
diff --git a/pages/index/comp/indexYouKe.vue b/pages/index/comp/indexYouKe.vue
index 74cd5a3..f474932 100644
--- a/pages/index/comp/indexYouKe.vue
+++ b/pages/index/comp/indexYouKe.vue
@@ -42,6 +42,7 @@
                 <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
             </Cn-grid>
         </view>
+		
     </view>
 </template>
 <script>
diff --git a/pages/index/comp/indexZhuYongHu.vue b/pages/index/comp/indexZhuYongHu.vue
index a1a922f..f0b5715 100644
--- a/pages/index/comp/indexZhuYongHu.vue
+++ b/pages/index/comp/indexZhuYongHu.vue
@@ -1,108 +1,143 @@
 <template>
-    <view class="index-zhuyonghu">
-        <template v-if="devCount.engineeringListLength > 1">
-            <view class="canneng-index-title mb20">所有工程设备统计</view>
-            <view class="header">
-                <view class="header-item" @click="jump('allEngineering')">
-                    <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
-                    <view class="header-item-label">设备总数</view>
-                </view>
-                <view class="header-item" @click="jump('onLineDevs')">
-                    <view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
-                    <view class="header-item-label">在线设备</view>
-                </view>
-                <view class="header-item" @click="jump('offLineDevs')">
-                    <view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
-                    <view class="header-item-label">离线设备</view>
-                </view>
-            </view>
-            <view class="mt20"></view>
-        </template>
-        <view class="canneng-index-title mb20">当前工程设备统计</view>
-        <view class="header">
-            <view class="header-item" @click="jump('nowEngineering')">
-                <view class="header-item-value">{{
-                        devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
-                    }}
-                </view>
-                <view class="header-item-label">设备总数</view>
-            </view>
-            <view class="header-item" @click="jump('currentOnLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
-                <view class="header-item-label">在线设备</view>
-            </view>
-            <view class="header-item" @click="jump('currentOffLineDevs')">
-                <view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
-                <view class="header-item-label">离线设备</view>
-            </view>
-        </view>
-        <view class="canneng-index-title mt20">常用功能</view>
-        <view style="padding: 20rpx 20rpx 0">
-            <Cn-grid title="">
-                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
-                <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
-                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
-            </Cn-grid>
-        </view>
-    </view>
+	<view class="index-zhuyonghu">
+		<template v-if="devCount.engineeringListLength > 1">
+			<view class="canneng-index-title mb20">所有工程设备统计</view>
+			<view class="header">
+				<view class="header-item" @click="jump('allEngineering')">
+					<view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
+					<view class="header-item-label">设备总数</view>
+				</view>
+				<view class="header-item" @click="jump('onLineDevs')">
+					<view class="header-item-value">{{ devCount.onLineDevCount || 0 }}</view>
+					<view class="header-item-label">在线设备</view>
+				</view>
+				<view class="header-item" @click="jump('offLineDevs')">
+					<view class="header-item-value">{{ devCount.offLineDevCount || 0 }}</view>
+					<view class="header-item-label">离线设备</view>
+				</view>
+			</view>
+			<view class="mt20"></view>
+		</template>
+		<view class="canneng-index-title mb20">当前工程设备统计</view>
+		<view class="header">
+			<view class="header-item" @click="jump('nowEngineering')">
+				<view class="header-item-value"
+					>{{ devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0 }}
+				</view>
+				<view class="header-item-label">设备总数</view>
+			</view>
+			<view class="header-item" @click="jump('currentOnLineDevs')">
+				<view class="header-item-value">{{ devCount.currentOnLineDevCount || 0 }}</view>
+				<view class="header-item-label">在线设备</view>
+			</view>
+			<view class="header-item" @click="jump('currentOffLineDevs')">
+				<view class="header-item-value">{{ devCount.currentOffLineDevCount || 0 }}</view>
+				<view class="header-item-label">离线设备</view>
+			</view>
+		</view>
+		<view class="canneng-index-title mt20">常用功能</view>
+		<view style="padding: 20rpx 20rpx 0">
+			<Cn-grid title="">
+				<Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
+				<!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
+				<Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
+			</Cn-grid>
+		</view>
+		<uni-popup ref="popup" type="dialog" @maskClick='maskClick'> 
+			<uni-popup-dialog
+				mode="base"
+				type="info" 
+				content="请选择设备类型"
+				:duration="0"
+				confirmText="直连设备"
+				cancelText="网关接入"
+				cancelColor= '#007aff'
+				@close="close"
+				@confirm="confirm"
+			></uni-popup-dialog>
+	
+		</uni-popup>
+	</view>
 </template>
 <script>
 export default {
-    data() {
-        return {
-            loading: false,
-        }
-    },
-    props: {
-        devCount: {
-            type: Object,
-            default: {},
-        },
-    },
-    methods: {
-        submitFeedBack() {
-            uni.navigateTo({url: '/pages/home/feedback'})
-        },
-        registerDevice() {
-            uni.showModal({
-                title: '提示',
-                content: '请选择设备类型',
-                confirmText: '直连设备',
-                cancelText: '网关接入',
-                cancelColor: '#007aff',
-                success: ({confirm, cancel}) => {
-                    if (confirm) {
-                        if (this.devCount.engineeringListLength > 0) {
-                            uni.navigateTo({
-                                url: '/pages/device/new?type=4',
-                            })
-                        } else {
-                            uni.navigateTo({
-                                url: '/pages/engineering/new?from=index'
-                            })
-                        }
+	data() {
+		return {
+			loading: false,
+		}
+	},
+	props: {
+		devCount: {
+			type: Object,
+			default: {},
+		},
+	},
+	methods: {
+		submitFeedBack() {
+			uni.navigateTo({ url: '/pages/home/feedback' })
+		},
+		registerDevice() {
+			this.$refs.popup.open()
+			// uni.showModal({
+			//     title: '提示',
+			//     content: '请选择设备类型',
+			//     confirmText: '直连设备',
+			//     cancelText: '网关接入',
+			//     cancelColor: '#007aff',
+			//     success: ({confirm, cancel}) => {
+			//         if (confirm) {
+			//             if (this.devCount.engineeringListLength > 0) {
+			//                 uni.navigateTo({
+			//                     url: '/pages/device/new?type=4',
+			//                 })
+			//             } else {
+			//                 uni.navigateTo({
+			//                     url: '/pages/engineering/new?from=index'
+			//                 })
+			//             }
 
-                    } else if (cancel) {
-                        // uni.navigateTo({
-                        //     url: '/pages/gateway/list',
-                        // })
-                        this.$util.toast('功能正在开发，敬请期待')
-                    }
-                },
-            })
-        },
-        registerGateway() {
-            uni.navigateTo({
-                url: '/pages/gateway/new',
-            })
-        },
-        jump(type) {
-            uni.navigateTo({
-                url:
-                    '/pages/device/list?type=' + type
-            })
-        },
-    },
+			//         } else if (cancel) {
+			//             // uni.navigateTo({
+			//             //     url: '/pages/gateway/list',
+			//             // })
+			//             this.$util.toast('功能正在开发，敬请期待')
+			//         }
+			//     },
+			// })
+		},
+		maskClick(){
+			this.$refs.popup.close()
+		},
+		close() {
+			this.$util.toast('功能正在开发，敬请期待')
+			this.$refs.popup.close()
+		},
+		confirm(value) {
+			
+			            if (this.devCount.engineeringListLength > 0) {
+			                uni.navigateTo({
+			                    url: '/pages/device/new?type=4',
+			                })
+			            } else {
+			                uni.navigateTo({
+			                    url: '/pages/engineering/new?from=index'
+			                })
+			            }
+			
+			
+			this.$refs.popup.close()
+		},
+		registerGateway() {
+			uni.navigateTo({
+				url: '/pages/gateway/new',
+			})
+		},
+		jump(type) {
+			uni.navigateTo({
+				url: '/pages/device/list?type=' + type,
+			})
+		},
+	},
 }
 </script>
 <style lang="scss"></style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d1e9cd7..6d8a5d7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -30,6 +30,7 @@
                 <GongCheng ref="gongCheng" :devCount="devCount" v-if="userInfo.authorities === 'engineering_user'" />
                 <!-- 主用户 -->
                 <ZhuYongHu :devCount="devCount" v-if="userInfo.authorities === 'app_vip_user'" />
+				<!-- 游客 -->
                 <YouKe :devCount="devCount" v-if="userInfo.authorities === 'tourist'"></YouKe>
                 <template v-show="engineeringList.length">
                     <view class="canneng-index-title mt20">设备列表</view>
@@ -150,6 +151,7 @@ export default {
                 return
             }
             getDevCount(this.select.engineeringId).then((res) => {
+				// console.log(`12312`,res)
                 // Object.assign(this.devCount, res.data)
                 this.devCount = res.data
                 this.devCount.currentOffLineDevs.forEach((item) => {
@@ -213,7 +215,7 @@ export default {
                 // #endif
             }, 1000)
         }
-        this.timer = setInterval(this.getDevCount, 3000) // 定时请求
+        this.timer = setInterval(this.getDevCount, 1000 *60) // 定时请求
         this.store = this.DataSource('/cs-device-boot/EquipmentDelivery/queryEquipmentByProject')
         // #ifdef APP-PLUS
         setTimeout(() => {
@@ -230,6 +232,7 @@ export default {
     },
     onShow() {
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+
         let access_token = uni.getStorageSync(this.$cacheKey.access_token)
         console.log(access_token)
         if (!access_token) {
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 62fcb89..b561790 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -1,64 +1,64 @@
 <template>
-    <view :loading="loading">
-        <view class="mine">
-            <view class="mine-header" @click="jump('basic')">
-                <image mode="aspectFill" class="mine-header-head" :src="userInfo.avatar" v-if="userInfo.avatar" />
-                <image mode="aspectFill" class="mine-header-head" src="/static/head.png" v-else />
-                <view class="mine-header-name hide-txt">
-                    <view>{{ userInfo.nickname }}</view>
-                    <view></view>
-                    <view class="tag">{{ roleName }}</view>
-                </view>
-                <image
-                    src="/static/erweima.png"
-                    style="height: 50rpx; width: 50rpx; border-radius: 12rpx"
-                    mode="scaleToFill"
-                />
-                <uni-icons type="forward" color="#aaa" size="16"></uni-icons>
-            </view>
-            <view class="mine-nav" v-if="userInfo.authorities === 'tourist'" @click="jump('upgrade')">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/server.png" />
-                <view class="mine-nav-label">角色升级</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <!-- <view class="mine-nav" @click="jump('audit')" v-if="userInfo.authorities === 'app_vip_user'">
+	<view :loading="loading">
+		<view class="mine">
+			<view class="mine-header" @click="jump('basic')">
+				<image mode="aspectFill" class="mine-header-head" :src="userInfo.avatar" v-if="userInfo.avatar" />
+				<image mode="aspectFill" class="mine-header-head" src="/static/head.png" v-else />
+				<view class="mine-header-name hide-txt">
+					<view>{{ userInfo.nickname }}</view>
+					<view></view>
+					<view class="tag">{{ roleName }}</view>
+				</view>
+				<image
+					src="/static/erweima.png"
+					style="height: 50rpx; width: 50rpx; border-radius: 12rpx"
+					mode="scaleToFill"
+				/>
+				<uni-icons type="forward" color="#aaa" size="16"></uni-icons>
+			</view>
+			<view class="mine-nav" v-if="userInfo.authorities === 'tourist'" @click="jump('upgrade')">
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/server.png" />
+				<view class="mine-nav-label">角色升级</view>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<!-- <view class="mine-nav" @click="jump('audit')" v-if="userInfo.authorities === 'app_vip_user'">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/server.png" />
                 <view class="mine-nav-label">角色审核</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view> -->
 
-            <!-- <view class="mine-nav" @click="jump('user')" v-if="userInfo.authorities === 'app_vip_user'">
+			<!-- <view class="mine-nav" @click="jump('user')" v-if="userInfo.authorities === 'app_vip_user'">
                 <image mode="aspectFill" class="mine-nav-icon" src="/static/subordinate.png" />
                 <view class="mine-nav-label">分享用户列表</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view> -->
-            <view
-                class="mine-nav"
-                @click="jump('scan')"
-                v-if="userInfo.authorities === 'app_vip_user' || userInfo.authorities === 'engineering_user'"
-            >
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/scan.png" />
-                <view class="mine-nav-label">扫一扫</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('engineering')">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/gongcheng.png" />
-                <view class="mine-nav-label">工程管理</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
+			<view
+				class="mine-nav"
+				@click="jump('scan')"
+				v-if="userInfo.authorities === 'app_vip_user' || userInfo.authorities === 'engineering_user'"
+			>
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/scan.png" />
+				<view class="mine-nav-label">扫一扫</view>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<view class="mine-nav" @click="jump('engineering')">
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/gongcheng.png" />
+				<view class="mine-nav-label">工程管理</view>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
 
-            <view class="mine-nav" @click="jump('project')">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/project.png" />
-                <view class="mine-nav-label">项目管理</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('feedback')">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/feedback.png" />
-                <view class="mine-nav-label">反馈列表</view>
-                <uni-badge :text="messageCount.feedBackCount"></uni-badge>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <!-- <view
+			<view class="mine-nav" @click="jump('project')">
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/project.png" />
+				<view class="mine-nav-label">项目管理</view>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<view class="mine-nav" @click="jump('feedback')">
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/feedback.png" />
+				<view class="mine-nav-label">反馈列表</view>
+				<uni-badge :text="messageCount.feedBackCount"></uni-badge>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<!-- <view
                 class="mine-nav"
                 @click="jump('gateway')"
                 style="border-bottom: none; box-shadow: 0 4rpx 8rpx #e7e7e74c"
@@ -67,41 +67,54 @@
                 <view class="mine-nav-label">网关列表</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </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>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view
-                class="mine-nav"
-                @click="jump('engineering/setting')"
-                v-if="userInfo.authorities === 'engineering_user'"
-            >
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/like.png" />
-                <view class="mine-nav-label">关注工程配置</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('serverSetting')" v-if="userInfo.authorities === 'engineering_user'">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/server2.png" />
-                <view class="mine-nav-label">调试内容配置</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <view class="mine-nav" @click="jump('setup')" style="border-bottom: none">
-                <image mode="aspectFill" class="mine-nav-icon" src="/static/setup.png" />
-                <view class="mine-nav-label">设置</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
-            <uni-popup ref="inputDialog" type="dialog">
-                <uni-popup-dialog
-                    ref="inputClose"
-                    mode="input"
-                    title="角色升级"
-                    placeholder="请输入六位邀请码"
-                    @confirm="upgrade"
-                ></uni-popup-dialog>
-            </uni-popup>
-        </view>
-    </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>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<view
+				class="mine-nav"
+				@click="jump('engineering/setting')"
+				v-if="userInfo.authorities === 'engineering_user'"
+			>
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/like.png" />
+				<view class="mine-nav-label">关注工程配置</view>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<view class="mine-nav" @click="jump('serverSetting')" v-if="userInfo.authorities === 'engineering_user'">
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/server2.png" />
+				<view class="mine-nav-label">调试内容配置</view>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<view class="mine-nav" @click="jump('setup')" style="border-bottom: none">
+				<image mode="aspectFill" class="mine-nav-icon" src="/static/setup.png" />
+				<view class="mine-nav-label">设置</view>
+				<uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+			</view>
+			<uni-popup ref="inputDialog" type="dialog">
+				<uni-popup-dialog
+					ref="inputClose"
+					mode="input"
+					title="角色升级"
+					placeholder="请输入六位邀请码"
+					@confirm="upgrade"
+				></uni-popup-dialog>
+			</uni-popup>
+		</view>
+		
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog
+				type="info"
+				cancelText="禁止"
+				confirmText="允许"
+				title="权限说明"
+				content='是否允许"灿能物联"使用相机?'
+				
+				@confirm="handleScon" 
+				@close="dialogClose"
+			></uni-popup-dialog>
+		</uni-popup>
+	</view>
 </template>
 
 <script>
@@ -109,219 +122,235 @@ import { roleUpdate, autoLogin } from '@/common/api/user'
 import { transferDevice, shareDevice } from '@/common/api/device'
 
 export default {
-    data() {
-        return {
-            loading: true,
-            userInfo: {},
-            messageCount: {},
-            timer: null,
-        }
-    },
-    computed: {
-        roleName() {
-            let roleName = ''
-            switch (this.userInfo.authorities) {
-                case 'tourist':
-                    roleName = '游客'
-                    break
-                case 'engineering_user':
-                    roleName = '工程用户'
-                    break
-                case 'app_vip_user':
-                    roleName = '正式用户'
-                    break
-                case 'market_user':
-                    roleName = '营销用户'
-                    break
-                case 'operation_manager':
-                    roleName = '运维管理员'
-                    break
-            }
-            return roleName
-        },
-    },
-    onLoad(options) {
-        this.init()
-    },
-    methods: {
-        init() {},
-        upgrade(code) {
-            console.log(code)
-            roleUpdate({
-                referralCode: code,
-                userId: this.userInfo.userIndex,
-            }).then((res) => {
-                uni.showToast({
-                    title: '升级成功',
-                    icon: 'none',
-                })
-                uni.removeStorageSync('access_token')
-                // 直接登录
-                autoLogin(this.userInfo.user_name).then((res) => {
-                    this.$util.loginSuccess(res.data).then((userInfo) => {
-                        this.userInfo = userInfo
-                    })
-                })
-            })
-        },
-        jump(type) {
-            switch (type) {
-                case 'scan':
-                    uni.scanCode({
-                        success: (res) => {
-                            console.log('条码类型：' + res.scanType)
-                            console.log('条码内容：' + res.result)
-                            let content = JSON.parse(res.result)
-                            switch (content.type) {
-                                case 'transferDevice':
-                                    this.transferDevice(content.id.split(','))
-                                    break
-                                case 'shareDevice':
-                                    this.shareDevice(content.id.split(','))
-                                    break
-                                default:
-                                    this.$util.toast('无效二维码')
-                                    break
-                            }
-                        },
-                    })
-                    break
-                case 'login':
-                    uni.navigateTo({
-                        url: `/pages/user/login`,
-                    })
-                    break
-                case 'gateway':
-                    uni.navigateTo({
-                        url: `/pages/gateway/list`,
-                    })
-                    break
-                case 'upgrade':
-                    this.$refs.inputDialog.open()
-                    break
-                case 'basic':
-                    uni.navigateTo({
-                        url: `/pages/user/basic`,
-                    })
-                    break
-                case 'project':
-                    uni.navigateTo({
-                        url: `/pages/project/list`,
-                    })
-                    break
-                case 'engineering':
-                    uni.navigateTo({
-                        url: `/pages/engineering/list`,
-                    })
-                    break
-                case 'engineering/setting':
-                    uni.navigateTo({
-                        url: `/pages/engineering/setting`,
-                    })
-                    break
-                case 'feedback':
-                    uni.navigateTo({
-                        url: `/pages/message/feedback`,
-                    })
-                    break
-                default:
-                    uni.navigateTo({
-                        url: `/pages/mine/${type}`,
-                    })
-                    break
-            }
-        },
-        transferDevice(id) {
-            transferDevice(id).then((res) => {
-                uni.navigateTo({ url: '/pages/mine/result?type=transferDevice&id=' + id })
-            })
-        },
-        shareDevice(id) {
-            shareDevice(id).then((res) => {
-                uni.navigateTo({ url: '/pages/mine/result?type=shareDevice&id=' + id })
-            })
-        },
-    },
-    onShow() {
-        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
-        this.loading = false
-        this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
-        this.timer = setInterval(() => {
-            this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
-        }, 1000) // 定时请求
-    },
-    onHide() {
-        clearInterval(this.timer)
-    },
+	data() {
+		return {
+			loading: true,
+			userInfo: {},
+			messageCount: {},
+			timer: null,
+		}
+	},
+	computed: {
+		roleName() {
+			let roleName = ''
+			switch (this.userInfo.authorities) {
+				case 'tourist':
+					roleName = '游客'
+					break
+				case 'engineering_user':
+					roleName = '工程用户'
+					break
+				case 'app_vip_user':
+					roleName = '正式用户'
+					break
+				case 'market_user':
+					roleName = '营销用户'
+					break
+				case 'operation_manager':
+					roleName = '运维管理员'
+					break
+			}
+			return roleName
+		},
+	},
+	onLoad(options) {
+		this.init()
+	},
+	methods: {
+		init() {},
+		upgrade(code) {
+			console.log(code)
+			roleUpdate({
+				referralCode: code,
+				userId: this.userInfo.userIndex,
+			}).then((res) => {
+				uni.showToast({
+					title: '升级成功',
+					icon: 'none',
+				})
+				uni.removeStorageSync('access_token')
+				// 直接登录
+				autoLogin(this.userInfo.user_name).then((res) => {
+					this.$util.loginSuccess(res.data).then((userInfo) => {
+						this.userInfo = userInfo
+					})
+				})
+			})
+		},
+		jump(type) {
+			switch (type) {
+				case 'scan':
+					if (
+						plus.os.name == 'Android' &&
+						plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
+					) {
+						//未授权
+					
+						this.$refs.alertDialog.open()
+					} else {
+						console.log(2)
+						this.handleScon()
+					}
+
+					
+					break
+				case 'login':
+					uni.navigateTo({
+						url: `/pages/user/login`,
+					})
+					break
+				case 'gateway':
+					uni.navigateTo({
+						url: `/pages/gateway/list`,
+					})
+					break
+				case 'upgrade':
+					this.$refs.inputDialog.open()
+					break
+				case 'basic':
+					uni.navigateTo({
+						url: `/pages/user/basic`,
+					})
+					break
+				case 'project':
+					uni.navigateTo({
+						url: `/pages/project/list`,
+					})
+					break
+				case 'engineering':
+					uni.navigateTo({
+						url: `/pages/engineering/list`,
+					})
+					break
+				case 'engineering/setting':
+					uni.navigateTo({
+						url: `/pages/engineering/setting`,
+					})
+					break
+				case 'feedback':
+					uni.navigateTo({
+						url: `/pages/message/feedback`,
+					})
+					break
+				default:
+					uni.navigateTo({ 
+						url: `/pages/mine/${type}`,
+					})
+					break
+			}
+		},
+		handleScon(){
+			uni.scanCode({
+			    success: (res) => {
+			        console.log('条码类型：' + res.scanType)
+			        console.log('条码内容：' + res.result)
+			        let content = JSON.parse(res.result)
+			        switch (content.type) {
+			            case 'transferDevice':
+			                this.transferDevice(content.id.split(','))
+			                break
+			            case 'shareDevice':
+			                this.shareDevice(content.id.split(','))
+			                break
+			            default:
+			                this.$util.toast('无效二维码')
+			                break
+			        }
+			    },
+			})
+		},
+		dialogClose(){},
+		transferDevice(id) {
+			transferDevice(id).then((res) => {
+				uni.navigateTo({ url: '/pages/mine/result?type=transferDevice&id=' + id })
+			})
+		},
+		shareDevice(id) {
+			shareDevice(id).then((res) => {
+				uni.navigateTo({ url: '/pages/mine/result?type=shareDevice&id=' + id })
+			})
+		},
+	},
+	onShow() {
+		this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+		this.loading = false
+		this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
+		this.timer = setInterval(() => {
+			this.messageCount = uni.getStorageSync(this.$cacheKey.messageCount) || {}
+		}, 1000) // 定时请求
+	},
+	onHide() {
+		clearInterval(this.timer)
+	},
 }
 </script>
 
 <style lang="scss">
 .mine {
-    .mine-header {
-        padding: 200rpx 34rpx 34rpx;
-        display: flex;
-        align-items: center;
-        background: $uni-theme-white;
-        margin-bottom: 20rpx;
-        box-shadow: 0 4rpx 8rpx #e7e7e74c;
+	.mine-header {
+		padding: 200rpx 34rpx 34rpx;
+		display: flex;
+		align-items: center;
+		background: $uni-theme-white;
+		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 8rpx #e7e7e74c;
 
-        .mine-header-head {
-            margin-right: 30rpx;
-            height: 128rpx;
-            width: 128rpx;
-            border-radius: $uni-theme-radius;
-            overflow: hidden;
-        }
+		.mine-header-head {
+			margin-right: 30rpx;
+			height: 128rpx;
+			width: 128rpx;
+			border-radius: $uni-theme-radius;
+			overflow: hidden;
+		}
 
-        .mine-header-name {
-            margin-right: 30rpx;
-            flex: 1;
-            font-size: 36rpx;
-            color: #111;
-            font-weight: 700;
+		.mine-header-name {
+			margin-right: 30rpx;
+			flex: 1;
+			font-size: 36rpx;
+			color: #111;
+			font-weight: 700;
 
-            .tag {
-                display: flex;
-                align-items: center;
-                margin-top: 10rpx;
-                font-size: 24rpx;
-                color: #aaa;
+			.tag {
+				display: flex;
+				align-items: center;
+				margin-top: 10rpx;
+				font-size: 24rpx;
+				color: #aaa;
 
-                .engineering-button {
-                    margin-left: 10rpx;
-                    font-size: 24rpx;
-                    padding: 5rpx 12rpx;
-                    color: #fff;
-                    font-weight: 400;
-                    border-radius: 16rpx;
-                    background: $uni-theme-color;
-                }
-            }
-        }
-    }
+				.engineering-button {
+					margin-left: 10rpx;
+					font-size: 24rpx;
+					padding: 5rpx 12rpx;
+					color: #fff;
+					font-weight: 400;
+					border-radius: 16rpx;
+					background: $uni-theme-color;
+				}
+			}
+		}
+	}
 
-    .mine-nav {
-        padding: 34rpx;
-        display: flex;
-        align-items: center;
-        background: $uni-theme-white;
-        border-bottom: 1rpx solid #e8e8e8;
+	.mine-nav {
+		padding: 34rpx;
+		display: flex;
+		align-items: center;
+		background: $uni-theme-white;
+		border-bottom: 1rpx solid #e8e8e8;
 
-        &-icon {
-            margin-right: 30rpx;
-            height: 44rpx;
-            width: 44rpx;
-            border-radius: $uni-theme-radius;
-            overflow: hidden;
-        }
+		&-icon {
+			margin-right: 30rpx;
+			height: 44rpx;
+			width: 44rpx;
+			border-radius: $uni-theme-radius;
+			overflow: hidden;
+		}
 
-        &-label {
-            margin-right: 30rpx;
-            flex: 1;
-            font-size: 28rpx;
-            color: #111;
-        }
-    }
+		&-label {
+			margin-right: 30rpx;
+			flex: 1;
+			font-size: 28rpx;
+			color: #111;
+		}
+	}
 }
 </style>
diff --git a/pages/mine/about.vue b/pages/mine/about.vue
index 3b748d2..ad9d05c 100644
--- a/pages/mine/about.vue
+++ b/pages/mine/about.vue
@@ -4,7 +4,7 @@
             <view class="about">
                 <image src="/static/logo.png" class="logo"></image>
                 <view class="name">灿能物联</view>
-                <view class="version">Version 1.0.3</view>
+                <view class="version">Version 1.1.1</view>
             </view>
         </view>
     </Cn-page>
diff --git a/pages/mine/setup.vue b/pages/mine/setup.vue
index 698d16d..ff57a13 100644
--- a/pages/mine/setup.vue
+++ b/pages/mine/setup.vue
@@ -22,7 +22,7 @@
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="mine-nav" @click="jump('policy')">
-                <view class="mine-nav-label">个人信息保护政策</view>
+                <view class="mine-nav-label">隐私政策</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="mine-nav" @click="jump('system')">
diff --git a/pages/user/forget.vue b/pages/user/forget.vue
index fc0dfc1..5df800c 100644
--- a/pages/user/forget.vue
+++ b/pages/user/forget.vue
@@ -13,7 +13,12 @@
                     </uni-forms-item>
                     <uni-forms-item name="code">
                         <view class="login-box-input">
-                            <uni-easyinput type="text" v-model="formData.code" placeholder="请输入验证码" maxlength="6" />
+                            <uni-easyinput
+                                type="text"
+                                v-model="formData.code"
+                                placeholder="请输入验证码"
+                                maxlength="6"
+                            />
                             <view
                                 class="ml40"
                                 style="
@@ -43,7 +48,7 @@
                 <!-- <view class="login-box-tips">
                     <view style="color: #999">点击提交即表示同意</view>
                     <navigator url="/pages/mine/agreement" hover-class="none">《用户协议》</navigator>
-                    <navigator url="/pages/mine/policy" hover-class="none">《个人信息保护政策》</navigator>
+                    <navigator url="/pages/mine/policy" hover-class="none">《隐私政策》</navigator>
                 </view> -->
             </view>
         </view>
@@ -206,7 +211,7 @@ export default {
         }
 
         .login-box-input-btn {
-            padding:0 40rpx;
+            padding: 0 40rpx;
             margin-left: 40rpx;
             background: $uni-theme-color;
             color: #fff;
diff --git a/pages/user/head.vue b/pages/user/head.vue
index ef12554..831dbfa 100644
--- a/pages/user/head.vue
+++ b/pages/user/head.vue
@@ -1,16 +1,29 @@
 <template>
-    <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>
+        <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>
-        </view>
-    </Cn-page>
+        </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>
 </template>
 <script>
 import { uploadImage, getImageUrl } from '@/common/api/basic'
@@ -25,12 +38,27 @@ export default {
     },
     methods: {
         take(type) {
+            if (type == 'camera') {
+                if (
+                    plus.os.name == 'Android' &&
+                    plus.navigator.checkPermission('android.permission.CAMERA') === 'undetermined'
+                ) {
+                    //未授权
+
+                    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) => {
-                    console.log(res)
                     uploadImage(res.tempFilePaths[0]).then((res) => {
                         console.log(res)
                         let result = JSON.parse(res[1].data)
@@ -47,7 +75,9 @@ export default {
                 },
             })
         },
+        dialogClose() {},
     },
+
     onLoad(options) {
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
     },
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 3cfbc44..b71462d 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -2,12 +2,12 @@
     <Cn-page :loading="loading">
         <view slot="body">
             <view class="login">
-                <view class="login-title" style="font-size: 36rpx;">欢迎登录</view>
+                <view class="login-title" style="font-size: 36rpx">欢迎登录</view>
                 <!-- <view class="login-des">灿能物联</view> -->
                 <view class="login-box">
                     <!-- <image class="login-box-logo" mode="widthFix" src="/static/logo.png"></image> -->
                     <image class="login-box-logo" mode="widthFix" src="/static/logo.png"></image>
-                    <view style="font-size: 40rpx;text-align: center;font-weight: 500;" class="mt20">灿能物联</view>
+                    <view style="font-size: 40rpx; text-align: center; font-weight: 500" class="mt20">灿能物联</view>
                     <template v-if="loginType == 'yzm'">
                         <view class="login-box-input mt100">
                             <input
@@ -22,15 +22,19 @@
                             <view class="login-box-input-img"></view>
                         </view> -->
                         <view class="login-box-input mt40">
-                            <input type="text" class="login-box-input-main" v-model="yzmForm.code"
-                                   placeholder="手机验证码" maxlength="6"/>
+                            <input
+                                type="text"
+                                class="login-box-input-main"
+                                v-model="yzmForm.code"
+                                placeholder="手机验证码"
+                                maxlength="6"
+                            />
                             <view
                                 class="ml40"
                                 style="font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
                                 v-if="waitTime > 0"
-                            >{{ waitTime + 's后重新获取' }}
-                            </view
-                            >
+                                >{{ waitTime + 's后重新获取' }}
+                            </view>
                             <button class="login-box-input-btn" v-else @click="getCode" size="mini">获取验证码</button>
                         </view>
                     </template>
@@ -69,18 +73,12 @@
                         <navigator url="/pages/user/register" hover-class="none">快速注册</navigator>
                     </view>
                     <view class="login-box-tips">
-                        <view style="color: #999"
-                        >
-                            <checkbox
-                                style="transform: scale(0.7)"
-                                :checked="checkbox"
-                                @click="checkbox = !checkbox"
-                            />
+                        <view style="color: #999">
+                            <checkbox style="transform: scale(0.7)" :checked="checkbox" @click="checkbox = !checkbox" />
                             我已阅读并同意
-                        </view
-                        >
+                        </view>
                         <navigator url="/pages/mine/agreement" hover-class="none">《用户协议》</navigator>
-                        <navigator url="/pages/mine/policy" hover-class="none">《个人信息保护政策》</navigator>
+                        <navigator url="/pages/mine/policy" hover-class="none">《隐私政策》</navigator>
                     </view>
                 </view>
             </view>
@@ -88,9 +86,9 @@
     </Cn-page>
 </template>
 <script>
-import {apiGetYms, apiPwdLogin, apiYsmLogin, gongkey} from '@/common/api/user'
-import {sm2, encrypt} from '@/common/js/sm2.js'
-import {sm3Digest} from '@/common/js/sm3.js'
+import { apiGetYms, apiPwdLogin, apiYsmLogin, gongkey } from '@/common/api/user'
+import { sm2, encrypt } from '@/common/js/sm2.js'
+import { sm3Digest } from '@/common/js/sm3.js'
 
 export default {
     data() {
@@ -110,14 +108,14 @@ export default {
             waitTime: 0,
             tenantId: '',
             companyName: '',
-            inter:null
+            inter: null,
         }
     },
     components: {},
     methods: {
         getCode() {
             if (!this.checkbox) {
-                return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
+                return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
             }
             if (!this.phone) {
                 return this.$util.toast('请输入手机号！')
@@ -148,7 +146,7 @@ export default {
         },
         login() {
             if (!this.checkbox) {
-                return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
+                return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
             }
             console.log(this.loginType)
             if (this.loginType == 'pwd') {
@@ -164,7 +162,7 @@ export default {
             console.log(this.phone)
             let loginName = encrypt(this.phone)
             console.log(loginName)
-            gongkey({loginName}).then((response) => {
+            gongkey({ loginName }).then((response) => {
                 let publicKey = response.data
                 let sm3Pwd = sm3Digest(this.pwdForm.pwd)
                 let jiamipassword = sm2(sm3Pwd + '|' + this.pwdForm.pwd, publicKey, 0)
diff --git a/pages/user/register.vue b/pages/user/register.vue
index 5f7be8a..cdcc0d1 100644
--- a/pages/user/register.vue
+++ b/pages/user/register.vue
@@ -5,28 +5,51 @@
                 <template v-if="step == 1">
                     <uni-forms ref="form" :rules="rules" :modelValue="formData">
                         <uni-forms-item name="phone">
-                            <uni-easyinput type="number" v-model="formData.phone" maxlength="11" placeholder="请输入手机号" />
+                            <uni-easyinput
+                                type="number"
+                                v-model="formData.phone"
+                                maxlength="11"
+                                placeholder="请输入手机号"
+                            />
                         </uni-forms-item>
                         <uni-forms-item name="code">
                             <view class="login-box-input">
-                                <uni-easyinput type="text" v-model="formData.code" placeholder="请输入验证码" maxlength="6" />
+                                <uni-easyinput
+                                    type="text"
+                                    v-model="formData.code"
+                                    placeholder="请输入验证码"
+                                    maxlength="6"
+                                />
                                 <view
                                     class="ml40"
-                                    style="margin-left: 40rpx; font-size: 28rpx; color: #666; width: 200rpx; text-align: center"
+                                    style="
+                                        margin-left: 40rpx;
+                                        font-size: 28rpx;
+                                        color: #666;
+                                        width: 200rpx;
+                                        text-align: center;
+                                    "
                                     v-if="waitTime > 0"
                                     >{{ waitTime + 's后重新获取' }}
                                 </view>
-                                <button class="login-box-input-btn" v-else @click="getCode" size="mini">获取验证码</button>
+                                <button class="login-box-input-btn" v-else @click="getCode" size="mini">
+                                    获取验证码
+                                </button>
                             </view>
                         </uni-forms-item>
                     </uni-forms>
                     <button type="default" class="submit-btn" @click="firstSubmit">注册</button>
                     <view class="login-box-tips">
                         <view style="color: #999"
-                            ><checkbox style="transform: scale(0.7)" :checked="checkbox" @click="checkbox = !checkbox" /> 我已阅读并同意</view
+                            ><checkbox
+                                style="transform: scale(0.7)"
+                                :checked="checkbox"
+                                @click="checkbox = !checkbox"
+                            />
+                            我已阅读并同意</view
                         >
                         <navigator url="/pages/mine/agreement" hover-class="none">《用户协议》</navigator>
-                        <navigator url="/pages/mine/policy" hover-class="none">《个人信息保护政策》</navigator>
+                        <navigator url="/pages/mine/policy" hover-class="none">《隐私政策》</navigator>
                     </view>
                 </template>
                 <template v-else>
@@ -54,11 +77,11 @@ export default {
     name: 'jiaban',
     data() {
         return {
-            checkbox:false,
+            checkbox: false,
             step: 1,
             loading: false,
             waitTime: 0,
-            inter:null,
+            inter: null,
             // 表单数据
             formData: {
                 phone: '',
@@ -106,7 +129,7 @@ export default {
     methods: {
         getCode() {
             if (!this.checkbox) {
-                return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
+                return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
             }
             if (!this.formData.phone) {
                 return this.$util.toast('请输入手机号！')
@@ -137,7 +160,7 @@ export default {
         },
         firstSubmit() {
             if (!this.checkbox) {
-                return this.$util.toast('请先阅读并同意用户协议和个人信息保护政策！')
+                return this.$util.toast('请先阅读并同意用户协议和隐私政策！')
             }
             this.$refs.form.validate().then((valid, errors) => {
                 apiRegister({
@@ -214,7 +237,7 @@ export default {
         }
 
         .login-box-input-btn {
-            padding:0 40rpx;
+            padding: 0 40rpx;
             margin-left: 40rpx;
             background: $uni-theme-color;
             color: #fff;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6f1b908..69b7988 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,44 +1,56 @@
-lockfileVersion: 5.4
+lockfileVersion: '6.0'
 
-specifiers:
-  '@types/html5plus': ^1.0.2
-  '@types/uni-app': ^1.4.4
-  crypto-js: ^4.1.1
-  html2canvas: ^1.4.1
-  image-tools: ^1.4.0
-  jsrsasign: ^10.8.6
-  mqtt: 3.0.0
-  pinyin-pro: ^3.13.2
-  qs: ^6.11.2
-  vconsole: ^3.15.1
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
 
 dependencies:
-  crypto-js: 4.1.1
-  html2canvas: 1.4.1
-  image-tools: 1.4.0
-  jsrsasign: 10.8.6
-  mqtt: 3.0.0
-  pinyin-pro: 3.13.2
-  qs: 6.11.2
-  vconsole: 3.15.1
+  crypto-js:
+    specifier: ^4.1.1
+    version: 4.1.1
+  html2canvas:
+    specifier: ^1.4.1
+    version: 1.4.1
+  image-tools:
+    specifier: ^1.4.0
+    version: 1.4.0
+  jsrsasign:
+    specifier: ^10.8.6
+    version: 10.8.6
+  mqtt:
+    specifier: 3.0.0
+    version: 3.0.0
+  pinyin-pro:
+    specifier: ^3.13.2
+    version: 3.13.2
+  qs:
+    specifier: ^6.11.2
+    version: 6.11.2
+  vconsole:
+    specifier: ^3.15.1
+    version: 3.15.1
 
 devDependencies:
-  '@types/html5plus': 1.0.2
-  '@types/uni-app': 1.4.4
+  '@types/html5plus':
+    specifier: ^1.0.2
+    version: 1.0.2
+  '@types/uni-app':
+    specifier: ^1.4.4
+    version: 1.4.4
 
 packages:
 
-  /@babel/helper-string-parser/7.22.5:
+  /@babel/helper-string-parser@7.22.5:
     resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-validator-identifier/7.22.5:
+  /@babel/helper-validator-identifier@7.22.5:
     resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/parser/7.22.5:
+  /@babel/parser@7.22.5:
     resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==}
     engines: {node: '>=6.0.0'}
     hasBin: true
@@ -46,14 +58,14 @@ packages:
       '@babel/types': 7.22.5
     dev: true
 
-  /@babel/runtime/7.22.6:
+  /@babel/runtime@7.22.6:
     resolution: {integrity: sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
     dev: false
 
-  /@babel/types/7.22.5:
+  /@babel/types@7.22.5:
     resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -62,17 +74,17 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
-  /@types/html5plus/1.0.2:
+  /@types/html5plus@1.0.2:
     resolution: {integrity: sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag==}
     dev: true
 
-  /@types/uni-app/1.4.4:
+  /@types/uni-app@1.4.4:
     resolution: {integrity: sha512-ZTXnrCTblZyoLIoKbTv1Whz1nxrTcM7vg0qGXzDpXP8m9MqdjKt48N3FffQT1IsJWNkxbvJ1Eg5UHDaq+k+oBQ==}
     dependencies:
       vue: 2.7.14
     dev: true
 
-  /@vue/compiler-sfc/2.7.14:
+  /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
     dependencies:
       '@babel/parser': 7.22.5
@@ -80,24 +92,24 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /async-limiter/1.0.1:
+  /async-limiter@1.0.1:
     resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
     dev: false
 
-  /balanced-match/1.0.2:
+  /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: false
 
-  /base64-arraybuffer/1.0.2:
+  /base64-arraybuffer@1.0.2:
     resolution: {integrity: sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==}
     engines: {node: '>= 0.6.0'}
     dev: false
 
-  /base64-js/1.5.1:
+  /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
     dev: false
 
-  /bl/4.1.0:
+  /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
       buffer: 5.7.1
@@ -105,50 +117,50 @@ packages:
       readable-stream: 3.6.1
     dev: false
 
-  /brace-expansion/1.1.11:
+  /brace-expansion@1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
     dev: false
 
-  /buffer-from/1.1.2:
+  /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
     dev: false
 
-  /buffer/5.7.1:
+  /buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
     dev: false
 
-  /call-bind/1.0.2:
+  /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
       get-intrinsic: 1.2.1
     dev: false
 
-  /callback-stream/1.1.0:
+  /callback-stream@1.1.0:
     resolution: {integrity: sha512-sAZ9kODla+mGACBZ1IpTCAisKoGnv6PykW7fPk1LrM+mMepE18Yz0515yoVcrZy7dQsTUp3uZLQ/9Sx1RnLoHw==}
     dependencies:
       inherits: 2.0.4
       readable-stream: 2.3.8
     dev: false
 
-  /commist/1.1.0:
+  /commist@1.1.0:
     resolution: {integrity: sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==}
     dependencies:
       leven: 2.1.0
       minimist: 1.2.8
     dev: false
 
-  /concat-map/0.0.1:
+  /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
     dev: false
 
-  /concat-stream/1.6.2:
+  /concat-stream@1.6.2:
     resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
     engines: {'0': node >= 0.8}
     dependencies:
@@ -158,42 +170,42 @@ packages:
       typedarray: 0.0.6
     dev: false
 
-  /copy-text-to-clipboard/3.2.0:
+  /copy-text-to-clipboard@3.2.0:
     resolution: {integrity: sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==}
     engines: {node: '>=12'}
     dev: false
 
-  /core-js/3.31.1:
+  /core-js@3.31.1:
     resolution: {integrity: sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==}
     requiresBuild: true
     dev: false
 
-  /core-util-is/1.0.3:
+  /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
     dev: false
 
-  /crypto-js/4.1.1:
+  /crypto-js@4.1.1:
     resolution: {integrity: sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==}
     dev: false
 
-  /css-line-break/2.1.0:
+  /css-line-break@2.1.0:
     resolution: {integrity: sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==}
     dependencies:
       utrie: 1.0.2
     dev: false
 
-  /csstype/3.1.2:
+  /csstype@3.1.2:
     resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
     dev: true
 
-  /d/1.0.1:
+  /d@1.0.1:
     resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
     dependencies:
       es5-ext: 0.10.62
       type: 1.2.0
     dev: false
 
-  /debug/4.3.4:
+  /debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
@@ -205,7 +217,7 @@ packages:
       ms: 2.1.2
     dev: false
 
-  /duplexify/3.7.1:
+  /duplexify@3.7.1:
     resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
     dependencies:
       end-of-stream: 1.4.4
@@ -214,7 +226,7 @@ packages:
       stream-shift: 1.0.1
     dev: false
 
-  /duplexify/4.1.2:
+  /duplexify@4.1.2:
     resolution: {integrity: sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==}
     dependencies:
       end-of-stream: 1.4.4
@@ -223,13 +235,13 @@ packages:
       stream-shift: 1.0.1
     dev: false
 
-  /end-of-stream/1.4.4:
+  /end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
     dependencies:
       once: 1.4.0
     dev: false
 
-  /es5-ext/0.10.62:
+  /es5-ext@0.10.62:
     resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
     engines: {node: '>=0.10'}
     requiresBuild: true
@@ -239,7 +251,7 @@ packages:
       next-tick: 1.1.0
     dev: false
 
-  /es6-iterator/2.0.3:
+  /es6-iterator@2.0.3:
     resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
     dependencies:
       d: 1.0.1
@@ -247,7 +259,7 @@ packages:
       es6-symbol: 3.1.3
     dev: false
 
-  /es6-map/0.1.5:
+  /es6-map@0.1.5:
     resolution: {integrity: sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==}
     dependencies:
       d: 1.0.1
@@ -258,7 +270,7 @@ packages:
       event-emitter: 0.3.5
     dev: false
 
-  /es6-set/0.1.6:
+  /es6-set@0.1.6:
     resolution: {integrity: sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==}
     engines: {node: '>=0.12'}
     dependencies:
@@ -270,39 +282,39 @@ packages:
       type: 2.7.2
     dev: false
 
-  /es6-symbol/3.1.3:
+  /es6-symbol@3.1.3:
     resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
     dependencies:
       d: 1.0.1
       ext: 1.7.0
     dev: false
 
-  /event-emitter/0.3.5:
+  /event-emitter@0.3.5:
     resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
     dependencies:
       d: 1.0.1
       es5-ext: 0.10.62
     dev: false
 
-  /ext/1.7.0:
+  /ext@1.7.0:
     resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
     dependencies:
       type: 2.7.2
     dev: false
 
-  /extend/3.0.2:
+  /extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
     dev: false
 
-  /fs.realpath/1.0.0:
+  /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: false
 
-  /function-bind/1.1.1:
+  /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
     dev: false
 
-  /get-intrinsic/1.2.1:
+  /get-intrinsic@1.2.1:
     resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
     dependencies:
       function-bind: 1.1.1
@@ -311,14 +323,14 @@ packages:
       has-symbols: 1.0.3
     dev: false
 
-  /glob-parent/3.1.0:
+  /glob-parent@3.1.0:
     resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==}
     dependencies:
       is-glob: 3.1.0
       path-dirname: 1.0.2
     dev: false
 
-  /glob-stream/6.1.0:
+  /glob-stream@6.1.0:
     resolution: {integrity: sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==}
     engines: {node: '>= 0.10'}
     dependencies:
@@ -334,7 +346,7 @@ packages:
       unique-stream: 2.3.1
     dev: false
 
-  /glob/7.2.3:
+  /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     dependencies:
       fs.realpath: 1.0.0
@@ -345,24 +357,24 @@ packages:
       path-is-absolute: 1.0.1
     dev: false
 
-  /has-proto/1.0.1:
+  /has-proto@1.0.1:
     resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
     engines: {node: '>= 0.4'}
     dev: false
 
-  /has-symbols/1.0.3:
+  /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
     dev: false
 
-  /has/1.0.3:
+  /has@1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
     dependencies:
       function-bind: 1.1.1
     dev: false
 
-  /help-me/1.1.0:
+  /help-me@1.1.0:
     resolution: {integrity: sha512-P/IZ8yOMne3SCTHbVY429NZ67B/2bVQlcYGZh2iPPbdLrEQ/qY5aGChn0YTDmt7Sb4IKRI51fypItav+lNl76w==}
     dependencies:
       callback-stream: 1.1.0
@@ -371,7 +383,7 @@ packages:
       xtend: 4.0.2
     dev: false
 
-  /html2canvas/1.4.1:
+  /html2canvas@1.4.1:
     resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==}
     engines: {node: '>=8.0.0'}
     dependencies:
@@ -379,26 +391,26 @@ packages:
       text-segmentation: 1.0.3
     dev: false
 
-  /ieee754/1.2.1:
+  /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
     dev: false
 
-  /image-tools/1.4.0:
+  /image-tools@1.4.0:
     resolution: {integrity: sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==}
     dev: false
 
-  /inflight/1.0.6:
+  /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
     dev: false
 
-  /inherits/2.0.4:
+  /inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
     dev: false
 
-  /is-absolute/1.0.0:
+  /is-absolute@1.0.0:
     resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -406,70 +418,70 @@ packages:
       is-windows: 1.0.2
     dev: false
 
-  /is-extglob/2.1.1:
+  /is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /is-glob/3.1.0:
+  /is-glob@3.1.0:
     resolution: {integrity: sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
     dev: false
 
-  /is-negated-glob/1.0.0:
+  /is-negated-glob@1.0.0:
     resolution: {integrity: sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /is-relative/1.0.0:
+  /is-relative@1.0.0:
     resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-unc-path: 1.0.0
     dev: false
 
-  /is-unc-path/1.0.0:
+  /is-unc-path@1.0.0:
     resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       unc-path-regex: 0.1.2
     dev: false
 
-  /is-windows/1.0.2:
+  /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /isarray/1.0.0:
+  /isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
     dev: false
 
-  /json-stable-stringify-without-jsonify/1.0.1:
+  /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: false
 
-  /jsrsasign/10.8.6:
+  /jsrsasign@10.8.6:
     resolution: {integrity: sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw==}
     dev: false
 
-  /leven/2.1.0:
+  /leven@2.1.0:
     resolution: {integrity: sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /minimatch/3.1.2:
+  /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
       brace-expansion: 1.1.11
     dev: false
 
-  /minimist/1.2.8:
+  /minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
     dev: false
 
-  /mqtt-packet/6.10.0:
+  /mqtt-packet@6.10.0:
     resolution: {integrity: sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==}
     dependencies:
       bl: 4.1.0
@@ -479,7 +491,7 @@ packages:
       - supports-color
     dev: false
 
-  /mqtt/3.0.0:
+  /mqtt@3.0.0:
     resolution: {integrity: sha512-0nKV6MAc1ibKZwaZQUTb3iIdT4NVpj541BsYrqrGBcQdQ7Jd0MnZD1/6/nj1UFdGTboK9ZEUXvkCu2nPCugHFA==}
     engines: {node: '>=4.0.0'}
     hasBin: true
@@ -506,58 +518,58 @@ packages:
       - utf-8-validate
     dev: false
 
-  /ms/2.1.2:
+  /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
     dev: false
 
-  /mutation-observer/1.0.3:
+  /mutation-observer@1.0.3:
     resolution: {integrity: sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==}
     dev: false
 
-  /nanoid/3.3.6:
+  /nanoid@3.3.6:
     resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
     dev: true
 
-  /next-tick/1.1.0:
+  /next-tick@1.1.0:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
     dev: false
 
-  /object-inspect/1.12.3:
+  /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
     dev: false
 
-  /once/1.4.0:
+  /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
       wrappy: 1.0.2
     dev: false
 
-  /ordered-read-streams/1.0.1:
+  /ordered-read-streams@1.0.1:
     resolution: {integrity: sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==}
     dependencies:
       readable-stream: 2.3.8
     dev: false
 
-  /path-dirname/1.0.2:
+  /path-dirname@1.0.2:
     resolution: {integrity: sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==}
     dev: false
 
-  /path-is-absolute/1.0.1:
+  /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /picocolors/1.0.0:
+  /picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
     dev: true
 
-  /pinyin-pro/3.13.2:
+  /pinyin-pro@3.13.2:
     resolution: {integrity: sha512-DKz04M0PkrongGyJW7GU+iNB2jInwLcP1p5+w0gu0hz2PtF8q+GTC1GDW731wyhm+q7PGoyMuY3sLONLTqi6mg==}
     dev: false
 
-  /postcss/8.4.24:
+  /postcss@8.4.24:
     resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
@@ -566,25 +578,25 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
-  /process-nextick-args/2.0.1:
+  /process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
     dev: false
 
-  /pump/2.0.1:
+  /pump@2.0.1:
     resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
     dev: false
 
-  /pump/3.0.0:
+  /pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
     dev: false
 
-  /pumpify/1.5.1:
+  /pumpify@1.5.1:
     resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
     dependencies:
       duplexify: 3.7.1
@@ -592,14 +604,14 @@ packages:
       pump: 2.0.1
     dev: false
 
-  /qs/6.11.2:
+  /qs@6.11.2:
     resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
     engines: {node: '>=0.6'}
     dependencies:
       side-channel: 1.0.4
     dev: false
 
-  /readable-stream/2.3.8:
+  /readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
     dependencies:
       core-util-is: 1.0.3
@@ -611,7 +623,7 @@ packages:
       util-deprecate: 1.0.2
     dev: false
 
-  /readable-stream/3.6.1:
+  /readable-stream@3.6.1:
     resolution: {integrity: sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==}
     engines: {node: '>= 6'}
     dependencies:
@@ -620,27 +632,27 @@ packages:
       util-deprecate: 1.0.2
     dev: false
 
-  /regenerator-runtime/0.13.11:
+  /regenerator-runtime@0.13.11:
     resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
     dev: false
 
-  /reinterval/1.1.0:
+  /reinterval@1.1.0:
     resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
     dev: false
 
-  /remove-trailing-separator/1.1.0:
+  /remove-trailing-separator@1.1.0:
     resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
     dev: false
 
-  /safe-buffer/5.1.2:
+  /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
     dev: false
 
-  /safe-buffer/5.2.1:
+  /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: false
 
-  /side-channel/1.0.4:
+  /side-channel@1.0.4:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
@@ -648,59 +660,59 @@ packages:
       object-inspect: 1.12.3
     dev: false
 
-  /source-map-js/1.0.2:
+  /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /source-map/0.6.1:
+  /source-map@0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /split2/3.2.2:
+  /split2@3.2.2:
     resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==}
     dependencies:
       readable-stream: 3.6.1
     dev: false
 
-  /stream-shift/1.0.1:
+  /stream-shift@1.0.1:
     resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
     dev: false
 
-  /string_decoder/1.1.1:
+  /string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
     dependencies:
       safe-buffer: 5.1.2
     dev: false
 
-  /string_decoder/1.3.0:
+  /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
       safe-buffer: 5.2.1
     dev: false
 
-  /text-segmentation/1.0.3:
+  /text-segmentation@1.0.3:
     resolution: {integrity: sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==}
     dependencies:
       utrie: 1.0.2
     dev: false
 
-  /through2-filter/3.0.0:
+  /through2-filter@3.0.0:
     resolution: {integrity: sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==}
     dependencies:
       through2: 2.0.5
       xtend: 4.0.2
     dev: false
 
-  /through2/2.0.5:
+  /through2@2.0.5:
     resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
     dependencies:
       readable-stream: 2.3.8
       xtend: 4.0.2
     dev: false
 
-  /to-absolute-glob/2.0.2:
+  /to-absolute-glob@2.0.2:
     resolution: {integrity: sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -708,50 +720,50 @@ packages:
       is-negated-glob: 1.0.0
     dev: false
 
-  /to-fast-properties/2.0.0:
+  /to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
     dev: true
 
-  /type/1.2.0:
+  /type@1.2.0:
     resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
     dev: false
 
-  /type/2.7.2:
+  /type@2.7.2:
     resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
     dev: false
 
-  /typedarray/0.0.6:
+  /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
     dev: false
 
-  /ultron/1.1.1:
+  /ultron@1.1.1:
     resolution: {integrity: sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==}
     dev: false
 
-  /unc-path-regex/0.1.2:
+  /unc-path-regex@0.1.2:
     resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /unique-stream/2.3.1:
+  /unique-stream@2.3.1:
     resolution: {integrity: sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==}
     dependencies:
       json-stable-stringify-without-jsonify: 1.0.1
       through2-filter: 3.0.0
     dev: false
 
-  /util-deprecate/1.0.2:
+  /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: false
 
-  /utrie/1.0.2:
+  /utrie@1.0.2:
     resolution: {integrity: sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==}
     dependencies:
       base64-arraybuffer: 1.0.2
     dev: false
 
-  /vconsole/3.15.1:
+  /vconsole@3.15.1:
     resolution: {integrity: sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==}
     dependencies:
       '@babel/runtime': 7.22.6
@@ -760,14 +772,14 @@ packages:
       mutation-observer: 1.0.3
     dev: false
 
-  /vue/2.7.14:
+  /vue@2.7.14:
     resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
     dependencies:
       '@vue/compiler-sfc': 2.7.14
       csstype: 3.1.2
     dev: true
 
-  /websocket-stream/5.5.2:
+  /websocket-stream@5.5.2:
     resolution: {integrity: sha512-8z49MKIHbGk3C4HtuHWDtYX8mYej1wWabjthC/RupM9ngeukU4IWoM46dgth1UOS/T4/IqgEdCDJuMe2039OQQ==}
     dependencies:
       duplexify: 3.7.1
@@ -781,11 +793,11 @@ packages:
       - utf-8-validate
     dev: false
 
-  /wrappy/1.0.2:
+  /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
     dev: false
 
-  /ws/3.3.3:
+  /ws@3.3.3:
     resolution: {integrity: sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -801,7 +813,7 @@ packages:
       ultron: 1.1.1
     dev: false
 
-  /xtend/4.0.2:
+  /xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
     dev: false
diff --git a/static/access.png b/static/access.png
new file mode 100644
index 0000000..137411e
Binary files /dev/null and b/static/access.png differ