1、公司级与分厂级看板调整OEE图表样式 2、各看板中的饼图图表增加随分辨率变化而改变自身半径功能，从而更清晰的展示内容标题指示箭头 3、OEE综合效...

zhaowei

2024-07-31 d55fef9c7205b412cadc99c2bb2dea9329b7a2c9

1、公司级与分厂级看板调整OEE图表样式
2、各看板中的饼图图表增加随分辨率变化而改变自身半径功能，从而更清晰的展示内容标题指示箭头
3、OEE综合效率分析页面新增车间字段

 src/views/dashboard/BranchFactorySignage.vue

@@ -69,7 +69,12 @@
    },
    data() {
      return {
        firstEnterClientWidth: null,
        pieChartRadius: ['40%', '60%'],
        normalPieChartRadius: ['40%', '60%'],
        currentPageProductionId: null,
        runningStateChart: '',
        runningStateChartDataRequireFinished: false,
        runningStateData: [
          { value: '0', name: '关机' },
          { value: '0', name: '报警' },
@@ -79,12 +84,14 @@
        efficiencyChart: '',
        efficiencyData: [],
        techConditionChart: '',
        techConditionChartRequireFinished: false,
        techConditionData: [
          { value: '0', name: '合格' },
          { value: '0', name: '禁用' },
          { value: '0', name: '限用' }
        ],
        warrantyMalfunctionChart: '',
        warrantyMalfunctionChartRequireFinished: false,
        warrantyMalfunctionData: [
          { value: '0', name: '报修' },
          { value: '0', name: '停机' },
@@ -136,6 +143,7 @@
      }
    },
    mounted() {
      this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
      window.addEventListener('resize', this.handleWindowResize)
      this.getChartDataByApi()
    },
@@ -167,8 +175,12 @@
        })
        signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
          .then(res => {
            if (res.success) this.runningStateData = res.result.list
            this.drawRunningStateChart(res.result.productionId)
            if (res.success) {
              this.runningStateData = res.result.list
              this.currentPageProductionId = res.result.productionId
              this.runningStateChartDataRequireFinished = true
              this.drawRunningStateChart(res.result.productionId)
            }
          })
      },

@@ -183,8 +195,10 @@
        })
        signageApi.getEquipmentUtilizationStatisticsApi(this.productionCode)
          .then(res => {
            if (res.success) this.efficiencyData = res.result
            this.drawEfficiencyChart()
            if (res.success) {
              this.efficiencyData = res.result
              this.drawEfficiencyChart()
            }
          })
      },

@@ -205,8 +219,9 @@
                { value: res.result[0].disabledCount, name: '禁用', technologyStatus: 'disabled' },
                { value: res.result[0].limitedUseCount, name: '限用', technologyStatus: 'limitedUse' }
              ]
              this.techConditionChartRequireFinished = true
              this.drawTechConditionChart()
            }
            this.drawTechConditionChart()
          })
      },

@@ -227,8 +242,9 @@
                { value: res.result[0].stopCount, name: '停机', isStop: '2' },
                { value: res.result[0].noStopCount, name: '运行', isStop: '1' }
              ]
              this.warrantyMalfunctionChartRequireFinished = true
              this.drawWarrantyMalfunctionChart()
            }
            this.drawWarrantyMalfunctionChart()
          })
      },

@@ -272,8 +288,10 @@
        })
        signageApi.getEquipmentOEEStatistics(this.productionCode)
          .then(res => {
            if (res.success) this.barChartData = res.result
            this.drawBarChart()
            if (res.success && res.result && res.result.length > 0) {
              this.barChartData = res.result
              this.drawBarChart()
            }
          })
      },

@@ -288,8 +306,10 @@
        })
        signageApi.getEquipmentMonthStatisticsApi(this.productionCode)
          .then(res => {
            if (res.success) this.doubleBarChartData = res.result
            this.drawDoubleBarChart()
            if (res.success) {
              this.doubleBarChartData = res.result
              this.drawDoubleBarChart()
            }
          })
      },

