新增权限页面，已处理未处理页面加字段 消息弹框等

pages.json

@@ -20,27 +20,27 @@
 				"app-plus": {
 
 					"titleNView": {
-						"buttons": [
+						"buttons": [
 							// {
 							// 	"text": "\ue607",
 							// 	"fontSize": "18px",
-							// 	 // "redDot": true,
-							// 	 "float":"right",
-							// 	"fontSrc": "/static/iconfont/iconfont.ttf",
-							// 	 "width": "auto"
-								
+							// 	 // "redDot": true,
+							// 	 "float":"right",
+							// 	"fontSrc": "/static/iconfont/iconfont.ttf",
+							// 	 "width": "auto"
+
 							// }
 							// {
 
-							// 	"text": "\ue63d",
-							// 	"fontSize": "18px",
-							// 	"float":"left",
-							// 	"fontSrc": "/static/iconfont/iconfont.ttf",
+							// 	"text": "\ue63d",
+							// 	"fontSize": "18px",
+							// 	"float":"left",
+							// 	"fontSrc": "/static/iconfont/iconfont.ttf",
 							// 	 "width": "auto"
 							// }
 						]
 					}
-				
+
 				}
 
 			}
@@ -48,7 +48,7 @@
 		{
 			"path": "pages/siteList/siteList",
 			"style": {
-				"navigationBarTitleText": "运行监测",
+				"navigationBarTitleText": "运行监测",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -87,12 +87,12 @@
 
 
 
-		{
-			"path": "pages/info/info",
-			"style": {
-				"navigationBarTitleText": "消息"
-			}
-		},
+		// {
+		// 	"path": "pages/info/info",
+		// 	"style": {
+		// 		"navigationBarTitleText": "消息"
+		// 	}
+		// },
 		{
 			"path": "pages/analyse/analyse",
 			"style": {
@@ -257,91 +257,76 @@
 			}
 
 		}
-	    
-        ,{
-            "path" : "pages/add-test/add-test",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/siteDetail/siteDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "站点详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/test/test",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        
-        ,{
-            "path" : "pages/siteListAlarming/siteListAlarming",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "站点列表",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-		
-        ,{
-            "path" : "pages/authManage/authManage",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "权限管理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/authAdd/authAdd",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "权限新增",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/siteAdd/siteAdd",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "站点新增",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/deviceManage/deviceManage",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备管理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/deviceAdd/deviceAdd",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+
+		, {
+			"path": "pages/add-test/add-test",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/siteDetail/siteDetail",
+			"style": {
+				"navigationBarTitleText": "站点详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/authority/authority",
+			"style": {
+				"navigationBarTitleText": "授权",
+				"enablePullDownRefresh": false
+			}
+
+		}
+
+		, {
+			"path": "pages/siteListAlarming/siteListAlarming",
+			"style": {
+				"navigationBarTitleText": "站点列表",
+				"enablePullDownRefresh": true
+			}
+
+		}
+
+		, {
+			"path": "pages/authManage/authManage",
+			"style": {
+				"navigationBarTitleText": "权限管理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/authAdd/authAdd",
+			"style": {
+				"navigationBarTitleText": "权限新增",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/siteAdd/siteAdd",
+			"style": {
+				"navigationBarTitleText": "站点新增",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/deviceManage/deviceManage",
+			"style": {
+				"navigationBarTitleText": "设备管理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/deviceAdd/deviceAdd",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
@@ -375,12 +360,6 @@
 				"selectedIconPath": "static/setting-selected.png",
 				"text": "设置"
 			}
-			// {
-			// 	"pagePath": "pages/login/login",
-			// 	"iconPath": "static/setting.png",
-			// 	"selectedIconPath": "static/setting-selected.png",
-			// 	"text": "登录"
-			// }
 		]
 
 	}

pages/authAdd/authAdd.vue

@@ -9,7 +9,7 @@
 				</view>
 
 				<select name="" id="" v-model="formMess.mobile" filterable clearable>
-					<option :value=item.mobile v-for="item in maintainStates">{{ item.mobile}}</option>
+					<option :value=item.phone v-for="item in phoneData">{{ item.phone}}</option>
 				</select>
 
 			</view>
@@ -72,7 +72,7 @@
 				</view>
 		
 				<select name="" id="" v-model="authorityData.phone" filterable clearable disabled="disabled"> 
-					<option :value=item.mobile v-for="item in maintainStates">{{ item.mobile}}</option>
+					<option :value=item.phone v-for="item in phoneData">{{ item.phone}}</option>
 				</select>
 		
 			</view>
@@ -154,33 +154,14 @@
 
 				// 站点多选下拉
 				siteItemDataOrigin: [],
-				selectedData: [],
+				selectedData: [],
+				phoneData:[],
 				siteItemData: [],
 				selectedArr: [],
 				selectedString: '',
 				radioOne: 3,
 
-				maintainStates: [{
-						value: 0,
-						mobile: '13262908435'
-					},
-					{
-						value: 1,
-						mobile: '13262908431'
-					},
-					{
-						value: 2,
-						mobile: '13262908432'  
-					},
-					{
-						value: 3,
-						mobile: '13971482380' 
-					},
-					{
-						value: 4,
-						mobile: '13000000000' 
-					}
-				]
+				
 			}
 		},
 
@@ -204,6 +185,7 @@
 				});
 			}
 			this.getSiteList();
+			this.getphoneList()
 			
 			
 			
@@ -241,10 +223,10 @@
 			
 			
 			// 修改请求
-			async setEditAuthority(ming={}) {
+			async setEditAuthority(params={}) {
 				const res = await this.$myRequest({
 					url: 'AuthorityManagement/setEditAuthority',
-					data:ming
+					data:params
 				})
 				if (!res.data.flag) {
 					uni.showToast({
@@ -267,10 +249,10 @@
 			
 			
 			// 回显信息请求
-			async getAuthority(ming={}) {
+			async getAuthority(params={}) {
 				const res = await this.$myRequest({
 					url: 'AuthorityManagement/getAuthority',
-					data:ming
+					data:params
 				})
 				this.authorityData=res.data.data[0]
 				this.selectedData=res.data.data[0].siteIdData
@@ -328,7 +310,18 @@
 				}, 1000);
 
 			},
-
+
+
+			//电话号码下拉请求数据
+			async getphoneList() {
+				const res = await this.$myRequest({
+					url: 'AuthorityManagement/getPhoneList',
+				})
+			
+				this.phoneData = res.data.data;
+				console.log(this.phoneData)
+				
+			},
 			//站点下拉请求数据
 			async getSiteList() {
 				const res = await this.$myRequest({
@@ -337,11 +330,13 @@
 				this.siteItemData = res.data.data;
 				this.siteItemDataOrigin = res.data.data;
 				
-			},
-			addAuthority(ming = {}) {
+			},
+			
+			
+			addAuthority(params = {}) {
 				return this.$myRequest({
 					url: 'AuthorityManagement/setaddAuthority',
-					data: ming
+					data: params
 				})
 			},
 

pages/authority/authority.vue

@@ -0,0 +1,36 @@
+<template>
+	<view style="text-align:center; padding-top:100rpx">
+
+		<image src="../../static/chart3-2.png" style="width:100rpx;height:100rpx"></image>
+		<br>
+		<br>
+		<view>该用户权限尚未开通，请联系管理员!</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+
+			}
+		},
+		
+		computed: {
+			
+
+		},
+		methods: {
+
+			
+
+
+		}
+	}
+</script>
+
+<style>
+	
+</style>

pages/deviceAdd/deviceAdd.vue

@@ -68,11 +68,11 @@
 					<text class="necessary">*</text>
 					设备编号:
 				</view>
-				<input name="deviceCode" v-model="deviceMessage.deviceCode"></input>
+				<input name="deviceCode" v-model="deviceMessage.deviceCode" disabled="disabled"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备名称:</view>
-				<input name="input" v-model="deviceMessage.deviceName"></input>
+				<input name="input" v-model="deviceMessage.deviceName" disabled="disabled"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>安装位置:</view>
@@ -339,10 +339,10 @@
 						title: "编辑成功",
 					});
 				}
-				setTimeout(() => {
-					uni.navigateTo({
-						url: '/pages/deviceManage/deviceManage',
-					});
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/siteManage/siteManage',
+					});
 				}, 1000);
 			},
 

