Merge branch 'master' of http://39.104.94.153:3000/yf_lj/bigDataApp

components/equip-item/equip-item.vue

@@ -1,18 +1,18 @@
 <template>
 	<view class="item">
-		<template v-if="$attrs.item.device_status==1">
+		<template v-if="item.device_status==1">
 			<view class="tag tag-on" ></view>
 		</template>
 		<template v-else>
 			<view class="tag tag-off" ></view>
 		</template>
 		<view class="info">
-			<text class="">设备ID：{{$attrs.item.device_id}}</text>
-			<text v-if="$attrs.item.device_status==1" class="state on">在线</text>
+			<text class="">设备ID：{{item.device_id}}</text>
+			<text v-if="item.device_status==1" class="state on">在线</text>
 			<text v-else  class="state off">离线</text>
 		</view>
 		<view class="date">
-			最新上报时间：{{$attrs.item.status_time|timeFormat}}
+			最新上报时间：{{item.status_time|timeFormat}}
 		</view>
 	</view>
 </template>
@@ -25,6 +25,9 @@
 				tagOff:'../../static/image/tab-off.png',
 			}
 		},
+		props:[
+			'item'
+		],
 		methods: {
 
 		}

main.js

@@ -24,6 +24,28 @@ Vue.filter('timeFormat',function(time){
 	return `${y}-${fun(m)}-${fun(d)} ${fun(h)}:${fun(min)}:${fun(sec)}`
 })
 
+ Vue.prototype.formatTime = function (thistime,fmt = 'yyyy-MM-dd hh:mm:ss') {
+        let $this = new Date(thistime)
+        let o = {
+          'M+': $this.getMonth() + 1,
+          'd+': $this.getDate(),
+          'h+': $this.getHours(),
+          'm+': $this.getMinutes(),
+          's+': $this.getSeconds(),
+          'q+': Math.floor(($this.getMonth() + 3) / 3),
+          'S': $this.getMilliseconds()
+        }
+        if (/(y+)/.test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, ($this.getFullYear() + '').substr(4 - RegExp.$1.length))
+        }
+        for (var k in o) {
+          if (new RegExp('(' + k + ')').test(fmt)) {
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+          }
+        }
+        return fmt
+      }
+
 const app = new Vue({
     ...App
 })

manifest.json

@@ -57,9 +57,11 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx8b73392672bcdac0",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : false
         },
         "usingComponents" : true
     },
@@ -72,7 +74,7 @@
     "mp-toutiao" : {
         "usingComponents" : true
     },
-    "uniStatistics": {  
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     }
 }

pages.json

