diff --git a/src/api/ywts/shms/tcy.js b/src/api/ywts/shms/tcy.js index 7db59fe..8162096 100644 --- a/src/api/ywts/shms/tcy.js +++ b/src/api/ywts/shms/tcy.js @@ -17,6 +17,7 @@ url: "zhjt-gktj/tcy/cljcqs", method: "post", data, + params: data }); } @@ -26,6 +27,7 @@ url: "zhjt-gktj/tcy/cllxfx", method: "post", data, + params: data }); } @@ -35,6 +37,28 @@ url: "zhjt-gktj/tcy/cclyl", method: "post", data, + params: data + }); +} + + +// 近1年车场收入态势 +export function getCarsIncome(data) { + return request({ + url: "zhjt-gktj/tcy/ccsrts", + method: "post", + data, + params: data + }); +} + +// 近1年僵尸车辆趋势 +export function getZombieCar(data) { + return request({ + url: "zhjt-gktj/tcy/jsclcs", + method: "post", + data, + params: data }); } diff --git a/src/api/ywts/shms/tcy.js b/src/api/ywts/shms/tcy.js index 7db59fe..8162096 100644 --- a/src/api/ywts/shms/tcy.js +++ b/src/api/ywts/shms/tcy.js @@ -17,6 +17,7 @@ url: "zhjt-gktj/tcy/cljcqs", method: "post", data, + params: data }); } @@ -26,6 +27,7 @@ url: "zhjt-gktj/tcy/cllxfx", method: "post", data, + params: data }); } @@ -35,6 +37,28 @@ url: "zhjt-gktj/tcy/cclyl", method: "post", data, + params: data + }); +} + + +// 近1年车场收入态势 +export function getCarsIncome(data) { + return request({ + url: "zhjt-gktj/tcy/ccsrts", + method: "post", + data, + params: data + }); +} + +// 近1年僵尸车辆趋势 +export function getZombieCar(data) { + return request({ + url: "zhjt-gktj/tcy/jsclcs", + method: "post", + data, + params: data }); } diff --git a/src/pages/ywts/shms/tcy/components/cars.vue b/src/pages/ywts/shms/tcy/components/cars.vue index ecaaf09..3317453 100644 --- a/src/pages/ywts/shms/tcy/components/cars.vue +++ b/src/pages/ywts/shms/tcy/components/cars.vue @@ -177,22 +177,21 @@ // 获取数据 fetchData(id) { console.log('获取到的id',id); - - // getCarsInOutTrend({id}).then(response => { - // if (response.code === 200) { - // this.extend.series[0].data = response.data.map(item => item.in) - // this.extend.series[1].data = response.data.map(item => item.out) - // this.extend.xAxis.data = response.data.map(item => item.date) - // this.myChart.setOption(this.extend, true) - // } - // }) + getCarsInOutTrend({id}).then(response => { + if (response.code === 200) { + const res = response.data.value.slice(0, 31) + this.extend.series[0].data = res.map(item => item.in) + this.extend.series[1].data = res.map(item => item.out) + this.extend.xAxis.data = res.map(item => item.date) + this.myChart.setOption(this.extend, true) + } + }) // console.log('近1月车辆进出趋势折线图初始化'); - - this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] - this.extend.series[1].data = [12,234,24,2342,234,33,3] - this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] - this.myChart.setOption(this.extend, true) - + // -------------------假数据-------------------------------------------- + // this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] + // this.extend.series[1].data = [12,234,24,2342,234,33,3] + // this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] + // this.myChart.setOption(this.extend, true) } } } diff --git a/src/api/ywts/shms/tcy.js b/src/api/ywts/shms/tcy.js index 7db59fe..8162096 100644 --- a/src/api/ywts/shms/tcy.js +++ b/src/api/ywts/shms/tcy.js @@ -17,6 +17,7 @@ url: "zhjt-gktj/tcy/cljcqs", method: "post", data, + params: data }); } @@ -26,6 +27,7 @@ url: "zhjt-gktj/tcy/cllxfx", method: "post", data, + params: data }); } @@ -35,6 +37,28 @@ url: "zhjt-gktj/tcy/cclyl", method: "post", data, + params: data + }); +} + + +// 近1年车场收入态势 +export function getCarsIncome(data) { + return request({ + url: "zhjt-gktj/tcy/ccsrts", + method: "post", + data, + params: data + }); +} + +// 近1年僵尸车辆趋势 +export function getZombieCar(data) { + return request({ + url: "zhjt-gktj/tcy/jsclcs", + method: "post", + data, + params: data }); } diff --git a/src/pages/ywts/shms/tcy/components/cars.vue b/src/pages/ywts/shms/tcy/components/cars.vue index ecaaf09..3317453 100644 --- a/src/pages/ywts/shms/tcy/components/cars.vue +++ b/src/pages/ywts/shms/tcy/components/cars.vue @@ -177,22 +177,21 @@ // 获取数据 fetchData(id) { console.log('获取到的id',id); - - // getCarsInOutTrend({id}).then(response => { - // if (response.code === 200) { - // this.extend.series[0].data = response.data.map(item => item.in) - // this.extend.series[1].data = response.data.map(item => item.out) - // this.extend.xAxis.data = response.data.map(item => item.date) - // this.myChart.setOption(this.extend, true) - // } - // }) + getCarsInOutTrend({id}).then(response => { + if (response.code === 200) { + const res = response.data.value.slice(0, 31) + this.extend.series[0].data = res.map(item => item.in) + this.extend.series[1].data = res.map(item => item.out) + this.extend.xAxis.data = res.map(item => item.date) + this.myChart.setOption(this.extend, true) + } + }) // console.log('近1月车辆进出趋势折线图初始化'); - - this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] - this.extend.series[1].data = [12,234,24,2342,234,33,3] - this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] - this.myChart.setOption(this.extend, true) - + // -------------------假数据-------------------------------------------- + // this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] + // this.extend.series[1].data = [12,234,24,2342,234,33,3] + // this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] + // this.myChart.setOption(this.extend, true) } } } diff --git a/src/pages/ywts/shms/tcy/components/carsRate.vue b/src/pages/ywts/shms/tcy/components/carsRate.vue index c985e8d..b540a13 100644 --- a/src/pages/ywts/shms/tcy/components/carsRate.vue +++ b/src/pages/ywts/shms/tcy/components/carsRate.vue @@ -6,6 +6,7 @@ + + diff --git a/src/api/ywts/shms/tcy.js b/src/api/ywts/shms/tcy.js index 7db59fe..8162096 100644 --- a/src/api/ywts/shms/tcy.js +++ b/src/api/ywts/shms/tcy.js @@ -17,6 +17,7 @@ url: "zhjt-gktj/tcy/cljcqs", method: "post", data, + params: data }); } @@ -26,6 +27,7 @@ url: "zhjt-gktj/tcy/cllxfx", method: "post", data, + params: data }); } @@ -35,6 +37,28 @@ url: "zhjt-gktj/tcy/cclyl", method: "post", data, + params: data + }); +} + + +// 近1年车场收入态势 +export function getCarsIncome(data) { + return request({ + url: "zhjt-gktj/tcy/ccsrts", + method: "post", + data, + params: data + }); +} + +// 近1年僵尸车辆趋势 +export function getZombieCar(data) { + return request({ + url: "zhjt-gktj/tcy/jsclcs", + method: "post", + data, + params: data }); } diff --git a/src/pages/ywts/shms/tcy/components/cars.vue b/src/pages/ywts/shms/tcy/components/cars.vue index ecaaf09..3317453 100644 --- a/src/pages/ywts/shms/tcy/components/cars.vue +++ b/src/pages/ywts/shms/tcy/components/cars.vue @@ -177,22 +177,21 @@ // 获取数据 fetchData(id) { console.log('获取到的id',id); - - // getCarsInOutTrend({id}).then(response => { - // if (response.code === 200) { - // this.extend.series[0].data = response.data.map(item => item.in) - // this.extend.series[1].data = response.data.map(item => item.out) - // this.extend.xAxis.data = response.data.map(item => item.date) - // this.myChart.setOption(this.extend, true) - // } - // }) + getCarsInOutTrend({id}).then(response => { + if (response.code === 200) { + const res = response.data.value.slice(0, 31) + this.extend.series[0].data = res.map(item => item.in) + this.extend.series[1].data = res.map(item => item.out) + this.extend.xAxis.data = res.map(item => item.date) + this.myChart.setOption(this.extend, true) + } + }) // console.log('近1月车辆进出趋势折线图初始化'); - - this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] - this.extend.series[1].data = [12,234,24,2342,234,33,3] - this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] - this.myChart.setOption(this.extend, true) - + // -------------------假数据-------------------------------------------- + // this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] + // this.extend.series[1].data = [12,234,24,2342,234,33,3] + // this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] + // this.myChart.setOption(this.extend, true) } } } diff --git a/src/pages/ywts/shms/tcy/components/carsRate.vue b/src/pages/ywts/shms/tcy/components/carsRate.vue index c985e8d..b540a13 100644 --- a/src/pages/ywts/shms/tcy/components/carsRate.vue +++ b/src/pages/ywts/shms/tcy/components/carsRate.vue @@ -6,6 +6,7 @@ + + diff --git a/src/pages/ywts/shms/tcy/components/zombieCar.vue b/src/pages/ywts/shms/tcy/components/zombieCar.vue new file mode 100644 index 0000000..96b756b --- /dev/null +++ b/src/pages/ywts/shms/tcy/components/zombieCar.vue @@ -0,0 +1,286 @@ + + + + + + diff --git a/src/api/ywts/shms/tcy.js b/src/api/ywts/shms/tcy.js index 7db59fe..8162096 100644 --- a/src/api/ywts/shms/tcy.js +++ b/src/api/ywts/shms/tcy.js @@ -17,6 +17,7 @@ url: "zhjt-gktj/tcy/cljcqs", method: "post", data, + params: data }); } @@ -26,6 +27,7 @@ url: "zhjt-gktj/tcy/cllxfx", method: "post", data, + params: data }); } @@ -35,6 +37,28 @@ url: "zhjt-gktj/tcy/cclyl", method: "post", data, + params: data + }); +} + + +// 近1年车场收入态势 +export function getCarsIncome(data) { + return request({ + url: "zhjt-gktj/tcy/ccsrts", + method: "post", + data, + params: data + }); +} + +// 近1年僵尸车辆趋势 +export function getZombieCar(data) { + return request({ + url: "zhjt-gktj/tcy/jsclcs", + method: "post", + data, + params: data }); } diff --git a/src/pages/ywts/shms/tcy/components/cars.vue b/src/pages/ywts/shms/tcy/components/cars.vue index ecaaf09..3317453 100644 --- a/src/pages/ywts/shms/tcy/components/cars.vue +++ b/src/pages/ywts/shms/tcy/components/cars.vue @@ -177,22 +177,21 @@ // 获取数据 fetchData(id) { console.log('获取到的id',id); - - // getCarsInOutTrend({id}).then(response => { - // if (response.code === 200) { - // this.extend.series[0].data = response.data.map(item => item.in) - // this.extend.series[1].data = response.data.map(item => item.out) - // this.extend.xAxis.data = response.data.map(item => item.date) - // this.myChart.setOption(this.extend, true) - // } - // }) + getCarsInOutTrend({id}).then(response => { + if (response.code === 200) { + const res = response.data.value.slice(0, 31) + this.extend.series[0].data = res.map(item => item.in) + this.extend.series[1].data = res.map(item => item.out) + this.extend.xAxis.data = res.map(item => item.date) + this.myChart.setOption(this.extend, true) + } + }) // console.log('近1月车辆进出趋势折线图初始化'); - - this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] - this.extend.series[1].data = [12,234,24,2342,234,33,3] - this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] - this.myChart.setOption(this.extend, true) - + // -------------------假数据-------------------------------------------- + // this.extend.series[0].data = [5154,4545,2455,7212,4545,2455,7212] + // this.extend.series[1].data = [12,234,24,2342,234,33,3] + // this.extend.xAxis.data = ['07-01','07-02','07-03','07-04','07-05','07-06','07-07'] + // this.myChart.setOption(this.extend, true) } } } diff --git a/src/pages/ywts/shms/tcy/components/carsRate.vue b/src/pages/ywts/shms/tcy/components/carsRate.vue index c985e8d..b540a13 100644 --- a/src/pages/ywts/shms/tcy/components/carsRate.vue +++ b/src/pages/ywts/shms/tcy/components/carsRate.vue @@ -6,6 +6,7 @@ + + diff --git a/src/pages/ywts/shms/tcy/components/zombieCar.vue b/src/pages/ywts/shms/tcy/components/zombieCar.vue new file mode 100644 index 0000000..96b756b --- /dev/null +++ b/src/pages/ywts/shms/tcy/components/zombieCar.vue @@ -0,0 +1,286 @@ + + + + + + diff --git a/src/pages/ywts/shms/tcy/popup.vue b/src/pages/ywts/shms/tcy/popup.vue index 83f7378..bd336f2 100644 --- a/src/pages/ywts/shms/tcy/popup.vue +++ b/src/pages/ywts/shms/tcy/popup.vue @@ -69,12 +69,12 @@
-
近1年工地综合得分排行
- +
近1年车场僵尸车辆趋势
+
-
近1年工地综合得分排行
- +
近1年车场收入态势
+
@@ -91,9 +91,11 @@ import Cars from './components/cars.vue' import CarsType from './components/carsType.vue' import CarsRate from './components/carsRate.vue' +import ZombieCar from './components/zombieCar.vue' +import Income from './components/income.vue' export default { name: 'tcyPopup', - components: {CarsRate, Cars, CarsType, ScoreLineBar, EduLineBar, CaseLineBar, CasePie, PersonBar}, + components: {CarsRate, Cars, CarsType, Income, ZombieCar, ScoreLineBar, EduLineBar, CaseLineBar, CasePie, PersonBar}, data() { return { titleImg: require('@/assets/images/popup/title.png'), // 背景图片 @@ -145,6 +147,8 @@ this.$refs.carsRef.fetchData(item.id) this.$refs.carsTypeRef.fetchData(item.id) this.$refs.carsRateRef.fetchData(item.id) + this.$refs.zombieCarRef.fetchData(item.id) + this.$refs.IncomeRef.fetchData(item.id) }, }, }