diff --git a/src/assets/images/cp1.jpg b/src/assets/images/cp1.jpg new file mode 100644 index 0000000..e3b159b Binary files /dev/null and b/src/assets/images/cp1.jpg differ diff --git a/src/assets/images/cp2.jpg b/src/assets/images/cp2.jpg new file mode 100644 index 0000000..1b6023a Binary files /dev/null and b/src/assets/images/cp2.jpg differ diff --git a/src/assets/js/getData1.js b/src/assets/js/getData1.js index fbae1f4..7b3c73b 100644 --- a/src/assets/js/getData1.js +++ b/src/assets/js/getData1.js @@ -21,7 +21,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': null, 'warn_time': '5', - 'is_full': '1' + 'is_full': '1', + 'struct_url': '2' } ], 'materialTask': [ @@ -40,7 +41,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -57,7 +59,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -74,7 +77,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -91,7 +95,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -108,7 +113,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -125,7 +131,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -142,7 +149,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -159,7 +167,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -176,7 +185,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -193,7 +203,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -210,7 +221,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -227,7 +239,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -244,7 +257,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -261,7 +275,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -278,7 +293,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -295,7 +311,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -312,7 +329,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -329,7 +347,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -346,7 +365,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -363,7 +383,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -380,7 +401,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -397,7 +419,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -414,7 +437,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -431,7 +455,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -448,7 +473,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -465,7 +491,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -482,7 +509,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -499,7 +527,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' }, { 'point_id': '1597551506607968256', @@ -516,7 +545,8 @@ export const storageMonitor = () => { 'standing_time': 20, 'standing_status': '静置完成', 'warn_time': '5', - 'is_full': '是' + 'is_full': '是', + 'struct_url': '1' } ], 'productionList': [ diff --git a/src/pages/StorageMonitor2.vue b/src/pages/StorageMonitor2.vue index 6b7179c..70f5d40 100644 --- a/src/pages/StorageMonitor2.vue +++ b/src/pages/StorageMonitor2.vue @@ -44,7 +44,7 @@

{{e.point_code}}

-
+
@@ -282,168 +282,6 @@ export default { }, closebtn () { this.code1 = '' - }, - getEchart1 () { - var finishArr = [] - var materArr = [] - this.materArr1.map(el => { - finishArr.push(el.finished_qty) - materArr.push(el.material_code) - }) - var option = { - legend: { - top: 10, - right: 10, - textStyle: { - color: '#ffffff', - fontSize: 12, - lineHeight: 20 - }, - itemGap: 20, - itemHeight: 8, - data: ['完成物料'] - }, - xAxis: { - type: 'category', - // data: ['1号砖', '2号砖', '3号砖', '4号砖', '5号砖', '6号砖', '7号砖'], - data: materArr, - axisLine: { - show: false, - lineStyle: { - color: '#fff' - } - } - }, - // yAxis: { - // type: 'value' - // }, - yAxis: { - // splitNumber: 5, - // 设置坐标轴字体颜色和宽度 - axisLine: { - show: false, - lineStyle: { - color: '#fff' - } - }, - axisTick: { - show: false - } - }, - series: [{ - name: '完成物料', - // data: [10, 50, 30, 20, 60, 70, 80], - data: finishArr, - type: 'bar', - barWidth: 10, - itemStyle: { - normal: { - // label: { - // show: true, - // position: 'top', - // color: '#fff', - // distance: 15 - // }, - color: '#dc33e6' - } - } - }] - } - - var echart = document.getElementById('echarts1') - var myChart = echarts.init(echart) - myChart.setOption(option) - window.addEventListener('resize', function () { - myChart.resize() - }) - }, - getEchart3 () { - var statusqtyArr = [] - this.materArr2.map(el => { - statusqtyArr.push(el.status__qty) - }) - // 基于准备好的dom，初始化echarts实例 - var myChart = echarts.init(document.getElementById('echarts3')) - var option = { - color: ['#30EBC9 ', '#E2BB0E', '#FF0000'], - legend: { - top: 40, - right: 160, - textStyle: { - color: '#ffffff', - fontSize: 12, - lineHeight: 20 - }, - itemGap: 20, - itemHeight: 8, - data: ['状态汇总'] - // data: ['静置中', '静置完成', '强制完成'] - }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'shadow' - } - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true - }, - xAxis: { - type: 'value', - position: 'top', - offset: -10, - splitLine: { - show: false - }, - axisLine: { - show: false, - lineStyle: { - color: '#fff' - } - }, - axisTick: { - show: false - }, - boundaryGap: [0, 0.4] - }, - yAxis: { - type: 'category', - axisLine: { - show: false - } - }, - series: [ - { - name: '状态汇总', - type: 'bar', - barWidth: 10, - // data: [120, 200, 150], - data: statusqtyArr, - itemStyle: { - normal: { - // label: { - // show: true, - // position: 'right', - // color: '#fff' - // }, - color: function (params) { - // 注意，如果颜色太少的话，后面颜色不会自动循环，最好多定义几个颜色 - var colorList = ['#30EBC9 ', '#E2BB0E', '#FF0000'] - return colorList[params.dataIndex] - } - } - } - } - ] - } - // 使用刚指定的配置项和数据显示图表。 - myChart.setOption(option) - window.addEventListener('resize', function () { - myChart.resize() - }) } } } @@ -571,6 +409,18 @@ export default { // left 50% // margin-left -30% opacity 0.5 + .machine_2 + position absolute + width 60% + width 100% + height 60px + overflow hidden + background center center / 100% 100% url(../assets/images/cp1.jpg) no-repeat + margin 0 auto + z-index 98 + // left 50% + // margin-left -30% + opacity 0.5 .ingbox position absolute bottom 0