分配设备用户所属

bigdata2/src/main.js

@@ -34,7 +34,8 @@ Vue.use(VueLazyload, {
   preLoad: 1.3,
   error: require('./assets/images/error.png'),
   loading: require('./assets/images/loading.gif'),
-  attempt: 2
+  attempt: 2,
+  effect: "fadeIn"
 })
 
 // 引入百度地图

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>防治系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/scd' }">杀虫灯</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/scd' }">物联网杀虫灯</el-breadcrumb-item>
 			<el-breadcrumb-item>数据详情</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="equipInfo">

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>测报系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/bzy' }">孢子仪</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/bzy' }">植物孢子捕捉仪</el-breadcrumb-item>
 			<el-breadcrumb-item>查看图片</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="check-btns">

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>测报系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/bzy' }">孢子仪</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/bzy' }">植物孢子捕捉仪</el-breadcrumb-item>
 			<el-breadcrumb-item>数据详情</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="equipInfo">
@@ -19,7 +18,8 @@
 		<el-row :gutter="20">
 			<el-col :md="24" :lg="12">
 				<el-card class="box-card">
-					<div class="charts">
+					<div style="text-align:center;font-size:20px;height:360px;position: relative;" v-if="Object.keys(option1).length<=0"><div class="el-loading-mask" style=""><div class="el-loading-spinner"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg><!----></div></div></div>
+					<div v-else class="charts">
 						<highcharts :options="option1" v-if="Object.keys(option1).length>0"></highcharts>
 						<div v-else style="text-align:center;font-size:20px;line-height:360px">暂无数据</div>
 					</div>
@@ -27,7 +27,8 @@
 			</el-col>
 			<el-col :md="24" :lg="12">
 				<el-card class="box-card">
-					<div class="charts">
+					<div style="text-align:center;font-size:20px;height:360px;position: relative;" v-if="Object.keys(option2).length<=0"><div class="el-loading-mask" style=""><div class="el-loading-spinner"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg><!----></div></div></div>
+					<div v-else class="charts">
 						<highcharts :options="option2" v-if="Object.keys(option2).length>0"></highcharts>
 						<div v-else style="text-align:center;font-size:20px;line-height:360px">暂无数据</div>
 					</div>
@@ -37,7 +38,7 @@
 		<div class="dataTableSearch">
 		</div>
 		<el-card class="box-card">
-			<el-table :data="tableData" stripe style="width: 100%">
+			<el-table v-loading="loading" :data="tableData" stripe style="width: 100%">
 				<el-table-column
 					v-for="(item,index) in tableHeadTxt"
 					:key="index"
@@ -65,6 +66,7 @@ import DateSearch from '@/components/DateSearch'
 export default {
 	data() {
 		return {
+			loading:true,
 			id: this.$route.params.e_id,
 			name: this.$route.query.name,
 			option1: {},
@@ -361,6 +363,7 @@ export default {
 				}else{
 					this.tableData = []
 				}
+				this.loading = false;
 			})
 		},
 		dateChange(data) {

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>测报系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/cbd' }">虫情测报</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/cbd' }">物联网虫情测报</el-breadcrumb-item>
 			<el-breadcrumb-item>数据详情</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="equipInfo">

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

@@ -1,8 +1,7 @@
 <template>
    <div>
       <el-breadcrumb separator-class="el-icon-arrow-right">
-        <el-breadcrumb-item>测报系统</el-breadcrumb-item>
-        <el-breadcrumb-item>虫情测报</el-breadcrumb-item>
+        <el-breadcrumb-item>物联网虫情测报</el-breadcrumb-item>
         <el-breadcrumb-item>害虫统计</el-breadcrumb-item>
       </el-breadcrumb>
       <div class="check-btns">

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>测报系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/cbd' }">虫情测报</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/cbd' }">物联网虫情测报</el-breadcrumb-item>
 			<el-breadcrumb-item>短信通知</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="innerBox">

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>测报系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/cbd' }">虫情测报</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/cbd' }">物联网虫情测报</el-breadcrumb-item>
 			<el-breadcrumb-item>害虫统计</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="equipInfo">
