fea(监控大屏): 修改设备运行时间统计图表

src/interface/apis.js

@@ -157,6 +157,10 @@
 		}
 	},
 	"equipment-controller": {
+		"data-get": {
+			"url": "/api/equipment/data",
+			"method": "get"
+		},
 		"export-post": {
 			"url": "/api/equipment/data/export",
 			"method": "post"
@@ -169,6 +173,10 @@
 			"url": "/api/equipment/file/upload",
 			"method": "post"
 		},
+		"findByShopCode-get": {
+			"url": "/api/equipment/findByShopCode",
+			"method": "get"
+		},
 		"transfer-post": {
 			"url": "/api/equipment/program/transfer",
 			"method": "post"
@@ -259,6 +267,10 @@
 			"url": "/api/v1/group",
 			"method": "put"
 		},
+		"page-post": {
+			"url": "/api/v1/group/page",
+			"method": "post"
+		},
 		"role-post": {
 			"url": "/api/v1/group/role",
 			"method": "post"
@@ -275,6 +287,10 @@
 			"url": "/api/v1/group/tree/user",
 			"method": "get"
 		},
+		"groupId-get": {
+			"url": "/api/v1/group/{groupId}",
+			"method": "get"
+		},
 		"groupId-delete": {
 			"url": "/api/v1/group/{groupId}",
 			"method": "delete"
@@ -401,6 +417,14 @@
 			"url": "/api/v1/user/group/users",
 			"method": "get"
 		},
+		"id-get": {
+			"url": "/api/v1/user/id/{id}",
+			"method": "get"
+		},
+		"userId-delete": {
+			"url": "/api/v1/user/id/{userId}",
+			"method": "delete"
+		},
 		"no-get": {
 			"url": "/api/v1/user/no/{no}",
 			"method": "get"
@@ -409,6 +433,10 @@
 			"url": "/api/v1/user/page",
 			"method": "get"
 		},
+		"page-post": {
+			"url": "/api/v1/user/page",
+			"method": "post"
+		},
 		"list-get": {
 			"url": "/api/v1/user/resource/list",
 			"method": "get"
@@ -609,6 +637,14 @@
 			"url": "/api/v2/workStation/delete/{id}",
 			"method": "delete"
 		},
+		"eqpRelation-post": {
+			"url": "/api/v2/workStation/eqpRelation",
+			"method": "post"
+		},
+		"eqpRelation-put": {
+			"url": "/api/v2/workStation/eqpRelation",
+			"method": "put"
+		},
 		"workPositionId-post": {
 			"url": "/api/v2/workStation/equipmentRelation/{workPositionId}",
 			"method": "post"
@@ -633,6 +669,10 @@
 			"url": "/api/v2/workStation/pageEqpRelation",
 			"method": "get"
 		},
+		"pageEquip-post": {
+			"url": "/api/v2/workStation/pageEquip",
+			"method": "post"
+		},
 		"username-get": {
 			"url": "/api/v2/workStation/pdaUser/{username}",
 			"method": "get"
@@ -702,6 +742,10 @@
 		"busNo-get": {
 			"url": "/area/detail/busNo",
 			"method": "get"
+		},
+		"test-get": {
+			"url": "/area/test",
+			"method": "get"
 		}
 	},
 	"report-controller": {
@@ -725,6 +769,10 @@
 			"url": "/area/oeuTrend",
 			"method": "get"
 		},
+		"runTimeList-get": {
+			"url": "/area/runTimeList",
+			"method": "get"
+		},
 		"stateTrend-get": {
 			"url": "/area/stateTrend",
 			"method": "get"

src/views/Basic/DeviceBasic/list.vue

@@ -226,19 +226,19 @@
             },
             // 获取设备分类数据
             getSeviceSortSelectData () {
-                let queryParams = { dicCode: 'DEVICE_SORT', hash: 'dicCode' };
+                let queryParams = { dicCode: 'DEVICE_SORT', hash: 'dicCode' }
                 this.$fetch('dict-item-controller/dicCode-get', queryParams).then(response => {
-                    this.equipTypeData = _.cloneDeep(response);
+                    this.equipTypeData = _.cloneDeep(response)
                 });
             }
         },
         mounted () {
             setTimeout(() => {
-                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210;
+                this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 210
                 // 获取设备分类数据
-                this.getSeviceSortSelectData();
+                this.getSeviceSortSelectData()
                 // 获取表格数据
-                this.getTableList();
+                this.getTableList()
             }, 0)
         }
     }