@@ -301,7 +321,6 @@
            this.drawWorkshopProblemChart()
          })
      },


      /* 绘制设备运行状态玫瑰饼图 */
      drawRunningStateChart(productionId) {
@@ -350,7 +369,7 @@
              type: 'pie',
              roseType: 'angle', // 玫瑰图
              // selectedMode: "single",
              radius: ['40%', '60%'],
              radius: this.pieChartRadius,
              center: ['53%', '50%'],
              color: [
                '#8B8B8B',
@@ -664,7 +683,7 @@
            {
              type: 'pie',
              // selectedMode: "single",
              radius: ['40%', '60%'],
              radius: this.pieChartRadius,
              center: ['50%', '60%'],
              color: [
                '#0FC61A',
@@ -753,7 +772,7 @@
            {
              type: 'pie',
              // selectedMode: "single",
              radius: ['40%', '60%'],
              radius: this.pieChartRadius,
              center: ['50%', '60%'],
              color: [
                '#24F2F5',
@@ -815,6 +834,7 @@
      /* 绘制单柱图 */
      drawBarChart() {
        const defaultData = []
        const colorArray = ['#79CEAA', '#F589A2', '#6FBF9D', '#66DFE2', '#A7F0C1', '#FAE893', '#F7B7A0']
        const dataMax = +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value
        let yAxisMax
        if (dataMax === 0) yAxisMax = 1 // 若数据中最大值为0，则将背景默认值设置为1
@@ -868,11 +888,13 @@
            axisLabel: {
              show: true, // 是否显示刻度标签，默认显示
              interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
              rotate: this.barChartData.length >= 5 ? -30 : 0, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
              rotate: this.barChartData.length >= 6 ? -30 : 0, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
              inside: false, // 刻度标签是否朝内，默认朝外
              margin: 10, // 刻度标签与轴线之间的距离
              formatter: value => {
                return `${this.barChartData.find(item => item.productionId === value).name}`
              }
              },
              fontSize: 14
            },
            axisTick: {
              show: true,
@@ -886,7 +908,8 @@
            interval: yAxisInterval,
            axisLabel: {
              formatter: '{value}',
              color: '#fff'
              color: '#fff',
              fontSize: 14
            },
            axisTick: {
              show: false
@@ -907,37 +930,42 @@
          series: [{
            type: 'bar',
            data: this.barChartData,
            barWidth: '15%',
            barWidth: this.barChartData.length > 5 ? '40%' : 30,
            itemStyle: {
              color: '#55D6A5'
              color: function(params) {
                let num = colorArray.length
                return colorArray[params.dataIndex % num]
              },
              barBorderRadius: 100
            },
            zlevel: 1,
            label: {
              show: true,
              show: false,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
                else return params.value
              },
              position: 'inside',
              position: 'top',
              textStyle: {
                color: '#fff',
                fontSize: 18
                fontSize: 16
              }
            }
          },
            {
              name: '背景',
              type: 'bar',
              barWidth: '15%',
              barWidth: this.barChartData.length > 5 ? '40%' : 30,
              barGap: '-100%',
              data: defaultData,
              itemStyle: {
                color: '#11294d'
                color: '#11294d',
                barBorderRadius: 100
              }
            }]
        }
        option.title.text = moment().subtract(1, 'months').format('M月') + `OEE车间`
        option.title.text = moment().subtract(1, 'months').format('M月') + `OEE`
        this.barChart.setOption(option, true)
        this.barChart.hideLoading()

@@ -958,7 +986,7 @@
      /* 绘制双柱图 */
      drawDoubleBarChart() {
        const option = {
          color: ['#409EFF', '#0FC61A'],
          color: ['#66DFE2', '#79CEAA'],
          tooltip: {
            confine: true,
            formatter: function(params) {
@@ -1001,7 +1029,7 @@
              }
            },
            axisLabel: {
              fontSize: 12,
              fontSize: 14,
              color: '#fff'
            },
            axisTick: {
@@ -1031,7 +1059,7 @@
                }
              },
              axisLabel: {
                fontSize: 12,
                fontSize: 14,
                color: '#fff',
                fontFamily: 'Bebas'
              }
@@ -1048,7 +1076,7 @@
                show: false
              },
              axisLabel: {
                fontSize: 12,
                fontSize: 14,
                formatter: '{value}%', // 右侧Y轴文字显示
                fontFamily: 'Bebas',
                color: '#6A93B9'
@@ -1060,11 +1088,11 @@
          series: [{
            type: 'bar',
            barWidth: 15,
            itemStyle: { barBorderRadius: [3, 3, 0, 0] },
            itemStyle: { barBorderRadius: 100 },
            name: 'OEE',
            data: this.doubleBarChartData.oeeList,
            label: {
              show: true,
              show: false,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
@@ -1079,11 +1107,11 @@
          }, {
            type: 'bar',
            barWidth: 15,
            itemStyle: { barBorderRadius: [3, 3, 0, 0] },
            itemStyle: { barBorderRadius: 100 },
            name: '利用率',
            data: this.doubleBarChartData.utilizationList,
            label: {
              show: true,
              show: false,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
@@ -1130,11 +1158,28 @@
        this.modalVisible = true
      },

      re_drawPieChart() {
        const clientWidth = document.body.clientWidth || document.documentElement.clientWidth
        if (this.firstEnterClientWidth != 1920) {
          this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / 1920)) + '%')
        } else {
          this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / this.firstEnterClientWidth)) + '%')
        }
        console.log('pieChartRadius', this.pieChartRadius)
        this.$nextTick(() => {
          // 数据未加载完成无需重绘图表，不然无法区分接口返回正常与否
          if (this.runningStateChartDataRequireFinished) this.drawRunningStateChart(this.currentPageProductionId)
          if (this.techConditionChartRequireFinished) this.drawTechConditionChart()
          if (this.warrantyMalfunctionChartRequireFinished) this.drawWarrantyMalfunctionChart()
        })
      },

      /**
       * 窗口尺寸变化时触发
       * 调整图表尺寸以适应分辨率
       */
      handleWindowResize() {
        this.re_drawPieChart()
        if (this.runningStateChart) this.runningStateChart.resize()
        if (this.efficiencyChart) this.efficiencyChart.resize()
        if (this.techConditionChart) this.techConditionChart.resize()

 src/views/dashboard/EquipmentSignage.vue

@@ -831,7 +831,7 @@
            axisLabel: {
              interval: 0,
              show: true,
              fontSize: 12,
              fontSize: 14,
              color: '#fff'
              // rotate: -30,
            },
@@ -880,7 +880,8 @@
              max: 100,
              axisLabel: {
                show: true,
                color: '#fff'
                color: '#fff',
                fontSize:14
              },
              axisLine: {
                show: true,

 src/views/dashboard/IndexSignage.vue

@@ -57,7 +57,12 @@
    components: { SignageModal },
    data() {
      return {
        firstEnterClientWidth: null,
        pieChartRadius: ['40%', '55%'],
        normalPieChartRadius: ['40%', '55%'],
        currentPageProductionId: null,
        runningStateChart: '',
        runningStateChartDataRequireFinished: false,
        runningStateData: [
          { value: '0', name: '关机' },
          { value: '0', name: '报警' },
@@ -67,16 +72,18 @@
        efficiencyChart: '',
        efficiencyData: [],
        techConditionChart: '',
        techConditionChartRequireFinished: false,
        techConditionData: [
          { value: '0', name: '合格' },
          { value: '0', name: '禁用' },
          { value: '0', name: '限用' }
        ],
        warrantyMalfunctionChart: '',
        warrantyMalfunctionChartRequireFinished: false,
        warrantyMalfunctionData: [
          { value: '12', name: '报修' },
          { value: '10', name: '停机' },
          { value: '8', name: '运行' }
          { value: '0', name: '报修' },
          { value: '0', name: '停机' },
          { value: '0', name: '运行' }
        ],
        supportPlanList: [
          {
@@ -125,7 +132,9 @@
      }
    },
    mounted() {
      this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
      window.addEventListener('resize', this.handleWindowResize)
      this.re_drawPieChart()
      this.getChartDataByApi()
    },
    beforeDestroy() {
@@ -156,8 +165,12 @@
        })
        signageApi.getEquipmentStatusStatisticsApi()
          .then(res => {
            if (res.success) this.runningStateData = res.result.list
            this.drawRunningStateChart(res.result.productionId)
            if (res.success) {
              this.runningStateData = res.result.list
              this.currentPageProductionId = res.result.productionId
              this.runningStateChartDataRequireFinished = true
              this.drawRunningStateChart(res.result.productionId)
            }
          })
      },

@@ -172,8 +185,10 @@
        })
        signageApi.getEquipmentUtilizationStatisticsApi()
          .then(res => {
            if (res.success) this.efficiencyData = res.result
            this.drawEfficiencyChart()
            if (res.success) {
              this.efficiencyData = res.result
              this.drawEfficiencyChart()
            }
          })
      },

@@ -194,8 +209,9 @@
                { value: res.result[0].disabledCount, name: '禁用', technologyStatus: 'disabled' },
                { value: res.result[0].limitedUseCount, name: '限用', technologyStatus: 'limitedUse' }
              ]
              this.techConditionChartRequireFinished = true
              this.drawTechConditionChart()
            }
            this.drawTechConditionChart()
          })
      },

