From 0c73a6c6a694db0148709e7e57319f17fe2b37ba Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 19 Jun 2024 21:16:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E6=89=A7=E8=A1=8Cnpm=20i?=
 =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=9A=84=E5=B7=AE=E5=BC=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 node_modules/.package-lock.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index 13df6de5..f1bfc4a7 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -240,6 +240,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mutation-observer": {
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",

From 3f2cc39715f9d5216a946ea76556a98f66b66077 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 24 Jun 2024 14:41:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?flx=EF=BC=9Aai=E9=A2=84=E8=AD=A6=E5=B7=B2?=
 =?UTF-8?q?=E5=A4=84=E7=BD=AE=E9=A1=B9=E7=9B=AE=E8=B4=A6=E5=8F=B7=20?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E8=83=BD=E8=BF=9B=E8=A1=8C=E5=A4=84?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/alarmPage/indexTwo.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/alarmPage/indexTwo.vue b/pages/alarmPage/indexTwo.vue
index 5b4828f6..b3d638b5 100644
--- a/pages/alarmPage/indexTwo.vue
+++ b/pages/alarmPage/indexTwo.vue
@@ -41,7 +41,7 @@
 						       @click="previewImg(url_config+'image/'+item.imageUrl)"></image>
 						       <!-- @click="previewImg(item.imageUrl)"></image> -->
 					</view>
-					<view class="bottom-right" @click="goDisposition(item)"  v-if="!item.handleResult && item.isEnableHandle" v-show="btnAuth">
+					<view class="bottom-right" @click="goDisposition(item)"  v-if="!item.handleResult && (item.isEnableHandle || userInfo.accountType == 5 || userInfo.accountType == 10)" v-show="btnAuth">
 						去处置
 					</view>
 					<view class="bottom-right" @click="goShutting(item)" style="background-color: #b0b0b0;" v-if="item.handleResult && !item.isEnableHandle">
@@ -75,11 +75,13 @@
 					{ id: 7, value: '反光衣报警' },
 					{ id: 8, value: '未穿反光衣' },
 				],
-				btnAuth: true
+				btnAuth: true,
+				userInfo:{}
 			}
 		},
 		onLoad() {
 			this.btnAuth = this.checkBtnPermission({key: 'ai_disposition', menuPath: '/project/aiAnalysis/warningList'})
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 		},
 		onShow(){
 			this.systemInfo = uni.getStorageSync('systemInfo')