@@ -145,6 +145,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/cb/bzy/equip-set/equip-set",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "设备控制",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/cb/xy/equip-set/equip-set",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "设备控制",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"condition": { //模式配置，仅开发期间生效
 	    "current": 3, //当前激活的模式（list 的索引项）

pages/cb/bzy/equip-set/equip-set.vue

@@ -0,0 +1,423 @@
+<template>
+	<view>
+		<view class="tit adminTit">
+			操作
+		</view>
+		<view class="btns">
+			 <button type="warn" @click="equipBtnControl('dtu_update')" size="mini">升级</button>
+			 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">重启</button>
+			 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">立即拍照</button>
+			 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">对焦拍照</button>
+			 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">转仓</button>
+		</view>
+		<view class="tit adminTit">
+			设备开关
+		</view>
+		<view class="uni-list-cell"  @click="on_off_show=true">
+			<text class="uni-input">{{on_off=="0"?'关闭':'开机'}}</text>
+			<view class="arrow"></view>
+			<u-select v-model="on_off_show" mode="single-column" :list="on_off_list" @confirm="confirm($event,'on_off')"></u-select>
+		</view>
+		<view class="tit">
+			载玻片滴液时间
+		</view>
+		<view class="uni-list-cell" @click="selectFun('drop_time')">
+			<text class="uni-input">{{setFrom.drop_time}}</text>
+			<view class="arrow"></view>
+			<u-select v-model="drop_time_show" mode="single-column" :list="drop_time_List" @confirm="confirm($event,'drop')"></u-select>
+		</view>
+		<view class="tit">
+			孢子培养时间(h)
+		</view>
+		<view class="">
+			<slider :value="setFrom.cul_time" show-value="true" :min="1" :max="24" @change="sliderChange($event,'cul_time')"  block-color="#57C878" activeColor="#57C878" step="1" />
+		</view>
+		<view class="tit">
+			保温仓设定温度(℃)
+		</view>
+		<view class="">
+			<slider :value="setFrom.set_temp" show-value="true" :min="10" :max="40" @change="sliderChange($event,'set_temp')"  block-color="#57C878" activeColor="#57C878" step="1" />
+		</view>
+		<view class="tit">
+			数据上传时间间隔(min)
+		</view>
+		<view class="">
+			<slider :value="setFrom.datt" show-value="true" :min="10" :max="60" @change="sliderChange($event,'datt')"  block-color="#57C878" activeColor="#57C878" step="1" />
+		</view>
+		<view class="tit">
+			采集开启和关闭时间
+		</view>
+		<view class="selectTime">
+			<view class="uni-list-cell time" @click="selectTime('st1')">
+				<text>{{coll_time.time01||'开始时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+			<text class="line">-</text>
+			<view class="uni-list-cell time" @click="selectTime('et1')">
+				<text>{{coll_time.time02||'结束时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+		</view>
+		<view class="selectTime">
+			<view class="uni-list-cell time" @click="selectTime('st2')">
+				<text>{{coll_time.time03||'开始时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+			<text class="line">-</text>
+			<view class="uni-list-cell time" @click="selectTime('et2')">
+				<text>{{coll_time.time04||'开始时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+		</view>
+		<view class="selectTime">
+			<view class="uni-list-cell time" @click="selectTime('st3')">
+				<text>{{coll_time.time05||'开始时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+			<text class="line">-</text>
+			<view class="uni-list-cell time" @click="selectTime('et3')">
+				<text>{{coll_time.time06||'开始时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+		</view>
+		<view class="submit-box">
+			<u-button  @click="submit" type="success">确定</u-button>
+		</view>
+		<u-select v-model="collShow" mode="single-column" :list="timeList" @confirm="collConfirm($event,timeType)"></u-select>
+		<u-toast ref="toast" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				d_id:'',
+				on_off_show:false,
+				on_off:null,//设备开关
+				on_off_list:[{
+					value:0,
+					label:'关闭'
+				},{
+					value:1,
+					label:'开机'
+				}],
+				drop_time_show:false,
+				drop_time_List:[],
+			    setFrom: {
+					drop_time: "1", //载玻片滴液时间
+					cul_time: 1, //孢子培养时间
+					set_temp: 10, //保温仓设定温度
+					datt: 10, //数据上传时间间隔(h)-m
+					coll_time: [], //采集开启和关闭时间
+				 },
+				coll_time: {
+			        time01: "",
+			        time02: "",
+			        time03: "",
+			        time04: "",
+			        time05: "",
+			        time06: "",
+					value01: "",
+					value02: "",
+					value03: "",
+					value04: "",
+					value05: "",
+					value06: "",
+			      },
+				timeList:[] ,
+				collShow:false,
+				timeType:''
+			}
+		},
+		onLoad(option){
+			this.d_id=option.d_id
+			this.equipOperation()
+			this.equipSet()
+		},
+		methods: {
+			//回显设备控制参数
+			async equipSet(){
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.send_control.device_control_info',
+					data:{
+						d_id:this.d_id,
+						cmd: "paramconf" 
+					}
+				})
+				this.setFrom.drop_time=res.drop_time 
+				this.setFrom.cul_time=res.cul_time
+				this.setFrom.set_temp=res.set_temp
+				this.setFrom.datt=res.datt
+				let coll_time=res.coll_time 
+				for (let i in coll_time) {
+					if (i == 0) {
+					  let arr = coll_time[i].split("-");
+					  this.coll_time.time01 =
+						Number(arr[0]) < 10 ? "0" + arr[0] + ":00" : arr[0] + ":00";
+					  this.coll_time.time02 =
+						Number(arr[1]) < 10 ? "0" + arr[1] + ":00" : arr[1] + ":00";
+					  this.coll_time.value01=Number(arr[0])
+					  this.coll_time.value02=Number(arr[1])
+					} else if (i == 1) {
+					  let arr = coll_time[i].split("-");
+					  this.coll_time.time03 =
+						Number(arr[0]) < 10 ? "0" + arr[0] + ":00" : arr[0] + ":00";
+					  this.coll_time.time04 =
+						Number(arr[1]) < 10 ? "0" + arr[1] + ":00" : arr[1] + ":00";
+						this.coll_time.value03=Number(arr[0])
+						this.coll_time.value04=Number(arr[1])
+					} else if (i == 2) {
+					  let arr = coll_time[i].split("-");
+					  this.coll_time.time05 =
+						Number(arr[0]) < 10 ? "0" + arr[0] + ":00" : arr[0] + ":00";
+					  this.coll_time.time06 =
+						Number(arr[1]) < 10 ? "0" + arr[1] + ":00" : arr[1] + ":00";
+						this.coll_time.value05=Number(arr[0])
+						this.coll_time.value06=Number(arr[1])
+					}
+				 }
+			console.log(this.setFrom)	
+			},
+			
+			
+			//回显设备开关状态
+			async equipOperation(){
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.worm_lamp.bzy_device',
+					data:{
+						d_id: this.d_id
+					}
+				})
+				this.on_off=res.on_off
+			},
+			//管理员操作
+			async equipBtnControl(cmd){
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.send_control.admin_device_control',
+					data:{
+						cmd,
+						device_type_id: 7,
+						d_id: this.d_id
+					}
+				})
+				if(res){
+					this.$refs.toast.show({
+						title: '指令下发成功!',
+						type: 'success',
+					})
+				}
+			},
+			confirm(e,a){
+				switch(a){
+					case "on_off":
+						if(e[0].value){
+							 this.equipControl("poweron",e[0].value);
+						}else{
+							this.equipControl("poweroff",e[0].value);
+						}
+						break;
+					case "drop":
+						this.setFrom.drop_time=e[0].value;
+						break;
+				}
+			},
+			async equipControl(cmd,val){
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.send_control.admin_device_control',
+					data:{
+						cmd,
+						device_type_id: 7,
+						d_id: this.d_id
+					}
+				})
+				this.on_off=val;
+			},
+			selectFun(a){
+				switch(a){
+					case 'drop_time':
+						for(let i=1;i<31;i++){
+							this.drop_time_List.push({
+								value:i,
+								label:i
+							})
+						}
+						this.drop_time_show=true;
+				}
+			},
+			sliderChange(e,a){
+				switch(a){
+					case 'cul_time':
+					  this.setFrom.cul_time=e.detail.value;
+					  break;
+					case 'set_temp':
+					   this.setFrom.set_temp=e.detail.value;
+					   break;
+					case 'datt':
+					  this.setFrom.datt=e.detail.value;
+					  break;
+				}
+			},
+			selectTime(a){
+				this.timeType=a
+				let arr=[]
+				if(a=='st1'){
+					for(let i=1;i<25;i++){
+						let label=i<10?`0${i}:00`:`${i}:00`
+						arr.push({
+							value:i,
+							label
+						})
+					}
+					this.timeList=arr
+				}else if(a=='et1'){
+					for(let i=this.coll_time.value01+1;i<25;i++){
+						let label=i<10?`0${i}:00`:`${i}:00`
+						arr.push({
+							value:i,
+							label
+						})
+					}
+					this.timeList=arr
+				}else if(a=='st2'){
+					for(let i=this.coll_time.value02+1;i<25;i++){
+						let label=i<10?`0${i}:00`:`${i}:00`
+						arr.push({
+							value:i,
+							label
+						})
+					}
+					this.timeList=arr
+				}else if(a=='et2'){
+					for(let i=this.coll_time.value03+1;i<25;i++){
+						let label=i<10?`0${i}:00`:`${i}:00`
+						arr.push({
+							value:i,
+							label
+						})
+					}
+					this.timeList=arr
+				}else if(a=='st3'){
+					for(let i=this.coll_time.value04+1;i<25;i++){
+						let label=i<10?`0${i}:00`:`${i}:00`
+						arr.push({
+							value:i,
+							label
+						})
+					}
+					this.timeList=arr
+				}else if(a=='et3'){
+					for(let i=this.coll_time.value05+1;i<25;i++){
+						let label=i<10?`0${i}:00`:`${i}:00`
+						arr.push({
+							value:i,
+							label
+						})
+					}
+					this.timeList=arr
+				}
+				this.collShow=true
+			},
+			collConfirm(e,a){
+				if(a=='st1'){
+					this.coll_time.time01=e[0].label
+					this.coll_time.value01=e[0].value
+				}else if(a=='et1'){
+					this.coll_time.time02=e[0].label
+					this.coll_time.value02=e[0].value
+				}else if(a=='st2'){
+					this.coll_time.time03=e[0].label
+					this.coll_time.value03=e[0].value
+				}else if(a=='et2'){
+					this.coll_time.time04=e[0].label
+					this.coll_time.value04=e[0].value
+				}else if(a=='st3'){
+					this.coll_time.time05=e[0].label
+					this.coll_time.value05=e[0].value
+				}else if(a=='et3'){
+					this.coll_time.time06=e[0].label
+					this.coll_time.value06=e[0].value
+				}
+			},
+			async submit(){
+				let arr=[]
+				if(this.coll_time.value01&&this.coll_time.value02){
+					arr.push(`${this.coll_time.value01}-${this.coll_time.value02}`)
+				}
+				if(this.coll_time.value03&&this.coll_time.value04){
+					arr.push(`${this.coll_time.value03}-${this.coll_time.value04}`)
+				}
+				if(this.coll_time.value05&&this.coll_time.value06){
+					arr.push(`${this.coll_time.value05}-${this.coll_time.value06}`)
+				}
+				this.setFrom.coll_time=arr
+				console.log(this.setFrom)
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.send_control.device_control',
+					data:{
+						device_type_id: 7,
+						d_id: this.d_id,
+						config: JSON.stringify(this.setFrom),
+					}
+				})
+				if(res){
+					this.$refs.toast.show({
+						title: '修改成功!',
+						type: 'success',
+					})
+					// setTimeout(()=>{
+					// 	this.equipSet()
+					// },3000)s
+					
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{padding:20rpx;
+	.tit{
+		line-height:30rpx;
+		font-size:30rpx;
+		padding-left:20rpx;
+		border-left-width:2px;
+		border-left-style: solid;
+		border-left-color:$uni-color-success;
+		margin:30rpx 0;
+		}
+	.adminTit{border-left-color:#e64340;}
+	.btns{
+		display:flex;
+		justify-content: flex-start;
+		flex-wrap:no-wrap;
+		button{margin:0;margin-right:10rpx;padding:0 25rpx;}
+	}
+	.uni-list-cell{
+		background:#F7F8FA;
+		padding:10rpx 40rpx;
+		font-size:28rpx;
+		.arrow{
+			display:inline-block;
+			border-width:12rpx 8rpx ;
+			border-style: solid;
+			float:right;
+			margin-top:10rpx;
+			border-color:#888 transparent transparent transparent;
+		}
+	}
+	.selectTime{
+		display:flex;
+		margin-bottom:20rpx;
+		.time{
+			width:350rpx;
+			display:flex;
+			justify-content: space-between;
+		}
+		.line{width:50rpx;text-align: center;}
+	}
+	.submit-box{
+		margin-top:60rpx
+	}
+	}
+</style>

pages/cb/cbd/equip-set/equip-set.vue

@@ -19,11 +19,11 @@
 			强制操作
 		</view>
 		<view class="btns">
-			<button type="warn" size="mini">拍照</button>
-			<button type="warn" size="mini">升级</button>
-			<button type="warn" size="mini">重启</button>
-			<button type="warn" size="mini">震动关闭</button>
-			<button type="warn" size="mini">震动开启</button>
+			<button type="warn" @click="equipBtnControl('takephoto')" size="mini">拍照</button>
+			<button type="warn" @click="equipBtnControl('update')" size="mini">升级</button>
+			<button type="warn" @click="equipBtnControl('reboot')" size="mini">重启</button>
+			<button type="warn" @click="equipBtnControl('close_shake')" size="mini">震动关闭</button>
+			<button type="warn" @click="equipBtnControl('open_shake')" size="mini">震动开启</button>
 		</view>
 		<view class="tit">
 			设备开关
@@ -120,6 +120,81 @@
 			<u-button  @click="submit" type="success">确定</u-button>
 		</view>
 		<u-toast ref="toast" />
+		<u-popup v-model="mqttShow">
+			<view class="mqtt-popup">
+				<u-field
+					required
+					v-model="mqttConfig.muid"
+					label="MQTT用户名"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					required
+					v-model="mqttConfig.mpwd"
+					label="MQTT密码"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					required
+					v-model="mqttConfig.mpi"
+					label="MQTT地址"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					required
+					v-model="mqttConfig.mport"
+					label="MQTT端口"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					required
+					v-model="mqttConfig.mpub"
+					label="上传地址"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					required
+					v-model="mqttConfig.msub"
+					label="下发地址"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					v-model="mqttConfig.fuid"
+					label="FTP用户名"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					v-model="mqttConfig.fpwd"
+					label="FTP密码"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					required
+					v-model="mqttConfig.fip"
+					label="图片上传地址"
+					label-width="180"
+				>
+				</u-field>
+				<u-field
+					required
+					v-model="mqttConfig.fport"
+					label="图片上传接口"
+					label-width="180"
+				>
+				</u-field>
+			</view>
+			<view class="mqtt-btn-box">
+				<u-button @click="" size="medium" type="success">确定</u-button>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -249,7 +324,20 @@
 					value:23,
 					label:'23:00'
 					},
-				]
+				],
+				mqttShow:false,
+				mqttConfig: {
+						muid: '',
+						mpwd: '',
+						mip: '',
+						mport: '',
+						mpub: '',
+						msub: '',
+						fuid: '',
+						fpwd: '',
+						fip: '',
+						fport: ''
+					},
 			}
 		},
 		onLoad(option){
@@ -364,6 +452,9 @@
 						title: '修改成功!',
 						type: 'success',
 					})
