Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/system/jbdHome/board/component/moreBar.vue

@@ -1,98 +1,113 @@
 <template>
-  <div class="pieView">
-    <div style="height: 10%;line-height: 30px;text-align: left;padding-left: 6px;width: 100%;">
-      {{info.config.title}}
-    </div>   
-    <div style="width:100%;height:90%;display: inline-block;"  v-show="showChart">
-      <div :id="info.config.idSelector" style="width:100%;height:100%;"> </div>
+    <div class="pieView">
+        <div style="height: 10%;line-height: 30px;text-align: left;padding-left: 6px;width: 100%;">
+            {{ info.config.title }}
+        </div>
+        <div v-show="showChart" style="width:100%;height:90%;display: inline-block;">
+            <div :id="info.config.idSelector" style="width:100%;height:100%;" />
+        </div>
+        <div v-if="!showChart" style="background: #061237;width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;">
+            <div style="color: #c7c7c7">目前无数据</div>
+        </div>
     </div>
-    <div style="background: #061237;width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;" v-if="!showChart">
-      <div style="color: #c7c7c7">目前无数据</div>
-    </div>
-  </div>
 </template>
 
 <script>
-import * as echarts from "echarts";
+import * as echarts from 'echarts'
 export default {
-  data() {
-    return {
-      yAxisNum:1,
-      showChart: true,
-    };
-  },
-  props: {
-    info: {
-      type: Object,
-      default: {},
+    props: {
+        info: {
+            type: Object,
+            default: {}
+        }
     },
-  },
-  mounted() {
-    let this_ = this;
-    this.$nextTick(()=>{
-      this_.getMiddleLeft();
-    })
-  },
-  methods: {
-    getMiddleLeft() {
-      let this_ = this;
-      let series = [];
-      
-      if(this_.info.data.source[0] == 999 ){
-        this.showChart = false;
-        return
-      }
-      for(let item of this.info.config.colors){
-        series.push({
-            type: 'bar',
-            color:item,            
-            label:{
-              show: true,
-              position: 'top',
-              color:"#fff"
-            }, 
-          })
-      }
-      var chartDom = document.getElementById(this.info.config.idSelector);
-      var myChart = echarts.init(chartDom);
-      let option = {
-        legend: {
-          left: "left",
-          textStyle: {
-            color: "#fff",
-          },
-        },
-        grid:{ // 让图表占满容器
-          top:"40px",
-          left:"40px",
-          right:"40px",
-          bottom:"40px"
-        },
-        tooltip: {},
-        dataset: {
-        dimensions: this_.info.data.dimensions,
-        source: this_.info.data.source,
-      },
-      xAxis: { 
-        type: 'category' ,
-        axisLabel: {
-          color: "#fff",
-          interval:0,  
-          rotate:20 
+    data () {
+        return {
+            yAxisNum: 1,
+            showChart: true
         }
-      },
-      yAxis: {
-        axisLabel: {
-          color: "#fff",
+    },
+    mounted () {
+        const this_ = this
+        this.$nextTick(() => {
+            this_.getMiddleLeft()
+        })
+    },
+    methods: {
+        getMiddleLeft () {
+            const this_ = this
+            const series = []
 
+            if (this_.info.data.source[0] == 999) {
+                this.showChart = false
+                return
+            }
+            for (const item of this.info.config.colors) {
+                series.push({
+                    type: 'bar',
+                    color: item,
+                    label: {
+                        show: true,
+                        position: 'top',
+                        color: '#fff'
+                    }
+                })
+            }
+            var chartDom = document.getElementById(this.info.config.idSelector)
+            var myChart = echarts.init(chartDom)
+            let interval = 7
+            let max = 0
+            console.log(this_.info.data.source)
+            this_.info.data.source.forEach(item => {
+                if (item.设备总数 > max) {
+                    max = item.设备总数
+                }
+            })
+            if (max < 7) {
+                interval = 1
+            } else {
+                // interval = parseInt(max / 7)
+                interval = Math.ceil((parseInt(max / 7) / 10)) * 10
+            }
+            const option = {
+                legend: {
+                    left: 'left',
+                    textStyle: {
+                        color: '#fff'
+                    }
+                },
+                grid: { // 让图表占满容器
+                    top: '40px',
+                    left: '40px',
+                    right: '40px',
+                    bottom: '40px'
+                },
+                tooltip: {},
+                dataset: {
+                    dimensions: this_.info.data.dimensions,
+                    source: this_.info.data.source
+                },
+                xAxis: {
+                    type: 'category',
+                    axisLabel: {
+                        color: '#fff',
+                        interval: 0,
+                        rotate: 20
+                    }
+                },
+                yAxis: {
+                    axisLabel: {
+                        color: '#fff'
+
+                    },
+                    interval: interval
+                },
+                series: series
+            }
+            myChart.setOption(option)
         }
-      },
-      series: series
-    };
-      myChart.setOption(option);
-    },
-  },
-};
+    }
+}
 </script>
 <style lang="scss" scoped>
 .pieView {
@@ -101,4 +116,4 @@ export default {
   height: 100%;
   background-color: rgba(6,30,93,.5);
 }
-</style>
+</style>

src/views/system/jbdHome/board/component/zhuzhuangtu.vue

@@ -1,146 +1,166 @@
 <template>
-  <div class="pieView">
-    <div style="height: 10%;width: 100%;line-height: 30px;text-align: left;padding-left: 10px;">{{info.config.title}}</div>   
-    <div style="width:100%;height:90%;display: inline-block;" v-show="showChart">
-      <div :id="info.config.idSelector" style="width:100%;height:100%;"> </div>
+    <div class="pieView">
+        <div style="height: 10%;width: 100%;line-height: 30px;text-align: left;padding-left: 10px;">{{ info.config.title }}</div>
+        <div v-show="showChart" style="width:100%;height:90%;display: inline-block;">
+            <div :id="info.config.idSelector" style="width:100%;height:100%;" />
+        </div>
+        <div v-if="!showChart" style="background: #061237;width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;">
+            <div style="color: #c7c7c7">目前无数据</div>
+        </div>
     </div>
-    <div style="background: #061237;width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;" v-if="!showChart">
-      <div style="color: #c7c7c7">目前无数据</div>
-    </div>
-  </div>
 </template>
 
 <script>
-import * as echarts from "echarts";
+import * as echarts from 'echarts'
 export default {
-  data() {
-    return {
-      yAxisNum:1,
-      showChart: true,
-    };
-  },
-  props: {
-    info: {
-      type: Object,
-      default: {},
+    props: {
+        info: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        }
     },
-  },
-  mounted() {
-    let this_ = this;
-    this.$nextTick(()=>{
-      this_.getMiddleLeft();
-    })
-    
-  },
-  methods: {
-    getMiddleLeft() {
-      var chartDom = document.getElementById(this.info.config.idSelector);
-      var myChart = echarts.init(chartDom);
-      let ay =this.info.data;
-      let yc;
-      ay[0] > ay[1]?yc=ay[0]:yc=ay[1];
-      this.yAxisNum =parseInt(yc / 6) ;
-      this.yAxisNum ==0? this.yAxisNum =1:'';
-      let num = 0;
-      for (let item of this.info.data) {
-        num += Number(item);
-      }
-      if (num == 0) {
-        this.showChart = false;
-      } else {
-        this.showChart = true;
-      }
-      var myChart = echarts.init(chartDom);
-      var option;
-      option = {
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            type: "shadow",
-          },
-        },
-        grid: {
-          left: "3%",
-          right: "4%",
-          bottom: "3%",
-          containLabel: true,
-        },
-        xAxis: [
-          {
-            type: "category",
-            data: this.info.xData,
-            interval: 2,
-            axisTick: {
-              alignWithLabel: false,
-            },
-            axisLabel: {
-              fontSize: 12,
-              rotate: 25,
-              formatter:function(value){  
-                var str = ""; 
-                var num = 6; //每行显示字数 
-                var valLength = value.length; //该项x轴字数  
-                var rowNum = Math.ceil(valLength / num); // 行数  
-                if(rowNum > 1) {
-                    for(var i = 0; i < rowNum; i++) {
-                        var temp = "";
-                        var start = i * num;
-                        var end = start + num;
-                        
-                        temp = value.substring(start, end) + "\n";
-                        str += temp; 
-                    }
-                    return str;
-                } else {
-                    return value;
-                } 
-            },
-            },
-            axisLine: {
-            lineStyle: {
-              color: "#fff",
-              width:1
+    data () {
+        return {
+            yAxisNum: 1,
+            showChart: true
+        }
+    },
+    mounted () {
+        const this_ = this
+        this.$nextTick(() => {
+            this_.getMiddleLeft()
+        })
+    },
+    methods: {
+        getMiddleLeft () {
+            var chartDom = document.getElementById(this.info.config.idSelector)
+            // console.log(chartDom.getBoundingClientRect().height, 'chartDom')
+            // const domHeight = parseInt(chartDom.getBoundingClientRect().height)
+            // let interval =
+            // var myChart = echarts.init(chartDom)
+            const ay = this.info.data
+            let yc
+            ay[0] > ay[1] ? yc = ay[0] : yc = ay[1]
+            this.yAxisNum = parseInt(yc / 6)
+            this.yAxisNum === 0 ? this.yAxisNum = 1 : ''
+            let num = 0
+            let max = 0
+            let interval = 7
+            for (const item of this.info.data) {
+                num += Number(item)
+                if (item > max) {
+                    max = item
+                }
             }
-          }
-          },
-        ],
-        yAxis: [
-          {
-            type: "value",
-          axisLine: {
-            lineStyle: {
-              color: "#fff"
+            if (max < 7) {
+                interval = 1
+            } else {
+                interval = Math.ceil((parseInt(max / 7) / 10)) * 10
             }
-          },
-          interval:15
-        },
-        ],
-        series: [
-          {
-            type: "bar",
-            data: this.info.data,
-            barWidth: 30,
-            label:{
-              show: true,
-              position: 'top',
-              color:"#fff"
-            },
-            itemStyle: {
-            normal: {
-                color: function(params) {
-                    var colorList = ['#5c7bd9', '#9fe080', '#339933', '#ffdc60','#f9210b', '#ff915a'];
-                    return colorList[params.dataIndex]
-                }
+            if (num === 0) {
+                this.showChart = false
+            } else {
+                this.showChart = true
             }
+            var myChart = echarts.init(chartDom)
+            var option
+            option = {
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                // grid: {
+                //     left: '3%',
+                //     right: '4%',
+                //     bottom: '3%',
+                //     containLabel: true
+                // },
+                grid: { // 让图表占满容器
+                    top: '40px',
+                    left: '40px',
+                    right: '40px',
+                    bottom: '40px'
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: this.info.xData,
+                        interval: 2,
+                        axisTick: {
+                            alignWithLabel: false
+                        },
+                        axisLabel: {
+                            fontSize: 12,
+                            rotate: 25,
+                            formatter: function (value) {
+                                var str = ''
+                                var num = 6 // 每行显示字数
+                                var valLength = value.length // 该项x轴字数
+                                var rowNum = Math.ceil(valLength / num) // 行数
+                                if (rowNum > 1) {
+                                    for (var i = 0; i < rowNum; i++) {
+                                        var temp = ''
+                                        var start = i * num
+                                        var end = start + num
+
+                                        temp = value.substring(start, end) + '\n'
+                                        str += temp
+                                    }
+                                    return str
+                                } else {
+                                    return value
+                                }
+                            }
+                        },
+                        axisLine: {
+                            lineStyle: {
+                                color: '#fff',
+                                width: 1
+                            }
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        axisLine: {
+                            lineStyle: {
+                                color: '#fff'
+                            }
+                        },
+                        interval: interval
+                    }
+                ],
+                series: [
+                    {
+                        type: 'bar',
+                        data: this.info.data,
+                        barWidth: 30,
+                        label: {
+                            show: true,
+                            position: 'top',
+                            color: '#fff'
+                        },
+                        itemStyle: {
+                            normal: {
+                                color: function (params) {
+                                    var colorList = ['#5c7bd9', '#9fe080', '#339933', '#ffdc60', '#f9210b', '#ff915a']
+                                    return colorList[params.dataIndex]
+                                }
+                            }
+                        }
+                    }
+
+                ]
+            }
+            myChart.setOption(option)
         }
-          },
-          
-        ],
-      };
-      myChart.setOption(option);
-    },
-  },
-};
+    }
+}
 </script>
 <style lang="scss" scoped>
 .pieView {
@@ -149,4 +169,4 @@ export default {
   height: 100%;
   background-color: rgba(6,30,93,.5);
 }
-</style>
+</style>