pages/deviceManage/deviceManage.vue

@@ -74,7 +74,7 @@
 			//筛选
 			searchSiteList() {
 				this.getDeviceList({
-					"deviceName": this.deviceName
+					"deviceName": this.deviceName,"siteId":this.siteId
 				})
 			},
 			

pages/index/index.vue

@@ -162,7 +162,6 @@
 					}
 				});
 			} else {
-				// alert("你点击了下拉");
 				this.showTag()
 			}
 		},
@@ -178,11 +177,11 @@
 				// uni.navigateTo({
 				// 	url: '/pages/login/login',
 				// });
-				setTimeout(function() {
-					uni.navigateTo({
-						url: '/pages/login/login',
-					});
-				}, 2000);
+				// setTimeout(function() {
+				// 	uni.navigateTo({
+				// 		url: '/pages/login/login',
+				// 	});
+				// }, 2000);
 				
 
 			}
@@ -225,66 +224,55 @@
 				var params = {};
 				var CODE = this.getUrlCode();
 				var code = CODE['code'];
-				// alert("CODE="+code);
 				if (code) {
-					// console.log("打印参数",JSON.stringify(params));
+
 					params.code = code;
-					// alert(code);
-					// alert(JSON.stringify(params));
+			
 
 					//使用code请求服务器接口，换取用户用户openID
 					const res = await this.$myRequest({
 						url: 'Com/getPageAuthorization',
 						data: params
 					})
-					// alert(res.data.flag);
 					if (res.data.flag == 3000) {
-						alert("授权失败,请重新登录");
-						
+						// alert("授权失败,请重新登录");
 						window.location.href ='https://qhome.usky.cn/index.html#/';
-						// uni.navigateTo({
-						// 	url: '/pages/login/login',
-						// });
+					}
+			
+					if (res.data.flag == 3003) {
+						uni.navigateTo({
+							url: '/pages/authority/authority',
+						});
 					}
 					if (res.data.flag == 3002) {
-						alert("授权失败,请重新登录");
+						// alert("授权失败,请重新登录");
 						window.location.href ='https://qhome.usky.cn/index.html#/';
-						// uni.navigateTo({
-						// 	url: '/pages/login/login',
-						// });
 					}
 					return "ok";
 				}
