111

sources/client/vrv-moblie/config/api.js

@@ -0,0 +1,129 @@
+//路径
+const root = "http://127.0.0.1:9999";
+
+//接口auth
+const api = {
+
+        user: {
+            list: `${root}/user/list`,
+            add: `${root}/user/add`,
+            update: `${root}/user/update`,
+            detail: `${root}/user/detail`,
+            delete: `${root}/user/delete`,
+            batchDelete: `${root}/user/batchDelete`,
+            bindRole: `${root}/user/bindRole`,
+            bindOperator: `${root}/user/bindOperator`,
+        },
+        operator: {
+            list: `${root}/operator/list`,
+            add: `${root}/operator/add`,
+            update: `${root}/operator/update`,
+            detail: `${root}/operator/detail`,
+            delete: `${root}/operator/delete`,
+            batchDelete: `${root}/operator/batchDelete`
+        },
+        project: {
+            list: `${root}/project/list`,
+            operatorList: `${root}/project/operatorList`,
+            add: `${root}/project/add`,
+            update: `${root}/project/update`,
+            detail: `${root}/project/detail`,
+            delete: `${root}/project/delete`,
+            batchDelete: `${root}/project/batchDelete`
+        },
+        gateway: {
+            list: `${root}/gateway/list`,
+            add: `${root}/gateway/add`,
+            update: `${root}/gateway/update`,
+            detail: `${root}/gateway/detail`,
+            delete: `${root}/gateway/delete`,
+            batchDelete: `${root}/gateway/batchDelete`
+        },
+        device: {
+            list: `${root}/device/list`,
+            add: `${root}/device/add`,
+            update: `${root}/device/update`,
+            detail: `${root}/device/detail`,
+            delete: `${root}/device/delete`,
+            batchDelete: `${root}/device/batchDelete`,
+        },
+        deviceParam: {
+            list: `${root}/deviceParam/list`,
+            add: `${root}/deviceParam/add`,
+            update: `${root}/deviceParam/update`,
+            detail: `${root}/deviceParam/detail`,
+            delete: `${root}/deviceParam/delete`,
+            batchDelete: `${root}/deviceParam/batchDelete`,
+        },
+        deviceAlarmRecord: {
+            list: `${root}/deviceAlarmRecord/list`,
+            add: `${root}/deviceAlarmRecord/add`,
+            update: `${root}/deviceAlarmRecord/update`,
+            detail: `${root}/deviceAlarmRecord/detail`,
+            delete: `${root}/deviceAlarmRecord/delete`,
+            batchDelete: `${root}/deviceAlarmRecord/batchDelete`,
+        },
+        deviceAlarmConfig: {
+            list: `${root}/deviceAlarmConfig/list`,
+            add: `${root}/deviceAlarmConfig/add`,
+            update: `${root}/deviceAlarmConfig/update`,
+            detail: `${root}/deviceAlarmConfig/detail`,
+            delete: `${root}/deviceAlarmConfig/delete`,
+            batchDelete: `${root}/deviceAlarmConfig/batchDelete`,
+        },
+        deviceAlarmRepairRecord: {
+            list: `${root}/deviceAlarmRepairRecord/list`,
+            add: `${root}/deviceAlarmRepairRecord/add`,
+            update: `${root}/deviceAlarmRepairRecord/update`,
+            detail: `${root}/deviceAlarmRepairRecord/detail`,
+            delete: `${root}/deviceAlarmRepairRecord/delete`,
+            batchDelete: `${root}/deviceAlarmRepairRecord/batchDelete`,
+        },
+        operatorLog: {
+            list: `${root}/operatorLog/list`,
+            add: `${root}/operatorLog/add`,
+            update: `${root}/operatorLog/update`,
+            detail: `${root}/operatorLog/detail`,
+            delete: `${root}/operatorLog/delete`,
+            batchDelete: `${root}/operatorLog/batchDelete`,
+        },
+        auth: {
+            verifyCode: `${root}/auth/verifyCode`,
+            login: `${root}/auth/login`,
+            updateUserPassword: `${root}/auth/updateUserPassword`,
+            userInfo: `${root}/auth/userInfo`,
+            logout: `${root}/auth/logout`,
+        },
+        role: {
+            list: `${root}/role/list`,
+            add: `${root}/role/add`,
+            update: `${root}/role/update`,
+            detail: `${root}/role/detail`,
+            delete: `${root}/role/delete`,
+        },
+        power: {
+            list: `${root}/power/list`,
+            add: `${root}/power/add`,
+            update: `${root}/power/update`,
+            detail: `${root}/power/detail`,
+            delete: `${root}/power/delete`,
+        },
+        rolePower: {
+            list: `${root}/rolePower/list`,
+            add: `${root}/rolePower/add`,
+            update: `${root}/rolePower/update`,
+            detail: `${root}/rolePower/detail`,
+            delete: `${root}/rolePower/delete`,
+        },
+        menu: {}
+    }
+;
+
+export default Object.assign(
+    {
+        $base: {
+            root: root,
+        },
+    },
+    api
+)

sources/client/vrv-moblie/main.js

@@ -1,4 +1,9 @@
 import App from './App'
+import http from './utils/http.js'
+import api from './config/api.js'
+
+uni.$http = http;
+uni.$api = api;
 
 // #ifndef VUE3
 import Vue from 'vue'

