数据对接

common/common.scss

@@ -351,7 +351,31 @@ radio,checkbox {
 	
 	
 	
-	// 权限新增
+	// 权限新增
+	
+	.perAppWrapper{
+		input,
+		select,
+		option {
+			line-height: 70rpx;
+			padding: 0 20rpx;
+			height: 70rpx;
+			border: 1px solid #EDEDED;
+			// width:500rpx!important;
+			background-color: #fff;
+			box-sizing: border-box;
+			appearance: none;
+			-moz-appearance: none;
+			-webkit-appearance: none;
+			color: #999;
+		
+		}
+		
+		.form-item .title {
+			width: 170rpx
+		}
+		
+	}
 	.siteItems{
 		z-index:999;
 		position:absolute;
@@ -813,4 +837,5 @@ radio,checkbox {
 	}
     // 导出页面样式end
 	
+	
 	

pages/accountManage/accountManage.vue

@@ -1,151 +1,42 @@
 <template>
-	<view class="padding" style="height:calc(100vh - 240rpx);overflow:auto;">
-		<table>
-			<tr>
-				<th>人员名称</th>
-				<th>联系方式</th>
-				<th>所在单位</th>
-				<th>角色权限</th>
-			</tr>
-			<tr>
-				<td>张三</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>李四</td>
-				<td>13262908433</td>
-				<td>上海永天科技</td>
-				<td>普通员工</td>
-			</tr>
-			<tr>
-				<td>王五</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
+	<view class="padding">
+		<view style="width:100%;overflow:auto;    height: calc(100vh - 156px);" >
+			<!-- <table style="width:200%;text-align:center" >
+				<tr>
+					<th>人员名称</th>
+					<th>联系方式</th>
+					<th>所在单位</th>
+					<th>角色权限</th>
+				</tr>
+				<tr v-for="(item,index) in getData" :key="index">
+					<td>{{item.username}}</td>
+					<td>{{item.phone}}</td>
+					<td>{{item.owner_name}}</td>
+					<td>{{item.statusid}}</td>
+				</tr>
+			</table>	 -->
 			
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
 			
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
+			<uni-table border stripe emptyText="暂无更多数据" >
+			    <!-- 表头行 -->
+			    <uni-tr>
+			        <uni-th align="center">人员名称</uni-th>
+			        <uni-th align="center">联系方式</uni-th>
+			        <uni-th align="center">所在单位</uni-th>
+					 <uni-th align="center" width="100">角色权限</uni-th>
+			    </uni-tr>
+			    <!-- 表格数据行 -->
+			    <uni-tr v-for="(item,index) in getData" :key="index">
+			        <uni-td align="center">{{item.username}}</uni-td>
+			        <uni-td align="center">{{item.phone}}</uni-td>
+			        <uni-td align="center">{{item.owner_name}}</uni-td>
+					<uni-td align="center">{{item.statusid}}</uni-td>
+			    </uni-tr>
 			
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			<tr>
-				<td>赵六</td>
-				<td>13262908433</td>
-				<td>虹泾总部园</td>
-				<td>管理员</td>
-			</tr>
-			
-		</table>
+			</uni-table>
+
+		</view>
+		
 		
 		
 		<view class="btn-area submitBottomBtn padding-lr-sm">
@@ -159,10 +50,27 @@
 	export default {
 		data() {
 			return {
-				
+				getData:[]
 			}
 		},
+		onLoad:function(option){
+			this.getDataList({'company_code':uni.getStorageSync('selectedCode')})
+		},
 		methods: {
+			
+			
+			// 维保计划列表数据请求
+			async getDataList(params = {}) {
+				const res = await this.$myRequest({
+					url: 'PermissionBinding/getPermissionBindingList',
+					data:params,
+					showLoading: true
+				})
+				this.getData=res.data.data;
+		
+				console.log(this.getData)
+			},
+			
 			goAddPer() {
 				uni.navigateTo({
 					url: '/pages/accountManage/perAdd/perAdd',

pages/accountManage/perAdd/perAdd.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="appWrapper">
+	<view class="perAppWrapper">
 
 		<form action="">
 			<view style="height:30rpx"></view>
@@ -8,35 +8,41 @@
 					<text class="necessary">*</text>
 					联系方式:
 				</view>
-				<input name="input" v-model="formMess.deviceNo"></input>
+				<select name="" id="" v-model="formMess.phone">
+					<option value="0">请选择</option>
+					<option :value="item.phone" v-for="(item,index) in phoneListData" :key="index">{{item.phone}}
+					</option>
+				</select>
 			</view>
 			<view class="form-item">
-				<view class="title">姓名:</view>
-				<input name="input" v-model="formMess.deviceName"></input>
+				<view class="title"><text class="necessary">*</text>姓名:</view>
+				<input name="input" v-model="formMess.name"></input>
 			</view>
 
 			<view class="form-item">
-				<view class="title">所在单位:</view>
-				<select name="" id="">
-					<option value="">虹泾总部园</option>
-					<option value="">单位二</option>
-					<option value="">单位三</option>
+				<view class="title">
+					<text class="necessary">*</text>
+					所在单位:
+				</view>
+				<select name="" id="" v-model="formMess.company_code">
+					<option value="0">请选择</option>
+					<option :value="item.owner_code" v-for="(item,index) in companyListData" :key="index"
+						style="width:80%">{{item.owner_name}}</option>
 				</select>
 			</view>
 
 			<view class="form-item">
-				<view class="title">角色权限:</view>
-				<radio-group name="gender">
+				<view class="title"><text class="necessary">*</text>角色权限:</view>
+				<radio-group name="gender" @change="radioChange">
 					<label class="margin-right">
-						<radio value="管理员" checked /><text>管理员</text>
+						<radio value="1" checked /><text>管理员</text>
 					</label>
 					<label>
-						<radio value="普通员工" /><text>普通员工</text>
+						<radio value="2" /><text>普通员工</text>
 					</label>
 				</radio-group>
 			</view>
 
-
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="submit()">提 交 </button>
 			</view>
@@ -47,104 +53,103 @@
 </template>
 
 <script>
-	var graceChecker = require("../../../common/graceChecker.js");
-	// import add from '../../common/select.js';
 	export default {
-
 		data() {
 			return {
-				index: -1,
-				picker: ['楼层一', '楼层二', '楼层三'],
-				type: '0',
-
-				isShow: false,
+				companyListData: [],
+				phoneListData: [],
 				formMess: {
-					"userName": "sss",
-					"siteName": "",
-					"place": "",
-					"longitude": "",
-					"dimension": "",
-					"contactor": "",
-					"mobile": "",
+					"phone": 0,
+					"company_code": 0,
+					"radioOne": "1",
+					"power": "",
 				},
 
-				// 站点多选下拉
-				siteItemData: ["站点一", "站点二", "站点三", "站点四", "站点五", "站点六"],
-				newDataList: ["站点一", "站点二", "站点三", "站点四", "站点五", "站点六"],
-
-				selectedData: [],
-				// 站点多选下拉 end
-
 
 			}
 		},
 		onLoad: function(option) {
+			this.getSiteList();
+			this.getPhoneList()
 
 		},
 		methods: {
-			submit() {
-				uni.navigateTo({
-					url: '/pages/accountManage/success/success',
-					
-				});
-			},
-			add: function(item, index) {
-				this.selectedData.push(item);
-				this.newDataList.splice(index, 1);
-				this.isShow = false;
-				this.formMess.siteName = ''
-			},
-			deleteItem: function(item, index) {
-				// this.selectedData.remove(item);
-				this.selectedDaxta.splice(index, 1);
-				this.newDataList.push(item);
-
+			async submit() {
+				//提交验证
+				if (!this.formMess.phone) {
+					uni.showToast({
+						title: "请输入联系方式",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.formMess.name) {
+					uni.showToast({
+						title: "请输入姓名",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.formMess.company_code) {
+					uni.showToast({
+						title: "请选择所在单位",
+						icon: "none"
+					});
+					return
+				}
+				let res = await this.addAuthority({
+					"phone": this.formMess.phone,
+					"name": this.formMess.name,
+					"power": this.formMess.radioOne,
+					"company_code": this.formMess.company_code
+				})
+
+				if (!res.data.flag) {
+					uni.showToast({
+						title: "添加失败",
+						icon: "none"
+					});
+				} else {
+					uni.showToast({
+						title: "添加成功",
+					});
+					setTimeout(() => {
+						uni.navigateTo({
+							url: '/pages/accountManage/success/success',
+						});
+					}, 1000);
+				}
 
 			},
 
-			// 站点多选下拉
-			test: function() {
-				this.isShow = !this.isShow;
+			//手机号码下拉请求数据
+			async getPhoneList() {
+				const res = await this.$myRequest({
+					url: 'PermissionBinding/getphoneList',
+				})
+				this.phoneListData = res.data.data;
 			},
-			test2: function() {
-				this.isShow = false;
+			//单位下拉请求数据
+			async getSiteList() {
+				const res = await this.$myRequest({
+					url: 'Index/getCompanyList',
+				})
+				this.companyListData = res.data.data;
 			},
-			handleInput() {
-				// var newlist = this.siteItemData.filter(item => item.indexOf(this.formMess.siteName) > -1)
-				// this.newDataList = newlist;
-				// console.log(this.newDataList)
+
+			radioChange(e) {
+				console.log('type:' + e.detail.value);
+				this.radioOne = e.detail.value;
 			},
-			// 站点多选下拉 end
 
+			addAuthority(params = {}) {
+				return this.$myRequest({
+					url: 'PermissionBinding/setPermissionBinding',
+					data: params
+				})
+			},
 
 
-			formSubmit: function(e) {
-				console.log('form发生了submit事件，携带数据为：' + JSON.stringify(e.detail.value))
-				//定义表单规则
-				var rule = [{
-						name: "userName",
-						checkType: "string",
-						checkRule: "1,3",
-						errorMsg: "姓名应为1-3个字符..."
-					},
-					// {name:"gender", checkType : "in", checkRule:"男,女",  errorMsg:"请选择性别"},
-					// {name:"loves", checkType : "notnull", checkRule:"",  errorMsg:"请选择爱好"}
-				];
-				//进行表单检查
-				var formData = e.detail.value;
-				var checkRes = graceChecker.check(formData, rule);
-				if (checkRes) {
-					uni.showToast({
-						title: "验证通过!",
-						icon: "none"
-					});
-				} else {
-					uni.showToast({
-						title: graceChecker.error,
-						icon: "none"
-					});
-				}
-			},
 			formReset: function(e) {
 				console.log('清空数据')
 			}
@@ -161,177 +166,5 @@
 
 
 <style lang="scss">
-	.cu-form-group {
-		border-top: 0;
-
-	}
-
-	input,
-	select,
-	option {
-		line-height: 70rpx;
-		padding: 0 20rpx;
-		height: 70rpx;
-		border: 1px solid #EDEDED;
-		// width:500rpx!important;
-		background-color: #fff;
-		box-sizing: border-box;
-		appearance: none;
-		-moz-appearance: none;
-		-webkit-appearance: none;
-		color: #999;
-
-
-	}
-
-	select:focus,
-	select:active,
-	select:hover {
-		outline: none;
-	}
-
-	select {
-		background: url(../../../static/arrow.png) no-repeat scroll 98% center;
-		background-size: 6%;
-	}
-
-	.form-item label text {
-		position: relative;
-		top: 2rpx
-	}
-
-	.form-item {
-		padding: 0 40rpx;
-		display: flex;
-		align-items: top;
-		margin-bottom: 20rpx;
-
-
-		.title {
-			width: 170rpx;
-			position: relative;
-
-			.necessary {
-				color: red;
-				display: inline-block;
-				position: absolute;
-				top: -2rpx;
-				left: -20rpx;
-				font-size: 40rpx;
-
-			}
-		}
-
-		input,
-		select {
-			width: 500rpx;
-			font-size: 28rpx;
-		}
-
-
-	}
-
-
-
-
-
-	/* 站点多选下拉样式 start */
-
-	.layui-btn {
-		background-color: #5fb878;
-	}
-
-	a {
-		text-decoration: none;
-	}
-
-	.label {
-		padding: 2px 0px;
-		background: #aaa;
-		border-radius: 2px;
-		color: #fff;
-		display: block;
-		line-height: 20px;
-		height: 20px;
-		margin: 2px 5px 2px 0;
-		float: left;
-	}
-
-	.label span {
-		padding: 0 5px;
-		color: #fff;
-	}
-
-	.close {
-		padding: 1px 5px !important;
-	}
-
-	.close:hover {
-		/* background-color: #009E94;
-	    border-radius: 2px;
-	    color: tomato; */
-	}
-
-	.selectId input {
-		width: 100% !important;
-	}
-
-	.selectId input {
-		height: 25px;
-		padding: 1px 5px;
-		border-radius: 3px;
-		width: calc(100% - 12px);
-		outline-color: #5fb878;
-		border: 1px solid #5fb878;
-	}
-
-	.selectId {
-		position: relative;
-	}
-
-	.selectId dl {
-		border: 1px solid #eee;
-		border-radius: 3px;
-		margin: 2px 0px;
-		max-height: 300px;
-		overflow-x: hidden;
-		white-space: nowrap;
-		position: absolute;
-		width: 100%;
-		top: 40px;
-		background: #fff;
-		z-index: 1000
-	}
-
-	.selectId dl dd {
-		margin: 0;
-		padding: 5px 10px;
-	}
-
-	.selectId dl dd:hover {
-		background-color: #5FB878;
-		color: white;
-	}
-
-	.AD {
-		/* width: 210px;
-	        margin-left: 40px; */
-		overflow-y: auto;
-		max-height: 200px;
-		/* border: 2px solid #5fb878;
-	        border-radius: 6px;
-	        padding: 1px 2px; */
-	}
-
-	form .AD span {
-		width: auto;
-	}
-
-	.siteSelect {
-		width: 71%;
-		display: inline-block;
-	}
-
-
-	/* 站点多选下拉样式end */
+	
 </style>

pages/accountManage/success/success.vue

@@ -9,7 +9,7 @@
 				<view>提交成功</view>
 			</view>
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="submit()">返 回 </button>
+				<button class="bg-blue round  margin-top" @click="back()">返 回 </button>
 			</view>
 	
 
@@ -32,6 +32,28 @@
 		},
 		methods: {
 			
+			back() {
+				alert(1)
+							/*uni.navigateBack({
+								delta: 1
+							})*/
+							//@zxyuns 处理兼容，如果没有上一级界面则返回首页
+							const pages = getCurrentPages();
+							if (pages.length === 3) {
+								uni.navigateBack({
+									delta: 2
+								});
+							} else if (pages.length === 1) {
+								uni.switchTab({
+									url: '/pages/home/home',
+								})
+							} else {
+								uni.navigateBack({
+									delta: 2
+								});
+							}
+						},
+			
 
 
 

pages/info/fireBashDetail/fireBashDetail.vue

@@ -11,29 +11,15 @@
 		</view>
 
 		<view class="fireD-content margin-top padding-top-xs">
-
 			<view class="">
-				
-				<img src="../../../static/fireD-img.png" alt="" style="max-width:100%">
-
-				<view style="text-indent:58rpx">
-					&nbsp;第一决：熟悉环境，暗记出口。当你来到酒店，卡拉OK厅，务必留心疏散通道、安全出口及楼梯方位等，等大火燃起、浓烟密布时，便可以摸清道路，尽快逃离现场。</view>
-				<view style="text-indent:58rpx">第二决：通道出口畅通无阻。楼梯、通道、安全出口等是火灾发生时最重要的逃生支路，应保证畅通无阻，切不可堆放杂物或设闸上锁。且自断后路，必死无疑。
-				</view>
-				<view style="text-indent:58rpx">第三决：保持镇静，快速撤离。突遇火灾，面对浓烟和烈火，千万不要盲目的跟从人流相互拥挤、乱冲乱撞。
-					首先要保持镇静，判明起火地点，多地脑筋，因地制宜， 因时制宜，决定逃生的办法。</view>
-				<view style="text-indent:58rpx">第四决：不入险地、不贪财物、生命是最重要的。不要因为害羞及顾及贵重物品，而把宝贵的逃生时间浪费在
-					穿衣或寻找贵重物品上。据报载：在一次特大火灾中，人们发现有三名遇难者手中抓着存折或首饰。</view>
-				<view style="text-indent:58rpx">
-					第五决：简易防护，不可缺少。逃生时可用毛巾、口罩等蒙住口鼻，将被褥浇湿蒙在身上通过烟火区。烟气较空气轻而飘上部，匍匐前进，贴近地面逃离是较佳的办法。</view>
-				<view style="text-indent:58rpx">第六决：莫乘电梯。发生火灾后，电气设备随时可能发生短路，造成停电。一定不要乘坐电梯。要走楼梯或紧急疏散通道。</view>
+				<view v-html="this.getData.content"></view>
 			</view>
 		</view>
 
-		<view class="preAndNext">
+		<view class="preAndNext" style="display:none">
 			<view class="flex align-top">
 				<view style="width:120rpx">上一篇：</view>
-				<view style="width:calc(100% - 120rpx)" >火灾逃生十大要诀</view>
+				<view style="width:calc(100% - 120rpx)">火灾逃生十大要诀</view>
 			</view>
 			<view class="flex align-top">
 				<view style="width:120rpx">下一篇：</view>
@@ -62,36 +48,39 @@
 	export default {
 		data() {
 			return {
-				praise:false,
-				zan:false,
-				getData:{}
+				praise: false,
+				zan: false,
+				getData: {}
 			}
 		},
-		
-		onLoad:function(option){
-			this.getFireBaseDetail({'company_code':uni.getStorageSync('selectedCode'),"id":option.id})
+
+		onLoad: function(option) {
+			this.getFireBaseDetail({
+				'company_code': uni.getStorageSync('selectedCode'),
+				"id": option.id
+			})
 		},
-		
+
 		methods: {
-			
+
 			// 详情页数据请求
 			async getFireBaseDetail(params = {}) {
 				const res = await this.$myRequest({
 					url: 'KnowledgeBase/getKnowledgeBaseDetails',
-					data:params,
+					data: params,
 					showLoading: true
 				})
-				this.getData=res.data.data[0];
+				this.getData = res.data.data[0];
 				console.log(this.getData)
 			},
-			
-			
+
+
 			clickPraise() {
-		
+
 				this.praise = !this.praise;
 			},
 			clickZan() {
-		
+
 				this.zan = !this.zan;
 			},
 

pages/weiBao/plan/plan.vue

@@ -1,7 +1,6 @@
 <template>
 	<view>
 		<!-- <view style="height:30rpx"></view> -->
-	
 
 		<view class=" bg-white plan-sec">
 			

pages/weiBao/planDetail/planDetail.vue

@@ -1,9 +1,7 @@
 <template>
 	<view>
-
 		<form action="">
 			<view style='height:30rpx'></view>
-
 			<view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
@@ -11,7 +9,6 @@
 				</view>
 				<input type="text" v-model="reportName">
 			</view>
-
 			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
@@ -31,35 +28,17 @@
 						<radio value="3" /><text>其他</text>
 					</label>
 				</radio-group>
-
 			</view>
-
 			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
 					上传图片：
 				</view>
-
 				<view style="width:500rpx">
 					<view ref="input" class="input">
 					</view>
-					<!-- <view class="cu-form-group">
-						<view class="grid col-4 grid-square flex-sub">
-							<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"
-								:data-url="imgList[index]">
-								<image :src="imgList[index]" mode="aspectFill"></image>
-								<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
-									<text class='cuIcon-close'></text>
-								</view>
-							</view>
-							<view class="solids" @tap="ChooseImage" v-if="imgList.length<4">
-								<text class='cuIcon-cameraadd'></text>
-							</view>
-						</view>
-					</view> -->
 				</view>
 			</view>
-
 			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
@@ -71,10 +50,7 @@
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
 			</view>
-
 		</form>
-
-
 	</view>
 </template>
 
@@ -87,8 +63,7 @@
 				id: '',
 				reportName: '',
 				radioOne: 0,
-				zb_id:0
-
+				zb_id:''
 			}
 		},
 
@@ -128,7 +103,6 @@
 						console.log(this.img)
 					},
 					fail: (err) => {
-
 						console.log(err)
 					}
 				});
@@ -156,22 +130,18 @@
 					});
 					return
 				}
-
-
 				this.powerSubmitRes({
 					"zb_id": this.zb_id,
-					// "zb_id":600,
 					"spot_id": this.id,
 					"report_name": this.reportName,
 					"spot_abnormal": this.radioOne,
 					"img": this.img,
 					"dwsb_remarks": this.msg,
 				})
-
 			},
 			async powerSubmitRes(params = {}) {
 				const res = await this.$myRequest({
-					url: 'Maintenance/setMaintenance',
+					url: 'Inspection/setInspection',
 					data: params
 				})
 				if (res.data.flag) {
@@ -180,57 +150,18 @@
 					});
 					setTimeout(() => {
 						uni.navigateTo({
-							url: '/pages/weiBao/planInnerList/planInnerList?id=' + this.id,
+							url: '/pages/weiBao/planInnerList/planInnerList?id=' + this.zb_id,
 						});
 					}, 1000);
 				}
 			},
-
-
-			ChooseImage() {
-				uni.chooseImage({
-					count: 4, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album'], //从相册选择
-					success: (res) => {
-						if (this.imgList.length != 0) {
-							this.imgList = this.imgList.concat(res.tempFilePaths)
-						} else {
-							this.imgList = res.tempFilePaths
-						}
-					}
-				});
-			},
-
-			ViewImage(e) {
-				uni.previewImage({
-					urls: this.imgList,
-					current: e.currentTarget.dataset.url
-				});
-			},
-			DelImg(e) {
-				uni.showModal({
-					title: '删除',
-					content: '确定要删除此图片吗？',
-					cancelText: '取消',
-					confirmText: '确定',
-					success: res => {
-						if (res.confirm) {
-							this.imgList.splice(e.currentTarget.dataset.index, 1)
-						}
-					}
-				})
-			},
 			textareaAInput(e) {
-				this.textareaAValue = e.detail.value
-			},
-
+							this.textareaAValue = e.detail.value
+						},
 		}
 	}
 </script>
 
 <style lang="scss">
 
-
-
 </style>

pages/weiBao/planDetailDone/planDetailDone.vue

@@ -8,7 +8,7 @@
 					<text class="necessary">*</text>
 					上报名称：
 				</view>
-				<view>市光四村221号楼</view>
+				<view>{{this.getData.wx_name}}</view>
 			</view>
 			
 			<view class="form-item">
@@ -16,7 +16,8 @@
 					<text class="necessary">*</text>
 					维保状态：
 				</view>
-				<radio-group name="gender" @change="radioChange">
+				<view>{{this.getData.spot_status}}</view>
+				<!-- <radio-group name="gender" @change="radioChange">
 					<label class="margin-right-xs">
 						<radio value="2" checked /><text>正常</text>
 					</label>
@@ -29,7 +30,7 @@
 					<label>
 						<radio value="3" /><text>其他</text>
 					</label>
-				</radio-group>
+				</radio-group> -->
 			</view>
 			
 			<view class="form-item">
@@ -37,8 +38,8 @@
 					<text class="necessary">*</text>
 					上传图片：
 				</view>
-				
-				<view>151198415.jpg</view>
+			
+				<img :src="`https://qhome.usky.cn${this.getData.report_photos}`" alt="" style="max-width:50%">  
 			</view>
 			
 			<view class="form-item">
@@ -46,7 +47,7 @@
 					<text class="necessary">*</text>
 					维保描述：
 				</view>
-				<view>描述信息</view>
+				<view>{{this.getData.dwsb_remarks}}</view>
 			</view>
 		
 		</form>
@@ -58,15 +59,29 @@
 	export default {
 		data() {
 			return {
-
+				getData:{}
 			}
 		},
+		onLoad:function(option){
+			this.getPlanDetail({"zb_id":option.zb_id,"spot_id":option.id})
+		},
 		methods: {
 			radioChange(e) {
 				console.log('type:' + e.detail.value);
 				this.radioOne = e.detail.value;
 			},
 			
+			async getPlanDetail(params = {}) {
+				const res = await this.$myRequest({
+					url: 'Inspection/getPatrolDetailss',
+					data:params,
+					showLoading: true
+				})
+				this.getData=res.data.data[0];
+			
+				console.log(this.getData)
+			},
+			
 		
 			
 		}

pages/weiBao/planInnerList/planInnerList.vue

@@ -51,7 +51,6 @@
 		},
 		onLoad:function(option){
 			this.getPlanList({'company_code':uni.getStorageSync('selectedCode'),"id":option.id})
-		
 		},
 
 		methods: {
@@ -70,7 +69,6 @@
 			
 			goDetailPage(item) {
 				if (item.data3==2) {
-					alert(1)
 					uni.navigateTo({
 						url: "/pages/weiBao/planDetailDone/planDetailDone?id="+item.id+'&zb_id='+this.getData.id,
 					})

pages/xunJian/planDetail/planDetail.vue

@@ -1,9 +1,7 @@
 <template>
 	<view>
-
 		<form action="">
 			<view style='height:30rpx'></view>
-
 			<view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
@@ -11,7 +9,6 @@
 				</view>
 				<input type="text" v-model="reportName">
 			</view>
-
 			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
@@ -31,35 +28,17 @@
 						<radio value="3" /><text>其他</text>
 					</label>
 				</radio-group>
-
 			</view>
-
 			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
 					上传图片：
 				</view>
-
 				<view style="width:500rpx">
 					<view ref="input" class="input">
 					</view>
-					<!-- <view class="cu-form-group">
-						<view class="grid col-4 grid-square flex-sub">
-							<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"
-								:data-url="imgList[index]">
-								<image :src="imgList[index]" mode="aspectFill"></image>
-								<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
-									<text class='cuIcon-close'></text>
-								</view>
-							</view>
-							<view class="solids" @tap="ChooseImage" v-if="imgList.length<4">
-								<text class='cuIcon-cameraadd'></text>
-							</view>
-						</view>
-					</view> -->
 				</view>
 			</view>
-
 			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
@@ -71,10 +50,7 @@
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
 			</view>
-
 		</form>
-
-
 	</view>
 </template>
 
@@ -87,14 +63,13 @@
 				id: '',
 				reportName: '',
 				radioOne: 0,
-				zb_id:0
-
+				zb_id: 0
 			}
 		},
 
 		onLoad: function(option) {
 			this.id = option.id;
-			this.zb_id=option.zb_id
+			this.zb_id = option.zb_id
 		},
 
 		mounted() {
@@ -128,7 +103,6 @@
 						console.log(this.img)
 					},
 					fail: (err) => {
-
 						console.log(err)
 					}
 				});
@@ -156,18 +130,14 @@
 					});
 					return
 				}
-
-
 				this.powerSubmitRes({
 					"zb_id": this.zb_id,
-					// "zb_id":600,
 					"spot_id": this.id,
 					"report_name": this.reportName,
 					"spot_abnormal": this.radioOne,
 					"img": this.img,
 					"dwsb_remarks": this.msg,
 				})
-
 			},
 			async powerSubmitRes(params = {}) {
 				const res = await this.$myRequest({
@@ -180,57 +150,18 @@
 					});
 					setTimeout(() => {
 						uni.navigateTo({
-							url: '/pages/xunJian/planInnerList/planInnerList?id=' + this.id,
+							url: '/pages/xunJian/planInnerList/planInnerList?id=' + this.zb_id,
 						});
 					}, 1000);
 				}
 			},
