manage-client 3.1.23 → 3.1.27

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -6,13 +6,7 @@
           <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
             <div class="row">
               <div class="col-sm-2">
-                <label class="font_normal_body">组织机构</label>
-                <res-select :initresid="$parent.$parent.org"
-                            style="width:60%"
-                            @res-select="$parent.$parent.getorg"
-                            restype='organization'>
-                </res-select>
-
+                <res-select-group :show-component="['company']" :initres="$parent.$parent.org" @re-res="$parent.$parent.getorg" style="width:60%"></res-select-group>
               </div>
               <div class="col-sm-2 form-group ">
                 <label class="font_normal_body">客户编号</label>
@@ -274,7 +268,11 @@
         userType:[],
         instructtype:[],
         instructstate:[],
-        org:[this.$login.f.orgid],
+        org:{
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
         orgcondition:' and f_filialeid = ' + this.$login.f.orgid,
         show: false,
         condition:'',
@@ -293,19 +291,18 @@
       readyGen(this)
       this.$refs.paged.$refs.criteria.model.f_start_date = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.f_end_date = Util.toStandardDateString() + ' 23:59:59'
-      this.$refs.paged.$refs.criteria.search()
+      //this.$refs.paged.$refs.criteria.search()
     },
     methods: {
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },
       getorg(obj) {
-        if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
-          this.orgcondition = " and f_filialeid in " + plugins.convertToIn(obj)
+        if(obj){
+          this.orgcondition = obj.replace('f_orgid', 'f_filialeid')
         }else{
           this.orgcondition = " and f_filialeid = " + this.$login.f.orgid
         }
-
       },
       initQueryParam () {
         let arr = []

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

@@ -0,0 +1,170 @@
+<template lang="html">
+  <div>
+    <div id="mk" :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) {
+    let load = new HttpResetClass()
+    load.load('POST', 'rs/sql/webmeter_getNewLoseGroupList',
+      {data:{condition: '1 = 1' + (self.orgid != null ? ' and f_orgid in( ' + self.orgid + ')' : ''),
+          groupname: 'max_days_type',
+          startDate: self.startdate + ' 00:00:00',
+          endDate: self.enddate  + ' 23:59:59'}},
+      {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'
+      },
+      orgid: '',
+      groupname: {
+        type: String,
+        default: 'max_days_type'
+      }
+    },
+    data () {
+      return {
+        xc: ''
+      }
+    },
+    ready () {
+      this.searchdata()
+    },
+    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('mk'))
+        console.log('-----55555------', this.xc)
+        let option = {
+          title: {
+            text: '表具失联(' + Name + ')分析',
+            x: 'left',
+            textStyle: {
+              color: '#000',
+              fontSize: 20
+            }
+          },
+          tooltip: {
+            trigger: 'axis',
+            extraCssText: 'width: auto;height: auto;'
+          },
+          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: {
+      'startdate' (val) {
+        this.searchdata()
+      },
+      'enddate' (val) {
+        this.searchdata()
+      },
+      'orgid' (val) {
+        this.searchdata()
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,111 @@
+<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.toStandardDateString(),
+          endDate: Util.toStandardDateString()
+        }
+      }
+    },
+    methods: {
+      searchdata() {
+        this.$refs.pay.searchdata()
+      },
+      getRes(obj) {
+        this.model.orgid = obj
+      },
+    }
+  }
+</script>
+
+<style lang="css">
+</style>