sources/client/vrv-moblie/pages.json

@@ -116,44 +116,57 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "pages/user/user",
+			"style": {
+				"navigationBarTitleText": "用户管理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/rolePower/rolePower",
+		 "style": {
+				"navigationBarTitleText": "角色管理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+		 "path": "pages/roleShowPower/roleShowPower",
+			"style": {
+				"navigationBarTitleText": "角色权限管理",
+		 	"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/runningState/runningState",
+			"style": {
+				"navigationBarTitleText": "运行状态",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/dataCurve/dataCurve",
+			"style": {
+				"navigationBarTitleText": "数据曲线",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/power/power",
+			"style": {
+				"navigationBarTitleText": "权限管理",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/project/projectEdit/projectEdit",
+			"style": {
+				"navigationBarTitleText": "修改用户",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/user/user",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "系统管理员账号管理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/rolePower/rolePower",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "角色与权限管理",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/runningState/runningState",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "运行状态",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/dataCurve/dataCurve",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "数据曲线",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-    ],
+	],
 
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

sources/client/vrv-moblie/pages/alarm/alarm.vue

@@ -7,7 +7,7 @@
 				<text>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区：</text> 
 				<text>客户名称：</text>
 				<text>报警类型：{{item.alarmType}}</text>
-				<text>报警时间：{{item.startTime}}</text>
+				<text>报警时间：{{item.createTime}}</text>
 			</view>
 
 

sources/client/vrv-moblie/pages/alarmRecord/alarmRecord.vue

@@ -13,7 +13,7 @@
 		</view>
 
 		<view class="anniu">
-			<image class="anniu" src="../../static/设备菜单/前往列表@2x.png"></image>
+			<image class="anniu" src="../../static/设备菜单/前往列表@2x.png" @tap="back"></image>
 		</view>
 	</view>
 </template>
@@ -39,7 +39,11 @@
 			})
 		},
 		methods: {
-
+			back() {
+				uni.navigateTo({
+					url: '/pages/device/deviceInfo/deviceInfo'
+				})
+			}
 		}
 	}
 </script>

sources/client/vrv-moblie/pages/dataCurve/dataCurve.vue

@@ -40,7 +40,7 @@
 			</view>
 
 			<view class="anniu">
-				<image class="anniu" src="../../static/设备菜单/前往列表@2x.png"></image>
+				<image class="anniu" src="../../static/设备菜单/前往列表@2x.png" @tap="back"></image>
 			</view>
 		</view>
 	</view>
@@ -121,6 +121,11 @@
 		},
 
 		methods: {
+			back() {
+				uni.navigateTo({
+					url: '/pages/device/deviceInfo/deviceInfo'
+				})
+			},
 			showLineA(canvasId, chartData) {
 				canvaLineA = new uCharts({ //这些配置项的意思看这：https://www.kancloud.cn/qiun/ucharts/1172125
 					$this: _self, //指针

sources/client/vrv-moblie/pages/login/login.vue

@@ -22,7 +22,8 @@
 						<view class="uni-form-item">
 							<view class="titleA">密码</view>
 							<view class="input">
-								<input password type="text" placeholder="请输入密码" style="margin-left: 30rpx;" />
+								<input type="text" placeholder="请输入密码" v-model="formData.password"
+									style="margin-left: 30rpx;" />
 								<!-- 	<input placeholder="请输入密码" v-model="formData.password" style="margin-left: 30rpx;" />
 								<view class="icon">
 									<uni-icons type="eye" size="26" @click="isC" v-show="block"></uni-icons>
@@ -98,17 +99,47 @@
 				this.block = !this.block;
 			},
 
-			formSubmit(e) {
+
+
+			async formSubmit(e) {
+				let vm = this;
+				let url = uni.$api.auth.login;
+				let data = {
+					account: this.formData.account,
+					password: this.formData.password,
+					verifyCode: this.formData.verifyCode
+
+				};
+				let res = await uni.$http.get(url, data);
 				console.log('form发生了submit事件')
 
-				uni.request('http://127.0.0.1:9999/auth/login', {
-						account: this.formData.account,
-						password: this.formData.password,
-						verifyCode: this.formData.verifyCode
-					},
-					'POST').then(function(res) {
-					console.log(res);
-				})
+				console.log(res);
+
+
+				if (res.data.status == 200) {
+					uni.showToast({
+						title: res.data.desc,
+						icon: "none"
+					})
+
+					uni.switchTab({
+						url: '/pages/operator/operator'
+					})
+				}
+
+				if (res.data.status == 400) {
+					uni.showToast({
+						title: res.data.data.errorFields[0].message,
+						icon: "none"
+					})
+				}
+
+				if (res.data.status == 500) {
+					uni.showToast({
+						title: res.data.desc,
+						icon: "none"
+					})
+				}
 			}
 
 		},

sources/client/vrv-moblie/pages/maintenanceRecord/maintenanceRecord.vue

@@ -13,7 +13,7 @@
 		</view>
 
 		<view class="anniu">
-			<image class="anniu" src="../../static/设备菜单/前往列表@2x.png"></image>
+			<image class="anniu" src="../../static/设备菜单/前往列表@2x.png" @tap="back"></image>
 		</view>
 	</view>
 </template>
@@ -39,7 +39,11 @@
 			})
 		},
 		methods: {
-
+			back() {
+				uni.navigateTo({
+					url: '/pages/device/deviceInfo/deviceInfo'
+				})
+			}
 		}
 	}
 </script>

