manage-client 3.2.88 → 3.2.89-aode

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()

package/src/components/ManageHomeCS/ManageHome.vue

@@ -15,8 +15,6 @@
           <div v-if="pagetitleshow.safe" @click="toNewPage('safe')" :class="{click:pageshow.safe,noclick:!pageshow.safe}">安检</div>
           <div v-if="pagetitleshow.monitor" @click="toNewPage('monitor')" :class="{click:pageshow.monitor,noclick:!pageshow.monitor}">监控</div>
           <div v-if="pagetitleshow.net" @click="toNewPage('net')" :class="{click:pageshow.net,noclick:!pageshow.net}">管网</div>
-          <div v-if="pagetitleshow.poor" @click="toNewPage('poor')" :class="{click:pageshow.poor,noclick:!pageshow.poor}">供销差</div>
-          <div v-if="pagetitleshow.predict" @click="toNewPage('predict')" :class="{click:pageshow.predict,noclick:!pageshow.predict}">预测气量</div>
         </div>
       </div>
       <div class="new-manage" @click=goto()>经营管控平台</div>
@@ -27,7 +25,7 @@
       <component v-for="s in modulename" :is="s" :key="$index" :f_filiale="f_filiale"
                  :drillshow="false" class="d3" v-if="pageshow[pagename1[$index]]&&pagetitleshow[pagename1[$index]]"></component>
     </div>
-<!--    <loading v-if="initdatashow" :backurl="backurl"></loading>-->
+    <loading v-if="initdatashow" :backurl="backurl"></loading>
   </div>
 </template>
 
@@ -51,10 +49,8 @@
           safe: false,       //安全
           monitor: false,    //监控
           net: false,        //管网
-          poor: false,       //供销差
-          predict: false,       //供销差
         },
-        f_filiale:'榆林.榆川天然气',
+        f_filiale:'西安市',
         dataindex:-1,
         loaddata: false,
         serverday: '',     //安全服务天数
@@ -64,8 +60,8 @@
         drillshow: false,      //三级页面显示
         typemodel:'CS',
         resdata: [],           //接收请求后台获取的安全服务开始时间
-        modulename: ['home', 'use-home', 'service-home', 'check-home', 'monitor-home', 'net-home','poor-home','predict-home'],  //导入组件名
-        pagename1: ['home', 'user', 'services', 'safe', 'monitor', 'net','poor','predict'], //权限控制显示模块名
+        modulename: ['home', 'use-home', 'service-home', 'check-home', 'monitor-home', 'net-home'],  //导入组件名
+        pagename1: ['home', 'user', 'services', 'safe', 'monitor', 'net'], //权限控制显示模块名
         pagetitleshow: {  //页面显示控制数组
           home: true,
           user: true,
@@ -73,8 +69,6 @@
           safe: true,
           monitor: true,
           net: true,
-          poor: true,
-          predict: true,
         },
         initdatashow: true,  //加载数据展示控制
       }

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

