merge branch master 20220428

src/components/ChartTable.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="app-table">
+   
+    <div class="table">
+      <el-table
+        :key="table.tableKey"
+        v-loading="table.listLoading"
+        element-loading-text="给我一点时间"
+        :data="table.list"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        class="elTable table-fixed"
+      >
+        <el-table-column :key="1" label="序号" prop="sort" align="center" width="50px" />
+        <el-table-column :key="2" label="栏舍名称" prop="barname" min-width="90px" align="center" />
+        <el-table-column :key="3" label="第一层" min-width="90px" align="center">
+          <el-table-column label="比例 (%)" prop="onerate" min-width="90px" align="center" />
+          <el-table-column label="重量 (g)" prop="oneweight" min-width="90px" align="center" />
+        </el-table-column>
+        <el-table-column :key="4" label="第二层" min-width="90px" align="center">
+          <el-table-column label="比例 (%)" prop="tworate" min-width="90px" align="center" />
+          <el-table-column label="重量 (g)" prop="twoweight" min-width="90px" align="center" />
+        </el-table-column>
+        <el-table-column :key="5" label="第三层" min-width="90px" align="center">
+          <el-table-column label="比例 (%)" prop="threerate" min-width="90px" align="center" />
+          <el-table-column label="重量 (g)" prop="threeweight" min-width="90px" align="center" />
+        </el-table-column>
+    
+      </el-table>
+      <Pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+    </div>
+   
+  </div>
+</template>
+
+<script>
+import { GetDataByName } from '@/api/common'
+import draggable from 'vuedraggable'
+import Cookies from 'js-cookie'
+import { parseTime } from '@/utils/index.js'
+import Pagination from '@/components/Pagination'
+export default {
+  name: 'MaterialIssuancePlan',
+  display: 'Two list header slot',
+  order: 14,
+  components: { Pagination },
+  data() {
+    return {
+      table: {
+        getdataListParm: {
+          name: 'getDungHistory',
+          page: 1,
+          offset: 1,
+          pagecount: 12,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            operatetime: ''
+          }
+        },
+        list: [],
+        total: 0,
+        tableKey: 0,
+        listLoading: false,
+        temp: {},
+        changeList: [],
+        startObj: {}
+      },
+
+      textMap: {
+        seeHistory: '粪便筛修改记录'
+      },
+      seeHistory: {
+        dialogFormVisible: false, dialogStatus: '',
+        total: 0, tableKey: 0, listLoading: false,
+        getdataListParm: {
+          name: 'getDungHistoryBar', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            barid: '',
+            inputDatetime: '',
+            time1: '',
+            time2: ''
+          }
+        }
+      },
+
+      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    changeDate() {
+      this.getList()
+    },
+    getList() {
+      this.table.listLoading = true
+      GetDataByName(this.table.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.table.list = response.data.list
+          this.table.pageNum = response.data.pageNum
+          this.table.pageSize = response.data.pageSize
+          this.table.total = response.data.total
+        } else {
+          this.table.list = []
+        }
+        setTimeout(() => {
+          this.table.listLoading = false
+        }, 100)
+      })
+    },
+
+    handleSearch() {
+      if (this.table.getdataListParm.parammaps.operatetime == '' || this.table.getdataListParm.parammaps.operatetime == null ) {
+        this.table.getdataListParm.parammaps.operatetime = ''
+      } else {
+        this.table.getdataListParm.parammaps.operatetime = parseTime(this.table.getdataListParm.parammaps.operatetime, '{y}-{m}-{d}')
+      }
+      this.getList()
+    },
+    handleRefresh() {
+      this.table.getdataListParm.parammaps.operatetime = ''
+      this.getList()
+    },
+   
+    
+  }
+}
+</script>
+
+<style  lang="scss" scoped>
+ .search{margin-bottom: 10px;}
+</style>

src/views/dashboard/pasture/index.vue

@@ -767,11 +767,11 @@ export default {
           }]
         }]
       }
-      this.row2.chart1.chartLine.setOption(option)
+      this.row2.chart1.chartLine.setOption(option)
       if (this.row2.chart1.chartLine != null) {
         window.onresize = function() {
           this.row2.chart1.chartLine.resize()
-        }
+        }
       }
       var that = this
       that.row2.chart1.chartLine.on('mouseover', e => {
@@ -809,11 +809,11 @@ export default {
         }],
         color: ['#529ae4', '#e4e7ec']
       }
