数据对接

common/common.scss

@@ -1,4 +1,5 @@
 /* common */
+
 body {
 	font-size: 32rpx;
 }
@@ -387,9 +388,6 @@ radio,checkbox {
 		
 		}
 		
-		.form-item .title {
-			width: 170rpx
-		}
 		
 	}
 	.siteItems{
@@ -581,6 +579,9 @@ radio,checkbox {
 		color: #999;
 
 	}
+	select{
+		background-color: rgba(0,0,0,0);
+	}
 	
 	
 	select:focus,
@@ -588,9 +589,22 @@ radio,checkbox {
 	select:hover {
 		outline: none;
 	}
-	
+	
+	.selectBox{
+		position:relative;
+		select{
+			z-index:2
+		}
+		.iconfont{
+			position:absolute;
+			top:0;
+			right:0rpx;
+			color:#999;
+			z-index:1
+		}
+	}
 	select {
-		background: url(/static/arrow2.png) no-repeat scroll 98% center;
+		// background: url(/static/arrow2.png) no-repeat scroll 98% center;
 		background-size:28rpx;
 	}
 	
@@ -605,12 +619,18 @@ radio,checkbox {
 		position: relative;
 		top: 2rpx
 	}
-	
+	.form-item.selectBox{
+		select{
+			background:rgba(0,0,0,0)
+		}
+	}
 	.form-item {
-		padding: 0 40rpx;
+		margin: 0 40rpx;
 		display: flex;
 		align-items: top;
-		margin-bottom: 20rpx;
+		margin-bottom: 20rpx;
+		line-height:70rpx;
+		
 	
 	
 		.title {

manifest.json

@@ -137,13 +137,18 @@
                 }
             }
         },
-        "domain" : "",
+        "domain" : "work",
         "sdkConfigs" : {
             "maps" : {
                 "qqmap" : {
                     "key" : ""
                 }
             }
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
         }
     }
 }

pages/accountManage/perAdd/perAdd.vue

@@ -3,7 +3,7 @@
 
 		<form action="">
 			<view style="height:30rpx"></view>
-			<view class="form-item">
+			<view class="form-item selectBox">
 				<view class="title">
 					<text class="necessary">*</text>
 					联系方式:
@@ -13,13 +13,15 @@
 					<option :value="item.phone" v-for="(item,index) in phoneListData" :key="index">{{item.phone}}
 					</option>
 				</select>
+				<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
+				
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>姓名:</view>
 				<input name="input" v-model="name"></input>
 			</view>
 
-			<view class="form-item">
+			<view class="form-item selectBox">
 				<view class="title">
 					<text class="necessary">*</text>
 					所在单位:
@@ -29,6 +31,7 @@
 					<option :value="item.owner_code" v-for="(item,index) in companyListData" :key="index"
 						style="width:80%">{{item.owner_name}}</option>
 				</select>
+				<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 			</view>
 
 			<view class="form-item">

pages/device-Manage/device-Manage.vue

@@ -21,7 +21,8 @@
 				</view>
 				<view class="nav-right num">
 					<view class="text-grey">
-						<span class="online">{{item.device_state}}</span>
+						<!-- <span class="online">{{item.device_state}}</span> -->
+						<span :class="item.device_state=='在线'?'online':'offline'">{{item.device_state}}</span>
 						<!-- <span class="offline" v-if="item.status==1">离线</span>
 						<span class="error" v-if="item.status==2">故障</span> -->
 						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>

pages/device-Manage/export/export.vue

@@ -4,8 +4,8 @@
 		<view class="ding">
 			<!-- <calendar></calendar> -->
 			<view class="example-body">
-				<uni-datetime-picker v-model="datetimerange" type="datetimerange" start-placeholder="请选择"
-					end-placeholder="请选择" start="2000-3-20 12:00:00" end="2021-10-20 20:00:00" rangeSeparator="至" />
+				<uni-datetime-picker v-model="datetimerange" type="datetimerange" start-placeholder="请选择开始时间"
+					end-placeholder="请选择结束时间" start="2000-3-20 12:00:00" end="2021-10-20 20:00:00" rangeSeparator="至" />
 			</view>
 		</view>
 
@@ -27,16 +27,20 @@
 							</view>
 							<view class="pro-date ">{{item.install_time}}</view>
 						</view>
-						<view class="action" style="z-index:99">
-							<view :class="item.device_state=='离线'?'':'processed'">{{item.device_state}}</view>
-							
+					<view class="nav-right num">
+						<view class="text-grey">
+							<!-- <span class="online">{{item.device_state}}</span> -->
+							<span :class="item.device_state=='在线'?'online':'offline'">{{item.device_state}}</span>
+				
+							<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 						</view>
 					</view>