sources/client/vrv-moblie/pages/operator/operator.vue

@@ -16,24 +16,31 @@
 		data() {
 			return {
 				operators: [],
-
 			}
 		},
-		onLoad() {
-			uni.request({
-				url: 'http://127.0.0.1:9999/operator/list',
-				method: 'GET',
-				data: {},
-				success: res => {
-
-					this.operators = res.data.data.operators;
-					console.log(res.data.data.operators);
-				},
+		onLoad(e) {
+			this.list(e)
 
+			uni.$on('flush', () => {
+				this.list(e)
 			})
 		},
 
 		methods: {
+			async list(e) {
+				let vm = this;
+				let url = uni.$api.operator.list;
+
+				let res = await uni.$http.get(url);
+				console.log('form发生了submit事件')
+
+				console.log(res);
+
+				this.operators = res.data.data.operators;
+				console.log(res.data.data.operators);
+
+			},
+
 			showDetail(e) {
 				console.log(e);
 				var code = e.currentTarget.dataset.code;

sources/client/vrv-moblie/pages/operator/operatorInfo/operatorInfo.vue

@@ -44,13 +44,15 @@
 						<input placeholder="联系电话" v-model="formData.tel" style="margin-left: 30rpx;" />
 					</view>
 				</view>
+
+				<view class="uni-btn-v">
+					<button class="button1" @tap="del">删除</button>
+					<button class="button2" @tap="edit">修改</button>
+				</view>
 			</form>
 		</view>
 
-		<view class="uni-btn-v">
-			<button form-type="submit" class="button1">删除</button>
-			<button form-type="submit" class="button2">修改</button>
-		</view>
+
 	</view>
 </template>
 
@@ -59,6 +61,7 @@
 		data() {
 			return {
 				formData: {
+					code: '',
 					name: '',
 					number: '',
 					contact: '',
@@ -66,6 +69,7 @@
 					address: '',
 					province: '',
 					city: '',
+					status: ''
 				}
 			}
 		},
@@ -82,8 +86,58 @@
 
 			});
 		},
+
+
 		methods: {
+			async edit(e) {
+				let vm = this;
+				let url = uni.$api.operator.update;
+				let data = {
+					code: this.formData.code,
+					status: 1,
+					name: this.formData.name,
+					number: this.formData.number,
+					contact: this.formData.contact,
+					tel: this.formData.tel,
+					address: this.formData.address,
+					province: this.formData.province,
+					city: this.formData.city,
+
+				};
+				let res = await uni.$http.get(url, data);
+				console.log('form发生了submit事件')
 
+				console.log(res);
+
+			},
+
+
+			async del(e) {
+				let vm = this;
+				let url = uni.$api.operator.delete;
+				let data = {
+					code: this.formData.code,
+				}
+
+				uni.showModal({
+					title: '提示',
+					content: '确认删除此信息？',
+					async success(e) {
+						console.log(e);
+						if (e.confirm) {
+							// 执行确认后的操作
+							let res = await uni.$http.get(url, data)
+							uni.$emit('flush');
+							uni.switchTab({
+								url:'/pages/operator/operator'
+							})
+							
+						} else {
+
+						}
+					},
+				})
+			}
 		}
 	}
 </script>
@@ -119,6 +173,7 @@
 	}
 
 	.uni-btn-v {
+		margin-top: 40rpx;
 		display: flex;
 		flex-direction: row;
 	}

sources/client/vrv-moblie/pages/operatorLog/operatorLog.vue

@@ -8,7 +8,7 @@
 </view>
 		
 			<view class="content">
-				<text>操 作 人：{{item.userReal}}</text>
+				<text>操 作 人：{{item.userRealname}}</text>
 				<text>操作时间：{{item.updateTime}}</text>
 			</view>
 

sources/client/vrv-moblie/pages/parameterSetting/parameterSetting.vue

@@ -146,7 +146,7 @@
 		</view>
 
 		<view class="anniu">
-			<image class="anniu" src="../../static/设备菜单/前往列表@2x.png"></image>
+			<image class="anniu" src="../../static/设备菜单/前往列表@2x.png" @tap="back"></image>
 		</view>
 
 	</view>
@@ -160,7 +160,11 @@
 			}
 		},
 		methods: {
-
+			back() {
+				uni.navigateTo({
+					url: '/pages/device/deviceInfo/deviceInfo'
+				})
+			}
 		}
 	}
 </script>

sources/client/vrv-moblie/pages/power/power.vue

