微调

common/api/harmonic.js

@@ -0,0 +1,10 @@
+import request from '../js/request'
+
+// apf-》获取模块状态
+export function getModuleState(params) {
+    return request({
+        url: '/cs-harmonic-boot/data/getModuleState',
+        method: 'post',
+        data: params,
+    })
+}

common/js/config.js

@@ -1,7 +1,7 @@
 const debug = false // true 是连地服务端本地，false 是连接线上
 
 const development = {
-    domain: 'http://192.168.1.22:10215',
+    domain: 'http://192.168.1.62:10215',
 }
 
 const production = {

common/js/mqtt.js

@@ -1,5 +1,5 @@
-// export const MQTT_IP = '192.168.1.24:10215/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
 export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
+// export const MQTT_IP = '192.168.1.24:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
 
 const MQTT_USERNAME = 't_user'//mqtt用户名
 const MQTT_PASSWORD = 'njcnpqs'//密码

common/js/util.js

@@ -105,6 +105,26 @@ function formatTime(time, option) {
         )
     }
 }
+// 获取当天日期（年月日）
+function getToday() {
+  const today = new Date();
+  const year = today.getFullYear();
+  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需+1
+  const day = String(today.getDate()).padStart(2, '0');
+  return `${year}-${month}-${day}`;
+}
+
+// 获取3个月前的日期
+function getThreeMonthsAgo() {
+  const threeMonthsAgo = new Date();
+  threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3); // 月份减3
+  const year = threeMonthsAgo.getFullYear();
+  const month = String(threeMonthsAgo.getMonth() + 1).padStart(2, '0');
+  const day = String(threeMonthsAgo.getDate()).padStart(2, '0');
+  return `${year}-${month}-${day}`;
+}
+
+
 
 const h5Helper = {
     isAndroid: function () {
@@ -296,4 +316,6 @@ export default {
     loginSuccess,
     refreshPrePage,
     getDictData,
+    getToday,
+    getThreeMonthsAgo
 }

manifest.json

@@ -2,9 +2,10 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.6.1",
+    "versionName" : "1.6.81",
-    "versionCode" : 161,
+    "versionCode" : 169,
     "transformPx" : false,
+    "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "safearea" : {
@@ -24,7 +25,6 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Maps" : {},
             "Barcode" : {},
             "Camera" : {},
             "Push" : {}
@@ -70,12 +70,7 @@
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
-                "maps" : {
+                "maps" : {},
-                    "amap" : {
-                        "appkey_ios" : "73262624599d79ee4ad8bba2ab4a0958",
-                        "appkey_android" : "c93dd87e087f3686a9d4463ce5ebcbe1"
-                    }
-                },
                 "push" : {
                     "unipush" : {
                         "version" : "2",
@@ -144,7 +139,7 @@
                 "/api" : {
                     "https" : true,
                     "target" : "https://pqmcn.com:8092/api",
-                    // "target" : "http://192.168.1.22:10215",
+                    // "target" : "http://192.168.1.62:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
@@ -155,6 +150,9 @@
         },
         "router" : {
             "base" : ""
+        },
+        "unipush" : {
+            "enable" : false
         }
     },
     "mp-toutiao" : {

package.json

@@ -16,5 +16,15 @@
             "前端组件",
             "通用组件"
         ]
+    },
+    "dependencies": {
+        "crypto-js": "^4.2.0",
+        "echarts": "^5.6.0",
+        "html2canvas": "^1.4.1",
+        "image-tool": "^1.0.2",
+        "image-tools": "^1.4.0",
+        "jsrsasign": "^11.1.0",
+        "mqtt": "^3.0.0",
+        "pinyin-pro": "^3.26.0"
     }
 }

pages/device/APF/comp/IO.vue

@@ -4,26 +4,47 @@
 			<view class="grid-card-title">温度</view>
 			<view class="grid-card-content-4">
 				<template v-for="item in renderData">
-					<view class="item item-title"
+					<view class="item item-title">{{ item[0].clDid }}
-						>{{ item[0].clDid }}
 						<template v-if="item[0].clDid"> (°C)</template>
 					</view>
-					<view class="item item-title"
+					<view class="item item-title">{{ item[1].clDid }}
-						>{{ item[1].clDid }}
 						<template v-if="item[1].clDid"> (°C)</template>
 					</view>
-					<view class="item item-title"
+					<view class="item item-title">{{ item[2].clDid }}
-						>{{ item[2].clDid }}
 						<template v-if="item[2].clDid"> (°C)</template>
 					</view>
-					<view class="item item-title"
+					<view class="item item-title">{{ item[3].clDid }}
-						>{{ 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[0].clDid ? Math.round(item[0].value) || '-' : '' }}</view>
-					<view class="item">{{ item[1].clDid ? Math.round(item[1].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[2].clDid ? Math.round(item[2].value) || '-' : '' }}</view>
-					<view class="item">{{ item[3].clDid ? Math.round(item[3].value)  || '-' : '' }}</view>
+					<view class="item">{{ item[3].clDid ? Math.round(item[3].value) || '-' : '' }}</view>
+				</template>
+			</view>
+		</view>
+		<!-- 运维管理员、工程用户 可看 -->
+		<view class="grid-card" v-if="userInfo.authorities=='operation_manager'||userInfo.authorities=='engineering_user'">
+			<view class="grid-card-title">状态</view>
+			<view class="grid-card-content-4">
+				<template v-for="(item, index) in moduleData">
+					<view class="item item-title">{{ item[0].moduleName }}
+						<template v-if="item[0].moduleName"></template>
+					</view>
+					<view class="item item-title">{{ item[1].moduleName }}
+						<template v-if="item[1].moduleName"></template>
+					</view>
+					<view class="item item-title">{{ item[2].moduleName }}
+						<template v-if="item[2].moduleName"></template>
+					</view>
+					<view class="item item-title">{{ item[3].moduleName }}
+						<template v-if="item[3].moduleName"></template>
+					</view>
+					<!-- <uni-tag :text="item[0].moduleState" :type=" item[0].moduleState=='离线'?'error' : 'success'" /> -->
+					<view class="item">{{ item[0].moduleState }}</view>
+					<view class="item">{{ item[1].moduleState }}</view>
+					<view class="item">{{ item[2].moduleState }}</view>
+					<view class="item">{{ item[3].moduleState }}</view>
 				</template>
 			</view>
 		</view>
@@ -43,50 +64,88 @@
 	</view>
 </template>
 <script>
-export default {
+	import {
-	data() {
+		getModuleState
-		return {}
+	} from '@/common/api/harmonic.js'
-	},
+	export default {
-	props: {
+
-		IOData: {
+		props: {
-			type: Array,
+			IOData: {
-			default: () => {
+				type: Array,
-				return []
+				default: () => {
+					return []
+				},
+			},
+			ndid: {
+				type: String,
 			},
 		},
-	},
+		data() {
-	computed: {
+			return {
-		renderData() {
+				list: [],
-			let arr = []
+				userInfo: {},
-			// 把IOData转换成每4个一组的二维数组
+				flag: false
-			for (let i = 0; i < this.IOData.length; i += 4) {
+			}
-				this.IOData.slice(i, i + 4).forEach((item) => {
+		},
-				
+		computed: {
-					if (Number.isInteger(item.value) || item.value =='') {
+			renderData() {
-					
+				let arr = []
-					}else {
+				// 把IOData转换成每4个一组的二维数组
-							item.value = (item.value-0).toFixed(2)
+				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(2)
+						}
+					})
+					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({})
+						}
 					}
 				})
-				arr.push(this.IOData.slice(i, i + 4))
+				console.warn(arr)
-			}
+				return arr
-			// 把每组的长度补齐到4
+			},
-			arr.forEach((item) => {
+			moduleData() {
-				if (item.length < 4) {
+				let arr = []
-					let length = 4 - item.length
+				// 把IOData转换成每4个一组的二维数组
-					for (let i = 0; i < length; i++) {
+				for (let i = 0; i < this.list.length; i += 4) {
-						item.push({})
+					arr.push(this.list.slice(i, i + 4))
-					}
 				}
-			})
+				// 把每组的长度补齐到4
-			console.warn(arr)
+				arr.forEach((item) => {
-			return arr
+					if (item.length < 4) {
+						let length = 4 - item.length
+						for (let i = 0; i < length; i++) {
+							item.push({})
+						}
+					}
+				})
+				console.warn(arr)
+				return arr
+			},
 		},
-	},
+		methods: {
-	methods: {},
+			info() {
-}
+				getModuleState({
+					id: this.ndid
+				}).then((res) => {
+					this.list = res.data
+				})
+			},
+		},
+		mounted() {
+			this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+			
+			this.info()
+		},
+	}
 </script>
 <style lang="scss">
-.basic {
+	.basic {}
-}
 </style>

pages/device/APF/comp/basic.vue

@@ -10,10 +10,10 @@
                     <view class="item">{{ item.phase }}</view>
                     <view class="item">{{
                         item['Apf_RmsI_Sys(A)'] > 0 ? item['Apf_RmsI_Sys(A)'].toFixed(2) : item['Apf_RmsI_Sys(A)']
-                    }}</view>
+                        }}</view>
                     <view class="item">{{
                         item['Apf_ThdA_Sys(%)'] > 0 ? item['Apf_ThdA_Sys(%)'].toFixed(2) : item['Apf_ThdA_Sys(%)']
-                    }}</view>
+                        }}</view>
                 </template>
             </view>
         </view>