+					</view>
 					<view class=" text-center margin-top" v-if="!this.getExportData.length&&this.dataRes">暂无数据...</view>
 				</view>
 			</view>
 		</block>
-		<view class="padding-lr padding-bottom-lg" style="position:fixed;bottom:0;width:100%">
+		<view v-if="this.getExportData.length>0" class="padding-lr padding-bottom-lg bg-white" style="position:fixed;bottom:0;width:100%">
 			<view class="btn-area">
 				<button class="bg-blue  round missReport margin-top" @tap="exportButton()">导 出 </button>
 			</view>

pages/deviceManage/deviceAdd/deviceAdd.vue

@@ -17,7 +17,7 @@
 				<view class="title"><text class="necessary">*</text>单元地址:</view>
 				<input name="input" v-model="unitinfo"></input>
 			</view>
-			<view class="form-item">
+			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>所属楼层:</view>
 				<select name="" id="" v-model="louyu">
 					<option value="">请选择</option>
@@ -34,20 +34,22 @@
 					<!-- <option :value=item v-for="item in 60" >楼层{{item}}</option> -->
 					<option :value=item v-for="item in 60" >楼层{{item}}</option>
 				</select>
+				<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 			</view>
-			<view class="form-item">
+			<view class="form-item ">
 				<view class="title"><text class="necessary">*</text>物联网卡号:</view>
 				<input name="input" v-model="sim"></input>
 			</view>
-			<view class="form-item">
+			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>所属单位:</view>
 				<select name="" id="" v-model="company_code">
 					<option value="0">请选择</option>
 					<option :value="item.owner_code" v-for="(item,index) in companyListData" 
 						style="width:80%">{{item.owner_name}}</option>
 				</select>
+				<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 			</view>
-			<view class="form-item">
+			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>设备类型:</view>
 				<select name="" id="" placeholder="" v-model="type">
 					<option value="0">请选择设备类型</option>
@@ -60,8 +62,9 @@
 					<option value="7">电气火灾</option>
 					<option value="16">视频监测</option>
 				</select>
+				<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 			</view>
-			<view class="form-item">
+			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>传输方式:</view>
 
 				<select name="" id="" placeholder="" v-model="transfer_type">
@@ -70,6 +73,7 @@
 					<option value="4G">4G</option>
 					<option v-if="this.type==2||this.type==5" value="Lora">Lora</option>
 				</select>
+				<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 			</view>
 			<view class="form-item margin-top">
 				<view class="title">
@@ -89,7 +93,7 @@
 
 			<!-- 水表NB必填参数 start -->
 			<block v-if="this.transfer_type=='NB'&&(this.type==2||this.type==5)">
-				<view class="form-item" >
+				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB类型:</view>
 					<select name="" id=""  v-model="deviceType">
 <!-- 						<option value="">烟感</option>
@@ -97,8 +101,9 @@
 						<option value="WaterMeter">宇洁戎情水表</option>
 						<option value="topsailSensor">拓扑索尔</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
-				<view class="form-item" >
+				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB厂商名称:</view>
 					<select name="" id="" v-model="manufacturerName">
 						<option value="ST">ST</option>
@@ -106,8 +111,9 @@
 						<option value="shanghaijunyanTest">shanghaijunyanTest</option>
 						<option value="Topsail">Topsail</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
-				<view class="form-item" >
+				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB设备型号:</view>
 					<select name="" id="" v-model="model">
 						<!-- <option value="">烟感型号</option> -->
@@ -115,8 +121,9 @@
 						<option value="WPTA">宇洁戎情水表型号</option>
 						<option value="TH12">拓扑索尔水表液位</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
-				<view class="form-item" >
+				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB厂商id:</view>
 					<select name="" id="" v-model="manufacturerId">
 						<option value="ST">ST</option>
@@ -124,6 +131,7 @@
 						<option value="JunyanTest">JunyanTest</option>
 						<option value="Topsail">Topsail</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
 				<view class="form-item" >
 					<view class="title"><text class="necessary">*</text>NB地址:</view>
@@ -139,32 +147,35 @@
 			
 			<!-- 用传4G必填参数 -->
 			<block v-if="this.type==1&&this.transfer_type=='4G'">
-				<view class="form-item"  >
+				<view class="form-item selectBox"  >
 					<view class="title"><text class="necessary">*</text>解析方法:</view>
 					<select name="" id="" v-model="owner_xh_a">
 						<option value="z">请选择</option>
 						<option :value=item v-for="item in 7" >方法{{item}}</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