@@ -0,0 +1,77 @@
+<template>
+	<view>
+		<view class="user" v-for="item in powers" :key="item.code">
+			<text class="title">{{item.name}}</text>
+
+			<view class="content">
+				<text>标识：{{item.flag}}</text>
+				<text>类型：{{item.type}}</text>
+				<text>描述：{{item.description}}</text>
+			</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				powers: [],
+			}
+		},
+		onLoad() {
+			uni.request({
+				url: 'http://127.0.0.1:9999/power/list',
+				method: 'GET',
+				data: {},
+				success: res => {
+					this.powers = res.data.data.powers;
+					console.log(res.data.data.powers);
+				},
+
+			})
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.anniu {
+		width: 116rpx;
+		height: 116rpx;
+		float: right;
+		margin-top: 10rpx;
+		margin-right: 4rpx;
+	}
+
+	.user {
+		width: 702rpx;
+		height: 280rpx;
+		background-color: white;
+		margin-top: 30rpx;
+		margin-left: 24rpx;
+		border-radius: 10rpx;
+		padding-top: 30rpx;
+	}
+
+	.content {
+		display: flex;
+		flex-direction: column;
+		margin-top: 30rpx;
+		margin-left: 30rpx;
+		line-height: 55rpx;
+		font-size: 28rpx;
+		color: #444546;
+	}
+
+	.title {
+		font-size: 36rpx;
+		margin-left: 30rpx;
+		color: #282828;
+		font-weight: 600;
+	}
+</style>

sources/client/vrv-moblie/pages/project/project.vue

@@ -26,6 +26,19 @@
 				},
 
 			})
+
+			uni.$on('flush', () => {
+				uni.request({
+					url: 'http://127.0.0.1:9999/project/list',
+					method: 'GET',
+					data: {},
+					success: res => {
+						this.projects = res.data.data.projects;
+						console.log(res.data.data.projects);
+					},
+
+				})
+			})
 		},
 		methods: {
 			showDetail(e) {

sources/client/vrv-moblie/pages/project/projectEdit/projectEdit.vue

@@ -0,0 +1,184 @@
+<template>
+	<view>
+		<view class="form">
+			<form>
+				<view class="uni-form-item">
+					<view class="title">项目名称</view>
+					<view class="input">
+						<input placeholder="运营商名称" v-model="formData.name" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+				<view class="uni-form-item">
+					<view class="title">项目编号</view>
+					<view class="input">
+						<input placeholder="运营商编号" v-model="formData.number" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+				<view class="uni-form-item">
+					<view class="title">关联运营商编号</view>
+					<view class="input">
+						<input placeholder="运营商编号" v-model="formData.operatorNumber" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+				<view class="uni-form-item">
+					<view class="title">省份</view>
+					<view class="input">
+						<input placeholder="省份" v-model="formData.province" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+				<view class="uni-form-item">
+					<view class="title">城市</view>
+					<view class="input">
+						<input placeholder="城市" v-model="formData.city" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+				<view class="uni-form-item">
+					<view class="title">详细地址</view>
+					<view class="input">
+						<input placeholder="详细地址" v-model="formData.address" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+
+				<view class="uni-form-item">
+					<view class="title">客户名称</view>
+					<view class="input">
+						<input placeholder="联系电话" v-model="formData.customer" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+				<view class="uni-form-item">
+					<view class="title">客户电话</view>
+					<view class="input">
+						<input placeholder="联系电话" v-model="formData.customerTel" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+				<view class="uni-form-item">
+					<view class="title">项目描述</view>
+					<view class="input">
+						<input placeholder="联系电话" v-model="formData.description" style="margin-left: 30rpx;" />
+					</view>
+				</view>
+
+				<view class="uni-btn-v">
+					<button class="button2" @tap="edit">修改</button>
+				</view>
+			</form>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				formData: {
+					code: '',
+					name: '',
+					number: '',
+					description: '',
+					customer: '',
+					customerTel: '',
+					address: '',
+					province: '',
+					city: '',
+					operatorCode: '',
+					operatorNumber: ''
+				}
+			}
+		},
+		onLoad(e) {
+			console.log(e);
+			uni.request({
+				url: 'http://127.0.0.1:9999/project/detail?code=' + e.code,
+				method: 'GET',
+				data: {},
+				success: res => {
+					this.formData = res.data.data.project;
+					console.log(this.formData);
+				},
+
+			});
+		},
+
+
+		methods: {
+			async edit(e) {
+				let vm = this;
+				let url = uni.$api.project.update;
+				let data = {
+					code: this.formData.code,
+					name: this.formData.name,
+					number: this.formData.number,
+					customer: this.formData.customer,
+					customerTel: this.formData.customerTel,
+					description: this.formData.description,
+
+					operatorCode: this.formData.operatorCode,
+					operatorNumber: this.formData.operatorNumber,
+					address: this.formData.address,
+					province: this.formData.province,
+					city: this.formData.city,
+
+				};
+				let res = await uni.$http.get(url, data);
+				console.log('form发生了submit事件')
+
+				uni.$emit('flush');
+
+				uni.navigateBack({
+					url: '/pages/projectInfo/projectInfo'
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+	.title {
+		margin-left: 30rpx;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+		font-size: 26rpx;
+	}
+
+	.form {
+		margin-top: 26rpx;
+		padding-top: 10rpx;
+		background-color: white;
+		width: 702rpx;
+		height: 1720rpx;
+		margin-left: 24rpx;
+		border-radius: 10rpx;
+	}
+
+
+	.input {
+		background-color: #F7F8F9;
+		width: 654rpx;
+		margin-left: 24rpx;
+		height: 98rpx;
+		border-radius: 10rpx;
+
+		display: flex;
+		align-items: center;
+	}
+
+	.uni-btn-v {
+		margin-top: 40rpx;
+		display: flex;
+		flex-direction: row;
+	}
+
+
+
+	.button2 {
+		width: 600rpx;
+		height: 76rpx;
+		margin-top: 30rpx;
+		background-color: #007AFF;
+		color: white;
+		font-size: unset;
+	}
+</style>

sources/client/vrv-moblie/pages/project/projectInfo/projectInfo.vue

@@ -40,13 +40,12 @@
 
 			<view class="col">
 				<view class="switch">
-					<switch checked color="#007AFE" @change="switchChange" />
+					<switch :checked="item.useStatus" color="#007AFE" @change="switchChange"/>
 				</view>
 				<view class="list" @tap="showDevice" :data-code="item.code">设备列表 ></view>
 			</view>
 
 
-
 			<text class="title">{{item.number}}</text>
 
 			<view class="content">
@@ -56,8 +55,8 @@
 		</view>
 
 		<view class="uni-btn-v">
-			<button form-type="submit" class="button1">删除项目</button>
-			<button form-type="submit" class="button2">修改项目信息</button>
+			<button form-type="submit" class="button1" @tap="del">删除项目</button>
+			<button form-type="submit" class="button2" @tap="showEdit" :data-code="formData.code">修改项目信息</button>
 		</view>
 
 
@@ -71,6 +70,7 @@
 				gateways: [],
 
 				formData: {
+					code: '',
 					name: '',
 					number: '',
 					description: '',
@@ -79,6 +79,8 @@
 					address: '',
 					province: '',
 					city: '',
+					operatorCode: '',
+					operatorNumber: ''
 				}
 			}
 		},
@@ -106,16 +108,85 @@
 				},
 
 			});