-      this.row2.chart2.chartLine.setOption(option)
+      this.row2.chart2.chartLine.setOption(option)
       if (this.row2.chart2.chartLine != null) {
         window.onresize = function() {
           this.row2.chart2.chartLine.resize()
-        }
+        }
       }
       var that = this
       that.row2.chart2.chartLine.on('mouseover', e => {
@@ -875,7 +875,7 @@ export default {
           text: '',
           subtext: ''
         },
-        color: ['#38c193', '#5199e5', '#fdb06a', '#fb8b73'], // 关键加上这句话，legend的颜色和折线的自定义颜色就一致了
+        color: ['#ff0000', '#5199e5', '#fdb06a', '#fb8b73'], // 关键加上这句话，legend的颜色和折线的自定义颜色就一致了
         grid: {
           bottom: '10%'
         },
@@ -908,17 +908,17 @@ export default {
           {type:'slider' },  //用于添加滑动条缩放，
         ],
         series: [
-          { symbol: 'none', name: '实际重量', type: 'line', symbolSize: 4, data: chartLine_data.data3, smooth: true, barWidth: '37', itemStyle: { normal: { lineStyle: { color: '#38c193' }}}},
-          { symbol: 'none', name: '设计重量', type: 'line', symbolSize: 4, barWidth: '37', data: chartLine_data.data2, itemStyle: { normal: { lineStyle: { color: '#5199e5' }}}},
-          { name: '开始重量', symbol: 'image://https://kptyun.cn:8081/file/pic/3.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data4 },
-          { name: '结束重量', symbol: 'image://https://kptyun.cn:8081/file/pic/4.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data5 }
+          { symbol: 'none', name: '实际重量', type: 'line', data: chartLine_data.data3, itemStyle: { normal: { lineStyle: { color: '#ff0000' ,width:2}}}},
+          { symbol: 'none', name: '设计重量', type: 'line',  data: chartLine_data.data2, itemStyle: { normal: { lineStyle: {  width:2}}}},
+          { name: '开始重量', symbol: 'image://https://kptyun.cn:8081/file/pic/3.png', symbolSize: 6, type: 'scatter', data: chartLine_data.data4 },
+          { name: '结束重量', symbol: 'image://https://kptyun.cn:8081/file/pic/4.png', symbolSize: 6, type: 'scatter', data: chartLine_data.data5 }
         ]
       }
       this.row2.chart3.chartLine.setOption(option)
-      if (this.row2.chart3.chartLine != null) {
-        window.onresize = function() {
-          this.row2.chart3.chartLine.resize()
-        }
+      if (this.row2.chart3.chartLine != null) {
+        window.onresize = function() {
+          this.row2.chart3.chartLine.resize()
+        }
       }
     },
     getCarLength() {
@@ -1165,11 +1165,11 @@ export default {
           { name: '计划准确率（去除取消重量）', type: 'line', symbol: 'none', smooth: true, itemStyle: { normal: { lineStyle: { color: '#fd8d75' }}}, data: chartLine_data.data4 }
         ]
       }
-      this.row3.chart1.chartLine.setOption(option)
+      this.row3.chart1.chartLine.setOption(option)
       if (this.row3.chart1.chartLine != null) {
         window.onresize = function() {
           this.row3.chart1.chartLine.resize()
-        }
+        }
       }
     },
     // 泌乳牛干物质采食量
@@ -1177,7 +1177,7 @@ export default {
       this.row3.chart2.listLoading = true
       GetReportform(this.row3.chart2.getdataListParm).then(response => {
         console.log('泌乳牛干物质采食量数据', response)
-        if (response.data !== null && response.data.list !== null && response.data.data !== null) {
+        if (response.data !== null && response.data.list !== null && response.data.data !== null) {
           for (let i = 0; i < response.data.data.length; i++) {
             if (response.data.data[i].field1 !== '' && response.data.data[i].field1 !== undefined) {
               response.data.data[i].field1 = parseFloat(response.data.data[i].field1)
@@ -1228,11 +1228,11 @@ export default {
           itemStyle: { barBorderRadius: [18, 18, 0, 0], normal: { color: '#36c293' }}, yAxisIndex: 1, data: chartLine_data.data3
         }]
       }
-      this.row3.chart2.chartLine.setOption(option)
+      this.row3.chart2.chartLine.setOption(option)
       if (this.row3.chart2.chartLine != null) {
         window.onresize = function() {
           this.row3.chart2.chartLine.resize()
-        }
+        }
       }
     },
 
@@ -1297,10 +1297,10 @@ export default {
         }]
       }
       this.row4.chart1.chartLine.setOption(option)
-      if (this.row4.chart1.chartLine != null) {
-        window.onresize = function() {
-          this.row4.chart1.chartLine.resize()
-        }
+      if (this.row4.chart1.chartLine != null) {
+        window.onresize = function() {
+          this.row4.chart1.chartLine.resize()
+        }
       }
     },
 
@@ -1352,11 +1352,11 @@ export default {
           name: '重量', type: 'bar', stack: '广告', itemStyle: { normal: { color: '#36C293' }}, data: chartLine_data.data2
         }]
       }
