manage-client 3.2.249 → 3.2.251

package/src/filiale/shanxian/Paymentpie.vue

@@ -9,12 +9,12 @@
 import * as Util from '../../Util'
 import co from 'co'
 import echarts from 'echarts'
-import { HttpResetClass } from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-let getData = function * (self) {
+let getData = function* (self) {
   let load = new HttpResetClass()
-  load.load('POST','rs/sql/sellinggasvalue',
-    {data: {startDate: self.startdate, endDate: self.enddate,key:'f_user_type',f_orgid:self.orgid}},
+  load.load('POST', 'rs/sql/sellinggasvalue',
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid:  self.orgid}},
     {resolveMsg: null, rejectMsg: null})
     .then((res) => {
       let arrparams = []
@@ -26,26 +26,26 @@ let getData = function * (self) {
         item.value = res.data[i].gas_value
         gasdata.push(item)
       }
-      console.log("加载echars组件")
-      self.setGas(arrparams,gasdata)
+      console.log('加载echars组件')
+      self.setGas(arrparams, gasdata)
     })
   let load1 = new HttpResetClass()
-  load1.load('POST','rs/sql/sellinggasvalue',
-  {data: {startDate: self.startdate, endDate: self.enddate,key:'f_payment',f_orgid:self.orgid}},
-  {resolveMsg: null, rejectMsg: null})
-  .then((res) => {
-    let arrparams = []
-    let moneydata = []
-    for (var i = 0; i < res.data.length; i++) {
-        let item1={}
+  load1.load('POST', 'rs/sql/sellinggasvalue',
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_payment', f_orgid:  self.orgid}},
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      let arrparams = []
+      let moneydata = []
+      for (var i = 0; i < res.data.length; i++) {
+        let item1 = {}
         arrparams[i] = res.data[i].name
         item1.name = res.data[i].name
         item1.value = res.data[i].money_value
         moneydata.push(item1)
-    }
-    console.log("加载echars组件")
-    self.setMoney(arrparams,moneydata)
-  })
+      }
+      console.log('加载echars组件')
+      self.setMoney(arrparams, moneydata)
+    })
 }
 export default {
   props: {
@@ -60,135 +60,136 @@ export default {
     orgid: {
       type: String
     }
-},
- data () {
-   return {
-     xc: '',
-     xd: ''
-   }
- },
- methods: {
+  },
+  data () {
+    return {
+      xc: '',
+      xd: ''
+    }
+  },
+  methods: {
 
-   setGas (arrparams,gasdata) {
-     console.log("进入组件")
-     let option1 = {
-       title: [
-         {
-           text: '收费来源气量金额饼状图',
-           x: '0%',
-           y: '0%',
-           textStyle: {
-             color: '#010606',
-             fontSize: 18,
-           }
-         },   {
-           text: '气量分布',
-           x: '40%',
-           y: '18%',
-           textStyle: {
-             color: '#010606',
-             fontSize: 16,
-           }
-         }],
-       tooltip: {
-         trigger: 'item',
-         formatter: '{a} <br/>{b}: ({c}m³) ({d}%)'
-       },
-       legend: {
-         orient: 'horizontal',
-         icon: 'circle',
-         x: 'center',
-         y: '80%',
+    setGas (arrparams, gasdata) {
+      console.log('进入组件')
+      let option1 = {
+        color: ['#FE974B', '#3D72FF', '#00C953'],
+        title: [
+          {
+            text: '收费来源气量金额饼状图',
+            x: '0%',
+            y: '0%',
+            textStyle: {
+              color: '#010606',
+              fontSize: 18
+            }
+          }, {
+            text: '气量分布',
+            x: '40%',
+            y: '18%',
+            textStyle: {
+              color: '#010606',
+              fontSize: 16
+            }
+          }],
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b}: ({c}m³) ({d}%)'
+        },
+        legend: {
+          orient: 'horizontal',
+          icon: 'circle',
+          x: 'center',
+          y: '80%',
 
-         textStyle: {
-           padding: [0, 0, 0, 4],
-           color: '#010606'
-         },
-         data: arrparams
-       },
-       series : [
-         {
-           name: '气量',
-           type: 'pie',
-           radius: ['0%', '40%'],
-           center: ['50%', '50%'],
-           hoverAnimation: true,
-           minAngle: 15,//最小角度
-           startAngle: 60, //起始角度
-           label: {normal: {show:true,}},
-           labelLine: { normal: {show:true,}},
-           data: gasdata
-         },
-       ]
+          textStyle: {
+            padding: [0, 0, 0, 4],
+            color: '#010606'
+          },
+          data: arrparams
+        },
+        series: [
+          {
+            name: '气量',
+            type: 'pie',
+            radius: ['0%', '40%'],
+            center: ['50%', '50%'],
+            hoverAnimation: true,
+            minAngle: 15, // 最小角度
+            startAngle: 60, // 起始角度
+            label: {normal: {show: true}},
+            labelLine: {normal: {show: true}},
+            data: gasdata
+          }
+        ]
 
-     }
-     this.xd = echarts.init(document.getElementById('ps'))
-     this.xd.setOption(option1,true)
-},
-   setMoney (arrparams,moneydata) {
-     console.log("进入组件")
-     let option = {
-       title: [
-         {
-           text: '',
-           x: '0%',
-           y: '0%',
-           textStyle: {
-             color: '#010606',
-             fontSize: 18,
-           }
-         }, {
-           text: '金额分布',
-           x: '40%',
-           y: '18%',
-           textStyle: {
-             color: '#010606',
-             fontSize: 16,
-           }
-         }],
-       tooltip: {
-         trigger: 'item',
-         formatter: '{a} <br/>{b}: ({c}元) ({d}%)'
-       },
-       legend: {
-         orient: 'horizontal',
-         icon: 'circle',
-         x: 'center',
-         y: '80%',
+      }
+      this.xd = echarts.init(document.getElementById('ps'))
+      this.xd.setOption(option1, true)
+    },
+    setMoney (arrparams, moneydata) {
+      console.log('进入组件')
+      let option = {
+        title: [
+          {
+            text: '',
+            x: '0%',
+            y: '0%',
+            textStyle: {
+              color: '#010606',
+              fontSize: 18
+            }
+          }, {
+            text: '金额分布',
+            x: '40%',
+            y: '18%',
+            textStyle: {
+              color: '#010606',
+              fontSize: 16
+            }
+          }],
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b}: ({c}元) ({d}%)'
+        },
+        legend: {
+          orient: 'horizontal',
+          icon: 'circle',
+          x: 'center',
+          y: '80%',
 
-         textStyle: {
-           padding: [0, 0, 0, 4],
-           color: '#010606'
-         },
-         data: arrparams
-       },
-       series : [
-         {
-           name: '金额',
-           type: 'pie',
-           radius: ['0%', '40%'],
-           center: ['50%', '50%'],
-           hoverAnimation: true,
-           minAngle: 15,//最小角度
-           startAngle: 60, //起始角度
-           label: {normal: {show:true,}},
-           labelLine: { normal: {show:true,}},
-           data: moneydata
-         }
-       ]
+          textStyle: {
+            padding: [0, 0, 0, 4],
+            color: '#010606'
+          },
+          data: arrparams
+        },
+        series: [
+          {
+            name: '金额',
+            type: 'pie',
+            radius: ['0%', '40%'],
+            center: ['50%', '50%'],
+            hoverAnimation: true,
+            minAngle: 15, // 最小角度
+            startAngle: 60, // 起始角度
+            label: {normal: {show: true}},
+            labelLine: {normal: {show: true}},
+            data: moneydata
+          }
+        ]
 
-     }
-     this.xc = echarts.init(document.getElementById('pp'))
-     this.xc.setOption(option,true)
-   },
-   searchdata () {
-     let getGen =getData(this);
-     co(getGen);
-   }
- },
- ready () {
-   this.searchdata()
- },
+      }
+      this.xc = echarts.init(document.getElementById('pp'))
+      this.xc.setOption(option, true)
+    },
+    searchdata () {
+      let getGen = getData(this)
+      co(getGen)
+    }
+  },
+  ready () {
+    this.searchdata()
+  },
   watch: {
     'startdate' (val) {
       this.searchdata()

package/src/filiale/shanxian/SiteManager.vue

@@ -12,31 +12,20 @@ import {HttpResetClass} from 'vue-client'
 
 let getData = function* (self) {
   let load = new HttpResetClass()
-  load.load('POST', 'rs/logic/sellinggasvalue',
-    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_type', f_orgid: self.orgid}},
+  load.load('POST', 'rs/sql/sellinggasvalue',
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
     {resolveMsg: null, rejectMsg: null})
     .then((res) => {
-      console.log(res + 'aaaaaaaaaaaa')
-      self.texttile = '用户类型'
-      let arrparams1 = []
-      let numdata1 = []
-      let gasdata1 = []
-      let pricedata1 = []
-      let arrparams2 = []
-      let numdata2 = []
-      let gasdata2 = []
-      let pricedata2 = []
-      console.log('res.data', res.data)
-      console.log(res.data.name1)
-      arrparams1[0] = res.data.name1
-      numdata1[0] = res.data.num_value1
-      gasdata1[0] = res.data.gas_value1
-      pricedata1[0] = res.data.money_value1
-      arrparams2[0] = res.data.name2
-      numdata2[0] = res.data.num_value2
-      gasdata2[0] = res.data.gas_value2
-      pricedata2[0] = res.data.money_value2
-      self.set(arrparams1, numdata1, gasdata1, pricedata1, arrparams2, numdata2, gasdata2, pricedata2)
+      self.texttile = '用户性质'
+      let arrparams = []
+      let numdata = []
+      let gasdata = []
+      for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num_value
+        gasdata[i] = res.data[i].gas_value
+      }
+      self.set(arrparams, numdata, gasdata)
     })
 }
 export default {
@@ -53,33 +42,34 @@ export default {
       type: String
     }
   },
+  title: '站点管理',
   data () {
-    title: '站点管理'
     return {
       texttile: '',
       xc: ''
     }
   },
   methods: {
-    set (arrparams1, numdata1, gasdata1, pricedata1, arrparams2, numdata2, gasdata2, pricedata2) {
+    set (arrparams, numdata, gasdata) {
       this.xc = echarts.init(document.getElementById('gph'))
       this.xc.setOption({
+        color: ['#894BE5', '#FE974B'],
         title: {
           text: '民用及非民用缴费散列图',
           subtext: '数据查询来源',
           x: 'left'
         },
         tooltip: {
-          trigger: 'item',
+          trigger: 'axis',
           formatter: function (params) {
-            let str = ''
-            console.log(JSON.stringify(params) + '-----------')
-            if (params.seriesName.includes('气量')) {
-              str += params.seriesName + ': ' + params.value + 'm³'
-            } else if (params.seriesName.includes('数量')) {
-              str += params.seriesName + ': ' + params.value + '笔'
-            } else {
-              str += params.seriesName + ': ' + params.value + '元'
+            var str = ''
+            str += params[0].name + '</br>'
+            for (var i = 0; i < params.length; i++) {
+              if (i === 0) {
+                str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '户' + '</br>'
+              } else {
+                str += params[i].marker + params[i].seriesName + ': ' + params[i].data + 'm³' + '</br>'
+              }
             }
             return str
           }
@@ -87,7 +77,7 @@ export default {
         legend: {
           x: 'left',
           y: 'bottom',
-          data: ['民用数量', '民用气量', '民用金额', '非民用数量', '非民用气量', '非民用金额']
+          data: ['户数', '气量']
         },
         toolbox: {
           show: true,
@@ -102,7 +92,7 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data: ['数据']
+            data: arrparams
           }
         ],
         yAxis: [
@@ -112,91 +102,10 @@ export default {
         ],
         series: [
           {
-            name: '民用数量',
-            type: 'bar',
-            data: numdata1,
-            barMinHeight: 5,
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  // 给出颜色组
-                  var colorList = ['#FE8463']
-                  return colorList[params.dataIndex]
-                }
-              }
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          },
-          {
-            name: '民用气量',
-            type: 'bar',
-            data: gasdata1,
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  // 给出颜色组
-                  var colorList = ['#45AC89']
-                  return colorList[params.dataIndex]
-                }
-              }
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          },
-          {
-            name: '民用金额',
+            name: '户数',
             type: 'bar',
-            data: pricedata1,
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  // 给出颜色组
-                  var colorList = ['#183467']
-                  return colorList[params.dataIndex]
-                }
-              }
-            }
-          },
-          {
-            name: '非民用数量',
-            type: 'bar',
-            data: numdata2,
+            data: numdata,
             barMinHeight: 5,
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  // 给出颜色组
-                  var colorList = ['#9BCA63']
-                  return colorList[params.dataIndex]
-                }
-              }
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          },
-          {
-            name: '非民用气量',
-            type: 'bar',
-            data: gasdata2,
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  // 给出颜色组
-                  var colorList = ['#26C0C0']
-                  return colorList[params.dataIndex]
-                }
-              }
-            },
             markLine: {
               data: [
                 {type: 'average', name: '平均值'}
@@ -204,24 +113,87 @@ export default {
             }
           },
           {
-            name: '非民用金额',
+            name: '气量',
             type: 'bar',
-            data: pricedata2,
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  // 给出颜色组
-                  var colorList = ['#27727B']
-                  return colorList[params.dataIndex]
-                }
-              }
-            },
+            data: gasdata,
             markLine: {
               data: [
                 {type: 'average', name: '平均值'}
               ]
             }
           }