@@ -28,13 +28,13 @@
                     <view class="item">{{ item.phase }}</view>
                     <view class="item">{{
                         item['Apf_PhV_Sys(V)'] > 0 ? item['Apf_PhV_Sys(V)'].toFixed(2) : item['Apf_PhV_Sys(V)']
-                    }}</view>
+                        }}</view>
                     <view class="item">{{
                         item['Apf_Freq(Hz)'] > 0 ? item['Apf_Freq(Hz)'].toFixed(2) : item['Apf_Freq(Hz)']
-                    }}</view>
+                        }}</view>
                     <view class="item">{{
                         item['Apf_ThdU_Sys(%)'] > 0 ? item['Apf_ThdU_Sys(%)'].toFixed(2) : item['Apf_ThdU_Sys(%)']
-                    }}</view>
+                        }}</view>
                 </template>
             </view>
         </view>
@@ -48,10 +48,10 @@
                     <view class="item">{{ item.phase }}</view>
                     <view class="item">{{
                         item['Apf_RmsI_Load(A)'] > 0 ? item['Apf_RmsI_Load(A)'].toFixed(2) : item['Apf_RmsI_Load(A)']
-                    }}</view>
+                        }}</view>
                     <view class="item">{{
                         item['Apf_ThdA_Load(%)'] > 0 ? item['Apf_ThdA_Load(%)'].toFixed(2) : item['Apf_ThdA_Load(%)']
-                    }}</view>
+                        }}</view>
                 </template>
             </view>
         </view>