-				<view class="form-item">
+				<view class="form-item selectBox">
 					<view class="title"></view>
 					<select name="" id="" v-model="owner_xh_b">
 						<option value="z">请选择</option>
 						<option :value=item v-for="item in 7" >方法{{item}}</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
-				<view class="form-item">
+				<view class="form-item selectBox">
 					<view class="title"></view>
 					<select name="" id="" v-model="owner_xh_c">
 						<option value="z">请选择</option>
 						<option :value=item v-for="item in 7" >方法{{item}}</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
 				
 			</block>
 			<!-- 电气火灾参数 start -->
 			<block v-if="this.type==7&&this.transfer_type=='4G'">
-				<view class="form-item">
+				<view class="form-item selectBox">
 					<view class="title"><text class="necessary">*</text>最高层:</view>
 					<select name="" id="" v-model="max_level">
 						<option value="">请选择</option>
@@ -180,8 +191,9 @@
 						<option value="-1">楼层B1</option>
 						<option :value=item v-for="item in 60" >楼层{{item}}</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
-				<view class="form-item">
+				<view class="form-item selectBox">
 					<view class="title"><text class="necessary">*</text>最底层:</view>
 					<select name="" id="" v-model="min_level">
 						<option value="">请选择</option>
@@ -197,6 +209,7 @@
 						<option value="-1">楼层B1</option>
 						<option :value=item v-for="item in 60" >楼层{{item}}</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
 				<view class="form-item ">
 					<view class="title">

pages/deviceManage/deviceManage.vue

@@ -6,7 +6,7 @@
 			<view style="height:206rpx"></view>
 			<view class="ding">
 				<view class="cu-bar search bg-gray filter-section" style="with:50%;">
-					<view class="search-form round bg-white">
+					<view class="search-form round bg-white selectBox">
 						<select name="" id="" placeholder="" v-model="dwtype">
 							<option value="0">请选择设备类型</option>
 							<option value="1">用传</option>
@@ -18,17 +18,19 @@
 							<option value="7">电气火灾</option>
 							<option value="16">视频监测</option>
 						</select>
+						<text class="icon iconfont margin-right margin-left">&#xe63d;</text>
 					</view>
 				</view>
 
 				<view class="cu-bar search bg-gray filter-section">
-					<view class="search-form round bg-white" style="margin-bottom:26rpx">
+					<view class="search-form round bg-white selectBox" style="margin-bottom:26rpx">
 						<select name="" id="" placeholder="" v-model="transmission_mode">
 							<option value="0">请选择传输方式</option>
 							<option value="NB">NB</option>
 							<option value="4G">4G</option>
 							<option value="Lora">Lora</option>
 						</select>
+						<text class="icon iconfont margin-right margin-left">&#xe63d;</text>
 					</view>
 					<view class="action">
 						<button class="cu-btn bg-blue round" @click="searchList">查询</button>
@@ -44,7 +46,8 @@
 			<view class="processList deviceRegistList" style="height: calc(100vh - 470rpx);">
 				<checkbox-group @change="changeCheckbox">
 					<view class="cu-list menu-avatar ">
-						<view class=" site-item text-center margin-top" v-if="!this.deviceManage.length&&this.deviceManageRes==1">暂无数据</view>
+						<view class=" site-item text-center margin-top"
+							v-if="!this.deviceManage.length&&this.deviceManageRes==1">暂无数据</view>
 						<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
 							v-for="(item,index) in newDeviceManage" :key="index" :data-target="'move-box-' + index">
 							<view class="cu-form-group margin-top">
@@ -52,7 +55,7 @@
 									:class="{'checked':checkedArr.includes(String(item.id))}"></checkbox>
 							</view>
 							<view class="cu-avatar round lg">
-								<image class="image-bg" src="/static/device-icon.png"/>
+								<image class="image-bg" src="/static/device-icon.png" />
 							</view>
 							<view class="content" @longpress="showDetail(item)">
 								<view class="pro-title">
@@ -100,7 +103,7 @@
 			<view class="share-item  text-center">
 				<view><text class="icon iconfont margin-xs" style="color:#FF642E">&#xe66e;</text></view>
 				<view @tap="showModal" data-target="DialogModal">
-						导出
+					导出
 				</view>
 			</view>
 			<view class="checkAll" style="display:inline-block">
