manage-client 3.2.5 → 3.2.7-aode

package/src/components/ManageHomeCS/Drill/DrillData.vue

@@ -1,39 +1,22 @@
 <template>
   <div>
     <div class="datestyle">
-      <label for="startDate" v-if="searchs!=='longnotbuygas'&&searchs!=='longnotusegas'&&searchs!=='lossassociation'">开始日期:</label>
+      <label for="startDate">开始日期:</label>
       <datepicker id="startDate" placeholder="开始日期" class="childrendatestyle"
-                  v-if="searchs!=='longnotbuygas'&&searchs!=='longnotusegas'&&searchs!=='lossassociation'"
                   v-model="model.startDate"
                   :value.sync="model.startDate"
                   :disabled-days-of-Week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-reset-button="reset">
       </datepicker>
-      <label for="endDate"  v-if="searchs!=='longnotbuygas'&&searchs!=='longnotusegas'&&searchs!=='lossassociation'">结束日期:</label>
+      <label for="endDate">结束日期:</label>
       <datepicker id="endDate" placeholder="结束日期" class="childrendatestyle"
-                  v-if="searchs!=='longnotbuygas'&&searchs!=='longnotusegas'&&searchs!=='lossassociation'"
                   v-model="model.endDate"
                   :value.sync="model.endDate"
                   :disabled-days-of-Week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-reset-button="reset">
       </datepicker>
-      <div class="childrendatestyle datepicker " v-if="searchs==='longnotbuygas'">
-        <input type="text" style="width:30%" class="childrendatestyle1" v-model="days1">
-        <label>< 未购气天数 <=</label>
-        <input type="text" style="width:30%" class="childrendatestyle1" v-model="days2">
-      </div>
-      <div class="childrendatestyle datepicker " v-if="searchs==='lossassociation'">
-        <input type="text" style="width:30%" class="childrendatestyle1" v-model="days1">
-        <label>< 失联天数<= </label>
-        <input type="text" style="width:30%" class="childrendatestyle1" v-model="days2">
-      </div>
-      <div class="childrendatestyle datepicker " v-if="searchs==='longnotusegas'">
-        <input type="text" style="width:30%" class="childrendatestyle1" v-model="days1">
-        <label>< 未使用天数<=</label>
-        <input type="text" style="width:30%" class="childrendatestyle1" v-model="days2">
-      </div>
       <!--<label class="control-label">组织机构</label>-->
       <!--<right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes" id="childrenorgstyle"></right-tree>-->
     </div>
@@ -112,8 +95,6 @@
     },
     data() {
       return {
-        days1:0,
-        days2:'',
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
         datapool: [],    //汇总数据
@@ -155,7 +136,6 @@
         xname: '',       //柱状图x名称
         seriename: '',    //seriename名称
         namesubif: false,
-        searchs:''
       }
 
     },
