修改bug

bigdata2/config/index.js

@@ -12,7 +12,7 @@ module.exports = {
     proxyTable: {
       '/': {
         // target: 'http://192.168.1.3:8000/',
-        target: 'http://192.168.1.11:8080/',
+        target: 'http://192.168.1.5:8000/',
         // target: 'http://192.168.1.120:8001/',
         changeOrigin: true,
         pathRewrite: {
@@ -29,7 +29,7 @@ module.exports = {
       },
     },
     // Various Dev Server settings
-    host: '192.168.1.11', // can be overwritten by process.env.HOST
+    host: '192.168.1.5', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

bigdata2/src/components/Index.vue

@@ -2,7 +2,7 @@
 	<el-container style="height: 100%">
 		<el-header>
 			<div v-if="userinfo.logo">
-				<img :src="userinfo.logo" alt=""  style="position: absolute;left: 20px;top: 20px;width: 136px;">
+				<img :src="userinfo.logo" alt=""  style="position: absolute;left: 20px;top: 20px;width: 250px;">
 			</div>
 			<div class="navbarBtn">
 				<!-- 用户 -->

bigdata2/src/pages/cure/scd/scd.vue

@@ -13,23 +13,25 @@
 				<el-row :gutter="10">
 					<el-col
 						:xs="24"
-						:sm="24"
-						:md="12"
-						:lg="8"
-						:xl="6"
+						:sm="12"
+						:md="8"
+						:lg="4"
+						:xl="4"
 						v-for="item in equipList"
 						:key="item.imei"
 					>
 						<el-card class="box-card">
-							<span
+							<!-- <span
 								:class="['on-stauts', item.device_status == 1 ? 'on' : 'off']"
-							></span>
+							></span> -->
 							<img src="@/assets/images/cure/scd/scdIconOn.png" />
-							<p class="equip">{{ item.device_id }}</p>
+							<p class="equip">{{ item.device_name || '无' }}</p>
 							<div class="item_info">
-								<p>设备名称 : {{ item.device_name || '无' }}</p>
-								<p>最新上报时间 : {{ item.status_time }}</p>
 								<p>地址 : {{ item.address || '无' }}</p>
+								<p>最新上报时间 : {{ item.status_time }}</p>
+								<p v-if = "item.device_status == 1">在线状态 : <span style="color:green">在线</span></p>
+								<p v-else>在线状态 : <span style="color:red">离线</span></p>
+								<p>设备号 :{{ item.device_id }}</p>
 							</div>
 							<div class="btns">
 								<el-button
@@ -124,7 +126,7 @@
 			background
 			layout="prev, pager, next"
 			:total="totalNum"
-			:page-size="8"
+			:page-size="12"
 			:current-page="queryInfo.page"
 			@current-change="changePage"
 		></el-pagination>

bigdata2/src/pages/forecasting/bzy/BzyPhotos.vue

@@ -48,6 +48,7 @@
 			layout="prev, pager, next"
 			:total="totalNum"
 			@current-change="changePage"
+			:page-size="8"
 		></el-pagination>
 	</div>
 </template>

bigdata2/src/pages/forecasting/cbd/PestsStats.vue

@@ -119,7 +119,7 @@ export default {
 			id: this.$route.query.id,
 			equipname: this.$route.query.name,
 			equipaddress:this.$route.query.address,
-			btnSelected: '2',
+			btnSelected: '3',
 			allPest: PestList,
 			currPests:[],
 			options: {},
@@ -179,13 +179,13 @@ export default {
 	},
 	watch: {
 		viewSwitch(val) {
-			this.btnSelected = '2'
+			this.btnSelected = '3'
 		}
 	},
 	created() {
 	},
 	mounted() {
-		this.timeBtnClick(2)
+		this.timeBtnClick(3)
 	},
 	methods: {
 		//筛选时间
@@ -256,10 +256,20 @@ export default {
 			for (var i = 0; i < data.dat1.length; i++) {
 				var arr1 = [],
 					arr2 = [];
-				arr1.push(this.returnTime(data.dat1[i].time));
-				arr1.push(parseFloat((data.dat1[i].at / 10).toFixed(1)));
-				arr2.push(this.returnTime(data.dat1[i].time));
-				arr2.push(parseFloat((data.dat1[i].ah / 10).toFixed(1)));
+				if(parseFloat((data.dat1[i].at / 10).toFixed(1)) != '25'){
+					arr1.push(this.returnTime(data.dat1[i].time));
+					arr1.push(parseFloat((data.dat1[i].at / 10).toFixed(1)));
+				}else{
+					arr1.push(this.returnTime(data.dat1[i].time));
+					arr1.push(0);
+				}
+				if(parseFloat((data.dat1[i].ah / 10).toFixed(1)) != '30'){
+					arr2.push(this.returnTime(data.dat1[i].time));
+					arr2.push(parseFloat((data.dat1[i].ah / 10).toFixed(1)));
+				}else{
+					arr2.push(this.returnTime(data.dat1[i].time));
+					arr2.push(0);
+				}
 				atData.unshift(arr1);
 				ahData.unshift(arr2);
 				if (i == data.dat1.length - 1) {

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

@@ -199,13 +199,17 @@ export default {
 							this.returnTime(item.tim),
 							Number(item.ah)
 						])
+						ChartData[2].dat.unshift([
+							this.returnTime(item.tim),
+							Number(item.infr_ct)
+						])
 					}
 					this.options = {
 						chart: {
 							zoomType: 'x'
 						},
 						title: {
-							text: '环境温度',
+							text: '环境温湿度',
 							align: 'left'
 						},
 						subtitle: {
@@ -250,7 +254,11 @@ export default {
 								name: ChartData[0].name,
 								data: ChartData[0].dat
 							},
-							
+							{
+								type: 'spline',
+								name: ChartData[1].name,
+								data: ChartData[1].dat
+							},
 						],
 						colors: ['#6cbbff', '#ff3f3f','#00e29d', ],
 						credits: {
@@ -268,7 +276,7 @@ export default {
 							zoomType: 'x'
 						},
 						title: {
-							text: '环境湿度',
+							text: '红外计数值',
 							align: 'left'
 						},
 						subtitle: {
@@ -310,8 +318,8 @@ export default {
 						series: [
 							{
 								type: 'spline',
-								name: ChartData[1].name,
-								data: ChartData[1].dat
+								name: ChartData[2].name,
+								data: ChartData[2].dat
 							}
 						],
 						colors: ['#00e29d', '#6cbbff', '#ff3f3f'],