manage-client 3.2.33 → 3.2.34-aode

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

@@ -7,199 +7,196 @@
     <div class="text-1">
       <div id="textchildsellgas"></div>
     </div>
-    <img class="img-bottom" src="/static/NewManageHome/1.gif" />
+    <img class="img-bottom" src="../../../../static/NewManageHome/1.gif" />
   </div>
 </template>
 
 <script>
   import * as DataSql from '../../../stores/DataSql'
   import co from 'co'
-  import * as Util from "../../../stores/Util";
 
 
   export default {
     name: "TextChildsellgas",
-    props: ['orgid'],
+    props: {
+      showdate: {
+        type: Boolean,
+        default: false
+      },
+      listenheight: String,
+    },
     data() {
       return {
-
+        date: [2018, 2017, 2016],
         xc: '',
-        timer:'',
-        resdata: [],
-        salvProName1 :[],
-        salvProValue1:[],
-        start:0,
-        end:2,
+        warn: '',
+        suspicious: '',
+        resdata: '',
+        monitordata: [],
+        monitordata1: [],
+        monitorscale: [],
+        grade: ['汉投', '城然', '安康', '商洛'],
       }
     },
     methods: {
       setBar() {
         this.xc = this.$echarts.init(document.getElementById('textchildsellgas'))
-        var salvProName =this.salvProName1
-        var salvProValue =this.salvProValue1
-        var salvProMax =[];//背景按最大值
-        for (let i = 0; i < salvProValue.length; i++) {
-          salvProMax.push(salvProValue[0])
+        var scale=this.$parent.$parent.scale*1.2
+        var data = {
+          grade: this.grade,
+          visits: [1000,1080,1380,1200],
+          totalCost: [1380,1380, 1380, 1380],
+          cost: this.monitorscale,
         }
-        var oroptionmapjsonr_charts=this.xc
-        var option={
-          dataZoom: [//滑动条
-            {
-              yAxisIndex: 0,//这里是从X轴的0刻度开始
-              show: false,//是否显示滑动条，不影响使用
-              type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
-              startValue:this.start,// 从头开始。
-              endValue:this.end , // 一次性展示2个。
-            }
-          ],
-          // backgroundColor:"#003366",
+        var rich = {
+          blue: {
+            fontSize:18*scale,
+            color: '#15dce2'
+          },
+          white: {
+            color: '#fff'
+          }
+        }
+        this.xc.setOption({
+
           grid: {
-            left: '2%',
-            right: '2%',
-            bottom: '2%',
-            top: '2%',
-            containLabel: true
+            left: '15%',
+            right: '15%',
+            top: '8%',
+            bottom: '0'
           },
           xAxis: {
             show: false,
-            type: 'value'
           },
-
-          yAxis: [{
+          yAxis: {
             type: 'category',
-            inverse: true,
             axisLabel: {
+              margin: 10 * scale,
               show: true,
-              textStyle: {
-                color: '#fff',
-                fontSize:16
-              },
-            },
-            splitLine: {
-              show: false
+              color: '#95bad7',
+              fontSize: 12 * scale
             },
             axisTick: {
-              show: false
+              show: false,
             },
             axisLine: {
-              show: false
+              show: false,
             },
-            data: salvProName
-          }, {
-            type: 'category',
-            inverse: true,
-            axisTick: 'none',
-            axisLine: 'none',
-            show: false,
-            axisLabel: {
-              textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-              },
-            },
-            data:salvProValue
-          }],
+            data: data.grade
+          },
           series: [{
-            name: '值',
             type: 'bar',
-            zlevel: 1,
+            barGap: '-100%',
+            label: {
+              normal: {
+                show: true,
+                position: 'right',
+                fontSize: 18*scale,
+                formatter:
+                  function (param) {
+                    return '{blue|' + data.visits[param.dataIndex] + ' 万}';
+                  },
+                rich: rich,
+              }
+            },
+            barWidth: '30%',
             itemStyle: {
               normal: {
-                barBorderRadius: 30,
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                  offset: 0,
-                  color: 'rgb(57,89,255,1)'
-                }, {
-                  offset: 1,
-                  color: 'rgb(46,200,207,1)'
-                }]),
-              },
+                // borderColor: 'rgba(1,207,242,0.05)',
+                borderWidth: 2,
+                barBorderRadius: 15*scale,
+                color: '#003d4c'
+              }
             },
-            label:{
-                  show: true,
-                  position: 'right',
-                  fontSize:22,
-                  color:"#14d7de",
-                  formatter: function(data) {
-                    // console.log('lable的数据是-----------------------------------')
-                    // console.log(DataSql.dataunit(data.data))
-                    return DataSql.dataunit(data.data);
-
-                  },
-                },
-            barWidth: 20,
-            data: salvProValue
-          },
-            {
-              name: '背景',
-              type: 'bar',
-              barWidth: 20,
-              barGap: '-90%',
-              data: salvProMax,
-              itemStyle: {
-                normal: {
-                  color: 'rgba(24,31,68,1)',
-                  barBorderRadius: 30,
+            z: 1,
+            data:  data.totalCost,
+            // data: da
+          }, {
+            type: 'bar',
+            barGap: '-99%',
+            barWidth: '30%',
+            itemStyle: {
+              normal: {
+                barBorderRadius: 16 * scale,
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  x1: 1,
+                  colorStops: [{
+                    offset: 0,
+                    color: '#6fd9d0'
+                  }, {
+                    offset: 1,
+                    color: '#6fd9d0'
+                  }]
                 }
               },
             },
-          ]
-        }
-        oroptionmapjsonr_charts.setOption(option)
-        const a=this.salvProValue1.length
-        this.timer=setInterval(function () {
-          // 每次向后滚动一个，最后一个从头开始。
-          if (option.dataZoom[0].endValue === a ) {
-            option.dataZoom[0].endValue = 2;
-            option.dataZoom[0].startValue = 0;
-          }
-          else {
-            option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1;
-            option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1;
-          }
-          oroptionmapjsonr_charts.setOption(option);
-        }, 2000);
-
-
+            label:{
+              formatter:function (param) {
+                console.log(param,'cdd')
+              }
+            },
+            max: 1,
+            labelLine: {
+              show: true,
+            },
+            z: 2,
+            data:  data.visits,
+          }]
+        })
       },
       searchdata() {
-        console.log('进入购进量查询-------------------')
-        let year = Util.toStandardDateString()
-        year = year.toString().substring(0, 4)
-        // startDate.toString().substring(0,4)
-        let sqldata = DataSql.getData(this,'purchase',{startDate:year}, 'resdata')
+        let warndata = DataSql.getData(this,'warningcount',{}, 'resdata')
+        co(warndata)
+        let sqldata = DataSql.getData(this, 'monitor',{}, 'monitordata')
         co(sqldata)
       },
