Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -36,6 +36,16 @@ class work {
       }
       }
     })
     })
   }
   }
+   // 数据趋势
+   async dataTrend (code) {
+    return request({
+      url: SERVER.SERVERAPI + '/rest/reg/work/dataTrend',
+      method: 'get',
+      params: {
+        code: code
+      }
+    })
+  }
    // 新建国有房屋信息
    // 新建国有房屋信息
    async addhousetotal (code) {
    async addhousetotal (code) {
     return request({
     return request({

@@ -49,10 +49,10 @@ export default {
   watch: {
   watch: {
     cdata: {
     cdata: {
       handler (newData) {
       handler (newData) {
-        this.xAxisData = newData.echartData.map((v) => v.name);
-        this.yAxisData1 = newData.echartData.map((v) => v.value1);
-        this.yAxisData2 = newData.echartData.map((v) => v.value2);
-        this.yAxisData3 = newData.echartData.map((v) => v.value3);
+        this.xAxisData = newData.echartData.map((v) => v.yearMonth);
+        this.yAxisData1 = newData.echartData.map((v) => v.receive);
+        this.yAxisData2 = newData.echartData.map((v) => v.record);
+        this.yAxisData3 = newData.echartData.map((v) => v.report);
         this.options = {
         this.options = {
           color: newData.color,
           color: newData.color,
           legend: {
           legend: {

@@ -4,6 +4,7 @@
 
 
 <script>
 <script>
 import Chart from './Chart'
 import Chart from './Chart'
+import work from "@/api/work";
 export default {
 export default {
   data () {
   data () {
     return {
     return {
@@ -88,6 +89,7 @@ export default {
     Chart
     Chart
   },
   },
    mounted() {
    mounted() {
+
      window.addEventListener("resize", () => {
      window.addEventListener("resize", () => {
        this.cdata=[],
        this.cdata=[],
       this.cdata= {
       this.cdata= {
@@ -97,75 +99,26 @@ export default {
           "#E873B2",
           "#E873B2",
           "#F4AF6F "
           "#F4AF6F "
         ],
         ],
-        echartData: [{
-          name: "2017-11",
-          value1: 1351,
-          value2: 600,
-          value3: 568,
-        },
-        {
-          name: "2017-11",
-          value1: 980,
-          value2: 1245,
-          value3: 1100,
-        },
-        {
-          name: "2017-11",
-          value1: 1127,
-          value2: 398,
-          value3: 568,
-        },
-        {
-          name: "2017-11",
-          value1: 1046,
-          value2: 689,
-          value3: 479
-        },
-        {
-          name: "2018-02",
-          value1: 780,
-          value2: 396,
-          value3: 655
-        },
-        {
-          name: "2018-08",
-          value1: 359,
-          value2: 1220,
-          value3: 540,
-        },
-        {
-          name: "2018-07",
-          value1: 229,
-          value2: 836,
-          value3: 1234,
-        },
-        {
-          name: "2018-09",
-          value1: 1176,
-          value2: 478,
-          value3: 755,
-        },
-        {
-          name: "2018-11",
-          value1: 515,
-          value2: 911,
-          value3: 806,
-        },
-        {
-          name: "2019-01",
-          value1: 658,
-          value2: 979,
-          value3: 813,
-        },
-        {
-          name: "2019-03",
-          value1: 364,
-          value2: 839,
-          value3: 886,
-        },
-        ]
+        echartData: []
       }
       }
     });
     });
+       window.addEventListener("resize", () => {
+     this.dataTrend()
+    });
+    this.dataTrend()
+  },
+  methods: {
+    async dataTrend() {
+      try {
+        let { result: res } = await work.dataTrend();
+        this.cdata.echartData = [];
+        this.cdata.echartData=res,
+        res.map((item) => {
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    },
   },
   },
 }
 }
 </script>
 </script>

@@ -6,14 +6,24 @@ class data {
   columns () {
   columns () {
     return [
     return [
       {
       {
+        prop: "state",
+        label: "状态",
+        width: '100',
+      },
+      {
+        prop: "UPLOADTIME",
+        label: "汇交日期",
+        width: '150',
+      },
+      {
         prop: "AREANAME",
         prop: "AREANAME",
         label: "区域名称",
         label: "区域名称",
       },
       },
       {
       {
-        prop: "UPLOADTIME",
+        prop: "ACCESSDATE",
         label: "日期",
         label: "日期",
         width: '150',
         width: '150',
-      },
+      },     
       {
       {
         prop: "type",
         prop: "type",
         label: "类别",
         label: "类别",
@@ -42,9 +52,9 @@ class data {
         width: '120',
         width: '120',
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
-            <div class={'difference'}>
-              <p>{scope.row.BUSINESSTYPECOUNT}</p>
-              <p>{''}</p>
+            <div >
+              <p>{scope.row.registerBusinesstypecount}</p>
+              <p>{scope.row.accessBusinesstypecount}</p>
             </div>
             </div>
           )
           )
         },
         },