@@ -64,13 +64,15 @@
                 <template v-for="(item, index) in renderData.补偿电流">
                     <view class="item">{{ item.phase }}</view>
                     <view class="item">{{
-                        item['Apf_RmsI_TolOut(A)'] > 0
+                        item['Apf_RmsI_TolOut(A)'] == 3.1415926 ? '-' :
-                            ? item['Apf_RmsI_TolOut(A)'].toFixed(2)
+                            item['Apf_RmsI_TolOut(A)'] > 0
-                            : item['Apf_RmsI_TolOut(A)']
+                                ? item['Apf_RmsI_TolOut(A)'].toFixed(2)
+                                : item['Apf_RmsI_TolOut(A)']
                     }}</view>
                     <view class="item">{{
-                        item['load_Rate'] > 0 ? item['load_Rate'].toFixed(2) : item['load_Rate']
+                        item['load_Rate'] == 3.1415926 ? '-' : item['load_Rate'] > 0 ? item['load_Rate'].toFixed(2) :
-                    }}</view>
+                            item['load_Rate']
+                        }}</view>
                 </template>
             </view>
         </view>
@@ -166,6 +168,5 @@ export default {
 }
 </script>
 <style lang="scss">
-.basic {
+.basic {}
-}
 </style>

pages/device/APF/comp/power.vue

@@ -4,15 +4,18 @@
 			<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">有功功率(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)']=='-'?  '-':(item['Apf_P_Sys(W)'] / 1000).toFixed(2) }}</view>
+					<view class="item">{{ item['Apf_P_Sys(W)'] == '-' ? '-' : (item['Apf_P_Sys(W)'] / 1000).toFixed(2) }}
-					<view class="item">{{item['Apf_Q_Sys(Var)']=='-'?  '-':(item['Apf_Q_Sys(Var)'] / 1000).toFixed(2) }}</view>
+					</view>
-					<view class="item">{{ item['Apf_S_Sys(VA)']=='-'?'-' :(item['Apf_S_Sys(VA)'] / 1000).toFixed(2) }}</view>
+					<view class="item">{{ item['Apf_Q_Sys(Var)'] == '-' ? '-' : (item['Apf_Q_Sys(Var)'] / 1000).toFixed(2) }}
+					</view>
+					<view class="item">{{ item['Apf_S_Sys(VA)'] == '-' ? '-' : (item['Apf_S_Sys(VA)'] / 1000).toFixed(2) }}
+					</view>
 					<view class="item">{{ item['Apf_PF_Sys(null)'] || '-' }}</view>
 				</template>
 			</view>
@@ -21,15 +24,18 @@
 			<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">有功功率(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)']=='-'?'-': (item['Apf_P_Load(W)'] / 1000).toFixed(2)  }}</view>
+					<view class="item">{{ item['Apf_P_Load(W)'] == '-' ? '-' : (item['Apf_P_Load(W)'] / 1000).toFixed(2) }}
-					<view class="item">{{ item['Apf_Q_Load(Var)']=='-'? '-':(item['Apf_Q_Load(Var)'] / 1000).toFixed(2)  }}</view>
+					</view>
-					<view class="item">{{ item['Apf_S_Load(VA)']=='-'? '-':(item['Apf_S_Load(VA)'] / 1000).toFixed(2)  }}</view>
+					<view class="item">{{ item['Apf_Q_Load(Var)'] == '-' ? '-' : (item['Apf_Q_Load(Var)'] / 1000).toFixed(2)
+						}}</view>
+					<view class="item">{{ item['Apf_S_Load(VA)'] == '-' ? '-' : (item['Apf_S_Load(VA)'] / 1000).toFixed(2) }}
+					</view>
 					<view class="item">{{ item['Apf_PF_Load(null)'] || '-' }}</view>
 				</template>
 			</view>
@@ -115,6 +121,5 @@ export default {
 }
 </script>
 <style lang="scss">
-.basic {
+.basic {}
-}
 </style>

pages/device/APF/comp/xieBo.vue

@@ -263,11 +263,11 @@ barCateGoryGap:20,
 				let dataOptions = []
 				let type = [
 					{
-						name: '谐波电流幅值序列',
+						name: '谐波电流幅值',
 						key: 'Apf_HarmI',
 					},
 					{
-						name: '谐波电压含有率序列',
+						name: '谐波电压含有率',
 						key: 'Apf_HarmUR',
 					},
 				]