@@ -216,8 +232,9 @@
                { value: res.result[0].stopCount, name: '停机', isStop: '2' },
                { value: res.result[0].noStopCount, name: '运行', isStop: '1' }
              ]
              this.warrantyMalfunctionChartRequireFinished = true
              this.drawWarrantyMalfunctionChart()
            }
            this.drawWarrantyMalfunctionChart()
          })
      },

@@ -261,8 +278,10 @@
        })
        signageApi.getEquipmentOEEStatistics()
          .then(res => {
            if (res.success) this.barChartData = res.result
            this.drawBarChart()
            if (res.success && res.result && res.result.length > 0) {
              this.barChartData = res.result
              this.drawBarChart()
            }
          })
      },

@@ -277,8 +296,10 @@
        })
        signageApi.getEquipmentMonthStatisticsApi()
          .then(res => {
            if (res.success) this.doubleBarChartData = res.result
            this.drawDoubleBarChart()
            if (res.success) {
              this.doubleBarChartData = res.result
              this.drawDoubleBarChart()
            }
          })
      },

@@ -290,7 +311,6 @@
            this.drawWorkshopProblemChart()
          })
      },


      /* 绘制设备运行状态玫瑰饼图 */
      drawRunningStateChart(productionId) {
@@ -340,7 +360,7 @@
              type: 'pie',
              roseType: 'angle', // 玫瑰图
              // selectedMode: "single",
              radius: ['40%', '55%'],
              radius: this.pieChartRadius,
              center: ['50%', '60%'],
              color: [
                '#8B8B8B',
@@ -651,7 +671,7 @@
            {
              type: 'pie',
              // selectedMode: "single",
              radius: ['40%', '55%'],
              radius: this.pieChartRadius,
              center: ['45%', '60%'],
              color: [
                '#0FC61A',
@@ -739,7 +759,7 @@
            {
              type: 'pie',
              // selectedMode: "single",
              radius: ['40%', '55%'],
              radius: this.pieChartRadius,
              center: ['45%', '60%'],
              color: [
                '#24F2F5',
@@ -799,6 +819,7 @@
      /* 绘制单柱图 */
      drawBarChart() {
        const defaultData = []
        const colorArray = ['#79CEAA', '#F589A2', '#6FBF9D', '#66DFE2', '#A7F0C1', '#FAE893', '#F7B7A0']
        const dataMax = +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value
        let yAxisMax
        if (dataMax === 0) yAxisMax = 1 // 若数据中最大值为0，则将背景默认值设置为1
@@ -854,10 +875,11 @@
              interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
              rotate: this.barChartData.length >= 6 ? -30 : 0, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
              inside: false, // 刻度标签是否朝内，默认朝外
              margin: 6, // 刻度标签与轴线之间的距离
              margin: 10, // 刻度标签与轴线之间的距离
              formatter: value => {
                return `${this.barChartData.find(item => item.productionId === value).name}`
              }
              },
              fontSize: 14
            },
            axisTick: {
              show: true,
@@ -871,7 +893,8 @@
            interval: yAxisInterval,
            axisLabel: {
              formatter: '{value}',
              color: '#fff'
              color: '#fff',
              fontSize: 14
            },
            axisTick: {
              show: false
@@ -892,37 +915,42 @@
          series: [{
            type: 'bar',
            data: this.barChartData,
            barWidth: '15%',
            barWidth: this.barChartData.length > 5 ? '40%' : 30,
            itemStyle: {
              color: '#55D6A5'
              color: function(params) {
                let num = colorArray.length
                return colorArray[params.dataIndex % num]
              },
              barBorderRadius: 100
            },
            zlevel: 1,
            label: {
              show: true,
              show: false,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
                else return params.value
              },
              position: 'inside',
              position: 'top',
              textStyle: {
                color: '#fff',
                fontSize: 18
                fontSize: 16
              }
            }
          },
            {
              name: '背景',
              type: 'bar',
              barWidth: '15%',
              barWidth: this.barChartData.length > 5 ? '40%' : 30,
              barGap: '-100%',
              data: defaultData,
              itemStyle: {
                color: '#11294d'
                color: '#11294d',
                barBorderRadius: 100
              }
            }]
        }
        option.title.text = moment().subtract(1, 'months').format('M月') + `OEE车间`
        option.title.text = moment().subtract(1, 'months').format('M月') + `OEE`
        this.barChart.setOption(option, true)
        this.barChart.hideLoading()

@@ -942,7 +970,7 @@
      /* 绘制双柱图 */
      drawDoubleBarChart() {
        const option = {
          color: ['#409EFF', '#0FC61A'],
          color: ['#66DFE2', '#79CEAA'],
          tooltip: {
            confine: true,
            formatter: function(params) {
@@ -985,7 +1013,7 @@
              }
            },
            axisLabel: {
              fontSize: 12,
              fontSize: 14,
              color: '#fff'
            },
            axisTick: {
@@ -1001,9 +1029,6 @@
              type: 'value',
              min: 0,
              minInterval: 1,
              splitArea: {
                show: false
              },
              axisLine: {
                show: true
              },
@@ -1018,7 +1043,7 @@
                }
              },
              axisLabel: {
                fontSize: 12,
                fontSize: 14,
                color: '#fff',
                fontFamily: 'Bebas'
              }
@@ -1035,10 +1060,10 @@
                show: false
              },
              axisLabel: {
                fontSize: 12,
                fontSize: 14,
                formatter: '{value}%', // 右侧Y轴文字显示
                fontFamily: 'Bebas',
                color: '#fff'
                color: '#6A93B9'
              },
              splitArea: {
                show: false
@@ -1047,11 +1072,11 @@
          series: [{
            type: 'bar',
            barWidth: 15,
            itemStyle: { barBorderRadius: [3, 3, 0, 0] },
            itemStyle: { barBorderRadius: 100 },
            name: 'OEE',
            data: this.doubleBarChartData.oeeList,
            label: {
              show: true,
              show: false,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
@@ -1066,11 +1091,11 @@
          }, {
            type: 'bar',
            barWidth: 15,
            itemStyle: { barBorderRadius: [3, 3, 0, 0] },
            itemStyle: { barBorderRadius: 100 },
            name: '利用率',
            data: this.doubleBarChartData.utilizationList,
            label: {
              show: true,
              show: false,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
@@ -1114,11 +1139,28 @@
        this.modalVisible = true
      },

      re_drawPieChart() {
        const clientWidth = document.body.clientWidth || document.documentElement.clientWidth
        if (this.firstEnterClientWidth != 1920) {
          this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / 1920)) + '%')
        } else {
          this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / this.firstEnterClientWidth)) + '%')
        }
        console.log('pieChartRadius', this.pieChartRadius)
        this.$nextTick(() => {
          if (this.runningStateChartDataRequireFinished) this.drawRunningStateChart(this.currentPageProductionId)
          if (this.techConditionChartRequireFinished) this.drawTechConditionChart()
          if (this.warrantyMalfunctionChartRequireFinished) this.drawWarrantyMalfunctionChart()
        })
      },

      /**
       * 窗口尺寸变化时触发
       * 调整图表尺寸以适应分辨率
       */
      handleWindowResize() {
        this.re_drawPieChart()

        if (this.runningStateChart) this.runningStateChart.resize()
        if (this.efficiencyChart) this.efficiencyChart.resize()
        if (this.techConditionChart) this.techConditionChart.resize()

 src/views/dashboard/WorkshopSectionSignage.vue

@@ -94,7 +94,12 @@
    },
    data() {
      return {
        firstEnterClientWidth: null,
        pieChartRadius: ['40%', '60%'],
        normalPieChartRadius: ['40%', '60%'],
        currentPageProductionId: null,
        runningStateChart: '',
        runningStateChartDataRequireFinished: false,
        runningStateData: [
          { value: '0', name: '关机' },
          { value: '0', name: '报警' },
@@ -102,12 +107,14 @@
          { value: '0', name: '运行' }
        ],
        techConditionChart: '',
        techConditionChartRequireFinished: false,
        techConditionData: [
          { value: '0', name: '合格' },
          { value: '0', name: '禁用' },
          { value: '0', name: '限用' }
        ],
        warrantyMalfunctionChart: '',
        warrantyMalfunctionChartRequireFinished: false,
        warrantyMalfunctionData: [
          { value: '0', name: '报修' },
          { value: '0', name: '停机' },
@@ -185,6 +192,7 @@
      }
    },
    mounted() {
      this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
      window.addEventListener('resize', this.handleWindowResize)
      this.getChartDataByApi()
    },
@@ -222,8 +230,9 @@
                { value: res.result[0].disabledCount, name: '禁用', technologyStatus: 'disabled' },
                { value: res.result[0].limitedUseCount, name: '限用', technologyStatus: 'limitedUse' }
              ]
              this.techConditionChartRequireFinished = true
              this.drawTechConditionChart()
            }
            this.drawTechConditionChart()
          })
      },