+
+			uni.$on('flush', () => {
+				uni.request({
+					url: 'http://127.0.0.1:9999/project/detail?code=' + e.code,
+					method: 'GET',
+					data: {},
+					success: res => {
+						this.formData = res.data.data.project;
+						console.log(this.formData);
+					},
+
+				});
+
+				uni.request({
+					url: 'http://127.0.0.1:9999/gateway/list?projectCode=' + e.code,
+					method: 'GET',
+					data: {},
+					success: res => {
+						this.gateways = res.data.data.gateways;
+						console.log(this.gateways);
+					},
+
+				});
+			})
 		},
 		methods: {
+			switchChange(e) {
+				console.log(e);
+				var usestatus = e.currentTarget.dataset.usestatus;
+				console.log(usestatus);
+			},
+
+			showEdit(e) {
+				console.log(e);
+				var code = e.currentTarget.dataset.code;
+
+				uni.navigateTo({
+					url: '/pages/project/projectEdit/projectEdit?code=' + code,
+				});
+			},
+
+			async del(e) {
+				let vm = this;
+				let url = uni.$api.project.delete;
+				let data = {
+					code: this.formData.code,
+				}
+
+				uni.showModal({
+					title: '提示',
+					content: '确认删除此信息？',
+					async success(e) {
+						console.log(e);
+						if (e.confirm) {
+							// 执行确认后的操作
+							let res = await uni.$http.get(url, data)
+
+							//让返回的页面刷新
+							uni.$emit('flush');
+
+							uni.switchTab({
+								url: '/pages/project/project'
+							})
+
+						} else {
+
+						}
+					},
+				})
+			},
+
 			showDevice(e) {
 				console.log(e);
 				var code = e.currentTarget.dataset.code;
-				
+
 				uni.navigateTo({
 					url: '/pages/device/device?code=' + code,
 				});
-				
+
 			}
 		}
 	}

sources/client/vrv-moblie/pages/rolePower/rolePower.vue

@@ -1,26 +1,11 @@
 <template>
 	<view>
-		<view class="user" v-for="item in rolePowers" :key="item.code">
-
-			<view class="all">
-				<view class="img">
-					<image class="image" src="../../static/权限管理/管理员@2x.png"></image>
-				</view>
-
-				<view class="text">
-					<text class="title">{{item.roleFlag}}</text>
-
-					<view class="content">
-						<text>角色权限：{{item.powerFlag}}</text>
-					</view>
-				</view>
-
-			</view>
-
-
+		<view class="systemSet" @tap="showPower" v-for="item in roles" :key="item.code" :data-flag="item.flag">
+			<image class="image1" src="../../static/权限管理/管理员@2x.png"></image>
+			<text style="margin-top: 40rpx;margin-left: 30rpx; width: 500rpx;">{{item.name}}</text>
+			<image class="image2" src="../../static/运营商管理/ico2@3x.png"></image>
 		</view>
 
-
 	</view>
 </template>
 
@@ -28,75 +13,68 @@
 	export default {
 		data() {
 			return {
-				rolePowers: [],
+				roles: [],
 			}
 		},
 		onLoad() {
 			uni.request({
-				url: 'http://127.0.0.1:9999/rolePower/list',
+				url: 'http://127.0.0.1:9999/role/list',
 				method: 'GET',
 				data: {},
 				success: res => {
-
-					this.rolePowers = res.data.data.rolePowers;
-					console.log(res.data.data.rolePowers);
+					this.roles = res.data.data.roles;
+					console.log(res.data.data.roles);
 				},
 
 			})
 		},
 		methods: {
+			showPower(e) {
+				var flag = e.currentTarget.dataset.flag;
 
+				uni.navigateTo({
+					url: '/pages/roleShowPower/roleShowPower?flag=' + flag,
+				})
+			}
 		}
 	}
 </script>
 
 <style>