-      this.row4.chart2.chartLine.setOption(option)
+      this.row4.chart2.chartLine.setOption(option)
       if (this.row4.chart2.chartLine != null) {
         window.onresize = function() {
           this.row4.chart2.chartLine.resize()
-        }
+        }
       }
     },
 

src/views/systemManagement/customboard2/Addboard2/index.vue

@@ -34,21 +34,21 @@
 
             </div>
 
+
             <div  class="board-item" v-if="item.boardtype == 'table'"> 
                 表格
-
-                <!-- <keep-alive>
-                  <component :is="chartTable.myComponent" ref="chartTable" />
-                </keep-alive> -->
-
-
+ 
                 <keep-alive>
-                  <component :is="chartTable.myComponent" ref="chartTable" />
+
+                  <ChartTable>  </ChartTable>
+                  <!-- <component :is="chartTable.myComponent" ref="chartTable" /> -->
                 </keep-alive>
             </div>
-            <div  class="board-item" v-if="item.boardtype == 'line'"> 
-                 线图
-            </div>
+            <!-- <div  class="board-item" v-if="item.boardtype == 'line'"> 
+                 <keep-alive>
+                  <component :is="chartLine.myComponent" ref="chartLine" />
+                </keep-alive>
+            </div> -->
           </el-card>
                     
                         
@@ -99,27 +99,33 @@
 import draggable from 'vuedraggable'
  
 import { GetDataByName } from '@/api/common'
