manage-client 3.1.16 → 3.1.20

package/src/components/qinhua/qinHuaMap.vue

@@ -1,16 +1,13 @@
 <template>
-
-  <div>
-    <div style="width: 100%;height: 100%">
+    <div style="width: 30%;height: 55%">
       <!--<div  style="height: 40px;"><span v-for="i in list"  @click="selmap(i)">{{i}}———></span></div>-->
       <div :id="idname" style="text-align: left"></div>
     </div>
-  </div>
 </template>
 
 <script>
 
-  import '../../stores/shanxi1.js'
+  // import '../../stores/shanxi1.js'
 
   export default {
     name: 'echart-map',
@@ -21,7 +18,7 @@
     data () {
       return {
         mapdata: [
-          {name: 'qinhua', value: require('../../../static/qh.json')}
+          {name: 'wuhai', value: require('../../../static/wuhai.json')}
           // {name:'咸阳市',value:require('../../../static/xianyangshi.json')},
           // {name:'西安市',value:require('../../../static/xianshi.json')}
         ],
@@ -40,26 +37,7 @@
         this.xc = chart
         var scale = this.$parent.$parent.$parent.scale
         var geoCoordMap = {}
-        this.$echarts.registerMap(mapjson.name, mapjson.value, {
-          千阳县: {
-            // 左上角经度
-            left: 108.5,
-            // 左上角纬度
-            top: 34.4,
-            // 经度横跨的范围
-            width: 0.2
-          },
-          平利县: {
-            left: 109.1,
-            top: 33.8,
-            width: 0.2
-          },
-          卢氏县: {
-            left: 109.4,
-            top: 34.1,
-            width: 0.2
-          }
-        })
+        this.$echarts.registerMap(mapjson.name, mapjson.value)
         chart.showLoading()
         var mapFeatures = this.$echarts.getMap(mapjson.name).geoJson.features
         chart.hideLoading()
@@ -90,42 +68,42 @@
         if (this.mode == '1') {
           colormode = '#66f2de'
         }
-        var data = [
+        let data = [
      {
-            name: '秦华',
+            name: '海勃湾区',
             value: 2852946,
             minyong: 2828604,
             feiminyong: 24342
      },
           {
-            name: '港务区',
+            name: '海南区',
             value: 29910,
             minyong: 29514,
             feiminyong: 396
           },
           {
-            name: '千阳县',
+            name: '乌达区',
             value: 11195,
             minyong: 10996,
             feiminyong: 189
-          },
-          {
-            name: '平利县',
-            value: 3306,
-            minyong: 3274,
-            feiminyong: 32
-          },
-          {
-            name: '卢氏县',
-            value: 2506,
-            minyong: 2365,
-            feiminyong: 141
           }
+     //      {
+     //        name: '平利县',
+     //        value: 3306,
+     //        minyong: 3274,
+     //        feiminyong: 32
+     //      },
+     //      {
+     //        name: '卢氏县',
+     //        value: 2506,
+     //        minyong: 2365,
+     //        feiminyong: 141
+     //      }
         ]
-        var col = ['#2a4096', '#1285de', '#27459b', '#284ba5', '#225bb2', '#2353a8', '#244ca3', '#1775cd', '#1e64bc', '#05a0fc', '#108de7', '#1b6dc3']
+        let col = ['#2a4096', '#1285de', '#27459b', '#284ba5', '#225bb2', '#2353a8', '#244ca3', '#1775cd', '#1e64bc', '#05a0fc', '#108de7', '#1b6dc3']
         let colors = []
-        for (var i = 0; i < data.length; i++) {
-          var jo = {
+        for (let i = 0; i < data.length; i++) {
+          let jo = {
             name: data[i].name,
             itemStyle: {
               areaColor: col[i],
@@ -135,7 +113,7 @@
           }
           colors.push(jo)
         }
-        var option = {
+        let option = {
           title: {
             text: '',
             subtext: '',
@@ -156,14 +134,14 @@
             enterable: true,
             position: function (point, params, dom, rect, size) {
               //其中point为当前鼠标的位置，size中有两个属性：viewSize和contentSize，分别为外层div和tooltip提示框的大小
-              var x = point[0] //
-              var y = point[1]
-              var viewWidth = size.viewSize[0]
-              var viewHeight = size.viewSize[1]
-              var boxWidth = size.contentSize[0]
-              var boxHeight = size.contentSize[1]
-              var posX = 0 //x坐标位置
-              var posY = 0 //y坐标位置
+              let x = point[0] //
+              let y = point[1]
+              let viewWidth = size.viewSize[0]
+              let viewHeight = size.viewSize[1]
+              let boxWidth = size.contentSize[0]
+              let boxHeight = size.contentSize[1]
+              let posX = 0 //x坐标位置
+              let posY = 0 //y坐标位置
 
               if (x < boxWidth) { //左边放不开
                 posX = 5
@@ -195,24 +173,24 @@
             top: 'bottom',
             text: ['高', '低'],
             calculable: true,
-            show: false,
-            inRange: {
-              color: [
-                // "#1DE9B6", "#F46E36", "#04B9FF", "#5DBD32", "#FFC809", "#FB95D5", "#BDA29A", "#6E7074", "#546570", "#C4CCD3"
-                // "#ff002d"
-                // "#ffc188",
-                // "#479fd2",
-                // "#fba853",
-                // "#48c7c0",
-                // "#fa8737",
-                // "#4bbdd6",
-                // "#ff6f5b",
-                // "#F4D5B1",
-                // "#ADE1E3",
-                // "#F4B387",
-                // "#F0F3F4"
-              ]
-            }
+            show: false
+            // inRange: {
+            //   color: [
+            //     // "#1DE9B6", "#F46E36", "#04B9FF", "#5DBD32", "#FFC809", "#FB95D5", "#BDA29A", "#6E7074", "#546570", "#C4CCD3"
+            //     // "#ff002d"
+            //     // "#ffc188",
+            //     // "#479fd2",
+            //     // "#fba853",
+            //     // "#48c7c0",
+            //     // "#fa8737",
+            //     // "#4bbdd6",
+            //     // "#ff6f5b",
+            //     // "#F4D5B1",
+            //     // "#ADE1E3",
+            //     // "#F4B387",
+            //     // "#F0F3F4"
+            //   ]
+            // }
           },
 
           series: [
@@ -220,11 +198,9 @@
               type: 'effectScatter',
               coordinateSystem: 'geo',
               data: [
-                {"name": "秦华", "value": [108.94592, 34.27197]},
-                {"name": "港务区", "value": [109.06265, 34.39048]},
-                {"name": "千阳县", "value": [108.6, 34.45]},
-                {"name": "平利县", "value": [109.2, 33.98]},
-                {"name": "卢氏县", "value": [109.5, 34.17]}
+                {"name": "海勃湾区","value": [106.817762, 39.673527]},
+                {"name": "海南区","value": [106.884789, 39.44153]},
+                {"name": "乌达区","value": [106.722711, 39.502288]}
               ],
               rippleEffect: {
                 period: 10, // 动画时间，值越小速度越快

package/src/components/statistical/StatisticalAnalysis.vue

@@ -1,50 +1,49 @@
 <template lang="html">
   <div :class="classname"  :style="{width:width,height:height}">
-    <div class="form-horizontal select-overspread container-fluid auto">
-      <div class="row">
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" >使用公司:</label>
-          <res-select restype='organization'
-                      v-model="model.orgid"
-                      :initresid="model.id">
+    <div style="height: 97%;">
+      <div class="col-sm-3" style="height: 97%">
+        <div class="row form-group" style="height: 5%">
+            <label class="font_normal_body" >使用公司:</label>
+          <res-select :initresid='model.orgid'
+                      @res-select="getorg"
+                      :is-mul="false"
+                      class="select select_list"
+                      restype='organization'
+                      style="width: 60%">
           </res-select>
         </div>
-        <div style="text-align:center;"><p>营收系统数据统计信息</p></div>
-      </div>
-    </div>
-    <div style="height: 97%;">
-      <div class="col-sm-3 " style="height: 97%">
-        <div style="width: 100%;height: 97%;" align="center">
-          <p>用户数量</p>
-          <table border="1" style="text-align:center;">
-            <tr>
-              <th><nobr>现有户数</nobr></th>
-              <th><nobr>年度新增</nobr></th>
-              <th><nobr>本月新增</nobr></th>
+        <div class="row" style="margin-left: 5%;margin-right: 5%;height: 15%;text-align:center;" >
+          <h4 style="font-size: 18px;">用户数量</h4>
+          <table class="col-sm-12 table table-bordered table-striped" style="font-size: 16px;">
+            <tr class="text-center">
+              <th style="text-align:center;"><nobr>现有户数</nobr></th>
+              <th style="text-align:center;"><nobr>年度新增</nobr></th>
+              <th style="text-align:center;"><nobr>本月新增</nobr></th>
             </tr>
             <tr>
-              <td><nobr>{{num}}</nobr></td>
-              <td><nobr>{{year}}</nobr></td>
-              <td><nobr>{{month}}</nobr></td>
+              <td style="text-align:center;"><nobr>{{num}}</nobr></td>
+              <td style="text-align:center;"><nobr>{{year}}</nobr></td>
+              <td style="text-align:center;"><nobr>{{month}}</nobr></td>
             </tr>
           </table>
-          <div style="width: 100%;height: 50%">
-            <p style="text-align:center;" auto>民用分类实有户数</p>
-            <ring-chart :sdata="sdata2" ></ring-chart>
-          </div>
-          <div style="width: 100%;height: 50%">
-            <p style="text-align:center;">工商业分类实有户数</p>
-            <ring-chart :sdata="sdata1" ></ring-chart>
-          </div>
+        </div>
+        <div style="width: 100%;height: 40%;margin-top: 10%;text-align:center;">
+          <h4 style="font-size: 18px;">民用分类实有户数</h4>
+          <ring-chart :sdata="sdata2" ></ring-chart>
+        </div>
+        <div style="width: 100%;height: 40%;text-align:center;">
+          <h4 style="font-size: 18px;">工商业分类实有户数</h4>
+          <ring-chart :sdata="sdata1" ></ring-chart>
         </div>
       </div>
-      <div class="col-sm-6" style="height: 97%">
+      <div class="col-sm-6" style="height: 97%;text-align:center;">
+        <h3>营收系统数据统计信息</h3>
         <div style="width: 100%;height: 50%">
           <div>
             <bar-chart :xdata="xdata" :sdata="sdata" :legend="legendData" :xname="xname" :yname="yname"> </bar-chart>
           </div>
         </div>
-        <div style="width: 100%;height: 47%">
+        <div style="width: 100%;height: 50%">
         <div>
 <!--          <bussiness-type :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>-->
           <bar-chart :xdata="xdata3" :sdata="sdata3" :legend="legendData1" :xname="xname" :yname="yname"> </bar-chart>
@@ -52,8 +51,8 @@
         </div>
       </div>
       <div class="col-sm-3" style="height: 97%">
-          <div style="width: 100%;height: 97%" align="center">
-            <p>各类表具在用用户数量</p>
+          <div style="width: 100%;height: 95%;margin-top: 10%;margin-right: 5%;" align="center">
+            <h4 style="font-size: 18px;">各类表具在用用户数量</h4>
             <data-grid :model=mood class="table_sy"  partial='list' >
               <template partial='head' >
                 <tr>
@@ -98,22 +97,21 @@ export default {
     }
   },
   watch:{
-    'model.orgid'(val) {
-      if (val) {
-        // console.log("77777777777777777",val)
+    'f_orgid'(val) {
+      // if (val) {
         this.ks()
-      }
+      // }
     }
   },
   data() {
     return {
       jurisdiction: this.$login.r,
       model: {
-        id: [this.$login.f.orgid],
         orgid: [this.$login.f.orgid],
         startDate: Util.toStandardDateString(),
         endDate: Util.toStandardDateString()
       },
+      f_orgid: '',
       xdata:[],
       sdata: [],
       legendData: ['民用'],
@@ -129,15 +127,28 @@ export default {
       month:'',
       arr:[],
       arrs:[],
-      mood:''
+      mood:'',
+      resoptions: []
     }
 
   },
   ready() {
-    this.ks()
+
   },
   methods: {
     ks(){
+        this.xdata = []
+        this.sdata =  []
+        this.sdata1 = []
+        this.sdata2 = []
+        this.xdata3 =  []
+        this.sdata3 =  []
+        this.num = ''
+        this.year = ''
+        this.month = ''
+        this.arr = []
+        this.arrs = []
+        this.mood = ''
       this.getuser()
       this.getType()
       this.getType1()
@@ -146,39 +157,43 @@ export default {
       this.getmeterbrand()
       console.log("7777777777777",this.sdata)
     },
-    async  getuser (){
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      // this.$parent.f_orgid = this.f_orgid
+    },
+    async getuser (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-     await load.load('POST','rs/sql/getUser', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getUser', {data: {f_orgid: this.f_orgid}}).then((res) => {
           console.log("加载res",res)
         for (var i = 0; i < res.data.length; i++) {
           this.num = res.data[i].number
-          this.year= res.data[i].year
-          this.month= res.data[i].month
+          this.year = res.data[i].year
+          this.month = res.data[i].month
         }
         })
     },
-    async  getType (){
+    async getType (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getTypess', {data: {f_orgid: id}}).then((res) => {
-        const rdata=res.data
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getTypess', {data: {f_orgid: this.f_orgid}}).then((res) => {
+        const rdata = res.data
         for (let i = 0; i < rdata.length; i++) {
-          const  object={
-              value:rdata[i].f_type,
-              name:rdata[i].f_devices_type
+          const object={
+              value: rdata[i].f_type,
+              name: rdata[i].f_devices_type
           }
           this.sdata2.push(object)
         }
       })
     },
-    async  getType1 (){
+    async getType1 (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getTypek', {data: {f_orgid: id}}).then((res) => {
-        const rdata=res.data
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getTypek', {data: {f_orgid: this.f_orgid}}).then((res) => {
+        const rdata = res.data
         for (let i = 0; i < rdata.length; i++) {
-          const  object={
+          const object = {
             value:rdata[i].f_type,
             name:rdata[i].f_devices_type
           }
@@ -186,10 +201,10 @@ export default {
         }
       })
     },
-    async  getnumber (){
+    async getnumber (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getNumberss', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getNumberss', {data: {f_orgid: this.f_orgid}}).then((res) => {
         const rdata=res.data
         for (let i = 0; i < rdata.length; i++) {
           this.arr.push(rdata[i].num)
@@ -199,10 +214,10 @@ export default {
         this.sdata.push(this.arr)
       })
     },
-    async  getnumber1 (){
+    async getnumber1 (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getNumbers', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getNumbers', {data: {f_orgid: this.f_orgid}}).then((res) => {
         console.log("加载res3",res)
         const rdata=res.data
         for (let i = 0; i < rdata.length; i++) {
@@ -216,20 +231,16 @@ export default {
         this.sdata3.push(this.arrs)
       })
     },
-    async  getmeterbrand (){
+    async getmeterbrand (){
       let load = new HttpResetClass()
-      let id = this.model.orgid.toString()
-      await load.load('POST','rs/sql/getMeterbrand', {data: {f_orgid: id}}).then((res) => {
+      // let id = this.model.orgid.toString()
+      await load.load('POST','rs/sql/getMeterbrand', {data: {f_orgid: this.f_orgid}}).then((res) => {
         this.mood=res
       })
-    },
-    searchdata () {
-      this.$refs.pay.searchdata()
-    },
-    // getRes (obj) {
-    //   this.model.orgid = obj
-    //   // this.ks()
-    // }
+    }
+    // searchdata () {
+    //   this.$refs.pay.searchdata()
+    // },
   }
 }
 </script>