-	.text {
-		margin-top: 24rpx;
-	}
-
-	.all {
+	.systemSet {
 		display: flex;
 		flex-direction: row;
-	}
-
-	.image {
-		margin-left: 24rpx;
+		height: 125rpx;
+		background-color: white;
 		margin-top: 30rpx;
-		width: 100rpx;
-		height: 100rpx;
-	}
-
-	.anniu {
-		width: 116rpx;
-		height: 116rpx;
-		float: right;
-		margin-top: 10rpx;
-		margin-right: 4rpx;
+		width: 704rpx;
+		margin-left: 23rpx;
+		border-radius: 10rpx;
 	}
 
-	.user {
-		width: 702rpx;
-		height: 207rpx;
+	.rolePower {
+		display: flex;
+		flex-direction: row;
+		height: 125rpx;
 		background-color: white;
 		margin-top: 30rpx;
-		margin-left: 24rpx;
+		width: 704rpx;
+		margin-left: 23rpx;
 		border-radius: 10rpx;
-		padding-top: 30rpx;
 	}
 
-	.content {
-
+	.image1 {
+		width: 90rpx;
+		height: 90rpx;
 		margin-top: 20rpx;
-		margin-left: 30rpx;
-		font-size: 28rpx;
-		color: #444546;
+		margin-left: 20rpx;
 	}
 
-	.title {
-		font-size: 36rpx;
-		margin-left: 30rpx;
-		color: #282828;
-		font-weight: 600;
+	.image2 {
+		width: 10px;
+		height: 10px;
+		margin-top: 50rpx;
+		// margin-left: 400rpx;
+
 	}
 </style>

sources/client/vrv-moblie/pages/roleShowPower/roleShowPower.vue

@@ -0,0 +1,104 @@
+<template>
+	<view>
+
+		<view class="user" v-for="item in rolePowers" :key="item.code">
+			<view class="img">
+				<image src="../../static/权限管理/管理员@2x.png" class="image"></image>
+			</view>
+
+			<view class="hang">
+				<text class="title">角色：{{item.roleFlag}}</text>
+
+				<view class="content">
+					<text>角色权限：{{item.powerFlag}}&nbsp;</text>
+				</view>
+			</view>
+
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				rolePowers: [],
+			}
+		},
+
+		onLoad(e) {
+			console.log(e.flag);
+			uni.request({
+				url: 'http://127.0.0.1:9999/rolePower/list?roleFlag=' + e.flag,
+				method: 'GET',
+				data: {},
+				success: res => {
+					this.rolePowers = res.data.data.rolePowers;
+					console.log(res);
+				},
+
+			});
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.img{
+		margin-top: 20rpx;
+	}
+	.image {
+		margin-top: 40rpx;
+		width: 90rpx;
+		height: 90rpx;
+		margin-top: 20rpx;
+		margin-left: 20rpx;
+	}
+
+	.anniu {
+		width: 116rpx;
+		height: 116rpx;
+		float: right;
+		margin-top: 10rpx;
+		margin-right: 4rpx;
+	}
+
+	.user {
+		width: 702rpx;
+		height: 210rpx;
+		background-color: white;
+		margin-top: 30rpx;
+		margin-left: 24rpx;
+		border-radius: 10rpx;
+		padding-top: 30rpx;
+		display: flex;
+		flex-direction: row;
+	}
+
+	.hang {
+		margin-top: 30rpx;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.content {
+		display: flex;
+		flex-direction: column;
+		margin-top: 30rpx;
+		margin-left: 30rpx;
+		line-height: 55rpx;
+		font-size: 28rpx;
+		color: #444546;
+	}
+
+	.title {
+		font-size: 36rpx;
+		margin-left: 30rpx;
+		color: #282828;
+		font-weight: 600;
+	}
+</style>

sources/client/vrv-moblie/pages/runningState/runningState.vue

@@ -125,7 +125,7 @@
 			<button class="button">停止按钮</button>
 		</view>
 
-		<view class="anniu">
+		<view class="anniu" @tap="back">
 			<image class="anniu" src="../../static/设备菜单/前往列表@2x.png"></image>
 		</view>
 
@@ -140,7 +140,11 @@
 			}
 		},
 		methods: {
-
+			back() {
+				uni.navigateTo({
+					url: '/pages/device/deviceInfo/deviceInfo'
+				})
+			}
 		}
 	}
 </script>

sources/client/vrv-moblie/pages/systemParameter/systemParameter.vue

@@ -96,7 +96,7 @@
 			</view>
 
 			<view class="anniu">
-				<image class="anniu" src="../../static/设备菜单/前往列表@2x.png"></image>
+				<image class="anniu" src="../../static/设备菜单/前往列表@2x.png" @tap="back"></image>
 			</view>
 
 
@@ -117,7 +117,11 @@
 			}
 		},
 		methods: {
-
+			back() {
+				uni.navigateTo({
+					url: '/pages/device/deviceInfo/deviceInfo'
+				})
+			}
 		}
 	}
 </script>

sources/client/vrv-moblie/pages/systemSet/systemSet.vue

