manage-client 3.2.83-aode → 3.2.83-jb

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

@@ -4,7 +4,7 @@
     <div class="text-1">
       <div id="texttotalsellgas" style="text-align: left"></div>
     </div>
-    <img class="img-bottom" src="../../../../static/NewManageHome/1.gif" />
+    <img class="img-bottom" src="/static/NewManageHome/1.gif" />
   </div>
 </template>
 
@@ -99,7 +99,7 @@
             type: 'bar',
             barWidth: '30%',
             itemStyle: {
-              barBorderRadius: [16*scale,16*scale,0,0],
+              barBorderRadius: [16,16,0,0],
               color:colors[v],
             },
             // emphasis:{
@@ -117,13 +117,13 @@
           type: 'line',
           symbol: "circle",
           yAxisIndex: 1,
-          symbolSize: 5 * scale,
+          symbolSize: 5 ,
           itemStyle: {
             normal: {
               lineStyle: {
                 width: 1,
-                shadowBlur: 10 * scale,
-                shadowOffsetY: 15 * scale,
+                shadowBlur: 10 ,
+                shadowOffsetY: 15 ,
               }
             }
           },
@@ -138,7 +138,7 @@
           title: {
             text: '',
             textAlign: 'left',
-            textStyle: {color: "#FFFFFF", fontSize: 12 * scale, fontWeight: "normal"}
+            textStyle: {color: "#FFFFFF", fontSize: 12 , fontWeight: "normal"}
           },
           legend: {
             itemGap: 20,
@@ -150,11 +150,11 @@
             y: '0',
             // padding: [0, 25, 0, 0],
             // padding: [0, 25*scale, 0, 0],
-            itemWidth: 20 * scale,
-            itemHeight: 10 * scale,
+            itemWidth: 20 ,
+            itemHeight: 10 ,
             textStyle: {
               padding:[0,10,0,0],
-              fontSize: 14 * scale,
+              fontSize: 14 ,
               color: '#95bad7'          // 图例文字颜色
             },
             formatter: function (params) {
@@ -168,7 +168,7 @@
           grid: {left: '5%', top: "24%",  right: "5%", width: '88%', height: '70%', containLabel: true},
           tooltip: {
               textStyle:{
-                  fontSize:16*scale
+                  fontSize:16
               },
             alwaysShowContent:true,
             position: function(point, params, dom, rect, size) {
@@ -201,7 +201,10 @@
               var result = ''
               params.forEach(function (item) {
                 var s = item.value
+                // console.log('valueresult---------------------------------')
+
                 var sary = s.toString().split('.')
+                // console.log(sary)
                 var l = 3
                 for (var i = sary[0].toString().length - 1; i > -1; i--) {
                   if (sary[0].toString().length - i == l) {
@@ -214,14 +217,14 @@
                 }
                 var valueresult = ''
                 if (sary.length > 1) {
-                  valueresult = sary[0] + '.' + sary[1]
+                  valueresult = sary[0] + '.' + sary[1].substring(0,2)
                 } else {
                   valueresult = sary[0]
                 }
                  if(item.seriesName=='占比'){
-                   result +="<span style='font-weight: normal'>"+ item.marker + " 占&nbsp;&nbsp;&nbsp;&nbsp;比  &nbsp;&nbsp;&nbsp;<span style=\"color:#e1e52a;font-weight: bolder\">" + valueresult + "</span></span></br>";
+                   result +="<span style='font-weight: normal'>"+ item.marker + " 占&nbsp;&nbsp;&nbsp;&nbsp;比  &nbsp;&nbsp;&nbsp;<span style=\"color:#e1e52a;font-weight: bolder\">" + Math.floor(valueresult * 100) / 100 + "</span></span></br>";
                  }else {
-                   result +="<span style=\"text-align: left;font-weight: normal\">"+  item.marker + " " + item.seriesName + "年 &nbsp;&nbsp; <span style=\"color:#e1e52a;font-weight: bolder\">" + valueresult + "</span></span></br>";
+                   result +="<span style=\"text-align: left;font-weight: normal\">"+  item.marker + " " + item.seriesName + "年 &nbsp;&nbsp; <span style=\"color:#e1e52a;font-weight: bolder\">" + valueresult.toString()    + "</span></span></br>";
                  }
               });
               return "<div style='text-align: center;height: 1px;font-weight: normal'>"+params[0].axisValue + '月份</div><br/>' + result
@@ -229,10 +232,10 @@
             backgroundColor:'#01396d',
             // borderColor :'rgba(13, 109, 180)',
             borderWidth:0,
-            hideDelay:100*scale,
+            hideDelay:100,
             triggerOn:'mousemove',
             enterable:true,
-            padding:10*scale,
+            padding:10,
             trigger: 'axis',
             axisPointer: { // 坐标轴指示器，坐标轴触发有效
               type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
@@ -245,12 +248,12 @@
               type: 'category',
               boundaryGap: true,
               nameTextStyle: {
-                fontSize: 12 * scale,
+                fontSize: 12 ,
                 color: '#15dce2',
                 padding: [38, 0, 0, -20],
               },
               axisLine: {show: true, lineStyle: {color: '#04669e', width: 1}},
-              axisLabel: {interval: 0, textStyle: {color: '#95bad7', fontSize: 14 * scale}},
+              axisLabel: {interval: 0, textStyle: {color: '#95bad7', fontSize: 14 }},
               axisTick: {show: false},
               data: xAxisData,
             },
@@ -260,11 +263,11 @@
               name: '金额/元',
               nameTextStyle: {
                 color:'#15dce2',
-                fontSize: 14 * scale,
-                padding: [0, 35 * scale, 0, 0],
+                fontSize: 14 ,
+                padding: [0, 35 , 0, 0],
               },
               axisTick: {show: false},
-              axisLine: {show: true, lineStyle: {color: '#08738e', fontSize: 14 * scale}},
+              axisLine: {show: true, lineStyle: {color: '#08738e', fontSize: 14 }},
               splitLine: {show: true, lineStyle: {type: 'dashed', color: '#004371'}},
               axisLabel: {
                 textStyle: {color: '#95bad7', fontSize: 14 * scale}, formatter: function (params) {
@@ -284,12 +287,12 @@
               position: 'right',
               nameTextStyle: {
                 color:'#15dce2',
-                fontSize: 14 * scale,
+                fontSize: 14 ,
                 padding: [0, 0, 0, 0],
               },
               axisTick: {show: false},
               splitLine: {show: false, lineStyle: {type: 'dashed', color: '#004371'}},
-              axisLine: {show: true, lineStyle: {color: '#08738e', fontSize: 14 * scale}},
+              axisLine: {show: true, lineStyle: {color: '#08738e', fontSize: 14 }},
               axisLabel:{show:true,color:'#95bad7'}
             },
           ],

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

@@ -5,9 +5,9 @@
        <div class="text-11">
         <table>
           <tr>
-            <td><span  style="color: #ffff2c;">{{totaluser}}</span> <br/> 现有总客户数</td>
-            <td><span  style="color: #66fade;">{{apply}}</span><br/> 开发客户数</td>
-            <td><span  style="color: #f29961;">{{hiddenuser}}</span><br/> 潜在客户数</td>
+            <td><span  style="color: #ffff2c;">{{totaluser}}</span> <br/>现有总用户数</td>
+            <td><span  style="color: #66fade;">{{apply}}</span><br/>民用户数</td>
+            <td><span  style="color: #f29961;">{{hiddenuser}}</span><br/>非民用户数</td>
           </tr>
         </table>
        </div>
@@ -15,7 +15,7 @@
        <div id="textuser"></div>
        </div>
       </div>
-      <img class="img-bottom" src="../../../../static/NewManageHome/1.gif" />
+      <img class="img-bottom" src="/static/NewManageHome/1.gif" />
     </div>
 </template>
 
@@ -24,6 +24,9 @@
   import co from 'co'
 
     export default {
+      props:[
+        'orgid'
+      ],
         name: "TextUser",
       data() {
         return {
@@ -38,24 +41,27 @@
           resdataapply: 0,  //报建用户数
           apply: '',  //报建用户数
           timer:'',
+          orgid:''
         }
       },
       methods: {
         //绘图
         setBar() {
           this.xc = this.$echarts.init(document.getElementById('textuser'))
-          var scale=this.$parent.$parent.scale*0.8
+          // var scale=this.$parent.$parent.scale*0.8
           DataSql.dataunitarray(this, 'usernum', 'usernumstring')
           var echartData = this.usernum
-          var echartData1 = this.usernumstring
-          var rich = {
-            blue: {
-              color: '#15dce2',
-              fontSize: 12 * scale,
-              align: 'center',
-              padding: [15*scale, 0, 15*scale, 0]
-            }
-          }
+          console.log('echartData---------------------dddddddddddddddddddddddddddddddddddddddddddddddd')
+          console.log(echartData)
+          // var echartData1 = this.usernumstring
+          // var rich = {
+          //   blue: {
+          //     color: '#15dce2',
+          //     fontSize: 12 ,
+          //     align: 'center',
+          //     padding: [15, 0, 15, 0]
+          //   }
+          // }
           var total = 0; //用户总和
           var result = ''
           echartData.forEach(function (value) {
@@ -63,6 +69,8 @@
           });
           var index = total.toString().length
           if (index > 4) {
+            console.log('total---------------------------------')
+            console.log(total)
             var t = total.toString().substring(0, index - 4)
             var s = total.toString().substring(index - 4, index - 3)
             var l = total.toString().substring(index - 3, index - 2)
@@ -74,9 +82,10 @@
               t = eval(t + '+1')
             }
             result = t + '.' + s + '万'
-          } else {
-            result = value
           }
+          // else {
+          //   result=total
+          // }
          var color= ['#6fd9d0', '#ede61f', '#6d9bdc']
           function appendBaseColor(dataList, colorList, opacity){
             const temp = [];
@@ -101,7 +110,7 @@
                 top: '25%',
                 textStyle: {
                   color: '#ffffff',
-                  fontSize: 16 * scale,
+                  fontSize: 16 ,
 
                 }
               },
@@ -109,10 +118,10 @@
                 text: result,
                 left: '45%',
                 top: '35%',
-                padding: [10 * scale, 10 * scale],
+                padding: [10 , 10 ],
                 textStyle: {
                   color: '#00e2ea',
-                  fontSize: 16 * scale,
+                  fontSize: 16 ,
 
                 }
               }],
@@ -122,11 +131,11 @@
               backgroundColor:'#01396d',
               // borderColor :'rgba(13, 109, 180)',
               borderWidth:0,
-              hideDelay:100*scale,
+              hideDelay:100,
               triggerOn:'mousemove',
-              padding:10*scale,
+              padding:10,
                 textStyle:{
-                    fontSize:18*scale
+                    fontSize:18
                 },
               formatter: function (params) {
                   return  params.marker + " <span style=\"font-weight: normal\"> " + params.name + "</span>  <span style=\"color:#e1e52a;font-weight: bolder\">&nbsp;&nbsp;" + params.value + "</span>"
@@ -163,14 +172,14 @@
               icon: 'circle',
               x: 'center',
               bottom: '6%',
-              itemWidth: 20 * scale,
-              itemHeight: 10 * scale,
+              itemWidth: 20 ,
+              itemHeight: 10 ,
               textStyle: {
-                fontSize: 12 * scale,
-                padding: [0, 0, 0, 4 * scale],
+                fontSize: 12 ,
+                padding: [0, 0, 0, 4 ],
                 color: '#ffffff'
               },
-              data: ['民用', '非民用', '民用锅炉']
+              data: ['民用', '非民用', '其他']
             },
             series: [
               {
@@ -225,12 +234,8 @@
         },
         //请求后台数据
         searchdata() {
-          let sqldata = DataSql.getData(this, 'user',{}, 'resdata')
+          let sqldata = DataSql.getData(this, 'user',{orgid:this.orgid}, 'resdata')
           co(sqldata)
-          let sqldatapie = DataSql.getData(this,'useri',{}, 'resdatapie')
-          co(sqldatapie)
-          let sqldataone = DataSql.getData(this,'userapply',{}, 'resdataapply')
-          co(sqldataone)
         },
       },
       beforeDestroy() {
@@ -238,59 +243,134 @@
         clearInterval(this.timer);
       },
       watch: {
-        // 监听用户数据并进行绘图
-        'usernum': {
+
+        'resdata': {
           deep: true,
           handler(val) {
+            clearInterval(this.timer);
+            console.log('进入监听================================')
+            console.log('val',val)
+            this.usernum = []
+            console.log(val.length)
+            if(val.length===0){
+              let result = {}
+              let result2 = {}
+              let result3 = {}
+              result3.name='民用'
+              result3.value=0
+              this.usernum[2]=result3
+              result.name='其他'
+              result.value=0
+              this.usernum[0]=result
+              result2.name='非民用'
+              result2.value=0
+              this.usernum[1]=result2
+            } else
+            if(val[0].f_user_type===null){ // 如果第一个 时null
+              let result = {}
+              let result2 = {}
+              let result3 = {}
+              result.name='其他'
+              result.value=val[0].num
+              this.usernum[0]=result
+              if(val[1]===undefined){ //如果没有第二个  后面两个都给0
+                result2.name='非民用'
+                result2.value=0
+                this.usernum[1]=result2
+                result3.name='民用'
+                result3.value=0
+                this.usernum[2]=result3
+              }else if(val[1].f_user_type==='非民用'){ // 如果第二个是  非民用 是
+                result2.name='非民用'
+                result2.value=val[1].num
+                this.usernum[1]=result2
+                if(val[2]===undefined){ // 如果第三个 没有时
+                  result3.name='民用'
+                  result3.value=0
+                  this.usernum[2]=result3
+                }else{ // 如果 有 就是 民用
+                  result3.name='民用'
+                  result3.value=val[2].num
+                  this.usernum[2]=result3
+                }
+              }else if(val[2]===undefined){ // 如果第三个没有时
+                result3.name='民用'
+                result3.value=0
+                this.usernum[2]=result3
+              }else{
+                result3.name='民用'
+                result3.value=val[2].num
+                this.usernum[2]=result3
+              }
+            }else
+
+            if(val[0].f_user_type==='非民用'){ // 如果第一个值是 非民用 其他就肯定是没有值的 那就给0
+              let result = {}
+              let result2 = {}
+              let result3 = {}
+              result2.name='非民用'
+              result2.value=val[0].num
+              this.usernum[1]=result2
+              result.name='其他'
+              result.value=0
+              this.usernum[0]=result
+              if(val[1]===undefined){ //如果第二值 没有 给0
+                result3.name='民用'
+                result3.value=0
+                this.usernum[2]=result3
+              }else if(val[1].f_user_type==='民用'){
+                result3.name='民用'
+                result3.value=val[1].num
+                this.usernum[2]=result3
+              }
+            }else
+
+            if(val[0].f_user_type==='民用'){ //如果第一个值为民用时 那就是 其他和非民用没值  就给这个两个补0
+              let result = {}
+              let result2 = {}
+              let result3 = {}
+              result3.name='民用'
+              result3.value=val[0].num
+              this.usernum[2]=result3
+              result.name='其他'
+              result.value=0
+              this.usernum[0]=result
+              result2.name='非民用'
+              result2.value=0
+              this.usernum[1]=result2
+            }
+            console.log('-------------------------------------------------------------------------------------------------')
+            console.log("this.usernum=================")
+            console.log(this.usernum)
             var value = this.usernum[0].value + this.usernum[1].value + this.usernum[2].value
+            var value1 = this.usernum[2].value
+            var value2 =this.usernum[1].value
             this.totaluser = DataSql.dataunit(value)
+            this.apply = DataSql.dataunit(value1)
+            this.hiddenuser = DataSql.dataunit(value2)
+
             this.setBar()
-            this.$parent.loaddata++
-          }
-        },
-        'resdata': {
-          deep: true,
-          handler(val) {
-            this.usernum = []
-            let result = {}
-            result.name = '民用'
-            result.value = this.resdata[0]['民用']
-            this.usernum.push(result)
-            let result1 = {}
-            result1.name = '非民用'
-            result1.value = this.resdata[0]['非民用']
-            this.usernum.push(result1)
-            let result2 = {}
-            result2.name = '民用锅炉'
-            result2.value = this.resdata[0]['民用锅炉']
-            this.usernum.push(result2)
           }
         },
-        'resdatapie': {
-          deep: true,
-          handler(val) {
-            var totalnum = 0
-            for (var i = 1; i < 6; i++) {
-              let item0 = {}
-              totalnum = totalnum + this.resdatapie[i].totalnum
-            }
-            this.hiddenuser = DataSql.dataunit(totalnum / 5,)
-          }
+        'orgid'(val){
+          console.log('进入orgid监听=======================')
+          console.log(val)
+          // this.orgid
+          clearInterval(this.timer);
+
+          this.searchdata()
         },
-        'resdataapply': {
-          deep: true,
-          handler(val) {
 
-            this.apply = DataSql.dataunit(this.resdataapply[0].totalnum)
-          }
-        }
       },
 
       ready() {
         // 拼接sql，请求后台
-        this.searchdata()
+        // this.searchdata()
+
       }
     }
+
+
 </script>
 
 <style scoped>