manage-client 4.0.37 → 4.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.37",
+    "version": "4.0.38",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/SellReport/SellingTable.vue

@@ -26,7 +26,27 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-          <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:res_select></res-select-group>
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+            <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+          </div>
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+            <res-select restype='department'
+                        @res-select="$parent.$parent.getdep"
+                        :parentresid  ="$parent.$parent.depresid"
+                        :initresid='$parent.$parent.depid'>
+            </res-select>
+
+          </div>
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+            <res-select restype='user'
+                        @res-select="$parent.$parent.getuser"
+                        :parentresid="$parent.$parent.userresid"
+                        :initresid='$parent.$parent.operatorid'>
+            </res-select>
+          </div>
         </div>
           <div class="span" style = "float:right;">
             <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
@@ -143,7 +163,7 @@
       }
     },
     ready () {
-      this.$refs.paged.$refs.criteria.$refs.res_select.sliceareashow = false
+      // this.$refs.paged.$refs.criteria.$refs.res_select.sliceareashow = false
       this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
       // this.$refs.paged.$refs.criteria.search()
@@ -155,10 +175,16 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        console.log('xxxxxxxxxxx',this.orgCondtionStr)
+        console.log('xxxxxxxxxxx', this.orgCondtionStr)
         let orgstr = '1=1 '
-        if(this.orgCondtionStr){
-          orgstr+=this.orgCondtionStr
+        if (this.f_orgid[0]) {
+          orgstr += `  and  f_orgid in ('${this.f_orgid}')`
+        }
+        if (this.f_depid[0]) {
+          orgstr += `  and  f_depid in ('${this.f_depid}')`
+        }
+        if (this.f_operatorid[0]) {
+          orgstr += `  and  f_operatorid in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
         this.$refs.paged.search(args)
@@ -185,19 +211,19 @@
         this.show = true
         this.filename = this.data.f_report_name + this.$login.toStandardDateString()
       },
-      async getRes (condition, obj) {
-        this.orgCondtionStr = condition
-        if(obj.orgnames.length>0){
-          this.orgname = obj.orgnames[0];
-        }
-        if(obj.operatornames.length>0){
-          let users = await this.$resetpost('api/af-revenue/sql/manageSingleTable',
-            {data: {tablename: 't_user', condition: ` id = '${obj.operatornames[0]}'`}},
-            {resolveMsg: null, rejectMsg: null});
-          if(users.data){
-            this.operatorname = users.data[0].name;
-          }
-        }
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+      },
+      getdep (obj, val) {
+        this.depname = val[0]
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser (obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
       }
     },
     watch: {

package/src/components/sale/businessquery/chargeRecordMaintenanceQuery.vue

@@ -22,7 +22,7 @@
                               v-model="model.endDate"
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
-                              condition="modifitime <= '{} 23:59: 59'"
+                              condition="modifitime <= '{} 23:59:59'"
                               :show-reset-button="true">
                   </datepicker>
                 </div>
@@ -260,8 +260,6 @@ export default {
       } else {
         args.condition = `${args.condition}` + this.orgConditionStr
       }
-      this.$refs.paged.$refs.cri.model.startDate = this.startDate
-      this.$refs.paged.$refs.cri.model.endDate = this.endDate
       this.condition = args.condition
       console.log("查看条件", this.condition)
       await this.model.search(args.condition, args.model)

package/src/filiale/fugou/UserGasEcharts.vue

@@ -0,0 +1,220 @@
+<template lang="html">
+  <div class="basic-main" style="height: 100%;">
+  <div class="row" style="height: 15%;width: 100%;" v-show="echarts">
+    <div class="col-sm-2" style="display: inline-block;">
+      <button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
+    </div>
+    <!--图显示模板-->
+    <div class="row col-sm-3 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 style="height: 80%;width: 98%;">
+    <div id="info"></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', 'api/af-revenue/sql/webmeter_getUserGasGroup',
+      {data: {condition: condition, groupname: self.groupname[0], startDate: self.startdate,
+          endDate: self.enddate}},
+      {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'
+      },
+      groupname: {
+        type: String,
+        default: 'year'
+      }
+    },
+    data () {
+      title: '业务类型'
+      return {
+        xc: ''
+      }
+    },
+    ready(){
+      console.log(this.echarts)
+    },
+    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 = '日'
+        }
+        const statInfo = document.getElementById('info') // 获取图表元素
+        statInfo.style.width = window.innerWidth - 200 + "px";  //初始化echarts图表宽度
+        statInfo.style.height = window.innerHeight - 200 + "px";  //初始化echarts图表宽度
+        this.xc = this.$echarts.init(statInfo)
+        // 设置宽度自适应
+        window.addEventListener('resize', () => {
+          statInfo.style.width = window.innerWidth - 200 + "px";
+          statInfo.style.height = window.innerHeight - 200 + "px";
+          this.xc.resize();
+        })
+        // this.xc.resize({height: '100%',width: '100%'})
+        this.xc.setOption({
+          title: {
+            text: '用气' + name + '分析图',
+            left: 'center',
+            y: '10',
+            textStyle: {
+              color: '#000',
+              fontSize: 20
+            }
+          },
+          color: ['#61a0a8', '#2f4554'],
+          tooltip: {
+            trigger: 'axis',
+            extraCssText: 'width: auto;height: auto;'
+          },
+          grid:{
+            top:'20%',
+          },
+          legend: {
+            y: '50',
+            data: ['用气量(民用)(m³)', '用气量(非民用)(m³)']
+          },
+          toolbox: {
+            y: '50',
+            show: true,
+            right:'2%',
+            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)
+      }
+    }
+  }
+</script>