Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain

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",

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')