src/views/CenterControl/components/MachineFailureTrend.vue

@@ -95,7 +95,6 @@
                             lineStyle: {
                                 color: '#234eb6'
                             }
-
                         },
                         axisLine: {
                             lineStyle: {
@@ -199,4 +198,4 @@
             width: 607px;
         }
     }
-</style>
+</style>
\ No newline at end of file

src/views/CenterControl/components/MachineWarning.vue

@@ -21,8 +21,12 @@
                     <span>描述</span>
                 </div>
             </div>
-            <div class="table-body">
-                <div 
+            <VueSeamlessScroll
+                v-if="warningList.length > 0"
+                :data="warningList"
+                :class-option="optionSingleHeight"
+                class="table-body">
+                <div
                     class="tr"
                     v-for="(item, index) in warningList"
                     :key="index">
@@ -30,15 +34,19 @@
                     <div class="th-machine">{{item.equipName}}</div>
                     <div class="th-pencil">{{item.info}}</div>
                 </div>
-            </div>
+            </VueSeamlessScroll>
         </div>
     </div>
 </template>
 
 <script>
     import Moment from 'moment'
+    import VueSeamlessScroll from 'vue-seamless-scroll'
 
     export default {
+        components: {
+            VueSeamlessScroll
+        },
         props: {
             pollingRequestTime: {}
         },
@@ -50,6 +58,13 @@
                 this.judgeTime()
             }
         },
+        computed: {
+            optionSingleHeight () {
+                return {
+                    singleHeight: 50
+                }
+            }
+        },
         data () {
             return {
                 // 报警信息列表
@@ -64,7 +79,7 @@
             // 请求设备异常列表
             getMachineWarningList () {
                 this.$fetch('report-controller/warningList-get', {}).then(response => {
-                    this.warningList = _.cloneDeep(response.slice(0, 17))
+                    this.warningList = _.cloneDeep(response)
                 })
             },
             // 时间处理
@@ -103,16 +118,16 @@
 <style lang="scss" scoped>
     .machine-warning {
         width: 534px;
-        height: 881px;
+        height: 414px;
         position: absolute;
         top: 166px;
         right: 57px;
         overflow: hidden;
+        /*background-color: rgba(1,1,1,0.5);*/
 
         .time-warning-pack {
             width: 534px;
             height: 60px;
-            // background-color: rgba(1,1,1,0.5);
             margin-top: 27px;
             line-height: 60px;
             .time {
@@ -139,9 +154,10 @@
         .warning-message-pack {
             margin-top: 10px;
             width: 474px;
-            height: 767px;
+            height: 317px;
             padding: 0 30px;
             // background-color: rgba(1,1,1,0.5);
+            overflow: hidden;
             .table-header {
                 height: 40px;
                 color: #00b4ff;
@@ -168,11 +184,14 @@
                 }
             }
             .table-body {
+                height: 257px;
+                overflow: hidden;
                 .tr {
+                    overflow: hidden;
                     div {
                         float: left;
-                        height: 40px;
-                        line-height: 40px;
+                        height: 50px;
+                        line-height: 50px;
                         font-weight: bold;
                         font-size: 18px;
                         color: #3facd9;
@@ -196,4 +215,4 @@
             }
         }
     }
-</style>
+</style>
\ No newline at end of file

src/views/CenterControl/index.vue

@@ -21,7 +21,7 @@
             <MachineOperatingStatus
                 :pollingRequestTime="pollingRequestTime">
             </MachineOperatingStatus>
-            <!-- 设备状态趋势图 -->
+            <!-- 设备累计运行时间统计 -->
             <MachineStateTrend
                 :pollingRequestTime="pollingRequestTime">
             </MachineStateTrend>

src/views/Led/Station/stationSix.vue

@@ -130,8 +130,8 @@
             //获取工位实时信息
             getData () {
                 this.$fetch('led-controller/ledInfo-get', {ledNo: '6'}).then(res => {
-                    this.timmingData = _.cloneDeep(res);
-                    this.roomInfoList = _.cloneDeep(res.roomInfoList);
+                    this.timmingData = _.cloneDeep(res)
+                    this.roomInfoList = _.cloneDeep(res.roomInfoList)
                     this.warningList = _.cloneDeep(res.warningList)
                     for (let item of this.roomInfoList) {
                         console.log('item', item)

src/views/Workshop/Parts/components/ProgramIssued.vue

@@ -241,6 +241,6 @@
     }
 </script>
 
-<style>
+<style lang="scss" scoped>
 
 </style>