diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue
index 68693080..87ba1df2 100644
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
- * @LastEditTime: 2024-03-12 09:05:20
+ * @LastEditTime: 2024-03-26 09:57:35
* @Description:
-->
@@ -36,17 +36,7 @@
-
-
-
-
-
@@ -89,50 +55,18 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -142,252 +76,7 @@ import baseContainer from './components/baseContainer'
import baseTable1 from './components/baseTable'
import baseTable from './components/baseTable'
import baseTable2 from './components/baseTable'
-// import TopRadioGroup from './components/topRadioGroup'
-// import pieChart1 from './components/PieChart'
-// import pieChart2 from './components/PieChart'
-// import pieChart3 from './components/PieChart'
-// import { mapGetters } from 'vuex'
import screenfull from 'screenfull'
-// import BaseVideo from './components/baseVideo.vue'
-// import alarmLevel from './components/alarmLevel'
-// import axios from '@/utils/request'
-// import doubleYChart from './components/doubleYChart '
-// import elementResizeDetectorMaker from 'element-resize-detector';
-// var erd = elementResizeDetectorMaker(); //创建实例
-// import LinearBarChart from './components/linearBarChart'
-const qualityTableProps1 = [
- {
- prop: 'name',
- label: '产线名称'
- },
- {
- prop: 'createTime',
- label: '发生时间'
- },
- {
- prop: 'code',
- label: '质量编码'
- },
- {
- prop: 'content',
- label: '质量内容'
- }
-]
-const qualityTableProps2 = [
- {
- prop: 'name',
- label: '工序名称'
- },
- {
- prop: 'createTime',
- label: '发生时间'
- },
- {
- prop: 'code',
- label: '质量编码'
- },
- {
- prop: 'content',
- label: '质量内容'
- }
-]
-const cxNameList = ['周一', '周二', '周三', '周四', '周五']
-
-const cxDataList = [
- {
- topColor: '#9DD5FF',
- bottomColor: '#1295FF',
- name: '电耗能',
- data: [100, 150, 121, 97, 140]
- },
- {
- topColor: '#FF8BC3',
- bottomColor: '#EB46A1',
- name: '水耗能',
- data: [110, 110, 151, 77, 110]
- },
- {
- topColor: '#85F6E9',
- bottomColor: '#2EC6B4',
- name: '天然气',
- data: [110, 120, 171, 287, 40]
- },
- {
- topColor: '#9496FF',
- bottomColor: '#6567FF',
- name: '焦炉煤气',
- data: [140, 157, 122, 27, 240]
- },
- {
- topColor: '#F68E8A',
- bottomColor: '#E95552',
- name: '余热发电',
- data: [170, 180, 127, 17, 340]
- },
- {
- topColor: '#FFE873',
- bottomColor: '#E7AE2A',
- name: '二氧化硫',
- data: [140, 160, 121, 57, 170]
- }
-]
-
-const qualityList1 = [
- { name: '钢一线', createTime: '2021.10.21 24:59:59', code: '2121321231', content: '气泡' },
- { name: '钢二线', createTime: '2021.11.22 24:59:59', code: '3321123213', content: '气泡' },
- { name: '钢三线', createTime: '2021.12.12 24:59:59', code: '4535435345', content: '气泡' },
- { name: '钢四线', createTime: '2021.12.20 24:59:59', code: '5465465466', content: '气泡' },
- { name: '钢五线', createTime: '2021.12.02 24:59:59', code: '2132131312', content: '气泡' },
- { name: '钢一线', createTime: '2021.10.21 24:59:59', code: '2121321231', content: '气泡' },
- { name: '钢二线', createTime: '2021.11.22 24:59:59', code: '3321123213', content: '气泡' },
- { name: '钢三线', createTime: '2021.12.12 24:59:59', code: '4535435345', content: '气泡' },
- { name: '钢四线', createTime: '2021.12.20 24:59:59', code: '5465465466', content: '气泡' },
- { name: '钢五线', createTime: '2021.12.02 24:59:59', code: '2132131312', content: '气泡' },
- { name: '钢一线', createTime: '2021.10.21 24:59:59', code: '2121321231', content: '气泡' },
- { name: '钢二线', createTime: '2021.11.22 24:59:59', code: '3321123213', content: '气泡' },
- { name: '钢三线', createTime: '2021.12.12 24:59:59', code: '4535435345', content: '气泡' },
- { name: '钢四线', createTime: '2021.12.20 24:59:59', code: '5465465466', content: '气泡' },
- { name: '钢五线', createTime: '2021.12.02 24:59:59', code: '2132131312', content: '气泡' },
- { name: '钢六线', createTime: '2021.12.11 24:59:59', code: '2132131212', content: '气泡' }
-]
-const qualityList2 = [
- { name: '上片', createTime: '2021.10.22 24:59:59', code: '2132132133', content: '气泡' },
- { name: '磨边', createTime: '2021.12.21 24:59:59', code: '2132131232', content: '气泡' },
- { name: '清洗', createTime: '2021.12.12 24:59:59', code: '1232131312', content: '气泡' },
- { name: '激光打孔', createTime: '2021.12.13 24:59:59', code: '2132132131', content: '气泡' },
- { name: 'AR镀膜', createTime: '2021.10.23 24:59:59', code: '2311212232', content: '气泡' },
- { name: '固化', createTime: '2021.09.22 24:59:59', code: '21321321312', content: '气泡' },
- { name: '清洗', createTime: '2021.12.12 24:59:59', code: '1232131312', content: '气泡' },
- { name: '激光打孔', createTime: '2021.12.13 24:59:59', code: '2132132131', content: '气泡' },
- { name: 'AR镀膜', createTime: '2021.10.23 24:59:59', code: '2311212232', content: '气泡' },
- { name: '固化', createTime: '2021.09.22 24:59:59', code: '21321321312', content: '气泡' },
- { name: '上片', createTime: '2021.10.22 24:59:59', code: '2132132133', content: '气泡' },
- { name: '磨边', createTime: '2021.12.21 24:59:59', code: '2132131232', content: '气泡' },
- { name: '清洗', createTime: '2021.12.12 24:59:59', code: '1232131312', content: '气泡' },
- { name: '激光打孔', createTime: '2021.12.13 24:59:59', code: '2132132131', content: '气泡' },
- { name: 'AR镀膜', createTime: '2021.10.23 24:59:59', code: '2311212232', content: '气泡' },
- { name: '固化', createTime: '2021.09.22 24:59:59', code: '21321321312', content: '气泡' },
- { name: '丝网印刷', createTime: '2021.12.21 24:59:59', code: '21321322132', content: '气泡' },
- { name: '钢化炉', createTime: '2021.12.20 24:59:59', code: '21321312321', content: '气泡' },
- { name: '检测设备', createTime: '2021.12.12 24:59:59', code: '21321322132', content: '气泡' },
- { name: '包装设备', createTime: '2021.12.23 24:59:59', code: '39284982931', content: '气泡' }
-]
-const legendData1 = [
- {
- name: '设备1',
- icon: 'circle',
- value: 196
- },
- {
- name: '设备2',
- icon: 'circle',
- value: 147
- },
- {
- name: '设备3',
- icon: 'circle',
- value: 24
- },
- {
- name: '设备4',
- icon: 'circle',
- value: 85
- },
- {
- name: '设备5',
- icon: 'circle',
- value: 8
- },
- {
- name: '设备6',
- icon: 'circle',
- value: 112
- },
- {
- name: '设备7',
- icon: 'circle',
- value: 146
- },
- {
- name: '设备8',
- icon: 'circle',
- value: 27
- },
- {
- name: '设备9',
- icon: 'circle',
- value: 2
- },
- {
- name: '设备10',
- icon: 'circle',
- value: 90
- }
-]
-const legendData2 = [
- {
- name: '磨边',
- icon: 'circle',
- value: 196
- },
- {
- name: '清洗',
- icon: 'circle',
- value: 135
- },
- {
- name: '固化',
- icon: 'circle',
- value: 144
- },
- {
- name: '镀膜',
- icon: 'circle',
- value: 97
- },
- {
- name: '激光打孔',
- icon: 'circle',
- value: 12
- },
- {
- name: '丝网印刷',
- icon: 'circle',
- value: 10
- },
- {
- name: '钢化炉',
- icon: 'circle',
- value: 3
- }
-]
-const legendData3 = [
- {
- name: '钢一线',
- icon: 'circle',
- value: 196
- },
- {
- name: '钢二线',
- icon: 'circle',
- value: 133
- },
- {
- name: '钢三线',
- icon: 'circle',
- value: 24
- },
- {
- name: '钢四线',
- icon: 'circle',
- value: 77
- },
- {
- name: '钢五线',
- icon: 'circle',
- value: 77
- }
-]
const locationTableProps = [
{
prop: 'eqName',
@@ -552,107 +241,6 @@ const qualityYearList = [
{ eqName: 'RQ20230920', eqCode: '3-03', level: '成品库B-D区-4', product: ' 3.2-1033*2089', productCode: 'CP5651696323', time: '2023年9月20日' },
{ eqName: 'RQ20230920', eqCode: '1-03', level: '成品库C-D区-4', product: ' 2.2-1033*2089', productCode: 'CP5651696323', time: '2023年9月20日' }
]
-const qualityMonthTableProps = [
- {
- prop: 'lineName',
- label: '产线名'
- },
- {
- prop: 'process',
- label: '工序'
- },
- {
- prop: 'eqName',
- label: '设备名'
- },
- {
- prop: 'eqCode',
- label: '设备编码'
- },
- {
- prop: 'long',
- label: '总运行时长(h)'
- },
- // {
- // prop: 'createTime',
- // label: '保养时间'
- // },
- {
- prop: 'status',
- label: '设备状态'
- }
- // {
- // prop: 'nextCreateTime',
- // label: '下次保养时间'
- // }
- // {
- // prop: 'nextLong',
- // label: '距离保养时间(天)',
- // // subcomponent: nextDay,
- // align: 'center'
- // }
-]
-
-const qualityMonthList = [
- {
- lineName: '钢一线',
- process: '41',
- eqName: '设备1',
- eqCode: '2312312',
- long: '255',
- // createTime: '2021-02-25 12:00:01',
- status: '报警'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 365
- },
- {
- lineName: '钢二线',
- process: '41',
- eqName: '设备2',
- eqCode: '43434',
- long: '255',
- // createTime: '2021-11-25 12:00:01',
- status: '正常'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 4
- },
- {
- lineName: '钢三线',
- process: '41',
- eqName: '设备3',
- eqCode: '23213212',
- long: '255',
- // createTime: '2021-10-25 12:00:01',
- status: '故障停机'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 24
- },
- {
- lineName: '钢四线',
- process: '41',
- eqName: '设备4',
- eqCode: '23213',
- long: '255',
- // createTime: '2021-02-25 12:00:01',
- status: '故障停机'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: -36
- },
- {
- lineName: '钢五线',
- process: '41',
- eqName: '设备5',
- eqCode: '23121312',
- long: '255',
- // createTime: '2021-06-25 12:00:01',
- status: '待机'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 111
- }
-]
-
-// let resizeFun = null
-
export default {
name: 'ProductionMonitoringCockpit',
components: {
@@ -676,12 +264,10 @@ export default {
times:undefined,
value: 100,
qualityYearTableProps,
- cxNameList,
inventoryTableProps,
inventoryList,
locationList,
locationTableProps,
- cxDataList,
qualityYearList,
isFullScreen: false,
orderProcessList: [
@@ -710,18 +296,12 @@ export default {
outRate: '0.4'
}
],
- qualityTableProps1,
- qualityMonthList,
- qualityMonthTableProps,
+ // qualityTableProps1,
modelMonth: '',
- qualityList1,
// logoutTime: 43200000,
- qualityTableProps2,
- qualityList2,
+ // qualityTableProps2,
+ // qualityList2,
dateType: '0',
- legendData1,
- legendData2,
- legendData3
}
},
computed: {
@@ -770,23 +350,7 @@ export default {
this.beilv2 = _this.clientWidth / 1920
})()
}
- // this.beilv2 = window.innerWidth / 1920
- // addEventListener('resize', resizeFun = () => {
- // this.beilv2 = window.innerWidth / 1920
- // })
- // erd.listenTo(document, (element) => {
- // console.log(element.offsetWidth)
- // this.beilv2 = element.offsetWidth / 1920
-
- // // var width = element.offsetWidth;
- // // var height = element.offsetHeight;
- // });
},
- // beforeDestroy() {
- // //离开页面删除检测器和所有侦听器
- // // erd.uninstall(document); //这里用ref是因为vue离开页面后获取不到dom
- // removeEventListener('resize', resizeFun)
- // },
methods: {
getTimes() {
setInterval(this.getTimesInterval, 1000);
@@ -815,32 +379,6 @@ export default {
windowWidth(value) {
this.clientWidth = value
},
- // fetchList(type) {
- // switch (type) {
- // case 'order-process':
- // return axios({
- // url: '/analysis/factory-monitor/order',
- // method: 'post'
- // }).then(res => {
- // if (res.data) {
- // console.log(res)
- // this.orderProcessList = res.data
- // // this.orderProcessList = [
- // // { id: 1, name: '订单1', outRate: 0.5 },
- // // { id: 2, name: '订单2', outRate: 0.54 },
- // // { id: 3, name: '订单3', outRate: 0.45 },
- // // { id: 4, name: '订单4', outRate: 0.65 },
- // // { id: 5, name: '订单5', outRate: 0.35 },
- // // { id: 6, name: '订单6', outRate: 0.15 },
- // // { id: 7, name: '订单7', outRate: 0.5 },
- // // { id: 8, name: '订单8', outRate: 0.5 }
- // // ]
- // } else {
- // this.orderProcessList.splice(0)
- // }
- // })
- // }
- // },
change() {
this.isFullScreen = screenfull.isFullscreen
},
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 054c04e0..7bcf2aed 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
@@ -134,143 +134,31 @@