@@ -2,13 +2,19 @@
 	<view>
 		<view class="systemSet" @tap="showUser">
 			<image class="image1" src="../../static/系统设置/系统设置@2x.png"></image>
-			<text style="margin-top: 40rpx;margin-left: 30rpx; width: 500rpx;">系统管理员账号管理</text>
+			<text style="margin-top: 40rpx;margin-left: 30rpx; width: 500rpx;">用户管理</text>
 			<image class="image2" src="../../static/运营商管理/ico2@3x.png"></image>
 		</view>
 
-		<view class="rolePower" @tap="showRolePower">
+		<view class="rolePower" @tap="showRole">
 			<image class="image1" src="../../static/系统设置/系统设置@2x.png"></image>
-			<text style="margin-top: 40rpx;margin-left: 30rpx; width: 500rpx;">角色与权限管理</text>
+			<text style="margin-top: 40rpx;margin-left: 30rpx; width: 500rpx;">角色管理</text>
+			<image class="image2" src="../../static/运营商管理/ico2@3x.png"></image>
+		</view>
+		
+		<view class="rolePower" @tap="showPower">
+			<image class="image1" src="../../static/系统设置/系统设置@2x.png"></image>
+			<text style="margin-top: 40rpx;margin-left: 30rpx; width: 500rpx;">权限管理</text>
 			<image class="image2" src="../../static/运营商管理/ico2@3x.png"></image>
 		</view>
 	</view>
@@ -29,10 +35,17 @@
 				});
 			},
 
-			showRolePower() {
+			showRole() {
 				uni.navigateTo({
 					url: '/pages/rolePower/rolePower',
 
+				});
+			},
+			
+			showPower() {
+				uni.navigateTo({
+					url: '/pages/power/power',
+			
 				});
 			}
 		}

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/app.json

@@ -18,8 +18,11 @@
     "pages/maintenanceRecord/maintenanceRecord",
     "pages/user/user",
     "pages/rolePower/rolePower",
+    "pages/roleShowPower/roleShowPower",
     "pages/runningState/runningState",
-    "pages/dataCurve/dataCurve"
+    "pages/dataCurve/dataCurve",
+    "pages/power/power",
+    "pages/project/projectEdit/projectEdit"
   ],
   "subPackages": [],
   "window": {

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/alarm/alarm.wxml

@@ -1 +1 @@
-<view><block wx:for="{{deviceAlarmRecords}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="alarm"><text class="title">{{item.alarmName}}</text><view class="content"><text>地       区：</text><text>客户名称：</text><text>{{"报警类型："+item.alarmType}}</text><text>{{"报警时间："+item.startTime}}</text></view></view></block></view>
+<view><block wx:for="{{deviceAlarmRecords}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="alarm"><text class="title">{{item.alarmName}}</text><view class="content"><text>地       区：</text><text>客户名称：</text><text>{{"报警类型："+item.alarmType}}</text><text>{{"报警时间："+item.createTime}}</text></view></view></block></view>

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/operator/operatorInfo/operatorInfo.wxss

@@ -25,6 +25,7 @@
 	align-items: center;
 }
 .uni-btn-v {
+	margin-top: 40rpx;
 	display: flex;
 	flex-direction: row;
 }

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/operatorLog/operatorLog.wxml

@@ -1 +1 @@
-<view><block wx:for="{{operatorLogs}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="log"><view class="oper"><text class="title">{{"操作内容："+item.content}}</text></view><view class="content"><text>{{"操 作 人："+item.userReal}}</text><text>{{"操作时间："+item.updateTime}}</text></view></view></block></view>
+<view><block wx:for="{{operatorLogs}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="log"><view class="oper"><text class="title">{{"操作内容："+item.content}}</text></view><view class="content"><text>{{"操 作 人："+item.userRealname}}</text><text>{{"操作时间："+item.updateTime}}</text></view></view></block></view>

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/power/power.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "权限管理",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/power/power.wxml

@@ -0,0 +1 @@
+<view><block wx:for="{{powers}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="user"><text class="title">{{item.name}}</text><view class="content"><text>{{"标识："+item.flag}}</text><text>{{"类型："+item.type}}</text><text>{{"描述："+item.description}}</text></view></view></block></view>

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/power/power.wxss

@@ -0,0 +1,33 @@
+
+.anniu {
+	width: 116rpx;
+	height: 116rpx;
+	float: right;
+	margin-top: 10rpx;
+	margin-right: 4rpx;
+}
+.user {
+	width: 702rpx;
+	height: 280rpx;
+	background-color: white;
+	margin-top: 30rpx;
+	margin-left: 24rpx;
+	border-radius: 10rpx;
+	padding-top: 30rpx;
+}
+.content {
+	display: flex;
+	flex-direction: column;
+	margin-top: 30rpx;
+	margin-left: 30rpx;
+	line-height: 55rpx;
+	font-size: 28rpx;
+	color: #444546;
+}
+.title {
+	font-size: 36rpx;
+	margin-left: 30rpx;
+	color: #282828;
+	font-weight: 600;
+}
+

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/project/projectEdit/projectEdit.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "修改用户",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/project/projectEdit/projectEdit.wxss