+					// setTimeout(()=>{
+					// 	this.getInfo()
+					// },3000)
 				}
 			},
 			async equipBtnControl(cmd){
@@ -382,8 +473,59 @@
 					})
 				}
 			},
-			mqttInfo(){
-				
+			async mqttInfo(){
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.send_control.device_control_info',
+					data:{
+						cmd:'netconf',
+						d_id: this.d_id
+					}
+				})
+				if(res){
+					let {ftp, mqtt } =res
+					this.mqttConfig = {
+						muid: mqtt.uid,
+						mpwd: mqtt.pwd,
+						mip: mqtt.ip,
+						mport: mqtt.port,
+						mpub: mqtt.pub,
+						msub: mqtt.sub,
+						fuid:ftp.uid,
+						fpwd:ftp.pwd,
+						fip:ftp.ip,
+						fport:ftp.port
+					}
+				}
+				this.mqttShow=true
+			},
+			async mqttSubm(){
+					let obj = {
+							mqtt: {
+								uid: this.mqttConfig.muid,
+								pwd: this.mqttConfig.mpwd,
+								ip: this.mqttConfig.mip,
+								port: this.mqttConfig.mport,
+								pub: this.mqttConfig.mpub,
+								sub: this.mqttConfig.msub,
+								keepalive: 60,
+								lastwill: '/yfkj/cbd/offline/'
+							},
+							ftp: {
+								uid: this.mqttConfig.fuid,
+								pwd: this.mqttConfig.fpwd,
+								ip: this.mqttConfig.fip,
+								port: this.mqttConfig.fport
+							}
+						}
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.send_control.device_control',
+					data:{
+							device_type_id: 3,
+							d_id: this.d_id,
+							cmd: 'setnet',
+							config: JSON.stringify(obj)
+					}
+				})		
 			}
 		}
 	}
