Commit 45d8af82 by lichengming

修改了统计分析

parent 3c671803
...@@ -12,5 +12,13 @@ export default { ...@@ -12,5 +12,13 @@ export default {
pageReportCheck: data => pageReportCheck: data =>
http.post('soil/v1/entrust/page_report_check', data).then(res => res), http.post('soil/v1/entrust/page_report_check', data).then(res => res),
pageReportIssue: data => pageReportIssue: data =>
http.post('soil/v1/entrust/page_report_issue', data).then(res => res) http.post('soil/v1/entrust/page_report_issue', data).then(res => res),
pageAnnual: data =>
http
.post('soil/v1/statistics/page_annual_entrust_statistics', data)
.then(res => res),
pageCustomer: data =>
http
.post('soil/v1/statistics/page_customer_entrust_statistics', data)
.then(res => res)
} }
...@@ -65,14 +65,12 @@ export default { ...@@ -65,14 +65,12 @@ export default {
} }
}, },
mounted() { mounted() {
// this._getData(this.entrustDate.getFullYear()) this._getData(this.entrustDate.getFullYear())
}, },
methods: { methods: {
_getData: async function(data) { _getData: async function(data) {
this.formObj.entrustDate = data this.formObj.entrustDate = data
const result = await soilStatistics.pageAnnualEntrustStatistics( const result = await soilStatistics.pageAnnual(this.formObj)
this.formObj
)
console.log('result', result) console.log('result', result)
if (result) { if (result) {
this._open(result) this._open(result)
......
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
// this._getUserGroup() // this._getUserGroup()
this.formObj.edateBegin = this.tempData.beginDate this.formObj.edateBegin = this.tempData.beginDate
this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss') this.formObj.edateEnd = this.$dateformat(lastday, 'yyyy-mm-dd HH:MM:ss')
// this._getData() this._getData()
// this._getServiceTypeList() // this._getServiceTypeList()
}, },
methods: { methods: {
...@@ -145,11 +145,7 @@ export default { ...@@ -145,11 +145,7 @@ export default {
}, },
// 服务类型 // 服务类型
_getData: async function() { _getData: async function() {
console.log('753951') const result = await soilStatistics.pageCustomer(this.formObj)
console.log('选择时间后的请求', this.formObj)
const result = await soilStatistics.pageCustomerEntrustStatistics(
this.formObj
)
if (result) { if (result) {
this.getPage.records = result this.getPage.records = result
this.$refs.testPieModal._openPie(this.getPage.records) this.$refs.testPieModal._openPie(this.getPage.records)
......
...@@ -78,6 +78,11 @@ export default [ ...@@ -78,6 +78,11 @@ export default [
meta: { title: '余样管理' } meta: { title: '余样管理' }
}, },
{ {
path: 'dispose',
component: SurplusManage,
meta: { title: '样品处理' }
},
{
path: 'receive_location', path: 'receive_location',
component: AddressManage, component: AddressManage,
meta: { title: '收样位置管理' } meta: { title: '收样位置管理' }
......
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