1、设备TEEP页面删除滚动加载功能 2、mdc首页工段级看板调整样式及功能

zhaowei

昨天 03cec15c5f30cb7eda1e76bbf4183ad9c89e4f83

1、设备TEEP页面删除滚动加载功能
2、mdc首页工段级看板调整样式及功能

 src/api/signage.js

@@ -12,7 +12,7 @@
  // 三级保养
  getThirdMaintenanceConditionApi: productionCode => getAction('/eam/home/maintenance', { productionCode }),
  // 二保计划
  getTwoMaintenancePlanListApi: productionCode => getAction('/eam/home/secondmaintenance', { productionCode }),
  getSecondMaintenancePlanListApi: productionCode => getAction('/eam/home/secondmaintenance', { productionCode }),
  // 设备OEE统计
  getEquipmentOEEStatistics: productionCode => getAction('/mdc/home/equipmentOEEStatistics', { productionCode }),
  // 设备OEE和利用率对比

 src/views/dashboard/BranchFactorySignage.vue

@@ -158,7 +158,7 @@
        this.getEfficiencyDataByApi()
        this.getTechConditionAndWarrantyMalfunctionDataByApi()
        this.getMonthMaintenanceNumByApi()
        this.getTwoMaintenanceChartDataByApi()
        this.getSecondMaintenanceChartDataByApi()
        this.getBarChartDataByApi()
        this.getDoubleBarChartDataByApi()
        this.getWorkshopProblemChartDataByApi()
@@ -226,21 +226,21 @@
                  technologyStatus: 'QUALIFIED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0,
                  name: '禁用',
                  technologyStatus: 'PROHIBITED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'RESTRICTED').value : 0,
                  name: '限用',
                  technologyStatus: 'RESTRICTED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0,
                  name: '禁用',
                  technologyStatus: 'PROHIBITED'
                }
              ]
              this.warrantyMalfunctionData = [
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0,
                  name: '报修',
                  code: 'bx'
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0,
                  name: '运行',
                  code: 'run'
                },
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'stop').value : 0,
@@ -248,9 +248,9 @@
                  code: 'stop'
                },
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0,
                  name: '运行',
                  code: 'run'
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0,
                  name: '报修',
                  code: 'bx'
                }
              ]
              this.techConditionChartRequireFinished = true
