10/20

bigdata2/config/index.js

@@ -48,7 +48,7 @@ module.exports = {
       },
     },
     // Various Dev Server settings
-    host: '192.168.1.10', // can be overwritten by process.env.HOST
+    host: '192.168.1.7', // can be overwritten by process.env.HOST
     port: 8000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

bigdata2/src/pages/forecasting/xycb/xycb.vue

@@ -5,9 +5,9 @@
 		</el-breadcrumb>
 		<SearchBar @fun="getDisplayType" @fun2="getIDName" @fun3="getIsOnline">
 			<template slot="search-box">
-				<template v-if="role=='admin'">
+				<template v-if="role == 'admin'">
 					<el-select
-						v-model="queryInfo.device_model"
+						v-model="queryInfo.etype"
 						class="select01"
 						clearable
 						size="mini"
@@ -21,53 +21,77 @@
 				</template>
 			</template>
 		</SearchBar>
-		<template v-if="displayType==1">
+		<template v-if="displayType == 1">
 			<el-row :gutter="10">
-				<el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6" v-for="item in equipList" :key="item.imei">
+				<el-col
+					:xs="24"
+					:sm="24"
+					:md="12"
+					:lg="8"
+					:xl="6"
+					v-for="item in equipList"
+					:key="item.imei"
+				>
 					<el-card class="box-card">
-						<equip-item :is_online="item.device_status">
+						<equip-item :is_online="item.is_online">
 							<span
 								slot="set"
-								v-show="userType==1"
+								v-show="userType == 1"
 								class="superOperate el-icon-setting"
-								@click="equipOperation(item.device_model,item.d_id)"
+								@click="equipOperation(item.etype, item.d_id)"
 							></span>
 							<span slot="title">性诱测报</span>
 							<div slot="content" class="content">
 								<p>
 									<i class="iconfont icon-yonghu"></i>
-									设备ID：{{item.device_id.slice(-8)}}
+									设备ID：{{ item.imei}}
 								</p>
 								<p>
 									<i class="iconfont icon-biaoqian"></i>
-									设备编号：{{item.device_code || "无"}}
+									设备名称：{{ item.equip_name||'无'}}
 								</p>
 								<p>
 									<i class="iconfont icon-diannao"></i>在线状态：
 									<span
-										:class="{red:item.device_status==0,green:item.device_status==1}"
-									>{{item.device_status==0?"离线":"在线"}}</span>
-								</p>
-								<p>
-									<i class="iconfont icon-dizhi"></i>
-									设备型号: {{item.device_model==1?'I'+'型':"II" +'型'}}
+										:class="{
+											red: item.is_online  == 0,
+											green: item.is_online  == 1
+										}"
+										>{{ item.is_online == 0 ? '离线' : '在线' }}</span
+									>
 								</p>
 								<p>
 									<i class="iconfont icon-shijian"></i>
-									最新上报时间 : {{item.status_time*1000 | formatTime}}
+									最新上报时间 : {{item.upl_time}}
 								</p>
 								<p class="btns">
 									<i class="iconfont icon-yemiancaozuo"></i>
-									<template v-if="item.device_model==2">
-										<el-button size="mini" type="info" @click="viewImage(item.device_id,item.d_id)">查看图片</el-button>
+									<template v-if="item.etype == 2">
+										<el-button
+											size="mini"
+											type="info"
+											@click="viewImage(item.device_id, item.d_id)"
+											>查看图片</el-button
+										>
 									</template>
 									<el-button
 										size="mini"
 										type="warning"
-										@click="EquipControl(item.device_model,item.d_id)"
-									>设备控制</el-button>
-									<el-button size="mini" type="success" @click="lookSIMCode(item.d_id)">SIM卡</el-button>
-									<el-button size="mini" type="danger" @click="dataDetails(item.device_id,item.d_id,item.device_model)">数据详情</el-button>
+										@click="EquipControl(item.etype, item.d_id)"
+										>设备控制</el-button
+									>
+									<el-button
+										size="mini"
+										type="success"
+										@click="lookSIMCode(item.d_id)"
+										>SIM卡</el-button
+									>
+									<el-button
+										size="mini"
+										type="danger"
+										@click="dataDetails(item.device_id, item.d_id, item.etype)"
+										>数据详情</el-button
+									>
 								</p>
 							</div>
 						</equip-item>
@@ -75,53 +99,68 @@
 				</el-col>
 			</el-row>
 		</template>
-		<template v-if="displayType==2">
+		<template v-if="displayType == 2">
 			<el-card class="box-card">
 				<el-table :data="equipList" stripe style="width: 100%">
-					<el-table-column prop="device_id" label="设备ID" width="180">
-						<template slot-scope="scope">{{scope.row.device_id.slice(-8)}}</template>
+					<el-table-column prop="imei" label="设备ID" width="180">
+						<template slot-scope="scope">{{
+							scope.row.imei
+						}}</template>
 					</el-table-column>
-					<el-table-column prop="device_code" label="设备编号" width="180">
-						<template slot-scope="scope">{{scope.row.device_code || "无"}}</template>
+					<el-table-column prop="equip_name" label="设备名称" width="180">
+						<template slot-scope="scope">{{
+							scope.row.equip_name || '无'
+						}}</template>
 					</el-table-column>
-					<el-table-column prop="device_status" label="在线状态">
+					<el-table-column prop="is_online" label="在线状态">
 						<template slot-scope="scope">
-							<p style="color:#17bb89" v-if="scope.row.device_status==1">在线</p>
-							<p style="color:#eb6765" v-if="scope.row.device_status==0">离线</p>
+							<p style="color: #17bb89" v-if="scope.row.is_online == 1">
+								在线
+							</p>
+							<p style="color: #eb6765" v-if="scope.row.is_online == 0">
+								离线
+							</p>
 						</template>
 					</el-table-column>
-					<el-table-column prop="xy_type" label="设备型号">
-						<template slot-scope="scope">
-							<p v-if="scope.row.xy_type==1">I型</p>
-							<p v-if="scope.row.xy_type==2">II型</p>
-						</template>
-					</el-table-column>
-					<el-table-column prop="status_time" label="最新上报时间">
-						<template slot-scope="scope">{{scope.row.status_time | formatTime}}</template>
+					<el-table-column prop="upl_time" label="最新上报时间">
+						<template slot-scope="scope">{{
+							scope.row.upl_time
+						}}</template>
 					</el-table-column>
 					<el-table-column label="操作" width="400">
 						<template slot-scope="scope">
 							<el-button
 								size="mini"
 								type="info"
-								@click="viewImage(scope.row.device_id,scope.row.d_id)"
-							>查看图片</el-button>
+								@click="viewImage(scope.row.imei, scope.row.d_id)"
+								>查看图片</el-button
+							>
 							<el-button
 								size="mini"
 								type="warning"
-								@click="EquipControl(scope.row.device_model,scope.row.d_id)"
-							>设备控制</el-button>
-							<el-button size="mini" type="success" @click="lookSIMCode(scope.row.d_id)">SIM卡</el-button>
+								@click="EquipControl(scope.row.etype, scope.row.d_id)"
+								>设备控制</el-button
+							>
+							<el-button
+								size="mini"
+								type="success"
+								@click="lookSIMCode(scope.row.d_id)"
+								>SIM卡</el-button
+							>
 							<el-button
 								size="mini"
 								type="danger"
-								@click="dataDetails(scope.row.device_id,scope.row.d_id,scope.device_model)"
-							>数据详情</el-button>
+								@click="
+									dataDetails(scope.row.device_id, scope.row.d_id, scope.etype)
+								"
+								>数据详情</el-button
+							>
 						</template>
 					</el-table-column>
 				</el-table>
 			</el-card>
 		</template>
+		{{totalNum}}
 		<el-pagination
 			background
 			:page-size="8"