+      scale() {
+        var l = this.monitordata1[1]
+        for (var i = 1; i < 5; i++) {
+          l = l + this.monitordata1[i + 1]
+          if (l < this.monitordata1[i + 1]) {
+            l = this.monitordata1[i + 1]
+          }
+        }
+        l = l * 1.3
+        for (var i = 1; i < 6; i++) {
+          if (this.monitordata1[i] == 0 || l == 0) {
+            this.monitorscale[i] = 0
+            continue
+          }
+          this.monitorscale[i] = this.monitordata1[i] / l
+        }
+        this.monitorscale[0] = 0
+      },
     },
     watch: {
       'resdata': {
         deep: true,
         handler(val) {
-          clearInterval(this.timer);
-          console.log('resdata监听 购进量====================================')
-          console.log(val)
-          // this.searchdata()
-          // this.warn = this.resdata[0].warn
-          // this.suspicious = this.resdata[0].suspicious
-          // this.$parent.loaddata++
-          for (let i = 0; i < val.length; i++) {
-              this.salvProName1.push(val[i].f_orgname.replaceAll('有限公司',''))
-              this.salvProValue1.push(val[i].value)
-
+          this.warn = this.resdata[0].warn
+          this.suspicious = this.resdata[0].suspicious
+          this.$parent.loaddata++
+        }
+      },
+      'monitordata': {
+        deep: true,
+        handler(val) {
+          let s = []
+          for (var i = 1; i < 6; i++) {
+            s[i] = this.monitordata[0][this.grade[i]]
           }
+          this.monitordata1 = s
+          // this.scale()
           this.setBar()
+          this.$parent.loaddata++
         }
       },
-      'orgid'(val){
-        console.log('进入orgid监听=======================')
-        console.log(val)
-        // this.orgid
-        clearInterval(this.timer);
-        this.searchdata()
-      },
     },
     ready() {
-      this.searchdata()
+      this.setBar()
+      // this.searchdata()
     }
   }
 </script>

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

@@ -1,33 +1,34 @@
 <template>
   <div align="center">
-
+    <div class="text-profit1">利润总额&nbsp;&nbsp;<span>165255万</span>
+    </div>
     <div class="text-profit2">
       <span class="title-1">营业收入</span>
       <div class="text-1">
         <div id="textprofit" style="text-align: left"></div>
 
       </div>