-				// alert("授权开始");
+
 				var cs = {};
 				var curl = window.location.href;
 				cs.curl = curl;
-				// alert("当前页面路径"+curl);
+
 				const res1 = await this.$myRequest({
 					url: 'Com/getAuthorizationUrl',
 					data: cs
 				})
-				// alert(res1.data);
+
 				var turl = res1.data.turl;
-				// alert(turl)
 				window.location.href =
 					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx4eab2e3b5531d58b&redirect_uri=' + turl +
 					'&response_type=code&scope=snsapi_base&state=abc123#wechat_redirect';
 			},
 			// end
 
-
-
 			//首页初始化授权
 			async getPageAuthorization(ming = {}) {
 				const res = await this.$myRequest({
 					url: 'Com/getPageAuthorization',
 					data: ming
 				})
-				alert(res.data.flag)
-
-				console.log('res.data');
-				console.log(res.data);
 
 				if (res.data.flag == 3000) {
 					uni.navigateTo({
@@ -307,7 +295,6 @@
 				})
 				this.staticData = res.data.data[0]
 				this.alarmCount=this.staticData.alarmCount
-				// console.log(this.staticData.alarmCount)
 			},
 
 
@@ -323,8 +310,6 @@
 			},
 
 			clickSelectItem(item, index) {
-				// alert(index);
-				alert(item);
 				this.getSearchList({
 					"siteName": item
 				});
@@ -332,14 +317,11 @@
 			},
 
 			handleInput() {
-				// this.searchList = this.searchList.filter(item => item.indexOf(this.searchInput) > -1);
-
 				var newlist = this.searchList2.filter(item => item.indexOf(this.searchInput) > -1)
 				this.searchList = newlist
 			},
 
 			navItemClick(index) {
-				// log(index)
 				let url = "";
 				switch (index) {
 					case 0:
@@ -356,19 +338,13 @@
 						url: url
 					})
 				} else {
-					// uni.showToast({
-					// 	title: '此模块开发中~',
-					// 	icon: 'none'
-					// });
 					uni.showModal({
 						title: 'Tips',
 						content: '此模块开发中~',
 						showCancel: false,
 						success: function(res) {
 							if (res.confirm) {
-								console.log('用户点击确定');
 							} else if (res.cancel) {
-								console.log('用户点击取消');
 							}
 						}
 					});

pages/login/login.vue

@@ -85,24 +85,19 @@
 				if (ua.match(/MicroMessenger/i) == "micromessenger") {
 
 					var curl2 = window.location.href;
-					alert('curl2')
-					alert(curl2)
+
 
 					//是
 					var appId = "wx4eab2e3b5531d58b";
 					var params = {};
 					var CODE = this.getUrlCode();
 					var code = CODE['code'];
-					alert('code')
-					alert(code)
 					if (code) {
 						params.code = code;
 						const res = await this.$myRequest({
 							url: 'Login/getLoginAuthorize',
 							data: params
 						})
-						alert('res.data.flag')
-						alert(res.data.flag)
 						// if (res.data.flag == true) {
 						// 	uni.switchTab({
 						// 		url: '/pages/index/index'
@@ -113,8 +108,6 @@
 					}
 					var cs = {};
 					var curl = window.location.href;
-					alert('curl')
-					alert(curl)
 					cs.curl = curl;
 					const res1 = await this.$myRequest({
 						url: 'Login/getLoginAuthorize',
@@ -139,11 +132,6 @@
 
 			//短信验证码验证
 			getVerifyCode() {
-
-
-
-
-
 				if (!this.phone) {
 					uni.showToast({
 						title: "请输入手机号码...",
@@ -182,10 +170,10 @@
 
 
 			},
-			async getVerifyData(ming = {}) {
+			async getVerifyData(params = {}) {
 				const res = await this.$myRequest({
 					url: 'Login/getVerificationCode',
-					data: ming
+					data: params
 				})
 
 
@@ -226,13 +214,11 @@
 				})
 
 			},
-			async getData(ming = {}) {
+			async getData(params = {}) {
 				const res = await this.$myRequest({
 					url: 'Login/setSignUp',
-					data: ming
+					data: params
 				})
-				alert(1)
-				alert(res.data.flag)
 				if (res.data.flag == true) {
 					uni.switchTab({
 						url: '/pages/index/index'

pages/processedDetail/processedDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">2021-01-18 15:16:45</view>
+			<view class="time">{{type==1?detailMessage.time:detailMessage2.time}}</view>
 			<button class="cu-btn radius bg-green sm">已处理</button>
 		</view>
 		<view v-if="type==1">

pages/setting/setting.vue

@@ -19,7 +19,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-item" @tap="goSiteManage">
+			<view class="cu-item" @tap="goSiteManage" v-if="permissionLabel==1">
 				<view class="cu-avatar " style="background-image:url(../../static/setting-icon2.png)"></view>
 				<view class="content">
 					<view class="">站点管理</view>
@@ -30,18 +30,7 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="cu-item" @tap="goDeviceManage">
-				<view class="cu-avatar " style="background-image:url(../../static/setting-icon3.png)"></view>
-				<view class="content">
-					<view class="">设备管理</view>
-				</view>
-				<view class="nav-right">
-					<view class="text-grey">
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
-					</view>
-				</view>
-			</view> -->
-			<view class="cu-item" @tap="goAuthManage">
+			<view class="cu-item" @tap="goAuthManage" v-if="permissionLabel==1">
 				<view class="cu-avatar " style="background-image:url(../../static/setting-icon4.png)"></view>
 				<view class="content">
 					<view class="">权限管理</view>
@@ -60,10 +49,27 @@
 <script>
 	export default {
 		data() {
-			return {
+			return {
+				permissionLabel:0
 			}
+		},
+		onLoad() {
+			this.getAuthorization()
 		},
 		methods: {
+			
+			async getAuthorization(params) {
+				const res = await this.$myRequest({
+					url: 'Com/getAuthorization',
+					showLoading: true,
+					data: params
+				})
+			
+				console.log(res.data.permissionLabel)
+				 this.permissionLabel = res.data.permissionLabel
+			},
+			
+			
 			goSiteManage() {
 				uni.navigateTo({
 					url: '/pages/siteManage/siteManage?type=1',
@@ -89,12 +95,22 @@
 				});
 			},
 			goMessagePush() {
-				uni.navigateTo({
-					url: '/pages/messagePush/messagePush',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+				uni.showModal({
+					title: 'Tips',
+					content: '此模块开发中~',
+					showCancel: false,
+					success: function(res) {
+						if (res.confirm) {
+						} else if (res.cancel) {
+						}
+					}
 				});
+				// uni.navigateTo({
+				// 	url: '/pages/messagePush/messagePush',
+				// 	success: res => {},
+				// 	fail: () => {},
+				// 	complete: () => {}
+				// });
 			},
 
 		}

pages/test/test.vue

@@ -1,140 +0,0 @@
-<template>
-	<view>
-
-		<!-- <input type="text"   v-model="searchVal" >
-		<view>
-			<view v-for="(item,index) in NewItems" :key="index" :value="item.value" v-text="item.name"></view>
-		</view> -->
-
-
-		<input type="text" @input="handleInput()" v-model="mytext">
-		<ul>
-			<li v-for="data in datalist">
-				{{data}}
-			</li>
-		</ul>
-
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				mytext: '',
-				// searchVal:'',
-				// items: [
-				// 	{name: 1, value: '站点1'},
-				// 	{name: 2, value: '站点2'},
-				// 	{name: 3, value: '站点3'},
-				// 	{name: 4, value: '站点4'},
-				// 	{name: 5, value: '站点5'},
-				// 	{name: 6, value: '站点6'},
-				// 	{name: 7, value: '站点7'},
-				// 	{name: 8, value: '站点8'},
-				// 	{name: 9, value: '站点9'},
-				// 	{name: 10, value: '站点10'},
-				// ],
-				// NewItems:[
-				// 	{name: 10, value: '站点10'}
-				// ],
-				datalist: ["aaa", "bbb", "ccc", "eee", "eac", "date"],
-				list: ["aaa", "bbb", "ccc", "eee", "eac", "date"]
-
-			}
-		},
-		// watch:{
-
-
-		// 	searchVal: {
-		// 	  	handler: function(val, oldVal) {
-		// 	  	  //这时候 o = 岑先生、u = 不认识	
-		// 	      this.items.map(function(item){
-		// 	      						   // console.log('===='+item.name)
-		// 								   // console.log('data===')
-		// 								   // console.log(this.$data)
-		// 	      	if(item.value.search(val)!=-1){
-		// 	      							console.log('this is new items')
-		// 	      							console.log(this.NewItems);
-		// 	      		this.NewItems.push(item);
-		// 	      	}
-
-		// 	      })
-		// 	    },
-		// 	    deep: true
-		// 	  }
-
-
-		// 	searchVal(val, oldVal){
-
-		// 	           this.items.map(function(item){
-		// 	           	if(item.value.search(val)!=-1){
-		// 					console.log('this is new items')
-		// 					console.log(this.NewItems);
-		// 	           		this.NewItems.push(item);
-		// 	           	}
-
-
-		// 	           })
-		// 	     }
-
-		// },
-		computed: {
-			// newItems(){
-
-			// 	var_this=this;
-			// 	var NewItems=[];
-			// 	this.items.map(function(item){
-			// 		if(item.name.search(_this.searchVal)!=-1){
-			// 			NewItems.push(item);
-			// 		}
-
-			// 	})
-			// 	return NewItems
-			// }
-
-		},
-		methods: {
-
-			handleInput() {
-				var newlist = this.list.filter(item => item.indexOf(this.mytext) > -1)
-				this.datalist = newlist
-			}
-
-
-		}
-	}
-</script>
-
-<style>
-	ul,
-	li {
-		list-style: none;
-	}
-
-	li {
-		position: relative;
-		height: 40px;
-		line-height: 40px;
-		border-bottom: 1px solid #000;
-	}
-
-	li span:first-child {
-		display: inline-block;
-		width: 10px;
-		height: 10px;
-		background-color: #000;
-	}
-
-	li div {
-		position: absolute;
-		left: 20px;
-		top: 0;
-		z-index: 1000;
-		width: 100px;
-		height: 100px;
-		border: 1px solid red;
-		background-color: #fff;
-	}
-</style>

pages/unprocessDetail/unprocessDetail.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">2021-01-18 15:16:45</view>
+			<view  v-if="type==1" class="time">{{detailMessage.time}}</view>
+			<view  v-else class="time">{{detailMessage2.time}}</view>
 			<button class="cu-btn radius bg-red sm">未处理</button>
 		</view>
 		<!-- 电力start -->
@@ -147,9 +148,6 @@
 		</view>
 
 
-
-
-
 	</view>
 </template>
 
@@ -166,7 +164,8 @@
 				detailMessage2: {},
 				msg: '',
 				msg2: '',
-				flag:false
+				flag:false,
+				companyCode:0
 
 			}
 		},
@@ -193,36 +192,43 @@
 		},
 		methods: {
 
-			async getUnProcessDetail(ming = {}) { 
+			async getUnProcessDetail(params = {}) { 
 				const res = await this.$myRequest({
 					url: 'IntegratedAlarm/getPowerAlarmDetails',
-					data: ming
+					data: params
 				})
 				console.log(res.data.data[0]);
 				this.detailMessage = res.data.data[0]
 			},
 
-			async getUnProcessDetail2(ming = {}) { 
+			async getUnProcessDetail2(params = {}) { 
 				const res = await this.$myRequest({
 					url: 'IntegratedAlarm/getVideoAlarmDetails',
-					data: ming
+					data: params
 				})
 				console.log(res.data.data[0]);
 				this.detailMessage2 = res.data.data[0]
 			},
 
-			async powerSubmitRes(ming = {}) {
+			async powerSubmitRes(params = {}) {
 				const res = await this.$myRequest({
 					url: 'IntegratedAlarm/setAlarmHandle',
-					data: ming
+					data: params
 				})
+				
 			   if(res.data.flag){
 				  uni.showToast({
 				  	title: "提交成功",
 				  });
-				  this.msg='',
-				  this.msg2=''
 			   }
+			   
+			   setTimeout(() => {
+			   	uni.navigateTo({
+			   		url: '/pages/processList/processList?companyCode=' + this.companyCode + '&type='+this.type+'',
+			   
+			   	});
+			   }, 1000);
+			 
 				
 			},
 
@@ -240,7 +246,9 @@
 						"id": this.detailMessage.id,
 						"handlerContent": this.msg
 					})
-				}
+				}
+				
+				
 			},
 			
 			videoSubmit() {