Commit 02683b18 authored by W_Y's avatar W_Y

Merge remote-tracking branch 'origin/project9-8' into project9-8

parents 10ccb924 a2482156
...@@ -329,7 +329,7 @@ export default { ...@@ -329,7 +329,7 @@ export default {
this.dataList = [] this.dataList = []
this.sumUpdateList.forEach(item => { this.sumUpdateList.forEach(item => {
this.numList.push(item.sum) this.numList.push(item.sum)
this.dataList.push(item.updateDate) this.dataList.push(item.time)
}) })
this.updateRegistrationTime() this.updateRegistrationTime()
}) })
...@@ -347,7 +347,7 @@ export default { ...@@ -347,7 +347,7 @@ export default {
this.updateChartsLeaveMessage() this.updateChartsLeaveMessage()
}) })
}, },
// 饼图 // 饼图1
getPtypeList() { getPtypeList() {
findCountIdByPtype().then(res => { findCountIdByPtype().then(res => {
this.PtypeList=[] this.PtypeList=[]
...@@ -371,16 +371,16 @@ export default { ...@@ -371,16 +371,16 @@ export default {
const renamedData = res.data.map(item => ({ const renamedData = res.data.map(item => ({
...item, ...item,
name: item.ptype === '1' ? '设备库' : (item.ptype === '2' ? '工序库' : item.ptype), name: item.ptype === '1' ? '设备库' : (item.ptype === '2' ? '工序库' : item.ptype),
value: item.sum, value: item.sum
})); }))
this.PtypeList = renamedData this.PtypeList = renamedData
this.updateVisitorData() this.updateVisitorData()
}) })
}, },
// 饼图 // 饼图2
getUpdateList() { getUpdateList() {
findCountIdByPtype1CreateDate().then(res => { findCountIdByPtype1CreateDate().then(res => {
console.log('---res---',res) console.log('---res---', res)
// this.PtypeList=[] // this.PtypeList=[]
// const renamedData = res.data.map(item => ({ // const renamedData = res.data.map(item => ({
// ...item, // ...item,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment