diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz-one.vue b/src/components/economic/yztInfo/qyfz-one.vue
index fd6e27c..ded8ac0 100644
--- a/src/components/economic/yztInfo/qyfz-one.vue
+++ b/src/components/economic/yztInfo/qyfz-one.vue
@@ -28,7 +28,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> 生物制药</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">2005年06月27日</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">2005年06月27日</div></div>
-            <div class="more-mapdetail">更多>></div>
+            <!--<div class="more-mapdetail">更多>></div>-->
           </div>
         </div>
       </div>
@@ -445,7 +445,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz-one.vue b/src/components/economic/yztInfo/qyfz-one.vue
index fd6e27c..ded8ac0 100644
--- a/src/components/economic/yztInfo/qyfz-one.vue
+++ b/src/components/economic/yztInfo/qyfz-one.vue
@@ -28,7 +28,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> 生物制药</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">2005年06月27日</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">2005年06月27日</div></div>
-            <div class="more-mapdetail">更多>></div>
+            <!--<div class="more-mapdetail">更多>></div>-->
           </div>
         </div>
       </div>
@@ -445,7 +445,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz.vue b/src/components/economic/yztInfo/qyfz.vue
index 47886bb..71e9461 100644
--- a/src/components/economic/yztInfo/qyfz.vue
+++ b/src/components/economic/yztInfo/qyfz.vue
@@ -1,3 +1,4 @@
+<!--企业发展一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -178,9 +179,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?0:new Date().getMonth();
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let years =new Date().getFullYear()-1 ;
+  // let month = new Date().getMonth()==0?0:new Date().getMonth();
+  // let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date() // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  let years =currentDate.getFullYear()-1 ;
   export default {
     name: 'qyfz',
     data () {
@@ -188,7 +191,7 @@
         showCondition:false,
         filter:{
           startDate:years+"-01",
-          endDate:new Date().format("yyyy-MM")
+          endDate:currentDate.format("yyyy-MM")
         },
         qyType:'',
         MapData:null,
@@ -422,11 +425,17 @@
       },
       getOneData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right='';
-          vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
-        })
+        // 假数据
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right='';
+        //   vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // })
       },
       getTwoData(){
         let vm = this;
@@ -485,7 +494,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -528,6 +548,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -539,22 +560,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -597,7 +618,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['50%', '88%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['65%', '50%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz-one.vue b/src/components/economic/yztInfo/qyfz-one.vue
index fd6e27c..ded8ac0 100644
--- a/src/components/economic/yztInfo/qyfz-one.vue
+++ b/src/components/economic/yztInfo/qyfz-one.vue
@@ -28,7 +28,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> 生物制药</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">2005年06月27日</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">2005年06月27日</div></div>
-            <div class="more-mapdetail">更多>></div>
+            <!--<div class="more-mapdetail">更多>></div>-->
           </div>
         </div>
       </div>
@@ -445,7 +445,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz.vue b/src/components/economic/yztInfo/qyfz.vue
index 47886bb..71e9461 100644
--- a/src/components/economic/yztInfo/qyfz.vue
+++ b/src/components/economic/yztInfo/qyfz.vue
@@ -1,3 +1,4 @@
+<!--企业发展一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -178,9 +179,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?0:new Date().getMonth();
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let years =new Date().getFullYear()-1 ;
+  // let month = new Date().getMonth()==0?0:new Date().getMonth();
+  // let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date() // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  let years =currentDate.getFullYear()-1 ;
   export default {
     name: 'qyfz',
     data () {
@@ -188,7 +191,7 @@
         showCondition:false,
         filter:{
           startDate:years+"-01",
-          endDate:new Date().format("yyyy-MM")
+          endDate:currentDate.format("yyyy-MM")
         },
         qyType:'',
         MapData:null,
@@ -422,11 +425,17 @@
       },
       getOneData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right='';
-          vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
-        })
+        // 假数据
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right='';
+        //   vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // })
       },
       getTwoData(){
         let vm = this;
@@ -485,7 +494,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -528,6 +548,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -539,22 +560,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -597,7 +618,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['50%', '88%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['65%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zdcy.vue b/src/components/economic/yztInfo/zdcy.vue
index 51caef1..d166ffb 100644
--- a/src/components/economic/yztInfo/zdcy.vue
+++ b/src/components/economic/yztInfo/zdcy.vue
@@ -1,3 +1,4 @@
+<!--主导产业一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;"  >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -171,18 +172,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         /**/
@@ -441,6 +445,9 @@
         }
         vm.$http.get('/dx-economy-api/zdcyCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine('chartsOne',t.xAxis,t.value,t.value2);
         })
       },
@@ -448,6 +455,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/zdcyCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartsTwo',t.xAxis,t.value,t.value2);
         })
       },
@@ -514,7 +525,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz-one.vue b/src/components/economic/yztInfo/qyfz-one.vue
index fd6e27c..ded8ac0 100644
--- a/src/components/economic/yztInfo/qyfz-one.vue
+++ b/src/components/economic/yztInfo/qyfz-one.vue
@@ -28,7 +28,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> 生物制药</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">2005年06月27日</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">2005年06月27日</div></div>
-            <div class="more-mapdetail">更多>></div>
+            <!--<div class="more-mapdetail">更多>></div>-->
           </div>
         </div>
       </div>
