manage-client 3.2.69 → 3.2.70-aode

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

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

@@ -3,10 +3,8 @@
 
     <!--用户-->
     <user-module class="safe-border safe-user" :f_filiale="f_filiale" v-bind:listenheight="listenheight"></user-module>
-    <!--&lt;!&ndash;陕西地图&ndash;&gt;-->
-    <!--<shanxi-map  class="safe-shanximap" mode="1" idname="shanximap"></shanxi-map>-->
-    <!--榆林地图-->
-    <yulin-map  class="safe-shanximap" mode="1" idname="yulinmap"></yulin-map>
+    <!--陕西地图-->
+    <shanxi-map  class="safe-shanximap" mode="1" idname="shanximap"></shanxi-map>
     <!--供售气量-->
     <gasvalue class="safe-border safe-gasvalue" :f_filiale="f_filiale" v-bind:listenheight="listenheight"></gasvalue>
     <!--客服-->

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

@@ -96,7 +96,8 @@
           yAxis: {
             type: 'category',
             axisLabel: {
-
+              margin: 10 * scale,
+              show: true,
               color: function (param) {
                 if (param == '警告类型') {
                   return '#fff'
@@ -207,17 +208,8 @@
       'resdata': {
         deep: true,
         handler(val) {
-          if(this.resdata.length>0){
-            this.warn = this.resdata[0].num
-          } else {
-            this.warn = 0
-          }
-          if(this.resdata.length>1){
-            this.suspicious = this.resdata[1].num
-          } else {
-            this.suspicious = 0
-          }
-
+          this.warn = this.resdata[0].warn
+          this.suspicious = this.resdata[0].suspicious
           this.$parent.loaddata++
         }
       },

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

@@ -38,9 +38,9 @@
             // borderColor :'rgba(13, 109, 180)',
             borderWidth:0,
             hideDelay:100,
-              padding:10,
+              padding:10*scale,
               textStyle:{
-                  fontSize:18
+                  fontSize:18*scale
               },
             formatter: function (params) {
               if (params[0].data == '') {
@@ -62,8 +62,8 @@
             x: 'right',
             y: 'top',
             itemGap: 20,
-            itemWidth: 20 ,
-            itemHeight: 10 ,
+            itemWidth: 20 * scale,
+            itemHeight: 10 * scale,
             // padding: [0, 25, 0, 0],
             data: ['已建', '在建', '审批'],
             textStyle: {
@@ -71,7 +71,7 @@
               color: '#ffffff'          // 图例文字颜色
             }
           },
-          grid: {left: '2%', top: "25%", bottom: "1%", right: "5%", containLabel: true},
+          grid: {left: '2%', top: "15%", bottom: "5%", right: "5%", containLabel: true},
           calculable: true,
           xAxis: [
             {
@@ -91,7 +91,7 @@
               axisLabel: {
                 show: true,
                 textStyle: {
-                  fontSize: 14 ,
+                  fontSize: 14 * scale,
                   color: '#ffffff'
                 }
               }
@@ -99,21 +99,21 @@
           ],
           yAxis: [
             {
-                // name: '(km)',
-                // nameLocation: "end",
-                // type: 'value',
-                // nameTextStyle: {
-                //   fontSize: 14 ,
-                //   padding: [50 , 35 , 0, 0],
-                //   color: '#15dce2',
-                // },
+              name: '(km)',
+              nameLocation: "end",
+              type: 'value',
+              nameTextStyle: {
+                fontSize: 14 * scale,
+                padding: [-10 * scale, 35 * scale, 0, 0],
+                color: '#15dce2',
+              },
               axisLine: {
                 show: false
               },
               axisLabel: {
                 show: true,
                 textStyle: {
-                  fontSize: 14 ,
+                  fontSize: 14 * scale,
                   color: '#15dce2'
                 }
               },
@@ -142,7 +142,7 @@
                 position: 'top',
                 textStyle: { //数值样式
                   color: '#fefefe',
-                  fontSize: 14
+                  fontSize: 14 * scale
                 }
               },
               itemStyle: {
@@ -162,7 +162,7 @@
                 position: 'top',
                 textStyle: { //数值样式
                   color: '#fefefe',
-                  fontSize: 14
+                  fontSize: 14 * scale
                 }
               },
               itemStyle: {normal: {color: '#f7cb32'}},
@@ -180,7 +180,7 @@
                 position: 'top',
                 textStyle: { //数值样式
                   color: '#fefefe',
-                  fontSize: 14
+                  fontSize: 14 * scale
                 }
               },
               itemStyle: {normal: {color: '#7393db'}},

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

@@ -40,8 +40,8 @@
         resdata: [],
         resdata1: [],
         totalstring: '',
-        safedata: [{value: 0, name: '当年已完成数'}, {value: 0, name: '当年未完成数'}],
-        safedatastring: [{value: "", name: '当年已完成数'}, {value: "", name: '当年未完成数'}],
+        safedata: [{value: 0, name: '已完成'}, {value: 0, name: '未完成'}],
+        safedatastring: [{value: "", name: '已完成'}, {value: "", name: '未完成'}],
         safeerrordata:[] ,
         hiddenuser:'',
         timer:'',
@@ -240,14 +240,14 @@
             DataSql.dataunitarray(this, 'safedata', 'safedatastring')
             this.setBar('safe', this.safedata)
             this.totalstring = DataSql.dataunit(this.resdata[0].totalsafe)
-            // if(this.safeerrordata.length>0){
-            //   var self=this
-            //   // this.safeerrordata.forEach(function (s) {
-            //   //   if(s.name=='隐患数'){
-            //   //     self.hiddenuser=s.value
-            //   //   }
-            //   // })
-            // }
+            if(this.safeerrordata.length>0){
+              var self=this
+              this.safeerrordata.forEach(function (s) {
+                if(s.name=='隐患数'){
+                  self.hiddenuser=s.value
+                }
+              })
+            }
             this.$parent.loaddata++
           }
         },
@@ -256,18 +256,15 @@
         deep: true,
         handler(val) {
           this.safeerrordata=this.resdata1
-
-          // this.totalstring = DataSql.dataunit(this.resdata1[0].totalsafe)
           this.setBar('safeerror', this.safeerrordata)
-          this.hiddenuser=0
-          if(this.resdata1.length>0){
-            this.safeerrordata.forEach((s)=> {
-                if(s.name==='有隐患用户数'){
-                  this.hiddenuser=s.value
-                }
-
+          if(this.resdata.length>0){
+            this.safeerrordata.forEach(function (s) {
+              if(s.name=='隐患数'){
+                self.hiddenuser=s.value
+              }
             })
           }
+          console.log(this.hiddenuser,'测试隐患数')
           this.$parent.loaddata++
         },
       },

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

@@ -5,10 +5,12 @@
       <div class="f2">
         <table>
           <tr>
-            <td><span v-model="totaluser">{{totaluser}}</span><br/><font size="4">现有总客户</font></td>
-            <td><span v-model="apply">{{apply}}</span><br/><font size="4">民用生活用气户数</font></td>
-            <td><span v-model="boiler">{{boiler}}</span><br/><font size="4">民用壁挂锅炉户数</font></td>
-            <td><span v-model="hiddenuser">{{hiddenuser}}</span><br/><font size="4">非民用户数</font></td>
+            <td style="width: 3%"></td>
+            <td><span v-model="totaluser">{{totaluser}}</span><br/>现有总客户</td>
+            <td class="td-1"></td>
+            <td><span v-model="apply">{{apply}}</span><br/>开发客户数</td>
+            <td class="td-1"></td>
+            <td><span v-model="hiddenuser">{{hiddenuser}}</span><br/>潜在客户数</td>
           </tr>
         </table>
       </div>
@@ -34,7 +36,6 @@
         usernumstring: [],
         totaluser: '',   //总用户数
         hiddenuser: '', //潜在用户数
-        boiler:'',//民用锅炉
         unit: [],        //用户数单位
         resdata: [],    //用户数据
         resdatapie: [],  //饼图数据
@@ -92,17 +93,18 @@
               top: '31%',
               textStyle: {
                 color: '#ffffff',
-                fontSize: 10 ,
+                fontSize: 10 * scale,
 
               }
             },
             {
               text: result,
-              left: '46%',
-              top: '40%',
+              left: '45%',
+              top: '38%',
+              padding: [10 * scale, 10 * scale],
               textStyle: {
                 color: '#00e2ea',
-                fontSize: 10 ,
+                fontSize: 10 * scale,
 
               }
             }],
@@ -157,10 +159,10 @@
             x: 'center',
             bottom: '6%',
             itemGap: 20,
-            itemWidth: 20 ,
-            itemHeight: 10 ,
+            itemWidth: 20 * scale,
+            itemHeight: 10 * scale,
             textStyle: {
-              fontSize: 12 ,
+              fontSize: 12 * scale,
               // padding: [0, 0, 0, 4 * scale],
               color: '#ffffff'
             },
@@ -306,12 +308,12 @@
       },
       //请求后台数据
       searchdata() {
-          let sqldata = DataSql.getData(this, 'user',{f_filiale:this.$parent.$parent.f_filiale}, 'resdata')
+        let sqldata = DataSql.getData(this, 'user',{f_filiale:this.$parent.$parent.f_filiale}, 'resdata')
         co(sqldata)
-        // let sqldatapie = DataSql.getData(this,'useri',{f_filiale:this.$parent.$parent.f_filiale}, 'resdatapie')
-        // co(sqldatapie)
-        // let sqldataone = DataSql.getData(this,'userapply',{f_filiale:this.$parent.$parent.f_filiale}, 'resdataapply')
-        // co(sqldataone)
+        let sqldatapie = DataSql.getData(this,'useri',{f_filiale:this.$parent.$parent.f_filiale}, 'resdatapie')
+        co(sqldatapie)
+        let sqldataone = DataSql.getData(this,'userapply',{f_filiale:this.$parent.$parent.f_filiale}, 'resdataapply')
+        co(sqldataone)
       },
     },
     watch: {
@@ -319,16 +321,8 @@
       'usernum': {
         deep: true,
         handler(val) {
-          console.log('----------------------------------------------------------')
-          console.log(this.usernum,'usernum')
           var value = this.usernum[0].value + this.usernum[1].value + this.usernum[2].value
-          var value1 = this.usernum[0].value
-          var value2 =this.usernum[1].value
-          var value3 =this.usernum[2].value
           this.totaluser = DataSql.dataunit(value)
-          this.apply = DataSql.dataunit(value1)
-          this.hiddenuser = DataSql.dataunit(value2)
-          this.boiler = DataSql.dataunit(value3)
           this.setBar()
           this.$parent.loaddata++
         }
@@ -360,8 +354,30 @@
           this.usernum.push(result2)
         }
       },
+      'resdatapie': {
+        deep: true,
+        handler(val) {
+          var totalnum = 0
+          if(this.resdatapie<1){
+            this.hiddenuser=0
+            return
+          }
+          for (var i = 1; i < 6; i++) {
+            let item0 = {}
+            totalnum = totalnum + this.resdatapie[i].totalnum
+          }
+          console.log(totalnum,'ceshi')
+          this.hiddenuser = DataSql.dataunit(totalnum / 5)
+          console.log(this.hiddenuser ,'ceshi')
+        }
+      },
+      'resdataapply': {
+        deep: true,
+        handler(val) {
 
-
+          this.apply = DataSql.dataunit(this.resdataapply[0].totalnum)
+        }
+      },
       'f_filiale'(){
         clearInterval(this.timer);
         this.searchdata()