@@ -180,29 +183,29 @@
 			return {
 				dwtype: 0,
 				transmission_mode: 0,
-				
+
 				deviceManage: [],
 				deviceManageRes: 0,
 				type: '0',
 				modalName: null,
-				
+
 				checkbox: [{
 					value: 'A',
 					checked: false
 				}],
 				isChecked: false,
 				checkedArr: [], //复选框选中的值
-				allChecked: false ,//是否全选
-				
+				allChecked: false, //是否全选
+
 				deleteIndex: '',
 				deleteId: '',
 				validCode: '',
 
-				exportData:[],
+				exportData: [],
 				json_fields: {
 					"单位编号": "company", //常规字段
 					"状态": "device_state",
-					"设备编号": "owner_code", 
+					"设备编号": "owner_code",
 					"设备名称": "owner_name",
 					"单元地址": "unitinfo",
 					"创建时间": "install_time",
@@ -233,6 +236,8 @@
 			this.getDataList({
 				'company_code': uni.getStorageSync('selectedCode')
 			})
+		
+			// document.querySelector('.uni-page-head-bd .uni-page-head__title').style.userSelect='none';
 		},
 		methods: {
 
@@ -253,7 +258,7 @@
 					showLoading: true
 				})
 				this.deviceManage = res.data.data;
-				this.deviceManageRes=1;
+				this.deviceManageRes = 1;
 			},
 
 			// 页面跳转
@@ -285,29 +290,40 @@
 				// 用于再次点击该项的取反
 				e.isShow = !nowStatu
 			},
-			
-			
+
+
 			//导出弹框
 			showModal(e) {
 				var ua = window.navigator.userAgent.toLowerCase();
-				if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+				// if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+				// 	uni.showModal({
+				// 		showCancel: false,
+				// 		content: '点击右上角 ┇，选择默认浏览器进行导出操作'
+				// 	});
+				// }else{
+				// 	if (this.checkedArr.length == 0) {
+				// 		uni.showModal({
+				// 			showCancel: false,
+				// 			content: '请选择至少一条需要导出的数据'
+				// 		});
+				// 	} else {
+				// 		this.modalName = e.currentTarget.dataset.target;
+				// 	}
+				// }
+
+				if (this.checkedArr.length == 0) {
 					uni.showModal({
 						showCancel: false,
-						content: '点击右上角 ┇，选择默认浏览器进行导出操作'
+						content: '请选择至少一条需要导出的数据'
 					});
-				}else{
-					if (this.checkedArr.length == 0) {
-						uni.showModal({
-							showCancel: false,
-							content: '请选择至少一条需要导出的数据'
-						});
-					} else {
-						this.modalName = e.currentTarget.dataset.target;
-					}
+				} else {
+					this.modalName = e.currentTarget.dataset.target;
 				}
-				
+
+
+
 			},