@@ -135,43 +174,51 @@
 			<div class="simCodeBox">
 				<div>
 					<span class="simCodeTitle">ICCID：</span>
-					<div>{{sim.iccid}}</div>
+					<div>{{ sim.iccid }}</div>
 				</div>
 				<div>
 					<span class="simCodeTitle">状态：</span>
-					<div>{{sim.account_status | simStatus}}</div>
+					<div>{{ sim.account_status | simStatus }}</div>
 				</div>
 				<div>
 					<span class="simCodeTitle">套餐：</span>
 					<div>
 						<el-progress :show-text="false" :percentage="100"></el-progress>
 					</div>
-					<span>{{sim.data_plan}}</span>
+					<span>{{ sim.data_plan }}</span>
 				</div>
 				<div>
 					<span class="simCodeTitle">已用流量：</span>
 					<div>
 						<template v-if="!isNaN(data_usage_Per)">
-							<el-progress :show-text="false" :percentage="data_usage_Per"></el-progress>
+							<el-progress
+								:show-text="false"
+								:percentage="data_usage_Per"
+							></el-progress>
 						</template>
 					</div>
-					<span>{{sim.data_usage}}MB</span>
+					<span>{{ sim.data_usage }}MB</span>
 				</div>
 				<div>
 					<span class="simCodeTitle">剩余流量：</span>
 					<div>
 						<template v-if="!isNaN(data_balance_per)">
-							<el-progress :show-text="false" :percentage="data_balance_per"></el-progress>
+							<el-progress
+								:show-text="false"
+								:percentage="data_balance_per"
+							></el-progress>
 						</template>
 					</div>
-					<span>{{sim.data_balance}}MB</span>
+					<span>{{ sim.data_balance }}MB</span>
 				</div>
 				<div>
 					<span class="simCodeTitle">到期时间：</span>
-					<div>{{sim.expiry_date*1000 | formatTime}}</div>
+					<div>{{ (sim.expiry_date * 1000) | formatTime }}</div>
 				</div>
 				<div class="operateBtn">
-					<el-button size="mini" @click="simCodeVisible=false">关闭</el-button>
+					<el-button size="mini" @click="simCodeVisible = false"
+						>关闭</el-button
+					>
 				</div>
 			</div>
 		</el-dialog>
@@ -196,7 +243,7 @@
 							:picker-options="{
 								start: '0:00',
 								step: '1:00',
-								end: '23:00',
+								end: '23:00'
 							}"
 						></el-time-select>
 					</el-form-item>
@@ -215,20 +262,38 @@
 					<el-form-item label="数据上传间隔：" prop="dat_t">
 						<div class="sliderParent">
 							<div class="block">
-								<el-slider :min="10" :step="10" :max="120" v-model="equipContrlForm2.dat_t" show-input></el-slider>
+								<el-slider
+									:min="10"
+									:step="10"
+									:max="120"
+									v-model="equipContrlForm2.dat_t"
+									show-input
+								></el-slider>
 							</div>
 						</div>
 					</el-form-item>
 					<el-form-item label="卷粘虫板时间：" prop="turn_t">
 						<div class="sliderParent">
 							<div class="block">
-								<el-slider :min="1" :max="23" v-model="equipContrlForm2.turn_t" show-input></el-slider>
+								<el-slider
+									:min="1"
+									:max="23"
+									v-model="equipContrlForm2.turn_t"
+									show-input
+								></el-slider>
 							</div>
 						</div>
 					</el-form-item>
 					<el-form-item class="handAddFormBtn">
-						<el-button type="primary" size="mini" @click="equipControlSubm(equipContrlForm2)">确定</el-button>
-						<el-button size="mini" @click="equipControlDialogVisible2 = false">取消</el-button>
+						<el-button
+							type="primary"
+							size="mini"
+							@click="equipControlSubm(equipContrlForm2)"
+							>确定</el-button
+						>
+						<el-button size="mini" @click="equipControlDialogVisible2 = false"
+							>取消</el-button
+						>
 					</el-form-item>
 				</el-form>
 			</div>