@@ -445,7 +445,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz.vue b/src/components/economic/yztInfo/qyfz.vue
index 47886bb..71e9461 100644
--- a/src/components/economic/yztInfo/qyfz.vue
+++ b/src/components/economic/yztInfo/qyfz.vue
@@ -1,3 +1,4 @@
+<!--企业发展一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -178,9 +179,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?0:new Date().getMonth();
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let years =new Date().getFullYear()-1 ;
+  // let month = new Date().getMonth()==0?0:new Date().getMonth();
+  // let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date() // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  let years =currentDate.getFullYear()-1 ;
   export default {
     name: 'qyfz',
     data () {
@@ -188,7 +191,7 @@
         showCondition:false,
         filter:{
           startDate:years+"-01",
-          endDate:new Date().format("yyyy-MM")
+          endDate:currentDate.format("yyyy-MM")
         },
         qyType:'',
         MapData:null,
@@ -422,11 +425,17 @@
       },
       getOneData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right='';
-          vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
-        })
+        // 假数据
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right='';
+        //   vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // })
       },
       getTwoData(){
         let vm = this;
@@ -485,7 +494,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -528,6 +548,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -539,22 +560,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -597,7 +618,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['50%', '88%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['65%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zdcy.vue b/src/components/economic/yztInfo/zdcy.vue
index 51caef1..d166ffb 100644
--- a/src/components/economic/yztInfo/zdcy.vue
+++ b/src/components/economic/yztInfo/zdcy.vue
@@ -1,3 +1,4 @@
+<!--主导产业一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;"  >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -171,18 +172,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         /**/
@@ -441,6 +445,9 @@
         }
         vm.$http.get('/dx-economy-api/zdcyCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine('chartsOne',t.xAxis,t.value,t.value2);
         })
       },
@@ -448,6 +455,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/zdcyCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartsTwo',t.xAxis,t.value,t.value2);
         })
       },
@@ -514,7 +525,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
diff --git a/src/components/economic/yztInfo/zhnh.vue b/src/components/economic/yztInfo/zhnh.vue
index c350ac5..f84c0cd 100644
--- a/src/components/economic/yztInfo/zhnh.vue
+++ b/src/components/economic/yztInfo/zhnh.vue
@@ -1,3 +1,4 @@
+<!--综合能耗一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -206,18 +207,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"yn",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'用能',unitName:'能耗(吨标准煤)',
         titleOne:'综合能源消费量行业分布',titleTwo:'产值单耗行业分布',
@@ -505,6 +509,14 @@
             _end = vm.timeFilter[1];
           }
         }
+        // 假数据
+        const mockData = {
+          "xAxis":["新能源新材料","生物医药","电子信息","其他"],
+          "value":[0,0,0,0],
+          "value2":[0,0,0,0]
+        }
+        vm.drawLine('chartsOne',mockData.xAxis,mockData.value,mockData.value2,[0, 0, -5,30]);
+        // 真实后台请求，隐藏
         vm.$http.get('/dx-economy-api/zhnhCharts/czdh',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='消费量(吨标准煤)';vm.chartsTitle.right='同比';
@@ -703,7 +715,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -813,7 +836,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz-one.vue b/src/components/economic/yztInfo/qyfz-one.vue
index fd6e27c..ded8ac0 100644
--- a/src/components/economic/yztInfo/qyfz-one.vue
+++ b/src/components/economic/yztInfo/qyfz-one.vue
@@ -28,7 +28,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> 生物制药</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">2005年06月27日</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">2005年06月27日</div></div>
-            <div class="more-mapdetail">更多>></div>
+            <!--<div class="more-mapdetail">更多>></div>-->
           </div>
         </div>
       </div>
@@ -445,7 +445,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz.vue b/src/components/economic/yztInfo/qyfz.vue
index 47886bb..71e9461 100644
--- a/src/components/economic/yztInfo/qyfz.vue
+++ b/src/components/economic/yztInfo/qyfz.vue
@@ -1,3 +1,4 @@
+<!--企业发展一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -178,9 +179,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?0:new Date().getMonth();
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let years =new Date().getFullYear()-1 ;
+  // let month = new Date().getMonth()==0?0:new Date().getMonth();
+  // let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date() // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  let years =currentDate.getFullYear()-1 ;
   export default {
     name: 'qyfz',
     data () {
@@ -188,7 +191,7 @@
         showCondition:false,
         filter:{
           startDate:years+"-01",
-          endDate:new Date().format("yyyy-MM")
+          endDate:currentDate.format("yyyy-MM")
         },
         qyType:'',
         MapData:null,
@@ -422,11 +425,17 @@
       },
       getOneData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right='';
-          vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
-        })
+        // 假数据
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right='';
+        //   vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // })
       },
       getTwoData(){
         let vm = this;
@@ -485,7 +494,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -528,6 +548,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -539,22 +560,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -597,7 +618,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['50%', '88%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['65%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zdcy.vue b/src/components/economic/yztInfo/zdcy.vue
index 51caef1..d166ffb 100644
--- a/src/components/economic/yztInfo/zdcy.vue
+++ b/src/components/economic/yztInfo/zdcy.vue
@@ -1,3 +1,4 @@
+<!--主导产业一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;"  >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -171,18 +172,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         /**/
@@ -441,6 +445,9 @@
         }
         vm.$http.get('/dx-economy-api/zdcyCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine('chartsOne',t.xAxis,t.value,t.value2);
         })
       },
@@ -448,6 +455,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/zdcyCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartsTwo',t.xAxis,t.value,t.value2);
         })
       },
@@ -514,7 +525,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
diff --git a/src/components/economic/yztInfo/zhnh.vue b/src/components/economic/yztInfo/zhnh.vue
index c350ac5..f84c0cd 100644
--- a/src/components/economic/yztInfo/zhnh.vue
+++ b/src/components/economic/yztInfo/zhnh.vue
@@ -1,3 +1,4 @@
+<!--综合能耗一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -206,18 +207,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"yn",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'用能',unitName:'能耗(吨标准煤)',
         titleOne:'综合能源消费量行业分布',titleTwo:'产值单耗行业分布',