+
+import { ChartTable } from '@/components/ChartTable'
+
 import Cookies from 'js-cookie'
  
 export default {
   name: 'Addboard2',
-  components: {  draggable },
+  components: {  draggable , ChartTable},
   data() {
     return {
       isRoleEdit: [],
-chartTable: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        myComponent: null
-      },
+
+
+ 
+
       boardList: [
         {
           title:'图表1',boardId:1,boardtype:'table',
           boardtext:[]
         },
-        {title:'图表2',boardId:1,boardtype:'line',
-          boardtext:[]},
-        {title:'图表3'},
+        {
+          title:'图表2',boardId:2,boardtype:'table',
+          boardtext:[]
+        },
+        {
+          title:'图表3',boardId:3,boardtype:'line',
+          },
         {title:'图表3'},
         {title:'图表3'},
 
@@ -134,6 +140,12 @@ chartTable: {
         myComponent: null
       },
 
+      chartLine: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        myComponent: null
+      },
+
 
 
        myChartList: [],
@@ -168,10 +180,14 @@ chartTable: {
  
     this.getList()
 
-    this.chartTable.dialogFormVisible = true
+     this.chartTable.dialogFormVisible = true
+     this.chartLine.dialogFormVisible = true
+
       const vue = this
-      var myComponent = () => import('./chartTable.vue')
-     vue.chartTable.myComponent = myComponent
+      // var myComponent1 = () => import('./chartTable.vue')
+      // vue.chartTable.myComponent = myComponent1
+      // var myComponent2 = () => import('./chartLine.vue')
+      // vue.chartTable.myComponent = myComponent2
   },
 
   methods: {

src/views/systemManagement/customboard2/ChartPanel2/chartTable.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="app-table">
+   
+    <div class="table">
+      <el-table
+        :key="table.tableKey"
+        v-loading="table.listLoading"
+        element-loading-text="给我一点时间"
+        :data="table.list"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        class="elTable table-fixed"
+      >
+        <el-table-column :key="1" label="序号" prop="sort" align="center" width="50px" />
+        <el-table-column :key="2" label="栏舍名称" prop="barname" min-width="90px" align="center" />
+        <el-table-column :key="3" label="第一层" min-width="90px" align="center">
+          <el-table-column label="比例 (%)" prop="onerate" min-width="90px" align="center" />
+          <el-table-column label="重量 (g)" prop="oneweight" min-width="90px" align="center" />
+        </el-table-column>
+        <el-table-column :key="4" label="第二层" min-width="90px" align="center">
+          <el-table-column label="比例 (%)" prop="tworate" min-width="90px" align="center" />
+          <el-table-column label="重量 (g)" prop="twoweight" min-width="90px" align="center" />
+        </el-table-column>
+        <el-table-column :key="5" label="第三层" min-width="90px" align="center">
+          <el-table-column label="比例 (%)" prop="threerate" min-width="90px" align="center" />
+          <el-table-column label="重量 (g)" prop="threeweight" min-width="90px" align="center" />
+        </el-table-column>
+    
+      </el-table>
+      <Pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+    </div>
+   
+  </div>
+</template>
+
+<script>
+import { GetDataByName } from '@/api/common'
+import draggable from 'vuedraggable'
+import Cookies from 'js-cookie'
+import { parseTime } from '@/utils/index.js'
+import Pagination from '@/components/Pagination'
+export default {
+  name: 'MaterialIssuancePlan',
+  display: 'Two list header slot',
+  order: 14,
+  components: { Pagination },
+  data() {
+    return {
+      table: {
+        getdataListParm: {
+          name: 'getDungHistory',
+          page: 1,
+          offset: 1,
+          pagecount: 12,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            operatetime: ''
+          }
+        },
+        list: [],
+        total: 0,
+        tableKey: 0,
+        listLoading: false,
+        temp: {},
+        changeList: [],
+        startObj: {}
+      },
+
+      textMap: {
+        seeHistory: '粪便筛修改记录'
+      },
+      seeHistory: {
+        dialogFormVisible: false, dialogStatus: '',
+        total: 0, tableKey: 0, listLoading: false,
+        getdataListParm: {
+          name: 'getDungHistoryBar', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            barid: '',
+            inputDatetime: '',
+            time1: '',
+            time2: ''
+          }
+        }
+      },
+
+      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    changeDate() {
+      this.getList()
+    },
+    getList() {
+      this.table.listLoading = true
+      GetDataByName(this.table.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.table.list = response.data.list
+          this.table.pageNum = response.data.pageNum
+          this.table.pageSize = response.data.pageSize
+          this.table.total = response.data.total
+        } else {
+          this.table.list = []
+        }
+        setTimeout(() => {
+          this.table.listLoading = false
+        }, 100)
+      })
+    },
+
+    handleSearch() {
+      if (this.table.getdataListParm.parammaps.operatetime == '' || this.table.getdataListParm.parammaps.operatetime == null ) {
+        this.table.getdataListParm.parammaps.operatetime = ''
+      } else {
+        this.table.getdataListParm.parammaps.operatetime = parseTime(this.table.getdataListParm.parammaps.operatetime, '{y}-{m}-{d}')
+      }
+      this.getList()
+    },
+    handleRefresh() {
+      this.table.getdataListParm.parammaps.operatetime = ''
+      this.getList()
+    },
+   
+    
+  }
+}
+</script>
+
+<style  lang="scss" scoped>
+ .search{margin-bottom: 10px;}
+</style>

src/views/systemManagement/customboard2/ChartPanel2/index.vue

@@ -193,22 +193,14 @@
             <el-form label-position="top" size="mini">
               <el-form-item  label="图表类型">
                 <div class="chart-type-list">
-                  <!-- <span v-for="item in chartTypeList" :key="item.type" :class="{activedIcon :item.type===chartType, disabledIcon: !isUsable(item)}" @click="switchChartType(item)">
-                    <el-tooltip :content="item.name +': '+item.matchRule.desc" placement="top">
-                      <svg-icon class="icon" :icon-class="isUsable(item)? item.icon : (item.icon + '_disabled')" />
-                    </el-tooltip>
-                  </span> -->
+             
 
                   <span  @click="switch_chart_type(item)" v-for="item in chartTypeList" style = "display:inline-block;height:30px;width:30px;margin-right:10px;margin-bottom:10px">
                     <el-tooltip  :content="item.desc" placement="top">
                       <svg-icon class="icon"  style="height:20px;width:20px" :icon-class="item.isUse? item.icon : (item.icon + '_disabled')" />   
                     </el-tooltip>
                   </span>