+          // {
+          //   name: '商业数量',
+          //   type: 'bar',
+          //   data: numdata2,
+          //   itemStyle: {
+          //     normal: {
+          //       color: function (params) {
+          //         // 给出颜色组
+          //         var colorList = ['#894BE5']
+          //         return colorList[params.dataIndex]
+          //       }
+          //     }
+          //   }
+          // },
+          // {
+          //   name: '商业气量',
+          //   type: 'bar',
+          //   data: gasdata2,
+          //   barMinHeight: 5,
+          //   itemStyle: {
+          //     normal: {
+          //       color: function (params) {
+          //         // 给出颜色组
+          //         var colorList = ['#FE974B']
+          //         return colorList[params.dataIndex]
+          //       }
+          //     }
+          //   },
+          //   markLine: {
+          //     data: [
+          //       {type: 'average', name: '平均值'}
+          //     ]
+          //   }
+          // },
+          // {
+          //   name: '工业数量',
+          //   type: 'bar',
+          //   data: numdata3,
+          //   itemStyle: {
+          //     normal: {
+          //       color: function (params) {
+          //         // 给出颜色组
+          //         var colorList = ['#894BE5']
+          //         return colorList[params.dataIndex]
+          //       }
+          //     }
+          //   },
+          //   markLine: {
+          //     data: [
+          //       {type: 'average', name: '平均值'}
+          //     ]
+          //   }
+          // },
+          // {
+          //   name: '工业气量',
+          //   type: 'bar',
+          //   data: gasdata3,
+          //   itemStyle: {
+          //     normal: {
+          //       color: function (params) {
+          //         // 给出颜色组
+          //         var colorList = ['#FE974B']
+          //         return colorList[params.dataIndex]
+          //       }
+          //     }
+          //   },
+          //   markLine: {
+          //     data: [
+          //       {type: 'average', name: '平均值'}
+          //     ]
+          //   }
+          // }
         ]
       })
     },