Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-web-back-soil
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-web-back-soil
Commits
45d8af82
Commit
45d8af82
authored
Oct 12, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了统计分析
parent
3c671803
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
11 deletions
+18
-11
soil-statistics.js
api/soil/soil-statistics.js
+9
-1
MeterAnnualEntrust.vue
pages/soil-statistics/annual-entrust/MeterAnnualEntrust.vue
+2
-4
MeterCustomerEntrust.vue
...soil-statistics/customer-entrust/MeterCustomerEntrust.vue
+2
-6
soil-routes.js
router/soil-routes.js
+5
-0
No files found.
api/soil/soil-statistics.js
View file @
45d8af82
...
@@ -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
)
}
}
pages/soil-statistics/annual-entrust/MeterAnnualEntrust.vue
View file @
45d8af82
...
@@ -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
)
...
...
pages/soil-statistics/customer-entrust/MeterCustomerEntrust.vue
View file @
45d8af82
...
@@ -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
)
...
...
router/soil-routes.js
View file @
45d8af82
...
@@ -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
:
'收样位置管理'
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment