Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

rislai

2024-08-07 3cf4ce0c94be1a8928ffe280429d6297583b3b8d

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def

@@ -60,14 +60,18 @@
        Taborder: 4
      ]
    }
    Component ButtonEnginePipelineReport
    Component ButtonPipelineReport
    {
      #keys: '[415136.0.884991586]'
      BaseType: 'WebButton'
      Children:
      [
        #child: ContextMenuPipelineReport
      ]
      Properties:
      [
        Image: 'DOCUMENT_CONNECTION'
        Label: 'Engine pipeline report'
        Label: 'Pipeline report'
        Taborder: 5
      ]
    }
@@ -82,6 +86,17 @@
        Taborder: 6
      ]
    }
    Component bMachineLogisticsCostReport
    {
      #keys: '[413988.0.1467117990]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'LOCATION_PIN'
        Label: 'Machine logistics cost report'
        Taborder: 7
      ]
    }
    Component ButtonScenarioComparisonDemandComparison id:ButtonScenarioComparisonDemandComparison_256
    {
      #keys: '[412672.1.90201789]'
@@ -90,7 +105,7 @@
      [
        Image: 'EQUALS'
        Label: '需求对比'
        Taborder: 7
        Taborder: 8
      ]
    }
    Component ButtonScheduleSummaryReport