修补优化补充

common/common.scss

@@ -923,4 +923,17 @@ radio,checkbox {
 		}
 		
 	}
+	
+	.info-one-info {
+		display:flex;
+		line-height:26px!important;
+		padding:10px 0;
+	}
+	.info-content uni-view uni-text:first-child{
+		width:88px!important;
+	}
+	.info-content uni-view uni-text:last-child{
+		width:75%;
+		
+	}
 	

manifest.json

@@ -132,7 +132,7 @@
             "base" : ""
         },
         "devServer" : {
-            "https" : true,
+            // "https" : true,
             "proxy" : {
                 "/web" : {
                     "target" : "https://wx.ewoogi.com/wx",

pages.json

@@ -60,6 +60,7 @@
 		{
 			"path": "pages/processList/processList",
 			"style": {
+				"enablePullDownRefresh":true,
 				"navigationBarTitleText": "火警",
 				"app-plus": {
 					"titleNView": {
@@ -680,7 +681,8 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"enablePullDownRefresh":true
 	},
 	"tabBar": {
 		"borderStyle": "white",

pages/accountManage/accountManage.vue

@@ -1,37 +1,40 @@
 <template>
 	<view class="padding">
-		<view style="width:100%;overflow:auto;    height: calc(100vh - 156px);" >
-
-			
-			
-			<uni-table  stripe emptyText="暂无更多数据" >
-			    <!-- 表头行 -->
-			    <uni-tr>
-			        <uni-th align="center" style="width:200rpx">人员名称</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>
+		<view style="width:100%;overflow:auto;    height: calc(100vh - 156px);">
+
+
+
+			<uni-table stripe emptyText="暂无更多数据">
+				<!-- 表头行 -->
+				<uni-tr>
+					<uni-th align="center" style="width:200rpx">人员名称</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>
-			
+				</uni-tr>
+
 			</uni-table>
-			
+
 
 		</view>
-		
-		
-		
+
+
+
 		<view class="btn-area submitBottomBtn  bg-white">
-			<view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total" @change="change" /></view>
+			<view class="uni-pagination-box">
+				<uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total"
+					@change="change" />
+			</view>
 			<button class="bg-blue round " @click="goAddPer()">新 增</button>
 		</view>
-		
+
 	</view>
 </template>
 
@@ -39,7 +42,7 @@
 	export default {
 		data() {
 			return {
-				getData:[],
+				getData: [],
 				// 每页数据量
 				pageSize: 100,
 				// 当前页
@@ -49,64 +52,78 @@
 				loading: false
 			}
 		},
-		onShow:function(option){
-			this.getDataList({'company_code':uni.getStorageSync('selectedCode'),'page':this.pageCurrent,"number":this.pageSize})
+		onShow: function(option) {
+			this.getDataList({
+				'company_code': uni.getStorageSync('selectedCode'),
+				'page': this.pageCurrent,
+				"number": this.pageSize
+			})
 		},
-		onLoad:function(option){
-			this.getDataList({'company_code':uni.getStorageSync('selectedCode'),'page':this.pageCurrent,"number":this.pageSize})
+		onLoad: function(option) {
+			this.getDataList({
+				'company_code': uni.getStorageSync('selectedCode'),
+				'page': this.pageCurrent,
+				"number": this.pageSize
+			})
 		},
 		methods: {
-			
-			
+
+
 			// 列表数据请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({
 					url: 'PermissionBinding/getPermissionBindingList',
-					data:params,
+					data: params,
 					showLoading: true
 				})
-				this.getData=res.data.data;
+				this.getData = res.data.data;
 				console.log(res.data.data[0])
 				console.log(res.data.data.length)
 				console.log(this.getData.length);
-				this.total=res.data.total;
+				this.total = res.data.total;
 			},
-			
+
 			// 分页触发
 			change(e) {
 				console.log(e)
 				// this.$refs.table.clearSelection()
 				// this.selectedIndexs.length = 0
-				this.getDataList({'company_code':uni.getStorageSync('selectedCode'),'page':e.current,"number":this.pageSize})
+				this.getDataList({
+					'company_code': uni.getStorageSync('selectedCode'),
+					'page': e.current,
+					"number": this.pageSize
+				})
 				// this.getDataList(e.current)
 			},
-			
-			
-			
+
+
+
 			goAddPer() {
 				uni.navigateTo({
 					url: '/pages/accountManage/perAdd/perAdd',
-					
+
 				});
 			},
-			
+
 		}
 	}
 </script>
 
 <style lang="scss">
-	/deep/ .uni-pagination__btn{
-		background-color:rgba(0,0,0,0)!important
-	}
-	/deep/ .uni-pagination-box{
-		background:#fff;
-		border-top:1px solid #ddd
+	/deep/ .uni-pagination__btn {
+		background-color: rgba(0, 0, 0, 0) !important
 	}
-	.submitBottomBtn{
-		padding:0px 32rpx 32rpx 32rpx
+
+	/deep/ .uni-pagination-box {
+		background: #fff;
+		border-top: 1px solid #ddd
 	}
-	/deep/ .uni-pagination__num{
-		height:80rpx
+
+	.submitBottomBtn {
+		padding: 0px 32rpx 32rpx 32rpx
 	}
 
+	/deep/ .uni-pagination__num {
+		height: 80rpx
+	}
 </style>

pages/analyse/monthDetail/monthDetail.vue

@@ -13,15 +13,15 @@
 					<text>单位名称：</text>
 					<text>{{project_info.company_name}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>进场日期：</text>
 					<text>{{project_info.approach_time}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text style="width:auto!important">完工日期：</text>
 					<text>{{project_info.complete_time}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>验收日期：</text>
 					<text>{{project_info.check_time}}</text>
 				</view>
@@ -93,15 +93,15 @@
 			</view>
 			<view class="info-content">
 				<view class="info-one-info ">
-					<text>统计起始日期：</text>
+					<text style="width:125px!important">统计起始日期：</text>
 					<text>{{count_time.startData}}</text>
 				</view>
-				<view>
-					<text>统计截至日期：</text>
+				<view  class="info-one-info ">
+					<text style="width:125px!important">统计截至日期：</text>
 					<text>{{count_time.endData}}</text>
 				</view>
-				<view>
-					<text>统计时段时长：</text>
+				<view class="info-one-info ">
+					<text style="width:125px!important">统计时段时长：</text>
 					<text>{{count_time.days}}</text>
 				</view>
 			</view>

pages/analyse/monthReport/monthReport.vue

@@ -7,7 +7,7 @@
 					<image class="image-bg" src="/static/month-report-icon.png"/>
 				</view>
 				<view class="content">
-					<view class="title">{{item.company_name}} {{item.event_time}}</view>
+					<view class="title text-cut" style="display:block">{{item.company_name}} {{item.event_time}}</view>
 				</view>
 				<view class="nav-right num">
 					<view>

pages/deviceDetail/deviceDetail.vue

@@ -21,23 +21,23 @@
 						<text>{{getData.type_name}}</text>
 					</view>
 
-					<view>
+					<view class="info-one-info ">
 						<text>设备编号：</text>
 						<text>15221</text>
 					</view>
-					<view>
-						<text>物联网卡号：</text>
+					<view class="info-one-info ">
+						<text style="width:98px!important">物联网卡号：</text>
 						<text>{{getData.sim}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>安装位置：</text>
 						<text>{{getData.unitinfo}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>添加时间：</text>
 						<text>{{getData.install_time}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>设备地址：</text>
 						<text>{{getData.owner_address}}</text>
 					</view>

pages/inspectList/processedDetail/processedDetail.vue

@@ -13,11 +13,12 @@
 				</view>
 				<view class="info-content">
 					<view class="info-one-info ">
-						<text>{{type==1?this.getData.artificial_code:this.getData.supervise_code}}</text>  
-					</view>
-					<view>
+						<text style="width:90px!important">{{type==1?this.getData.artificial_code:this.getData.supervise_code}}:</text>  
 						<text>{{this.getData.content}}</text>
 					</view>
+					<!-- <view>
+						
+					</view> -->
 				</view>
 			</view>
 			<!-- 基本信息end -->
@@ -30,7 +31,7 @@
 				</view>
 				<view class="info-content">
 					<view class="info-one-info ">
-						<text>处理账号/电话：</text>
+						<text style="width:100px!important">处理账号/电话：</text>
 						<text>{{this.getData.clr_phone}}</text>
 					</view>
 					<view>

pages/inspectList/unprocessDetail/unprocessDetail.vue

@@ -14,10 +14,9 @@
 				<view class="info-content">
 					<view class="info-one-info ">
 						<text>{{type==1?this.getData.artificial_code:this.getData.supervise_code}}</text>  
-					</view>
-					<view>
 						<text>{{this.getData.content}}</text>
 					</view>
+				
 				</view>
 			</view>
 			<!-- 基本信息end -->

pages/processList/processList.vue

@@ -99,9 +99,22 @@
 
 			};
 		},
-
+		
+		  onPullDownRefresh() {
+		        console.log('refresh--上拉刷新');
+				// this.getProcessData()
+				
+		        setTimeout(function () {
+		            uni.stopPullDownRefresh();
+		        }, 100);
+		    },
 
 		onLoad: function(option) {
+			
+			setTimeout(function () {
+			            console.log('start pulldown');
+			        }, 1000);
+			        uni.startPullDownRefresh();
 
 			this.getProcessData({
 				"company_code": uni.getStorageSync('selectedCode'),

pages/safeGuard/safeGuard.vue

@@ -8,39 +8,39 @@
 					<text>单位名称：</text>
 					<text>{{this.getData.company}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>维保单位：</text>
 					<text>{{this.getData.maintenance_company}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text style="width:auto!important">开始日期：</text>
 					<text>{{this.getData.start_time}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>结束日期：</text>
 					<text>{{this.getData.end_time}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>销售人员：</text>
 					<text>{{this.getData.salesman}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>联系电话：</text>
 					<text>{{this.getData.salesman_phone}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>客户联系人：</text>
 					<text>{{this.getData.customer}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>客户电话：</text>
 					<text>{{this.getData.customer_phone}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>合同状态：</text>
 					<text class="online">启用{{this.getData.status}}</text>
 				</view>
-				<view>
+				<view class="info-one-info ">
 					<text>详细内容：</text>
 					<a :href="`${this.getData.url}`" download>点击下载查看详情</a>
 				</view>

pages/unprocessDetail/unprocessDetail.vue

@@ -16,11 +16,11 @@
 						<text>{{getData.device_name}}</text>
 					</view>
 
-					<view>
+					<view  class="info-one-info ">
 						<text>设备地址：</text>
 						<text>{{getData.unitinfo}}</text>
 					</view>
-					<view>
+					<view  class="info-one-info ">
 						<text>告警信息：</text>
 						<text>{{getData.alarm_information}}</text>
 					</view>

pages/weiBao/recordDetail/recordDetail.vue

@@ -20,23 +20,23 @@
 						<text>{{this.getData.owner_name}}</text>
 					</view>
 
-					<view>
+					<view class="info-one-info ">
 						<text>单位地址：</text>
 						<text>{{this.getData.owner_address}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>维保点位：</text>
 						<text>{{this.getData.spot_name}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>点位地址：</text>
 						<text>{{this.getData.spot_address}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>预期时间：</text>
 						<text>{{this.getData.ywc_time}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>完成时间：</text>
 						<text>{{this.getData.wc_time}}</text>
 					</view>
@@ -55,11 +55,11 @@
 						<text>{{this.getData.name}}</text>
 					</view>
 			
-					<view>
+					<view class="info-one-info ">
 						<text>联系方式：</text>
 						<text>{{this.getData.phone}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>维保描述：</text>
 						<text>{{this.getData.rec_count}}</text>
 					</view>

pages/xunJian/recordDetail/recordDetail.vue

@@ -20,23 +20,23 @@
 						<text>{{this.getData.owner_name}}</text>
 					</view>
 
-					<view>
+					<view class="info-one-info ">
 						<text>单位地址：</text>
 						<text>{{this.getData.owner_address}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>巡检点位：</text>
 						<text>{{this.getData.spot_name}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>点位地址：</text>
 						<text>{{this.getData.spot_address}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>预期时间：</text>
 						<text>{{this.getData.ywc_time}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>完成时间：</text>
 						<text>{{this.getData.wc_time}}</text>
 					</view>
@@ -55,11 +55,11 @@
 						<text>{{this.getData.name}}</text>
 					</view>
 
-					<view>
+					<view class="info-one-info ">
 						<text>联系方式：</text>
 						<text>{{this.getData.phone}}</text>
 					</view>
-					<view>
+					<view class="info-one-info ">
 						<text>巡检描述：</text>
 						<text>{{this.getData.rec_count}}</text>
 					</view>