-
-                  <!-- <el-tooltip   content="1" placement="top">
-                      <svg-icon class="icon"  style="height:100px;width:100px"  icon-class="chart_line_disabled" />   
-                    </el-tooltip> -->
-
+ 
 
                 </div>
               </el-form-item>
@@ -624,6 +616,24 @@ export default {
       
       },
 
+
+       chartLine_data3:{
+        chartType:'line_bar',
+        xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+        legendArr1: ['数据1', '数据2', '数据3', '数据4' ],
+        dataArr1:[
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
+        ],
+         legendArr2: ['数据5',  '线条1'],
+        dataArr2:[
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+        ]
+      },
+
       requestParam: {},
       isokDisable: false,
       selectList: [],
@@ -1037,8 +1047,134 @@ export default {
           }()
       
       }
+      
+
+      // var option_line_bar = {
+
+        
+      //   title: { text: 'Stacked Line' },
+      //   tooltip: { trigger: 'axis' },
+      //   legend: {   data: chartLine_data.legendArr1.concat( chartLine_data.legendArr2)  , right: 10, show: true, type: 'scroll' },
+      //   grid: { top: '15%', left: '8%', right: '8%', containLabel: true },
+      //   xAxis: [{ type: 'category',data:chartLine_data.xAxisArr }],
+      //   yAxis: [
+      //     {type: 'value', name: 'kg'},
+           
+      //   ],
+      //    series: function (e) {
+      //       var serie = [];
+      //       for (var i = 0; i < chartLine_data.xAxisArr.length; i++) {
+           
+      //           var item = {
+      //             name: chartLine_data.legendArr1[i],
+      //             data: chartLine_data.dataArr1[i],
+      //             type: 'line',
+      //             emphasis: { label: { show: true, position: 'inside' } },
+      //           }
+ 
+             
+
+      //         serie.push(item);
+      //       }
 
 
+      //        for (var i = 0; i < chartLine_data.xAxisArr.length; i++) {
+             
+      //           var item = {
+      //             name: chartLine_data.legendArr2[i],
+      //             data: chartLine_data.dataArr2[i],
+      //             type: 'bar',
+      //             emphasis: { label: { show: true, position: 'inside' } },
+      //           }
+             
+
+      //         serie.push(item);
+      //       }
+
+
+
+      //       console.log(serie)
+
+      //       return serie;
+      //     }()
+      
+      // }
+
+      var option_line_bar = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        toolbox: {
+          feature: {
+            dataView: { show: true, readOnly: false },
+            magicType: { show: true, type: ['line', 'bar'] },
+            restore: { show: true },
+            saveAsImage: { show: true }
+          }
+        },
+        legend: {
+          data: ['Evaporation', 'Precipitation', 'Temperature']
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+            axisPointer: {
+              type: 'shadow'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: 'Precipitation',
+            min: 0,
+            max: 250,
+            interval: 50,
+            axisLabel: {
+              formatter: '{value} ml'
+            }
+          },
+          {
+            type: 'value',
+            name: 'Temperature',
+            min: 0,
+            max: 25,
+            interval: 5,
+            axisLabel: {
+              formatter: '{value} °C'
+            }
+          }
+        ],
+        series: [
+          {
+            name: 'Evaporation',
+            type: 'bar',
+            data: [
+              2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
+            ]
+          },
+          {
+            name: 'Precipitation',
+            type: 'bar',
+            data: [
+              2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
+            ]
+          },
+          {
+            name: 'Temperature',
+            type: 'line',
+            yAxisIndex: 1,
+            data: [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2]
+          }
+        ]
+      };
      
 
 
@@ -1050,6 +1186,8 @@ export default {
          this.chartLine.setOption(option_horizontal_bar)
       } else if(chartLine_data.chartType == 'pie'){
          this.chartLine.setOption(option_pie)
+      }  else if(chartLine_data.chartType == 'line_bar'){
+         this.chartLine.setOption(option_line_bar)
       } 
 
        
@@ -1085,6 +1223,12 @@ export default {
       }  else if(item.type == 'pie'){
         this.chartLine_data2.chartType = 'pie'
          this.roadChartLine(this.chartLine_data2)
+      }   else if(item.type == 'line_bar'){
+        console.log(1111)
+         this.chartLine_data3.chartType = 'line_bar'
+         console.log(this.chartLine_data3)
+        this.roadChartLine(this.chartLine_data3)
+        
       } 
       
     }