@@ -433,8 +575,14 @@
 		.submit-box{
 			margin-top:60rpx
 		}
-
-  
+		.mqtt-popup{
+			width:580rpx;
+			
+		}
+		.mqtt-btn-box{
+			margin-top:50rpx;
+			text-align: center;
+		}
 	}
 	
 

pages/cb/equip-detail/equip-detail.vue

@@ -11,12 +11,60 @@
 				设备类型：{{equipInfo.type|equipType}}
 			</view>
 			<view class="">
-				最近上报时间：{{equipInfo.status_time | timeFormat}}
+				最新上报时间：{{equipInfo.status_time | timeFormat}}
 			</view>
 			<view class="">
 				设备地址：{{equipInfo.address}}
 			</view>
+			<view v-if="type==7" @click="setTime(equipInfo.d_id)">
+			<text space="emsp">载玻片、培养液更换时间</text> <u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon>
+			</view>
+			<view v-if="type==4" @click="addYx(equipInfo.d_id)">
+			<text space="emsp">添加诱芯</text> <u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon>
+			</view>
+			<u-popup v-model="setTimeShow" mode="center" width="600rpx" >
+				<u-field
+					label="载玻片更换时间"
+					placeholder="选择日期"
+					label-width='240'
+					required
+					:error-message="glassErr"
+					v-model="glass_slide_time"
+					@click="glass_show=true"
+				>
+				</u-field>
+				<u-field
+					label="培养液更换时间"
+					placeholder="选择日期"
+					label-width='240'
+					required
+					:error-message="culErr"
+					v-model="cultivate_time"
+					@click="cultivate_show=true"
+				>
+				</u-field>
+				<view class="btn-box">
+					<u-button @click="setTimeSubmit" size="mini" type="success">确定</u-button>
+				</view>
+				<u-calendar v-model="glass_show" mode="date" @change="timeChange($event,'glass')"></u-calendar>
+				<u-calendar v-model="cultivate_show" mode="date" @change="timeChange($event,'cultivate')"></u-calendar>
+			</u-popup>
+			<u-popup v-model="yxShow" mode="center" width="600rpx" >
+				<u-field
+					label="监测害虫名称"
+					label-width='240'
+					required
+					:error-message="xyErr"
+					v-model="decoy"
+				>
+				</u-field>
+				<view class="btn-box">
+					<u-button @click="yxSubmit" size="mini" type="success">确定</u-button>
+				</view>
+			</u-popup>
+			<u-toast ref="toast" />
 		</view>
+		
 		<view class="equip_part">
 			<template v-if="equipInfo.type==7">
 				<view  class="item1" v-for="item in bzy" @click="partClick(item.path)">
