manage-client 3.2.22 → 3.2.26

package/src/components/webmeter/DrillData/LostContactEcharts.vue

@@ -1,177 +1,177 @@
-<template lang="html">
-  <div class="basic-main">
-    <div style="height: 40px;width: 100%;" v-show="echarts">
-      <div style="display: inline-block;">
-        <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
-      </div>
-      <!--图显示模板-->
-      <div class="mystyle" style="display: inline-block;">
-        <label class="font_normal_body">图表统计项</label>
-        <v-select :options='$parent.getgroupname' :value.sync="groupname"
-                  close-on-select
-                  id="groupname"
-                  placeholder='分组项'
-                  v-model="groupname"
-                  value-single="true"></v-select>
-      </div>
-    </div>
-    <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
-      <div id="infoss" style=" height: 600px;width: 800px;padding: 1% 1%;min-width:98%;min-height: 98%"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import * as Util from '../../../Util'
-  import co from 'co'
-  import { HttpResetClass } from 'vue-client'
-
-  let getData = function * (self, condition) {
-    let load = new HttpResetClass()
-    load.load('POST', 'rs/sql/webmeter_getNewLoseGroupList',
-      {data:{condition: condition, groupname: self.groupname[0], startDate: self.startdate ? self.startdate:Util.toStandardDateString(),
-          endDate: self.enddate ? self.enddate:Util.toStandardDateString()}},
-      {resolveMsg: null, rejectMsg: null})
-      .then((res) => {
-        let name = []
-        let value = []
-        for (let i = 0; i < res.data.length; i++) {
-          name[i] = res.data[i].res
-          value[i] = res.data[i].value
-        }
-        console.log(name)
-        console.log(value)
-        self.set(name,value)
-      })
-  }
-  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'
-      },
-      groupname: {
-        type: String,
-        default: 'max_days_type'
-      }
-    },
-    data () {
-      return {
-        xc: ''
-      }
-    },
-    methods: {
-      set (key, value) {
-        let Name = ''
-        if (this.groupname[0] === 'f_user_type')
-        {
-          Name = '用户类型'
-        } else if (this.groupname[0] === 'f_gasproperties') {
-          Name = '用气性质'
-        }  else if (this.groupname[0] === 'f_orgname') {
-          Name = '分公司'
-        } else if (this.groupname[0] === 'max_days_type') {
-          Name = '最长失联天数'
-        } else if (this.groupname[0] === 'all_days_type') {
-          Name = '合计失联天数'
-        } else {
-          Name = '合计'
-        }
-        this.xc = this.$echarts.init(document.getElementById('infoss'))
-        console.log('-----55555------', this.xc)
-        let option = {
-          title: {
-            text: '表具失联(' + Name + ')分析',
-            left: 'center',
-            textStyle: {
-              color: '#000',
-              fontSize: 15
-            }
-          },
-          tooltip: {
-            trigger: 'axis'
-          },
-          toolbox: {
-            show: true,
-            feature: {
-              dataView: {show: true, readOnly: false},
-              magicType: {show: true, type: ['line', 'bar']},
-              restore: {show: true},
-              saveAsImage: {show: true}
-            }
-          },
-          calculable: true,
-          xAxis: [
-            {
-              name: '分组项',
-              nameTextStyle: {
-                fontSize: 15
-              },
-              type: 'category',
-              data: key,
-              axisLabel: {
-                show: true,
-                textStyle: {
-                  fontSize: 15
-                }
-              }
-            }
-          ],
-          yAxis: [
-            {
-              name: '用户数(户)',
-              nameTextStyle: {
-                fontSize: 15
-              },
-              type: 'value'
-            }
-          ],
-          series: [
-            {
-              name: '用户数',
-              type: 'bar',
-              data: value,
-              markPoint: {
-                data: [
-                  {type: 'max', name: '最大值'},
-                  {type: 'min', name: '最小值'}
-                ]
-              },
-              markLine: {
-                data: [
-                  {type: 'average', name: '平均值'}
-                ]
-              }
-            }
-          ]
-        }
-        this.xc.setOption(option)
-        console.log("------------->>>>>>>>",document.getElementById('infoss'))
-      },
-      searchdata (condition) {
-        let getGen = getData(this, condition)
-        co(getGen)
-      }
-    },
-    watch: {
-      'echarts' (val) {
-        this.searchdata(this.condition)
-      },
-      'groupname' (val) {
-        this.searchdata(this.condition)
-      }
-    }
-  }
-</script>
+<template lang="html">
+  <div class="basic-main">
+    <div style="height: 40px;width: 100%;" v-show="echarts">
+      <div style="display: inline-block;">
+        <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
+      </div>
+      <!--图显示模板-->
+      <div class="mystyle" style="display: inline-block;">
+        <label class="font_normal_body">图表统计项</label>
+        <v-select :options='$parent.getgroupname' :value.sync="groupname"
+                  close-on-select
+                  id="groupname"
+                  placeholder='分组项'
+                  v-model="groupname"
+                  value-single="true"></v-select>
+      </div>
+    </div>
+    <div id="charts" style=" height: 98%;width: 98%;padding: 1% 1%;">
+      <div id="infoss" style=" height: 600px;width: 800px;padding: 1% 1%;min-width:98%;min-height: 98%"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as Util from '../../../Util'
+  import co from 'co'
+  import { HttpResetClass } from 'vue-client'
+
+  let getData = function * (self, condition) {
+    let load = new HttpResetClass()
+    load.load('POST', 'rs/sql/webmeter_getNewLoseGroupList',
+      {data:{condition: condition, groupname: self.groupname[0], startDate: self.startdate ? self.startdate:Util.toStandardDateString(),
+          endDate: self.enddate ? self.enddate:Util.toStandardDateString()}},
+      {resolveMsg: null, rejectMsg: null})
+      .then((res) => {
+        let name = []
+        let value = []
+        for (let i = 0; i < res.data.length; i++) {
+          name[i] = res.data[i].res
+          value[i] = res.data[i].value
+        }
+        console.log(name)
+        console.log(value)
+        self.set(name,value)
+      })
+  }
+  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'
+      },
+      groupname: {
+        type: String,
+        default: 'max_days_type'
+      }
+    },
+    data () {
+      return {
+        xc: ''
+      }
+    },
+    methods: {
+      set (key, value) {
+        let Name = ''
+        if (this.groupname[0] === 'f_user_type')
+        {
+          Name = '用户类型'
+        } else if (this.groupname[0] === 'f_gasproperties') {
+          Name = '用气性质'
+        }  else if (this.groupname[0] === 'f_orgname') {
+          Name = '分公司'
+        } else if (this.groupname[0] === 'max_days_type') {
+          Name = '最长失联天数'
+        } else if (this.groupname[0] === 'all_days_type') {
+          Name = '合计失联天数'
+        } else {
+          Name = '合计'
+        }
+        this.xc = this.$echarts.init(document.getElementById('infoss'))
+        console.log('-----55555------', this.xc)
+        let option = {
+          title: {
+            text: '表具失联(' + Name + ')分析',
+            left: 'center',
+            textStyle: {
+              color: '#000',
+              fontSize: 15
+            }
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+          toolbox: {
+            show: true,
+            feature: {
+              dataView: {show: true, readOnly: false},
+              magicType: {show: true, type: ['line', 'bar']},
+              restore: {show: true},
+              saveAsImage: {show: true}
+            }
+          },
+          calculable: true,
+          xAxis: [
+            {
+              name: '分组项',
+              nameTextStyle: {
+                fontSize: 15
+              },
+              type: 'category',
+              data: key,
+              axisLabel: {
+                show: true,
+                textStyle: {
+                  fontSize: 15
+                }
+              }
+            }
+          ],
+          yAxis: [
+            {
+              name: '用户数(户)',
+              nameTextStyle: {
+                fontSize: 15
+              },
+              type: 'value'
+            }
+          ],
+          series: [
+            {
+              name: '用户数',
+              type: 'bar',
+              data: value,
+              markPoint: {
+                data: [
+                  {type: 'max', name: '最大值'},
+                  {type: 'min', name: '最小值'}
+                ]
+              },
+              markLine: {
+                data: [
+                  {type: 'average', name: '平均值'}
+                ]
+              }
+            }
+          ]
+        }
+        this.xc.setOption(option)
+        console.log("------------->>>>>>>>",document.getElementById('infoss'))
+      },
+      searchdata (condition) {
+        let getGen = getData(this, condition)
+        co(getGen)
+      }
+    },
+    watch: {
+      'echarts' (val) {
+        this.searchdata(this.condition)
+      },
+      'groupname' (val) {
+        this.searchdata(this.condition)
+      }
+    }
+  }
+</script>

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -70,11 +70,12 @@
                             v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
                     >
                   </div>
