manage-client 3.2.1 → 3.2.2-aode

package/src/components/webmeter/newwebmeter/NewException/NewEchartsAll.vue

@@ -1,111 +0,0 @@
-<template>
-  <div :class="classname" :style="{width:width,height:height}">
-    <div class="form-horizontal select-overspread container-fluid auto">
-      <div class="row">
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="startDate">开始日期:</label>
-          <datepicker id="startDate" placeholder="开始日期"
-                      style="width:60%"
-                      v-model="model.startDate"
-                      :value.sync="model.startDate"
-                      :disabled-days-of-Week="[]"
-                      class="datepicker"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="endDate">结束日期:</label>
-          <datepicker id="endDate" placeholder="结束日期"
-                      style="width:60%"
-                      class="datepicker"
-                      v-model="model.endDate"
-                      :value.sync="model.endDate"
-                      :disabled-days-of-Week="[]"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="endDate">使用公司:</label>
-          <res-select restype='organization'
-                      @res-select="getRes"
-                      :initresid="model.id">
-          </res-select>
-        </div>
-      </div>
-    </div>
-    <div style="height: 97%;">
-      <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
-        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
-          <new-gas-echarts :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid.toString()'
-                        v-ref:pay></new-gas-echarts>
-        </div>
-        <div style="flex: 1;width: 50%">
-          <new-handplan-echarts :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid.toString()'
-                        v-ref:pay></new-handplan-echarts>
-        </div>
-      </div>
-      <div class="flex-row" style="flex: 1;height: 48%">
-
-        <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
-          <div  style="flex: 1;">
-            <new-instruct-echarts :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid.toString()' v-ref:pay ></new-instruct-echarts>
-          </div>
-          <!--          <div style="flex: 1;">-->
-          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
-          <!--          </div>-->
-        </div>
-
-        <div style="flex: 1;width: 50%">
-          <new-contact-echarts :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid.toString()' v-ref:pay ></new-contact-echarts>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script>
-  import * as Util from '../../../../Util'
-
-  export default {
-    title: '综合分析',
-    props: {
-      classname: {
-        type: String,
-        default: 'basic-main'
-      },
-      width: {
-        type: String,
-        default: '98.5%'
-      },
-      height: {
-        type: String,
-        default: '98%'
-      }
-    },
-    data() {
-      return {
-        jurisdiction: this.$login.r,
-        model: {
-          id: [this.$login.f.orgid],
-          orgid: [this.$login.f.orgid],
-          startDate: Util.addDate(new Date(),-6).substring(0,10),
-          endDate: Util.toStandardDateString()
-        }
-      }
-    },
-    methods: {
-      searchdata() {
-        this.$refs.pay.searchdata()
-      },
-      getRes(obj) {
-        this.model.orgid = obj
-      },
-    }
-  }
-</script>
-
-<style lang="css">
-</style>

package/src/components/webmeter/newwebmeter/NewException/NewGasEcharts.vue