@@ -298,6 +298,7 @@ barCateGoryGap:20,
 		},
 		initEcharts() {
 			setTimeout(() => {
+				if(this.renderData['电网侧']['Apf_HarmI'][Object.keys(this.renderData['电网侧']['Apf_HarmI'])[0]] == undefined) return
 				let obj = JSON.parse(
 					JSON.stringify(
 						this.renderData['电网侧']['Apf_HarmI'][Object.keys(this.renderData['电网侧']['Apf_HarmI'])[0]],

pages/device/APF/report.vue

@@ -3,8 +3,14 @@
         <view class="content" slot="body">
             <view class="content-item" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
                 <view class="content-item-header">
-                    <uni-badge class="uni-badge-left-margin" :is-dot="true" :text="item.status == '1' ? 0 : 1"
+                    <uni-badge
-                        absolute="rightTop" size="small" style="margin-top: 30rpx;">
+                        class="uni-badge-left-margin"
+                        :is-dot="true"
+                        :text="item.status == '1' ? 0 : 1"
+                        absolute="rightTop"
+                        size="small"
+                        style="margin-top: 30rpx"
+                    >
                         <view class="content-item-header-icon">
                             <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
                         </view>
@@ -14,8 +20,8 @@
                         <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
                         <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
                         <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
-                        <view class="content-item-header-right-des">监测点名称：{{ item.lineName }}</view>
+                        <!-- <view class="content-item-header-right-des">监测点名称：{{ item.lineName }}</view> -->
-                        <view class="content-item-header-right-des">暂态事件类型：{{ item.showName.slice(0, -4) }}</view>
+                        <!-- <view class="content-item-header-right-des">暂态类型：{{ item.showName }}</view> -->
                         <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
                     </view>
                     <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -38,8 +44,10 @@
                 </view>
             </uni-card> -->
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+            <uni-load-more
-                :status="store.status"></uni-load-more>
+                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"
+            ></uni-load-more>
         </view>
     </Cn-page>
 </template>
@@ -104,16 +112,18 @@ export default {
             this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
             this.store.params.type = this.type
             this.store.params.deviceId = this.deviceId
+            this.store.params.startTime =  this.$util.getThreeMonthsAgo()
+            this.store.params.endTime = this.$util.getToday() 
             this.store.loadedCallback = () => {
                 this.store.data.forEach((item) => {
                     if (this.type === '3') {
-                        item.showName = '告警,告警码：' + item.code
+                        item.showName = '告警，告警码：' + (item.code || '-')
                     }
                     if (this.type !== '0') {
-                        item.subTitle = `于${item.startTime}`
+                        item.subTitle = `于${item.startTime}发生${item.showName}`
                     } else {
                         item.subTitle =
-                            `于${item.startTime}。` +
+                            `发生时间：${item.startTime}，` +
                             item.dataSet
                                 .map((item2) => {
                                     return (

pages/device/DVR/comp/dianWang.vue

@@ -59,7 +59,7 @@
 </template>
 <script>
 export default {
-    data () {
+    data() {
         return {
         }
     },

pages/device/DVR/comp/niBian.vue

@@ -60,7 +60,7 @@
 </template>
 <script>
 export default {
-    data () {
+    data() {
         return {
         }
     },

pages/device/DVR/comp/shuChu.vue

@@ -83,7 +83,7 @@
 </template>
 <script>
 export default {
-    data () {
+    data() {
         return {
         }
     },

pages/device/edit.vue

@@ -284,17 +284,17 @@ export default {
                 })
             })
         },
-        chooseLocation() {
+        // chooseLocation() {
-            uni.chooseLocation({
+        //     uni.chooseLocation({
-                success: function (res) {
+        //         success: function (res) {
-                    this.address = res.name
+        //             this.address = res.name
-                    console.log('位置名称：' + res.name)
+        //             console.log('位置名称：' + res.name)
-                    console.log('详细地址：' + res.address)
+        //             console.log('详细地址：' + res.address)
-                    console.log('纬度：' + res.latitude)
+        //             console.log('纬度：' + res.latitude)
-                    console.log('经度：' + res.longitude)
+        //             console.log('经度：' + res.longitude)
-                },
+        //         },
-            })
+        //     })
-        },
+        // },
         chooseGplot() {
             this.$refs.gplot.open()
         },

pages/device/new.vue

@@ -23,7 +23,7 @@
                 </button>
             </view>
         </template>
-        <template v-else>
+        <template v-else >
             <view class="content">
                 <uni-forms>
                     <uni-forms-item label="项目">
@@ -97,9 +97,12 @@
                 </uni-forms>
             </view>
             <image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
-            <view class="btn-wrap">
+            <view class="btn-wrap" >
                 <!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
-                <view class="btn-wrap-item" @click="submit"> 提交</view>
+                <!-- <view class="btn-wrap-item" @click="submit" > 提交</view> -->
+                 <button class="btn-wrap-item" :loading="isLoading1" :disabled="isLoading1" @click="submit">
+                    {{ isLoading1 ? '提交中...' : '提交' }}
+                </button>
             </view>
             <uni-drawer ref="gplot" mode="right" :mask-click="false">
                 <scroll-view style="height: 100%" scroll-y="true">
@@ -189,6 +192,7 @@ export default {
             projectRange: [],
             point: {},
             isLoading: false,
+            isLoading1: false,
             pointList: [],
             activeGplot: 0,
             positionList: [],
@@ -360,17 +364,17 @@ export default {
                     this.isLoading = false
                 })
         },
-        chooseLocation() {
+        // chooseLocation() {
-            uni.chooseLocation({
+        //     uni.chooseLocation({
-                success: function (res) {
+        //         success: function (res) {
-                    this.address = res.name
+        //             this.address = res.name
-                    console.log('位置名称：' + res.name)
+        //             console.log('位置名称：' + res.name)
-                    console.log('详细地址：' + res.address)
+        //             console.log('详细地址：' + res.address)
-                    console.log('纬度：' + res.latitude)
+        //             console.log('纬度：' + res.latitude)
-                    console.log('经度：' + res.longitude)
+        //             console.log('经度：' + res.longitude)
-                },
+        //         },
-            })
+        //     })
-        },
+        // },
         chooseGplot() {
             this.$refs.gplot.open()
             this.dialogOpen = true
@@ -451,6 +455,7 @@ export default {
                 this.$util.toast('监测点不能重复')
                 return
             }
+            this.isLoading1 = true
             addDevice({
                 ...this.formData,
                 list: this.pointList,
@@ -459,10 +464,13 @@ export default {
             }).then((res) => {
                 console.log(res)
                 this.$util.toast('提交成功')
+                 this.isLoading1 = false
                 setTimeout(() => {
                     this.type = 3
                     uni.navigateBack({ delta: 1 })
                 }, 1500)
+            }).catch(()=>{
+                 this.isLoading1 = false
             })
         },
     },

pages/engineering/new.vue

@@ -93,17 +93,17 @@ export default {
         select(e) {
             console.log(e)
         },
-        chooseLocation() {
+        // chooseLocation() {
-            uni.chooseLocation({
+        //     uni.chooseLocation({
-                success: function (res) {
+        //         success: function (res) {
-                    this.address = res.name
+        //             this.address = res.name
-                    console.log('位置名称：' + res.name)
+        //             console.log('位置名称：' + res.name)
-                    console.log('详细地址：' + res.address)
+        //             console.log('详细地址：' + res.address)
-                    console.log('纬度：' + res.latitude)
+        //             console.log('纬度：' + res.latitude)
-                    console.log('经度：' + res.longitude)
+        //             console.log('经度：' + res.longitude)
-                },
+        //         },
-            })
+        //     })
-        },
+        // },
         async submit() {
             console.log(this.formData)
             if (!this.formData.name) {

pages/gateway/new.vue

@@ -26,8 +26,8 @@
                         <view style="display:flex;">
                             <uni-easyinput :clearable="false" type="textarea" autoHeight v-model="formData.address"
                                 placeholder="请输入位置信息" />
-                            <uni-icons type="location" color="#007aff" size="26" class="ml20"
+                            <!-- <uni-icons type="location" color="#007aff" size="26" class="ml20"
-                                @click="chooseLocation"></uni-icons>
+                                @click="chooseLocation"></uni-icons> -->
                         </view>
                     </uni-forms-item>
                     <uni-forms-item label="拓扑图">
@@ -97,17 +97,17 @@ export default {
         register () {
             this.type = 2
         },
-        chooseLocation () {
+        // chooseLocation () {
-            uni.chooseLocation({
+        //     uni.chooseLocation({
-                success: function (res) {
+        //         success: function (res) {
-                    this.address = res.name
+        //             this.address = res.name
-                    console.log('位置名称：' + res.name);
+        //             console.log('位置名称：' + res.name);
-                    console.log('详细地址：' + res.address);
+        //             console.log('详细地址：' + res.address);
-                    console.log('纬度：' + res.latitude);
+        //             console.log('纬度：' + res.latitude);
-                    console.log('经度：' + res.longitude);
+        //             console.log('经度：' + res.longitude);
-                }
+        //         }
-            });
+        //     });
-        },
+        // },
         submit () {
             this.$util.toast('提交成功')
             setTimeout(() => {

pages/message/message.vue

@@ -3,8 +3,14 @@
         <view class="content" slot="body">
             <view class="content-item" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
                 <view class="content-item-header">
-                    <uni-badge class="uni-badge-left-margin" :is-dot="true" :text="item.status == '1' ? 0 : 1"
+                    <uni-badge
-                        absolute="rightTop" size="small" :style="type == '0' ? `margin-top: 30rpx;` : ''">
+                        class="uni-badge-left-margin"
+                        :is-dot="true"
+                        :text="item.status == '1' ? 0 : 1"
+                        absolute="rightTop"
+                        size="small"
+                        :style="type == '0' ? `margin-top: 30rpx;` : ''"
+                    >
                         <view class="content-item-header-icon">
                             <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
                         </view>
@@ -14,10 +20,12 @@
                         <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
                         <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
                         <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
-                        <view class="content-item-header-right-des" v-if="type == '0' || type == '1'">监测点名称：{{
+                        <view class="content-item-header-right-des" v-if="type == '0' || type == '1'"
-                            item.lineName }}</view>
+                            >监测点名称：{{ item.lineName }}</view
-                        <view class="content-item-header-right-des" v-if="type == '0'">暂态事件类型：{{ item.showName.slice(0,
+                        >
-                            -4) }}</view>
+                        <view class="content-item-header-right-des" v-if="type == '0'"
+                            >暂态类型：{{ item.showName }}</view
+                        >
                         <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
                     </view>
                     <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -40,8 +48,10 @@
                 </view>
             </uni-card> -->
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+            <uni-load-more
-                :status="store.status"></uni-load-more>
+                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"
+            ></uni-load-more>
         </view>
     </Cn-page>
 </template>
@@ -105,18 +115,20 @@ export default {
             console.log(dictData)
             this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
             this.store.params.type = this.type
+            this.store.params.startTime = this.$util.getThreeMonthsAgo()
+            this.store.params.endTime = this.$util.getToday()
             this.store.loadedCallback = () => {
                 console.log(111, this.store.data)
 
                 this.store.data.forEach((item) => {
                     if (this.type === '3') {
-                        item.showName = '告警,告警码：' + item.code
+                        item.showName = '告警，告警码：' + (item.code || '-')
                     }
                     if (this.type !== '0') {
                         item.subTitle = `于${item.startTime}发生${item.showName}`
                     } else {
                         item.subTitle =
-                            `于${item.startTime}。` +
+                            `发生时间：${item.startTime}，` +
                             item.dataSet
                                 .map((item2) => {
                                     return (
@@ -136,7 +148,6 @@ export default {
         },
         jump(item) {
             if (this.type === '0') {
-
                 let str = JSON.stringify(item).replace(/%/g, '百分比')
                 item.status = '1'
 

pages/message/messageDetail.vue

@@ -12,7 +12,7 @@
                 <view class="mb5"> 工程名称：{{ detail.engineeringName }} </view>
                 <view class="mb5"> 事件名称：{{ detail.showName }}</view>
                 <view class="mb5" v-for="(item, textIndex) in detail.dataSet" :key="textIndex">
-                    {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
+                    {{ item.showName + '：' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }}
                 </view>
             </view>
             <view class="detail-content">

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.6.1</view>
+                <view class="version">Version 1.6.7</view>
             </view>
         </view>
     </Cn-page>

pages/mine/setup.vue

@@ -45,10 +45,10 @@
                 <view class="mine-nav-label">意见反馈</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view> -->
-			<!-- @click="jump('about')" -->
+            <!-- @click="jump('about')" -->
-            <view class="mine-nav"  style="border-bottom: none">
+            <view class="mine-nav" style="border-bottom: none">
                 <view class="mine-nav-label">版本信息</view>
-				  <view style="color: #828282;font-size: 14rpx;">当前版本V1.6.2</view>
+                <view style="color: #828282; font-size: 14rpx">当前版本V<1.6.7</view>
                 <!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> -->
             </view>
             <view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none">

pages/project/new.vue

@@ -24,13 +24,13 @@
                                     v-model="formData.area"
                                     placeholder="请输入区域信息"
                                 />
-                                <uni-icons
+                                <!-- <uni-icons
                                     type="location"
                                     color="#007aff"
                                     size="26"
                                     class="ml20"
                                     @click="chooseLocation"
-                                ></uni-icons>
+                                ></uni-icons> -->
                             </view>
                         </uni-forms-item>
                         <uni-forms-item label="描述">
@@ -241,19 +241,19 @@ export default {
             this.formData.files.push(...e.tempFiles)
             console.log(this.formData.files)
         },
-        chooseLocation() {
+        // chooseLocation() {
-            uni.chooseLocation({
+        //     uni.chooseLocation({
-                success: (res) => {
+        //         success: (res) => {
-                    this.formData.area = res.name
+        //             this.formData.area = res.name
-                    this.formData.lat = res.latitudeame
+        //             this.formData.lat = res.latitudeame
-                    this.formData.lng = res.longitude
+        //             this.formData.lng = res.longitude
-                    console.log('位置名称：' + res.name)
+        //             console.log('位置名称：' + res.name)
-                    console.log('详细地址：' + res.address)
+        //             console.log('详细地址：' + res.address)
-                    console.log('纬度：' + res.latitude)
+        //             console.log('纬度：' + res.latitude)
-                    console.log('经度：' + res.longitude)
+        //             console.log('经度：' + res.longitude)
-                },
+        //         },
-            })
+        //     })
-        },
+        // },
         async submit() {
             console.log(this.formData)
             if (!this.formData.name) {

pnpm-lock.yaml

@@ -6,92 +6,32 @@ settings:
 
 dependencies:
   crypto-js:
-    specifier: ^4.1.1
+    specifier: ^4.2.0
-    version: 4.1.1
+    version: 4.2.0
+  echarts:
+    specifier: ^5.6.0
+    version: 5.6.0
   html2canvas:
     specifier: ^1.4.1
     version: 1.4.1
+  image-tool:
+    specifier: ^1.0.2
+    version: 1.0.2
   image-tools:
     specifier: ^1.4.0
     version: 1.4.0
   jsrsasign:
-    specifier: ^10.8.6
+    specifier: ^11.1.0
-    version: 10.8.6
+    version: 11.1.0
   mqtt:
-    specifier: 3.0.0
+    specifier: ^3.0.0
     version: 3.0.0
   pinyin-pro:
-    specifier: ^3.13.2
+    specifier: ^3.26.0
-    version: 3.13.2
+    version: 3.26.0
-  qs:
-    specifier: ^6.11.2
-    version: 6.11.2
-  vconsole:
-    specifier: ^3.15.1
-    version: 3.15.1
-
-devDependencies:
-  '@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:
-    resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@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:
-    resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.22.5
-    dev: true
-
-  /@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:
-    resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.5
-      to-fast-properties: 2.0.0
-    dev: true
-
-  /@types/html5plus@1.0.2:
-    resolution: {integrity: sha512-OklP5lrmLq8/6TUOLgWc0LndUVvAiTWX5dnyoCFhIUtFW9opWsnCtG/UxPgeuC28Rv2XNbFfft/hEEI39P/4Ag==}
-    dev: true
-
-  /@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:
-    resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
-    dependencies:
-      '@babel/parser': 7.22.5
-      postcss: 8.4.24
-      source-map: 0.6.1
-    dev: true
-
   /async-limiter@1.0.1:
     resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
     dev: false
@@ -114,11 +54,11 @@ packages:
     dependencies:
       buffer: 5.7.1
       inherits: 2.0.4
-      readable-stream: 3.6.1
+      readable-stream: 3.6.2
     dev: false
 
-  /brace-expansion@1.1.11:
+  /brace-expansion@1.1.12:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+    resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
@@ -135,13 +75,6 @@ packages:
       ieee754: 1.2.1
     dev: false
 
-  /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:
     resolution: {integrity: sha512-sAZ9kODla+mGACBZ1IpTCAisKoGnv6PykW7fPk1LrM+mMepE18Yz0515yoVcrZy7dQsTUp3uZLQ/9Sx1RnLoHw==}
     dependencies:
@@ -170,22 +103,12 @@ packages:
       typedarray: 0.0.6
     dev: false
 
-  /copy-text-to-clipboard@3.2.0:
-    resolution: {integrity: sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /core-js@3.31.1:
-    resolution: {integrity: sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==}
-    requiresBuild: true
-    dev: false
-
   /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
     dev: false
 
-  /crypto-js@4.1.1:
+  /crypto-js@4.2.0:
-    resolution: {integrity: sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==}
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
     dev: false
 
   /css-line-break@2.1.0:
@@ -194,19 +117,16 @@ packages:
       utrie: 1.0.2
     dev: false
 
-  /csstype@3.1.2:
+  /d@1.0.2:
-    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
+    resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==}
-    dev: true
+    engines: {node: '>=0.12'}
-
-  /d@1.0.1:
-    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
     dependencies:
-      es5-ext: 0.10.62
+      es5-ext: 0.10.64
-      type: 1.2.0
+      type: 2.7.3
     dev: false
 
-  /debug@4.3.4:
+  /debug@4.4.1:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
@@ -214,59 +134,67 @@ packages:
       supports-color:
         optional: true
     dependencies:
-      ms: 2.1.2
+      ms: 2.1.3
     dev: false
 
   /duplexify@3.7.1:
     resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
     dependencies:
-      end-of-stream: 1.4.4
+      end-of-stream: 1.4.5
       inherits: 2.0.4
       readable-stream: 2.3.8
-      stream-shift: 1.0.1
+      stream-shift: 1.0.3
     dev: false
 
-  /duplexify@4.1.2:
+  /duplexify@4.1.3:
-    resolution: {integrity: sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==}
+    resolution: {integrity: sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==}
     dependencies:
-      end-of-stream: 1.4.4
+      end-of-stream: 1.4.5
       inherits: 2.0.4
-      readable-stream: 3.6.1
+      readable-stream: 3.6.2
-      stream-shift: 1.0.1
+      stream-shift: 1.0.3
     dev: false
 
-  /end-of-stream@1.4.4:
+  /echarts@5.6.0:
-    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+    resolution: {integrity: sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==}
+    dependencies:
+      tslib: 2.3.0
+      zrender: 5.6.1
+    dev: false
+
+  /end-of-stream@1.4.5:
+    resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
     dependencies:
       once: 1.4.0
     dev: false
 
-  /es5-ext@0.10.62:
+  /es5-ext@0.10.64:
-    resolution: {integrity: sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==}
+    resolution: {integrity: sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==}
     engines: {node: '>=0.10'}
     requiresBuild: true
     dependencies:
       es6-iterator: 2.0.3
-      es6-symbol: 3.1.3
+      es6-symbol: 3.1.4
+      esniff: 2.0.1
       next-tick: 1.1.0
     dev: false
 
   /es6-iterator@2.0.3:
     resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
     dependencies:
-      d: 1.0.1
+      d: 1.0.2
-      es5-ext: 0.10.62
+      es5-ext: 0.10.64
-      es6-symbol: 3.1.3
+      es6-symbol: 3.1.4
     dev: false
 
   /es6-map@0.1.5:
     resolution: {integrity: sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==}
     dependencies:
-      d: 1.0.1
+      d: 1.0.2
-      es5-ext: 0.10.62
+      es5-ext: 0.10.64
       es6-iterator: 2.0.3
       es6-set: 0.1.6
-      es6-symbol: 3.1.3
+      es6-symbol: 3.1.4
       event-emitter: 0.3.5
     dev: false
 
@@ -274,32 +202,47 @@ packages:
     resolution: {integrity: sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==}
     engines: {node: '>=0.12'}
     dependencies:
-      d: 1.0.1
+      d: 1.0.2
-      es5-ext: 0.10.62
+      es5-ext: 0.10.64
       es6-iterator: 2.0.3
-      es6-symbol: 3.1.3
+      es6-symbol: 3.1.4
       event-emitter: 0.3.5
-      type: 2.7.2
+      type: 2.7.3
     dev: false
 
-  /es6-symbol@3.1.3:
+  /es6-symbol@3.1.4:
-    resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
+    resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==}
+    engines: {node: '>=0.12'}
     dependencies:
-      d: 1.0.1
+      d: 1.0.2
       ext: 1.7.0
     dev: false
 
+  /esniff@2.0.1:
+    resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==}
+    engines: {node: '>=0.10'}
+    dependencies:
+      d: 1.0.2
+      es5-ext: 0.10.64
+      event-emitter: 0.3.5
+      type: 2.7.3
+    dev: false
+
   /event-emitter@0.3.5:
     resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
     dependencies:
-      d: 1.0.1
+      d: 1.0.2
-      es5-ext: 0.10.62
+      es5-ext: 0.10.64
+    dev: false
+
+  /exif-js@2.3.0:
+    resolution: {integrity: sha512-1Og9pAzG2FZRVlaavH8bB8BTeHcjMdJhKmeQITkX+uLRCD0xPtKAdZ2clZmQdJ56p9adXtJ8+jwrGp/4505lYg==}
     dev: false
 
   /ext@1.7.0:
     resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
     dependencies:
-      type: 2.7.2
+      type: 2.7.3
     dev: false
 
   /extend@3.0.2:
@@ -310,19 +253,6 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: false
 
-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-    dev: false
-
-  /get-intrinsic@1.2.1:
-    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
-    dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-    dev: false
-
   /glob-parent@3.1.0:
     resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==}
     dependencies:
@@ -348,6 +278,7 @@ packages:
 
   /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6
@@ -357,23 +288,6 @@ packages:
       path-is-absolute: 1.0.1
     dev: false
 
-  /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:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-    dev: false
-
-  /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:
     resolution: {integrity: sha512-P/IZ8yOMne3SCTHbVY429NZ67B/2bVQlcYGZh2iPPbdLrEQ/qY5aGChn0YTDmt7Sb4IKRI51fypItav+lNl76w==}
     dependencies:
@@ -395,12 +309,19 @@ packages:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
     dev: false
 
+  /image-tool@1.0.2:
+    resolution: {integrity: sha512-D7fATR4b2rBPKaCsY7yajL9pVIha+vBTb5BqzqFXMRGIOVxxUOf4CEVrBt8LmGgcwp4Wa/JNLoaXNMDViOo8tg==}
+    dependencies:
+      exif-js: 2.3.0
+    dev: false
+
   /image-tools@1.4.0:
     resolution: {integrity: sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==}
     dev: false
 
   /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
@@ -462,8 +383,8 @@ packages:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: false
 
-  /jsrsasign@10.8.6:
+  /jsrsasign@11.1.0:
-    resolution: {integrity: sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw==}
+    resolution: {integrity: sha512-Ov74K9GihaK9/9WncTe1mPmvrO7Py665TUfUKvraXBpu+xcTWitrtuOwcjf4KMU9maPaYn0OuaWy0HOzy/GBXg==}
     dev: false
 
   /leven@2.1.0:
@@ -474,7 +395,7 @@ packages:
   /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
-      brace-expansion: 1.1.11
+      brace-expansion: 1.1.12
     dev: false
 
   /minimist@1.2.8:
@@ -485,7 +406,7 @@ packages:
     resolution: {integrity: sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==}
     dependencies:
       bl: 4.1.0
-      debug: 4.3.4
+      debug: 4.4.1
       process-nextick-args: 2.0.1
     transitivePeerDependencies:
       - supports-color
@@ -499,14 +420,14 @@ packages:
       base64-js: 1.5.1
       commist: 1.1.0
       concat-stream: 1.6.2
-      duplexify: 4.1.2
+      duplexify: 4.1.3
-      end-of-stream: 1.4.4
+      end-of-stream: 1.4.5
       es6-map: 0.1.5
       help-me: 1.1.0
       inherits: 2.0.4
       minimist: 1.2.8
       mqtt-packet: 6.10.0
-      pump: 3.0.0
+      pump: 3.0.3
       readable-stream: 2.3.8
       reinterval: 1.1.0
       split2: 3.2.2
@@ -518,28 +439,14 @@ packages:
       - utf-8-validate
     dev: false
 
-  /ms@2.1.2:
+  /ms@2.1.3:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
     dev: false
 
-  /mutation-observer@1.0.3:
-    resolution: {integrity: sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==}
-    dev: false
-
-  /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:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
     dev: false
 
-  /object-inspect@1.12.3:
-    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
-    dev: false
-
   /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
@@ -561,23 +468,10 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /picocolors@1.0.0:
+  /pinyin-pro@3.26.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
+    resolution: {integrity: sha512-HcBZZb0pvm0/JkPhZHWA5Hqp2cWHXrrW/WrV+OtaYYM+kf35ffvZppIUuGmyuQ7gDr1JDJKMkbEE+GN0wfMoGg==}
-    dev: true
-
-  /pinyin-pro@3.13.2:
-    resolution: {integrity: sha512-DKz04M0PkrongGyJW7GU+iNB2jInwLcP1p5+w0gu0hz2PtF8q+GTC1GDW731wyhm+q7PGoyMuY3sLONLTqi6mg==}
     dev: false
 
-  /postcss@8.4.24:
-    resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.6
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: true
-
   /process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
     dev: false
@@ -585,14 +479,14 @@ packages:
   /pump@2.0.1:
     resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
     dependencies:
-      end-of-stream: 1.4.4
+      end-of-stream: 1.4.5
       once: 1.4.0
     dev: false
 
-  /pump@3.0.0:
+  /pump@3.0.3:
-    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+    resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
     dependencies:
-      end-of-stream: 1.4.4
+      end-of-stream: 1.4.5
       once: 1.4.0
     dev: false
 
@@ -604,13 +498,6 @@ packages:
       pump: 2.0.1
     dev: false
 
-  /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:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
     dependencies:
@@ -623,8 +510,8 @@ packages:
       util-deprecate: 1.0.2
     dev: false
 
-  /readable-stream@3.6.1:
+  /readable-stream@3.6.2:
-    resolution: {integrity: sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==}
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
     engines: {node: '>= 6'}
     dependencies:
       inherits: 2.0.4
@@ -632,10 +519,6 @@ packages:
       util-deprecate: 1.0.2
     dev: false
 
-  /regenerator-runtime@0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
-    dev: false
-
   /reinterval@1.1.0:
     resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
     dev: false
@@ -652,32 +535,14 @@ packages:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: false
 
-  /side-channel@1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      object-inspect: 1.12.3
-    dev: false
-
-  /source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /split2@3.2.2:
     resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==}
     dependencies:
-      readable-stream: 3.6.1
+      readable-stream: 3.6.2
     dev: false
 
-  /stream-shift@1.0.1:
+  /stream-shift@1.0.3:
-    resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
+    resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==}
     dev: false
 
   /string_decoder@1.1.1:
@@ -720,17 +585,12 @@ packages:
       is-negated-glob: 1.0.0
     dev: false
 
-  /to-fast-properties@2.0.0:
+  /tslib@2.3.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /type@1.2.0:
-    resolution: {integrity: sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==}
     dev: false
 
-  /type@2.7.2:
+  /type@2.7.3:
-    resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
+    resolution: {integrity: sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==}
     dev: false
 
   /typedarray@0.0.6:
@@ -763,22 +623,6 @@ packages:
       base64-arraybuffer: 1.0.2
     dev: false
 
-  /vconsole@3.15.1:
-    resolution: {integrity: sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==}
-    dependencies:
-      '@babel/runtime': 7.22.6
-      copy-text-to-clipboard: 3.2.0
-      core-js: 3.31.1
-      mutation-observer: 1.0.3
-    dev: false
-
-  /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:
     resolution: {integrity: sha512-8z49MKIHbGk3C4HtuHWDtYX8mYej1wWabjthC/RupM9ngeukU4IWoM46dgth1UOS/T4/IqgEdCDJuMe2039OQQ==}
     dependencies:
@@ -817,3 +661,9 @@ packages:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
     dev: false
+
+  /zrender@5.6.1:
+    resolution: {integrity: sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==}
+    dependencies:
+      tslib: 2.3.0
+    dev: false

readme

@@ -9,7 +9,7 @@
 njcnyw
 
 
-1.工程用户 1899999999
+1.工程用户 18000001234   12345678
 2.营销用户 1888888888
 3.正式用户  187777777777
 4.运维管理元 18666666666