-
-
-			ChooseImage() {
-				uni.chooseImage({
-					count: 4, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album'], //从相册选择
-					success: (res) => {
-						if (this.imgList.length != 0) {
-							this.imgList = this.imgList.concat(res.tempFilePaths)
-						} else {
-							this.imgList = res.tempFilePaths
-						}
-					}
-				});
-			},
-
-			ViewImage(e) {
-				uni.previewImage({
-					urls: this.imgList,
-					current: e.currentTarget.dataset.url
-				});
-			},
-			DelImg(e) {
-				uni.showModal({
-					title: '删除',
-					content: '确定要删除此图片吗？',
-					cancelText: '取消',
-					confirmText: '确定',
-					success: res => {
-						if (res.confirm) {
-							this.imgList.splice(e.currentTarget.dataset.index, 1)
-						}
-					}
-				})
-			},
 			textareaAInput(e) {
 				this.textareaAValue = e.detail.value
 			},
-
 		}
 	}
 </script>
 
 <style lang="scss">
 
-
-
 </style>

pages/xunJian/planDetailDone/planDetailDone.vue

@@ -8,15 +8,16 @@
 					<text class="necessary">*</text>
 					上报名称：
 				</view>
-				<view>市光四村221号楼</view>
+				<view>{{this.getData.wx_name}}</view>
 			</view>
 			
 			<view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
 					巡检状态：
