统计接入

gongchangdaping/src/api/work.js

@@ -32,10 +32,10 @@ export function getdeviceMonitorList(data) {
 	'params':data
   })
 }
-//首件检验记录
-export function getannexListFn(data) {
+//设备异常统计
+export function getabnormalStatistics(data) {
   return request({
-    'url': '/system/annex/listNo',
+    'url': '/visualization/mes/dv/abnormalStatistics',
     'method': 'get',
 	'params':data
   })
@@ -49,11 +49,10 @@ export function getDictionaryFn(data) {
   })
 }
 // 巡检记录
-export function getloginAndPlayView(data) {
+export function getrecentData(data) {
   return request({
-    url: '/playvision/loginAndPlayView',
-    method: 'post',
-	type:true,
+    url: '/visualization/mes/pro/recentData',
+    method: 'get',
 	'params':data,
   })
 }

gongchangdaping/src/views/components/mixbarcharts.vue

@@ -66,7 +66,7 @@ export default {
       this.chart = echarts.init(this.$el, 'macarons')
 		this.setOptions(this.chartData) 
     },
-	setOptions({ data,xAxis,bara,barb,barc} = {}) {
+	setOptions({ data,xaxis,bara,barb,barc} = {}) {
 	  this.chart.setOption({
 			color:['#D85600','#0877E8','#EA68A2',],
 			tooltip: {
@@ -94,7 +94,7 @@ export default {
 			  xAxis: [
 			    {
 			      type: 'category',
-			      data: xAxis,
+			      data: xaxis,
 			      axisPointer: {
 			        type: 'shadow'
 			      },

gongchangdaping/src/views/components/ycmixbarcharts.vue

@@ -66,7 +66,7 @@ export default {
       this.chart = echarts.init(this.$el, 'macarons')
 		this.setOptions(this.chartData) 
     },
-	setOptions({ data,xAxis,bara,barb} = {}) {
+	setOptions({ data,xaxis,bara,barb} = {}) {
 	  this.chart.setOption({
 			color:['#0877E8','#EA68A2',],
 			tooltip: {
@@ -94,7 +94,7 @@ export default {
 			  xAxis: [
 			    {
 			      type: 'category',
-			      data: xAxis,
+			      data: xaxis,
 			      axisPointer: {
 			        type: 'shadow'
 			      },

gongchangdaping/src/views/controlRoom.vue

@@ -7,7 +7,7 @@
 		</div>
 		<div class="conbox">
 			<div class="videbox">
-				<div id="divPlugin" :style="'width:'+swidth+'px;height:'+sheight+'px'" ></div> class="flex1 videbox" ref="videbox" style="width: 100%;"
+				<div id="divPlugin" :style="'width:'+swidth+'px;height:'+sheight+'px'" ></div>
 			</div>
 			
 			<!-- <div class="conlist" v-for="(ite,idx) in boxlist" :key="idx">
@@ -67,7 +67,7 @@ export default {
 		szDeviceIdentify:'',//ip_port,
 		firstfalg:true,
 		total:80,
-		pageNum:1.,
+		pageNum:1,
 		pageSize:9,
 		videoList:[],
 	};

gongchangdaping/src/views/index.vue

@@ -116,7 +116,7 @@ import pieCharts from "./components/piecharts.vue"
 import mixbarCharts from "./components/mixbarcharts.vue"
 import ycmixbarCharts from "./components/ycmixbarcharts.vue"
 import hbarCharts from "./components/hbarcharts.vue"
-import {getWorkorderList,getlistGanttTaskList,getMaintenrecordList,} from "@/api/work.js"
+import {getWorkorderList,getlistGanttTaskList,getMaintenrecordList,getabnormalStatistics,getrecentData} from "@/api/work.js"
   export default {
 	components:{boxTable,pieCharts,mixbarCharts,ycmixbarCharts,hbarCharts},
     data() {
@@ -156,6 +156,7 @@ import {getWorkorderList,getlistGanttTaskList,getMaintenrecordList,} from "@/api
 	  	this.getList()
 		this.getWorkorderList()
 		this.getlistGanttTaskList()
+		this.init()
 	  },
     async mounted() {
 		clearInterval(this.timer);
@@ -177,6 +178,28 @@ import {getWorkorderList,getlistGanttTaskList,getMaintenrecordList,} from "@/api
               this.timer = null; // 防止内存泄漏
             }
         },
+		init(){
+			this.getabnormalStatistics();
+			this.getrecentData();
+		},
+		getabnormalStatistics(){
+			var params={
+				days:6
+			}
+			getabnormalStatistics(params).then(res=>{
+				this.mixbarDatab=JSON.parse(JSON.stringify(res.data))
+			})
+		},
+		getrecentData(){
+			var params={
+				days:6
+			}
+			getrecentData(params).then(res=>{
+				if(res.code==200){
+					this.mixbarDataa=JSON.parse(JSON.stringify(res.data))
+				}
+			})
+		},
 		getWorkorderList(){
 			var params={
 				pageNum:this.pageNum,