@@ -30,6 +30,7 @@
     },
     data() {
       return {
+        date: [2018, 2017, 2016],
         title: '警告',
         xc: '',
         monitortotal: '',
@@ -81,16 +82,10 @@
             show: false,
           },
           yAxis: {
-            data: data.grade,
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              show: false,
-            },
-            // type: 'category',
+            type: 'category',
             axisLabel: {
-
+              margin: 10 * scale,
+              show: true,
               color: function (param) {
                 if (param == '警告类型') {
                   return '#fff'
@@ -99,8 +94,13 @@
               },
               fontSize: 12 * scale
             },
-            //
-            // data: data.grade
+            axisTick: {
+              show: false,
+            },
+            axisLine: {
+              show: false,
+            },
+            data: data.grade
           },
           series: [{
             type: 'bar',

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

@@ -29,38 +29,26 @@
         let legendname = []
         this.comparedgas.forEach(function (s) {
           legendname.push(s.name)
-          console.log("监控---往期购气量================"+legendname)
         })
         var rich = {
-          yellow: {
-            color: "#ffc72b",
-            fontSize: 10 * scale,
-            padding: [5, 4],
-            align: 'center'
-          },
-          total: {
-            color: "#ffc72b",
-            fontSize: 10 * scale,
-            align: 'center'
-          },
           white: {
             color: "#fff",
             align: 'center',
             fontSize: 14 * scale,
-            padding: [6, 4]
+
+            padding: [8*scale, 8*scale]
           },
           blue: {
             color: '#e1e52a',
-            fontWeight:'bolder',
             fontSize: 16 * scale,
             align: 'center',
-            padding: [6, 4]
+            padding: [8*scale,8*scale]
           },
           hr: {
             borderColor: '#64d8d4',
             width: '100%',
             borderWidth: 0.5,
-            height: 0
+            height: 0,
           },
         }
         var total = 0; //用户总和
@@ -75,10 +63,10 @@
             icon: 'circle',
             x: '26%',
             bottom: '2%',
-            itemWidth: 20 ,
-            itemHeight: 10 ,
+            itemWidth: 20 * scale,
+            itemHeight: 10 * scale,
             textStyle: {
-              fontSize: 12 ,
+              fontSize: 12 * scale,
               color: '#ffffff'
             },
             data: legendname

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

@@ -72,7 +72,7 @@
             left: '9%',
             bottom: -5,
             start: 2,
-            end: 30 //初始化滚动条
+            end: 90 //初始化滚动条
           }],
           tooltip: {
             alwaysShowContent:true,
@@ -196,7 +196,8 @@
       },
     },
     ready() {
-      let getData = DataSql.getData(this, 'meterbrand',{condition:'1=1'}, 'meterdata')
+
+      let getData = DataSql.getData(this, 'meterbrand',{f_filiale:this.$parent.$parent.f_filiale}, 'meterdata')
       co(getData)
     }
   }

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

@@ -5,10 +5,10 @@
         <table>
           <tr>
             <td class="td-1"><img src="../../../../static/ManageHomePic/图层61.png"></td>
-            <td class="td-2"><span>{{warn}}</span><br/>警告用户</td>
+            <td class="td-2"><span>{{warningnum}}</span><br/>警告用户</td>
             <td style="width:0.5%"></td>
             <td class="td-3"><img src="../../../../static/ManageHomePic/图层71.png"></td>
-            <td class="td-2"><span class="span-1">{{suspicious}}</span><br/>可疑用户</td>
+            <td class="td-2"><span class="span-1">{{suspiciousnum}}</span><br/>可疑用户</td>
           </tr>
         </table>
       </div>
@@ -33,16 +33,14 @@
 
   export default {
     name: "MonitorCenter",
-    // props: {
-    //   warningnum: Number,
-    //   suspiciousnum: Number,
-    // },
+    props: {
+      warningnum: Number,
+      suspiciousnum: Number,
+    },
     data() {
       return {
         resdata: [],
         resdata1: [],
-        warn:'0',
-        suspicious:'0',
         usernumdata: {k1: 0, k2: 0}
       }
     },
@@ -70,9 +68,8 @@
       'resdata1': {
         deep: true,
         handler(val) {
+          this.warningnum = this.resdata1[0].warn
 
-          this.warn = this.resdata1[0]?this.resdata1[0].num:'0'
-          this.suspicious = this.resdata1[1]?this.resdata1[1].num:'0'
           this.$parent.loaddata++
         }
       },

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

@@ -6,8 +6,7 @@
               v-on:drilldata="listenToData"></caveat>
       <!--监控中心-->
       <monitor-center class="border monitorcenter"
-                      ></monitor-center>
-<!--      :suspiciousnum="suspiciousnum"-->
+                      :suspiciousnum="suspiciousnum"></monitor-center>
       <!--长期未用气用户统计-->
       <no-gas v-ref:nogas class="border nogas" v-on:drill="listenToComparedGas"
               v-on:drilldata="listenToData"></no-gas>
@@ -18,8 +17,8 @@
       <nobuy-gas v-ref:nobuygas class="border nobuygas" v-on:drill="listenToComparedGas"
                  v-on:drilldata="listenToData"></nobuy-gas>
       <!--往期购气对比-->
-      <compared-gas class="border comparedgas"
-                  ></compared-gas>
+      <compared-gas v-ref:comparedgas class="border comparedgas" v-on:drill="listenToComparedGas"
+                    v-on:drilldata="listenToData"></compared-gas>
       <!--供销差-->
       <buysub class="border buysub"></buysub>
       <!--气表品牌分布-->
@@ -64,6 +63,7 @@
     },
     methods: {
       listenToComparedGas(idname, childname, pagename, initdatatr) {
+        return
         // console.log(idname, childname, pagename, initdatatr)
         this.drillshow = true
         this.idname = idname

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

@@ -36,7 +36,7 @@
         }
         this.$parent.suspiciousnum = this.$parent.suspiciousnum + num
         xAxisData.push("")
-        var yname = ' 天'
+        var yname = ' 月份'
         for (var v = 0; v < legendData.length; v++) {
           var serie = {
             name: legendData[0],
@@ -106,7 +106,7 @@
                   result += item.marker + " " + item.seriesName + " &nbsp;&nbsp;&nbsp;<span style='font-weight: bolder;color:#e1e52a;'>" + item.value + "</span></br>";
                 }
               });