@@ -505,6 +509,14 @@
             _end = vm.timeFilter[1];
           }
         }
+        // 假数据
+        const mockData = {
+          "xAxis":["新能源新材料","生物医药","电子信息","其他"],
+          "value":[0,0,0,0],
+          "value2":[0,0,0,0]
+        }
+        vm.drawLine('chartsOne',mockData.xAxis,mockData.value,mockData.value2,[0, 0, -5,30]);
+        // 真实后台请求，隐藏
         vm.$http.get('/dx-economy-api/zhnhCharts/czdh',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='消费量(吨标准煤)';vm.chartsTitle.right='同比';
@@ -703,7 +715,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -813,7 +836,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zhyx-newcopy.vue b/src/components/economic/yztInfo/zhyx-newcopy.vue
index c928157..09bb060 100644
--- a/src/components/economic/yztInfo/zhyx-newcopy.vue
+++ b/src/components/economic/yztInfo/zhyx-newcopy.vue
@@ -48,7 +48,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> {{companyDetail.industryName}}</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">{{companyDetail.qyclrq}}</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">{{companyDetail.qyzczb}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz-one.vue b/src/components/economic/yztInfo/qyfz-one.vue
index fd6e27c..ded8ac0 100644
--- a/src/components/economic/yztInfo/qyfz-one.vue
+++ b/src/components/economic/yztInfo/qyfz-one.vue
@@ -28,7 +28,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> 生物制药</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">2005年06月27日</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">2005年06月27日</div></div>
-            <div class="more-mapdetail">更多>></div>
+            <!--<div class="more-mapdetail">更多>></div>-->
           </div>
         </div>
       </div>
@@ -445,7 +445,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz.vue b/src/components/economic/yztInfo/qyfz.vue
index 47886bb..71e9461 100644
--- a/src/components/economic/yztInfo/qyfz.vue
+++ b/src/components/economic/yztInfo/qyfz.vue
@@ -1,3 +1,4 @@
+<!--企业发展一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -178,9 +179,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?0:new Date().getMonth();
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let years =new Date().getFullYear()-1 ;
+  // let month = new Date().getMonth()==0?0:new Date().getMonth();
+  // let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date() // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  let years =currentDate.getFullYear()-1 ;
   export default {
     name: 'qyfz',
     data () {
@@ -188,7 +191,7 @@
         showCondition:false,
         filter:{
           startDate:years+"-01",
-          endDate:new Date().format("yyyy-MM")
+          endDate:currentDate.format("yyyy-MM")
         },
         qyType:'',
         MapData:null,
@@ -422,11 +425,17 @@
       },
       getOneData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right='';
-          vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
-        })
+        // 假数据
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right='';
+        //   vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // })
       },
       getTwoData(){
         let vm = this;
@@ -485,7 +494,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -528,6 +548,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -539,22 +560,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -597,7 +618,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['50%', '88%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['65%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zdcy.vue b/src/components/economic/yztInfo/zdcy.vue
index 51caef1..d166ffb 100644
--- a/src/components/economic/yztInfo/zdcy.vue
+++ b/src/components/economic/yztInfo/zdcy.vue
@@ -1,3 +1,4 @@
+<!--主导产业一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;"  >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -171,18 +172,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         /**/
@@ -441,6 +445,9 @@
         }
         vm.$http.get('/dx-economy-api/zdcyCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine('chartsOne',t.xAxis,t.value,t.value2);
         })
       },
@@ -448,6 +455,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/zdcyCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartsTwo',t.xAxis,t.value,t.value2);
         })
       },
@@ -514,7 +525,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
diff --git a/src/components/economic/yztInfo/zhnh.vue b/src/components/economic/yztInfo/zhnh.vue
index c350ac5..f84c0cd 100644
--- a/src/components/economic/yztInfo/zhnh.vue
+++ b/src/components/economic/yztInfo/zhnh.vue
@@ -1,3 +1,4 @@
+<!--综合能耗一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -206,18 +207,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"yn",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'用能',unitName:'能耗(吨标准煤)',
         titleOne:'综合能源消费量行业分布',titleTwo:'产值单耗行业分布',
@@ -505,6 +509,14 @@
             _end = vm.timeFilter[1];
           }
         }
+        // 假数据
+        const mockData = {
+          "xAxis":["新能源新材料","生物医药","电子信息","其他"],
+          "value":[0,0,0,0],
+          "value2":[0,0,0,0]
+        }
+        vm.drawLine('chartsOne',mockData.xAxis,mockData.value,mockData.value2,[0, 0, -5,30]);
+        // 真实后台请求，隐藏
         vm.$http.get('/dx-economy-api/zhnhCharts/czdh',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='消费量(吨标准煤)';vm.chartsTitle.right='同比';
@@ -703,7 +715,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -813,7 +836,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zhyx-newcopy.vue b/src/components/economic/yztInfo/zhyx-newcopy.vue
index c928157..09bb060 100644
--- a/src/components/economic/yztInfo/zhyx-newcopy.vue
+++ b/src/components/economic/yztInfo/zhyx-newcopy.vue
@@ -48,7 +48,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> {{companyDetail.industryName}}</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">{{companyDetail.qyclrq}}</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">{{companyDetail.qyzczb}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
diff --git a/src/components/economic/yztInfo/zhyx.vue b/src/components/economic/yztInfo/zhyx.vue
index f94df8a..dd16ae6 100644
--- a/src/components/economic/yztInfo/zhyx.vue
+++ b/src/components/economic/yztInfo/zhyx.vue
@@ -1,3 +1,4 @@
+<!--综合运行一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -171,8 +172,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   import esriLoader from 'esri-loader'
   import { loadModules } from 'esri-loader';
   export default {
@@ -180,11 +184,11 @@
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
-        year:year,
+        timeFilter:[startDate,endDate],
+        year:currentYear,
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         dateType:'month',
         mapList:[
@@ -449,6 +453,21 @@
         }
         vm.$http.get('/dx-economy-api/zhyxCharts/czhy',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          console.log('czhy')
+          console.log(t)
+          console.log('=========')
+          // 排序
+          let temp = []
+          const tlength = t.xAxis.length
+          for(let i=0;i<tlength;i++){
+            if(t.value[i]>0){
+              temp.push({'x':t.xAxis[i],'value':t.value[i]})
+            }
+          }
+          // 对temp进行排序
+          // temp = temp.sort((a,b)=>a.value-b.value)
+          t.xAxis = temp.map(item=>item.x).reverse()
+          t.value = temp.map(item=>item.value).reverse()
           vm.drawBar('chartsOne',t.xAxis,t.value);
         }).catch((err)=>{console.log(err)});
       },
@@ -463,11 +482,19 @@
             _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:[2, 126, 2,69]
+        }
+        vm.chartsTitle.left = '企业数(家)';vm.chartsTitle.right = '';
+        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;
@@ -575,7 +602,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -617,6 +655,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -628,22 +667,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -673,7 +712,8 @@
   }
 </script>
 <style>