@@ -1,209 +0,0 @@
-<template lang="html">
-  <div>
-    <div id="m" :style="{width:'100%',height:'100%'}"></div>
-  </div>
-</template>
-
-<script>
-import * as Util from '../../../../Util'
-import co from 'co'
-import { HttpResetClass } from 'vue-client'
-
-let getData = function * (self, condition) {
-  console.log('6666666666')
-  let load = new HttpResetClass()
-  load.load('POST', 'rs/sql/webmeter_getUserGasGroup',
-    {data: {condition: '1 = 1' + (self.orgid != null ? ' and f_orgid in ( ' + self.orgid +')' : ''),
-        groupname: 'day',
-        startDate: self.startdate + ' 00:00:00',
-        endDate: self.enddate  + ' 23:59:59'}},
-    {resolveMsg: null, rejectMsg: null})
-    .then((res) => {
-      let arrparams = []
-      let gasdata1 = []
-      let gasdata2 = []
-      for (var i = 0; i < res.data.length; i++) {
-        arrparams[i] = res.data[i].f_type
-        gasdata1[i] = res.data[i].f_oughtamount1
-        gasdata2[i] = res.data[i].f_oughtamount2
-      }
-      self.set(arrparams, gasdata1, gasdata2)
-    })
-}
-export default {
-  props: {
-    echarts:{
-      type:Boolean,
-      default:false
-    },
-    startdate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
-    enddate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
-    condition: {
-      type: String,
-      default: '1=1'
-    },
-    orgid:'',
-    groupname: {
-      type: String,
-      default: 'year'
-    }
-  },
-  data () {
-    title: '业务类型'
-    return {
-      xc: ''
-    }
-  },
-  ready(){
-    console.log(this.echarts)
-    this.searchdata()
-  },
-  methods: {
-    set (arrparams, gasdata1, gasdata2) {
-      console.log('--------->>>>>>>>>>>>',arrparams,gasdata1,gasdata2)
-      console.log("ec:"+this.echarts)
-      let name = ''
-      if (this.groupname === 'year')
-      {
-        name = '年'
-      } else if (this.groupname === 'month'){
-        name = '月'
-      } else if (this.groupname === 'week'){
-        name = '周'
-      } else {
-        name = '日'
-      }
-      this.xc = this.$echarts.init(document.getElementById('m'))
-      // this.xc.resize({height: '100%',width: '100%'})
-      this.xc.setOption({
-        title: {
-          text: '用气' + name + '分析图',
-          x: 'left',
-          textStyle: {
-            color: '#000',
-            fontSize: 20
-          }
-        },
-        color: ['#61a0a8', '#2f4554'],
-        tooltip: {
-          trigger: 'axis',
-          extraCssText: 'width: auto;height: auto;'
-        },
-        grid:{
-          top:'20%',
-        },
-        legend: {
-          x: 'left',
-          y: 'bottom',
-          textStyle: {
-            fontSize: 12
-          },
-          data: ['用气量(民用)(m³)', '用气量(非民用)(m³)']
-        },
-        toolbox: {
-          show: true,
-          feature: {
-            mark: {show: true},
-            dataView: {show: true, readOnly: false},
-            magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
-            restore: {show: true},
-            saveAsImage: {show: true}
-          }
-        },
-        calculable: true,
-        xAxis: [
-          { name: '日期',
-            nameTextStyle: {
-              fontSize: 15
-            },
-            type: 'category',
-            data: arrparams
-          }
-        ],
-        yAxis : [
-          {
-            type : 'value',
-            name: '用气量(m³)',
-            nameTextStyle: {
-              fontSize: 15
-            },
-            axisLabel: {
-              show: true,
-              textStyle: {
-                fontSize: 15,
-                color: '#7d8000'
-              }
-            }
-          }
-        ],
-        series : [
-          {
-            name: '用气量(民用)(m³)',
-            type: 'bar',
-            smooth: true,
-            itemStyle: {normal: {areaStyle: {type: 'default'}}},
-            data: gasdata1,
-            markPoint: {
-              data: [
-                {type: 'max', name: '最大值'},
-                {type: 'min', name: '最小值'}
-              ]
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          },
-          {
-            name: '用气量(非民用)(m³)',
-            type: 'bar',
-            smooth: true,
-            itemStyle: {normal: {areaStyle: {type: 'default'}}},
-            data: gasdata2,
-            markPoint: {
-              data: [
-                {type: 'max', name: '最大值'},
-                {type: 'min', name: '最小值'}
-              ]
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            }
-          }
-        ]
-      })
-    },
-    searchdata (condition) {
-      console.log("ec:"+this.echarts)
-      let getGen = getData(this, condition)
-      co(getGen)
-    }
-  },
-  watch: {
-    // 'echarts' (val) {
-    //   this.searchdata(this.condition)
-    // },
-    // 'groupname' (val) {
-    //   this.searchdata(this.condition)
-    // },
-    'startdate' (val) {
-      this.searchdata()
-    },
-    'enddate' (val) {
-      this.searchdata()
-    },
-    'orgid' (val) {
-      this.searchdata()
-    }
-  }
-}
-</script>

package/src/components/webmeter/newwebmeter/NewException/NewHandplanEcharts.vue

@@ -1,213 +0,0 @@
-<template lang="html">
-  <div>
-    <div id="h" :style="{width:'100%',height:'100%'}"></div>
-  </div>
-</template>
-
-<script>
-import * as Util from '../../../../Util'
-import co from 'co'
-import { HttpResetClass } from 'vue-client'
-
-let getData = function * (self) {
-  let load = new HttpResetClass()
-  load.load('POST','rs/sql/webmeter_getNewHandChanceList',
-    {data:{condition: '1 = 1' + (self.orgid != null ? ' and uf.f_orgid in( ' + self.orgid + ')' : ''),
-        startDate: self.startdate + ' 00:00:00',
-        endDate: self.enddate  + ' 23:59:59'}},
-    {resolveMsg: null, rejectMsg: null}).then((res) => {
-    // every_time,f_bv1,f_bv2,f_bv3,f_gas
-    let every_time = []
-    let f_bv1 = []
-    let f_gas = []
-    let f_gas1 = []
-    for (var i = 0; i < res.data.length; i++) {
-      every_time[i] = res.data[i].f_insert_date
-      f_bv1[i] = res.data[i].f_bv1
-      f_gas[i] = res.data[i].f_gas
-      f_gas1[i] = res.data[i].f_gas1
-    }
-    console.log(self.echarts)
-    self.set(every_time, f_bv1, f_gas, f_gas1)
-  })
-}
-export default {
-  props: {
-    echarts: {
-      type: Boolean,
-      default:false
-    },
-    startdate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
-    enddate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
-    orgid:'',
-    condition: {
-      type: String,
-      default: '1=1'
-    }
-  },
-  data () {
-    return {
-      xc: ''
-    }
-  },
-  ready(){
-    console.log(this.echarts)
-    this.searchdata()
-  },
-  methods: {
-    // every_time: 日期  f_bv1: 抄表成功率   f_gas: 日用气量
-    set (every_time,f_bv1,f_gas,f_gas1) {
-
-      this.xc = this.$echarts.init(document.getElementById('h'))
-      this.xc.setOption({
-        title: {
-          text: '抄表率分析',
-          x: 'left',
-          textStyle: {
-            color: '#000',
-            fontSize: 20
-          }
-        },
-        color: ['#61a0a8', '#2f4554'],
-        tooltip: {
-          trigger: 'axis',
-          extraCssText: 'width: auto;height: auto;'
-        },
-        legend: {
-          x: 'left',
-          y: 'bottom',
-          textStyle: {
-            fontSize: 12
-          },
-          data: [ '日均用气量(m³)','抄表成功率%']
-        },
-        toolbox: {
-          show: true,
-          feature: {
-            mark: {show: true},
-            dataView: {show: true, readOnly: false},
-            magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
-            restore: {show: true},
-            saveAsImage: {show: true}
-          }
-        },
-        calculable: true,
-        xAxis: [
-          {
-            type: 'category',
-            data: every_time,
-            axisPointer: {
-              type: 'shadow'
-            },
-            axisLabel: {
-              show: true,
-              textStyle: {
-                color: '#7d8000',
-                fontSize: 10
-              }
-            }
-          }
-        ],
-        yAxis: [
-          {
-            'type': 'value',
-            'name': '用气量(m³)',
-            nameTextStyle: {
-              fontSize: 10
-            },
-            'show': true,
-            'axisLabel': {
-              'show': true,
-              'textStyle': {
-                'color': '#7d8000',
-                fontSize: 10
-              }
-            }
-          },
-          {
-            type: 'value',
-            name: '完成率(%)',
-            nameTextStyle: {
-              fontSize: 10
-            },
-            show: true,
-            axisLabel: {
-              show: true,
-              textStyle: {
-                'color': '#7d838b',
-                fontSize: 10
-              }
-            }
-          }
-        ],
-        grid: {
-          top: '20%'
-        },
-        series: [
-
-          {
-            name: '日均用气量(m³)',
-            nameTextStyle: {
-              fontSize: 10
-            },
-            type: 'bar',
-            data: f_gas1,
-            barWidth: 30,
-            markPoint: {
-              data: [
-                {type: 'max', name: '最大值'},
-                {type: 'min', name: '最小值'}
-              ]
-            },
-            markLine: {
-              data: [
-                {type: 'average', name: '平均值'}
-              ]
-            },
-            itemStyle: {
-              normal: {
-                color: '#7b5541'
-              }
-            },
-            barGap: '0'
-          },
-          {
-            name: '抄表成功率%',
-            type: 'line',
-            yAxisIndex: 1,
-            data: f_bv1,
-            itemStyle: {
-              normal: {
-                color: '#ffaa00',
-                fontSize: 10
-              }
-            },
-            smooth: true
-          }
-        ]
-      })
-    },
-    searchdata () {
-      let getGen = getData(this)
-      co(getGen)
-    }
-  },
-  watch: {
-    'startdate' (val) {
-      this.searchdata()
-    },
-    'enddate' (val) {
-      this.searchdata()
-    },
-    'orgid' (val) {
-      this.searchdata()
-    }
-  }
-}
-</script>