manage-client 3.2.138 → 3.2.142

package/src/components/SellReport/MarketMonthChart.vue

@@ -0,0 +1,162 @@
+
+<template>
+  <div col="col-sm-12">
+    <div class="col-sm-6">
+     <left-chart :param="param" id="leftchart" title="用气量情况"></left-chart>
+    </div>
+    <div class="col-sm-6">
+      <left-chart :param="param1" id="leftchart2" title="用气比例"></left-chart>
+    </div>
+  </div>
+</template>
+
+<script>
+import  {HttpResetClass} from "vue-client";
+export default {
+    props: ['condition'],
+    data() {
+      return {
+        dataLength: 0,
+        xData: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
+        param:[],
+        param1:[],
+        name:[],
+        yData: [],
+        yData2:[],
+      }
+    },
+    methods: {
+     getParams (params) {
+       this.name = []
+       this.yData = []
+       this.yData2 = []
+       let http  = new HttpResetClass()
+       http.load('post','rs/sql/gasbai_body',{data: params}).then((res)=>{
+         console.log(res.data)
+         this.dataLength = res.data.length
+         let sumgas1 = 0
+         let sumgas2 = 0
+         let sumgas3 = 0
+         let sumgas4 = 0
+         let sumgas5 = 0
+         let sumgas6 = 0
+         let sumgas7 = 0
+         let sumgas8 = 0
+         let sumgas9 = 0
+         let sumgas10 = 0
+         let sumgas11 = 0
+         let sumgas12 = 0
+         for (let i = 0; i < res.data.length; i++) {
+           sumgas1 += res.data[i].f_gas1
+           sumgas2 += res.data[i].f_gas2
+           sumgas3 += res.data[i].f_gas3
+           sumgas4 += res.data[i].f_gas4
+           sumgas5 += res.data[i].f_gas5
+           sumgas6 += res.data[i].f_gas6
+           sumgas7 += res.data[i].f_gas7
+           sumgas8 += res.data[i].f_gas8
+           sumgas9 += res.data[i].f_gas9
+           sumgas10 += res.data[i].f_gas10
+           sumgas11 += res.data[i].f_gas11
+           sumgas12 += res.data[i].f_gas12
+         }
+         for (let i = 0; i < res.data.length; i++) {
+           this.name.push(res.data[i].f_gastype)
+           let arr2 = []
+           let arr1 = []
+           arr1.push(res.data[i].f_gas1)
+           arr1.push(res.data[i].f_gas2)
+           arr1.push(res.data[i].f_gas3)
+           arr1.push(res.data[i].f_gas4)
+           arr1.push(res.data[i].f_gas5)
+           arr1.push(res.data[i].f_gas6)
+           arr1.push(res.data[i].f_gas7)
+           arr1.push(res.data[i].f_gas8)
+           arr1.push(res.data[i].f_gas9)
+           arr1.push(res.data[i].f_gas10)
+           arr1.push(res.data[i].f_gas11)
+           arr1.push(res.data[i].f_gas12)
+           if (sumgas1 > 0 ) {
+             arr2.push((res.data[i].f_gas1*100/sumgas1).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas2 > 0 ) {
+             arr2.push((res.data[i].f_gas2*100/sumgas2).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas3 > 0 ) {
+             arr2.push((res.data[i].f_gas3*100/sumgas3).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas4 > 0 ) {
+             arr2.push((res.data[i].f_gas4*100/sumgas4).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas5 > 0 ) {
+             arr2.push((res.data[i].f_gas5*100/sumgas5).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas6 > 0 ) {
+             arr2.push((res.data[i].f_gas6*100/sumgas6).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas7 > 0 ) {
+             arr2.push((res.data[i].f_gas7*100/sumgas7).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas8 > 0 ) {
+             arr2.push((res.data[i].f_gas8*100/sumgas8).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas9 > 0 ) {
+             arr2.push((res.data[i].f_gas9*100/sumgas9).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas10 > 0 ) {
+             arr2.push((res.data[i].f_gas10*100/sumgas10).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas11 > 0 ) {
+             arr2.push((res.data[i].f_gas11*100/sumgas11).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           if (sumgas12 > 0 ) {
+             arr2.push((res.data[i].f_gas12*100/sumgas12).toFixed(2))
+           } else {
+             arr2.push(0)
+           }
+           this.yData.push(arr1)
+           this.yData2.push(arr2)
+         }
+         this.param = {
+           legendData:this.name,
+           xData :this.xData,
+           yData:this.yData,
+         }
+         this.param1 = {
+           legendData:this.name,
+           xData :this.xData,
+           yData:this.yData2,
+         }
+       })
+     }
+    },
+    watch: {
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/SellReport/MarketMonthgas.vue

@@ -0,0 +1,244 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2 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="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div><!--
+            <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" style="width: 60%"></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'
+                          is-mul="false"
+                          @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'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </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>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+            <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
+                  'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="$parent.$parent.f_user_type"
+                        v-model="$parent.$parent.f_user_type"
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <!--<div class="col-sm-2 form-group">-->
+            <!--<label class="font_normal_body">收费状态</label>-->
+            <!--<v-select :value.sync="$parent.$parent.f_state" multiple-->
+            <!--v-model="$parent.$parent.f_state"-->
+            <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
+            <!--condition="f_state in {}"-->
+            <!--close-on-select></v-select>-->
+            <!--</div>-->
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">月度用气性质使用占比报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+        <market-month-chart v-ref:getChart >
+        </market-month-chart>
+      </div>
+    </criteria-paged>
+
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+
+export default {
+  title: '月度用气性质使用占比报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      condition:null,
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_user_type: '',
+      f_state:['有效'],
+      model: new DataModel('rs/report/applygasfillgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    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'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      console.log('23231312321:',this.f_user_type)
+      if(this.f_user_type && this.f_user_type[0]) {
+        orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
+      }
+      /*        if (this.f_orgid && this.f_orgid[0]) {
+                orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+              }
+              if (this.f_depid && this.f_depid[0]) {
+                orgcondition += ' and f_depid in (' + this.f_depid + ')'
+              }
+              if(this.f_operatorid && this.f_operatorid[0]) {
+                orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+              }*/
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.condition =  this.$refs.paged.model.params
+      this.$refs.paged.search(args)
+      console.log(this.$refs.paged)
+      this.$refs.paged.$refs.getchart.getParams(this.$refs.paged.model.params)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    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: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/WebReport/EchartsBox.vue

@@ -32,10 +32,11 @@
                       @res-select="getRes"
                       :initresid="model.id">
           </res-select>
+          <button class="button_search button_spacing" @click="changePage()">下一页</button>
         </div>
       </div>
     </div>
-    <div style="height: 97%;">
+    <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[0]'
@@ -49,8 +50,9 @@
       <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[0]' v-ref:pay ></paymentpie>
+          <div style="flex: 1;">
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        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>-->
@@ -58,7 +60,15 @@
         </div>
 
         <div style="flex: 1;width: 50%">
-          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                          v-ref:pay></bussiness-type>
+        </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[0]'></gas-properties-manager>
         </div>
       </div>
     </div>
@@ -67,43 +77,53 @@
 </template>
 
 <script>
-  import * as Util from '../../Util'
+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%'
+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()
     },
-    data() {
-      return {
-        jurisdiction: this.$login.r,
-        model: {
-          id: [this.$login.f.orgid],
-          orgid: [this.$login.f.orgid],
-          startDate: Util.toStandardDateString(),
-          endDate: Util.toStandardDateString()
-        }
+    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]
       }
     },
-    methods: {
-      searchdata() {
-        this.$refs.pay.searchdata()
-      },
-      getRes(obj) {
-        this.model.orgid = obj
-      },
+    getRes (obj) {
+      this.model.orgid = obj
     }
   }
+}
 </script>
 
 <style lang="css">

package/src/components/daping/DataManagement.vue

@@ -6,7 +6,7 @@
         <div class="flex">
           <div class="flex" >
             <div class="flex-row" style="height: 40%;margin-top: 2%;">
-              <div  class="auto col-sm-12" style="width: 40%;height: 100%;padding: 1em" >
+              <div  class="auto col-sm-12" style="width: 60%;height: 100%;padding: 1em" >
                 <div class=" col-sm-12 auto" style="padding-left: 1em">
                   <span class="font-title">安检</span>
                 </div>
@@ -24,9 +24,9 @@
                   <span class="normal-font" >计划安检量</span>
                 </div>
               </div>
-              <div style="width: 60%">
-                <ring-safecheck-wh></ring-safecheck-wh>
-              </div>
+              <!--<div style="width: 60%">-->
+                <!--<ring-safecheck-wh></ring-safecheck-wh>-->
+              <!--</div>-->
             </div>
             <div  style="height: 58%">
               <safe-check-wh></safe-check-wh>

package/src/components/daping/json/dataManage.json

@@ -1,14 +1,18 @@
 {
 "checkData":{
-  "wrhsum":2458,
+  "wrhsum":1021,
   "jhsum":81300
 },
-  "checkByMonth":[{"sucnum":8359,"time":"2021-11","allnum":8359},
-    {"sucnum":2114,"time":"2021-12","allnum":2114},
-    {"sucnum":5528,"time":"2022-01","allnum":5528},
-    {"sucnum":6921,"time":"2022-02","allnum":6921},
-    {"sucnum":3820,"time":"2022-03","allnum":3820}
- ],
+  "checkByMonth":[
+    {"sucnum":8359,"time":"2021-10","allnum":8500},
+    {"sucnum":8359,"time":"2021-11","allnum":8400},
+    {"sucnum":2114,"time":"2021-12","allnum":2200},
+    {"sucnum":5500,"time":"2022-01","allnum":5528},
+    {"sucnum":6921,"time":"2022-02","allnum":7000},
+    {"sucnum":3820,"time":"2022-03","allnum":4000},
+    {"sucnum":8617,"time":"2022-04","allnum":9000},
+    {"sucnum":9388,"time":"2022-05","allnum":9500}
+  ],
   "callData":{
     "yearamount":12101,
     "sumsend":2453,

package/src/components/qinhua/Pie.vue

@@ -24,9 +24,10 @@
           // color: color,
           backgroundColor: '#ffffff00',
           legend: {
+            // show: false,
             orient: 'horizontal',
             x: 'center',
-            y: 'top',
+            y: 'bottom',
             icon: 'circle',
             data: title,
             itemWidth: 10,
@@ -48,23 +49,32 @@
             // }],
             labelLine: {
               normal: {
-                length: '5%'
+                length: 10
               }
             },
             label: {
               show: true,
-              formatter: '{b|{b}}\n{per|{d}%}',
+              formatter: '{b|{b}}{per|{d}%}',
               rich: {
+                a: {
+                  color: '#999',
+                  lineHeight: 16,
+                  align: 'center'
+                },
+                hr: {
+                  borderColor: '#aaa',
+                  width: '100%',
+                  borderWidth: 1,
+                  height: 0
+                },
                 b: {
                   fontSize: 10,
                   padding: [5, 0],
                   color: '#fff'
                 },
-                hr: {
-                  height: 0,
-                  borderWidth: 1,
-                  width: '100%',
-                  borderColor: '#fff'
+                c: {
+                  fontSize: 10,
+                  color: '#eee'
                 },
                 per: {
                   color: '#FDF44E',