manage-client 3.2.78 → 3.2.79-aode

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)

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

@@ -8,7 +8,7 @@
 <script>
   import * as DataSql from '../../../stores/DataSql'
   import co from 'co'
-
+  import * as Util from '../../../Util'
 
   export default {
     name: "NoContact",
@@ -28,7 +28,8 @@
         var legendData = ['用户数量'];
         var serieData = [];
         var metaDate = []
-
+        var Auxiliarydata = []
+        var data0 = 0
         var num = 0
         for (var i = this.nocontactdata.length; i > 0; i--) {
           xAxisData.push(this.nocontactdata[i - 1].name)
@@ -37,8 +38,19 @@
         }
         this.$parent.warningnum = this.$parent.warningnum + num
         xAxisData.push("")
-
-        var yname = ' 日'
+        metaDate.forEach(function (s) {
+          data0 = data0 + s
+        })
+        for (var i = 0; i < metaDate.length; i++) {
+          Auxiliarydata.push(data0 / 60)
+        }
+        var rich = {
+          white: {
+            color: "#f7cb32",
+            padding: [0, 0, -20*scale, 0]
+          }
+        }
+        var yname = ' 月份'
         for (var v = 0; v < legendData.length; v++) {
           var serie = {
             name: legendData[0],
@@ -48,7 +60,7 @@
             barGap: "20%",
             itemStyle: {
               normal: {
-                color: '#6fd9d0',
+                color: "#013e48",
                 label: {
                   show: true,
                   textStyle: {
@@ -57,14 +69,32 @@
                   },
                   position: "top",
                   formatter: function (p) {
-                    return p.value > 0 ? (p.value) : 0;
-                  }
+                    var s = p.value > 0 ? (p.value) : 0
+                    return '{white|' + s + '}'
+                  },
+                  rich: rich
                 }
               }
             },
             data: metaDate,
           }
+          var serie1 = {
+            name: 'ser',
+            type: "bar",
+            stack: "总量",
+            itemStyle: {
+              normal: {
+                color: "#6fd9d0",
+                barBorderRadius: 0,
+                label: {
+                  show: false,
+                }
+              }
+            },
+            data: Auxiliarydata
+          }
           serieData.push(serie)
+          serieData.push(serie1)
         }
         var colors = ["#036BC8", "#4A95FF", "#5EBEFC", "#2EF7F3", "#FFFFFF"]
         this.xc.setOption({
@@ -86,10 +116,10 @@
             // borderColor :'rgba(13, 109, 180)',
             borderWidth:0,
             hideDelay:100,
-            padding:10*scale,
-            textStyle:{
-              fontSize:18*scale
-            },
+              padding:10*scale,
+              textStyle:{
+                  fontSize:18*scale
+              },
             formatter: function (params) {
               if (params[0].axisValue == '') {
                 return ''
@@ -97,10 +127,10 @@
               var result = ''
               params.forEach(function (item) {
                 if (item.seriesName !== 'ser') {
-                  result += item.seriesName + " &nbsp;&nbsp;&nbsp;<span style='font-weight: bolder;color:#e1e52a;'> " + item.value + "</span></br>";
+                  result += 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',
@@ -113,7 +143,7 @@
               nameTextStyle: {
                 fontSize: 14 * scale,
                 color: '#15dce2',
-                padding: [40 * scale, 0, 0, -70 * scale],
+                padding: [48 * scale, 0, 0, -70 * scale],
               },
               axisLine: {show: true, lineStyle: {color: '#04669e', width: 1}},
               axisLabel: {interval: 0, textStyle: {color: '#ffffff', fontSize: 14 * scale}},
@@ -139,38 +169,37 @@
       },
       // 查询sql
       sqlsearch() {
-        let getData = DataSql.getData(this, 'lossassociation',{condition:'1=1'}, 'resdata')
+        // var date = DataSql.toBeforeDate(365)
+        // DataSql.param = date + ' 00:00:00'
+        let getData = DataSql.getData(this,'lossassociation',{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 self = this
-        let date = ['0-7', '7-30', '30-90', '90-180', '180-360','>360']
-        var i = 5
-        num.forEach( (row)=> {
+          var self=this
+        this.resdata.forEach(function (s) {
           let item = {}
-          item.name = date[i]
-          item.value = num[i]
+          item.name = s.dates
+          item.value = s.num
           self.nocontactdata.push(item)
-          i--
+
         })
-        console.log("========================>this.nocontactdata",this.nocontactdata)
+        console.log(this.nocontactdata,'5456456')
       },
-
       // 钻取入口
       drillclick() {
-        var total = this.nocontactdata
+        console.log(this.title)
+        let total = []
+        for (var i = this.nocontactdata; i > 0; i--) {
+          total.push(this.nocontactdata[i - 1])
+        }
+        var date=eval(Util.toStandardDateString().toString().substring(0, 4) + '-2') + '-01-01 00:00:00'
         var initdatatr = {
+          startDate:date ,
+          endDate: Util.toStandardDateString() + ' 00:00:00',
           param: '',
           param1: '',
-          listparam: '1=1 '
+          listparam: ' al.f_hand_date>=to_date(\''+date+'\',\'yyyy-mm-dd hh24:mi:ss\') and '
         }
         this.$emit('drill', 'lossassociation', 'nocontact', this.title, initdatatr)
         this.$emit('drilldata', total)

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

@@ -38,13 +38,13 @@
         this.$parent.warningnum = this.$parent.warningnum + num
         xAxisData.push("")
 
-        var yname = ' 天'
+        var yname = ' 月份'
         for (var v = 0; v < legendData.length; v++) {
           var serie = {
             name: legendData[0],
             type: "bar",
             stack: "总量",
-            barWidth: '30%',
+            barWidth: '20%',
             barGap: "20%",
             itemStyle: {
               normal: {
@@ -70,7 +70,7 @@
         this.xc.setOption({
           title: {text: '', textAlign: 'left', textStyle: {color: "#fff", fontSize: "16*scale", fontWeight: "normal"}},
           color: colors,
-          grid: {left: '4%', top: "18%", bottom: "5%", right: "5%", containLabel: true},
+          grid: {left: '4%', top: "18%", bottom: "3%", right: "5%", containLabel: true},
           dataZoom: [{
             type: 'inside',
             show: true,
@@ -100,7 +100,7 @@
                   result += 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',
@@ -141,37 +141,35 @@
       sqlsearch() {
         // var date = DataSql.toBeforeDate(365)
         // DataSql.param = date + ' 00:00:00'
-        let getData = DataSql.getData(this,  'longnotusegas',{condition:'1=1'}, 'resdata')
+        let getData = DataSql.getData(this, 'longnotusegas',{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 self = this
-        let date = ['0-7', '7-30', '30-90', '90-180', '180-360','>360']
-        var i = 5
-        num.forEach( (row)=> {
+       var self=this
+        this.resdata.forEach(function (s) {
           let item = {}
-          item.name = date[i]
-          item.value = num[i]
+          item.name = s.dates
+          item.value = s.num
           self.nousegasdata.push(item)
-          i--
+
         })
         console.log(this.nousegasdata)
       },
       // 钻取入口
       drillclick() {
-        var total = this.nousegasdata
+        console.log(this.title)
+        let total = []
+        for (var i = this.nousegasdata.length; i > 0; i--) {
+          total.push(this.nousegasdata[i - 1])
+        }
+        var date=eval(Util.toStandardDateString().toString().substring(0, 4) + '-2') + '-01-01 00:00:00'
         var initdatatr = {
+          startDate: date,
+          endDate: Util.toStandardDateString() + ' 00:00:00',
           param: '',
           param1: '',
-          listparam: '1=1 '
+          listparam: ' al.f_hand_date>=to_date(\''+date+'\',\'yyyy-mm-dd hh24:mi:ss\') and  '
         }
         this.$emit('drill', 'longnotusegas', 'nogas', this.title, initdatatr)
         this.$emit('drilldata', total)
@@ -181,7 +179,7 @@
       'resdata': {
         deep: true,
         handler(val) {
-          console.log(this.resdata, '长期未用气用户统计')
+          console.log(this.resdata, '失联用户统计')
           this.processData()
           this.setBar('NoGas')
           this.$parent.loaddata++

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

@@ -95,10 +95,10 @@
             icon: 'circle',
             x:'center',
             bottom:'2%',
-            itemWidth: 20 ,
-            itemHeight: 10 ,
+            itemWidth: 20 * scale,
+            itemHeight: 10 * scale,
             textStyle: {
-              fontSize: 12 ,
+              fontSize: 12 * scale,
               color: '#ffffff'
             },
             data: ['已完成', '未完成']

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

@@ -85,10 +85,10 @@
             x:'33%',
             itemGap: 30,
             bottom:'2%',
-            itemWidth: 20 ,
-            itemHeight: 10 ,
+            itemWidth: 20 * scale,
+            itemHeight: 10 * scale,
             textStyle: {
-              fontSize: 12 ,
+              fontSize: 12 * scale,
               color: '#ffffff'
             },
             data: ['已处理', '未处理']

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

@@ -1,20 +1,22 @@
 <template>
   <div>
     <!--管网建设-->
-     <net-info class="border lineinspection"></net-info>
+    <net-work-one class="border construction"></net-work-one>
     <!--管网运行-->
-    <single-bar-line class="border gasvalue"></single-bar-line>
+    <supply-gas class="border gasvalue"></supply-gas>
     <!--巡线-->
-      <trend class="border construction"></trend>
+    <line-inspection class="border lineinspection"></line-inspection>
     <!--管网隐患-->
-    <weather class="border netdanger"></weather>
-    <guanwang  class="border-1 networkmap"></guanwang>
+    <net-danger class="border netdanger"></net-danger>
+    <net-work-map  class="border-1 networkmap"></net-work-map>
   </div>
 </template>
 
 <script>
+  import NetWorkMap from "./NetWorkMap";
   export default {
     name: "NetHome",
+    components: {NetWorkMap},
     data() {
       return {
         loaddata: 0