manage-client 3.2.83-aode → 3.2.83-jb

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,36 +145,25 @@
       },
       // 查询sql
       sqlsearch() {
-        var date = DataSql.toBeforeDate(1065)
-        let getData = DataSql.getData(this,  'longnotbuygas',{startDate:date,f_filiale:this.$parent.$parent.f_filiale}, 'resdata')
+        let getData = DataSql.getData(this,  'longnotbuygas',{condition:'1=1'}, 'resdata')
         co(getData)
       },
       //整理数据
       processData() {
-        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++
-        })
+        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 = ['一', '二', '四', '六']
-        var i = 3
-        num.forEach(function (s) {
+        let date = ['0-7', '7-30', '30-90', '90-180', '180-360','>360']
+        var i = 5
+        num.forEach( (row)=> {
           let item = {}
           item.name = date[i]
-          item.value = s
+          item.value = num[i]
           self.nobuygasdata.push(item)
           i--
         })
@@ -182,15 +171,11 @@
       },
       // 钻取入口
       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: '  al.f_operate_date>=to_date(\''+date+'\',\'yyyy-mm-dd hh24:mi:ss\') and '
+          listparam: '1=1 '
         }
         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,8 +28,7 @@
         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)
@@ -38,19 +37,8 @@
         }
         this.$parent.warningnum = this.$parent.warningnum + num
         xAxisData.push("")
-        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 = ' 月份'
+
+        var yname = ' 日'
         for (var v = 0; v < legendData.length; v++) {
           var serie = {
             name: legendData[0],
@@ -60,7 +48,7 @@
             barGap: "20%",
             itemStyle: {
               normal: {
-                color: "#013e48",
+                color: '#6fd9d0',
                 label: {
                   show: true,
                   textStyle: {
@@ -69,32 +57,14 @@
                   },
                   position: "top",
                   formatter: function (p) {
-                    var s = p.value > 0 ? (p.value) : 0
-                    return '{white|' + s + '}'
-                  },
-                  rich: rich
+                    return p.value > 0 ? (p.value) : 0;
+                  }
                 }
               }
             },
             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({
@@ -116,10 +86,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 ''
@@ -127,10 +97,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',
@@ -143,7 +113,7 @@
               nameTextStyle: {
                 fontSize: 14 * scale,
                 color: '#15dce2',
-                padding: [48 * scale, 0, 0, -70 * scale],
+                padding: [40 * scale, 0, 0, -70 * scale],
               },
               axisLine: {show: true, lineStyle: {color: '#04669e', width: 1}},
               axisLabel: {interval: 0, textStyle: {color: '#ffffff', fontSize: 14 * scale}},
@@ -169,37 +139,38 @@
       },
       // 查询sql
       sqlsearch() {
-        // 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')
+        let getData = DataSql.getData(this, 'lossassociation',{condition:'1=1'}, 'resdata')
         co(getData)
       },
       //整理数据
       processData() {
-          var self=this
-        this.resdata.forEach(function (s) {
+        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)=> {
           let item = {}
-          item.name = s.dates
-          item.value = s.num
+          item.name = date[i]
+          item.value = num[i]
           self.nocontactdata.push(item)
-
+          i--
         })
-        console.log(this.nocontactdata,'5456456')
+        console.log("========================>this.nocontactdata",this.nocontactdata)
       },
+
       // 钻取入口
       drillclick() {
-        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 total = this.nocontactdata
         var initdatatr = {
-          startDate:date ,
-          endDate: Util.toStandardDateString() + ' 00:00:00',
           param: '',
           param1: '',
-          listparam: ' al.f_hand_date>=to_date(\''+date+'\',\'yyyy-mm-dd hh24:mi:ss\') and '
+          listparam: '1=1 '
         }
         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: '20%',
+            barWidth: '30%',
             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: "3%", right: "5%", containLabel: true},
+          grid: {left: '4%', top: "18%", bottom: "5%", 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,35 +141,37 @@
       sqlsearch() {
         // var date = DataSql.toBeforeDate(365)
         // DataSql.param = date + ' 00:00:00'
-        let getData = DataSql.getData(this, 'longnotusegas',{f_filiale:this.$parent.$parent.f_filiale}, 'resdata')
+        let getData = DataSql.getData(this,  'longnotusegas',{condition:'1=1'}, 'resdata')
         co(getData)
       },
       //整理数据
       processData() {
-       var self=this
-        this.resdata.forEach(function (s) {
+        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)=> {
           let item = {}
-          item.name = s.dates
-          item.value = s.num
+          item.name = date[i]
+          item.value = num[i]
           self.nousegasdata.push(item)
-
+          i--
         })
         console.log(this.nousegasdata)
       },
       // 钻取入口
       drillclick() {
-        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 total = this.nousegasdata
         var initdatatr = {
-          startDate: date,
-          endDate: Util.toStandardDateString() + ' 00:00:00',
           param: '',
           param1: '',
-          listparam: ' al.f_hand_date>=to_date(\''+date+'\',\'yyyy-mm-dd hh24:mi:ss\') and  '
+          listparam: '1=1 '
         }
         this.$emit('drill', 'longnotusegas', 'nogas', this.title, initdatatr)
         this.$emit('drilldata', total)
@@ -179,7 +181,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 * scale,
-            itemHeight: 10 * scale,
+            itemWidth: 20 ,
+            itemHeight: 10 ,
             textStyle: {
-              fontSize: 12 * scale,
+              fontSize: 12 ,
               color: '#ffffff'
             },
             data: ['已完成', '未完成']

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

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

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

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

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

@@ -61,12 +61,12 @@
             x: 'right',
             y: 'top',
             itemGap: 20,
-            itemWidth: 20 * scale,
-            itemHeight: 10 * scale,
+            itemWidth: 20 ,
+            itemHeight: 10 ,
             // padding: [0, 25, 0, 0],
             data: ['已建', '在建', '审批'],
             textStyle: {
-              fontSize: 14 * scale,
+              fontSize: 14 ,
               color: '#ffffff'          // 图例文字颜色
             }
           },