-  @import url('http://223.84.218.79:18086/arcgis/arcgis_js_api/library/3.11/3.11/esri/css/esri.css');
+  /*@import url('http://223.84.218.79:18086/arcgis/arcgis_js_api/library/3.11/3.11/esri/css/esri.css');*/
+  @import url('https://js.arcgis.com/3.29/esri/css/esri.css');
   .search-row-condition .el-date-editor .el-range-input{width:35%!important;}
   .map-search-box .el-input__inner input{ }
   .map-search-box .search-btn{ }

diff --git a/README.md b/README.md
index f814f73..233cc2a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # smart-economys
 
+> 东乡产业经济
 > dongxinag project
 
 ## Build Setup
diff --git a/src/components/common/Global.vue b/src/components/common/Global.vue
index 7e70e32..345278f 100644
--- a/src/components/common/Global.vue
+++ b/src/components/common/Global.vue
@@ -1,6 +1,9 @@
 <script>
   import axios from 'axios'
+  // 此处baseUrl取决于前端访问路径
   const BASE_HTTP_URL = 'http://' + window.location.host;
+  // const BASE_HTTP_URL = 'http://111.198.10.15:11645';
+  // const BASE_HTTP_URL = 'http://223.84.218.79:18086';
   let DICT_ALL = [],loading = false,app = {
     DICT_ALL : [],
     INDUSTRY_ALL : [],
diff --git a/src/components/dataService/dataService.vue b/src/components/dataService/dataService.vue
index 6236f1e..3e29799 100644
--- a/src/components/dataService/dataService.vue
+++ b/src/components/dataService/dataService.vue
@@ -138,9 +138,10 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let threeMouth =  new Date().setMonth(new Date().getMonth() - 3);
+  const currentDate = new Date('2020/12/31')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  let threeMouth =  new Date('2020/12/31').setMonth(currentDate.getMonth() - 3);
   export default {
     name: 'dataService',
     data () {
@@ -152,7 +153,7 @@
           /*startDate: new Date(threeMouth).format("yyyy-MM"),
           endDate:new Date().format("yyyy-MM"),*/
           startDate:new Date(threeMouth).format("yyyy-MM"),
-          endDate:new Date().format("yyyy-MM"),
+          endDate:currentDate.format("yyyy-MM"),
           plates:'',
           industries:'',
           scales:'',
diff --git a/src/components/economic/subject/cyydjj.vue b/src/components/economic/subject/cyydjj.vue
index 65e5c32..be2d8e6 100644
--- a/src/components/economic/subject/cyydjj.vue
+++ b/src/components/economic/subject/cyydjj.vue
@@ -58,8 +58,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()-1+"-0"+month :new Date().getFullYear()-1+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'cyydjj',
     data () {
@@ -67,10 +70,10 @@
         locations:[],
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
-        lastYear:new Date().format("yyyy-MM"),
+        lastYear:endDate,
         tabList: [
           {name:'产业基金规模统计',type:'economic/cyydjj/gmtj',className:'router-link-active'},
           {name:'产业基金使用分析',type:'economic/cyydjj/syfx',className:''},
diff --git a/src/components/economic/subject/cyydjjInfo/syfx.vue b/src/components/economic/subject/cyydjjInfo/syfx.vue
index d84c03f..deb9e5b 100644
--- a/src/components/economic/subject/cyydjjInfo/syfx.vue
+++ b/src/components/economic/subject/cyydjjInfo/syfx.vue
@@ -226,7 +226,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '35%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/gdzctz.vue b/src/components/economic/subject/gdzctz.vue
index 98cb59d..82e1282 100644
--- a/src/components/economic/subject/gdzctz.vue
+++ b/src/components/economic/subject/gdzctz.vue
@@ -1,3 +1,4 @@
+<!--固定资产投资情况专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;" >
@@ -87,23 +88,26 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'ztfxGdzctz',
     data () {
       return {
-        year:new Date().format("yyyy"),
+        year:currentDate.format("yyyy"),
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         locations: [],
-        lastTime:new Date(year).format("yyyy-MM"),
+        lastTime:endDate,
         filter:{
           location:"",
           hydm:"",
           type:'zcz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         chartTable:[
           {cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45},
@@ -135,7 +139,7 @@
           }
         },
         chartsTitle:{ left:'',right:''},
-        countData:{total:0,years:'',latestDate:''},
+        countData:{total:808374,years:'',latestDate:''},
       }
     },
     mounted (){
@@ -190,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(){
@@ -203,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;
@@ -220,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
@@ -237,7 +255,10 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+            }
           },
           yAxis:[
             {
@@ -319,7 +340,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '40%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/subject/jck.vue b/src/components/economic/subject/jck.vue
index b917d21..8209c05 100644
--- a/src/components/economic/subject/jck.vue
+++ b/src/components/economic/subject/jck.vue
@@ -138,20 +138,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -260,6 +263,7 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = _data.data
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -435,7 +439,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -544,7 +552,7 @@
               name:'出口生产企业占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/jjyx.vue b/src/components/economic/subject/jjyx.vue
index 2c9802a..fbfb114 100644
--- a/src/components/economic/subject/jjyx.vue
+++ b/src/components/economic/subject/jjyx.vue
@@ -1,3 +1,4 @@
+<!--工业经济专题分析-->
 <template>
   <div class="full-box ztfx">
     <div class="" style="width: 100%;height:100%;">
@@ -158,8 +159,9 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1')
+  let month = currentDate.getMonth()+1;
+  let year = month<10?currentDate .getFullYear()+"-0"+month :currentDate .getFullYear()+"-"+month;
   export default {
     name: 'jjyx',
     data () {
@@ -177,7 +179,7 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
+          startDate: new Date(year).format("yyyy-")+"01",
           endDate:new Date(year).format("yyyy-MM")
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'2019-04',totalTb: 0},
@@ -293,6 +295,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -303,6 +308,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -481,7 +490,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -590,7 +603,7 @@
               name:'主导产业工业'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/llyd.vue b/src/components/economic/subject/llyd.vue
index b1da257..d23077e 100644
--- a/src/components/economic/subject/llyd.vue
+++ b/src/components/economic/subject/llyd.vue
@@ -290,7 +290,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '70%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '38%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyfz.vue b/src/components/economic/subject/qyfz.vue
index 94a5d8a..667799b 100644
--- a/src/components/economic/subject/qyfz.vue
+++ b/src/components/economic/subject/qyfz.vue
@@ -112,8 +112,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
@@ -122,8 +125,8 @@
         year:new Date(year).format("yyyy"),
         lastTime:new Date(year).format("yyyy-MM"),
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,latestDate:'',totalTb: 0},
         defaultOp:{
@@ -216,16 +219,22 @@
         vm.$http.get('/dx-economy-api/subject/qyfz/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='总产值(亿元)';vm.chartsTitle.right = ''
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartTwo',t.xAxis,t.value,null,t.value2);
         })
       },
       getThreeData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right = ''
-          vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
-        })
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartThree',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/subject/qyfz/qyfz',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right = ''
+        //   vm.drawLineOne('chartThree',t.xAxis,t.value,null,null);
+        // })
       },
       getFourData(){
         let vm = this;
@@ -246,7 +255,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -300,23 +313,23 @@
               }
             }
           },
