Commit 43b424b6 authored by eddie.woo's avatar eddie.woo

modify

parent 49c4bdc2
......@@ -12,11 +12,11 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
var xArray = ['1月', '2月', '3月', '4月', '5月', '6月',
'7月', '8月', '9月', '10月', '11月', '12月'];
var colors = ['#ffb600', '#dc6900', '#a32020'];
//增值税负担率
function getBurdenRateData(chart) {
var yArray = ['应纳税额', '主营业务收入', '占比'];
var colors = ['#5793f3', '#d14a61', '#675bba'];
$http.get('/reportAnalysis/burdenRateData/' + $scope.projectId, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
......@@ -64,7 +64,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'right',
axisLine: {
lineStyle: {
color: colors[0]
color: colors[2]
}
},
axisLabel: {
......@@ -81,7 +81,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'left',
axisLine: {
lineStyle: {
color: colors[1]
color: colors[2]
}
},
axisLabel: {
......@@ -95,17 +95,29 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
{
name: yArray[0],
type: 'bar',
itemStyle: {
color: colors[1]
},
data: res.data.vatAmount
},
{
name: yArray[1],
type: 'bar',
itemStyle: {
color: colors[0]
},
data: res.data.income
},
{
name: yArray[2],
type: 'line',
yAxisIndex: 1,
itemStyle: {
color: colors[2]
},
lineStyle: {
color: colors[2]
},
data: res.data.rate
}
]
......@@ -141,6 +153,9 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
yAxis: {},
series: [{
// symbolSize: 20,
itemStyle: {
color: '#dc6900'
},
data: data,
type: 'scatter'
}],
......@@ -167,7 +182,6 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
//进项税额占主营业务成本的比例
function getIncomeRateData(chart) {
var yArray = ['进项税额', '主营业务成本', '占比'];
var colors = ['#5793f3', '#d14a61', '#675bba'];
$http.get('/reportAnalysis/incomeRate/' + $scope.projectId, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
......@@ -215,7 +229,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'right',
axisLine: {
lineStyle: {
color: colors[0]
color: colors[2]
}
},
axisLabel: {
......@@ -232,7 +246,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'left',
axisLine: {
lineStyle: {
color: colors[1]
color: colors[2]
}
},
axisLabel: {
......@@ -246,17 +260,26 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
{
name: yArray[0],
type: 'bar',
itemStyle: {
color: colors[1]
},
data: res.data.vatAmount
},
{
name: yArray[1],
type: 'bar',
itemStyle: {
color: colors[0]
},
data: res.data.income
},
{
name: yArray[2],
type: 'line',
yAxisIndex: 1,
itemStyle: {
color: colors[2]
},
data: res.data.rate
}
]
......@@ -270,7 +293,6 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
//进项税转出额波动率
function getIncomeVolatilityData(chart) {
var yArray = ['本期进项税额转出额', '进项税额', '占比'];
var colors = ['#5793f3', '#d14a61', '#675bba'];
$http.get('/reportAnalysis/incomeVolatility/' + $scope.projectId, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
......@@ -318,7 +340,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'right',
axisLine: {
lineStyle: {
color: colors[0]
color: colors[2]
}
},
axisLabel: {
......@@ -335,7 +357,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'left',
axisLine: {
lineStyle: {
color: colors[1]
color: colors[2]
}
},
axisLabel: {
......@@ -349,17 +371,26 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
{
name: yArray[0],
type: 'bar',
itemStyle: {
color: colors[1]
},
data: res.data.vatAmount
},
{
name: yArray[1],
type: 'bar',
itemStyle: {
color: colors[0]
},
data: res.data.income
},
{
name: yArray[2],
type: 'line',
yAxisIndex: 1,
itemStyle: {
color: colors[2]
},
data: res.data.rate
}
]
......@@ -373,7 +404,6 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
//增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例
function getVatIncomeRateData(chart) {
var yArray = ['增值税应税收入', '增值税免、抵、退出口收入'];
var colors = ['#5793f3', '#d14a61', '#675bba'];
$http.get('/reportAnalysis/vatIncomeRate/' + $scope.projectId + "/" + $scope.projectPeriod, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
......@@ -432,7 +462,6 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
//增值税应税收入、增值税免、抵、退办法出口收入 占会计收入比例 趋势
function getVatIncomeLineData(chart) {
var yArray = ['增值税应税收入', '增值税免、抵、退出口收入'];
var colors = ['#5793f3', '#d14a61', '#675bba'];
$http.get('/reportAnalysis/vatIncomeLine/' + $scope.projectId, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
......@@ -480,7 +509,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'right',
axisLine: {
lineStyle: {
color: colors[0]
color: colors[2]
}
},
axisLabel: {
......@@ -494,11 +523,17 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
{
name: yArray[0],
type: 'line',
itemStyle: {
color: colors[0]
},
data: res.data.vatAmount
},
{
name: yArray[1],
type: 'line',
itemStyle: {
color: colors[1]
},
data: res.data.income
}
]
......@@ -512,7 +547,6 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
//已抵扣进项税波动率
function getDeductionData(chart) {
var yArray = ['占比', '基准值'];
var colors = ['#5793f3', '#d14a61', '#675bba'];
$http.get('/reportAnalysis/deduction/' + $scope.projectId, apiConfig.createVat())
.success(function (res) {
if (res && 0 === res.code) {
......@@ -559,7 +593,7 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
position: 'left',
axisLine: {
lineStyle: {
color: colors[1]
color: colors[2]
}
},
axisLabel: {
......@@ -573,11 +607,17 @@ vatModule.controller('VatModelAnalysisController', ['$scope', '$translate', '$ui
{
name: yArray[1],
type: 'line',
itemStyle: {
color: '#968c6d'
},
data: ['1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1']
},
{
name: yArray[0],
type: 'bar',
itemStyle: {
color: colors[1]
},
data: res.data.rate
}
]
......
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