diff --git a/src/api/board/getData.js b/src/api/board/getData.js index d6c99bc..144cbc1 100644 --- a/src/api/board/getData.js +++ b/src/api/board/getData.js @@ -8,3 +8,11 @@ export function getData(query) { params: query }) } + +export function generalInterfaceList(query) { + return request({ + url: '/boardReport/generalInterfaceList', + method: 'post', + data: query + }) +} diff --git a/src/api/board/liner.js b/src/api/board/liner.js index d770b1c..d70de41 100644 --- a/src/api/board/liner.js +++ b/src/api/board/liner.js @@ -1,10 +1,7 @@ import request from '@/utils/request' -// 查询工单计划 -export function getPlan(query) { - return request({ - url: '../data.json', - method: 'get', - params: query - }) -} + + + + + diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue index 2033cfc..c961a89 100644 --- a/src/views/board/liner/index.vue +++ b/src/views/board/liner/index.vue @@ -72,7 +72,7 @@ -
平均节拍:{{meter}} 秒/件
+
平均节拍:{{ meter }} 秒/件
@@ -92,7 +92,7 @@ import vueSeamlessScroll from "vue-seamless-scroll"; import Chart from "../../../components/board/Chart"; import * as echarts from 'echarts' -import {getData} from '@/api/board/getData' +import {getData, generalInterfaceList} from '@/api/board/getData' export default { components: { @@ -109,7 +109,7 @@ export default { '泡前库存统计', '箱体发泡实时状态', ], - meter:30, + meter: 30, linerNum: 50, caseNum: 44, titlePosition: [ @@ -154,6 +154,31 @@ export default { }, mounted() { const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 + generalInterfaceList({ + "method": "SCADA_INV_STATS_01('')" + }).then(e => { + console.log(e) + }) + generalInterfaceList({ + "method": "SCADA_INV_STATS_SUM('')" + }).then(e => { + console.log(e) + }) + generalInterfaceList({ + "method": "scada_inv_stats_02('')" + }).then(e => { + console.log(e) + }) + generalInterfaceList({ + "method": "scada_in_store_01('')" + }).then(e => { + console.log(e) + }) + generalInterfaceList({ + "method": "scada_xk_pro_01('')" + }).then(e => { + console.log(e) + }) getData().then(e => { this.scrollTableData = e.table1 this.$refs.chart1.setData({ @@ -672,7 +697,8 @@ export default { color: #fff; letter-spacing: 1px; } -.meter{ + +.meter { position: absolute; top: 19.7%; left: 62.5%; diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue index 9f8c992..2bdcf81 100644 --- a/src/views/dashboard/LineChart.vue +++ b/src/views/dashboard/LineChart.vue @@ -116,6 +116,9 @@ export default { { axisTick: { show: false + }, + axisLabel:{ + formatter:'{value}%' } } ], @@ -125,7 +128,7 @@ export default { series: [ { name: '订单违约率', - type: 'bar', + type: 'line', yAxisIndex:1, itemStyle: { normal: { @@ -146,7 +149,7 @@ export default { { name: '产量', smooth: false, - type: 'line', + type: 'bar', itemStyle: { normal: { color: '#3888fa', diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue index ed69360..a409761 100644 --- a/src/views/index_v1.vue +++ b/src/views/index_v1.vue @@ -40,15 +40,18 @@ const lineChartData = { }, messages: { expectedData: [200, 192, 120, 144, 160, 130, 140], - actualData: [180, 160, 151, 106, 145, 150, 130] + actualData: [180, 160, 151, 106, 145, 150, 130], + expedData: [200, 192, 120, 144, 160, 130, 140] }, purchases: { expectedData: [80, 100, 121, 104, 105, 90, 100], - actualData: [120, 90, 100, 138, 142, 130, 130] + actualData: [120, 90, 100, 138, 142, 130, 130], + expedData: [200, 192, 120, 144, 160, 130, 140] }, shoppings: { expectedData: [130, 140, 141, 142, 145, 150, 160], - actualData: [120, 82, 91, 154, 162, 140, 130] + actualData: [120, 82, 91, 154, 162, 140, 130], + expedData: [200, 192, 120, 144, 160, 130, 140] } }