@@ -85,7 +84,7 @@
 				<!-- <el-button type="primary" size="mini" @click.stop="dowonloadFile">导出</el-button> -->
 			</div>
 			<el-card class="box-card">
-				<el-table :data="tableData" stripe style="width: 100%">
+				<el-table :data="currTableData" stripe style="width: 100%">
 					<el-table-column
 						v-for="(item,index) in tableHeadTxt"
 						:key="index"
@@ -95,6 +94,17 @@
 						<template slot-scope="scope">{{scope.row[scope.column.property]}}</template>
 					</el-table-column>
 				</el-table>
+
+				 <el-pagination
+				 	v-if="currTableData.length"
+					background
+					layout="prev, pager, next"
+					:page='queryInfo.page'
+					:total="total"
+					@prev-click="prevClick"
+					@next-click="nextClick"
+					@current-change="changePage">
+				</el-pagination>
 			</el-card>
 		</div>
 	</div>
@@ -139,6 +149,7 @@ export default {
 			],
 			// 表格数据
 			tableData: [],
+			currTableData:[],
 			tableDataA: [],
 			timeRange: '',
 			queryInfo: {
@@ -517,15 +528,29 @@ export default {
 					}
 					var resultItem = result[j].split(',');
 					arr.push({
-						name:this.allPest[resultItem[1]],
-						sum:resultItem[0],
+						name:this.allPest[resultItem[0]],
+						sum:resultItem[1],
 						time:dat[i].time
 					})
 				}
 			}
-
-			this.tableData = arr
+			this.tableData = arr;
+			this.total = this.tableData.length;
+			this.currTableData = this.tableData.slice((this.queryInfo.page-1)*10,this.queryInfo.page*10)
 		},
+		prevClick(val){
+            this.queryInfo.page--;
+			this.currTableData = this.tableData.slice((this.queryInfo.page-1)*10,this.queryInfo.page*10)
+         },
+         nextClick(val){
+            this.queryInfo.page++;
+			this.currTableData = this.tableData.slice((this.queryInfo.page-1)*10,this.queryInfo.page*10)
+         },
+         //改变page
+         changePage(val){
+            this.queryInfo.page=val;
+			this.currTableData = this.tableData.slice((this.queryInfo.page-1)*10,this.queryInfo.page*10)
+         },
 
 		// 下拉框筛选害虫名称
 		screenInsect() {

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

@@ -1,9 +1,8 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>测报系统</el-breadcrumb-item>
 			<el-breadcrumb-item :to="{ path: '/index/cbd' }"
-				>虫情测报</el-breadcrumb-item
+				>物联网虫情测报</el-breadcrumb-item
 			>
 			<el-breadcrumb-item>查看图片</el-breadcrumb-item>
 		</el-breadcrumb>
@@ -113,7 +112,7 @@
 		></el-pagination>
 
 		<!-- 自动识别对话框 -->
-		<el-dialog title="识别结果" :visible.sync="discernVisible" width="30%">
+		<el-dialog title="识别结果" :visible.sync="discernVisible" width="600px">
 			<div v-loading="loading" v-viewer>
 				<!-- <img :src="this.recognitionImage" width="100%" alt /> -->
 				<img

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>防治系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/xycb' }">性诱测报</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/xycb' }">智能性诱测报</el-breadcrumb-item>
 			<el-breadcrumb-item>数据详情</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="equipInfo">

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

@@ -1,8 +1,7 @@
 <template>
 	<div>
 		<el-breadcrumb separator-class="el-icon-arrow-right">
-			<el-breadcrumb-item>测报系统</el-breadcrumb-item>
-			<el-breadcrumb-item :to="{ path: '/index/xycb' }">性诱测报</el-breadcrumb-item>
+			<el-breadcrumb-item :to="{ path: '/index/xycb' }">智能性诱测报</el-breadcrumb-item>
 			<el-breadcrumb-item>查看图片</el-breadcrumb-item>
 		</el-breadcrumb>
 		<div class="check-btns">