-      <img class="img-bottom" src="/static/NewManageHome/3.gif" />
+      <img class="img-bottom" src="../../../../static/NewManageHome/3.gif" />
     </div>
 
   </div>
 </template>
 
 <script>
-  import * as Util from "../../../stores/Util";
-  import * as DataSql from "../../../stores/DataSql";
-  import co from "co";
-
   export default {
     name: "TextProfit",
-    props:['orgid'],
+    props: {
+      listenheight: String,
+    },
     data() {
       return {
         xc: '',
-        name:[],
-        value:[],
+        construction: {//建设数据
+          Built: [200, 100, 60,111],//已建数据
+          rebuilt: [20, 15, 40,60],//在建数据
+          approved: [180, 85, 20,51],//审批数据
+        },
         timer:'',
-        resdata:'',
       }
     },
     beforeDestroy() {
@@ -37,8 +38,8 @@
     methods: {
       setBar() {
         this.xc = this.$echarts.init(document.getElementById('textprofit'))
-        var oroptionmapjsonr_charts=this.xc
-        var option={
+        var scale=this.$parent.$parent.scale
+        this.xc.setOption({
           title: {
             text: '',
             subtext: '',
@@ -54,7 +55,7 @@
                 opacity:0.3
               }
             },
-            padding:10,
+            padding:10*scale,
             show: true,
             alwaysShowContent:true,
             backgroundColor:'#01396d',
@@ -65,7 +66,7 @@
             triggerOn:'mousemove',
             enterable:true,
               textStyle:{
-                  fontSize:16
+                  fontSize:16*scale
               },
             formatter: function (params) {
               if (params[0].axisValue == '') {
@@ -73,7 +74,7 @@
               }
               var result = ''
               params.forEach(function (item) {
-                  result +="<span style=\"text-align: left;font-weight: normal\">"+  item.marker + " " + "收入" + "&nbsp;&nbsp;  <span style=\"color:#e1e52a;font-weight: bolder\">" +  item.value.toFixed(2) + "</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\">" +  item.value + "</span></span></br>";
               });
               return "<div style='text-align: center;height: 1px;font-weight: normal'>"+params[0].axisValue + '</div><br/>' + result
             },
@@ -103,32 +104,24 @@
             },
             extraCssText:'width: auto;height:auto;',
           },
+
           legend: {
             // icon: 'circle',
             // icon: 'diamond',
             y: 'top',
             right:'2%',
             itemGap: 20,
-            itemWidth: 20 ,
-            itemHeight: 10 ,
+            itemWidth: 20 * scale,
+            itemHeight: 10 * scale,
             padding: [0, 25, 0, 0],
-            data: this.name,
+            data: ['收入', '支出', '利润'],
             textStyle: {
-              fontSize: 14 ,
+              fontSize: 14 * scale,
               color: '#95bad7'          // 图例文字颜色
             }
           },
           grid: {left: '5%', top: "20%",  right: "5%",bottom:'5%', containLabel: true},
           calculable: true,
-          dataZoom: [//滑动条
-            {
-              xAxisIndex: 0,//这里是从X轴的0刻度开始
-              show: false,//是否显示滑动条，不影响使用
-              type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
-              startValue:0,// 从头开始。
-              endValue:2 , // 一次性展示2个。
-            }
-          ],
           xAxis: [
             {
               type: 'category',
@@ -144,11 +137,11 @@
                 interval: 0,
                 length: '100px',
               },
-              data: this.name,           //图分段的段名
+              data: ['城燃', '汉投', '安康','商洛'],           //图分段的段名
               axisLabel: {
                 show: true,
                 textStyle: {
-                  fontSize: 14 ,
+                  fontSize: 14 * scale,
                   color: '#95bad7'
                 }
               }
@@ -156,12 +149,12 @@
           ],
           yAxis: [
             {
-              name: '(万/元)',
+              name: '(千万/元)',
               nameLocation: "end",
               type: 'value',
               nameTextStyle: {
-                fontSize: 14 ,
-                padding: [50, 35 , 0, 0],
+                fontSize: 14 * scale,
+                padding: [50, 35 * scale, 0, 0],
                 color: '#15dce2',
               },
               axisLine: {
@@ -174,7 +167,7 @@
               axisLabel: {
                 show: true,
                 textStyle: {
-                  fontSize: 14 ,
+                  fontSize: 14 * scale,
                   color: '#95bad7'
                 }
               },
@@ -189,107 +182,91 @@
             }
           ],
           barCategoryGap: '2%',
-          series: {
-            type: 'bar',
-            // barGap: 0,
-            barCategoryGap: '1%',
-            barWidth: '18%',
-            data: this.value,
-            hoverAnimation: false,
-            // label: {
-            //   show: true,
-            //   position: 'top',
-            //   textStyle: { //数值样式
-            //     color: '#95bad7',
-            //     fontSize: 14
-            //   }
-            // },
-            itemStyle: {
-              normal: {color: '#6fd9d0',},
-            }
-          }
-        }
-
-        let idx = 0;
-        // var oroptionmapjsonr_charts1=this.xc
-        // this.timer=setInterval(()=>{
-        //   idx = (idx+ 1) % 4;
-        //   oroptionmapjsonr_charts1.dispatchAction({
-        //     type: 'showTip',
-        //     seriesIndex: 1,
-        //     dataIndex: idx
-        //   });
-        //
-        // }, 3000)
+          series: [
+            {
+              name: '收入',
+              type: 'bar',
+              // barGap: 0,
+              barCategoryGap: '1%',
+              barWidth: '18%',
+              data: this.construction.Built,
+              hoverAnimation: false,
+              label: {
+                show: true,
+                position: 'top',
+                textStyle: { //数值样式
+                  color: '#95bad7',
+                  fontSize: 14 * scale
+                }
+              },
+              itemStyle: {
+                normal: {color: '#6fd9d0',},
+              }
+            },
+            {
+              name: '支出',
+              type: 'bar',
+              //  barGap: 0,
+              barCategoryGap: '1%',
+              barWidth: '18%',
+              data: this.construction.rebuilt,
+              hoverAnimation: false,
+              label: {
+                show: true,
+                position: 'top',
+                textStyle: { //数值样式
+                  color: '#95bad7',
+                  fontSize: 14 * scale
+                }
+              },
+              itemStyle: {normal: {color: '#f7cb32'}},
+            },
+            {
+              name: '利润',
+              type: 'bar',
+              //    barGap: 0,
+              barCategoryGap: '1%',
+              barWidth: '18%',
+              data: this.construction.approved,
+              hoverAnimation: false,
+              label: {
+                show: true,
+                position: 'top',
+                textStyle: { //数值样式
+                  color: '#95bad7',
+                  fontSize: 14 * scale
+                }
+              },
+              itemStyle: {normal: {color: '#7393db'}},
+            },
+          ],
+        }, true)
 
-        const a=this.value.length
-        oroptionmapjsonr_charts.setOption(option)
-        this.timer=setInterval(function () {
-          // 每次向后滚动一个，最后一个从头开始。
-          if (option.dataZoom[0].endValue === a ) {
-            option.dataZoom[0].endValue = 2;
-            option.dataZoom[0].startValue = 0;
-          }
-          else {
-            option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1;
-            option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1;
-          }
-          oroptionmapjsonr_charts.setOption(option);
-          idx = (idx+ 1) % a;
-            oroptionmapjsonr_charts.dispatchAction({
-              type: 'showTip',
-              seriesIndex: 0,
-              dataIndex: idx
-            });
-        }, 3000);
+        let idx = -1;
+        var oroptionmapjsonr_charts1=this.xc
+        this.timer=setInterval(()=>{
+          idx = (idx+ 1) % 4;
+          oroptionmapjsonr_charts1.dispatchAction({
+            type: 'showTip',
+            seriesIndex: 1,
+            dataIndex: idx
+          });
 
-      },
-      searchdata() {
-        console.log('营业厅收入-------------------')
-        let year = Util.toStandardDateString()
-        let startDate = year.toString().substring(0, 4)
-        let endDate = parseInt(startDate)+1
-        // startDate.toString().substring(0,4)
-        let sqldata = DataSql.getData(this,'serviceHall',{startDate:startDate,endDate:endDate,orgid:this.orgid}, 'resdata')
-        co(sqldata)
+        }, 3000)
       },
     },
     watch: {
-      'resdata': {
+      'listenheight': {
         deep: true,
         handler(val) {
-          console.log('进入营业厅收入=========================监听')
-          console.log(val)
-          clearInterval(this.timer);
-          this.name=[]
-          this.value=[]
-          if(val.length===0){
-            this.name.push('其他')
-            this.value.push(0)
-          }else{
-            for (let i = 0; i < val.length; i++) {
-              if(val[i].f_depname===null){
-                this.name.push('其他')
-              }else{
-                this.name.push(val[i].f_depname)
-              }
-
-              this.value.push(val[i].value/1000)
-
+          if (this.listenheight !== '') {
+            // this.$parent.$parent.changeresize(this.xc)
           }
-
-          }
-          this.setBar()
         },
-
-      },
-      'orgid'(val){
-        clearInterval(this.timer);
-        this.searchdata()
       }
     },
     ready() {
-
+      this.setBar()
     }
   }
 </script>