@@ -92,7 +140,7 @@
 					{
 						icon:'/static/image/cb/4.png',
 						tex:'设备控制',
-						path:''
+						path:'/pages/cb/bzy/equip-set/equip-set'
 					},{
 						icon:'/static/image/cb/1.png',
 						tex:'查看图片',
@@ -111,7 +159,7 @@
 					{
 						icon:'/static/image/cb/4.png',
 						tex:'设备控制',
-						path:''
+						path:'/pages/cb/xy/equip-set/equip-set'
 					},{
 						icon:'/static/image/cb/6.png',
 						tex:'sim卡详情',
@@ -123,6 +171,16 @@
 					}
 				],
 				newState:{},//设备最新状态
+				setTimeShow:false,
+				glass_show:false,
+				cultivate_show:false,
+				cultivate_time: "",
+				glass_slide_time: "",
+				glassErr:'',
+				culErr:'',
+				yxShow:false,//诱芯弹框
+				xyErr:'',
+				decoy:''
 			}
 		},
 		computed:{
@@ -391,6 +449,87 @@
 				uni.navigateTo({
 					url:path+ '?d_id=' + this.equipInfo.d_id
 				});
+			},
+			async setTime(d_id){
+				const res=await this.$myRequest({
+					url:'/api/api_gateway?method=device.device_manage.get_spore_time',
+					data:{
+						device_type_id:this.type,
+						d_id
+					}
+				})
+				this.glass_slide_time=res.glass_slide_time?this.formatTime(res.glass_slide_time*1000,'yyyy-MM-dd'):''
+				this.cultivate_time=res.cultivate_time?this.formatTime(res.cultivate_time*1000,'yyyy-MM-dd'):''
+				this.setTimeShow=true
+			},
+			timeChange(e,a){
+				if(a=='glass'){
+					this.glass_slide_time=e.result
+					this.glassErr=''
+				}else{
+					this.cultivate_time=e.result
+					this.culErr=''
+				}
+			},
+			async setTimeSubmit(){
+				if(!this.glass_slide_time){
+					this.glassErr="请填写载玻片更换时间"
+				}
+				if(!this.cultivate_time){
+					this.culErr="请填写培养液更换时间"
+					return 
+				}
+				 let glass = parseInt(
+				        new Date(this.glass_slide_time).getTime() / 1000
+				      );
+				let cultivate = parseInt(
+					      new Date(this.cultivate_time).getTime() / 1000
+					    );
+					const res=await this.$myRequest({
+						url:'/api/api_gateway?method=device.device_manage.updata_spore_time',
+						data:{
+							device_type_id: this.type,
+							d_id: this.equipInfo.d_id,
+							glass_slide_time:glass,
+							cultivate_time: cultivate
+						}
+					})
+					if(res){
+						this.$refs.toast.show({
+							title: '修改成功!',
+							type: 'success',
+						})
+					}
+					this.setTimeShow=false
+			},
+			async addYx(d_id){
+				const res=await this.$myRequest({
+					url:'/api/api_gateway?method=device.device_manage.get_spore_time',
+					data:{
+						device_type_id:this.type,
+						d_id
+					}
+				})
+				this.decoy=res.decoy;
+				this.yxShow=true
+			},
+			async yxSubmit(){
+				if(!this.decoy){
+					this.xyErr="请填写监测害虫名称";
+					return false
+				}
+				const res=await this.$myRequest({
+					url:'/api/api_gateway?method=device.device_manage.updata_spore_time',
+					data:{
+						device_type_id:this.type,
+						d_id:this.equipInfo.d_id,
+						decoy:this.decoy
+					}
+				})
+				if(res){
+					this.xyErr=""
+					this.yxShow=false
+				}
 			}
 		},
 	}
@@ -467,6 +606,10 @@
 				image{width:70rpx;}
 			}
 		}
+		.btn-box{
+			text-align:center;
+			padding:30rpx;
+		}
 	}
 
 </style>

pages/cb/index/index.vue

@@ -45,6 +45,7 @@
 					list:[],
 					pageIndex:1,
 				}],
+				device_id:'',//筛选的设备id
 			}
 		},
 		onLoad(){
@@ -84,19 +85,30 @@
 					data:{
 						device_type_id:this.equipArr[act].type,
 						page:this.equipArr[act].pageIndex,
-						page_size:10
+						page_size:10,
 					}
 				})
+				console.log(res)
 				this.equipArr[act].list=[...this.equipArr[act].list,...res.data]
 				console.log(this.equipArr[act].list)
 			},