-				</view>
-				<radio-group name="gender" @change="radioChange">
+				</view>
+				<view>{{this.getData.spot_status}}</view>
+				<!-- <radio-group name="gender" @change="radioChange">
 					<label class="margin-right-xs">
 						<radio value="2" checked /><text>正常</text>
 					</label>
@@ -29,7 +30,7 @@
 					<label>
 						<radio value="3" /><text>其他</text>
 					</label>
-				</radio-group>
+				</radio-group> -->
 			</view>
 			
 			<view class="form-item">
@@ -37,8 +38,8 @@
 					<text class="necessary">*</text>
 					上传图片：
 				</view>
-				
-				<view>151198415.jpg</view>
+			
+				<img :src="`https://qhome.usky.cn${this.getData.report_photos}`" alt="" style="max-width:50%">  
 			</view>
 			
 			<view class="form-item">
@@ -46,7 +47,7 @@
 					<text class="necessary">*</text>
 					巡检描述：
 				</view>
-				<view>描述信息</view>
+				<view>{{this.getData.dwsb_remarks}}</view>
 			</view>
 		
 		</form>
@@ -58,11 +59,11 @@
 	export default {
 		data() {
 			return {
-
+				getData:{}
 			}
 		},
-		onload(option){
-			this.getAuthority({"id":option.phone,"company_code": uni.getStorageSync('selectedCode')})
+		onLoad:function(option){
+			this.getPlanDetail({"zb_id":option.zb_id,"spot_id":option.id})
 		},
 		methods: {
 			radioChange(e) {
@@ -70,15 +71,15 @@
 				this.radioOne = e.detail.value;
 			},
 			
-			// 回显信息请求
-			async getAuthority(params={}) {
+			async getPlanDetail(params = {}) {
 				const res = await this.$myRequest({
-					url: 'Inspection/getInspectionDetails',
-					data:params
+					url: 'Inspection/getPatrolDetailss',
+					data:params,
+					showLoading: true
 				})
-				this.authorityData=res.data.data[0]
-				this.selectedData=res.data.data[0].siteIdData;				
+				this.getData=res.data.data[0];
 			
+				console.log(this.getData)
 			},