manage-client 4.0.47 → 4.0.48

package/package.json

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

package/src/filiale/jiaxian/DayReportList.vue

@@ -56,7 +56,7 @@
                         v-model="model.f_residential_area"
                         :value-single="true"
                         :options='$parent.$parent.areaslist' placeholder='请选择'
-                        condition1="f_residential_area = '{}'"
+                        condition1="ss.f_residential_area = '{}'"
                         close-on-select search="true"></v-select>
             </div>
 
@@ -377,10 +377,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
 
         console.log("========")
         console.log(this.$refs.paged.$refs.cri.model.f_residential_area)
-        if(this.$refs.paged.$refs.cri.model.f_residential_area != '' && this.$refs.paged.$refs.cri.model.f_zones != ''){
-          this.$refs.paged.model.params.condition1 = `f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}' and f_zones = '${this.$refs.paged.$refs.cri.model.f_zones}'`
+        if(this.$refs.paged.$refs.cri.model.f_residential_area != '' && this.$refs.paged.$refs.cri.model.f_zones != undefined && this.$refs.paged.$refs.cri.model.f_residential_area != undefined &&  this.$refs.paged.$refs.cri.model.f_zones != ''){
+          this.$refs.paged.model.params.condition1 = `ss.f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}' and f_zones = '${this.$refs.paged.$refs.cri.model.f_zones}'`
         }else if (this.$refs.paged.$refs.cri.model.f_residential_area != ''){
-          this.$refs.paged.model.params.condition1 = `f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}'`
+          this.$refs.paged.model.params.condition1 = `ss.f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}'`
         }else if (this.$refs.paged.$refs.cri.model.f_zones != '') {
           this.$refs.paged.model.params.condition1 = `f_zones = '${this.$refs.paged.$refs.cri.model.f_zones}'`
         }else {

package/src/filiale/xinjiangdexin/EchartsBox.vue

@@ -0,0 +1,143 @@
+<template lang="html">
+  <div :class="classname" v-if="jurisdiction.includes('首页')" :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>
+          <button class="button_search button_spacing" @click="changePage()">下一页</button>
+        </div>
+      </div>
+    </div>
+    <div style="height: 97%;" v-if="showPage === 1">
+      <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%">
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
+                        v-ref:pay></site-manager>
+<!--        <test></test>-->
+        </div>
+        <div style="flex: 1;width: 50%">
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
+                        v-ref:pay></bank-manager>
+        </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;">
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'
+                        v-ref:pay></paymentpie>
+          </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%">
+<!--          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'-->
+<!--                          v-ref:pay></bussiness-type>-->
+          <user-gas-echarts-list-index :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid' v-ref:pay></user-gas-echarts-list-index>
+
+        </div>
+      </div>
+    </div>
+    <div style="height: 97%;" v-if="showPage === 2">
+      <div class="flex-row" style="flex: 1;height: 96%">
+        <div style="flex: 1">
+          <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid'></gas-properties-manager>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import * as Util from '../../Util'
+
+export default {
+  props: {
+    classname: {
+      type: String,
+      default: 'basic-main'
+    },
+    width: {
+      type: String,
+      default: '98.5%'
+    },
+    height: {
+      type: String,
+      default: '98%'
+    }
+  },
+  data () {
+    return {
+      showPage: 1,
+      page: [1, 2],
+      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()
+    },
+    changePage () {
+      let curPage = this.page.indexOf(this.showPage)
+      if (curPage + 1 === this.page.length) {
+        this.showPage = this.page[0]
+      } else {
+        this.showPage = this.page[curPage + 1]
+      }
+    },
+    getRes (obj) {
+      console.log('obj--------',obj)
+      let stringValue = ''
+      for (var i = 0; i < obj.length; i++) {
+        if (i === obj.length - 1) {
+          stringValue = stringValue + "'" + obj[i] + "'"
+        } else {
+          stringValue = stringValue + "'" + obj[i] + "',"
+        }
+      }
+      console.log('stringValue--------',stringValue)
+      this.model.orgid = stringValue
+    }
+  }
+}
+</script>
+
+<style lang="css">
+</style>

package/src/filiale/xinjiangdexin/UserGasAll.vue

@@ -42,7 +42,7 @@
                     <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
                     <export-excel :data="$parent.$parent.getCondition()"
                                   :field="$parent.$parent.getfield"
-                                  sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getUserGasList" template-name='未用气分析'
+                                  sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newGasRecordQuery" template-name='未用气分析'
                                   v-ref:exports
                                   :choose-col="true"></export-excel>
                     <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()" >显示汇总</button>

package/src/filiale/xinjiangdexin/UserGasEchartsListIndex.vue

@@ -0,0 +1,279 @@
+<template lang="html">
+    <div id="charts">
+      <div id="userhandplan" :style="{width:'100%',height:'98%'}"></div>
+    </div>
+</template>
+
+<script>
+import * as Util from '../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import { HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST', 'api/af-revenue/sql/webmeter_getNewHandChanceList', {data: {condition: self.condition, startDate: self.startdate, endDate: self.enddate}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    // eslint-disable-next-line camelcase
+    let every_time = res.data.map(x => x.f_insert_date)
+    // eslint-disable-next-line camelcase
+    let f_bv1 = res.data.map(x => x.f_bv1)
+    // eslint-disable-next-line camelcase
+    let f_gas1 = res.data.map(x => x.f_gas1)
+    let c = res.data.map(x => x.c)
+    let c1 = res.data.map(x => x.c1)
+    console.log(self.echarts)
+    self.set(every_time, f_bv1, f_gas1, c, c1)
+  })
+}
+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'
+    }
+  },
+  data () {
+    return {
+      xc: ''
+    }
+  },
+  ready () {
+    this.searchdata()
+    console.log(this.echarts)
+  },
+  methods: {
+    // every_time: 日期  f_bv1: 抄表成功率   f_gas: 日用气量
+    // eslint-disable-next-line camelcase
+    set (every_time, f_bv1, f_gas1, c, c1) {
+      const statInfo = document.getElementById('userhandplan') // 获取图表元素
+      // 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.setOption({
+        'title': {
+          'text': '抄表率分析',
+          'left': 'center',
+          'y': '10',
+          'textStyle': {
+            'color': '#696969',
+            fontSize: 20
+          }
+        },
+
+        'tooltip': {
+          'trigger': 'axis',
+          'extraCssText': 'height: auto;'
+        },
+        'legend': {
+          'data': [
+            {
+              'name': '日均用气量(m³)',
+              'icon': 'circle',
+              'textStyle': {
+                'color': '#7b5541',
+                fontSize: 12
+              }
+            },
+            {
+              'name': '抄表成功户数',
+              'icon': 'circle',
+              'textStyle': {
+                'color': '#45c1b6',
+                fontSize: 12
+              }
+            },
+            {
+              'name': '再用户数',
+              'icon': 'circle',
+              'textStyle': {
+                'color': '#8a9e64',
+                fontSize: 12
+              }
+            },
+            {
+              'name': '抄表成功率%',
+              'icon': 'circle',
+              'textStyle': {
+                'color': '#ffaa00',
+                fontSize: 12
+              }
+            }
+          ],
+          'top': '10%',
+          'textStyle': {
+            'color': '#fff'
+          }
+        },
+        'xAxis': [
+          {
+            'type': 'category',
+            'data': every_time,
+            'axisPointer': {
+              'type': 'shadow'
+            },
+            'axisLabel': {
+              'show': true,
+              'textStyle': {
+                'color': '#7d838b',
+                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': '15%'
+        },
+        'series': [
+          {
+            'name': '日均用气量(m³)',
+            'type': 'line',
+            'yAxisIndex': 1,
+            'data': f_gas1,
+            'itemStyle': {
+              'normal': {
+                'color': '#7b5541',
+                fontSize: 10
+              }
+            },
+            'smooth': true
+          },
+          {
+            'name': '抄表成功户数',
+            nameTextStyle: {
+              fontSize: 10
+            },
+            'type': 'bar',
+            'data': c1,
+            'barWidth': 'auto',
+            markPoint: {
+              data: [
+                {type: 'max', name: '最大值'},
+                {type: 'min', name: '最小值'}
+              ]
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            },
+            'itemStyle': {
+              'normal': {
+                'color': '#45c1b6'
+              }
+            },
+            'barGap': '0'
+          },
+          {
+            'name': '再用户数',
+            nameTextStyle: {
+              fontSize: 10
+            },
+            'type': 'bar',
+            'data': c,
+            'barWidth': 'auto',
+            markPoint: {
+              data: [
+                {type: 'max', name: '最大值'},
+                {type: 'min', name: '最小值'}
+              ]
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            },
+            'itemStyle': {
+              'normal': {
+                'color': '#8a9e64'
+              }
+            },
+            '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: {
+    'echarts' () {
+      console.log(this.echarts)
+      this.searchdata()
+    },
+    'startdate' (val) {
+      this.searchdata()
+    },
+    'enddate' (val) {
+      this.searchdata()
+    },
+    'orgid' (val) {
+      this.searchdata()
+    }
+  }
+}
+</script>

package/src/filiale/xinjiangdexin/reportManage.js

@@ -0,0 +1,12 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 气价分组汇总表
+  Vue.component('user-gas-echarts-list-index', (resolve) => {
+    require(['./UserGasEchartsListIndex'], resolve)
+  })
+  Vue.component('echarts-box', (resolve) => {
+    require(['./EchartsBox'], resolve)
+  })
+}