Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue

@@ -230,26 +230,25 @@
              containLabel: true
            },
          legend:{
            //设置默认不显示
            selected:{
                "曲线":false,
            },
            // selected:{
            //     "曲线":false,
            // },
            top:'0',
            right:'10',
            //设置单选多选模式
            selectedMode:'single',
            // selectedMode:'single',
            icon:"pin",
            data:[
              {
                name:'曲线',
                textStyle:{
                  padding:4,
                  color:'#e957ff',
                  // borderWidth:1,
                  fontSize:16,
                  // borderColor:'#50E6D7'
                }
              },
              // {
              //   name:'曲线',
              //   textStyle:{
              //     padding:4,
              //     color:'#e957ff',
              //     // borderWidth:1,
              //     fontSize:16,
              //     // borderColor:'#50E6D7'
              //   }
              // },
              {
                name:'柱状图',
                textStyle:{
@@ -306,52 +305,53 @@
              }
            },
            series:[
              {
              name:'曲线',
              type: 'line',
              smooth:true,
              symbol: 'circle',
              symbolSize: 8,
              label:{
                show:true,
                position:"top",
                textStyle:{
                  color:'#000',
                },
                formatter:"时长：{c}H"
              },
              itemStyle: {
                color: "rgb(87, 120, 225)",
                borderColor: "#fff",
                borderWidth: 2,
                shadowColor: 'rgba(0, 0, 0, .3)',
              },
              lineStyle: {
                normal: {
                  color:"rgb(87, 120, 225)",
                  shadowColor: 'rgba(87, 120, 225, .4)',
                  shadowBlur: 8,
                  shadowOffsetY: 10,
                  shadowOffsetX: 0,
                },
              },
              areaStyle: {
                normal: {
                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                    offset: 0,
                    color: 'rgba(87, 120, 225, .6)'
                  }, {
                    offset: 1,
                    color: 'rgba(87, 120, 225, .3)'
                  }]),
                }
              },
              data: [this.openingLong, this.closedLong, this.processLong,this.waitingLong],
            },
            //   {
            //   name:'曲线',
            //   type: 'line',
            //   smooth:true,
            //   symbol: 'circle',
            //   symbolSize: 8,
            //   label:{
            //     show:true,
            //     position:"top",
            //     textStyle:{
            //       color:'#000',
            //     },
            //     formatter:"时长：{c}H"
            //   },
            //   itemStyle: {
            //     color: "rgb(87, 120, 225)",
            //     borderColor: "#fff",
            //     borderWidth: 2,
            //     shadowColor: 'rgba(0, 0, 0, .3)',
            //   },
            //   lineStyle: {
            //     normal: {
            //       color:"rgb(87, 120, 225)",
            //       shadowColor: 'rgba(87, 120, 225, .4)',
            //       shadowBlur: 8,
            //       shadowOffsetY: 10,
            //       shadowOffsetX: 0,
            //     },
            //   },
            //   areaStyle: {
            //     normal: {
            //       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
            //         offset: 0,
            //         color: 'rgba(87, 120, 225, .6)'
            //       }, {
            //         offset: 1,
            //         color: 'rgba(87, 120, 225, .3)'
            //       }]),
            //     }
            //   },
            //   data: [this.openingLong, this.closedLong, this.processLong,this.waitingLong],
            // },
              {
                name:'柱状图',
                type: 'bar',
                data: [this.openingLong, this.closedLong, this.processLong,this.waitingLong],
                // data:[22,3,5,6],
                barWidth: 25,
                label:{
                  show:true,
@@ -366,9 +366,10 @@
                    color: function(params) {
                      let colorList = [
                        ["#6496e9","#6bded3"],
                        ["#ffbb65","#fdc68b"],
                        ["#849db8","#b4b8cc"],
                        ["#4fe1c5","#4ecee1"],
                        ["#9978fa","#88a1fa"],
                        // ["#9978fa","#88a1fa"],
                        ["#ffbb65","#fdc68b"],
                      ];
                      // return colorList[params.dataIndex];
                      let colorItem = colorList[params.dataIndex];
@@ -447,13 +448,22 @@
            {
            type: 'bar',
            data: [this.openingLong,this.totalLong],
              // data:[22,22],
            barWidth: 25,
              label:{
                show:true,
                position:"top",
                textStyle:{
                  color:'#000',
                },
                formatter:"时长：{c}H"
              },
            itemStyle: {
              normal: {
                color: function(params) {
                  let colorList = [
                    ["#6496e9","#6bded3"],
                    ["#ffbb65","#fdc68b"],
                    ["#9978fa","#88a1fa"],
                  ];
                  // return colorList[params.dataIndex];
                  let colorItem = colorList[params.dataIndex];
@@ -531,13 +541,22 @@
          series: [{
            type: 'bar',
            data: [this.processLong,this.openingLong],
            // data:[22,22],
            barWidth: 25,
            label:{
              show:true,
              position:"top",
              textStyle:{
                color:'#000',
              },
              formatter:"时长：{c}H"
            },
            itemStyle: {
              normal: {
                color: function(params) {
                  let colorList = [
                    ["#4fe1c5","#4ecee1"],
                    ["#9978fa","#88a1fa"],
                    ["#6496e9","#6bded3"],
                  ];
                  // return colorList[params.dataIndex];
                  let colorItem = colorList[params.dataIndex];
@@ -564,13 +583,16 @@
              this.StatCharOpeningRate = res.result.openRate;
              this.StatCharUsedRate = res.result.utilizationRate;
              this.UtilizationHeight = res.result.openRate;
              this.StatCharUsedopeningRate = res.result.StartupHeight;
              this.StartupHeight = res.result.StartupHeight;
              this.StatCharUsedopeningRate = res.result.usedOpenRate;
              this.StartupHeight = res.result.usedOpenRate;
              this.openingLong = this.getTime(res.result.openLong)
              this.waitingLong = this.getTime(res.result.waitLong);
              this.processLong = this.getTime(res.result.processLong);
              this.closedLong = this.getTime(res.result.closeLong);
              this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
              this.draw();
            }
            else{
              this.draw();
            }
          })
@@ -585,10 +607,17 @@
        let _this = this
        getAction(this.url.getBaseTree).then((res) => {
          if (res.success) {
            if(res.result[0]){
              _this.$set(this.queryParam, 'tierName', res.result[0].title)
            }
            // console.log(res.result[0].entity.tierName)
            _this.$set(this.queryParam, 'tierName', res.result[0].title)

          } else {
            this.$message.warn(res.message)
            // this.$message.warn(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
@@ -625,11 +654,11 @@
            this.$set(this.queryParam, 'tierName', val.title)
            this.$set(this.queryParam, 'equipmentId', val.equipmentId)
            this.queryParams.parentId = ''
            this.queryParams.equipmentIds = val.equipmentId
            this.queryParams.equipmentId = val.equipmentId
            this.searchQuery()
          }else{
            this.queryParams.parentId = val.key
            this.queryParams.equipmentIds = ''
            this.queryParams.equipmentId = ''
            this.$set(this.queryParam, 'tierName', val.title)
            this.searchQuery()
            }