Pārlūkot izejas kodu

图片预加载

yf_zd 5 gadi atpakaļ
vecāks
revīzija
58a0c630ad

+ 1 - 1
bigdata2/config/index.js

@@ -11,7 +11,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/': {
-        target: 'http://192.168.1.3:8000/',
+        target: 'http://192.168.1.11:8080/',
         // target: 'http://192.168.1.8:8000/',
         // target: 'http://192.168.1.120:8001/',
         changeOrigin: true,

+ 1 - 0
bigdata2/package.json

@@ -76,6 +76,7 @@
     "v-viewer": "^1.5.1",
     "vue-axios": "^2.1.5",
     "vue-cropper": "^0.5.2",
+    "vue-lazyload": "^1.3.3",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.10",

BIN
bigdata2/src/assets/images/error.png


BIN
bigdata2/src/assets/images/loading.gif


+ 8 - 0
bigdata2/src/main.js

@@ -29,6 +29,14 @@ Vue.config.productionTip = false //是阻止显示生产模式的消息
 import 'babel-polyfill' //兼容IE11
 require("babel-polyfill")
 
+import VueLazyload from 'vue-lazyload'
+Vue.use(VueLazyload, {
+  preLoad: 1.3,
+  error: require('./assets/images/error.png'),
+  loading: require('./assets/images/loading.gif'),
+  attempt: 2
+})
+
 // 引入百度地图
 import BaiduMap from 'vue-baidu-map'
 import {

+ 4 - 4
bigdata2/src/pages/forecasting/cbd/DataDetails.vue

@@ -379,8 +379,8 @@ export default {
 				if(res.data.length>0){
 					var at = [],ah = [];
 					for(var i = 0;i<res.data.length;i++){
-						at.push([this.returnTime(res.data[i].tim),res.data[i].at])
-						ah.push([this.returnTime(res.data[i].tim),res.data[i].ah])
+						at.push([this.returnTime(res.data[i].tim),res.data[i].at/10])
+						ah.push([this.returnTime(res.data[i].tim),res.data[i].ah/10])
 						if(i == res.data.length-1){
 							this.options = {
 								chart: {
@@ -529,8 +529,8 @@ export default {
 					var tps = cbd_data.tps == 0 ? '正常' : '温控';
 					var lps = cbd_data.lps == 0 ? '正常' : '光控';
 					this.tableData.push({
-						at:cbd_data.at,
-						ah:cbd_data.ah,
+						at:(cbd_data.at/10).toFixed(2),
+						ah:(cbd_data.ah/10).toFixed(2),
 						hrt:cbd_data.hrt,
 						rps:rps,
 						tps:tps,

+ 16 - 0
bigdata2/src/pages/forecasting/cbd/PestsStats.vue

@@ -221,10 +221,17 @@ export default {
 			// 折线
 			var wormsArr = [];
 			var html = '';
+			var kind=kind.filter(function (item) {
+				return item!='0';
+			}); 
+
 			if (!kind.length) {
 				this.worms = [];
 				this.viewSwitch2 = ''
+				this.chartsShow = false;
+				this.chartsShowA = false;
 			}
+			
 			for (var z = 0; z < kind.length; z++) {
 				wormsArr.push({
 					value:z,
@@ -247,6 +254,9 @@ export default {
 				if (i == data.dat1.length - 1) {
 					if (data.dat.length) {
 						for (var j = 0; j < data.dat.length; j++) {
+							if(data.dat[j].result == '0'){
+								continue;
+							}
 							var secondArr = [];
 							var currTime = this.returnTime(data.dat[j].time)
 							var resultArr = data.dat[j].result.split('#');
@@ -276,6 +286,9 @@ export default {
 								// 饼状图
 								for (var ss = 0; ss < worm.length; ss++) {
 									var currWormTotal = 0;
+									console.log(ss)
+									console.log(worm)
+									console.log(worm[ss])
 									for (var sss = 0; sss < worm[ss].length; sss++) {
 										currWormTotal += worm[ss][sss][1];
 										if (sss == worm[ss].length - 1) {
@@ -499,6 +512,9 @@ export default {
 			for(var i = 0;i<dat.length;i++){
 				var result = dat[i].result.split('#');
 				for(var j = 0;j<result.length;j++){
+					if(result[j] == '0'){
+						continue;
+					}
 					var resultItem = result[j].split(',');
 					arr.push({
 						name:this.allPest[resultItem[1]],

+ 1 - 1
bigdata2/src/pages/forecasting/cbd/cbdDataPhotos.vue

@@ -77,7 +77,7 @@
 						</template>
 					</div>
 					<div class="photoImg">
-						<img :src="item.addr" @error="errImg" alt />
+						<img v-lazy="item.addr"  alt />
 					</div>
 					<div class="photoCtrl">
 						<div class="time">{{item.upl_time}}</div>