diff --git a/src/assets/board/boardBg3.jpg b/src/assets/board/boardBg3.jpg index deed465..5ed8ada 100644 Binary files a/src/assets/board/boardBg3.jpg and b/src/assets/board/boardBg3.jpg differ diff --git a/src/views/board/board1/index.vue b/src/views/board/board1/index.vue index f3ef56f..a651e24 100644 --- a/src/views/board/board1/index.vue +++ b/src/views/board/board1/index.vue @@ -31,7 +31,7 @@
- 暂停 + 停机 ： {{ runningData.STOPPEDCOUNT }} 台 @@ -58,17 +58,17 @@
{{ i.DEVICENAME }}
-
停机
-
待机
+
报警
+
停机
正常运行
未开机
-
+
{{ parseFloat(i.value1 || '0').toFixed(1) }} h
-
+
{{ parseFloat(i.value1 || '0').toFixed(1) }} @@ -91,17 +91,17 @@
{{ i.DEVICENAME }}
-
停机
-
待机
+
报警
+
停机
正常运行
未开机
-
+
{{ timeData[i.DEVICECODE] || '0' }} h
-
+
{{ timeData[i.DEVICECODE] || '0' }} @@ -224,12 +224,12 @@ export default { label: '正常运行' }, { - value: 2, - label: '停机' + value: 4, + label: '报警' }, { - value: 3, - label: '待机' + value: 2, + label: '停机' }, ], isData: false, @@ -653,7 +653,7 @@ export default { } .itemTime1 { - color: #FC7F03; + color: #FFC107; } .itemTime2 { diff --git a/src/views/board/board4/index.vue b/src/views/board/board4/index.vue index bd1d5e1..0ce2a71 100644 --- a/src/views/board/board4/index.vue +++ b/src/views/board/board4/index.vue @@ -103,15 +103,15 @@ form.isSimulate ? form.text11 : runningData.TOTALCOUNT }}
-
总维修次数: {{ - form.isSimulate ? form.text12 : deviceStatusData.repairCount +
当日总停机次数: {{ + form.isSimulate ? form.text12 : shutDownList.length }}
生产进度
-
累计维修分析
+
累计停机分析
质量追溯
设备总产量
-
当日维修趋势
+
{{ form.isSimulate ? form.info1.text1 : alarmInfoData.deviceName }}
@@ -215,22 +215,70 @@
-
-
-
{{ k + 1 }}
-
{{ form.isSimulate ? i.text1 : i.deviceName }}
-
-
+
+
+
+ 设备名称 +
+
+ 停机原因 +
+
+ 开始时间 +
+
+ 结束时间
-
{{ form.isSimulate ? i.text3 : i.repairCount }}次
+ +
+
+
+ {{ form.isSimulate ? item.text1 : item.deviceName }} +
+
+ {{ form.isSimulate ? item.text2 : item.shutReason }} +
+
+ {{ form.isSimulate ? item.text3 : item.shutBeginTime }} +
+
+ {{ form.isSimulate ? item.text3 : item.shutEndTime }} +
+
+
+
- - - - - - + + + + + + + + + + + + + + + +
@@ -288,7 +336,7 @@ - + @@ -525,7 +573,10 @@ import { getProductionTotal, getQualityStatistics, getQualityTraceList, getRepairAnalysisList, getRepairTrendList } from "@/api/board/board4"; import {listQualityInspection} from "@/api/report/qualityInspection"; +import {listShutDown} from "@/api/dms/shutDown"; +import {parseTime} from "@/utils/ruoyi"; +const now = new Date() const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 export default { components: { @@ -618,8 +669,9 @@ export default { qualityStatisticsData: {}, qualityTraceList: [], deviceProductionList: [], - qualityInspectionList:[], - runningData: {} + qualityInspectionList: [], + runningData: {}, + shutDownList: [] } }, async mounted() { @@ -639,7 +691,24 @@ export default { }, methods: { async getData() { - listQualityInspection({pageSize:99999999}).then(res => { + listShutDown({ + beginTime: parseTime(new Date( + now.getFullYear(), + now.getMonth(), + now.getDate(), + 0, 0, 0 + )), + endTime: parseTime(new Date( + now.getFullYear(), + now.getMonth(), + now.getDate(), + 23, 59, 59 + )), + pageSize: 99999999 + }).then(res => { + this.shutDownList = res.rows + }) + listQualityInspection({pageSize: 99999999}).then(res => { this.qualityInspectionList = res.rows }) getDeviceStatusStatistics().then(e => { @@ -883,89 +952,89 @@ export default { } ], }) - this.$refs.chart3.setData({ - xAxis: { - data: this.form.isSimulate ? this.form.chart3.map(e => e.value1) : this.repairTrendList?.map(e => e.timeHour), - boundaryGap: false, - axisLine: { - lineStyle: { - color: '#377097', - } - }, - axisLabel: { - fontSize: 12, - interval: 0, - color: '#4C95C1', - }, - axisTick: { - alignWithLabel: true, - lineStyle: { - color: '#37709799', - } - }, - splitLine: { - show: true, - alignWithLabel: true, - lineStyle: { - color: '#37709799', - type: 'dashed', - } - } - }, - yAxis: { - axisLine: { - show: true, - lineStyle: { - color: '#377097', - } - }, - axisLabel: { - fontSize: 14, - color: '#4C95C1', - }, - axisTick: { - show: true, - alignWithLabel: true, - lineStyle: { - color: '#37709799', - } - }, - splitLine: { - show: true, - alignWithLabel: true, - lineStyle: { - color: '#37709799', - type: 'dashed', - } - } - }, - grid: { - top: 20, - right: 20, - bottom: 40, - left: 50 - }, - series: [ - { - type: "line", - symbolSize: 5, - symbol: 'circle', - itemStyle: { - color: '#FBFFFA', // 点填充颜色 - borderColor: '#D8080C', // 点边框颜色 - borderWidth: 2 // 边框宽度 - }, - lineStyle: { - color: '#CE0F06', // 折线颜色 - width: 2 - }, - label: { - // show: false, - }, - data: this.form.isSimulate ? this.form.chart3.map(e => e.value2) : this.repairTrendList.map(e => e.repairCount), - }, - ], - }) + // this.$refs.chart3.setData({ + // xAxis: { + // data: this.form.isSimulate ? this.form.chart3.map(e => e.value1) : this.repairTrendList?.map(e => e.timeHour), + // boundaryGap: false, + // axisLine: { + // lineStyle: { + // color: '#377097', + // } + // }, + // axisLabel: { + // fontSize: 12, + // interval: 0, + // color: '#4C95C1', + // }, + // axisTick: { + // alignWithLabel: true, + // lineStyle: { + // color: '#37709799', + // } + // }, + // splitLine: { + // show: true, + // alignWithLabel: true, + // lineStyle: { + // color: '#37709799', + // type: 'dashed', + // } + // } + // }, + // yAxis: { + // axisLine: { + // show: true, + // lineStyle: { + // color: '#377097', + // } + // }, + // axisLabel: { + // fontSize: 14, + // color: '#4C95C1', + // }, + // axisTick: { + // show: true, + // alignWithLabel: true, + // lineStyle: { + // color: '#37709799', + // } + // }, + // splitLine: { + // show: true, + // alignWithLabel: true, + // lineStyle: { + // color: '#37709799', + // type: 'dashed', + // } + // } + // }, + // grid: { + // top: 20, + // right: 20, + // bottom: 40, + // left: 50 + // }, + // series: [ + // { + // type: "line", + // symbolSize: 5, + // symbol: 'circle', + // itemStyle: { + // color: '#FBFFFA', // 点填充颜色 + // borderColor: '#D8080C', // 点边框颜色 + // borderWidth: 2 // 边框宽度 + // }, + // lineStyle: { + // color: '#CE0F06', // 折线颜色 + // width: 2 + // }, + // label: { + // // show: false, + // }, + // data: this.form.isSimulate ? this.form.chart3.map(e => e.value2) : this.repairTrendList.map(e => e.repairCount), + // }, + // ], + // }) // this.$refs.chart4.setData({ // radar: { // center: ["30%", "50%"], @@ -1170,6 +1239,14 @@ export default { height: 29%; } +.scrollTable2 { + position: absolute; + top: 43%; + left: 72.8%; + width: 23.8%; + height: 52%; +} + .scrollTableItem { color: #65CDF9; margin: auto 0px; diff --git a/src/views/board/board5/index.vue b/src/views/board/board5/index.vue index b58cc1b..c87e245 100644 --- a/src/views/board/board5/index.vue +++ b/src/views/board/board5/index.vue @@ -79,7 +79,7 @@
-
应检设备{{ +
累计应检设备{{ form.isSimulate ? form.text16 : inspectStatisticsData.deviceCount }}台
{{ @@ -814,7 +814,7 @@ export default { .deviceNum { position: absolute; top: 0%; - left: 55%; + left: 54%; color: #fff; font-size: 1vw; letter-spacing: 0.1vw;