+			async searchEquip(){
+				const res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.worm_lamp.lamp_list',
+					data:{
+						device_type_id:this.equipArr[this.active].type,
+						device_id:this.device_id,
+					}
+				})
+				this.equipArr[this.active].list=res.data
+			},
 			tabClick(index){
 				this.active=index;
 			},
 			clickRight(){
 				uni.navigateTo({
-				    url: '/pages/search/search'
-				});
+				    url: '/pages/search/search?device_type_id='+this.equipArr[this.active].type
+					})
 			},
 			itemClick(item){
 				item.type=this.equipArr[this.active].type

pages/cb/xy/equip-set/equip-set.vue

@@ -0,0 +1,137 @@
+<template>
+	<view>
+		<view class="tit adminTit">
+			操作
+		</view>
+		<view class="btns">
+			 <button type="warn" @click="equipBtnControl('dtu_update')" size="mini">升级</button>
+			 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">重启</button>
+			 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">清网</button>
+			 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">查询服务器配置</button>
+		</view>
+		<view class="tit adminTit">
+			设备开关
+		</view>
+		<view class="uni-list-cell"  @click="on_off_show=true">
+			<text class="uni-input">{{equipContrlForm1.ds=="0"?'关机':'开机'}}</text>
+			<view class="arrow"></view>
+			<u-select v-model="on_off_show" mode="single-column" :list="on_off_list" @confirm="confirm($event,'on_off')"></u-select>
+		</view>
+		<view class="tit adminTit">
+			时控开关
+		</view>
+		<view class="uni-list-cell"  @click="on_off_show=true">
+			<text class="uni-input">{{equipContrlForm1.timctrl=="0"?'关':'开'}}</text>
+			<view class="arrow"></view>
+			<u-select v-model="on_off_show" mode="single-column" :list="on_off_list" @confirm="confirm($event,'on_off')"></u-select>
+		</view>
+		<view class="tit">
+			时控时长
+		</view>
+		<view class="selectTime">
+			<view class="uni-list-cell time" @click="selectTime('st1')">
+				<text>{{equipContrlForm1.st||'开始时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+			<text class="line">-</text>
+			<view class="uni-list-cell time" @click="selectTime('et1')">
+				<text>{{equipContrlForm1.et||'结束时间'}}</text>
+				<u-icon name="clock"></u-icon>
+			</view>
+			<u-select v-model="timeShow" mode="single-column" :list="timeList" @confirm="collConfirm($event,timeType)"></u-select>
+		</view>
+		<view class="tit">
+			数据频率(min)
+		</view>
+		<view class="">
+			<slider :value="equipContrlForm1.dat_f" show-value="true" :min="10" :max="40" @change="sliderChange"  block-color="#57C878" activeColor="#57C878" step="1" />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				d_id:'',
+				equipContrlForm1: {
+			        // st: '', //时控开始时间
+			        // et: '', //时控结束时间
+			        // dat_f: null ,//数据上传时间间隔
+			        // ds:'',//开关，1开机，0关机
+					//timctrl:''
+			    },	
+				timeList:[],
+				timeShow:false,
+			}
+		},
+		onLoad(option){
+			this.d_id=option.d_id
+			this.equipSet()
+		},
+		methods: {
+			//回显设备控制参数
+			async equipSet(){
+				let res=await this.$myRequest({
+					url:'/api/api_gateway?method=forecast.send_control.device_control_info',
+					data:{
+						d_id:this.d_id,
+						cmd: "paramconf" 
+					}
+				})
+				console.log(res)
+			},
+			equipBtnControl(){
+				
+			},
+			sliderChange(e){
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	padding:20rpx;
+	.tit{
+		line-height:30rpx;
+		font-size:30rpx;
+		padding-left:20rpx;
+		border-left-width:2px;
+		border-left-style: solid;
+		border-left-color:$uni-color-success;
+		margin:30rpx 0;
+		}
+	.adminTit{border-left-color:#e64340;}
+	.btns{
+		display:flex;
+		justify-content: flex-start;
+		flex-wrap:no-wrap;
+		button{margin:0;margin-right:10rpx;padding:0 25rpx;}
+	}
+	.uni-list-cell{
+		background:#F7F8FA;
+		padding:10rpx 40rpx;
+		font-size:28rpx;
+		.arrow{
+			display:inline-block;
+			border-width:12rpx 8rpx ;
+			border-style: solid;
+			float:right;
+			margin-top:10rpx;
+			border-color:#888 transparent transparent transparent;
+		}
+	}
+	.selectTime{
+		display:flex;
+		margin-bottom:20rpx;
+		.time{
+			width:350rpx;
+			display:flex;
+			justify-content: space-between;
+		}
+		.line{width:50rpx;text-align: center;}
+	}
+}
+</style>

pages/search/search.vue

@@ -12,9 +12,32 @@
 	export default {
 		data() {
 			return {
-				
+				device_type_id:''
 			}
 		},
+		onLoad(option){
+			this.device_type_id=option.device_type_id
+		},
+		async onNavigationBarSearchInputConfirmed(e) {
+		  //在这里执行搜索操作
+		  let pages = getCurrentPages()
+		  let nowPage = pages[ pages.length - 1];  //当前页页面实例
+		  let prevPage = pages[ pages.length - 2 ];  //上一页页面实例
+		  // prevPage.$vm.searchVal = 1211
+		  prevPage.$vm.device_id=e.text
+		  prevPage.$vm.searchEquip()
+		  uni.navigateBack({
+		      delta: 1
+		  });
+		  // let _this=this
+		  // const res=await this.$myRequest({
+		  // 	url:'/api/api_gateway?method=forecast.worm_lamp.lamp_list',
+		  // 	data:{
+		  // 		device_type_id:this.device_type_id,
+		  // 		device_id:e.text,
+		  // 	}
+		  // })
+		},
 		methods: {
 			
 		},

unpackage/dist/dev/mp-weixin/app.json

@@ -6,7 +6,12 @@
     "pages/my/user-info/user-info",
     "pages/my/feedback/feedback",
     "pages/search/search",
-    "pages/cb/equip-detail/equip-detail"
+    "pages/cb/equip-detail/equip-detail",
+    "pages/login/login",
+    "pages/cb/cbd/equip-set/equip-set",
+    "pages/fourMoodBase/index/index",
+    "pages/cb/bzy/equip-set/equip-set",
+    "pages/cb/xy/equip-set/equip-set"
   ],
   "subPackages": [],
   "window": {
@@ -15,6 +20,5 @@
     "navigationBarBackgroundColor": "#fff",
     "backgroundColor": "#ff0000"
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap88.json"
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/components/equip-item/equip-item.wxml

@@ -1 +1 @@
-<view class="item"><block wx:if="{{$attrs.item.online==1}}"><view class="tag tag-on"></view></block><block wx:else><view class="tag tag-off"></view></block><view class="info"><text>{{"设备ID："+$attrs.item.id}}</text><block wx:if="{{$attrs.item.online==1}}"><text class="state on">在线</text></block><block wx:else><text class="state off">离线</text></block></view><view class="date">{{'最新上报时间：'+$attrs.item.date+''}}</view></view>
+<view class="item"><block wx:if="{{item.device_status==1}}"><view class="tag tag-on"></view></block><block wx:else><view class="tag tag-off"></view></block><view class="info"><text>{{"设备ID："+item.device_id}}</text><block wx:if="{{item.device_status==1}}"><text class="state on">在线</text></block><block wx:else><text class="state off">离线</text></block></view><view class="date">{{'最新上报时间：'+$root.f0+''}}</view></view>

unpackage/dist/dev/mp-weixin/components/uni-nav-bar/uni-nav-bar.wxss

@@ -126,8 +126,7 @@
   z-index: 998;
 }
 .uni-navbar--shadow.data-v-4afea59e {
-  -webkit-box-shadow: 0 1px 6px #ccc;
-          box-shadow: 0 1px 6px #ccc;
+  box-shadow: 0 1px 6px #ccc;
 }
 .uni-navbar--border.data-v-4afea59e {
   border-bottom-width: 1rpx;

unpackage/dist/dev/mp-weixin/pages/cb/bzy/equip-set/equip-set.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "设备控制",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-select": "/uview-ui/components/u-select/u-select",
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-button": "/uview-ui/components/u-button/u-button",
+    "u-toast": "/uview-ui/components/u-toast/u-toast"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/cb/bzy/equip-set/equip-set.wxss

@@ -0,0 +1,92 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+page {
+  padding: 20rpx;
+}
+page .tit {
+  line-height: 30rpx;
+  font-size: 30rpx;
+  padding-left: 20rpx;
+  border-left-width: 2px;
+  border-left-style: solid;
+  border-left-color: #57C878;
+  margin: 30rpx 0;
+}
+page .adminTit {
+  border-left-color: #e64340;
+}
+page .btns {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+          justify-content: flex-start;
+  -webkit-flex-wrap: no-wrap;
+          flex-wrap: no-wrap;
+}
+page .btns button {
+  margin: 0;
+  margin-right: 10rpx;
+  padding: 0 25rpx;
+}
+page .uni-list-cell {
+  background: #F7F8FA;
+  padding: 10rpx 40rpx;
+  font-size: 28rpx;
+}
+page .uni-list-cell .arrow {
+  display: inline-block;
+  border-width: 12rpx 8rpx;
+  border-style: solid;
+  float: right;
+  margin-top: 10rpx;
+  border-color: #888 transparent transparent transparent;
+}
+page .selectTime {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  margin-bottom: 20rpx;
+}
+page .selectTime .time {
+  width: 350rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+          justify-content: space-between;
+}
+page .selectTime .line {
+  width: 50rpx;
+  text-align: center;
+}
+page .submit-box {
+  margin-top: 60rpx;
+}
+

unpackage/dist/dev/mp-weixin/pages/cb/cbd/equip-set/equip-set.json

@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "设备控制",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-select": "/uview-ui/components/u-select/u-select",
+    "u-button": "/uview-ui/components/u-button/u-button",
+    "u-toast": "/uview-ui/components/u-toast/u-toast",
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-field": "/uview-ui/components/u-field/u-field"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/cb/cbd/equip-set/equip-set.wxss

@@ -0,0 +1,98 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+page {
+  padding: 20rpx;
+}
+page .tit {
+  line-height: 30rpx;
+  font-size: 30rpx;
+  padding-left: 20rpx;
+  border-left-width: 2px;
+  border-left-style: solid;
+  border-left-color: #57C878;
+  margin: 30rpx 0;
+}
+page .adminTit {
+  border-left-color: #e64340;
+}
+page .btns {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+          justify-content: flex-start;
+  -webkit-flex-wrap: no-wrap;
+          flex-wrap: no-wrap;
+}
+page .btns button {
+  margin: 0;
+  margin-right: 10rpx;
+  padding: 0 25rpx;
+}
+page .uni-list-cell {
+  background: #F7F8FA;
+  padding: 10rpx 40rpx;
+  font-size: 28rpx;
+}
+page .uni-list-cell .arrow {
+  display: inline-block;
+  border-width: 12rpx 8rpx;
+  border-style: solid;
+  float: right;
+  margin-top: 10rpx;
+  border-color: #888 transparent transparent transparent;
+}
+page .selectTime {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+page .selectTime .time {
+  width: 350rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+          justify-content: space-between;
+}
+page .selectTime .line {
+  width: 50rpx;
+  text-align: center;
+}
+page .submit-box {
+  margin-top: 60rpx;
+}
+page .mqtt-popup {
+  width: 580rpx;
+}
+page .mqtt-btn-box {
+  margin-top: 50rpx;
+  text-align: center;
+}
+

unpackage/dist/dev/mp-weixin/pages/cb/ddd/ddd.js

@@ -1,31 +0,0 @@
-(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/cb/ddd/ddd"],{
-
-/***/ 96:
-/*!************************************************************!*\
-  !*** E:/bigData/main.js?{"page":"pages%2Fcb%2Fddd%2Fddd"} ***!
-  \************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);
-var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _ddd = _interopRequireDefault(__webpack_require__(/*! ./pages/cb/ddd/ddd.vue */ 97));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
-createPage(_ddd.default);
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
-
-/***/ }),
-
-/***/ 97:
-/*!***************************************!*\
-  !*** E:/bigData/pages/cb/ddd/ddd.vue ***!
-  \***************************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-throw new Error("Module build failed (from ./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js):\nError: ENOENT: no such file or directory, open 'E:\\bigData\\pages\\cb\\ddd\\ddd.vue'");
-
-/***/ })
-
-},[[96,"common/runtime","common/vendor"]]]);
-//# sourceMappingURL=../../../../.sourcemap/mp-weixin/pages/cb/ddd/ddd.js.map

