diff --git a/sql/QualityAssurance/质量数据查询_测量数据发动机在线状态_下线统计_趋势分析.sql b/sql/QualityAssurance/质量数据查询_测量数据发动机在线状态_下线统计_趋势分析.sql new file mode 100644 index 0000000..683dd49 --- /dev/null +++ b/sql/QualityAssurance/质量数据查询_测量数据发动机在线状态_下线统计_趋势分析.sql @@ -0,0 +1,51 @@ +IF OBJECT_ID(N'[dbo].[质量数据查询_测量数据发动机在线状态_下线统计_趋势分析]', N'P') IS NOT NULL +BEGIN + DROP PROCEDURE [dbo].[质量数据查询_测量数据发动机在线状态_下线统计_趋势分析] +END +GO + +CREATE PROCEDURE [dbo].[质量数据查询_测量数据发动机在线状态_下线统计_趋势分析] + @开始时间 NVARCHAR(20), + @结束时间 NVARCHAR(20), + @订单号_check INT, + @订单号 NVARCHAR(100), + @产品型号代码_check INT, + @产品型号代码 NVARCHAR(100), + @聚合类型 NVARCHAR(10) = N'day' +AS +BEGIN + SET NOCOUNT ON + + DECLARE @startTime DATETIME + DECLARE @endTime DATETIME + + SET @startTime = CONVERT(DATETIME, @开始时间 + ' 00:00:00', 120) + SET @endTime = CONVERT(DATETIME, @结束时间 + ' 23:59:59', 120) + + ;WITH SourceData AS ( + SELECT + 订单号, + 发动机号, + 机型, + 离开时间 = CONVERT(DATETIME, 离开时间, 120) + FROM 测量数据发动机在线状态 + WHERE 离开时间 IS NOT NULL + AND CONVERT(DATETIME, 离开时间, 120) >= @startTime + AND CONVERT(DATETIME, 离开时间, 120) <= @endTime + AND (@订单号_check = 0 OR 订单号 = @订单号) + AND (@产品型号代码_check = 0 OR 产品型号代码 = @产品型号代码) + ) + SELECT + 时间段 = CASE + WHEN @聚合类型 = N'hour' THEN CONVERT(NVARCHAR(13), 离开时间, 120) + N':00' + ELSE CONVERT(NVARCHAR(10), 离开时间, 23) + END, + 下线数量 = COUNT(1) + FROM SourceData + GROUP BY CASE + WHEN @聚合类型 = N'hour' THEN CONVERT(NVARCHAR(13), 离开时间, 120) + N':00' + ELSE CONVERT(NVARCHAR(10), 离开时间, 23) + END + ORDER BY MIN(离开时间) +END +GO diff --git a/src/icons/svg/AlarmManagement.svg b/src/icons/svg/AlarmManagement.svg new file mode 100644 index 0000000..2816acd --- /dev/null +++ b/src/icons/svg/AlarmManagement.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/AlarmThresholdValue.svg b/src/icons/svg/AlarmThresholdValue.svg new file mode 100644 index 0000000..6fadbb9 --- /dev/null +++ b/src/icons/svg/AlarmThresholdValue.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/AndonQuery.svg b/src/icons/svg/AndonQuery.svg new file mode 100644 index 0000000..90e1a49 --- /dev/null +++ b/src/icons/svg/AndonQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BalanceReport.svg b/src/icons/svg/BalanceReport.svg new file mode 100644 index 0000000..63bb03b --- /dev/null +++ b/src/icons/svg/BalanceReport.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/BasicDataMaintenance.svg b/src/icons/svg/BasicDataMaintenance.svg new file mode 100644 index 0000000..2ca2d73 --- /dev/null +++ b/src/icons/svg/BasicDataMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BlueCollarBonusBaseInput.svg b/src/icons/svg/BlueCollarBonusBaseInput.svg new file mode 100644 index 0000000..1b9b4a0 --- /dev/null +++ b/src/icons/svg/BlueCollarBonusBaseInput.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BlueCollarBonusScoreInput.svg b/src/icons/svg/BlueCollarBonusScoreInput.svg new file mode 100644 index 0000000..a1e08b4 --- /dev/null +++ b/src/icons/svg/BlueCollarBonusScoreInput.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BlueCollarJobSettings.svg b/src/icons/svg/BlueCollarJobSettings.svg new file mode 100644 index 0000000..04b10da --- /dev/null +++ b/src/icons/svg/BlueCollarJobSettings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BlueCollarScoreModify.svg b/src/icons/svg/BlueCollarScoreModify.svg new file mode 100644 index 0000000..725ad2a --- /dev/null +++ b/src/icons/svg/BlueCollarScoreModify.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BlueCollarScoresApproval.svg b/src/icons/svg/BlueCollarScoresApproval.svg new file mode 100644 index 0000000..6d235c3 --- /dev/null +++ b/src/icons/svg/BlueCollarScoresApproval.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BonusBaseInput.svg b/src/icons/svg/BonusBaseInput.svg new file mode 100644 index 0000000..0dea4d8 --- /dev/null +++ b/src/icons/svg/BonusBaseInput.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/BonusBaseRntry.svg b/src/icons/svg/BonusBaseRntry.svg new file mode 100644 index 0000000..d6b1239 --- /dev/null +++ b/src/icons/svg/BonusBaseRntry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BonusInquiry.svg b/src/icons/svg/BonusInquiry.svg new file mode 100644 index 0000000..3ea4f75 --- /dev/null +++ b/src/icons/svg/BonusInquiry.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/BonusScore.svg b/src/icons/svg/BonusScore.svg new file mode 100644 index 0000000..394f01a --- /dev/null +++ b/src/icons/svg/BonusScore.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/BonusSettlement.svg b/src/icons/svg/BonusSettlement.svg new file mode 100644 index 0000000..b4009d7 --- /dev/null +++ b/src/icons/svg/BonusSettlement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/BucketInformationMaintenance.svg b/src/icons/svg/BucketInformationMaintenance.svg new file mode 100644 index 0000000..5479663 --- /dev/null +++ b/src/icons/svg/BucketInformationMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/CallEmptyBucket.svg b/src/icons/svg/CallEmptyBucket.svg new file mode 100644 index 0000000..0e7d0ae --- /dev/null +++ b/src/icons/svg/CallEmptyBucket.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/CallEmptyBucket2.svg b/src/icons/svg/CallEmptyBucket2.svg new file mode 100644 index 0000000..57445e9 --- /dev/null +++ b/src/icons/svg/CallEmptyBucket2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ChangeModelTimeReport.svg b/src/icons/svg/ChangeModelTimeReport.svg new file mode 100644 index 0000000..5610436 --- /dev/null +++ b/src/icons/svg/ChangeModelTimeReport.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/CuttingTvSearch.svg b/src/icons/svg/CuttingTvSearch.svg new file mode 100644 index 0000000..274324c --- /dev/null +++ b/src/icons/svg/CuttingTvSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/DataImport.svg b/src/icons/svg/DataImport.svg new file mode 100644 index 0000000..d74b1d1 --- /dev/null +++ b/src/icons/svg/DataImport.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/DimensionsSummaryReport.svg b/src/icons/svg/DimensionsSummaryReport.svg new file mode 100644 index 0000000..a3fed5d --- /dev/null +++ b/src/icons/svg/DimensionsSummaryReport.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/DocumentImport.svg b/src/icons/svg/DocumentImport.svg new file mode 100644 index 0000000..3b12260 --- /dev/null +++ b/src/icons/svg/DocumentImport.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/EnergyStatisticalAnalysis.svg b/src/icons/svg/EnergyStatisticalAnalysis.svg new file mode 100644 index 0000000..30a1237 --- /dev/null +++ b/src/icons/svg/EnergyStatisticalAnalysis.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/ExcelImport.svg b/src/icons/svg/ExcelImport.svg new file mode 100644 index 0000000..7400c96 --- /dev/null +++ b/src/icons/svg/ExcelImport.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/GrindingErrorhandling.svg b/src/icons/svg/GrindingErrorhandling.svg new file mode 100644 index 0000000..af78c42 --- /dev/null +++ b/src/icons/svg/GrindingErrorhandling.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/GrindingQuality.svg b/src/icons/svg/GrindingQuality.svg new file mode 100644 index 0000000..3019088 --- /dev/null +++ b/src/icons/svg/GrindingQuality.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/GrindingQualityHistory.svg b/src/icons/svg/GrindingQualityHistory.svg new file mode 100644 index 0000000..cddc891 --- /dev/null +++ b/src/icons/svg/GrindingQualityHistory.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/GrindingStatistics.svg b/src/icons/svg/GrindingStatistics.svg new file mode 100644 index 0000000..b0445e6 --- /dev/null +++ b/src/icons/svg/GrindingStatistics.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/GrindingTvSearch.svg b/src/icons/svg/GrindingTvSearch.svg new file mode 100644 index 0000000..274324c --- /dev/null +++ b/src/icons/svg/GrindingTvSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/Grindingyield.svg b/src/icons/svg/Grindingyield.svg new file mode 100644 index 0000000..9d0361e --- /dev/null +++ b/src/icons/svg/Grindingyield.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/HistoricalAlarmIcon.svg b/src/icons/svg/HistoricalAlarmIcon.svg new file mode 100644 index 0000000..15d3541 --- /dev/null +++ b/src/icons/svg/HistoricalAlarmIcon.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/HomePageIndex.svg b/src/icons/svg/HomePageIndex.svg new file mode 100644 index 0000000..d2bb95b --- /dev/null +++ b/src/icons/svg/HomePageIndex.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/HourlyEquilibriumManagement.svg b/src/icons/svg/HourlyEquilibriumManagement.svg new file mode 100644 index 0000000..5223e7b --- /dev/null +++ b/src/icons/svg/HourlyEquilibriumManagement.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/InputInformationQuery.svg b/src/icons/svg/InputInformationQuery.svg new file mode 100644 index 0000000..d3071f6 --- /dev/null +++ b/src/icons/svg/InputInformationQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/InputInformationSearch.svg b/src/icons/svg/InputInformationSearch.svg new file mode 100644 index 0000000..2dad992 --- /dev/null +++ b/src/icons/svg/InputInformationSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/KKI.svg b/src/icons/svg/KKI.svg new file mode 100644 index 0000000..5f6961a --- /dev/null +++ b/src/icons/svg/KKI.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/KKIBomMantaince.svg b/src/icons/svg/KKIBomMantaince.svg new file mode 100644 index 0000000..dc094c4 --- /dev/null +++ b/src/icons/svg/KKIBomMantaince.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/KKIHistoryMaintenance.svg b/src/icons/svg/KKIHistoryMaintenance.svg new file mode 100644 index 0000000..f9b0ffc --- /dev/null +++ b/src/icons/svg/KKIHistoryMaintenance.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/KKIInventoryMantaince.svg b/src/icons/svg/KKIInventoryMantaince.svg new file mode 100644 index 0000000..19290a4 --- /dev/null +++ b/src/icons/svg/KKIInventoryMantaince.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/KKIMaintenance.svg b/src/icons/svg/KKIMaintenance.svg new file mode 100644 index 0000000..ad8e748 --- /dev/null +++ b/src/icons/svg/KKIMaintenance.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/KKIUpdate.svg b/src/icons/svg/KKIUpdate.svg new file mode 100644 index 0000000..ea4dc4f --- /dev/null +++ b/src/icons/svg/KKIUpdate.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/LoginHistorySearch.png b/src/icons/svg/LoginHistorySearch.png new file mode 100644 index 0000000..fa2d773 Binary files /dev/null and b/src/icons/svg/LoginHistorySearch.png differ diff --git a/src/icons/svg/LoginHistorySearch.svg b/src/icons/svg/LoginHistorySearch.svg new file mode 100644 index 0000000..e63c7c7 --- /dev/null +++ b/src/icons/svg/LoginHistorySearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/LossHour.svg b/src/icons/svg/LossHour.svg new file mode 100644 index 0000000..2a6adea --- /dev/null +++ b/src/icons/svg/LossHour.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/LossInput.svg b/src/icons/svg/LossInput.svg new file mode 100644 index 0000000..6ceef06 --- /dev/null +++ b/src/icons/svg/LossInput.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/LossOfManHourQuery.svg b/src/icons/svg/LossOfManHourQuery.svg new file mode 100644 index 0000000..2a52c27 --- /dev/null +++ b/src/icons/svg/LossOfManHourQuery.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/LossReview.svg b/src/icons/svg/LossReview.svg new file mode 100644 index 0000000..4d172a8 --- /dev/null +++ b/src/icons/svg/LossReview.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MachineCategoryMaintenance.svg b/src/icons/svg/MachineCategoryMaintenance.svg new file mode 100644 index 0000000..d574c5b --- /dev/null +++ b/src/icons/svg/MachineCategoryMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MachinePlanningMantenance.svg b/src/icons/svg/MachinePlanningMantenance.svg new file mode 100644 index 0000000..373aeb4 --- /dev/null +++ b/src/icons/svg/MachinePlanningMantenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MachineToolsMaintenance.svg b/src/icons/svg/MachineToolsMaintenance.svg new file mode 100644 index 0000000..8d20e2b --- /dev/null +++ b/src/icons/svg/MachineToolsMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MainMaterialMantaince.svg b/src/icons/svg/MainMaterialMantaince.svg new file mode 100644 index 0000000..6a1cb08 --- /dev/null +++ b/src/icons/svg/MainMaterialMantaince.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MainMaterialMantainceSearch.svg b/src/icons/svg/MainMaterialMantainceSearch.svg new file mode 100644 index 0000000..6a1cb08 --- /dev/null +++ b/src/icons/svg/MainMaterialMantainceSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ManufactureRequirement.svg b/src/icons/svg/ManufactureRequirement.svg new file mode 100644 index 0000000..3c9b738 --- /dev/null +++ b/src/icons/svg/ManufactureRequirement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ManufactureRequirementSearch.svg b/src/icons/svg/ManufactureRequirementSearch.svg new file mode 100644 index 0000000..98cf6e4 --- /dev/null +++ b/src/icons/svg/ManufactureRequirementSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialDictionaryMantaince.svg b/src/icons/svg/MaterialDictionaryMantaince.svg new file mode 100644 index 0000000..17d0a9c --- /dev/null +++ b/src/icons/svg/MaterialDictionaryMantaince.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MenuManagement.svg b/src/icons/svg/MenuManagement.svg new file mode 100644 index 0000000..d16bd1d --- /dev/null +++ b/src/icons/svg/MenuManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MonthlyScoringTableGeneration.svg b/src/icons/svg/MonthlyScoringTableGeneration.svg new file mode 100644 index 0000000..f48ba18 --- /dev/null +++ b/src/icons/svg/MonthlyScoringTableGeneration.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OffLinePartCount.png b/src/icons/svg/OffLinePartCount.png new file mode 100644 index 0000000..25fd9ab Binary files /dev/null and b/src/icons/svg/OffLinePartCount.png differ diff --git a/src/icons/svg/OffLinePartCount.svg b/src/icons/svg/OffLinePartCount.svg new file mode 100644 index 0000000..c18174d --- /dev/null +++ b/src/icons/svg/OffLinePartCount.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OrganizationalStructureMaintenance.svg b/src/icons/svg/OrganizationalStructureMaintenance.svg new file mode 100644 index 0000000..5802158 --- /dev/null +++ b/src/icons/svg/OrganizationalStructureMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutputInformationQuery.svg b/src/icons/svg/OutputInformationQuery.svg new file mode 100644 index 0000000..067c402 --- /dev/null +++ b/src/icons/svg/OutputInformationQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutputInformationSearch.svg b/src/icons/svg/OutputInformationSearch.svg new file mode 100644 index 0000000..20e9fcf --- /dev/null +++ b/src/icons/svg/OutputInformationSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PTPT.svg b/src/icons/svg/PTPT.svg new file mode 100644 index 0000000..a383ca5 --- /dev/null +++ b/src/icons/svg/PTPT.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PerformanceAppraisal.svg b/src/icons/svg/PerformanceAppraisal.svg new file mode 100644 index 0000000..2f92640 --- /dev/null +++ b/src/icons/svg/PerformanceAppraisal.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/PersonnelBasicData.svg b/src/icons/svg/PersonnelBasicData.svg new file mode 100644 index 0000000..dfa09e0 --- /dev/null +++ b/src/icons/svg/PersonnelBasicData.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PersonnelDataImport.svg b/src/icons/svg/PersonnelDataImport.svg new file mode 100644 index 0000000..0fde784 --- /dev/null +++ b/src/icons/svg/PersonnelDataImport.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PersonnelMaintenance.svg b/src/icons/svg/PersonnelMaintenance.svg new file mode 100644 index 0000000..ab6d9f8 --- /dev/null +++ b/src/icons/svg/PersonnelMaintenance.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/PersonnelPermission.svg b/src/icons/svg/PersonnelPermission.svg new file mode 100644 index 0000000..5fec9b5 --- /dev/null +++ b/src/icons/svg/PersonnelPermission.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PersonnelRoleAssignment.svg b/src/icons/svg/PersonnelRoleAssignment.svg new file mode 100644 index 0000000..38fcf9e --- /dev/null +++ b/src/icons/svg/PersonnelRoleAssignment.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/PlannedExceptionHandling.svg b/src/icons/svg/PlannedExceptionHandling.svg new file mode 100644 index 0000000..2dea670 --- /dev/null +++ b/src/icons/svg/PlannedExceptionHandling.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PlannedExceptionHandlingSearch.svg b/src/icons/svg/PlannedExceptionHandlingSearch.svg new file mode 100644 index 0000000..2dea670 --- /dev/null +++ b/src/icons/svg/PlannedExceptionHandlingSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductionBonus.svg b/src/icons/svg/ProductionBonus.svg new file mode 100644 index 0000000..f0ae3af --- /dev/null +++ b/src/icons/svg/ProductionBonus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductionBonusScoreInput.svg b/src/icons/svg/ProductionBonusScoreInput.svg new file mode 100644 index 0000000..68837ab --- /dev/null +++ b/src/icons/svg/ProductionBonusScoreInput.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/ProductionBonusScoreModify.svg b/src/icons/svg/ProductionBonusScoreModify.svg new file mode 100644 index 0000000..da8e815 --- /dev/null +++ b/src/icons/svg/ProductionBonusScoreModify.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/ProductionCompletionRate.svg b/src/icons/svg/ProductionCompletionRate.svg new file mode 100644 index 0000000..7f4d872 --- /dev/null +++ b/src/icons/svg/ProductionCompletionRate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductionPlanComplete.svg b/src/icons/svg/ProductionPlanComplete.svg new file mode 100644 index 0000000..5deb2a6 --- /dev/null +++ b/src/icons/svg/ProductionPlanComplete.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductionPlanDelivery.svg b/src/icons/svg/ProductionPlanDelivery.svg new file mode 100644 index 0000000..bac9e2d --- /dev/null +++ b/src/icons/svg/ProductionPlanDelivery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductionPlanMaintenance.svg b/src/icons/svg/ProductionPlanMaintenance.svg new file mode 100644 index 0000000..0a397ed --- /dev/null +++ b/src/icons/svg/ProductionPlanMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductionPlanSearch.svg b/src/icons/svg/ProductionPlanSearch.svg new file mode 100644 index 0000000..3135780 --- /dev/null +++ b/src/icons/svg/ProductionPlanSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductionTimeRate.svg b/src/icons/svg/ProductionTimeRate.svg new file mode 100644 index 0000000..cd13c6b --- /dev/null +++ b/src/icons/svg/ProductionTimeRate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/QualitySearch.svg b/src/icons/svg/QualitySearch.svg new file mode 100644 index 0000000..8d33be5 --- /dev/null +++ b/src/icons/svg/QualitySearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/RealTimeAlarm.svg b/src/icons/svg/RealTimeAlarm.svg new file mode 100644 index 0000000..2159d7e --- /dev/null +++ b/src/icons/svg/RealTimeAlarm.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/RealTimeAlarmInformation.svg b/src/icons/svg/RealTimeAlarmInformation.svg new file mode 100644 index 0000000..90c443f --- /dev/null +++ b/src/icons/svg/RealTimeAlarmInformation.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/Repolishing.svg b/src/icons/svg/Repolishing.svg new file mode 100644 index 0000000..d543ac2 --- /dev/null +++ b/src/icons/svg/Repolishing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ReportQuery.svg b/src/icons/svg/ReportQuery.svg new file mode 100644 index 0000000..9beadff --- /dev/null +++ b/src/icons/svg/ReportQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/RepositoryInformationMaintenance.svg b/src/icons/svg/RepositoryInformationMaintenance.svg new file mode 100644 index 0000000..3d953db --- /dev/null +++ b/src/icons/svg/RepositoryInformationMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/RevisionRateOfWorkOrder.svg b/src/icons/svg/RevisionRateOfWorkOrder.svg new file mode 100644 index 0000000..b66fe3c --- /dev/null +++ b/src/icons/svg/RevisionRateOfWorkOrder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ScheduledExceptionHandling.svg b/src/icons/svg/ScheduledExceptionHandling.svg new file mode 100644 index 0000000..4596906 --- /dev/null +++ b/src/icons/svg/ScheduledExceptionHandling.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ScheduledExceptionHandlingSearch.svg b/src/icons/svg/ScheduledExceptionHandlingSearch.svg new file mode 100644 index 0000000..4596906 --- /dev/null +++ b/src/icons/svg/ScheduledExceptionHandlingSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SortErrorhandling.svg b/src/icons/svg/SortErrorhandling.svg new file mode 100644 index 0000000..2ad4952 --- /dev/null +++ b/src/icons/svg/SortErrorhandling.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SortRepositoryInformationMaintenance.svg b/src/icons/svg/SortRepositoryInformationMaintenance.svg new file mode 100644 index 0000000..1c06c55 --- /dev/null +++ b/src/icons/svg/SortRepositoryInformationMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SortingQuality.svg b/src/icons/svg/SortingQuality.svg new file mode 100644 index 0000000..362c798 --- /dev/null +++ b/src/icons/svg/SortingQuality.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SortingQualityHistory.svg b/src/icons/svg/SortingQualityHistory.svg new file mode 100644 index 0000000..3becba5 --- /dev/null +++ b/src/icons/svg/SortingQualityHistory.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SortingStatistics.svg b/src/icons/svg/SortingStatistics.svg new file mode 100644 index 0000000..4a82d8a --- /dev/null +++ b/src/icons/svg/SortingStatistics.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SortingTvSearch.svg b/src/icons/svg/SortingTvSearch.svg new file mode 100644 index 0000000..274324c --- /dev/null +++ b/src/icons/svg/SortingTvSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/Sortingyield.svg b/src/icons/svg/Sortingyield.svg new file mode 100644 index 0000000..d2935cc --- /dev/null +++ b/src/icons/svg/Sortingyield.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/StationBeat.svg b/src/icons/svg/StationBeat.svg new file mode 100644 index 0000000..2286d9b --- /dev/null +++ b/src/icons/svg/StationBeat.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/StationJPH.svg b/src/icons/svg/StationJPH.svg new file mode 100644 index 0000000..3e7d730 --- /dev/null +++ b/src/icons/svg/StationJPH.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/StationMaintain.svg b/src/icons/svg/StationMaintain.svg new file mode 100644 index 0000000..5e7b814 --- /dev/null +++ b/src/icons/svg/StationMaintain.svg @@ -0,0 +1 @@ + diff --git a/src/icons/svg/StationOEE.svg b/src/icons/svg/StationOEE.svg new file mode 100644 index 0000000..8cbf0ea --- /dev/null +++ b/src/icons/svg/StationOEE.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/StationStatistics.svg b/src/icons/svg/StationStatistics.svg new file mode 100644 index 0000000..0b85264 --- /dev/null +++ b/src/icons/svg/StationStatistics.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/StationTimeOff.png b/src/icons/svg/StationTimeOff.png new file mode 100644 index 0000000..4b7905c Binary files /dev/null and b/src/icons/svg/StationTimeOff.png differ diff --git a/src/icons/svg/StationTimeOff.svg b/src/icons/svg/StationTimeOff.svg new file mode 100644 index 0000000..58f6b00 --- /dev/null +++ b/src/icons/svg/StationTimeOff.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/StatisticalReport.svg b/src/icons/svg/StatisticalReport.svg new file mode 100644 index 0000000..39434e0 --- /dev/null +++ b/src/icons/svg/StatisticalReport.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/SteelDemand.svg b/src/icons/svg/SteelDemand.svg new file mode 100644 index 0000000..cf87e96 --- /dev/null +++ b/src/icons/svg/SteelDemand.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/StopInformationQuery.svg b/src/icons/svg/StopInformationQuery.svg new file mode 100644 index 0000000..351588d --- /dev/null +++ b/src/icons/svg/StopInformationQuery.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/icons/svg/SummaryLostWorkingHours.svg b/src/icons/svg/SummaryLostWorkingHours.svg new file mode 100644 index 0000000..54806c2 --- /dev/null +++ b/src/icons/svg/SummaryLostWorkingHours.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SystemMaintenance.svg b/src/icons/svg/SystemMaintenance.svg new file mode 100644 index 0000000..2619085 --- /dev/null +++ b/src/icons/svg/SystemMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SystemRoleMaintenance.svg b/src/icons/svg/SystemRoleMaintenance.svg new file mode 100644 index 0000000..4380133 --- /dev/null +++ b/src/icons/svg/SystemRoleMaintenance.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/icons/svg/TLBonusSummary.svg b/src/icons/svg/TLBonusSummary.svg new file mode 100644 index 0000000..6eb6b6f --- /dev/null +++ b/src/icons/svg/TLBonusSummary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/TLScoresApproval.svg b/src/icons/svg/TLScoresApproval.svg new file mode 100644 index 0000000..df036c4 --- /dev/null +++ b/src/icons/svg/TLScoresApproval.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/TimeFreezeSetUp.svg b/src/icons/svg/TimeFreezeSetUp.svg new file mode 100644 index 0000000..674db57 --- /dev/null +++ b/src/icons/svg/TimeFreezeSetUp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/WMSInformationSearch.svg b/src/icons/svg/WMSInformationSearch.svg new file mode 100644 index 0000000..af26157 --- /dev/null +++ b/src/icons/svg/WMSInformationSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/WarehouseMaintenance.svg b/src/icons/svg/WarehouseMaintenance.svg new file mode 100644 index 0000000..21566e5 --- /dev/null +++ b/src/icons/svg/WarehouseMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/WhiteCollarBonusInput.svg b/src/icons/svg/WhiteCollarBonusInput.svg new file mode 100644 index 0000000..8126b07 --- /dev/null +++ b/src/icons/svg/WhiteCollarBonusInput.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/WhiteCollarBonusesSummary.svg b/src/icons/svg/WhiteCollarBonusesSummary.svg new file mode 100644 index 0000000..ea24215 --- /dev/null +++ b/src/icons/svg/WhiteCollarBonusesSummary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/WhiteCollarScoreModify.svg b/src/icons/svg/WhiteCollarScoreModify.svg new file mode 100644 index 0000000..10772ff --- /dev/null +++ b/src/icons/svg/WhiteCollarScoreModify.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/WhiteCollarScoresApproval.svg b/src/icons/svg/WhiteCollarScoresApproval.svg new file mode 100644 index 0000000..6f2f4d4 --- /dev/null +++ b/src/icons/svg/WhiteCollarScoresApproval.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/huang.svg b/src/icons/svg/huang.svg new file mode 100644 index 0000000..cafab4a --- /dev/null +++ b/src/icons/svg/huang.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/ku.svg b/src/icons/svg/ku.svg new file mode 100644 index 0000000..f8fbbd8 --- /dev/null +++ b/src/icons/svg/ku.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/scanErr.svg b/src/icons/svg/scanErr.svg new file mode 100644 index 0000000..8f49e80 --- /dev/null +++ b/src/icons/svg/scanErr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/xiao.svg b/src/icons/svg/xiao.svg new file mode 100644 index 0000000..1b314fd --- /dev/null +++ b/src/icons/svg/xiao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/看板_board.svg b/src/icons/svg/看板_board.svg new file mode 100644 index 0000000..9ab8541 --- /dev/null +++ b/src/icons/svg/看板_board.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/索引管理.svg b/src/icons/svg/索引管理.svg new file mode 100644 index 0000000..bd0dde0 --- /dev/null +++ b/src/icons/svg/索引管理.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lang/en-US.js b/src/lang/en-US.js index 5ad5bce..13a04fb 100644 --- a/src/lang/en-US.js +++ b/src/lang/en-US.js @@ -13,12 +13,12 @@ export default { }, login: { systemName: 'Intelligent Assembly Line Information Management System', - usernamePlaceholder: 'Please enter username', + usernamePlaceholder: 'Please enter Employee ID', passwordPlaceholder: 'Please enter password', rememberPassword: 'Remember password', changePassword: 'Change password', loginButton: 'Login', - account: 'Attendance No.', + account: 'Employee ID', oldPassword: 'Old password', newPassword: 'New password', confirmPassword: 'Confirm password', @@ -487,6 +487,12 @@ export default { importSuccess: 'Import succeeded!', importFailed: 'Import failed!' }, + tagsView: { + refresh: 'Refresh', + closeCurrent: 'Close Current', + closeOthers: 'Close Others', + closeAll: 'Close All' + }, menu: { '主页': 'Home', '菜单管理': 'Menus', diff --git a/src/lang/index.js b/src/lang/index.js index 1a86b8d..12f57ec 100644 --- a/src/lang/index.js +++ b/src/lang/index.js @@ -6,7 +6,7 @@ import enUS from './en-US' Vue.use(VueI18n) -export const DEFAULT_LOCALE = 'zh-CN' +export const DEFAULT_LOCALE = 'en-US' export const LOCALE_STORAGE_KEY = 'language' export const SUPPORT_LOCALES = ['zh-CN', 'en-US'] diff --git a/src/lang/zh-CN.js b/src/lang/zh-CN.js index c8fd55d..6897c2e 100644 --- a/src/lang/zh-CN.js +++ b/src/lang/zh-CN.js @@ -487,6 +487,12 @@ export default { importSuccess: '导入成功!', importFailed: '导入失败!' }, + tagsView: { + refresh: '重新加载', + closeCurrent: '关闭当前', + closeOthers: '关闭其他', + closeAll: '关闭全部' + }, menu: { '主页': '主页', '菜单管理': '菜单管理', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 4255289..5f01e99 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -35,58 +35,28 @@ const user = { // 登录 Login({ commit }, userInfo) { const username = userInfo.username.trim() - if (username !== '0000') { - return new Promise((resolve, reject) => { - const params = new Login_Request(username, userInfo.password) - HttpCli.Get('/sys/login', params).then(response => { - console.log(response) - const data = response.data - if (data.code === 200 && data.success) { - const login_Response = new Login_Response(data) - setToken(login_Response.result.token) - Cookies.set('id', login_Response.result.userInfo.id, { expires: 1 }) - Cookies.set('name', login_Response.result.userInfo.username, { expires: 1 }) - Cookies.set('userId', login_Response.result.userInfo.username, { expires: 1 }) - Cookies.set('session_id', login_Response.result.userInfo.id) - commit('SET_TOKEN', login_Response.result.token) - commit('SET_NAME', login_Response.result.userInfo.username) - commit('SET_ID', login_Response.result.userInfo.id) - commit('SET_userId', login_Response.result.userInfo.username) - resolve() - } else { - Message.error('账号或密码错误,请重新登录') - this.$router.push({ path: '/login' }) - } - resolve(response.data) - }).catch(error => { - console.log(error) - reject(error) - }) + return new Promise((resolve, reject) => { + login(username, userInfo.password).then(response => { + const data = response.data + if (data.length === 0 || data.result === '0') { + Message.error('账号或密码错误,请重新登录') + this.$router.push({ path: '/login' }) + } else { + setToken(data[0].角色编号) + Cookies.set('id', data[0].人员编号, { expires: 1 }) + Cookies.set('name', data[0].姓名, { expires: 1 }) + Cookies.set('userId', data[0].考勤编号, { expires: 1 }) + Cookies.set('session_id', data[0].session_id) + commit('SET_TOKEN', data[0].角色编号) + commit('SET_NAME', data[0].姓名) + commit('SET_ID', data[0].人员编号) + commit('SET_userId', data[0].考勤编号) + resolve() + } + }).catch(error => { + reject(error) }) - } else { - return new Promise((resolve, reject) => { - login(username, userInfo.password).then(response => { - const data = response.data - if (data.length === 0 || data.result === '0') { - Message.error('账号或密码错误,请重新登录') - this.$router.push({ path: '/login' }) - } else { - setToken(data[0].角色编号) - Cookies.set('id', data[0].人员编号, { expires: 1 }) - Cookies.set('name', data[0].姓名, { expires: 1 }) - Cookies.set('userId', data[0].考勤编号, { expires: 1 }) - Cookies.set('session_id', data[0].session_id) - commit('SET_TOKEN', data[0].角色编号) - commit('SET_NAME', data[0].姓名) - commit('SET_ID', data[0].人员编号) - commit('SET_userId', data[0].考勤编号) - resolve() - } - }).catch(error => { - reject(error) - }) - }) - } + }) }, // 获取用户信息 diff --git a/src/utils/request.js b/src/utils/request.js index bfab726..d8e7f85 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -63,7 +63,7 @@ const service = axios.create({ // && config.data.name !== '菜单系统模块_通知信息_查询数据' && config.data.name !== '菜单系统模块_首页信息_查询数据1' && config.data.name !== '菜单系统模块_首页信息_查询数据2' service.interceptors.request.use(config => { - if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') { + if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据' && config.data.name !== '账号信息_修改密码_MESWORK') { const id = Cookies.get('id') if (typeof (id) === 'undefined') { store.dispatch('FedLogOut').then(() => { diff --git a/src/views/QualityAssurance/OffLinePartCount/index.vue b/src/views/QualityAssurance/OffLinePartCount/index.vue new file mode 100644 index 0000000..84cc3b9 --- /dev/null +++ b/src/views/QualityAssurance/OffLinePartCount/index.vue @@ -0,0 +1,417 @@ + + + + + diff --git a/src/views/QualityAssurance/StationBeat/index.vue b/src/views/QualityAssurance/StationBeat/index.vue new file mode 100644 index 0000000..9d4affe --- /dev/null +++ b/src/views/QualityAssurance/StationBeat/index.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/views/QualityAssurance/StationJPH/index.vue b/src/views/QualityAssurance/StationJPH/index.vue new file mode 100644 index 0000000..300180d --- /dev/null +++ b/src/views/QualityAssurance/StationJPH/index.vue @@ -0,0 +1,524 @@ + + + + + diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue index 477f8df..13dfe93 100644 --- a/src/views/layout/components/TagsView.vue +++ b/src/views/layout/components/TagsView.vue @@ -7,10 +7,10 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2bdbee4..085dcb1 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -10,9 +10,11 @@ label-position="left" label-width="0px" class="card-box login-form"> -

- -
+

+ +
{{ $t('login.systemName') }}
@@ -56,7 +58,7 @@
{{ $t('login.rememberPassword') }} - {{ $t('login.changePassword') }} +

- + @@ -319,7 +321,7 @@ export default { height: 1px; } .login-form { - height: 500px; + height: 450px; border-radius: 20px; background-color: white; position: absolute;