@@ -244,8 +253,9 @@
                { value: res.result[0].stopCount, name: '停机', isStop: '2' },
                { value: res.result[0].noStopCount, name: '运行', isStop: '1' }
              ]
              this.warrantyMalfunctionChartRequireFinished = true
              this.drawWarrantyMalfunctionChart()
            }
            this.drawWarrantyMalfunctionChart()
          })
      },

@@ -280,8 +290,12 @@
        })
        signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
          .then(res => {
            if (res.success) this.runningStateData = res.result.list
            this.drawRunningStateChart(res.result.productionId)
            if (res.success) {
              this.runningStateData = res.result.list
              this.currentPageProductionId = res.result.productionId
              this.runningStateChartDataRequireFinished = true
              this.drawRunningStateChart(res.result.productionId)
            }
          })
      },

@@ -296,8 +310,10 @@
        })
        signageApi.getEquipmentDayUtilizationStatisticsApi(this.productionCode)
          .then(res => {
            if (res.success) this.first7DaysEfficiencyData = res.result
            this.drawFirst7DaysEfficiencyDataChart()
            if (res.success) {
              this.first7DaysEfficiencyData = res.result
              this.drawFirst7DaysEfficiencyDataChart()
            }
          })
      },

@@ -349,15 +365,16 @@
        })
        signageApi.getEquipmentOEEMonthStatisticsApi(this.productionCode)
          .then(res => {
            if (res.success) {
            if (res.success && res.result && res.result.length > 0) {
              this.barChartData = res.result.map(item => {
                return {
                  name: item.equipmentId,
                  value: item.overallEquipmentEfficiency
                }
              })
              this.drawBarChart()
            }
            this.drawBarChart()

          })
      },