@@ -275,8 +275,8 @@
      },

      /* 调用接口获取二保计划 */
      getTwoMaintenanceChartDataByApi() {
        signageApi.getTwoMaintenancePlanListApi(this.productionCode)
      getSecondMaintenanceChartDataByApi() {
        signageApi.getSecondMaintenancePlanListApi(this.productionCode)
          .then(res => {
            if (res.success && res.result.length > 0) this.twoMaintenanceChartData = res.result.map(item => [item.factoryName, item.monthPlan, '二级保养'])
            this.drawMaintenanceChart()
@@ -359,10 +359,9 @@
            itemGap: 15,
            textStyle: {
              color: 'rgba(0,0,0,.45)',
              fontSize: 14,
              padding: [0, 0, 0, 0]
              fontSize: 14
            },
            data: ['关机', '报警', '待机', '运行']
            data: ['运行', '待机', '报警', '关机']
          },
          grid: {
            containLabel: true
@@ -630,7 +629,6 @@
            top: 25,
            orient: 'vertical',
            right: 0,
            // bottom: "0",
            itemWidth: 14,
            itemHeight: 14,
            icon: 'roundRect',
@@ -640,7 +638,7 @@
              fontSize: 14,
              padding: [0, 0, 0, 0]
            },
            data: ['合格', '禁用', '限用']
            data: ['合格', '限用', '禁用']
          },
          grid: {
            containLabel: true
@@ -954,10 +952,20 @@
        const option = {
          color: ['#1890FF', '#2EC35C'],
          tooltip: {
            confine: true,
            trigger: 'axis',
            axisPointer: {
              type: 'shadow'
            },
            formatter: function(params) {
              return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' +
                '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + params.seriesName + ' : ' + params.value + '%'
              let result = ''
              params.forEach((item, index) => {
                let dom = `<span style="display:inline-block;width:10px;height:10px;border-radius:100px;margin-right:5px;background:${item.color}"></span>${item.seriesName}：${item.value}%`
                if (index === 0) {
                  result = `<span style="font-weight:bolder;">${item.name}</span>`
                }
                result += '<br />' + dom
              })
              return result
            }
          },
          grid: {
@@ -1171,15 +1179,6 @@

<style lang="less" scoped>
  .page-container {
    .page-title {
      display: flex;
      justify-content: space-evenly;
      flex-wrap: wrap;
      color: #fff;
      margin-bottom: 10px;

    }

    .content-container {
      padding-top: 5px;
      display: flex;

 src/views/dashboard/IndexSignage.vue

@@ -148,7 +148,7 @@
        this.getEfficiencyDataByApi()
        this.getTechConditionAndWarrantyMalfunctionDataByApi()
        this.getThirdMaintenanceConditionByApi()
        this.getTwoMaintenanceChartDataByApi()
        this.getSecondMaintenanceChartDataByApi()
        this.getBarChartDataByApi()
        this.getDoubleBarChartDataByApi()
        this.getWorkshopProblemChartDataByApi()
@@ -214,21 +214,21 @@
                  technologyStatus: 'QUALIFIED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0,
                  name: '禁用',
                  technologyStatus: 'PROHIBITED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'RESTRICTED').value : 0,
                  name: '限用',
                  technologyStatus: 'RESTRICTED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0,
                  name: '禁用',
                  technologyStatus: 'PROHIBITED'
                }
              ]
              this.warrantyMalfunctionData = [
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0,
                  name: '报修',
                  code: 'bx'
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0,
                  name: '运行',
                  code: 'run'
                },
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'stop').value : 0,
@@ -236,9 +236,9 @@
                  code: 'stop'
                },
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0,
                  name: '运行',
                  code: 'run'
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0,
                  name: '报修',
                  code: 'bx'
                }
              ]
              this.techConditionChartRequireFinished = true
@@ -263,8 +263,8 @@
      },

      /* 调用接口获取二保计划 */
      getTwoMaintenanceChartDataByApi() {
        signageApi.getTwoMaintenancePlanListApi()
      getSecondMaintenanceChartDataByApi() {
        signageApi.getSecondMaintenancePlanListApi()
          .then(res => {
            if (res.success && res.result.length > 0) this.twoMaintenanceChartData = res.result.map(item => [item.factoryName, item.monthPlan, '二级保养'])
            this.drawMaintenanceChart()
@@ -348,10 +348,9 @@
            itemGap: 15,
            textStyle: {
              color: 'rgba(0,0,0,.45)',
              fontSize: 14,
              padding: [0, 0, 0, 0]
              fontSize: 14
            },
            data: ['关机', '报警', '待机', '运行']
            data: ['运行', '待机', '报警', '关机']
          },
          grid: {
            containLabel: true
@@ -360,7 +359,6 @@
            {
              type: 'pie',
              roseType: 'angle', // 玫瑰图
              // selectedMode: "single",
              radius: this.pieChartRadius,
              center: ['50%', '60%'],
              color: [
@@ -373,8 +371,6 @@
                position: 'outside',
                show: true,
                color: 'rgba(0,0,0,.45)',
                // textBorderColor: 'inherit',
                // textBorderWidth: 1,
                fontSize: 16,
                formatter: function(params) {
                  if (params.name !== '') {
@@ -619,17 +615,15 @@
            top: 25,
            orient: 'vertical',
            right: 0,
            // bottom: "0",
            itemWidth: 14,
            itemHeight: 14,
            icon: 'roundRect',
            itemGap: 15,
            textStyle: {
              color: 'rgba(0,0,0,.45)',
              fontSize: 14,
              padding: [0, 0, 0, 0]
              fontSize: 14
            },
            data: ['合格', '禁用', '限用']
            data: ['合格', '限用', '禁用']
          },
          grid: {
            containLabel: true
@@ -637,7 +631,6 @@
          series: [
            {
              type: 'pie',
              // selectedMode: "single",
              radius: this.pieChartRadius,
              center: ['45%', '60%'],
              color: [
@@ -649,8 +642,6 @@
                position: 'outside',
                show: true,
                color: 'rgba(0,0,0,.45)',
                // textBorderColor: 'inherit',
                // textBorderWidth: 1,
                fontSize: 16,
                formatter: function(params) {
                  if (params.name !== '') {
@@ -726,7 +717,6 @@
          series: [
            {
              type: 'pie',
              // selectedMode: "single",
              radius: this.pieChartRadius,
              center: ['45%', '60%'],
              color: [
@@ -917,7 +907,8 @@
              barWidth: 26,
              barGap: '-100%',
              data: this.barChartData
            }]
            }
          ]
        }

        option.title.text = moment().subtract(1, 'months').format('M月') + `OEE`
@@ -941,10 +932,20 @@
        const option = {
          color: ['#1890FF', '#2EC35C'],
          tooltip: {
            confine: true,
            trigger: 'axis',
            axisPointer: {
              type: 'shadow'
            },
            formatter: function(params) {
              return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' +
                '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + params.seriesName + ' : ' + params.value + '%'
              let result = ''
              params.forEach((item, index) => {
                let dom = `<span style="display:inline-block;width:10px;height:10px;border-radius:100px;margin-right:5px;background:${item.color}"></span>${item.seriesName}：${item.value}%`
                if (index === 0) {
                  result = `<span style="font-weight:bolder;">${item.name}</span>`
                }
                result += '<br />' + dom
              })
              return result
            }
          },
          grid: {
@@ -1154,14 +1155,6 @@

<style lang="less" scoped>
  .page-container {
    .page-title {
      display: flex;
      justify-content: space-evenly;
      flex-wrap: wrap;
      color: #fff;
      margin-bottom: 10px;
    }

    .content-container {
      padding-top: 5px;
      display: flex;

 src/views/dashboard/WorkshopSectionSignage.vue

@@ -11,7 +11,8 @@
          <div id="warranty_malfunction_chart" style="width:100%;height: 240px;"></div>
          <div>
            <div style="display: flex;flex-direction:column;align-items: center">
              <dv-decoration-11 style="width:45%;height:60px;color: #fff;font-size: 20px;align-self: flex-start">三保计划
              <dv-decoration-11
                style="width:45%;height:60px;color: rgba(0,0,0,.45);font-size: 20px;align-self: flex-start">三保计划
              </dv-decoration-11>
              <div class="support-plan-container">
                <div v-for="(item,index) in supportPlanList" :key="index" class="support-plan-item"
@@ -26,9 +27,10 @@
            </div>

            <div style="display: flex;margin-top: 10px;justify-content: space-between;align-items: center;">
              <dv-decoration-11 style="width:45%;height:60px;font-size: 20px;color: #fff">二保计划</dv-decoration-11>
              <dv-decoration-11 style="width:45%;height:60px;font-size: 20px;color: rgba(0,0,0,.45)">二保计划
              </dv-decoration-11>
              <div
                style="flex:1;text-align:center;font-size: 25px;color: #9BD890;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
                style="flex:1;text-align:center;font-size: 25px;color: rgba(0,0,0,.45);overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
                2024年4月1日大修
              </div>
            </div>
@@ -79,6 +81,7 @@
  import signageApi from '@/api/signage'
  import moment from 'moment'
  import SignageModal from './modules/SignageModal'
  import * as echarts from 'echarts'

  export default {
    name: 'WorkshopSectionSignage',
@@ -124,40 +127,38 @@
          {
            planTime: '本月三保计划',
            planValueLabel: 'thisMonthMaintenancePlanNum',
            backgroundColor: '#5FE0AF',
            apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceList'
            backgroundColor: '#719D8E',
            code: 'bysbzs'
          },

          {
            planTime: '本月完成量',
            planValueLabel: 'thisMonthMaintenanceRealNum',
            backgroundColor: '#409EFF',
            apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceFinishList'
            code: 'bwc'
          },
          {
            planTime: '延期',
            planValueLabel: 'maintenanceExtensionNum',
            backgroundColor: '#FCAA29',
            apiUrl: '/eam/calibrationOrder/show3MaintenancePostponeList'
            backgroundColor: '#E89D29',
            code: ''
          },

          {
            planTime: '超期',
            planValueLabel: 'maintenanceOverdueNum',
            backgroundColor: '#F56C6C',
            apiUrl: '/eam/calibrationOrder/show3MaintenanceOverdueList'
            code: ''
          },
          {
            planTime: '下月计划',
            planValueLabel: 'nextMonthMaintenancePlanNum',
            backgroundColor: '#D6BC52',
            apiUrl: '/eam/calibrationOrder/showNextMonthMaintenanceList'
            backgroundColor: '#A8985D',
            code: 'xysb'
          },
          {
            planTime: '下下月计划',
            planValueLabel: 'nextNextMonthMaintenancePlanNum',
            backgroundColor: '#58D9F9',
            apiUrl: '/eam/calibrationOrder/showNextNextMonthMaintenanceList'
            code: 'xxysb'
          }
        ],
        thisMonthMaintenancePlanNum: 0,
@@ -204,78 +205,83 @@
    methods: {
      /* 调用接口获取图表数据汇总方法 */
      getChartDataByApi() {
        this.getTechConditionDataByApi()
        this.getWarrantyMalfunctionDataByApi()
        this.getTechConditionAndWarrantyMalfunctionDataByApi()
        this.getRunningStateDataByApi()
        this.getMonthMaintenanceNumByApi()
        this.getThirdMaintenanceNumByApi()
        this.getFirst7DaysEfficiencyDataByApi()
        this.getGaugeChartDataByApi()
        this.getBarChartDataByApi()
      },

      /* 调用接口获取技术状态 */
      getTechConditionDataByApi() {
      /* 调用接口获取技术状态与故障报修 */
      getTechConditionAndWarrantyMalfunctionDataByApi() {
        this.techConditionChart = this.$echarts.init(document.getElementById('tech_condition_chart'))
        this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
        this.techConditionChart.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0, 0, 0, .45)'
        })
        signageApi.getEquipmentTechnologyStatusListApi(this.productionCode)
          .then(res => {
            if (res.success && res.result) {
              this.techConditionData = [
                { value: res.result[0].qualifiedCount, name: '合格', technologyStatus: 'qualified' },
                { value: res.result[0].disabledCount, name: '禁用', technologyStatus: 'disabled' },
                { value: res.result[0].limitedUseCount, name: '限用', technologyStatus: 'limitedUse' }
              ]
              this.techConditionChartRequireFinished = true
              this.drawTechConditionChart()
            }
          })
      },

      /* 调用接口获取设备报修故障 */
      getWarrantyMalfunctionDataByApi() {
        this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
        this.warrantyMalfunctionChart.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0, 0, 0, .45)'
        })
        signageApi.getReportRepairEquipmentListApi(this.productionCode)
        signageApi.getEquipmentTechnologyStatusAndReportRepairEquipmentListApi(this.productionCode)
          .then(res => {
            if (res.success && res.result) {
              this.warrantyMalfunctionData = [
                { value: res.result[0].failurTotalCount, name: '报修', isStop: '' },
                { value: res.result[0].stopCount, name: '停机', isStop: '2' },
                { value: res.result[0].noStopCount, name: '运行', isStop: '1' }
              this.techConditionData = [
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'QUALIFIED').value : 0,
                  name: '合格',
                  technologyStatus: 'QUALIFIED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'RESTRICTED').value : 0,
                  name: '限用',
                  technologyStatus: 'RESTRICTED'
                },
                {
                  value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0,
                  name: '禁用',
                  technologyStatus: 'PROHIBITED'
                }
              ]
              this.warrantyMalfunctionData = [
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0,
                  name: '运行',
                  code: 'run'
                },
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'stop').value : 0,
                  name: '停机',
                  code: 'stop'
                },
                {
                  value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0,
                  name: '报修',
                  code: 'bx'
                }
              ]
              this.techConditionChartRequireFinished = true
              this.warrantyMalfunctionChartRequireFinished = true
              this.drawTechConditionChart()
              this.drawWarrantyMalfunctionChart()
            }
          })
      },

      /* 调用接口获取三保计划 */
      getMonthMaintenanceNumByApi() {
        signageApi.getThisMonthMaintenanceListApi(this.productionCode)
      getThirdMaintenanceNumByApi() {
        signageApi.getThirdMaintenanceConditionApi(this.productionCode)
          .then(res => {
            if (res.success && res.result) this.thisMonthMaintenancePlanNum = res.result[0].totalCount
          })
        signageApi.getThisMonthMaintenanceFinishListApi(this.productionCode)
          .then(res => {
            if (res.success && res.result) this.thisMonthMaintenanceRealNum = res.result[0].totalCount
          })
        signageApi.getNextMonthMaintenanceList(this.productionCode)
          .then(res => {
            if (res.success && res.result) this.nextMonthMaintenancePlanNum = res.result[0].totalCount
          })
        signageApi.getNextNextMonthMaintenanceListApi(this.productionCode)
          .then(res => {
            if (res.success && res.result) this.nextNextMonthMaintenancePlanNum = res.result[0].totalCount
            if (res.success && res.result) {
              this.thisMonthMaintenancePlanNum = res.result.find(item => item.code === 'bysbzs').value
              this.thisMonthMaintenanceRealNum = res.result.find(item => item.code === 'bwc').value
              this.nextMonthMaintenancePlanNum = res.result.find(item => item.code === 'xysb').value
              this.nextNextMonthMaintenancePlanNum = res.result.find(item => item.code === 'xxysb').value
            }
          })
      },

@@ -285,8 +291,7 @@
        this.runningStateChart.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0,0,0,.45)'
        })
        signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
          .then(res => {
@@ -305,8 +310,7 @@
        this.first7DaysEfficiencyChart.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0,0,0,.45)'
        })
        signageApi.getEquipmentDayUtilizationStatisticsApi(this.productionCode)
          .then(res => {
@@ -326,26 +330,22 @@
        this.gaugeChart1.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0,0,0,.45)'
        })
        this.gaugeChart2.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0,0,0,.45)'
        })
        this.gaugeChart3.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0,0,0,.45)'
        })
        this.gaugeChart4.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0,0,0,.45)'
        })
        signageApi.getEquipmentEfficiencyStatisticsApi(this.productionCode)
          .then(res => {
@@ -360,12 +360,51 @@
        this.barChart.showLoading({
          text: '数据加载中 ...',
          color: '#0696e1', // 加载动画颜色
          textColor: '#fff',
          maskColor: 'rgba(1, 25, 75, 0.2)' // 遮罩层
          textColor: 'rgba(0,0,0,.45)'
        })
        signageApi.getEquipmentOEEMonthStatisticsApi(this.productionCode)
          .then(res => {
            if (res.success && res.result && res.result.length > 0) {
            if (res.success && res.result) {
              const res = {
                result: [
                  {
                    equipmentId: '2140311',
                    overallEquipmentEfficiency: 12
                  },
                  {
                    equipmentId: '2140511',
                    overallEquipmentEfficiency: 32
                  },
                  {
                    equipmentId: '2420011',
                    overallEquipmentEfficiency: 15
                  },
                  {
                    equipmentId: '2140023',
                    overallEquipmentEfficiency: 62
                  },
                  {
                    equipmentId: '2110011',
                    overallEquipmentEfficiency: 46
                  },
                  {
                    equipmentId: '2140211',
                    overallEquipmentEfficiency: 75
                  },
                  {
                    equipmentId: '2144011',
                    overallEquipmentEfficiency: 86
                  },
                  {
                    equipmentId: '2140021',
                    overallEquipmentEfficiency: 97
                  },
                  {
                    equipmentId: '2145031',
                    overallEquipmentEfficiency: 57
                  }
                ]
              }
              this.barChartData = res.result.map(item => {
                return {
                  name: item.equipmentId,
@@ -374,7 +413,6 @@
              })
              this.drawBarChart()
            }

          })
      },

@@ -404,17 +442,15 @@
            top: 'bottom',
            orient: 'horizontal',
            right: 0,
            // bottom: "0",
            itemWidth: 14,
            itemHeight: 14,
            icon: 'roundRect',
            itemGap: 15,
            textStyle: {
              color: 'inherit',
              fontSize: 14,
              padding: [0, 0, 0, 0]
              color: 'rgba(0,0,0,.45)',
              fontSize: 14
            },
            data: ['合格', '禁用', '限用']
            data: ['合格', '限用', '禁用']
          },
          grid: {
            containLabel: true
@@ -422,20 +458,17 @@
          series: [
            {
              type: 'pie',
              // selectedMode: "single",
              radius: this.pieChartRadius,
              center: ['50%', '50%'],
              color: [
                '#0FC61A',
                '#F56436',
                '#8B8B8B'
                '#0AA012',
                '#247F49',
                '#757160'
              ],
              label: {
                position: 'outside',
                show: true,
                color: 'inherit',
                // textBorderColor: 'inherit',
                // textBorderWidth: 1,
                color: 'rgba(0,0,0,.45)',
                fontSize: 16,
                formatter: function(params) {
                  if (params.name !== '') {
@@ -446,7 +479,10 @@
              labelLine: {
                show: true,
                length2: 15,
                length: 15
                length: 15,
                lineStyle: {
                  color: 'rgba(0,0,0,.45)'
                }
              },
              data: this.techConditionData
            }
@@ -466,12 +502,12 @@
        })
      },

      /* 绘制设备报修故障饼图 */
      /* 绘制设备报修故障情况饼图 */
      drawWarrantyMalfunctionChart() {
        const option = {
          title: {
            show: true, // 是否显示标题，默认为true
            text: '设备报修故障', // 主标题文本
            text: '设备报修故障情况', // 主标题文本
            x: 'left', // 标题水平安放位置，可选值为'left'、'center'、'right'或具体的水平坐标值
            y: 'top', // 标题垂直安放位置，可选值为'top'、'bottom'、'center'或具体的垂直坐标值
            textStyle: {
@@ -492,15 +528,13 @@
            top: 'bottom',
            orient: 'horizontal',
            right: 0,
            // bottom: "0",
            itemWidth: 14,
            itemHeight: 14,
            icon: 'roundRect',
            itemGap: 15,
            textStyle: {
              color: 'inherit',
              fontSize: 14,
              padding: [0, 0, 0, 0]
              color: 'rgba(0,0,0,.45)',
              fontSize: 14
            },
            data: ['报修', '停机', '运行']
          },
@@ -510,20 +544,17 @@
          series: [
            {
              type: 'pie',
              // selectedMode: "single",
              radius: this.pieChartRadius,
              center: ['50%', '50%'],
              color: [
                '#24F2F5',
                '#F56436',
                '#FFFF40'
                '#00CED1',
                '#B85B38',
                '#FFFF88'
              ],
              label: {
                position: 'outside',
                show: true,
                color: 'inherit',
                // textBorderColor: 'inherit',
                // textBorderWidth: 1,
                color: 'rgba(0,0,0,.45)',
                fontSize: 16,
                formatter: function(params) {
                  if (params.name !== '') {
@@ -534,7 +565,10 @@
              labelLine: {
                show: true,
                length2: 15,
                length: 15
                length: 15,
                lineStyle: {
                  color: 'rgba(0,0,0,.45)'
                }
              },
              data: this.warrantyMalfunctionData
            }
@@ -559,7 +593,7 @@
        const option = {
          title: {
            show: true, // 是否显示标题，默认为true
            text: '设备状态', // 主标题文本
            text: '设备运行状态统计', // 主标题文本
            x: 'left', // 标题水平安放位置，可选值为'left'、'center'、'right'或具体的水平坐标值
            y: 'top', // 标题垂直安放位置，可选值为'top'、'bottom'、'center'或具体的垂直坐标值
            textStyle: {
@@ -580,17 +614,15 @@
            top: 'bottom',
            orient: 'horizontal',
            right: 0,
            // bottom: "0",
            itemWidth: 14,
            itemHeight: 14,
            icon: 'roundRect',
            itemGap: 15,
            textStyle: {
              color: 'inherit',
              fontSize: 14,
              padding: [0, 0, 0, 0]
              color: 'rgba(0,0,0,.45)',
              fontSize: 14
            },
            data: ['关机', '报警', '待机', '运行']
            data: ['运行', '待机', '报警', '关机']
          },
          grid: {
            containLabel: true
@@ -599,22 +631,19 @@
            {
              type: 'pie',
              roseType: 'angle', // 玫瑰图
              // selectedMode: "single",
              radius: this.pieChartRadius,
              center: ['50%', '50%'],
              color: [
                '#8B8B8B',
                '#F56436',
                '#FFFF40',
                '#0FC61A'
                '#686869',
                '#AA6349',
                '#FFFF88',
                '#5D975D'
              ],
              label: {
                position: 'outside',
                show: true,
                color: 'inherit',
                // textBorderColor: 'inherit',
                // textBorderWidth: 1,
                fontSize: 30,
                color: 'rgba(0,0,0,.45)',
                fontSize: 16,
                formatter: function(params) {
                  if (params.name !== '') {
                    return `${params.name}:${params.value}`
@@ -624,7 +653,10 @@
              labelLine: {
                show: true,
                length2: 20,
                length: 30
                length: 30,
                lineStyle: {
                  color: 'rgba(0,0,0,.45)'
                }
              },
              data: this.runningStateData
            }
@@ -648,9 +680,9 @@
            const equipmentIdObj = {
              equipmentId: item.equipmentId,
              equipmentName: item.equipmentName,
              openRate: 0,
              startRate: 0,
              utilizationRate: 0
              openRate: 84,
              startRate: 70,
              utilizationRate: 42
            }
            this.first7DaysEfficiencyData.dataList.push(equipmentIdObj)
          }
@@ -671,22 +703,22 @@
              name: '开机率',
              value: this.first7DaysEfficiencyData.dataList.map(item => item.openRate)
            }
          ],
          yAxisName: '前7天TEEP(%)'
          ]
        }
        let legendData = []
        let seriesData = []
        let colorArr = ['#A7F0C1', '#FAE893', '#66DFE2']
        let colorArr = ['#1890FF', '#2EC35C', '#EA967B']
        legendData = newData.yAxis.map((item) => item.name)
        seriesData = newData.yAxis.map((item1, index1) => {
          return {
            name: item1.name,
            type: 'bar',
            symbol: 'circle',
            barGap: '0%',
            symbolSize: 8,
            itemStyle: {
              color: colorArr[index1],
              barBorderRadius: 100
              barBorderRadius: 4
            },
            lineStyle: {
              width: 2
@@ -695,10 +727,35 @@
              show: true
            },
            yAxisIndex: 1,
            data: item1.value // 折线图的数据
            data: item1.value,// 折线图的数据
            label: {
              show: true,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
                else return params.value
              },
              position: index1 % 2 === 0 ? 'top' : 'inside',
              textStyle: {
                color: 'rgba(0,0,0,.45)',
                fontSize: 10
              }
            }
          }
        })
        const option = {
          title: {
            show: true, // 是否显示标题，默认为true
            text: '前7天TEEP(%)', // 主标题文本
            x: 'left', // 标题水平安放位置，可选值为'left'、'center'、'right'或具体的水平坐标值
            y: 'top', // 标题垂直安放位置，可选值为'top'、'bottom'、'center'或具体的垂直坐标值
            textStyle: {
              // 主标题文本样式
              fontSize: 18,
              fontWeight: 'normal',
              color: '#1AD8DE'
            }
          },
          grid: {
            containLabel: true,
            bottom: '1%',
@@ -730,7 +787,7 @@
            itemGap: 10,
            textStyle: {
              fontSize: 14,
              color: '#fff'
              color: 'rgba(0,0,0,.45)'
            }
          },
          xAxis: {
@@ -739,13 +796,13 @@
              interval: 0,
              show: true,
              fontSize: 14,
              color: '#fff'
              // rotate: -30,
              margin: 10,
              color: 'rgba(0,0,0,.45)'
            },
            axisLine: {
              show: true,
              lineStyle: {
                color: '#fff'
                color: 'rgba(0,0,0,.45)'
              }
            },
            axisTick: {
@@ -758,8 +815,7 @@
              name: newData.yAxisName,
              nameTextStyle: {
                color: '#1AD8DE',
                fontSize: 18,
                padding: [0, 0, 0, 110]
                fontSize: 18
              },
              nameGap: 30,
              type: 'value',
@@ -767,17 +823,14 @@
              axisLine: {
                show: true,
                lineStyle: {
                  color: '#fff'
                  color: 'rgba(0,0,0,.45)'
                }
              },
              axisTick: {
                show: false
              },
              splitLine: {
                show: false,
                lineStyle: {
                  color: '#fff'
                }
                show: false
              }
            },
            {
@@ -787,23 +840,20 @@
              max: 100,
              axisLabel: {
                show: true,
                color: '#fff',
                color: 'rgba(0,0,0,.45)',
                fontSize: 14
              },
              axisLine: {
                show: true,
                lineStyle: {
                  color: '#fff'
                  color: 'rgba(0,0,0,.45)'
                }
              },
              axisTick: {
                show: true
              },
              splitLine: {
                show: false,
                lineStyle: {
                  color: '#fff'
                }
                show: false
              }
            }
          ],
@@ -813,15 +863,6 @@
            startValue: 0, // 从头开始。
            endValue: 6 // 一次性展示几个
          }
          // toolbox: {
          //   show: true,
          //   feature: {
          //     mark: { show: true },
          //     magicType: { show: true, type: ['line', 'bar'] },
          //     restore: { show: true },
          //     saveAsImage: { show: true, name: '前7天利用率统计图', pixelRatio: 1 }
          //   }
          // }
        }
        this.first7DaysEfficiencyChart.setOption(option, true)
        this.first7DaysEfficiencyChart.hideLoading()
@@ -841,6 +882,7 @@
        // 设备列表大于7个时开启自动轮播
        if (this.first7DaysEfficiencyData.mdcEquipmentList.length <= 7) return
        this.first7DaysEfficiencyChartCarouselTime = setInterval(() => {
          colorArr.push(colorArr.shift())
          newData.xAxis.push(newData.xAxis.shift())
          newData.yAxis.forEach(item => item.value.push(item.value.shift()))
          this.$nextTick(() => {
@@ -893,14 +935,14 @@
                show: true,
                length: 10,
                lineStyle: {
                  color: '#fff',
                  color: 'rgba(0,0,0,.45)',
                  width: 2
                }
              },
              axisTick: {
                length: 5,
                lineStyle: {
                  color: '#fff',
                  color: 'rgba(0,0,0,.45)',
                  width: 1
                }
              },
@@ -1078,7 +1120,9 @@
      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 barTopColor = ['#EA967B', '#62AC75', '#32ACBF', '#7196CE']
        let barBottomColor = ['#F8E18B', '#A8D07C', '#7BCAC5', '#8DCCEF']
        const dataMax = this.barChartData.length > 0 ? +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value : 0
        let yAxisMax
        if (dataMax === 0) yAxisMax = 1 // 若数据中最大值为0，则将背景默认值设置为1
        else yAxisMax = Math.ceil(dataMax / 5) * 5 // 设置柱图背景阴影默认值，思路为数据最大值最接近的能被5整除的数字
@@ -1116,31 +1160,26 @@
            left: '6%',
            right: '3%'
          },
          xAxis: [
            {
              // name: '上个月OEE',
              // nameLocation: 'middle',
              // nameGap: 40, // x轴name与横坐标轴线的间距
              type: 'category',
              data: xAisData,
              axisLine: {
                lineStyle: {
                  color: '#fff'
                }
              },
              axisLabel: {
                show: true, // 是否显示刻度标签，默认显示
                interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
                // rotate: this.barChartData.length >= 5 ? -30 : 0, // 刻度标签旋转的角度，在类目轴的类目标签显示不下的时候可以通过旋转防止标签之间重叠；旋转的角度从-90度到90度
                inside: false, // 刻度标签是否朝内，默认朝外
                margin: 6, // 刻度标签与轴线之间的距离
                fontSize: 14
              },
              axisTick: {
                show: true,
                alignWithLabel: true
          xAxis: {
            type: 'category',
            data: xAisData,
            axisLine: {
              lineStyle: {
                color: 'rgba(0,0,0,.45)'
              }
            }],
            },
            axisLabel: {
              show: true, // 是否显示刻度标签，默认显示
              interval: 0, // 坐标轴刻度标签的显示间隔，在类目轴中有效；默认会采用标签不重叠的策略间隔显示标签；可以设置成0强制显示所有标签；如果设置为1，表示『隔一个标签显示一个标签』，如果值为2，表示隔两个标签显示一个标签，以此类推。
              inside: false, // 刻度标签是否朝内，默认朝外
              margin: 10, // 刻度标签与轴线之间的距离
              fontSize: 14
            },
            axisTick: {
              show: true,
              alignWithLabel: true
            }
          },
          yAxis: [
            {
              name: '%',
@@ -1150,7 +1189,7 @@
              position: 'left',
              axisLabel: {
                formatter: '{value}',
                color: '#fff',
                color: 'rgba(0,0,0,.45)',
                fontSize: 14
              },
              axisTick: {
@@ -1159,14 +1198,11 @@
              axisLine: {
                show: true,
                lineStyle: {
                  color: '#fff'
                  color: 'rgba(0,0,0,.45)'
                }
              },
              splitLine: {
                show: false,
                lineStyle: {
                  color: 'rgba(255,255,255,0.12)'
                }
                show: false
              }
            },
            {
@@ -1174,48 +1210,68 @@
              axisLine: {
                show: true,
                lineStyle: {
                  color: '#fff'
                  color: 'rgba(0,0,0,.45)'
                }
              }
            }
          ],
          series: [{
            type: 'bar',
            data: this.barChartData,
            barWidth: this.barChartData.length > 5 ? '40%' : 30,
            itemStyle: {
              color: function(params) {
                let num = colorArray.length
                return colorArray[params.dataIndex % num]
              },
              barBorderRadius: 100
            },
            label: {
              show: false,
              lineHeight: 10,
              formatter: params => {
                if (+params.value === 0) return ''
                else return params.value
              },
              position: 'inside',
              textStyle: {
                color: '#fff',
                fontSize: 18
              }
            },
            zlevel: 1
          },
          series: [
            {
              name: '背景',
              type: 'bar',
              barWidth: this.barChartData.length > 5 ? '40%' : 30,
              barGap: '-100%',
              data: defaultData,
              type: 'pictorialBar',
              symbolSize: [26, 10],
              symbolOffset: [0, -5],
              z: 12,
              itemStyle: {
                color: '#11294d',
                barBorderRadius: 100
              }
            }],
                color: function(params) {
                  return barBottomColor[params.dataIndex % barBottomColor.length]
                }
              },
              label: {
                show: true,
                position: 'top',
                fontSize: 12,
                color: 'rgba(0,0,0,.45)'
              },
              symbolPosition: 'end',
              data: this.barChartData
            },
            {
              type: 'pictorialBar',
              symbolSize: [26, 10],
              symbolOffset: [0, 5],
              z: 12,
              itemStyle: {
                color: function(params) {
                  return barTopColor[params.dataIndex % barTopColor.length]
                }
              },
              data: this.barChartData
            },
            {
              type: 'bar',
              itemStyle: {
                color: function(params) {
                  return new echarts.graphic.LinearGradient(
                    0, 0, 0, 1,
                    [{
                      offset: 1,
                      color: barTopColor[params.dataIndex % barTopColor.length]
                    },
                      {
                        offset: 0,
                        color: barBottomColor[params.dataIndex % barBottomColor.length]
                      }
                    ]
                  )
                },
                opacity: .9
              },
              z: 16,
              barWidth: 26,
              barGap: '-100%',
              data: this.barChartData
            }
          ],
          dataZoom: {
            show: false,
            startValue: 0, // 从头开始。
@@ -1239,7 +1295,8 @@
        this.barChartCarouselTime = setInterval(() => {
          this.barChartData.push(this.barChartData.shift())
          xAisData.push(xAisData.shift())
          colorArray.push(colorArray.shift())
          barTopColor.push(barTopColor.shift())
          barBottomColor.push(barBottomColor.shift())
          this.$nextTick(() => {
            this.barChart.setOption(option, true)
          })
@@ -1272,9 +1329,10 @@
      openMaintenanceModal(record) {
        this.modalTitle = record.planTime
        this.modalDataApiParams = {
          productionCode: this.productionCode
          productionCode: this.productionCode,
          code: record.code
        }
        this.modalDataApiUrl = record.apiUrl
        this.modalDataApiUrl = '/eam/home/maintenanceList'
        this.modalVisible = true
      },

@@ -1314,15 +1372,6 @@

<style lang="less" scoped>
  .page-container {
    .page-title {
      display: flex;
      justify-content: space-evenly;
      flex-wrap: wrap;
      color: #fff;
      margin-bottom: 10px;

    }

    .content-container {
      padding-top: 5px;
      display: flex;
@@ -1352,7 +1401,7 @@
              .plan-value {
                margin-right: 20px;
                font-size: 30px;
                color: #EAC910;
                color: #fff;
              }
            }
          }
@@ -1374,7 +1423,7 @@
  }

  /deep/ .ant-form .ant-form-item-label label {
    color: #fff;
    color: rgba(0, 0, 0, .45);
    font-size: 18px;
  }

@@ -1384,16 +1433,16 @@

  /deep/ .ant-select-selection__clear {
    background: transparent !important;
    color: #fff;
    color: rgba(0, 0, 0, .45);
  }

  /deep/ .ant-select {
    color: #fff;
    color: rgba(0, 0, 0, .45);
  }

  /deep/ .ant-input {
    border: 1px solid #689ACA;
    color: #fff;
    border: 1px solid rgba(0, 0, 0, .45);
    color: rgba(0, 0, 0, .45);
    background: transparent !important;
  }
</style>

 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue

@@ -582,10 +582,6 @@
        this.checkedList = checkedList
      },
      searchQuery() {
        // 因触底刷新会修改参数时间值，故在此用时间选择器的时间值对参数时间值再次赋值，若不这样做则参数时间值则会与时间选择器上的时间值不一致
        this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
        this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')

        if (this.queryParam.typeTree == '1') {
          this.queryParam.parentId = this.queryParamEquip.parentId
          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
@@ -627,13 +623,6 @@
        this.tableHeads = []
        this.dataList = []
        this.spinning = true
        // 若日期选择器设置的查询请求数量超过15条则开启懒加载
        if (this.requestAllDataSize > this.everyRequestDataSize) {
          // 开启懒加载后将结束日期设置为开始日期之后的14天，即先查询15天内的数据
          this.queryParam.endTime = moment(this.queryParam.startTime).add(this.everyRequestDataSize - 1, 'days').format('YYYYMMDD')
          this.isLazyRequest = true
          this.tableScroll.removeEventListener('scroll', this.tableScrollX) // 为避免滚动条有滚动距离后后点击查询按钮触发滚动事件，因此在触发事件前移除事件
        }

        getAction(this.url.list, this.queryParam).then(res => {
          if (res.success) {
@@ -651,7 +640,6 @@
            this.checkSameData1(this.dataList)
            this.checkSameData2(this.dataList)
            this.combineCell()
            this.tableScroll.addEventListener('scroll', this.tableScrollX)
          }
        }).finally(() => {
          this.spinning = false
@@ -662,40 +650,6 @@
      handleShowFeedbackModal() {
        this.$refs.modalForm.formParams = {}
        this.modalVisible = true
      },

      // 滚动条触底刷新表格数据
      tableScrollX() {
        // 当滚动条触底且懒加载开启时触发滚动条触底刷新
        if (Math.ceil(this.tableScroll.scrollLeft + this.tableScroll.clientWidth) + 1 >= this.tableScroll.scrollWidth && this.isLazyRequest) {
          this.spinning = true
          this.queryParam.startTime = moment(this.queryParam.endTime).add(1, 'days').format('YYYYMMDD')
          // 判断设置懒加载后的结束时间是否超过时间选择器中设置的结束时间
          if (moment(this.queryParam.endTime).add(this.everyRequestDataSize - 1, 'days').format('YYYYMMDD') - moment(this.dates[1]).format('YYYYMMDD') < 0) {
            //再次查询后15天内的数据
            this.queryParam.endTime = moment(this.queryParam.endTime).add(this.everyRequestDataSize, 'days').format('YYYYMMDD')
          } else {
            // 如果不小于时间选择器中设置的时间则设置请求结束日期为时间选择器中设置的结束时间并且关闭懒加载（意味着最后一次触底刷新）
            this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
            this.isLazyRequest = false
          }
          getAction(this.url.list, this.queryParam)
            .then(res => {
              if (res.success) {
                this.tableHeads = [...this.tableHeads.slice(0, -2), ...res.result.dates]
                this.dataList.forEach(item1 => {
                  res.result.mdcEfficiencyList.forEach(item2 => {
                    if (item1.equipmentId === item2.equipmentId) {
                      item1.dataList = [...item1.dataList.slice(0, -2), ...item2.dataList]
                    }
                  })
                })
              }
            })
            .finally(() => {
              this.spinning = false
            })
        }
      },

      // 获取设备类型列表