-            {
-              name: '工业产值',
-              type: 'bar',
-              color:"#16e1ff",
-              barMaxWidth:'20',
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: '工业产值',
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   barMaxWidth:'20',
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: '同比',
             type: 'line',
@@ -358,7 +371,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -469,7 +486,7 @@
               name:'企业规模分布图',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/qyrz.vue b/src/components/economic/subject/qyrz.vue
index 791f24c..4491d51 100644
--- a/src/components/economic/subject/qyrz.vue
+++ b/src/components/economic/subject/qyrz.vue
@@ -141,20 +141,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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-01"
+  const endDate = currentDate.format("yyyy-MM-dd")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
-        timeFilter:[new Date().format("yyyy-")+"01-01",new Date(year).format("yyyy-MM-dd")],
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
+        timeFilter:[startDate,endDate],
         locations: [],
         filter:{
-          startDate: new Date().format("yyyy-")+"01-01",
-          endDate:new Date().format("yyyy-MM-dd")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 2017,totalTb: 0,latestDate:''},
         chartTable:[],
@@ -261,6 +264,7 @@
             let t = resp.data.data
             vm.chartsTitle.left = '融资额(亿元)';
             vm.chartsTitle.right = '同比';
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -324,7 +328,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -436,7 +451,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0,        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -545,7 +564,7 @@
               name:'企业融资代偿比例',
               type:'pie',
               radius:['55%', '85%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/subject/qyzhnh.vue b/src/components/economic/subject/qyzhnh.vue
index 2172466..bff8a09 100644
--- a/src/components/economic/subject/qyzhnh.vue
+++ b/src/components/economic/subject/qyzhnh.vue
@@ -177,20 +177,23 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  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 endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date().format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:currentDate.format("yyyy"),
+        lastTime:endDate,
         locations:[],industryName:'',
         filter:{
           industryCode:'',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         typeValue:'用气',
         unit:'用气量（万方）',
@@ -653,7 +656,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['55%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/rcls.vue b/src/components/economic/subject/rcls.vue
index d7dc483..f91bd52 100644
--- a/src/components/economic/subject/rcls.vue
+++ b/src/components/economic/subject/rcls.vue
@@ -478,7 +478,7 @@
               name:vm.pieTitle,
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/subject/zdcy.vue b/src/components/economic/subject/zdcy.vue
index bc7ac69..697634b 100644
--- a/src/components/economic/subject/zdcy.vue
+++ b/src/components/economic/subject/zdcy.vue
@@ -152,15 +152,18 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'jjyx',
     data () {
       return {
         showCondition:false,
-        year:new Date(year).format("yyyy"),
-        lastTime:new Date(year).format("yyyy-MM"),
+        year:new Date(currentYear).format("yyyy"),
+        lastTime:new Date(currentYear).format("yyyy-MM"),
         locations: [],
         industryName:'',
         unit:'产值(亿元)',
@@ -169,8 +172,8 @@
         filter:{
           industryCode:"",
           type:'cz',
-          startDate: new Date().format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate: startDate,
+          endDate:endDate
         },
         totalData:{total: 0,current: 0,currentTb: 0,year: 0,latestDate:'',totalTb: 0},
         chartTable:[{cid: 2, name: "江西科伦 ", value: 125391.1, valueTb: 12.45}],
@@ -287,6 +290,9 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
             vm.drawLineOne('chartOne', t.xAxis, t.value, t.value2);
           }
         })
@@ -297,6 +303,10 @@
           let _data = resp.data;
           if(_data.code === 200 && !vm.$Util.isEmpty(_data.data)) {
             let t = resp.data.data
+            if(vm.filter.type=='ls'){
+              t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+            }
+            t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
             vm.drawLineOne('chartTwo', t.xAxis, t.value, t.value2);
           }
         })
@@ -474,7 +484,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              // rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -583,7 +597,7 @@
               name:'主导产业规上'+vm.typeName+'占比',
               type:'pie',
               radius:['55%', '80%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label: {normal:{show:false}},
diff --git a/src/components/economic/yztInfo/gdzctz.vue b/src/components/economic/yztInfo/gdzctz.vue
index 29e6b60..273875a 100644
--- a/src/components/economic/yztInfo/gdzctz.vue
+++ b/src/components/economic/yztInfo/gdzctz.vue
@@ -71,7 +71,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -126,17 +126,20 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         /**/
         defaultOp:{
@@ -366,23 +369,37 @@
             _end = vm.timeFilter[1];
           }
         }
-        vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='投资额(万元)';
-          vm.drawLine('chartsOne',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.drawLine('chartsOne',xAxis,mockData,null);
+        // 隐藏调用接口
+        // vm.$http.get('/dx-economy-api/subject/largeProject/times',{params:vm.filter}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='投资额(万元)';
+          // vm.drawLine('chartsOne',t.xAxis,t.value,null);
+        // })
       },
       getTwoData(){
         let vm = this;
-        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 ? null: 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
@@ -391,7 +408,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -403,16 +431,21 @@
                 color:'rgba(255,255,255,.8)',
                 formatter: function (value) {
                   let texts = [];
+                  let text = ''
                   if(value<1000){
                     texts.push(value)
+                    text = value
                   }else if(Math.ceil(value/1000)>=1&&Math.ceil(value/1000)<10){
                     texts.push(Math.ceil(value/1000) + "千")
+                    text = Math.ceil(value/1000) + "千"
                   }else if(Math.ceil(value/10000)>=1&&Math.ceil(value/10000)<100){
                     texts.push(Math.ceil(value/10000) + "万")
+                    text = Math.ceil(value/10000) + "万"
                   }else if(Math.ceil(value/1000000)>=1){
                     texts.push(Math.ceil(value/1000000) + "百万")
+                    text =Math.ceil(value/1000000) + "百万"
                   }
-                  return value
+                  return text
                 }},
               axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
               splitLine:{lineStyle:{color:'rgba(255,255,255,.1)'}}
@@ -474,7 +507,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['40%', '65%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['40%', '50%'],
               avoidLabelOverlap: false,
               label:{show:false},
diff --git a/src/components/economic/yztInfo/gyjj.vue b/src/components/economic/yztInfo/gyjj.vue
index 1dcdb8b..a3ff487 100644
--- a/src/components/economic/yztInfo/gyjj.vue
+++ b/src/components/economic/yztInfo/gyjj.vue
@@ -1,3 +1,4 @@
+<!--工业经济一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -146,18 +147,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date(year).format("yyyy-")+"01",
-          endDate:new Date(year).format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         mapList:[
@@ -404,6 +408,9 @@
         }
         vm.$http.get('/dx-economy-api/gyjjCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine1('chartsOne',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -411,6 +418,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/gyjjCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data;
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine1('chartsTwo',t.xAxis,t.value,t.value2);
         }).catch((err)=>{console.log(err)});
       },