-              return "<div style='text-align: center;height: 1px;font-weight: normal'>"+params[0].axisValue + '天</div> <br/> ' + result
+              return "<div style='text-align: center;height: 1px;font-weight: normal'>"+params[0].axisValue + '月</div> <br/> ' + result
             },
             axisPointer: {type: 'line', lineStyle: {width: 0}},
             trigger: 'axis',
@@ -145,25 +145,36 @@
       },
       // 查询sql
       sqlsearch() {
-        let getData = DataSql.getData(this,  'longnotbuygas',{condition:'1=1'}, 'resdata')
+        var date = DataSql.toBeforeDate(1065)
+        let getData = DataSql.getData(this,  'longnotbuygas',{startDate:date,f_filiale:this.$parent.$parent.f_filiale}, 'resdata')
         co(getData)
       },
       //整理数据
       processData() {
-        let num = [0, 0, 0, 0, 0, 0 ]
-        num[0] = this.resdata[0].week
-        num[1] = this.resdata[0].month
-        num[2] = this.resdata[0].tmonth
-        num[3] = this.resdata[0].harfyear
-        num[4] = this.resdata[0].year
-        num[5] = this.resdata[0].more
+        var l = 0
+        let num = [0, 0, 0, 0]
+        this.resdata.forEach(function (s) {
+          if (l < 7) {
+            num[0] = num[0] + s.num
+          }
+          if (l > 6 && l < 9) {
+            num[1] = num[1] + s.num
+          }
+          if (l > 8 && l < 10) {
+            num[2] = num[2] + s.num
+          }
+          if (l > 9 && l < 11) {
+            num[3] = num[3] + s.num
+          }
+          l++
+        })
         var self = this
-        let date = ['0-7', '7-30', '30-90', '90-180', '180-360','>360']
-        var i = 5
-        num.forEach( (row)=> {
+        let date = ['一', '二', '四', '六']
+        var i = 3
+        num.forEach(function (s) {
           let item = {}
           item.name = date[i]
-          item.value = num[i]
+          item.value = s
           self.nobuygasdata.push(item)
           i--
         })
@@ -171,11 +182,15 @@
       },
       // 钻取入口
       drillclick() {
+        console.log(this.title)
         var total = this.nobuygasdata
+        var date = DataSql.toBeforeDate(365)+ ' 00:00:00'
         var initdatatr = {
+          startDate: date,
+          endDate: Util.toStandardDateString() + ' 00:00:00',
           param: '',
           param1: '',
-          listparam: '1=1 '
+          listparam: '  al.f_operate_date>=to_date(\''+date+'\',\'yyyy-mm-dd hh24:mi:ss\') and '
         }
         this.$emit('drill', 'longnotbuygas', 'nobuygas', this.title, initdatatr)
         this.$emit('drilldata', total)