-			
+
 			//导出事件
 			getDataExport() {
 				const base64 = s => window.btoa(unescape(encodeURIComponent(s)));
@@ -348,7 +364,7 @@
 				            <x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>
 				            </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
 				            </head><body><table>${str}</table></body></html>`;
-				
+
 
 				// 通过创建a标签实现
 				const link = document.createElement("a");
@@ -358,7 +374,7 @@
 				link.click();
 			},
 			//导出按钮另存为
-			saveAsData(e){
+			saveAsData(e) {
 				this.modalName = null
 				this.getDataExport();
 			},
@@ -434,6 +450,43 @@
 </script>
 
 <style>
+	
+
+	page {
+		-moz-user-select: none;
+		/*火狐*/
+		-webkit-user-select: none;
+		/*webkit浏览器*/
+		-ms-user-select: none;
+		/*IE10*/
+		-khtml-user-select: none;
+		/*早期浏览器*/
+		user-select: none;
+	}
+
+	/* user-select有2个值（none表示不能选中文本，text表示可以选择文本） */
+
+
+	* {
+		-webkit-touch-callout: none;
+		-webkit-user-select: none;
+		-khtml-user-select: none;
+		-moz-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
+	}
+
+	input {
+		-webkit-touch-callout: initial !important;
+		-webkit-user-select: initial !important;
+		-khtml-user-select: initial !important;
+		-moz-user-select: initial !important;
+		-ms-user-select: initial !important;
+		user-select: initial !important;
+	}
+
+
+
 	.showDetailEdit {
 		position: absolute;
 		background: #fff;

pages/deviceOffLine/deviceOffLine.vue

@@ -5,7 +5,7 @@
 		<view style="height:224rpx"></view>
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="with:50%;">
-				<view class="search-form round bg-white" >
+				<view class="search-form round bg-white selectBox" >
 					<select name="" id="" placeholder="" v-model="dwtype">
 						<option value="0">请选择设备类型</option>
 						<option value="1">用传</option>
@@ -16,19 +16,21 @@
 						<option value="6">RTU</option>
 						<option value="7">电气火灾</option>
 						<option value="16">视频监测</option>
-					</select>
+					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
 				
 			</view>
 			
 			<view class="cu-bar search bg-gray filter-section">
-				<view class="search-form round bg-white" style="margin-bottom:26rpx">
+				<view class="search-form round bg-white selectBox" style="margin-bottom:26rpx">
 					<select name="" id="" placeholder="" v-model=" transfer_type">
 						<option value="0">请选择传输方式</option>
 						<option value="NB">NB</option>
 						<option value="4G">4G</option>
 						<option value="Lora">Lora</option>
 					</select>
+					<text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>
@@ -42,7 +44,7 @@
 		<block class="">
 			<view class="processList">
 				<view class="cu-list menu-avatar ">
-					<view class=" site-item text-center margin-top" v-if="!this.deviceOffLineData.length&&this.deviceOffLineDataRes==1">暂无数据</view>
+					<view class=" site-item text-center margin-top" v-if="!this.deviceOffLineData.length&&this.deviceOffLineDataRes==1">暂无数据...</view>
 					<view class="cu-item" v-for="(item,index) in deviceOffLineData" :key="index"  >
 						<view class="cu-avatar lg">
 							<image class="image-bg" src="/static/device-icon.png"/>
@@ -120,6 +122,9 @@
 			})
 		},
 		onLoad(option) {
+			
+			
+
 			this.status_type=option.status_type;
 			this.getSiteList({"status_type":option.status_type,"company_code ":uni.getStorageSync('selectedCode')});
 			
@@ -140,12 +145,17 @@
 			});
 		},
 		
+
+		
 		// 自定义导航事件   （导出操作）
 		onNavigationBarButtonTap(e) {
+			
 			if (e.float == 'right') {
+
 				//#ifdef H5
 				let exportUrl= this.$BASE_URL+`ExportModule/getStatusDetailsListExpor/status_type/${this.status_type}/company_code/${uni.getStorageSync('selectedCode')}/ transfer_type/${this. transfer_type1}/dwtype/${this.dwtype1}/`
 				var ua = window.navigator.userAgent.toLowerCase();
+
 				if(ua.match(/MicroMessenger/i) == 'micromessenger'){
 					uni.showModal({
 						showCancel: false,
@@ -162,6 +172,8 @@
 		},
 
 		methods: {
+			
+			
 			searchData() {
 				this.getSiteList({
 					" transfer_type": this. transfer_type,
@@ -183,7 +195,16 @@
 				this.siteListRes = 1;
 				console.log(res.data.data)
 				this.deviceOffLineData = res.data.data;
-				this.deviceOffLineDataRes=1
+				this.deviceOffLineDataRes=1;
+				
+				//#ifdef H5
+				if(this.deviceOffLineData.length<1){
+					document.querySelector('.uni-page-head-ft .uni-page-head-btn .uni-btn-icon').style.display='none';
+				}else{
+					document.querySelector('.uni-page-head-ft .uni-page-head-btn .uni-btn-icon').style.display='block';
+				}
+				//#endif
+				
 			},
 			
 			// 导出

pages/export/export.vue

@@ -4,8 +4,8 @@
 		<view class="ding">
 			<!-- <calendar></calendar> -->
 			<view class="example-body">
-				<uni-datetime-picker v-model="datetimerange" type="datetimerange" start-placeholder="请选择"
-					end-placeholder="请选择" start="2000-3-20 12:00:00" end="2021-10-20 20:00:00" rangeSeparator="至" />
+				<uni-datetime-picker v-model="datetimerange" type="datetimerange" start-placeholder="请选择开始时间"
+					end-placeholder="请选择结束时间" start="2000-3-20 12:00:00" end="2021-10-20 20:00:00" rangeSeparator="至" />
 			</view>
 		</view>
 
@@ -19,8 +19,7 @@
 						</view>
 						<view class="content">
 							<view class="pro-title">
-								<view class="cut" v-if="keyWords=='人工督察单'">{{item.artificial_code}}</view>
-								<view class="cut" v-if="keyWords=='电子督察单'">{{item.supervise_code}}</view>
+								<view class="cut">{{keyWords=='人工督察单'?item.artificial_code:item.supervise_code}}</view>
 							</view>
 							<view class="pro-des  ">
 								<view class="text-cut">{{item.content}}</view>
@@ -36,7 +35,7 @@
 				</view>
 			</view>
 		</block>
-		<view class="padding-lr padding-bottom-lg" style="position:fixed;bottom:0;width:100%">
+		<view v-if="this.getExportData.length>0" class="padding-lr padding-bottom-lg bg-white" style="position:fixed;bottom:0;width:100%">
 			<view class="btn-area">
 				<button class="bg-blue  round missReport margin-top" @tap="exportButton()">导 出 </button>
 			</view>
@@ -46,13 +45,6 @@
 
 	</view>
 </template>
-<script>
-	
-	
-	
-	
-	
-</script>
 
 <script>
 	import json from '../../data/json.js';
@@ -61,7 +53,6 @@
 			return {
 				getExportData: [],
 				dataRes: 0,
-				// datetimerange: ['2021-03-20 20:10:10', '2021-05-10 10:10:10'],
 				datetimerange: ['', ''],
 				keyWords:'',
 		
@@ -69,7 +60,6 @@
 		},
 		onLoad: function(option) {
 			this.keyWords=option.keywords;
-			alert(this.keyWords)
 			this.getData({
 				"company_code": uni.getStorageSync('selectedCode'),
 				"start_time": '',
@@ -91,23 +81,9 @@
 		methods: {
 
 			async getData(params = {}) {
-				
-				let listUrl = "";
-				switch (this.keyWords) {
-					case '人工督察单':
-						listUrl = "FireInspector/getManualInspectorList"
-						break;
-					case '电子督察单':
-						listUrl = "FireInspector/getElectronicInspectorList"
-						break;
-					default:
-						break;
-				}
-				alert(listUrl)
-
-				
 				const res = await this.$myRequest({
-					url: listUrl, //人员督察单渲染
+					// url: listUrl, //人员督察单渲染
+					url:this.keyWords=='人工督察单'?'FireInspector/getManualInspectorList':'FireInspector/getElectronicInspectorList',
 					data: params,
 					showLoading: true
 				})
@@ -128,9 +104,7 @@
 				}
 				
 				
-				//#ifdef H5
-				alert(this.$BASE_URL)
-				alert(url2)
+				//#ifdef H5				
 				let exportUrl = this.$BASE_URL +url2+
 					`/start_time/${this.datetimerange[0]}/end_time/${this.datetimerange[1]}/company_code/${uni.getStorageSync('selectedCode')}/`
 				var ua = window.navigator.userAgent.toLowerCase();

pages/index/index.vue

@@ -40,7 +40,7 @@
 						<li @tap="goOfflineList()">
 							<image src="../../static/chart3-1.png" style="width:64rpx;height:64rpx"></image>
 						</li>
-						<li >
+						<li>
 							<image src="../../static/chart3-2.png" style="width:64rpx;height:64rpx"></image>
 						</li>
 						<li>
@@ -105,8 +105,8 @@
 				alarmCount: json.staticData.data[0].alarmCount,
 				cuIconList: json.cuIconList,
 				Inv: 0,
-				
-				defaultSite:0,
+
+				defaultSite: 0,
 
 
 				flag: false,
@@ -135,6 +135,54 @@
 		},
 
 		onLoad(option) {
+			
+			if (option.op) {
+			
+				// alert('op')
+				
+				// 首页数据渲染
+				this.getSearchList();
+				this.getHomeData({
+					'company_code': uni.getStorageSync('selectedCode') ? uni.getStorageSync('selectedCode') : this
+						.defaultSite
+				});
+				this.getHandleData({
+					'company_code': uni.getStorageSync('selectedCode') ? uni.getStorageSync('selectedCode') : this
+						.defaultSite
+				});
+			
+			
+			
+			
+			} else {
+				// alert(2)
+				this.init()
+			
+			}
+			
+			
+			// let ua = navigator.userAgent.toLowerCase();
+			// if (ua.match(/MicroMessenger/i) == "micromessenger") {
+				
+
+
+
+
+			// }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 			var res = uni.getStorageSync('selectedCode');
 			var res2 = uni.getStorageSync('selectedName');
 			if (res) {
@@ -143,23 +191,29 @@
 				});
 			}
 
-			// 首页数据渲染
-			this.getSearchList();
-			this.getHomeData({'company_code':uni.getStorageSync('selectedCode')?uni.getStorageSync('selectedCode'):this.defaultSite});
-			this.getHandleData({'company_code':uni.getStorageSync('selectedCode')?uni.getStorageSync('selectedCode'):this.defaultSite});
 			
 
+
 			// 图表切换渲染
 			this.hackReset = false;
 			this.$nextTick(() => {
 				this.hackReset = true;
 			})
-			
+
 
 
 		},
 		methods: {
 
+			async init() {
+				window.location.href = this.$BASE_URL + "Com/getPageAuthorization1"
+			},
+
+
+
+
+
+
 			//扫码
 			scanQRCode() {
 				alert(1)
@@ -188,7 +242,7 @@
 				// 微信公众号获取位置
 
 				jwx.configWeiXin(jweixin => {
-					
+
 					alert(22)
 					wx.getLocation({
 						type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
@@ -282,8 +336,8 @@
 					data: param
 				})
 				this.getData = res.data.data
-				
-				this.defaultSite=this.getData[0].owner_code;
+
+				this.defaultSite = this.getData[0].owner_code;
 
 				if (!uni.getStorageSync('selectedCode')) {
 					uni.setStorageSync('selectedCode', this.getData[0].owner_code);
@@ -313,8 +367,12 @@
 				uni.setNavigationBarTitle({
 					title: this.searchInput
 				});
-				this.getHomeData({'company_code':uni.getStorageSync('selectedCode')});
-				this.getHandleData({'company_code':uni.getStorageSync('selectedCode')});
+				this.getHomeData({
+					'company_code': uni.getStorageSync('selectedCode')
+				});
+				this.getHandleData({
+					'company_code': uni.getStorageSync('selectedCode')
+				});
 				this.flag = false
 			},
 			handleInput() {
@@ -351,7 +409,7 @@
 				const res = await this.$myRequest({
 					url: 'Index/getFunctionalModuleStatistics',
 					showLoading: true,
-					data:param
+					data: param
 				})
 
 				this.cuIconList[0].badge = res.data.data[0].comprehensive_alarm_count;

pages/login/login.vue

@@ -35,13 +35,25 @@
 				codeTime: 0,
 				phone: '',
 				verify: '',
-				VerificationCodeOne: ''
+				// VerificationCodeOne: ''
 			}
 		},
 		
-		onLoad() {
+		onLoad(option) {
+			if(option.flag){
+				// alert(1)
+				
+				
+			}else{
+				// alert(2)
+				this.init()
+				
+			}
+			
+			
+			
 
-			this.init()
+			// this.init()
 
 			uni.setNavigationBarColor({
 				frontColor: "#ffffff", //文字颜色
@@ -52,60 +64,63 @@
 		methods: {
 			
 			// 初始化 start
-			getUrlCode() {
-				var url = location.search
-				this.winUrl = url
-				var theRequest = new Object()
-				if (url.indexOf("?") != -1) {
-					var str = url.substr(1)
-					var strs = str.split("&")
-					for (var i = 0; i < strs.length; i++) {
-						theRequest[strs[i].split("=")[0]] = (strs[i].split("=")[1])
-					}
-				}
-				return theRequest
-			},
-			async init() {
-				let ua = navigator.userAgent.toLowerCase();
-				if (ua.match(/MicroMessenger/i) == "micromessenger") {
-					var curl2 = window.location.href;
-					//是
-					var appId = "wx4eab2e3b5531d58b";
-					var params = {};
-					var CODE = this.getUrlCode();
-					var code = CODE['code'];
-					if (code) {
-						params.code = code;
-						const res = await this.$myRequest({
-							url: 'Login/getLoginAuthorize',
-							data: params
-						})
-						// if (res.data.flag == true) {
-						// 	uni.switchTab({
-						// 		url: '/pages/index/index'
-						// 	});
-						// }
-						code = '';
-						return "ok";
-					}
-					var cs = {};
-					var curl = window.location.href;
-					cs.curl = curl;
-					const res1 = await this.$myRequest({
-						url: 'Login/getLoginAuthorize',
-						data: cs
-					})
-					var turl = res1.data.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';
-				} else {
-					const res = await this.$myRequest({
-						url: 'Login/getLoginAuthorize',
-						data: params
-					})
-				}
+			// getUrlCode() {
+			// 	var url = location.search
+			// 	this.winUrl = url
+			// 	var theRequest = new Object()
+			// 	if (url.indexOf("?") != -1) {
+			// 		var str = url.substr(1)
+			// 		var strs = str.split("&")
+			// 		for (var i = 0; i < strs.length; i++) {
+			// 			theRequest[strs[i].split("=")[0]] = (strs[i].split("=")[1])
+			// 		}
+			// 	}
+			// 	return theRequest
+			// },
+			
+			
+			async init(){
+				window.location.href=this.$BASE_URL+"Login/getFirst1"
 			},
+			
+			
+			
+			// async init() {
+			// 	let ua = navigator.userAgent.toLowerCase();
+			// 	if (ua.match(/MicroMessenger/i) == "micromessenger") {
+			// 		var curl2 = window.location.href;
+			// 		//是
+			// 		var appId = "wx4eab2e3b5531d58b";
+			// 		var params = {};
+			// 		var CODE = this.getUrlCode();
+			// 		var code = CODE['code'];
+			// 		if (code) {
+			// 			params.code = code;
+			// 			const res = await this.$myRequest({
+			// 				url: 'Login/getLoginAuthorize',
+			// 				data: params
+			// 			})
+			// 			code = '';
+			// 			return "ok";
+			// 		}
+			// 		var cs = {};
+			// 		var curl = window.location.href;
+			// 		cs.curl = curl;
+			// 		const res1 = await this.$myRequest({
+			// 			url: 'Login/getLoginAuthorize',
+			// 			data: cs
+			// 		})
+			// 		var turl = res1.data.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';
+			// 	} else {
+			// 		const res = await this.$myRequest({
+			// 			url: 'Login/getLoginAuthorize',
+			// 			data: params
+			// 		})
+			// 	}
+			// },
 			// 初始化 end
 
 			//点击获取验证码
@@ -145,8 +160,6 @@
 						}
 					}, 1000)
 				}
-
-
 			},
 			
 			//点击提交按钮
@@ -174,23 +187,24 @@
 				}
 				this.getData({
 					"phone": this.phone,
-					"VerificationCode": this.verify,
-					"VerificationCodeOne": this.VerificationCodeOne
+					"VerificationCode": this.verify,  
+					// "VerificationCodeOne": this.VerificationCodeOne
 				})
 
 			},
 			
-			async getVerifyData(params = {}) {
+			async getVerifyData(params = {}) {
+				// alert(1)
 				const res = await this.$myRequest({
-					url: 'Login/getVerificationCode',
+					url: 'Login/getVerificationCode',   
 					data: params
 				})
-				this.VerificationCodeOne = eval('(' + res.data + ')').data[0].VerificationCode
+				// this.VerificationCodeOne = eval('(' + res.data + ')').data[0].VerificationCode
 			},
 			
 			async getData(params = {}) {
 				const res = await this.$myRequest({
-					url: 'Login/setSignUp',
+					url: 'Login/setSignUp',  	
 					data: params
 				})
 				if (res.data.flag == true) {

pages/processList/export/export.vue

@@ -4,8 +4,8 @@
 		<view class="ding">
 			<!-- <calendar></calendar> -->
 			<view class="example-body">
-				<uni-datetime-picker v-model="datetimerange" type="datetimerange" start-placeholder="请选择"
-					end-placeholder="请选择" start="2000-3-20 12:00:00" end="2021-10-20 20:00:00" rangeSeparator="至" />
+				<uni-datetime-picker v-model="datetimerange" type="datetimerange" start-placeholder="请选择开始时间"
+					end-placeholder="请选择结束时间" start="2000-3-20 12:00:00" end="2021-10-20 20:00:00" rangeSeparator="至" />
 			</view>
 		</view>
 
@@ -15,7 +15,7 @@
 					<view class="cu-item" v-for="(item,index) in getExportData" :key="index">
 						<view class="cu-avatar lg">
 							
-							<image class="image-bg" :src="item.clzt==1?'/static/process-icon.png':'/static/processed-icon.png'"/>
+							<image class="image-bg" :src="item.clzt==0?'/static/process-icon.png':'/static/processed-icon.png'"/>
 							<!-- <image class="image-bg"
 								:src="item.device_state=='离线'?'/static/device-icon.png':'/static/device-icon.png'" /> -->
 						</view>
@@ -30,7 +30,7 @@
 							<view class="pro-date ">{{item.time}}</view>
 						</view>
 						<view class="action" style="z-index:99">
-							<view class="unProcess"  v-if="item.clzt==1">未处理</view>
+							<view class="unProcess"  v-if="item.clzt==0">未处理</view>
 							<view class="processed" v-else>已处理</view>
 							
 							<!-- <view :class="item.device_state=='离线'?'':'processed'">{{item.device_state}}</view> -->
@@ -41,7 +41,7 @@
 				</view>
 			</view>
 		</block>
-		<view class="padding-lr padding-bottom-lg" style="position:fixed;bottom:0;width:100%">
+		<view v-if="this.getExportData.length>0" class="padding-lr padding-bottom-lg bg-white" style="position:fixed;bottom:0;width:100%">
 			<view class="btn-area">
 				<button class="bg-blue  round missReport margin-top" @tap="exportButton()">导 出 </button>
 			</view>
@@ -94,11 +94,9 @@
 				this.dataRes = 1;
 			},
 			exportButton() {
-				alert(this.type)
-
 				//#ifdef H5
 				let exportUrl = this.$BASE_URL+
-					`ExportModule/getDeviceListExpor/start_time/${this.datetimerange[0]}/end_time/${this.datetimerange[1]}/type/${this.type}/company_code/${uni.getStorageSync('selectedCode')}/`
+					`ExportModule/getIntegratedAlarmListExpor/start_time/${this.datetimerange[0]}/end_time/${this.datetimerange[1]}/type/${this.type}/company_code/${uni.getStorageSync('selectedCode')}/`
 				var ua = window.navigator.userAgent.toLowerCase();
 				if (ua.match(/MicroMessenger/i) == 'micromessenger') {
 					uni.showModal({