unpackage/dist/dev/mp-weixin/pages/cb/equip-detail/equip-detail.json

@@ -1,5 +1,12 @@
 {
   "navigationBarTitleText": "设备详情",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-field": "/uview-ui/components/u-field/u-field",
+    "u-button": "/uview-ui/components/u-button/u-button",
+    "u-calendar": "/uview-ui/components/u-calendar/u-calendar",
+    "u-toast": "/uview-ui/components/u-toast/u-toast"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/cb/equip-item/equip-item.js

@@ -1,31 +0,0 @@
-(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/cb/equip-item/equip-item"],{
-
-/***/ 98:
-/*!**************************************************************************!*\
-  !*** E:/bigData/main.js?{"page":"pages%2Fcb%2Fequip-item%2Fequip-item"} ***!
-  \**************************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(createPage) {__webpack_require__(/*! uni-pages */ 4);
-var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 2));
-var _equipItem = _interopRequireDefault(__webpack_require__(/*! ./pages/cb/equip-item/equip-item.vue */ 99));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
-createPage(_equipItem.default);
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createPage"]))
-
-/***/ }),
-
-/***/ 99:
-/*!*****************************************************!*\
-  !*** E:/bigData/pages/cb/equip-item/equip-item.vue ***!
-  \*****************************************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-throw new Error("Module build failed (from ./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js):\nError: ENOENT: no such file or directory, open 'E:\\bigData\\pages\\cb\\equip-item\\equip-item.vue'");
-
-/***/ })
-
-},[[98,"common/runtime","common/vendor"]]]);
-//# sourceMappingURL=../../../../.sourcemap/mp-weixin/pages/cb/equip-item/equip-item.js.map