@@ -0,0 +1,40 @@
+
+.title {
+	margin-left: 30rpx;
+	margin-top: 20rpx;
+	margin-bottom: 20rpx;
+	font-size: 26rpx;
+}
+.form {
+	margin-top: 26rpx;
+	padding-top: 10rpx;
+	background-color: white;
+	width: 702rpx;
+	height: 1720rpx;
+	margin-left: 24rpx;
+	border-radius: 10rpx;
+}
+.input {
+	background-color: #F7F8F9;
+	width: 654rpx;
+	margin-left: 24rpx;
+	height: 98rpx;
+	border-radius: 10rpx;
+
+	display: flex;
+	align-items: center;
+}
+.uni-btn-v {
+	margin-top: 40rpx;
+	display: flex;
+	flex-direction: row;
+}
+.button2 {
+	width: 600rpx;
+	height: 76rpx;
+	margin-top: 30rpx;
+	background-color: #007AFF;
+	color: white;
+	font-size: unset;
+}
+

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/rolePower/rolePower.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "角色与权限管理",
+  "navigationBarTitleText": "角色管理",
   "enablePullDownRefresh": false,
   "usingComponents": {}
 }

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/rolePower/rolePower.wxml

@@ -1 +1 @@
-<view><block wx:for="{{rolePowers}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="user"><view class="all"><view class="img"><image class="image" src="../../static/权限管理/管理员@2x.png"></image></view><view class="text"><text class="title">{{item.roleFlag}}</text><view class="content"><text>{{"角色权限："+item.powerFlag}}</text></view></view></view></view></block></view>
+<view><block wx:for="{{roles}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="systemSet" data-flag="{{item.flag}}" data-event-opts="{{[['tap',[['showPower',['$event']]]]]}}" bindtap="__e"><image class="image1" src="../../static/权限管理/管理员@2x.png"></image><text style="margin-top:40rpx;margin-left:30rpx;width:500rpx;">{{item.name}}</text><image class="image2" src="../../static/运营商管理/ico2@3x.png"></image></view></block></view>

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/rolePower/rolePower.wxss

@@ -1,44 +1,34 @@
 
-.text {
-	margin-top: 24rpx;
-}
-.all {
+.systemSet {
 	display: flex;
 	flex-direction: row;
-}
-.image {
-	margin-left: 24rpx;
+	height: 125rpx;
+	background-color: white;
 	margin-top: 30rpx;
-	width: 100rpx;
-	height: 100rpx;
-}
-.anniu {
-	width: 116rpx;
-	height: 116rpx;
-	float: right;
-	margin-top: 10rpx;
-	margin-right: 4rpx;
+	width: 704rpx;
+	margin-left: 23rpx;
+	border-radius: 10rpx;
 }
-.user {
-	width: 702rpx;
-	height: 207rpx;
+.rolePower {
+	display: flex;
+	flex-direction: row;
+	height: 125rpx;
 	background-color: white;
 	margin-top: 30rpx;
-	margin-left: 24rpx;
+	width: 704rpx;
+	margin-left: 23rpx;
 	border-radius: 10rpx;
-	padding-top: 30rpx;
 }
-.content {
-
+.image1 {
+	width: 90rpx;
+	height: 90rpx;
 	margin-top: 20rpx;
-	margin-left: 30rpx;
-	font-size: 28rpx;
-	color: #444546;
+	margin-left: 20rpx;
 }
-.title {
-	font-size: 36rpx;
-	margin-left: 30rpx;
-	color: #282828;
-	font-weight: 600;
+.image2 {
+	width: 10px;
+	height: 10px;
+	margin-top: 50rpx;
+	/* margin-left: 400rpx; */
 }
 

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/roleShowPower/roleShowPower.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "角色权限管理",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/roleShowPower/roleShowPower.wxml

@@ -0,0 +1 @@
+<view><block wx:for="{{rolePowers}}" wx:for-item="item" wx:for-index="__i0__" wx:key="code"><view class="user"><view class="img"><image class="image" src="../../static/权限管理/管理员@2x.png"></image></view><view class="hang"><text class="title">{{"角色："+item.roleFlag}}</text><view class="content"><text>{{"角色权限："+item.powerFlag+''}}</text></view></view></view></block></view>

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/roleShowPower/roleShowPower.wxss

@@ -0,0 +1,50 @@
+
+.img{
+	margin-top: 20rpx;
+}
+.image {
+	margin-top: 40rpx;
+	width: 90rpx;
+	height: 90rpx;
+	margin-top: 20rpx;
+	margin-left: 20rpx;
+}
+.anniu {
+	width: 116rpx;
+	height: 116rpx;
+	float: right;
+	margin-top: 10rpx;
+	margin-right: 4rpx;
+}
+.user {
+	width: 702rpx;
+	height: 210rpx;
+	background-color: white;
+	margin-top: 30rpx;
+	margin-left: 24rpx;
+	border-radius: 10rpx;
+	padding-top: 30rpx;
+	display: flex;
+	flex-direction: row;
+}
+.hang {
+	margin-top: 30rpx;
+	display: flex;
+	flex-direction: column;
+}
+.content {
+	display: flex;
+	flex-direction: column;
+	margin-top: 30rpx;
+	margin-left: 30rpx;
+	line-height: 55rpx;
+	font-size: 28rpx;
+	color: #444546;
+}
+.title {
+	font-size: 36rpx;
+	margin-left: 30rpx;
+	color: #282828;
+	font-weight: 600;
+}
+