-                  <div class="col-sm-2">
-                    <label class="font_normal_body">公&emsp;&emsp;司</label>
-                    <right-tree @re-res="$parent.$parent.getorg"
-                                :initresid='$parent.$parent.orgid'></right-tree>
-                  </div>
+<!--                  <div class="col-sm-2">-->
+<!--                    <label class="font_normal_body">公&emsp;&emsp;司</label>-->
+<!--                    <right-tree @re-res="$parent.$parent.getorg"-->
+<!--                                :initresid='$parent.$parent.orgid'></right-tree>-->
+<!--                  </div>-->
+                  <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
 <!--                  <div class="col-sm-2 form-group">-->
 <!--                    <label class="font_normal_body">组织机构</label>-->
 <!--                    <res-select :initresid="$parent.$parent.orgid"-->
@@ -360,6 +361,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
     components: {UserGasEcharts},
     data() {
       return {
+        resshow:['company','slicearea'],
         model: new PagedList('rs/sql/webmeter_getUserGasList', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
           f_oughtamount: 0,
           f_oughtfee: 0,
@@ -423,7 +425,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
         orgid:[this.$login.f.orgid],
-        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
+        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
+        zonesdata:''
       }
     },
     ready() {
@@ -495,6 +498,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+        if(this.zonesdata){
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
+        }
         args.condition = this.condition
         this.model.search(args.condition, args.model)
       },
@@ -522,6 +528,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
       getRes(obj) {
         this.orgCondtionStr = plugins.convertToIn(obj)
+        if(obj.indexOf("f_zones = ")>0){
+          this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
+        }else{
+          this.zonesdata='';
+        }
       },
       getorg(obj) {
         this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'