diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue index f56942f..ed4c2f3 100644 --- a/src/components/economic/subject/gdzctz.vue +++ b/src/components/economic/subject/gdzctz.vue @@ -139,7 +139,7 @@ } }, chartsTitle:{ left:'',right:''}, - countData:{total:0,years:'',latestDate:''}, + countData:{total:808374,years:'',latestDate:''}, } }, mounted (){ @@ -194,6 +194,7 @@ vm.$http.get('/dx-economy-api/subject/largeProject/total',{params:{year:vm.year}}).then(function (resp) { let t = resp.data.data vm.countData = t; + vm.countData = {total:808374,years:'808374',latestDate:'2020-12'}; }) }, getOneData(){ @@ -207,11 +208,16 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data - vm.chartsTitle.left='投资额(万元)'; - vm.drawLine('chartOne',t.xAxis,t.value,null); - }) + // 2020年假数据 + const xAxis = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']; + const mockData = [0,0,53431,63373,98622,153120,231646,98636,69233,15027,25256,0] + vm.chartsTitle.left='投资额(万元)'; + vm.drawLine('chartOne',xAxis,mockData,null); + // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data + // vm.chartsTitle.left='投资额(万元)'; + // vm.drawLine('chartOne',t.xAxis,t.value,null); + // }) }, getTwoData(){ let vm = this; @@ -224,15 +230,23 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data; - let legend=[]; - t.forEach(function (item) { - legend.push(item.name); - item.value = item.value == 0 ? null: item.value; - }) - vm.drawPie("chartTwo",t,legend) + // 假数据 + let t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] + let legend = [] + t.forEach(function (item) { + legend.push(item.name); + item.value = item.value == 0 ? 0: item.value; }) + vm.drawPie("chartTwo",t,legend) + // vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data; + // let legend=[]; + // t.forEach(function (item) { + // legend.push(item.name); + // item.value = item.value == 0 ? null: item.value; + // }) + // vm.drawPie("chartTwo",t,legend) + // }) }, drawLine(container,cate,d1,d2,d3){ let vm = this diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue index f56942f..ed4c2f3 100644 --- a/src/components/economic/subject/gdzctz.vue +++ b/src/components/economic/subject/gdzctz.vue @@ -139,7 +139,7 @@ } }, chartsTitle:{ left:'',right:''}, - countData:{total:0,years:'',latestDate:''}, + countData:{total:808374,years:'',latestDate:''}, } }, mounted (){ @@ -194,6 +194,7 @@ vm.$http.get('/dx-economy-api/subject/largeProject/total',{params:{year:vm.year}}).then(function (resp) { let t = resp.data.data vm.countData = t; + vm.countData = {total:808374,years:'808374',latestDate:'2020-12'}; }) }, getOneData(){ @@ -207,11 +208,16 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data - vm.chartsTitle.left='投资额(万元)'; - vm.drawLine('chartOne',t.xAxis,t.value,null); - }) + // 2020年假数据 + const xAxis = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']; + const mockData = [0,0,53431,63373,98622,153120,231646,98636,69233,15027,25256,0] + vm.chartsTitle.left='投资额(万元)'; + vm.drawLine('chartOne',xAxis,mockData,null); + // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data + // vm.chartsTitle.left='投资额(万元)'; + // vm.drawLine('chartOne',t.xAxis,t.value,null); + // }) }, getTwoData(){ let vm = this; @@ -224,15 +230,23 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data; - let legend=[]; - t.forEach(function (item) { - legend.push(item.name); - item.value = item.value == 0 ? null: item.value; - }) - vm.drawPie("chartTwo",t,legend) + // 假数据 + let t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] + let legend = [] + t.forEach(function (item) { + legend.push(item.name); + item.value = item.value == 0 ? 0: item.value; }) + vm.drawPie("chartTwo",t,legend) + // vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data; + // let legend=[]; + // t.forEach(function (item) { + // legend.push(item.name); + // item.value = item.value == 0 ? null: item.value; + // }) + // vm.drawPie("chartTwo",t,legend) + // }) }, drawLine(container,cate,d1,d2,d3){ let vm = this diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue index cca1d53..54631ff 100644 --- a/src/components/economic/subject/qyfz.vue +++ b/src/components/economic/subject/qyfz.vue @@ -115,7 +115,7 @@ const currentDate = new Date('2020/12/31') // 当前日期 const month = currentDate.getMonth()+1; // 月份 const year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month; - const startDate = currentDate.format("yyyy-")+"01" + const startDate = currentDate.format("yyyy-")+"01-01" const endDate = currentDate.format("yyyy-MM-dd") export default { name: 'jjyx', diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue index f56942f..ed4c2f3 100644 --- a/src/components/economic/subject/gdzctz.vue +++ b/src/components/economic/subject/gdzctz.vue @@ -139,7 +139,7 @@ } }, chartsTitle:{ left:'',right:''}, - countData:{total:0,years:'',latestDate:''}, + countData:{total:808374,years:'',latestDate:''}, } }, mounted (){ @@ -194,6 +194,7 @@ vm.$http.get('/dx-economy-api/subject/largeProject/total',{params:{year:vm.year}}).then(function (resp) { let t = resp.data.data vm.countData = t; + vm.countData = {total:808374,years:'808374',latestDate:'2020-12'}; }) }, getOneData(){ @@ -207,11 +208,16 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data - vm.chartsTitle.left='投资额(万元)'; - vm.drawLine('chartOne',t.xAxis,t.value,null); - }) + // 2020年假数据 + const xAxis = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']; + const mockData = [0,0,53431,63373,98622,153120,231646,98636,69233,15027,25256,0] + vm.chartsTitle.left='投资额(万元)'; + vm.drawLine('chartOne',xAxis,mockData,null); + // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data + // vm.chartsTitle.left='投资额(万元)'; + // vm.drawLine('chartOne',t.xAxis,t.value,null); + // }) }, getTwoData(){ let vm = this; @@ -224,15 +230,23 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data; - let legend=[]; - t.forEach(function (item) { - legend.push(item.name); - item.value = item.value == 0 ? null: item.value; - }) - vm.drawPie("chartTwo",t,legend) + // 假数据 + let t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] + let legend = [] + t.forEach(function (item) { + legend.push(item.name); + item.value = item.value == 0 ? 0: item.value; }) + vm.drawPie("chartTwo",t,legend) + // vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data; + // let legend=[]; + // t.forEach(function (item) { + // legend.push(item.name); + // item.value = item.value == 0 ? null: item.value; + // }) + // vm.drawPie("chartTwo",t,legend) + // }) }, drawLine(container,cate,d1,d2,d3){ let vm = this diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue index cca1d53..54631ff 100644 --- a/src/components/economic/subject/qyfz.vue +++ b/src/components/economic/subject/qyfz.vue @@ -115,7 +115,7 @@ const currentDate = new Date('2020/12/31') // 当前日期 const month = currentDate.getMonth()+1; // 月份 const year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month; - const startDate = currentDate.format("yyyy-")+"01" + const startDate = currentDate.format("yyyy-")+"01-01" const endDate = currentDate.format("yyyy-MM-dd") export default { name: 'jjyx', diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue index 2db66a4..16a481d 100644 --- a/src/components/economic/yztInfo/gdzctz.vue +++ b/src/components/economic/yztInfo/gdzctz.vue @@ -382,17 +382,24 @@ }, getTwoData(){ let vm = this; - vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:vm.filter}).then(function (resp) { - let t = resp.data.data; - // 假数据 - t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] - let legend=[]; - t.forEach(function (item) { - legend.push(item.name); - item.value = item.value == 0 ? 0: item.value; - }) - vm.drawPie("chartsTwo",t,legend) + // 假数据 + let t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] + let legend = [] + t.forEach(function (item) { + legend.push(item.name); + item.value = item.value == 0 ? 0: item.value; }) + vm.drawPie("chartsTwo",t,legend) + // 调用接口 + // vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:vm.filter}).then(function (resp) { + // let t = resp.data.data; + // let legend=[]; + // t.forEach(function (item) { + // legend.push(item.name); + // item.value = item.value == 0 ? 0: item.value; + // }) + // vm.drawPie("chartsTwo",t,legend) + // }) }, drawLine(container,cate,d1,d2,d3){ let vm = this diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue index f56942f..ed4c2f3 100644 --- a/src/components/economic/subject/gdzctz.vue +++ b/src/components/economic/subject/gdzctz.vue @@ -139,7 +139,7 @@ } }, chartsTitle:{ left:'',right:''}, - countData:{total:0,years:'',latestDate:''}, + countData:{total:808374,years:'',latestDate:''}, } }, mounted (){ @@ -194,6 +194,7 @@ vm.$http.get('/dx-economy-api/subject/largeProject/total',{params:{year:vm.year}}).then(function (resp) { let t = resp.data.data vm.countData = t; + vm.countData = {total:808374,years:'808374',latestDate:'2020-12'}; }) }, getOneData(){ @@ -207,11 +208,16 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data - vm.chartsTitle.left='投资额(万元)'; - vm.drawLine('chartOne',t.xAxis,t.value,null); - }) + // 2020年假数据 + const xAxis = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']; + const mockData = [0,0,53431,63373,98622,153120,231646,98636,69233,15027,25256,0] + vm.chartsTitle.left='投资额(万元)'; + vm.drawLine('chartOne',xAxis,mockData,null); + // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data + // vm.chartsTitle.left='投资额(万元)'; + // vm.drawLine('chartOne',t.xAxis,t.value,null); + // }) }, getTwoData(){ let vm = this; @@ -224,15 +230,23 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { - let t = resp.data.data; - let legend=[]; - t.forEach(function (item) { - legend.push(item.name); - item.value = item.value == 0 ? null: item.value; - }) - vm.drawPie("chartTwo",t,legend) + // 假数据 + let t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] + let legend = [] + t.forEach(function (item) { + legend.push(item.name); + item.value = item.value == 0 ? 0: item.value; }) + vm.drawPie("chartTwo",t,legend) + // vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:$.extend({startDate:_start,endDate:_end},vm.filter)}).then(function (resp) { + // let t = resp.data.data; + // let legend=[]; + // t.forEach(function (item) { + // legend.push(item.name); + // item.value = item.value == 0 ? null: item.value; + // }) + // vm.drawPie("chartTwo",t,legend) + // }) }, drawLine(container,cate,d1,d2,d3){ let vm = this diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue index cca1d53..54631ff 100644 --- a/src/components/economic/subject/qyfz.vue +++ b/src/components/economic/subject/qyfz.vue @@ -115,7 +115,7 @@ const currentDate = new Date('2020/12/31') // 当前日期 const month = currentDate.getMonth()+1; // 月份 const year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month; - const startDate = currentDate.format("yyyy-")+"01" + const startDate = currentDate.format("yyyy-")+"01-01" const endDate = currentDate.format("yyyy-MM-dd") export default { name: 'jjyx', diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue index 2db66a4..16a481d 100644 --- a/src/components/economic/yztInfo/gdzctz.vue +++ b/src/components/economic/yztInfo/gdzctz.vue @@ -382,17 +382,24 @@ }, getTwoData(){ let vm = this; - vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:vm.filter}).then(function (resp) { - let t = resp.data.data; - // 假数据 - t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] - let legend=[]; - t.forEach(function (item) { - legend.push(item.name); - item.value = item.value == 0 ? 0: item.value; - }) - vm.drawPie("chartsTwo",t,legend) + // 假数据 + let t = [{"name":"1亿以下","value":20},{"name":"1~2亿","value":4},{"name":"2~3亿","value":3},{"name":"3~4亿","value":6},{"name":"4~5亿","value":2},{"name":"5亿以上","value":5}] + let legend = [] + t.forEach(function (item) { + legend.push(item.name); + item.value = item.value == 0 ? 0: item.value; }) + vm.drawPie("chartsTwo",t,legend) + // 调用接口 + // vm.$http.get('/dx-economy-api/subject/largeProject/scale',{params:vm.filter}).then(function (resp) { + // let t = resp.data.data; + // let legend=[]; + // t.forEach(function (item) { + // legend.push(item.name); + // item.value = item.value == 0 ? 0: item.value; + // }) + // vm.drawPie("chartsTwo",t,legend) + // }) }, drawLine(container,cate,d1,d2,d3){ let vm = this diff --git a/src/components/economic/yztInfo/zhyx.vue b/src/components/economic/yztInfo/zhyx.vue index 9b3bdb6..2206adf 100644 --- a/src/components/economic/yztInfo/zhyx.vue +++ b/src/components/economic/yztInfo/zhyx.vue @@ -467,11 +467,18 @@ _end = vm.timeFilter[1]; } } - vm.$http.get('/dx-economy-api/zhyxCharts/qyfz',{params:vm.filter}).then(function (resp) { - let t = resp.data.data - vm.chartsTitle.left = '家';vm.chartsTitle.right = ''; - vm.drawLine('chartsTwo',t.xAxis,t.value,null,null); - }).catch((err)=>{console.log(err)}); + // 假数据 + let t = { + xAxis:["工业企业", "规上企业", "上市公司","投产运营企业","高新技术企业"], + value:[360, 126, 2,360,69] + } + vm.drawLine('chartsTwo',t.xAxis,t.value,null,null); + // 调用接口,隐藏2021 + // vm.$http.get('/dx-economy-api/zhyxCharts/qyfz',{params:vm.filter}).then(function (resp) { + // let t = resp.data.data + // vm.chartsTitle.left = '家';vm.chartsTitle.right = ''; + // vm.drawLine('chartsTwo',t.xAxis,t.value,null,null); + // }).catch((err)=>{console.log(err)}); }, getThreeData(){ let vm = this;