@@ -421,7 +432,12 @@
           let legend=[];
           t.forEach(function (item) {
             legend.push(item.name);
-            item.value = item.value == 0 ? null: item.value;
+            if(vm.filter.type=='ls'){
+              item.value = item.value == 0 ? null: (item.value*10).toFixed(2);
+            }else{
+              item.value = item.value == 0 ? null: item.value;
+            }
+
           })
           vm.drawPie("chartsThree",t,legend)
         }).catch((err)=>{console.log(err)});
@@ -446,7 +462,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
@@ -535,7 +555,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -653,7 +684,7 @@
               name:'规上工业行业分布',
               type:'pie',
               radius:['50%', '90%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['60%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz-one.vue b/src/components/economic/yztInfo/qyfz-one.vue
index fd6e27c..ded8ac0 100644
--- a/src/components/economic/yztInfo/qyfz-one.vue
+++ b/src/components/economic/yztInfo/qyfz-one.vue
@@ -28,7 +28,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> 生物制药</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">2005年06月27日</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">2005年06月27日</div></div>
-            <div class="more-mapdetail">更多>></div>
+            <!--<div class="more-mapdetail">更多>></div>-->
           </div>
         </div>
       </div>
@@ -445,7 +445,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/qyfz.vue b/src/components/economic/yztInfo/qyfz.vue
index 47886bb..71e9461 100644
--- a/src/components/economic/yztInfo/qyfz.vue
+++ b/src/components/economic/yztInfo/qyfz.vue
@@ -1,3 +1,4 @@
+<!--企业发展一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -178,9 +179,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?0:new Date().getMonth();
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
-  let years =new Date().getFullYear()-1 ;
+  // let month = new Date().getMonth()==0?0:new Date().getMonth();
+  // let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date() // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  let years =currentDate.getFullYear()-1 ;
   export default {
     name: 'qyfz',
     data () {
@@ -188,7 +191,7 @@
         showCondition:false,
         filter:{
           startDate:years+"-01",
-          endDate:new Date().format("yyyy-MM")
+          endDate:currentDate.format("yyyy-MM")
         },
         qyType:'',
         MapData:null,
@@ -422,11 +425,17 @@
       },
       getOneData(){
         let vm = this;
-        vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
-          let t = resp.data.data
-          vm.chartsTitle.left='';vm.chartsTitle.right='';
-          vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
-        })
+        // 假数据
+        let t = {
+          xAxis:["拟上市企业", "规上企业", "上市公司","高新技术企业"],
+          value:[2, 126, 2,69]
+        }
+        vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // vm.$http.get('/dx-economy-api/qyfzCharts/qyfz',{params:{}}).then(function (resp) {
+        //   let t = resp.data.data
+        //   vm.chartsTitle.left='';vm.chartsTitle.right='';
+        //   vm.drawLine('chartsOne',t.xAxis,t.value,null,null);
+        // })
       },
       getTwoData(){
         let vm = this;
@@ -485,7 +494,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -528,6 +548,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -539,22 +560,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -597,7 +618,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['50%', '88%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['65%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zdcy.vue b/src/components/economic/yztInfo/zdcy.vue
index 51caef1..d166ffb 100644
--- a/src/components/economic/yztInfo/zdcy.vue
+++ b/src/components/economic/yztInfo/zdcy.vue
@@ -1,3 +1,4 @@
+<!--主导产业一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;"  >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -171,18 +172,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"cz",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'产值',
         /**/
@@ -441,6 +445,9 @@
         }
         vm.$http.get('/dx-economy-api/zdcyCharts/industry',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
           vm.drawLine('chartsOne',t.xAxis,t.value,t.value2);
         })
       },