unpackage/dist/dev/mp-weixin/pages/cb/equip-item/equip-item.wxml

@@ -1 +0,0 @@
-<view></view>

unpackage/dist/dev/mp-weixin/pages/cb/index/index.wxss

@@ -27,6 +27,9 @@
 page {
   background: #F5F5F5;
 }
+page .content {
+  padding: 0 20rpx 20rpx 20rpx;
+}
 image {
   width: 100%;
 }

unpackage/dist/dev/mp-weixin/pages/cb/xy/equip-set/equip-set.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "设备控制",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-select": "/uview-ui/components/u-select/u-select",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/cb/xy/equip-set/equip-set.wxss

@@ -0,0 +1,89 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+page {
+  padding: 20rpx;
+}
+page .tit {
+  line-height: 30rpx;
+  font-size: 30rpx;
+  padding-left: 20rpx;
+  border-left-width: 2px;
+  border-left-style: solid;
+  border-left-color: #57C878;
+  margin: 30rpx 0;
+}
+page .adminTit {
+  border-left-color: #e64340;
+}
+page .btns {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+          justify-content: flex-start;
+  -webkit-flex-wrap: no-wrap;
+          flex-wrap: no-wrap;
+}
+page .btns button {
+  margin: 0;
+  margin-right: 10rpx;
+  padding: 0 25rpx;
+}
+page .uni-list-cell {
+  background: #F7F8FA;
+  padding: 10rpx 40rpx;
+  font-size: 28rpx;
+}
+page .uni-list-cell .arrow {
+  display: inline-block;
+  border-width: 12rpx 8rpx;
+  border-style: solid;
+  float: right;
+  margin-top: 10rpx;
+  border-color: #888 transparent transparent transparent;
+}
+page .selectTime {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  margin-bottom: 20rpx;
+}
+page .selectTime .time {
+  width: 350rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+          justify-content: space-between;
+}
+page .selectTime .line {
+  width: 50rpx;
+  text-align: center;
+}
+

unpackage/dist/dev/mp-weixin/pages/cb/equip-item/equip-item.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
+  "navigationStyle": "custom",
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/login/login.wxml

@@ -0,0 +1 @@
+<view><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]]]}}" bindsubmit="__e"><view class="uni-form-item uni-column"><view><input class="uni-input" name="username" placeholder-class="icon iconfont icon-bianji1" placeholder="请输入用户名"/></view><view><input class="uni-input" name="pass" placeholder-class="icon iconfont icon-bianji1" placeholder="请输入密码"/></view><view class="uni-btn-v"><button form-type="submit">Submit</button></view></view></form></view>

unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -0,0 +1,5 @@
+
+.uni-form-item{
+	margin-top:50rpx;
+}
+

unpackage/dist/dev/mp-weixin/pages/my/feedback/feedback.wxss

@@ -52,7 +52,6 @@ page .sub-btn {
   font-size: 28rpx;
   color: #fff;
   text-align: center;
-  -webkit-border-radius: 4px;
-          border-radius: 4px;
+  border-radius: 4px;
 }
 

unpackage/dist/dev/mp-weixin/pages/my/user-info/user-info.wxss

@@ -43,8 +43,7 @@ page .user-info .info-item {
 page .user-info .info-item .avater {
   width: 100rpx;
   height: 100rpx;
-  -webkit-border-radius: 50%;
-          border-radius: 50%;
+  border-radius: 50%;
   overflow: hidden;
 }
 page .user-info .info-item .avater image {

unpackage/dist/dev/mp-weixin/project.config.json

@@ -4,25 +4,29 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false
+    "urlCheck": false,
+    "minified": true,
+    "postcss": false
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "touristappid",
+  "appid": "wx8b73392672bcdac0",
   "projectname": "bigDataa",
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": 3,
       "list": [
         {
           "name": "about",
@@ -35,10 +39,14 @@
           "pathName": "pages/my/feedback/feedback"
         },
         {
+          "name": "cdIndex",
           "id": 2,
-          "name": "pages/my/about/about",
-          "pathName": "pages/my/about/about",
-          "query": ""
+          "pathName": "pages/cb/index/index"
+        },
+        {
+          "name": "login",
+          "id": 3,
+          "pathName": "pages/login/login"
         }
       ]
     }

unpackage/dist/dev/mp-weixin/sitemap55.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

unpackage/dist/dev/mp-weixin/sitemap56.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}