yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改接口

Browse Source
master
夜笙歌 8 months ago
parent 4f32a014e7
commit bb5e49714c
7 changed files with 168 additions and 21 deletions
Show Stats Download Patch File Download Diff File

BIN
public/bg.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

4
src/api/board/getData.js
Unescape Escape View File

@ -13,12 +13,14 @@ export function generalInterfaceList(query) {
return request({ return request({
url: '/boardReport/generalInterfaceList', url: '/boardReport/generalInterfaceList',
method: 'post', method: 'post',
isMsg:true,
data: query data: query
}) })
} }
export function getSimulateData(query) { export function getSimulateData(query) {
return request({ return request({
isMsg:true,
url: '/base/customData/list', url: '/base/customData/list',
method: 'get', method: 'get',
params: {customType: 1, ...query} params: {customType: 1, ...query}
@ -28,6 +30,7 @@ export function getSimulateData(query) {
export function getFoamingData(query) { export function getFoamingData(query) {
return request({ return request({
isMsg:true,
url: '/boardReport/boxFoamingProductionInterface', url: '/boardReport/boxFoamingProductionInterface',
method: 'post', method: 'post',
data: query data: query
@ -36,6 +39,7 @@ export function getFoamingData(query) {
export function getCurrentTeamTimeList(query) { export function getCurrentTeamTimeList(query) {
return request({ return request({
isMsg:true,
url: '/boardReport/getCurrentTeamTimeList', url: '/boardReport/getCurrentTeamTimeList',
method: 'post', method: 'post',
data: query data: query

2
src/utils/request.js
Unescape Escape View File

@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
const s_data = sessionObj.data; // 请求数据 const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间 const s_time = sessionObj.time; // 请求时间
const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { if (config?.isMsg !== true && s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
const message = '数据正在处理，请勿重复提交'; const message = '数据正在处理，请勿重复提交';
console.warn(`[${s_url}]: ` + message) console.warn(`[${s_url}]: ` + message)
return Promise.reject(new Error(message)) return Promise.reject(new Error(message))

54
src/views/board/scanDown/index.vue
Unescape Escape View File

@ -14,7 +14,7 @@
}}&nbsp;&nbsp;差异：{{ }}&nbsp;&nbsp;差异：{{
finishedProductOutput.mb - finishedProductOutput.sj finishedProductOutput.mb - finishedProductOutput.sj
}};&nbsp;达成率：{{ ((finishedProductOutput.sj / finishedProductOutput.mb) * 100).toFixed(2) }}% </span> }};&nbsp;达成率：{{ ((finishedProductOutput.sj / finishedProductOutput.mb) * 100).toFixed(2) }}% </span>
<span style="position: absolute;top: 54.3%;left: 19%;color: #fff;font-size: 0.9vw">目标：{{ finalInspection.mb }}% &nbsp;&nbsp;&nbsp;实际：{{ <span style="position: absolute;top: 54.3%;left: 19%;color: #fff;font-size: 0.9vw">目标：{{ finalInspection.mb }} &nbsp;&nbsp;&nbsp;实际：{{
finalInspection.sj finalInspection.sj
}}% &nbsp;&nbsp;&nbsp;累计不良数：{{ finalInspection.bls }}</span> }}% &nbsp;&nbsp;&nbsp;累计不良数：{{ finalInspection.bls }}</span>
<span style="position: absolute;top: 54.3%;left: 66.7%;color: #CFD2D0;font-size: 0.9vw">合计：{{ zhddhj }}</span> <span style="position: absolute;top: 54.3%;left: 66.7%;color: #CFD2D0;font-size: 0.9vw">合计：{{ zhddhj }}</span>
@ -179,9 +179,20 @@ export default {
e: 'cp-1-01', e: 'cp-1-01',
i: "scada_cp_cp_cl_01('CX_01')", i: "scada_cp_cp_cl_01('CX_01')",
f: (e) => { f: (e) => {
let nowHour = new Date().getHours()
let jdmb = 0
if (nowHour >= 8 && nowHour < 20) {
jdmb = e.map(v => v.Y_VALUE_TWO).splice(0, (nowHour - 8 + 1)).reduce((v1, v2) => v1 + v2, 0)
}
if (nowHour >= 20) {
jdmb = e.map(v => v.Y_VALUE_TWO).splice(0, (nowHour - 20 + 1)).reduce((v1, v2) => v1 + v2, 0)
}
if (nowHour < 8) {
jdmb = e.map(v => v.Y_VALUE_TWO).splice(0, (nowHour + 4 + 1)).reduce((v1, v2) => v1 + v2, 0)
}
this.finishedProductOutput = { this.finishedProductOutput = {
mb: e.reduce((v1, v2) => v1 + v2.Y_VALUE_TWO, 0), mb: e.reduce((v1, v2) => v1 + v2.Y_VALUE_TWO, 0),
jdmb: 1, jdmb: jdmb,
sj: e.reduce((v1, v2) => v1 + v2.Y_VALUE_ONE, 0), sj: e.reduce((v1, v2) => v1 + v2.Y_VALUE_ONE, 0),
} }
this.$refs.chart1.setData({ this.$refs.chart1.setData({
@ -342,6 +353,17 @@ export default {
}) })
} }
}, },
{
e: 'cp-1-02',
i: "scada_cp_zj_02('CX_01')",
f: (e) => {
this.finalInspection = {
mb: e?.[0]?.COLUMN_A || '',
sj: e?.[0]?.COLUMN_C || '',
bls: e?.[0]?.COLUMN_B || '',
}
}
},
{ {
e: 'cp-1-03', e: 'cp-1-03',
i: "scada_cp_zj_01('CX_01')", i: "scada_cp_zj_01('CX_01')",
@ -578,7 +600,7 @@ export default {
i: "scada_cp_rk_order_01('CX_01')", i: "scada_cp_rk_order_01('CX_01')",
f: (e) => { f: (e) => {
this.scrollTableData = e this.scrollTableData = e
this.zhddhj = e.reduce((v1, v2) => v1 + v2.COLUMN_D, 0) this.zhddhj = e.reduce((v1, v2) => v1 + parseFloat(v2.COLUMN_D), 0)
} }
}, },
], ],
@ -587,9 +609,20 @@ export default {
e: 'cp-2-01', e: 'cp-2-01',
i: "scada_cp_cp_cl_01('CX_02')", i: "scada_cp_cp_cl_01('CX_02')",
f: (e) => { f: (e) => {
let nowHour = new Date().getHours()
let jdmb = 0
if (nowHour >= 8 && nowHour < 20) {
jdmb = e.map(v => v.Y_VALUE_TWO).splice(0, (nowHour - 8 + 1)).reduce((v1, v2) => v1 + v2, 0)
}
if (nowHour >= 20) {
jdmb = e.map(v => v.Y_VALUE_TWO).splice(0, (nowHour - 20 + 1)).reduce((v1, v2) => v1 + v2, 0)
}
if (nowHour < 8) {
jdmb = e.map(v => v.Y_VALUE_TWO).splice(0, (nowHour + 4 + 1)).reduce((v1, v2) => v1 + v2, 0)
}
this.finishedProductOutput = { this.finishedProductOutput = {
mb: e.reduce((v1, v2) => v1 + v2.Y_VALUE_TWO, 0), mb: e.reduce((v1, v2) => v1 + v2.Y_VALUE_TWO, 0),
jdmb: 1, jdmb: jdmb,
sj: e.reduce((v1, v2) => v1 + v2.Y_VALUE_ONE, 0), sj: e.reduce((v1, v2) => v1 + v2.Y_VALUE_ONE, 0),
} }
this.$refs.chart1.setData({ this.$refs.chart1.setData({
@ -750,6 +783,17 @@ export default {
}) })
} }
}, },
{
e: 'cp-2-02',
i: "scada_cp_zj_02('CX_02')",
f: (e) => {
this.finalInspection = {
mb: e?.[0]?.COLUMN_A || '',
sj: e?.[0]?.COLUMN_C || '',
bls: e?.[0]?.COLUMN_B || '',
}
}
},
{ {
e: 'cp-2-03', e: 'cp-2-03',
i: "scada_cp_zj_01('CX_02')", i: "scada_cp_zj_01('CX_02')",
@ -986,7 +1030,7 @@ export default {
i: "scada_cp_rk_order_01('CX_02')", i: "scada_cp_rk_order_01('CX_02')",
f: (e) => { f: (e) => {
this.scrollTableData = e this.scrollTableData = e
this.zhddhj = e.reduce((v1, v2) => v1 + v2.COLUMN_D, 0) this.zhddhj = e.reduce((v1, v2) => v1 + parseFloat(v2.COLUMN_D), 0)
} }
}, },
] ]

125
src/views/index_v1.vue
Unescape Escape View File

@ -126,6 +126,9 @@ export default {
mounted() { mounted() {
getData({}).then(e => { getData({}).then(e => {
let data = e.data let data = e.data
let xData1 = [...new Set(data.columnarList.map(val => val.BEGIN_DATE))]
let xData2 = [...new Set(data.lineList.map(val => val.BEGIN_DATE))]
console.log(data)
this.topData = { this.topData = {
value1: data.planOrderSum, value1: data.planOrderSum,
value2: data.prodOrderSum, value2: data.prodOrderSum,
@ -146,8 +149,7 @@ export default {
left: '0%', left: '0%',
}, },
xAxis: { xAxis: {
data: data.columnarList.map(val => val.BEGIN_DATE), data: xData1,
// boundaryGap: false,
axisTick: { axisTick: {
show: false show: false
} }
@ -183,7 +185,7 @@ export default {
], ],
series: [ series: [
{ {
name: '订单履约率', name: '一线订单履约率',
type: 'line', type: 'line',
yAxisIndex: 1, yAxisIndex: 1,
itemStyle: { itemStyle: {
@ -210,12 +212,48 @@ export default {
}, },
}, },
}, },
data: data.columnarList.map(val => val.RATE), data: xData1.map(v => {
return (data.columnarList.find(val => val.BEGIN_DATE === v && val.PRODUCT_LINE_CODE === "CX_01"))?.RATE || 0
}),
animationDuration: 1000,
animationEasing: 'quadraticOut'
},
{
name: '二线订单履约率',
type: 'line',
yAxisIndex: 1,
itemStyle: {
normal: {
color: '#3888fa',
lineStyle: {
color: '#3888fa',
width: 2
},
// areaStyle: {
// color: '#f3f8ff'
// }
}
},
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
},
},
},
data: xData1.map(v => {
return (data.columnarList.find(val => val.BEGIN_DATE === v && val.PRODUCT_LINE_CODE === "CX_02"))?.RATE || 0
}),
animationDuration: 1000, animationDuration: 1000,
animationEasing: 'quadraticOut' animationEasing: 'quadraticOut'
}, },
{ {
name: '产量', name: '一线产量',
smooth: false, smooth: false,
type: 'bar', type: 'bar',
barMaxWidth: 60, barMaxWidth: 60,
@ -243,7 +281,44 @@ export default {
} }
} }
}, },
data: data.columnarList.map(val => val.COMPLETE_AMOUNT), data: xData1.map(v => {
return (data.columnarList.find(val => val.BEGIN_DATE === v && val.PRODUCT_LINE_CODE === "CX_01"))?.COMPLETE_AMOUNT || 0
}),
animationDuration: 1000,
animationEasing: 'quadraticOut'
},
{
name: '二线产量',
smooth: false,
type: 'bar',
barMaxWidth: 60,
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
},
},
},
itemStyle: {
normal: {
color: '#9fe080',
lineStyle: {
color: '#9fe080',
width: 2
},
areaStyle: {
color: '#f3f8ff'
}
}
},
data: xData1.map(v => {
return (data.columnarList.find(val => val.BEGIN_DATE === v && val.PRODUCT_LINE_CODE === "CX_02"))?.COMPLETE_AMOUNT || 0
}),
animationDuration: 1000, animationDuration: 1000,
animationEasing: 'quadraticOut' animationEasing: 'quadraticOut'
} }
@ -261,7 +336,7 @@ export default {
left: '0%', left: '0%',
}, },
xAxis: { xAxis: {
data: data.lineList.map(val => val.BEGIN_DATE), data: xData2,
boundaryGap: false, boundaryGap: false,
axisTick: { axisTick: {
show: false show: false
@ -291,9 +366,8 @@ export default {
}, },
legend: {}, legend: {},
series: [ series: [
{ {
name: '清单率', name: '一线清单率',
smooth: false, smooth: false,
type: 'line', type: 'line',
itemStyle: { itemStyle: {
@ -308,10 +382,35 @@ export default {
} }
} }
}, },
data: data.lineList.map(val => val.COMPLETE_AMOUNT), data: xData1.map(v => {
return (data.lineList.find(val => val.BEGIN_DATE === v && val.PRODUCT_LINE_CODE === "CX_01"))?.COMPLETE_AMOUNT || 0
}),
animationDuration: 2800, animationDuration: 2800,
animationEasing: 'quadraticOut' animationEasing: 'quadraticOut'
}] },
{
name: '二线清单率',
smooth: false,
type: 'line',
itemStyle: {
normal: {
color: '#3888fa',
lineStyle: {
color: '#3888fa',
width: 2
},
areaStyle: {
color: '#f3f8ff'
}
}
},
data: xData1.map(v => {
return (data.lineList.find(val => val.BEGIN_DATE === v && val.PRODUCT_LINE_CODE === "CX_02"))?.COMPLETE_AMOUNT || 0
}),
animationDuration: 2800,
animationEasing: 'quadraticOut'
}
]
} }
this.pieChartData = { this.pieChartData = {
title: { title: {
@ -326,7 +425,7 @@ export default {
}, },
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{a} <br/>{b} : {c} ({d}%)' formatter: '缺陷种类:{b} : {c} ({d}%)'
}, },
legend: { legend: {
left: 'center', left: 'center',
@ -406,6 +505,6 @@ export default {
} }
/deep/ .blackHover:hover { /deep/ .blackHover:hover {
color: #000!important; color: #000 !important;
} }
</style> </style>

2
src/views/model/model.vue
Unescape Escape View File

@ -609,7 +609,7 @@ export default {
// appsecret: 'rXmhoLAiOPNKzbl7g2qxCV8tFwRdYuZM' // appsecret: 'rXmhoLAiOPNKzbl7g2qxCV8tFwRdYuZM'
// } // }
const viewer = new AMRT.Viewer('container', {offline: true}) const viewer = new AMRT.Viewer('container', {offline: true})
viewer.sceneManager.setBackground('http://10.100.72.10:8900/docs/img/bg.jpg') viewer.sceneManager.setBackground('http://10.100.72.10:8900/bg.jpg')
viewer.controls.setTarget(285.6140415831262, -66.96447327588656, -15.909577343207037) viewer.controls.setTarget(285.6140415831262, -66.96447327588656, -15.909577343207037)
viewer.controls.setPosition(289.21362270826876, 1559.17755547545135, 1298.62483706445185) viewer.controls.setPosition(289.21362270826876, 1559.17755547545135, 1298.62483706445185)
let modelArr = [ let modelArr = [

2
vue.config.js
Unescape Escape View File

@ -37,7 +37,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://10.11.43.2:8080`, // target: `http://10.11.43.2:8080`,
target: `http://10.100.72.10:8080`, target: `http://10.100.72.10:8080`,
// target: `http://localhost:8080`, // target: `http://192.168.1.118:6061`,
// target: `http://localhost:6061`, // target: `http://localhost:6061`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {

Write Preview
Loading…
Cancel
Save