@@ -253,55 +318,90 @@
 								placeholder="起始时间"
 								v-model="equipContrlForm1.st"
 								:picker-options="{
-								start: '0:00',
-								step: '1:00',
-								end: '23:00',
-							}"
+									start: '0:00',
+									step: '1:00',
+									end: '23:00'
+								}"
 							></el-time-select>
-							<span style="margin:0 10px">至</span>
+							<span style="margin: 0 10px">至</span>
 							<el-time-select
 								placeholder="结束时间"
 								v-model="equipContrlForm1.et"
 								:picker-options="{
-								start: '0:00',
-								step: '1:00',
-								end: '23:00',
-								minTime: equipContrlForm1.st
-							}"
+									start: '0:00',
+									step: '1:00',
+									end: '23:00',
+									minTime: equipContrlForm1.st
+								}"
 							></el-time-select>
 						</div>
 					</el-form-item>
 					<el-form-item label="数据上传时间间隔：" prop="dat_f">
 						<div class="sliderParent">
 							<div class="block">
-								<el-slider :min="1" :max="10" v-model="equipContrlForm1.dat_f" show-input></el-slider>
+								<el-slider
+									:min="1"
+									:max="10"
+									v-model="equipContrlForm1.dat_f"
+									show-input
+								></el-slider>
 							</div>
 						</div>
 					</el-form-item>
 					<el-form-item class="handAddFormBtn">
-						<el-button type="primary" size="mini" @click="equipControlSubm(equipContrlForm1)">确定</el-button>
-						<el-button size="mini" @click="equipControlDialogVisible1 = false">取消</el-button>
+						<el-button
+							type="primary"
+							size="mini"
+							@click="equipControlSubm(equipContrlForm1)"
+							>确定</el-button
+						>
+						<el-button size="mini" @click="equipControlDialogVisible1 = false"
+							>取消</el-button
+						>
 					</el-form-item>
 				</el-form>
 			</div>
 		</el-dialog>
 		<!-- 管理员操作对话框 I型-->
 		<el-dialog title="操作" :visible.sync="operarionDialogVisible" width="25%">
-			<el-button type="primary" @click="equipBtnControl('poweron')" size="mini">开启</el-button>
-			<el-button type="primary" @click="equipBtnControl('poweroff')" size="mini">关闭</el-button>
-			<el-button type="primary" @click="equipBtnControl('reboot')" size="mini">重启</el-button>
+			<el-button type="primary" @click="equipBtnControl('poweron')" size="mini"
+				>开启</el-button
+			>
+			<el-button type="primary" @click="equipBtnControl('poweroff')" size="mini"
+				>关闭</el-button
+			>
+			<el-button type="primary" @click="equipBtnControl('reboot')" size="mini"
+				>重启</el-button
+			>
 			<el-button type="primary" size="mini">清网</el-button>
-			<el-button type="primary" @click="equipBtnControl('update')" size="mini">升级</el-button>
+			<el-button type="primary" @click="equipBtnControl('update')" size="mini"
+				>升级</el-button
+			>
 			<el-button type="primary" size="mini">查询服务器配置</el-button>
 		</el-dialog>
 		<!-- 管理员操作对话框 II型-->
 		<el-dialog title="操作" :visible.sync="operarionDialogVisible2" width="25%">