@@ -448,6 +455,10 @@
         let vm = this;
         vm.$http.get('/dx-economy-api/zdcyCharts/times',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          if(vm.filter.type=='ls'){
+            t.value = t.value.map(item=>{return (item*10).toFixed(2)})
+          }
+          t.xAxis = t.xAxis.map(item=>item.split('-')[1].replace(/\b(0+)/gi,"")+'月')
           vm.drawLine('chartsTwo',t.xAxis,t.value,t.value2);
         })
       },
@@ -514,7 +525,11 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0        // 标签倾斜的角度
+            }
           },
           yAxis:[
             {
diff --git a/src/components/economic/yztInfo/zhnh.vue b/src/components/economic/yztInfo/zhnh.vue
index c350ac5..f84c0cd 100644
--- a/src/components/economic/yztInfo/zhnh.vue
+++ b/src/components/economic/yztInfo/zhnh.vue
@@ -1,3 +1,4 @@
+<!--综合能耗一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -206,18 +207,21 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   export default {
     name: 'zhyx',
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
+        timeFilter:[startDate,endDate],
         filter:{
           type:"yn",
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         typeName:'用能',unitName:'能耗(吨标准煤)',
         titleOne:'综合能源消费量行业分布',titleTwo:'产值单耗行业分布',
@@ -505,6 +509,14 @@
             _end = vm.timeFilter[1];
           }
         }
+        // 假数据
+        const mockData = {
+          "xAxis":["新能源新材料","生物医药","电子信息","其他"],
+          "value":[0,0,0,0],
+          "value2":[0,0,0,0]
+        }
+        vm.drawLine('chartsOne',mockData.xAxis,mockData.value,mockData.value2,[0, 0, -5,30]);
+        // 真实后台请求，隐藏
         vm.$http.get('/dx-economy-api/zhnhCharts/czdh',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
           vm.chartsTitle.left='消费量(吨标准煤)';vm.chartsTitle.right='同比';
@@ -703,7 +715,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -813,7 +836,7 @@
               name:'固定资产投资占比',
               type:'pie',
               radius:['30%', '55%'],
-              minAngle: 30,
+              // minAngle: 30,
               center:['50%', '50%'],
               avoidLabelOverlap: false,
               label: {
diff --git a/src/components/economic/yztInfo/zhyx-newcopy.vue b/src/components/economic/yztInfo/zhyx-newcopy.vue
index c928157..09bb060 100644
--- a/src/components/economic/yztInfo/zhyx-newcopy.vue
+++ b/src/components/economic/yztInfo/zhyx-newcopy.vue
@@ -48,7 +48,7 @@
             <div class="map-detail-row"><div class="">行　　业：</div><div class=""> {{companyDetail.industryName}}</div></div>
             <div class="map-detail-row"><div class="">注册日期：</div><div class="">{{companyDetail.qyclrq}}</div></div>
             <div class="map-detail-row"><div class="">注册资本：</div><div class="">{{companyDetail.qyzczb}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
diff --git a/src/components/economic/yztInfo/zhyx.vue b/src/components/economic/yztInfo/zhyx.vue
index f94df8a..dd16ae6 100644
--- a/src/components/economic/yztInfo/zhyx.vue
+++ b/src/components/economic/yztInfo/zhyx.vue
@@ -1,3 +1,4 @@
+<!--综合运行一张图-->
 <template>
   <div class="full-box jjyxyzt">
     <div class="" style="width: 100%;height:100%;" >
@@ -71,7 +72,7 @@
             <div class="map-detail-row"><div class="">负责人（法人）：</div><div class="">{{companyDetail.legalPerson}}</div></div>
             <div class="map-detail-row"><div class="">工业税收：</div><div class="">{{companyDetail.gyss}}</div></div>
             <div class="map-detail-row"><div class="">主营业务收入：</div><div class="">{{companyDetail.zyywsr}}</div></div>
-            <div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>
+            <!--<div class="more-mapdetail" @click="goCompantDetail(companyDetail.id)">更多>></div>-->
           </div>
         </div>
       </div>
@@ -171,8 +172,11 @@
 </template>
 
 <script>
-  let month = new Date().getMonth()==0?1:new Date().getMonth()+1;
-  let year = month<10?new Date().getFullYear()+"-0"+month :new Date().getFullYear()+"-"+month;
+  const currentDate = new Date('2020/12/1') // 当前日期
+  const month = currentDate.getMonth()+1; // 月份
+  const currentYear = month<10?currentDate.getFullYear()+"-0"+month :currentDate.getFullYear()+"-"+month;
+  const startDate = currentDate.format("yyyy-")+"01"
+  const endDate = currentDate.format("yyyy-MM")
   import esriLoader from 'esri-loader'
   import { loadModules } from 'esri-loader';
   export default {
@@ -180,11 +184,11 @@
     data () {
       return {
         showCondition:false,
-        timeFilter:[new Date().format("yyyy-")+"01",new Date(year).format("yyyy-MM")],
-        year:year,
+        timeFilter:[startDate,endDate],
+        year:currentYear,
         filter:{
-          startDate:new Date().format("yyyy-")+"01",
-          endDate:new Date().format("yyyy-MM")
+          startDate:startDate,
+          endDate:endDate
         },
         dateType:'month',
         mapList:[
@@ -449,6 +453,21 @@
         }
         vm.$http.get('/dx-economy-api/zhyxCharts/czhy',{params:vm.filter}).then(function (resp) {
           let t = resp.data.data
+          console.log('czhy')
+          console.log(t)
+          console.log('=========')
+          // 排序
+          let temp = []
+          const tlength = t.xAxis.length
+          for(let i=0;i<tlength;i++){
+            if(t.value[i]>0){
+              temp.push({'x':t.xAxis[i],'value':t.value[i]})
+            }
+          }
+          // 对temp进行排序
+          // temp = temp.sort((a,b)=>a.value-b.value)
+          t.xAxis = temp.map(item=>item.x).reverse()
+          t.value = temp.map(item=>item.value).reverse()
           vm.drawBar('chartsOne',t.xAxis,t.value);
         }).catch((err)=>{console.log(err)});
       },
@@ -463,11 +482,19 @@
             _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:[2, 126, 2,69]
+        }
+        vm.chartsTitle.left = '企业数(家)';vm.chartsTitle.right = '';
+        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;
@@ -575,7 +602,18 @@
           xAxis: {
             type:"category",
             data: cate,
-            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}}
+            axisLine:{lineStyle:{color:'rgba(255,255,255,.3)'}},
+            axisLabel: {
+              interval: 0,      // 坐标轴刻度标签的显示间隔
+              rotate: cate.length>5?40:0,        // 标签倾斜的角度
+              formatter: function(value) {
+                var res = value;
+                if(cate.length>5 && res.length > 3) {
+                  res = res.substring(0, 2) + "..";
+                }
+                return res;
+              },
+            }
           },
           yAxis:[
             {
@@ -617,6 +655,7 @@
             type: 'bar',
             color:"#6ee988",
             data: d1,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            barMaxWidth: '20',
             itemStyle: {
               color: {
                 type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
@@ -628,22 +667,22 @@
               }
             }
           },
-            {
-              name: vm.chartsTitle.left,
-              type: 'bar',
-              color:"#16e1ff",
-              data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
-              itemStyle: {
-                color: {
-                  type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
-                  colorStops: [{
-                    offset: 0, color: '#16e1ff' // 0% 处的颜色
-                  }, {
-                    offset: 1, color: '#16e1ff' // 100% 处的颜色
-                  }]
-                }
-              }
-            },
+            // {
+            //   name: vm.chartsTitle.left,
+            //   type: 'bar',
+            //   color:"#16e1ff",
+            //   data: d2,//[100,200,33,56,188,123,143,23,99],//res.zcz
+            //   itemStyle: {
+            //     color: {
+            //       type: 'linear', x: 0, y: 0, x2: 0, y2: 1,
+            //       colorStops: [{
+            //         offset: 0, color: '#16e1ff' // 0% 处的颜色
+            //       }, {
+            //         offset: 1, color: '#16e1ff' // 100% 处的颜色
+            //       }]
+            //     }
+            //   }
+            // },
             {
             name: vm.chartsTitle.right,
             type: 'line',
@@ -673,7 +712,8 @@
   }
 </script>
 <style>
-  @import url('http://223.84.218.79:18086/arcgis/arcgis_js_api/library/3.11/3.11/esri/css/esri.css');
+  /*@import url('http://223.84.218.79:18086/arcgis/arcgis_js_api/library/3.11/3.11/esri/css/esri.css');*/
+  @import url('https://js.arcgis.com/3.29/esri/css/esri.css');
   .search-row-condition .el-date-editor .el-range-input{width:35%!important;}
   .map-search-box .el-input__inner input{ }
   .map-search-box .search-btn{ }
diff --git a/src/main.js b/src/main.js
index 1a7f2c5..ccb8e61 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,7 +35,8 @@
 loadScript(options)*/
 
 const options = {
-  url: 'http://223.84.218.79:18086/arcgis/arcgis_js_api/library/3.11/3.11/init.js',
+  url: 'https://js.arcgis.com/3.29/',
+  // url: 'http://223.84.218.79:18086/arcgis/arcgis_js_api/library/3.11/3.11/init.js',
 };
 loadScript(options)
 /**/