manage-client 3.2.4 → 3.2.6-aode

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

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

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

package/src/components/ManageHomeCS/NewHome/NewManageHome.vue

@@ -3,34 +3,20 @@
     <!--导航栏-->
     <div class="manage-navigation">
       <div class="navigation-title"><div class="navigation-date">{{date}}</div></div>
-      <div class="safe-manage">
-
-        <label class="font_normal_body">组织机构</label>
-        <res-select :initresid='curorgid'
-                    @res-select="getorg"
-                    :is-mul="true"
-                    restype='organization'
-                    @blur="$parent.getOrgid()"
-                    class="select">
-        </res-select>
-
-
-      </div>
+      <div class="safe-manage" @click=goto()>安全服务平台</div>
     </div>
     <!--&lt;!&ndash;正文&ndash;&gt;-->
     <div class="manage-text">
       <!--1-->
-      <text-user :orgid="orgid" class="text-user" ref="text-user"></text-user>
+      <text-user class="text-user" ref="text-user"></text-user>
       <text-shanximap class="text-shanximap" ref="text-shanximap"></text-shanximap>
-      <text-sellgas :orgid="orgid" class="text-sellgas" ref="text-sellgas"></text-sellgas>
+      <text-sellgas class="text-sellgas" ref="text-sellgas"></text-sellgas>
       <text-totalsellgas class="text-totalsellgas" ref="text-totalsellgas"></text-totalsellgas>
-      <text-childsellgas :orgid="orgid" class="text-childsellgas" ref="text-childsellgas"></text-childsellgas>
-      <text-profit :orgid="orgid" class="text-profit" ref="text-profit"></text-profit>
-      <text-business  :orgid="orgid" class="text-business" ref="text-business"></text-business>
-      <!--用气性质分布图-->
-      <text-gasproperties :orgid="orgid" class="text-gasproperties" ref="text-gasproperties"></text-gasproperties>
+      <text-childsellgas class="text-childsellgas" ref="text-childsellgas"></text-childsellgas>
+      <text-profit class="text-profit" ref="text-profit"></text-profit>
+      <text-business class="text-business" ref="text-business"></text-business>
     </div>
-    <loading v-if="initdatashow"></loading>
+    <!--<loading v-if="initdatashow"></loading>-->
     <loading v-if="initdatashow"  :backurl="backurl"></loading>
   </div>
 </template>
@@ -39,144 +25,40 @@
   import * as Util from '../../../stores/Util'
   import * as DataSql from '../../../stores/DataSql'
   import co from 'co'
-  import {HttpResetClass} from "vue-client";
-  import * as ldapHelper from "system-clients/src/util/LdapHelper";
-  import plugins from "../../../plugins/GetLoginInfoService";
-  let saveGen = function * (self) {
-    //获取分公司树
-    let data = {
-      source: "tool.getFullTree(this.getRights().where(row.getType() == $organization$))",
-      userid: "15"
-    }
-    let http = new HttpResetClass()
-    let ret = yield http.load('POST', `/rs/search`, data, {resolveMsg: null, rejectMsg: null})
-    console.log('res-------------------------------')
-    console.log(ret)
-  }
+
   export default {
     title: "经营管控",
+    props: {
+      homeflag:Boolean,
+    },
     data() {
       return {
-        backurl:'static/ManageHomePic/加载数据1.gif',
+        backurl:'../../../static/ManageHomePic/加载数据1.gif',
         date:'',   //获取当前时间
-        initdatashow:true,
-        curorgid:['31307'],
-        orgcondition:'',
-        orgid:'',
-        // obj: {
-        //   userid: this.$login.f.id,
-        //   source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        //   res: this.$login.f.f_fengongsi,
-        //   resids: this.$login.f.f_orgids
-        // }
+        initdatashow:true
       }
     },
     methods: {
-      getorg(obj) {
-        console.log('回调---------------=======================')
-        console.log(obj)
-        let str = JSON.stringify(obj)
-        str = str.replace(/"/g,`'`)
-        str = str.replace(/\[/g,``)
-        str = str.replace(/\]/g,``)
-        console.log("=====小区model22222222222绑定====",str)
-        this.orgid=str
-        //查询多个小区时条件
-        // args.condition += ` and f_residential_area in  ( ${str} )`
-
-
-      },
       // 定时获取时间
      getdate(){
        var self=this
        setInterval(() => {
          self.date=Util.toStandardTimeString()
-         var refreshHours = new Date().getHours();
-         var refreshMin = new Date().getMinutes();
-         var refreshSec = new Date().getSeconds();
-         // console.log('时间是----------------------------------------')
-         // console.log(refreshHours)
-         // console.log(refreshMin)
-         // console.log(refreshSec)
-         if(refreshHours=='0' && refreshMin=='0' && refreshSec=='0'){
-           // 指定每天凌晨做的事情
-           window.reload()
-
-         }
        }, 1000)
      },
-      getRes (obj) {
-        this.orgname = obj.res[0]
-        this.depresid = obj.resids
-        this.f_orgid = obj.resids
+      goto(){
+        this.$parent.homeflag=false
       },
-
     },
     watch: {
 
-    },
-    created(){
-      // debugger
-      this.$login.f.id ='15'
-      // this.$login.f.f_orgid ='1123'
     },
     ready() {
      this.getdate()
       var self=this
       setTimeout(function () {
         self.initdatashow=false
-      },2000)
-
-      let gen = saveGen(this)
-      return co(gen)
+      },3000)
     }
   }
 </script>
-
-<style scoped>
-  .safe-manage {
-    float: right;
-    background-color: #041343;
-    border: solid 1px #0b87e2;
-    letter-spacing: 2px;
-    color: #ffffff;
-    font-size: 1.8rem;
-    height: 66%;
-    margin: 0.5% 2%;
-    padding: 8px 2%;
-    width: 28%;
-  }
-  .select{
-    width: 100%;
-  }
-  .font_normal_body{
-    font-size: 1.8rem !important;
-    line-height: 15px;
-    color: white;
-  }
-  .text-profit{
-    top:64%
-  }
-  .text-sellgas{
-    height: 24%;
-  }
-
-  .text-gasproperties {
-      position: absolute;
-      background-image: url('/static/NewManageHome/分公司年度购进量.png');
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      top: 26%;
-      left:70%;
-      width: 28%;
-      height: 26%;
-      text-align: center;
-      padding-top: 1px;
-    }
-   .text-business{
-     top: 54%;
-     height: 44%;
-   }
-
-
-</style>