1

gongchangdaping/src/api/work.js

@@ -24,10 +24,10 @@ export function getMaintenrecordList(data) {
 	'params':data
   })
 }
-// 原料检验记录
-export function getpeopleFn(data) {
+// 查询监控设备列表:带分页
+export function getdeviceMonitorList(data) {
   return request({
-    'url': '/system/reservat/statistics/people',
+    'url': '/visualization/iot/deviceMonitor/list',
     'method': 'get',
 	'params':data
   })

gongchangdaping/src/router/index.js

@@ -8,7 +8,7 @@ const routes = [{
   path: '/',
   name: 'Home',
   component: () => import('../views/main.vue'),
-  redirect: '/index',
+  redirect: '/factory',
   children: [
     {
       path: '/index',

gongchangdaping/src/views/components/table.vue

@@ -11,12 +11,12 @@
       @scroll.passive="handleScroll"
       :style="'width: 100%;background: transparent;max-height:'+tableHeight"
     >
-	<el-table-column
+	<!-- <el-table-column
 	      type="index"
 		  label="序号"
 		  align='center'
 	      width="10%">
-	    </el-table-column>
+	    </el-table-column> -->
       <el-table-column :cell-style="{ whiteSpace: 'pre-line' }" v-for="(ite,idx) in columns" :key="idx" align='center' :prop="ite.prop" :label="ite.label"
       	:width="ite.width">
       	<template slot-scope="scope" >
@@ -32,9 +32,9 @@
 				   		<div>{{ scope.row['time']}}</div>
 				   	</div>
 					
-					<!-- <div v-else-if="ite.prop=='xh'">
-						<div>{{index}}</div>
-					</div> -->
+					<div v-else-if="ite.prop=='xh'">
+						<div>{{scope.$index+1}}</div>
+					</div>
       			   <div v-else >{{ scope.row[ite.prop] }}</div>
       	  </template>
       </el-table-column>

gongchangdaping/src/views/controlRoom.vue

@@ -29,6 +29,7 @@
 </template>
 <script>
 import videoBox from "./components/videobox.vue"
+import {getdeviceMonitorList,} from "@/api/work.js"
 export default {
 	components: {videoBox},
 	props:{
@@ -59,6 +60,10 @@ export default {
 	  this.refreshTime()
 	  this.timer = setInterval(this.refreshTime, 1000);
 	  // this.getVideo()
+	  this.getList()
+  },
+  created() {
+  	// this.getList()
   },
   watch: {
   	scale(val){
@@ -73,21 +78,21 @@ export default {
   	},
   	idx(val){
   		var that=this;
-  		if(val==3){
-  			if(that.firstfalg){
-  				that.firstfalg=false;
-				 that.getVideo()
-  			}else{
-				setTimeout(function(){
-					WebVideoCtrl.I_ShowPlugin()
-				},100)
+  	// 	if(val==3){
+  	// 		if(that.firstfalg){
+  	// 			that.firstfalg=false;
+			// 	 that.getVideo()
+  	// 		}else{
+			// 	setTimeout(function(){
+			// 		WebVideoCtrl.I_ShowPlugin()
+			// 	},100)
 				
-			}
-  		}else{
-  			if(WebVideoCtrl&&!that.firstfalg){
-  				WebVideoCtrl.I_HidPlugin()
-  			}
-  		}
+			// }
+  	// 	}else{
+  	// 		if(WebVideoCtrl&&!that.firstfalg){
+  	// 			WebVideoCtrl.I_HidPlugin()
+  	// 		}
+  	// 	}
   	}
   },
  beforeDestroy() {
@@ -102,6 +107,11 @@ export default {
 	}
  },
   methods:{
+	  getList(){
+		getdeviceMonitorList().then(res=>{
+			console.log(res)
+		})
+	  },
 	refreshTime() {
 	  this.time = new Date().toLocaleString('zh-CN', {
 	    year: 'numeric',

gongchangdaping/src/views/index.vue

@@ -123,15 +123,15 @@ import {getWorkorderList,getlistGanttTaskList,getMaintenrecordList,} from "@/api
       return {
 		visibleRows:6,
 		dataList: [],
-		columna:[{label:'客户',prop:'clientName',width:"20%"},{label:'内编',prop:'productCode',width:"20%"},{label:'数量',prop:'quantity',width:"20%"},{label:'交期',prop:'requestDate',width:"20%"},],
+		columna:[{label:'序号',prop:'xh',width:"15%"},{label:'客户',prop:'clientName',width:"20%"},{label:'内编',prop:'productCode',width:"20%"},{label:'数量',prop:'quantity',width:"20%"},{label:'交期',prop:'requestDate',width:"20%"},],
 		
 		visibleRowsb:9,
 		dataListb: [],
-		columnb:[{label:'客户',prop:'clientName',width:"15%"},{label:'内编',prop:'productCode',width:"15%"},{label:'任务名称',prop:'text',width:"15%"},{label:'数量',prop:'quantity',width:"15%"},{label:'完成率',prop:'progress',width:"15%"},{label:'交期',prop:'requestDate',width:"15%"},],
+		columnb:[{label:'序号',prop:'xh',width:"10%"},{label:'客户',prop:'clientName',width:"15%"},{label:'内编',prop:'productCode',width:"15%"},{label:'任务名称',prop:'text',width:"15%"},{label:'数量',prop:'quantity',width:"15%"},{label:'完成率',prop:'progress',width:"15%"},{label:'交期',prop:'requestDate',width:"15%"},],
 		visibleRowsc:4,
 		dataListc: [],
 		statusOptionsc:[{dictValue:'PREPARE',dictLabel:'维修中'},{dictValue:'FINISHED',dictLabel:'完成'}],
-		columnc:[{label:'设备名称',prop:'machineryName',width:"25%"},{label:'设备编号',prop:'machineryCode',width:"15%"},{label:'保养项目',prop:'planName',width:"10%"},{label:'负责人',prop:'nickName',width:"15%"},{label:'当前状态',prop:'status',width:"15%",type:"katype"},],
+		columnc:[{label:'序号',prop:'xh',width:"10%"},{label:'设备名称',prop:'machineryName',width:"25%"},{label:'设备编号',prop:'machineryCode',width:"15%"},{label:'保养项目',prop:'planName',width:"10%"},{label:'负责人',prop:'nickName',width:"15%"},{label:'当前状态',prop:'status',width:"15%",type:"katype"},],
 		
 		pieDataa:{data:[{value:4,name:'运行'},{value:0,name:'维护'},{value:0,name:'故障'},{value:4,name:'关机'}],name:"FCCL覆铜压合机",num:4},
 		pieDatab:{data:[{value:9,name:'运行'},{value:2,name:'维护'},{value:1,name:'故障'},{value:3,name:'关机'}],name:"高精密烤箱",num:9},

gongchangdaping/src/views/lunbo.vue

@@ -1,6 +1,6 @@
 <template>
 <div style="height: 100%;">
-	<el-carousel indicator-position="outside" @change="handleChange" autoplay :interval="15000">
+	<el-carousel indicator-position="outside" @change="handleChange" :autoplay="isautoplay" :interval="15000">
 	    <el-carousel-item >
 			<index/>
 	    </el-carousel-item>
@@ -27,6 +27,7 @@
     data() {
       return {
 		idx:0,
+		isautoplay:false
       }
     },
 	computed: {