新增组件及页面

dgtis-ui/src/views/dashboard/LineBarChart.vue

@@ -112,17 +112,18 @@
             },
           ],
           series: [
-            {
-              name: that.data.barData.name,
-              type: 'bar',
-              itemStyle:{
-                color:'#1DCAF5'
-              },
-              data: that.data.barData.data
-            },
+            // {
+            //   name: that.data.barData.name,
+            //   type: 'bar',
+            //   itemStyle:{
+            //     color:'#1DCAF5'
+            //   },
+            //   data: that.data.barData.data
+            // },
             {
               name: that.data.lineData.name,
               type: 'line',
+              smooth: true,
               itemStyle:{
                 color:'#5AAFF9',
                 borderColor:'#CFAF19'

dgtis-ui/src/views/system/userInfoDetails/index.vue

@@ -186,10 +186,10 @@ export default {
           name:'',
           data:[]
         },
-        barData:{
-          name:'',
-          data:[]
-        },
+        // barData:{
+        //   name:'',
+        //   data:[]
+        // },
         xAxisData:[]
       },
       pieChartHalfData:[],
@@ -248,8 +248,8 @@ export default {
           that.lineBarChartData.xAxisData = response.data.lineBarChartData.xaxisData;
           that.lineBarChartData.lineData.data = response.data.lineBarChartData.actaulData.data;
           that.lineBarChartData.lineData.name = response.data.lineBarChartData.actaulData.name;
-          that.lineBarChartData.barData.data = response.data.lineBarChartData.expectedData.data;
-          that.lineBarChartData.barData.name = response.data.lineBarChartData.expectedData.name;
+          // that.lineBarChartData.barData.data = response.data.lineBarChartData.expectedData.data;
+          // that.lineBarChartData.barData.name = response.data.lineBarChartData.expectedData.name;
           this.loading = false;
         }
       );