@@ -406,7 +423,7 @@
            {
              type: 'pie',
              // selectedMode: "single",
              radius: ['40%', '60%'],
              radius: this.pieChartRadius,
              center: ['50%', '50%'],
              color: [
                '#0FC61A',
@@ -494,7 +511,7 @@
            {
              type: 'pie',
              // selectedMode: "single",
              radius: ['40%', '60%'],
              radius: this.pieChartRadius,
              center: ['50%', '50%'],
              color: [
                '#24F2F5',
@@ -583,7 +600,7 @@
              type: 'pie',
              roseType: 'angle', // 玫瑰图
              // selectedMode: "single",
              radius: ['35%', '55%'],
              radius: this.pieChartRadius,
              center: ['50%', '50%'],
              color: [
                '#8B8B8B',
@@ -659,7 +676,7 @@
        }
        let legendData = []
        let seriesData = []
        let colorArr = ['#09F39E', '#A5F10D', '#09B3F6']
        let colorArr = ['#A7F0C1', '#FAE893', '#66DFE2']
        legendData = newData.yAxis.map((item) => item.name)
        seriesData = newData.yAxis.map((item1, index1) => {
          return {
@@ -668,7 +685,8 @@
            symbol: 'circle',
            symbolSize: 8,
            itemStyle: {
              color: colorArr[index1]
              color: colorArr[index1],
              barBorderRadius: 100
            },
            lineStyle: {
              width: 2
@@ -720,7 +738,7 @@
            axisLabel: {
              interval: 0,
              show: true,
              fontSize: 12,
              fontSize: 14,
              color: '#fff'
              // rotate: -30,
            },
@@ -769,7 +787,8 @@
              max: 100,
              axisLabel: {
                show: true,
                color: '#fff'
                color: '#fff',
                fontSize: 14
              },
              axisLine: {
                show: true,
@@ -1057,6 +1076,14 @@

      /* 绘制单柱图 */
      drawBarChart() {
        const defaultData = []
        const colorArray = ['#79CEAA', '#F589A2', '#6FBF9D', '#66DFE2', '#A7F0C1', '#FAE893', '#F7B7A0']
        const dataMax = +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value
        let yAxisMax
        if (dataMax === 0) yAxisMax = 1 // 若数据中最大值为0，则将背景默认值设置为1
        else yAxisMax = Math.ceil(dataMax / 5) * 5 // 设置柱图背景阴影默认值，思路为数据最大值最接近的能被5整除的数字
        const yAxisInterval = yAxisMax / 5 // 同时将刻度值分成5份
        this.barChartData.forEach(item => defaultData.push(yAxisMax))
        const xAisData = this.barChartData.map(item => item.name)
        const option = {
          height: 260,
@@ -1077,11 +1104,11 @@
            axisPointer: {
              type: 'shadow'
            },
            // backgroundColor: 'rgba(9, 24, 48, 0.5)',
            borderColor: 'rgba(75, 253, 238, 0.4)',
            textStyle: {
              // color: '#CFE3FC'
            formatter: function(params) {
              return '<span style="font-weight:bolder;">' + params[0].name + '</span><br/>' +
                '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params[0].color + '"></span>' + ' OEE: ' + params[0].value + '%'
            },
            borderColor: 'rgba(75, 253, 238, 0.4)',
            borderWidth: 1
          },
          grid: {
@@ -1106,7 +1133,8 @@
                interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
                // rotate: this.barChartData.length >= 5 ? -30 : 0, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
                inside: false, // 刻度标签是否朝内，默认朝外
                margin: 6 // 刻度标签与轴线之间的距离
                margin: 6, // 刻度标签与轴线之间的距离
                fontSize: 14
              },
              axisTick: {
                show: true,
@@ -1116,12 +1144,14 @@
          yAxis: [
            {
              name: '%',
              // nameLocation: 'middle',
              // nameGap: 30, // x轴name与横坐标轴线的间距
              min: 0,
              max: yAxisMax,
              interval: yAxisInterval,
              position: 'left',
              axisLabel: {
                formatter: '{value}',
                color: '#fff'
                color: '#fff',
                fontSize: 14
              },
              axisTick: {
                show: true
@@ -1152,10 +1182,13 @@
          series: [{
            type: 'bar',
            data: this.barChartData,
            barWidth: '25%',
            barWidth: this.barChartData.length > 5 ? '40%' : 30,
            itemStyle: {
              color: '#17C1F0',
              barBorderRadius: [10, 10, 10, 10]
              color: function(params) {
                let num = colorArray.length
                return colorArray[params.dataIndex % num]
              },
              barBorderRadius: 100
            },
            label: {
              show: false,
@@ -1169,8 +1202,20 @@
                color: '#fff',
                fontSize: 18
              }
            }
          }],
            },
            zlevel: 1
          },
            {
              name: '背景',
              type: 'bar',
              barWidth: this.barChartData.length > 5 ? '40%' : 30,
              barGap: '-100%',
              data: defaultData,
              itemStyle: {
                color: '#11294d',
                barBorderRadius: 100
              }
            }],
          dataZoom: {
            show: false,
            startValue: 0, // 从头开始。
@@ -1194,6 +1239,7 @@
        this.barChartCarouselTime = setInterval(() => {
          this.barChartData.push(this.barChartData.shift())
          xAisData.push(xAisData.shift())
          colorArray.push(colorArray.shift())
          this.$nextTick(() => {
            this.barChart.setOption(option, true)
          })
@@ -1232,18 +1278,35 @@
        this.modalVisible = true
      },

      re_drawPieChart() {
        const clientWidth = document.body.clientWidth || document.documentElement.clientWidth
        if (this.firstEnterClientWidth != 1920) {
          this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / 1920)) + '%')
        } else {
          this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / this.firstEnterClientWidth)) + '%')
        }
        console.log('pieChartRadius', this.pieChartRadius)
        this.$nextTick(() => {
          // 数据未加载完成无需重绘图表，不然无法区分接口返回正常与否
          if (this.runningStateChartDataRequireFinished) this.drawRunningStateChart(this.currentPageProductionId)
          if (this.techConditionChartRequireFinished) this.drawTechConditionChart()
          if (this.warrantyMalfunctionChartRequireFinished) this.drawWarrantyMalfunctionChart()
        })
      },

      /**
       * 窗口尺寸变化时触发
       * 调整图表尺寸以适应分辨率
       */
      handleWindowResize() {
        this.re_drawPieChart()
        if (this.runningStateChart) this.runningStateChart.resize()
        if (this.efficiencyChart) this.efficiencyChart.resize()
        if (this.techConditionChart) this.techConditionChart.resize()
        if (this.warrantyMalfunctionChart) this.warrantyMalfunctionChart.resize()
        if (this.first7DaysEfficiencyChart) this.first7DaysEfficiencyChart.resize()
        if (this.gaugeChart1) this.gaugeChart1.resize()
        if (this.gaugeChart2) this.gaugeChart2.resize()
        if (this.gaugeChart3) this.gaugeChart3.resize()
        if (this.gaugeChart4) this.gaugeChart4.resize()
        if (this.barChart) this.barChart.resize()
        if (this.doubleBarChart) this.doubleBarChart.resize()
      }
    }
  }

 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue

@@ -102,8 +102,13 @@
    </div>

    <div id="EfficiencyShift" style="flex:1;overflow: hidden;height: inherit">
      <a-table :columns="columns" rowKey="id" :dataSource="dataSource.records" :loading="tableLoading"
               :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered></a-table>
      <a-table :columns="columns" rowKey="id" :dataSource="dataSource.records?dataSource.records:[]"
               :loading="tableLoading"
               :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered>
        <template slot="equipmentModel" slot-scope="text, record">
          <editable-cell :text="text" @change="onCellChange(record.id, 'equipmentModel', $event)"/>
        </template>
      </a-table>
    </div>
    <!--<div class="pagination">-->
    <!--<a-pagination-->
@@ -129,9 +134,11 @@
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
  import api from '@api/mdc'

  import EditableCell from './EditableCell.vue'

  export default {
    name: 'OEEAnalysisList',
    components: {},
    components: { EditableCell },
    data() {
      return {
        dates: [moment().subtract('month', 1), moment().subtract('month', 1)],
@@ -163,6 +170,12 @@
            }
          },
          {
            title: '车间',
            align: 'center',
            dataIndex: 'productionName',
            width: 200
          },
          {
            title: '设备统一编号',
            align: 'center',
            dataIndex: 'equipmentId',
@@ -177,8 +190,9 @@
          {
            title: '设备型号',
            align: 'center',
            width: 110,
            dataIndex: 'equipmentModel'
            width: 200,
            dataIndex: 'equipmentModel',
            scopedSlots: { customRender: 'equipmentModel' }
          },
          {
            title: '日期',
@@ -507,7 +521,7 @@
        this.tableLoading = true
        getAction(this.url.list, this.queryParam)
          .then(res => {
            if (res.success) {
            if (res.success && res.result) {
              this.dataSource = res.result
              this.tableLoading = false
            }
@@ -538,6 +552,10 @@
        this.loadData()
      },

      onCellChange(key, dataIndex, value) {
        console.log('触发onCellChange', key, dataIndex, value)
      },

      /**
       * 当浏览器可视窗口尺寸发生改变时触发
       */