-			<el-button type="primary" @click="equipBtnControl('reboot')" size="mini">重启</el-button>
-			<el-button type="primary" @click="equipBtnControl('update')" size="mini">升级</el-button>
-			<el-button type="primary" @click="equipBtnControl('mqttconf')" size="mini">mqtt网络配置</el-button>
-			<el-button type="primary" @click="equipBtnControl('takephoto')" size="mini">拍照</el-button>
-			<el-button type="primary" @click="equipBtnControl('turn')" size="mini">卷黏虫带</el-button>
-			<el-button type="primary" @click="equipBtnControl('repower')" size="mini">重新上电</el-button>
+			<el-button type="primary" @click="equipBtnControl('reboot')" size="mini"
+				>重启</el-button
+			>
+			<el-button type="primary" @click="equipBtnControl('update')" size="mini"
+				>升级</el-button
+			>
+			<el-button type="primary" @click="equipBtnControl('mqttconf')" size="mini"
+				>mqtt网络配置</el-button
+			>
+			<el-button
+				type="primary"
+				@click="equipBtnControl('takephoto')"
+				size="mini"
+				>拍照</el-button
+			>
+			<el-button type="primary" @click="equipBtnControl('turn')" size="mini"
+				>卷黏虫带</el-button
+			>
+			<el-button type="primary" @click="equipBtnControl('repower')" size="mini"
+				>重新上电</el-button
+			>
 		</el-dialog>
 	</div>
 </template>
@@ -338,7 +438,7 @@ export default {
 				dver: '',
 				f_id: '',
 				ename: '',
-				device_model: null
+				etype: null
 			},
 			//设备控制I 型
 			equipContrlForm1: {
@@ -383,6 +483,7 @@ export default {
 	},
 	methods: {
 		getIsOnline(data) {
+			console.log(data);
 			this.queryInfo.is_online = data
 			this.queryInfo.page = 1
 			this.getEquipList()
@@ -400,21 +501,32 @@ export default {
 		getEquipList() {
 			this.$axios({
 				method: 'post',
-				url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
+				url: '/api/sex_trap_view',
 				data: this.qs.stringify({
-					device_type_id: 4,
-					page_size: 8,
-					device_id: this.queryInfo.f_id,
-					device_name: this.queryInfo.ename,
+					// page_size: 8,
+					// device_id: this.queryInfo.f_id,
+					// device_name: this.queryInfo.ename,
+					// page: this.queryInfo.page,
+					// device_status: this.queryInfo.is_online,
+					// etype: this.queryInfo.etype
+					f_id: '',
+					ename: '',
 					page: this.queryInfo.page,
-					device_status: this.queryInfo.is_online,
-					device_model: this.queryInfo.device_model
+					is_online: this.queryInfo.is_online,
+					etype: this.queryInfo.etype //1代表I型，2代表II型
 				})
 			}).then((res) => {
-				if (res.data.message == '') {
-					this.equipList = res.data.data.data
-					this.totalNum = res.data.data.counts
-				}
+				let data = res.data.dat
+				let arr = data.map((item) => {
+					let obj= eval('(' + item.sex_trap + ')')
+					obj.equip_name=item.equip_name
+					obj.upl_time=item.upl_time
+					obj.is_online=Number(item.is_online)
+					return obj
+				})
+				console.log(arr)
+				this.equipList = arr
+				this.totalNum = res.data.nums
 			})
 		},
 		//改变page
@@ -423,9 +535,12 @@ export default {
 			this.getEquipList()
 		},
 		// 数据详情
-		dataDetails(e_id, d_id,device_model) {
+		dataDetails(e_id, d_id, etype) {
 			this.currImei = e_id
-			this.$router.push({path:`/index/xycbDataDetail/${e_id}/${d_id}`,query:{device_model:device_model}})
+			this.$router.push({
+				path: `/index/xycbDataDetail/${e_id}/${d_id}`,
+				query: { etype: etype }
+			})
 		},
 		//sim卡状态
 		handleClick(tab, event) {
@@ -434,7 +549,10 @@ export default {
 		// 查看图片
 		viewImage(id, d_id) {
 			this.currImei = id
-			this.$router.push({ path: `/index/xycbDataPhotos/${id}`, query: {d_id:d_id} })
+			this.$router.push({
+				path: `/index/xycbDataPhotos/${id}`,
+				query: { d_id: d_id }
+			})
 		},
 		//设备控制操作
 		EquipControl(model, d_id) {