Merge remote-tracking branch 'origin/master'

lyh

昨天 222efa89f74386c97cce2b0ea33d13b1ddbdb49e

Merge remote-tracking branch 'origin/master'

 src/components/page/GlobalLayout.vue

@@ -70,7 +70,7 @@

      <!-- layout content -->
      <a-layout-content
        :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' ,background: $route.meta.title=='首页'?'#FEFEFE':''}">
        :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' ,background: $route.meta.title=='首页'?'#FDFDFD':''}">
        <slot></slot>
      </a-layout-content>


 src/views/dashboard/WorkshopSectionSignage.vue

@@ -7,13 +7,9 @@
        </div>

        <dv-border-box-9 style="padding: 15px 15px 0">
          <div id="tech_condition_chart" style="width:100%;height: 240px;"></div>
          <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: rgba(0,0,0,.45);font-size: 20px;align-self: flex-start">三保计划
              </dv-decoration-11>
          <div id="tech_condition_chart" style="width:100%;height: 280px;"></div>
          <div id="warranty_malfunction_chart" style="width:100%;height: 280px;"></div>
          <div style="display: flex;flex-direction:column;align-items: center;margin-top: 40px">
              <div class="support-plan-container">
                <div v-for="(item,index) in supportPlanList" :key="index" class="support-plan-item"
                     :style="{background:item.backgroundColor}" @click="openMaintenanceModal(item)">
@@ -22,16 +18,6 @@
                    <div class="plan-value">{{$data[item.planValueLabel]}}</div>
                    <div>台</div>
                  </div>
                </div>
              </div>
            </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: rgba(0,0,0,.45)">二保计划
              </dv-decoration-11>
              <div
                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>
          </div>
@@ -365,46 +351,6 @@
        signageApi.getEquipmentOEEMonthStatisticsApi(this.productionCode)
          .then(res => {
            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,
@@ -680,9 +626,9 @@
            const equipmentIdObj = {
              equipmentId: item.equipmentId,
              equipmentName: item.equipmentName,
              openRate: 84,
              startRate: 70,
              utilizationRate: 42
              openRate: 0,
              startRate: 0,
              utilizationRate: 0
            }
            this.first7DaysEfficiencyData.dataList.push(equipmentIdObj)
          }
@@ -1384,7 +1330,6 @@
          justify-content: space-around;
          flex-wrap: wrap;
          color: #fff;
          padding-top: 20px;

          .support-plan-item {
            border-radius: 3px;

 src/views/eam/maintenance/modules/EamSecondMaintenanceOrderBatchPrintModal.vue

@@ -163,7 +163,7 @@
      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
        if (this.$refs.form) this.$refs.form.clearValidate()
      }
    }
  }

 src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal.vue

@@ -243,7 +243,7 @@
        getAction(this.url.queryById, { id: record.dataId })
          .then(res => {
            if (res.success) {
              that.model = Object.assign({ confirmDealType: '1' }, res.result)
              that.model = Object.assign({}, res.result, { confirmDealType: '1' })
              that.model.dataId = record.dataId
              that.model.taskId = record.id
              that.model.userId = record.assignee