@@ -192,7 +172,6 @@
       },
       //钻取按键响应事件
       listenToChild1() {
-        console.log('进入钻取----------------------------------------------------------------------')
         // 获取下拉列表zhi
         var texttile = this.$refs.selected.selectedItems
         var texttile1 = this.$refs.selected1.selectedItems
@@ -209,19 +188,13 @@
 
         console.log(this.datedefault,'时间判断')
         // 填充默认时间
-        console.log('---------------钻取时间前---------------------------')
-        console.log(this.model.startDate)
-        console.log(this.model.endDate)
         if (this.datedefault == true) {
-          Drillsql.startDate = eval(Util.toStandardDateString().toString().substring(0, 4) + '-50') + '-01-01'
-          Drillsql.endDate = this.model.endDate
+            Drillsql.startDate = eval(Util.toStandardDateString().toString().substring(0, 4) + '-50') + '-01-01 00:00:00'
+            Drillsql.endDate = this.model.endDate + ' 00:00:00'
         } else {
-          Drillsql.startDate = this.model.startDate
-          Drillsql.endDate = this.model.endDate
+          Drillsql.startDate = this.model.startDate + ' 00:00:00'
+          Drillsql.endDate = this.model.endDate + ' 00:00:00'
         }
-        console.log('==========================钻取时间后后后后后后后后后---------------------------')
-        console.log(this.model.startDate)
-        console.log(this.model.endDate)
 
         //特殊处理
         var param = Drillsql.param
@@ -290,18 +263,15 @@
         // 点击字段进行sql拼接
         var barcondition = ''
         if (this.barparam != '' && conditionparamone.barparamif) {
-          barcondition = ' and ' + this.barparam.drilltype + '=\'' + this.barparam.name + '\' '
-          console.log("========================================listenToChild1拼条件了",barcondition)
+          barcondition = this.barparam.drilltype + '=\'' + this.barparam.name + '\' and '
         }
        var dateif=true
         // 时间参数进行sql拼接
-        if (this.datalistif && !this.datedefault && !dateparamif && this.searchs!=='longnotbuygas'&&this.searchs!=='longnotusegas'&&this.searchs!=='lossassociation') {
+        if (this.datalistif && !this.datedefault && !dateparamif) {
           dateif=false
-          barcondition = dateparam + '>=to_date(\'' +  Drillsql.startDate+ '\',\'yyyy-MM-dd\') and '
-            + dateparam + '<=to_date(\'' +  Drillsql.endDate + '\',\'yyyy-MM-dd \')' + barcondition
+          barcondition = dateparam + '>=to_date(\'' +  Drillsql.startDate+ '\',\'yyyy-MM-dd hh24:mi:ss\') and '
+            + dateparam + '<=to_date(\'' +  Drillsql.endDate + '\',\'yyyy-MM-dd hh24:mi:ss\') and ' + barcondition
         }
-        console.log('拼接的参数后的数据--------------------------')
-        console.log(barcondition,'拼接的参数后的数据')
         // 拼接SQL查询条件
         // keys:分组字段  drillparam:选择字段   drillterm:查询条件
         // console.log(barcondition, '拼接字段')
@@ -323,39 +293,9 @@
         if(this.idname=='usernum'|| this.idname=='pastscale'){
           condition =barcondition
         }else {
-          if(!barcondition){
-            condition =this.bartype
-          }else{
-            condition =this.bartype+' and '+barcondition
-          }
-        }
-        if(!barcondition){
-          barcondition=conditionparamone.name?(' '+conditionparamone.name):''+conditionparamtow.name?(' and '+conditionparamtow.name):' '
-        }else{
-          barcondition+=' and '+ barcondition
-        }
-        if(!this.days1){
-          this.days1=0
+          condition =this.bartype+' and '+barcondition
         }
 
-      if(this.searchs==='longnotbuygas'){ // 长期未购气
-        barcondition = barcondition+' and CAST(trunc(SYSDATE)- NVL(F_SELLINGGAS_MAX_DATE,a.f_input_date) as int) > ' + this.days1
-        if(this.days2){
-          barcondition = barcondition+ ' and CAST(trunc(SYSDATE)- NVL(F_SELLINGGAS_MAX_DATE,a.f_input_date) as int) <= ' + this.days2
-        }
-      }else if(this.searchs==='longnotusegas'){ // 长期未用气
-        barcondition =barcondition+ ' and CAST(trunc(SYSDATE)- trunc(F_HANDPLAN_MAX_HANDDATE) as int) >' + this.days1
-        if(this.days2){
-          barcondition = barcondition+ ' and CAST(trunc(SYSDATE)- trunc(F_HANDPLAN_MAX_HANDDATE) as int) <='+this.days2
-        }
-      }else if(this.searchs==='lossassociation'){ // 失联
-        barcondition = barcondition+' and slday >'+this.days1
-        if(this.days2){
-          barcondition =barcondition+ ' and  slday <='+this.days2
-        }
-    }
-        condition=barcondition
-
         //请求后台数据
         var sqlcondition = {
           startDate:Drillsql.startDate,
@@ -371,37 +311,32 @@
           var s2 = eval(Drillsql.param1 + '*100')
           var s2 = s2.toString().substring(0, 5)
           var s3=''
-          s3= conditionparamone.label
-          if(s3=='全部'){
-            s3=''
-          }
+             s3= conditionparamone.label
+            if(s3=='全部'){
+               s3=''
+            }
           sqlcondition.s1=s1
           sqlcondition.s2=s2
           sqlcondition.s3=s3
-          if(conditionparamone.name){
-            console.log("拼conditionparamone.name")
-            sqlcondition.param3=' and '+conditionparamone.name
-          }
+          sqlcondition.param3=' and '+conditionparamone.name
         }
         console.log(sqlcondition, '图表请求sql')
         let getsqldata = Dec.getData(this, sqlparam ,sqlcondition)
         co(getsqldata)
         // 时间参数进行sql拼接
-        console.log("=======================准备调用getDrillList!!!!"+this.parenttitle.pagetitle+"========"+this.idname)
         var pagelist = Drillsql.getDrillList(this.parenttitle.pagetitle, this.idname, '', '')
-        console.log("=======================!!!!pagelist："+JSON.stringify(pagelist[2]))
-        console.log("this.searchs:"+this.searchs+"======this.datalistif:"+this.datalistif+"======!this.datedefault:"+!this.datedefault+"======dateif:"+dateif)
-        if (this.datalistif && !this.datedefault&&dateif&&this.searchs==='longnotbuygas'&&this.searchs==='longnotusegas'&&this.searchs==='lossassociation') {
+        if (this.datalistif && !this.datedefault&&dateif) {
+          barcondition = pagelist[2].dateparam + '>=to_date(\'' + this.model.startDate + ' 00:00:00\',\'yyyy-MM-dd hh24:mi:ss\') and '
+            + pagelist[2].dateparam + '<=to_date(\'' + this.model.endDate + ' 00:00:00\',\'yyyy-MM-dd hh24:mi:ss\') and ' + barcondition
           this.datelistif = false
         }
         console.log(barcondition, '时间sqllist')
         //获取列表sql
         if (!conditionparamone.listif) {
-          console.log("!!!!!!!!!!!!!!!!!!!!!!!conditionparamone.listif拼了barcondition",conditionparamone.name)
-          barcondition = barcondition
+          barcondition = barcondition + '  ' + conditionparamone.name + '\t and '
         }
-        if (texttile1 != '' && this.searchs!=='lossassociation' && this.searchs!=='longnotusegas' && this.searchs!=='longnotbuygas' ) {
-          barcondition = barcondition + '\t and '+ conditionparamtow.listparam
+        if (texttile1 != '') {
+          barcondition = barcondition + conditionparamtow.listparam
         }
         var list = Drillsql.listparam
         // 警告特殊处理
@@ -411,10 +346,9 @@
         Drillsql.listparam1 = barcondition
         console.log(Drillsql.listparam1, '列表钻取条件 ')
         pagelist = Drillsql.getDrillList(this.parenttitle.pagetitle, this.idname, '', '')
-        console.log("========pagelist",pagelist)
+        console.log(pagelist)
         var sqllistcondition= [this.idname+'list',20,{listparam:"\""+Drillsql.listparam+"\"",listparam1:"\""+Drillsql.listparam1+"\""}]
         //调用赋值函数，传递给绘图子组件
-
         this.Transfer(sqllistcondition, pagelist[0].headData, pagelist[1].bodyData)
         Drillsql.param = param
         Drillsql.param1 = param1
@@ -458,8 +392,6 @@
       },
       //初始化图表数据参数
       initdata() {
-        console.log(this.idname)
-        this.searchs=this.idname
         console.log(this.echartsdata, '钻取初始化参数')
         console.log(this.initdatatr, '初始化获取sql的参数')
 
@@ -474,7 +406,7 @@
 
         //特殊处理
         if (this.parenttitle.pagechildrenname == '主要用户展示') {
-          Drillsql.listparam1 = ' a.f_user_type=\'非民用\' '
+          Drillsql.listparam1 = ' a.f_user_type=\'非民用\' and  '
         }
 
         this.$parent.$refs[this.childname].setBar("echarts")
@@ -494,31 +426,6 @@
         this.inputtext = ''
         this.drillparam = Drillsql.getDrillParameter(this.parenttitle.pagetitle, this.idname, '', '')
       },
-      //整理数据
-      notgasData(res) {
-        var nobuygasdata=[]
-        let num = [0, 0, 0, 0, 0, 0 ]
-        num[0] = res[0].week
-        num[1] = res[0].month
-        num[2] = res[0].tmonth
-        num[3] = res[0].harfyear
-        num[4] = res[0].year
-        num[5] = res[0].more
-        var date = ['0-7', '7-30', '30-90', '90-180', '180-360','>360']
-        var i = 0
-        num.forEach((row)=>{
-
-          let item = {}
-          item.name = date[i]
-          item.value = num[i]
-          item.type = this.select1[0]?this.select1[0]:this.select0[0]
-          nobuygasdata.push(item)
-          i++
-        })
-
-        console.log("@@@@@@@@@@@@@@@@",nobuygasdata)
-        return nobuygasdata
-      },
     }
     ,
     watch: {
@@ -552,11 +459,6 @@
         {
           deep: true,
           handler(val) {
-            console.log("!!!!!!!!!!!!!!!!!!!!!!drillshow变了！",val)
-            if(val){
-              this.datedefault = false
-              this.datalistif = true
-            }
             return
             if (typeof this.echartsdata !== "undefined" && this.drillshow == true && this.initflag) {
               this.initdata()
@@ -587,7 +489,6 @@
             })
             setTimeout(() => {
               self.drillparam.forEach(function (s) {
-                console.log("select0!!!!!!!!!!!!!!",s)
                 if (s.value == self.select0) {
                   if (typeof s.children != "undefined" && JSON.stringify(s.children) != '[]') {
                     self.childrenselectshow = true
@@ -629,49 +530,26 @@
       'sqlobtaindata':
         {
           deep: true,
-          async handler(val) {
-            console.log("==================>",val)
+          handler(val) {
             if (this.sqlobtaindata.length < 1) {
               this.$showMessage('数据为空!')
               return
             }
-
-            if(this.searchs==='longnotbuygas'||this.searchs==='longnotusegas'||this.searchs==='lossassociation'){
-              var dates=[]
-              dates=await this.notgasData(this.sqlobtaindata)
-                if (this.echartsType == 'pie') {
-                  this.datapool = dates
-                  Dec.setPie(this, 'echarts', this.sqlobtaindata, this.sqlobtaindata)
-                }
-                if (this.echartsType == 'bar') {
-                  this.datapool = dates
-
-                  var cachebardata = await Dec.DataIntegration(dates)
-                  console.log(cachebardata, this.bartype, '整合数据及柱状图状态')
-                  Dec.setBar(this, 'echarts', cachebardata, this.xname, this.yname, this.seriename, this.idname, this.namesubif)
-                }
-            }else{
-
-              if (this.echartsType == 'pie') {
-                this.datapool = this.sqlobtaindata
-                Dec.setPie(this, 'echarts', this.sqlobtaindata, this.sqlobtaindata)
-              }
-              if (this.echartsType == 'bar') {
-                this.datapool = this.sqlobtaindata
-                var cachebardata = Dec.DataIntegration(this.sqlobtaindata)
-                // console.log(cachebardata, this.bartype, '整合数据及柱状图状态')
-                Dec.setBar(this, 'echarts', cachebardata, this.xname, this.yname, this.seriename, this.idname, this.namesubif)
-              }
+            console.log('测试数据变化')
+            if (this.echartsType == 'pie') {
+              this.datapool = this.sqlobtaindata
+              Dec.setPie(this, 'echarts', this.sqlobtaindata, this.sqlobtaindata)
+            }
+            if (this.echartsType == 'bar') {
+              this.datapool = this.sqlobtaindata
+              var cachebardata = Dec.DataIntegration(this.sqlobtaindata)
+              // console.log(cachebardata, this.bartype, '整合数据及柱状图状态')
+              Dec.setBar(this, 'echarts', cachebardata, this.xname, this.yname, this.seriename, this.idname, this.namesubif)
             }
-
-
-
-
           }
         },
     },
     ready() {
-
       // console.log(this.drillshow, '三级页面')
       // this.model.startDate = Util.toStandardDateString()
       // this.model.endDate = Util.toStandardDateString()
@@ -685,11 +563,7 @@
     border: solid 1px #6fd9d0;
     color: white;
   }
-  .childrendatestyle1{
-    background-color: rgba(1, 207, 242, 0.01);
-    border: solid 1px #6fd9d0;
-    color: white;
-  }
+
   .childrendatestyle .datepicker-popup {
     background-color: #023740 !important;
     border: solid 1px #6fd9d0;

package/src/components/ManageHomeCS/Drill/DrillList.vue

@@ -3,10 +3,10 @@
     <div class="title-2" :class="{'title-21':tableshow}">
       <p align="center">明细表</p>
       <div class="title-21" id="excel">
-        <!--<export-excel :data="excelsql"-->
-                      <!--:field="filename"-->
-                      <!--sqlurl="rs/logic/exportfile" :sql-name="sqlname" :template-name='templatename'-->
-                      <!--:choose-col="true" :class="{execlshow:$parent.listenlistshow}"></export-excel>-->
+        <export-excel :data="excelsql"
+                      :field="filename"
+                      sqlurl="rs/logic/exportfile" :sql-name="sqlname" :template-name='templatename'
+                      :choose-col="true" :class="{execlshow:$parent.listenlistshow}"></export-excel>
       </div>
       <div v-show="!$parent.listenlistshow" class="title-22" @click="biglist"><img
         src="../../../../static/ManageHomePic/图层1510.png">展开

package/src/components/ManageHomeCS/Home/CallCenter.vue

@@ -6,11 +6,11 @@
         <table>
           <tr>
             <td class="td-img"><img src="../../../../static/ManageHomePic/图层6.png"></td>
-            <td>呼入总数(年)<br/><span>{{datas.phoneyear}}</span></td>
+            <td>呼入总数<br/><span>1020</span></td>
           </tr>
           <tr>
             <td class="td-img"><img src="../../../../static/ManageHomePic/图层7.png"></td>
-            <td>接入总数(年)<br/><span>{{datas.inileyear}}</span></td>
+            <td>接入总数<br/><span>800</span></td>
           </tr>
         </table>
       </div>
@@ -18,11 +18,11 @@
         <table>
           <tr>
             <td class="td-img"><img src="../../../../static/ManageHomePic/图层9.png"></td>
-            <td>呼入总数(日)<br/><span class="span-fix">{{datas.phoneday}}</span></td>
+            <td>维修完成数<br/><span class="span-fix">3201</span></td>
           </tr>
           <tr>
             <td class="td-img"><img src="../../../../static/ManageHomePic/图层8.png"></td>
-            <td>接入总数(日)<br/><span class="span-fix">{{datas.inileday}}</span></td>
+            <td>维修未完成数<br/><span class="span-fix">657</span></td>
           </tr>
         </table>
       </div>
@@ -31,44 +31,29 @@
 </template>
 
 <script>
-
-  async function geaaa (self) {
-    let res = await self.$resetpost('rs/sql/getSeatinfo',
-      {data: {condition:self.sqlcondition}},
+  import * as Util from '../../../Util'
+  import co from 'co'
+  import {HttpResetClass} from 'vue-client'
+
+  let getData = function * (self) {
+    let load = new HttpResetClass()
+    load.load("POST",'rs/sql/getSeatinfo',
+      {data: self.sqlcondition},
       {resolveMsg: null, rejectMsg: null})
-      for(var i=0;i<4;i++){
-        if(res.data[i].phoneday>0){
-          self.datas.phoneday=res.data[i].phoneday
-        }
-        if(res.data[i].inileday>0){
-          self.datas.inileday=res.data[i].inileday
-        }
-        if(res.data[i].phoneyear>0){
-          self.datas.phoneyear=res.data[i].phoneyear
-        }
-        if(res.data[i].inileyear>0){
-          self.datas.inileyear=res.data[i].inileyear
-        }
-      }
-      console.log("好想下班呀，可是还没改完",res.data)
-
+      .then((res) => {
+        console.log(res.data)
+      })
   }
   export default {
     name: "call-center",
     data(){
       return{
-        datas:{
-          phoneday:0,
-          inileday:0,
-          phoneyear:0,
-          inileyear:0
-        },
-
-        sqlcondition:'1=1',
+        sqlcondition:{},
       }
     },
-    async ready(){
-      await geaaa(this)
+    ready(){
+      // let getdata=getData(this)
+      // co(getdata)
     }
   }
 </script>

package/src/components/ManageHomeCS/Home/GasValue.vue

@@ -10,17 +10,20 @@
     <div class="d1">
       <div class="d11">
         <table class="backgroundimg">
-
           <tr>
-            <td class="td5"><span  class="td-title">民用气量销售&emsp;</span><span v-for="a in totalgasarrary" style="color: #62e7ff" track-by="$index">{{a}}</span><span class="span-unit" style="color: #62e7ff">{{unit}}方</span>
+            <td class="td3"><span class="td-title">城镇气化销售&nbsp;&nbsp;&nbsp;</span><span v-for="a in totalgasarrary" track-by="$index">{{a}}</span><span class="span-unit">{{unit}}方</span>
+            </td>
+          </tr>
+          <tr>
+            <td class="td3"><span  class="td-title">LNG加气站销售&nbsp;</span><span v-for="a in totalgasarrary" style="color: #62e7ff" track-by="$index">{{a}}</span><span class="span-unit" style="color: #62e7ff">{{unit}}方</span>
             </td>
           </tr>
           <tr>
-            <td class="td5"><span  class="td-title">非民用销售&emsp;&emsp;</span><span v-for="a in totalgasarrary1" style="color: #f29961"  track-by="$index">{{a}}</span><span class="span-unit" style="color: #f29961" >{{unit}}方</span>
+            <td class="td3"><span  class="td-title">CNG加气站销售&nbsp;</span><span v-for="a in totalgasarrary" style="color: #f29961"  track-by="$index">{{a}}</span><span class="span-unit" style="color: #f29961" >{{unit}}方</span>
             </td>
           </tr>
           <tr>
-            <td class="td5"><span  class="td-title">混合型气量销售</span><span v-for="a in totalgasarrary2" style="color: #748bf0"  track-by="$index">{{a}}</span><span class="span-unit" style="color: #748bf0" >{{unit}}方</span>
+            <td class="td3"><span  class="td-title">CNG公司销售&nbsp;&nbsp;&nbsp;&nbsp;</span><span v-for="a in totalgasarrary" style="color: #748bf0"  track-by="$index">{{a}}</span><span class="span-unit" style="color: #748bf0" >{{unit}}方</span>
             </td>
           </tr>
         </table>
@@ -43,156 +46,64 @@
     },
     data() {
       return {
+        totalgas: '',
+        totalgasarrary: [],
+        date: [2018, 2017, 2016],
         sqlcondition: '',
+        result: [],
         unit: '',
-        resdata: '',
-        resdata1: '',
-        resdata2: '',
-        totalgas:'',
-        totalgas1:'',
-        totalgas2:'',
-        totalgasarrary:[],
-        totalgasarrary1:[],
-        totalgasarrary2:[],
+        resdata: []
       }
     },
     methods: {
       //请求后台数据
       searchdata(year) {
-        console.log('searchdata--------------------------------------------------searchdata')
-        console.log(DataSql.getData(this, 'pregas', {},'resdata'))
-        let sqldata = DataSql.getData(this, 'pregas', {},'resdata')
+        let sqldata = DataSql.getData(this, 'pregas',{startDate:year,f_filiale:this.$parent.$parent.f_filiale}, 'resdata')
         co(sqldata)
-        let sqldata1 = DataSql.getData(this, 'civilgas', {},'resdata1')
-        co(sqldata1)
-        let sqldata2 = DataSql.getData(this, 'hybridgas', {},'resdata2')
-        co(sqldata2)
       },
-      getValueInt() {
-        var index = this.totalgas.toString().indexOf('.');
-        var s = 0
-        if (index > -1) {
-          s = this.totalgas.toString().substring(0, index);
-        } else {
-          s = this.totalgas
-        }
-
-        var a = s + ''
-        if (a.length > 9) {
-          a = a.substring(0, a.length - 8);
-          this.unit = '亿'
-        }
-        if (a.length > 5) {
-          a = a.substring(0, a.length - 4);
-          this.unit = '万'
-        }
+      // 将数值打碎成数组
+      gasValueStyle(s) {
         this.totalgasarrary = []
-        for (var i = 0; i < a.length; i++) {
-          this.totalgasarrary.push(a.charAt(i))
-        }
-
-      } ,
-      getValueInt1() {
-        var index = this.totalgas1.toString().indexOf('.');
-        var s = 0
-        if (index > -1) {
-          s = this.totalgas1.toString().substring(0, index);
-        } else {
-          s = this.totalgas1
+        for (var i = 0; i < s.length; i++) {
+          this.totalgasarrary.push(s.charAt(i))
         }
-
-        var a = s + ''
-        if (a.length > 9) {
-          a = a.substring(0, a.length - 8);
+      },
+      // 数据增加单位
+      datafix(data) {
+        var s = data + ''
+        if (s.length > 9) {
+          s = s.substring(0, s.length - 8);
           this.unit = '亿'
         }
-        if (a.length > 5) {
-          a = a.substring(0, a.length - 4);
+        if (s.length > 5) {
+          s = s.substring(0, s.length - 4);
           this.unit = '万'
         }
-        this.totalgasarrary1 = []
-        for (var i = 0; i < a.length; i++) {
-          this.totalgasarrary1.push(a.charAt(i))
-        }
-
-      } ,
-      getValueInt2() {
-        var index = this.totalgas2.toString().indexOf('.');
+        this.gasValueStyle(s)
+      },
+      //取整
+      getValueInt() {
+        var index = this.totalgas.toString().indexOf('.');
         var s = 0
         if (index > -1) {
-          s = this.totalgas2.toString().substring(0, index);
+          s = this.totalgas.toString().substring(0, index);
         } else {
-          s = this.totalgas2
-        }
-
-        var a = s + ''
-        if (a.length > 9) {
-          a = a.substring(0, a.length - 8);
-          this.unit = '亿'
-        }
-        if (a.length > 5) {
-          a = a.substring(0, a.length - 4);
-          this.unit = '万'
-        }
-        this.totalgasarrary2 = []
-        for (var i = 0; i < a.length; i++) {
-          this.totalgasarrary2.push(a.charAt(i))
+          s = this.totalgas
         }
-
+        this.datafix(s)
       }
     },
     watch: {
       'resdata':{
         deep: true,
         handler(val) {
-          console.log('------------民用销售气量===================民用销售气量----------------------------')
-          console.log(this.resdata,'民用销售气量')
-          console.log(this.resdata[0],'民用销售气量-----------------')
-          if(this.resdata[0]!==undefined){
-            this.totalgas=this.resdata[0].value
-
-          }
-
-
-        }
-      },
-      'resdata1':{
-        deep: true,
-        handler(val) {
-          console.log('------------非民用销售气量非民用销售气量----------------------------')
-          console.log(this.resdata1,'非民用销售气量')
-          if(this.resdata1[0]!==undefined){
-            this.totalgas1=this.resdata1[0].value
-
-          }
-
-          // this.resdata1=this.resdata1[0].value
-        }
-      },
-      'resdata2':{
-        deep: true,
-        handler(val) {
-          console.log('---混合销售气量------------------------混合销售气量-------------')
-          console.log(this.resdata2,'混合销售气量')
-          if(this.resdata2[0]!==undefined){
-            this.totalgas2=this.resdata2[0].value
-
-          }
+          this.totalgas = this.resdata[0].value
         }
       },
       'totalgas'(val) {
         this.getValueInt()
         this.$parent.loaddata++
       },
-      'totalgas1'(val) {
-        this.getValueInt1()
-        this.$parent.loaddata++
-      },
-      'totalgas2'(val) {
-        this.getValueInt2()
-        this.$parent.loaddata++
-      },
-
       'f_filiale'(){
         var date = Util.toStandardDateString();
         var year = date.substring(0, 4)-4