From caf80caeffc467a237900c464204e8f426e3e6e6 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 19 Jul 2022 09:42:37 +0800 Subject: [PATCH 1/6] bug630 --- .../newHome/components/PopularAbility.vue | 321 +++++++++--------- 1 file changed, 161 insertions(+), 160 deletions(-) diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue index ee733fcf..ebdda9b2 100644 --- a/front/src/views/newHome/components/PopularAbility.vue +++ b/front/src/views/newHome/components/PopularAbility.vue @@ -153,195 +153,196 @@ } From f1de4b860e0120be7439803dca92f7951d6f9e03 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Tue, 19 Jul 2022 09:42:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=8A=A0word-break:=20br?= =?UTF-8?q?eak-all;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AbilityRanking.vue | 2 + .../components/AtlasResources.vue | 3 + .../Algorithm/AlgorithmAdvantage.vue | 1 + .../Algorithm/AlgorithmApplicationCase.vue | 1 + .../AlgorithmApplicationScenarios.vue | 2 + .../Algorithm/AlgorithmAssociatedAbility.vue | 2 + .../Algorithm/AlgorithmChargingStandard.vue | 1 + .../Algorithm/AlgorithmTopDetails.vue | 2 + .../Algorithm/AlgorithmUsageMode.vue | 233 +++++---- .../Application/ApplicationAbilityTrial.vue | 1 + .../ApplicationAssociatedAbility.vue | 2 + .../ApplicationAssociatedComponents.vue | 1 + .../ApplicationFunctionIntorduction.vue | 410 ++++++++------- .../Application/ApplicationTopDetails.vue | 2 + .../Business/BusinessApplicationCase.vue | 1 + .../Business/BusinessApplicationScenarios.vue | 2 + .../Business/BusinessAssociatedAbility.vue | 2 + .../Business/BusinessFunctionIntorduction.vue | 2 + .../Business/BusinessTopDetails.vue | 2 + .../components/Business/BusinessUsageMode.vue | 3 + .../Developer/DeveloperApplicationCase.vue | 1 + .../DeveloperApplicationScenarios.vue | 2 + .../Developer/DeveloperAssociatedAbility.vue | 2 + .../DeveloperFunctionIntorduction.vue | 2 + ...operOwningDepartmentAndServiceProvider.vue | 2 + .../Developer/DeveloperTopDetails.vue | 2 + .../components/Developer/DeveloperTrial.vue | 1 + .../LayerServiceApplicationCase.vue | 1 + .../LayerServiceApplicationScenarios.vue | 2 + .../LayerServiceAssociatedAbility.vue | 2 + .../LayerService/LayerServiceInformation.vue | 1 + .../LayerService/LayerServiceTopDetails.vue | 2 + .../LayerService/LayerServiceUsageMode.vue | 2 + front/src/views/home/DetailsPageconetent.vue | 1 + front/src/views/home/algorithmCompare.vue | 1 + .../home/components/AbilityToRecommend.vue | 1 + front/src/views/home/components/header.vue | 2 + .../home/components/searchResultList.vue | 2 + front/src/views/home/components/tableGrid.vue | 1 + .../home/detailsPageInfrastructureTree.vue | 2 + .../views/home/detailsPageconetentTree.vue | 2 + front/src/views/home/integrationServices.vue | 495 +++++++++--------- front/src/views/home/latestAbility.vue | 1 + .../mynoticeView/components/NoticeList.vue | 1 + .../components/CapabilityConvergence.vue | 1 + .../newHome/components/LatestCapabilities.vue | 1 + .../newHome/components/PopularAbility.vue | 321 ++++++------ .../components/RecommendationAbility.vue | 2 + .../views/newHome/components/WorkDynList.vue | 1 + .../OnTheRightSideOfTheList.vue | 1 + .../components/AbilityApplication.vue | 2 + .../personalCenter/components/Comment.vue | 1 + .../personalCenter/components/Demand.vue | 1 + .../components/MyApplication.vue | 2 + .../personalCenter/components/MyApply.vue | 1 + .../personalCenter/components/MyComments.vue | 2 + .../personalCenter/components/MyPublish.vue | 1 + .../personalCenter/components/OffTheShelf.vue | 1 + .../components/OtherApplications .vue | 1 + .../components/PurchaseVehicle.vue | 1 + .../components/PutOnTheShelf .vue | 1 + 61 files changed, 837 insertions(+), 710 deletions(-) diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue index 9f7c9740..ea0efca1 100644 --- a/front/src/views/abilityStatistics/components/AbilityRanking.vue +++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue @@ -257,6 +257,7 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; margin-bottom: 20px; + word-break: break-all; } .content-fangwenliang { width: 215px; @@ -268,6 +269,7 @@ -webkit-box-orient: vertical; color: #999999; margin-bottom: 20px; + word-break: break-all; } } } diff --git a/front/src/views/abilityStatistics/components/AtlasResources.vue b/front/src/views/abilityStatistics/components/AtlasResources.vue index 29aa1ade..454685fd 100644 --- a/front/src/views/abilityStatistics/components/AtlasResources.vue +++ b/front/src/views/abilityStatistics/components/AtlasResources.vue @@ -599,6 +599,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .num { width: 100px; @@ -719,6 +720,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } } div:nth-of-type(1) { @@ -757,6 +759,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } span:hover { border: 1px solid #147ad8; diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue index 7f35d9e9..e0294a52 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue @@ -139,6 +139,7 @@ display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; + word-break: break-all; } } .item:nth-of-type(1) { diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationCase.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationCase.vue index 58754581..7270dca2 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationCase.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationCase.vue @@ -302,6 +302,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue index cac2ee22..da60117d 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue @@ -177,6 +177,7 @@ display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; + word-break: break-all; -webkit-box-orient: vertical; } .tab-top-down { @@ -269,6 +270,7 @@ overflow: hidden; -webkit-line-clamp: 6; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue index d7f93986..a5af8482 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue @@ -160,6 +160,7 @@ overflow: hidden; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .associated-ability-card-content { width: 100%; @@ -175,6 +176,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue index 0ebc73a1..b47cfb22 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue @@ -110,6 +110,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } .content-footer { position: absolute; diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue index bffc1b64..8185cf2d 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue @@ -258,6 +258,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .label-content { position: relative; @@ -291,6 +292,7 @@ display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; + word-break: break-all; } } .bottom { diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue index 21af942f..82fb965c 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue @@ -324,138 +324,141 @@ diff --git a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue index db3dcafa..0de7ad16 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue @@ -153,6 +153,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; + word-break: break-all; -webkit-box-orient: vertical; } } diff --git a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue index 2e2c8054..dae68f5f 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue @@ -175,6 +175,7 @@ display: -webkit-box; overflow: hidden; -webkit-line-clamp: 2; + word-break: break-all; -webkit-box-orient: vertical; } .associated-ability-card-content { @@ -190,6 +191,7 @@ display: -webkit-box; overflow: hidden; -webkit-line-clamp: 5; + word-break: break-all; -webkit-box-orient: vertical; } } diff --git a/front/src/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue b/front/src/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue index 5f2b7f1c..31f47e2a 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue @@ -138,6 +138,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; + word-break: break-all; -webkit-box-orient: vertical; } } diff --git a/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue b/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue index eec26ec0..5ea3c2f8 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue @@ -7,26 +7,42 @@
-
+ " + > -
+
{{ itemSonTitle.name }}
-
+
diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue index 758b3b85..3f1c9f01 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue @@ -236,6 +236,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .label-content { @@ -275,6 +276,7 @@ display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; + word-break: break-all; } } diff --git a/front/src/views/detailsAll/components/Business/BusinessApplicationCase.vue b/front/src/views/detailsAll/components/Business/BusinessApplicationCase.vue index a0017137..098d4b24 100644 --- a/front/src/views/detailsAll/components/Business/BusinessApplicationCase.vue +++ b/front/src/views/detailsAll/components/Business/BusinessApplicationCase.vue @@ -293,6 +293,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue index cac2ee22..97d3419c 100644 --- a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue @@ -178,6 +178,7 @@ overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .tab-top-down { min-width: 120px; @@ -269,6 +270,7 @@ overflow: hidden; -webkit-line-clamp: 6; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue index 0913adce..7484988e 100644 --- a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue @@ -160,6 +160,7 @@ overflow: hidden; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .associated-ability-card-content { width: 100%; @@ -175,6 +176,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue index 3ac5b4f0..508dd68b 100644 --- a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue @@ -158,6 +158,7 @@ overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .tab-top-down { min-width: 1.2rem; @@ -244,6 +245,7 @@ overflow: hidden; -webkit-line-clamp: 6; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue index 023c4f92..160a84dd 100644 --- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue +++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue @@ -243,6 +243,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .label-content { @@ -282,6 +283,7 @@ display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; + word-break: break-all; } } diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 09512ec4..c5b810ef 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -297,6 +297,7 @@ overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } } } @@ -358,6 +359,7 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; flex-direction: column; + word-break: break-all; p { // width: 1.60rem; @@ -369,6 +371,7 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; margin-right: 0.15rem; + word-break: break-all; span { cursor: pointer; diff --git a/front/src/views/detailsAll/components/Developer/DeveloperApplicationCase.vue b/front/src/views/detailsAll/components/Developer/DeveloperApplicationCase.vue index fbb2c9c0..73fe36ea 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperApplicationCase.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperApplicationCase.vue @@ -302,6 +302,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue index cac2ee22..97d3419c 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue @@ -178,6 +178,7 @@ overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .tab-top-down { min-width: 120px; @@ -269,6 +270,7 @@ overflow: hidden; -webkit-line-clamp: 6; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue index 0913adce..7484988e 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue @@ -160,6 +160,7 @@ overflow: hidden; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .associated-ability-card-content { width: 100%; @@ -175,6 +176,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue b/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue index 38b38178..ff5f8297 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue @@ -158,6 +158,7 @@ overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .tab-top-down { min-width: 1.2rem; @@ -244,6 +245,7 @@ overflow: hidden; -webkit-line-clamp: 6; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue index cd10212c..1d5f2198 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue @@ -248,6 +248,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-all; } } } @@ -272,6 +273,7 @@ -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; + word-break: break-all; } } .right { diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue index 3171b3f9..3896918d 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue @@ -245,6 +245,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 1; + word-break: break-all; -webkit-box-orient: vertical; } .label-content { @@ -278,6 +279,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; + word-break: break-all; -webkit-box-orient: vertical; } } diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue b/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue index 50ebfd2c..edf44111 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue @@ -138,6 +138,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } } .main-center { diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationCase.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationCase.vue index a0017137..098d4b24 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationCase.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationCase.vue @@ -293,6 +293,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue index cac2ee22..97d3419c 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue @@ -178,6 +178,7 @@ overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .tab-top-down { min-width: 120px; @@ -269,6 +270,7 @@ overflow: hidden; -webkit-line-clamp: 6; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue index 0913adce..7484988e 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue @@ -160,6 +160,7 @@ overflow: hidden; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .associated-ability-card-content { width: 100%; @@ -175,6 +176,7 @@ overflow: hidden; -webkit-line-clamp: 5; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue index 484b2503..31e69a21 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue @@ -252,6 +252,7 @@ overflow: hidden; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } } } diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue index b768f3c7..06ba2cf3 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue @@ -239,6 +239,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .label-content { position: relative; @@ -273,6 +274,7 @@ display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; + word-break: break-all; } } .bottom { diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index b3148f0d..79ac9571 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -362,6 +362,7 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; flex-direction: column; + word-break: break-all; p { // width: 1.60rem; @@ -372,6 +373,7 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; margin-right: 0.15rem; + word-break: break-all; span { cursor: pointer; diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index c44b5692..9ff9bb1c 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1757,5 +1757,6 @@ white-space: nowrap; text-overflow: ellipsis; -webkit-line-clamp: 1; + word-break: break-all; } diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue index d9bb13f6..bab19889 100644 --- a/front/src/views/home/algorithmCompare.vue +++ b/front/src/views/home/algorithmCompare.vue @@ -814,6 +814,7 @@ display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; + word-break: break-all; } .td-name-text { diff --git a/front/src/views/home/components/AbilityToRecommend.vue b/front/src/views/home/components/AbilityToRecommend.vue index ad050971..86a18e94 100644 --- a/front/src/views/home/components/AbilityToRecommend.vue +++ b/front/src/views/home/components/AbilityToRecommend.vue @@ -380,6 +380,7 @@ font-size: 0.14rem; color: #666666; line-height: 0.2rem; + word-break: break-all; } } .chakangengduo { diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 2747ebff..35354823 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -405,6 +405,7 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; overflow: hidden; + word-break: break-all; } .out { cursor: pointer; @@ -487,6 +488,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; + word-break: break-all; -webkit-box-orient: vertical; } button { diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 526a8768..96ded629 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -968,6 +968,7 @@ text-overflow: ellipsis; /*超出显示为省略号*/ -webkit-box-orient: vertical; + word-break: break-all; } } .btn { @@ -1103,5 +1104,6 @@ text-overflow: ellipsis; /*超出显示为省略号*/ -webkit-box-orient: vertical; + word-break: break-all; } diff --git a/front/src/views/home/components/tableGrid.vue b/front/src/views/home/components/tableGrid.vue index c384b72f..3b770830 100644 --- a/front/src/views/home/components/tableGrid.vue +++ b/front/src/views/home/components/tableGrid.vue @@ -114,6 +114,7 @@ -webkit-box-orient: vertical; -webkit-line-clamp: 3; overflow: hidden; + word-break: break-all; } button { margin: 0px; diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue index 8fd0def1..9fb6aaca 100644 --- a/front/src/views/home/detailsPageInfrastructureTree.vue +++ b/front/src/views/home/detailsPageInfrastructureTree.vue @@ -450,6 +450,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } } .up:hover { @@ -496,6 +497,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } } .child:hover { diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue index 08e8c04d..91228e04 100644 --- a/front/src/views/home/detailsPageconetentTree.vue +++ b/front/src/views/home/detailsPageconetentTree.vue @@ -449,6 +449,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } } .up:hover { @@ -495,6 +496,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } } .child:hover { diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index 14b1cf29..d2f0443b 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -1,263 +1,279 @@ diff --git a/front/src/views/home/latestAbility.vue b/front/src/views/home/latestAbility.vue index c12c3b9c..f31415d9 100644 --- a/front/src/views/home/latestAbility.vue +++ b/front/src/views/home/latestAbility.vue @@ -185,6 +185,7 @@ -webkit-box-orient: vertical; -webkit-line-clamp: 3; overflow: hidden; + word-break: break-all; } button { margin: 0rem; diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue index 949ffd95..e6029fb4 100644 --- a/front/src/views/mynoticeView/components/NoticeList.vue +++ b/front/src/views/mynoticeView/components/NoticeList.vue @@ -423,6 +423,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .left:hover { color: #0058e1; diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue index 9e520325..f0bfeb1b 100644 --- a/front/src/views/newHome/components/CapabilityConvergence.vue +++ b/front/src/views/newHome/components/CapabilityConvergence.vue @@ -328,6 +328,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .name:hover { color: #0058e1; diff --git a/front/src/views/newHome/components/LatestCapabilities.vue b/front/src/views/newHome/components/LatestCapabilities.vue index dd54b720..59ab9956 100644 --- a/front/src/views/newHome/components/LatestCapabilities.vue +++ b/front/src/views/newHome/components/LatestCapabilities.vue @@ -169,6 +169,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .text { width: 100%; diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue index ee733fcf..aba6ac2e 100644 --- a/front/src/views/newHome/components/PopularAbility.vue +++ b/front/src/views/newHome/components/PopularAbility.vue @@ -153,195 +153,196 @@ } diff --git a/front/src/views/newHome/components/RecommendationAbility.vue b/front/src/views/newHome/components/RecommendationAbility.vue index 33f9693f..4b772bb5 100644 --- a/front/src/views/newHome/components/RecommendationAbility.vue +++ b/front/src/views/newHome/components/RecommendationAbility.vue @@ -179,6 +179,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .content-top-pingfen { background: unset; @@ -203,6 +204,7 @@ -webkit-box-orient: vertical; margin-bottom: 0.12rem; cursor: pointer; + word-break: break-all; } .num { font-size: 0.14rem; diff --git a/front/src/views/newHome/components/WorkDynList.vue b/front/src/views/newHome/components/WorkDynList.vue index 8b402866..61d432ed 100644 --- a/front/src/views/newHome/components/WorkDynList.vue +++ b/front/src/views/newHome/components/WorkDynList.vue @@ -167,6 +167,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .pulish-time { position: absolute; diff --git a/front/src/views/personalCenter/OnTheRightSideOfTheList.vue b/front/src/views/personalCenter/OnTheRightSideOfTheList.vue index db829f9b..370572f7 100644 --- a/front/src/views/personalCenter/OnTheRightSideOfTheList.vue +++ b/front/src/views/personalCenter/OnTheRightSideOfTheList.vue @@ -176,6 +176,7 @@ -webkit-line-clamp: 3; -webkit-box-orient: vertical; color: #999999; + word-break: break-all; } } .content-body-bottom { diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index 9b1da485..4ba11b26 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -300,6 +300,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; .type { background: #0087ff; color: #fff; @@ -321,6 +322,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .result:hover { color: #0058e1; diff --git a/front/src/views/personalCenter/components/Comment.vue b/front/src/views/personalCenter/components/Comment.vue index b37806f3..3048a6f3 100644 --- a/front/src/views/personalCenter/components/Comment.vue +++ b/front/src/views/personalCenter/components/Comment.vue @@ -192,6 +192,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .result:hover { color: #0058e1; diff --git a/front/src/views/personalCenter/components/Demand.vue b/front/src/views/personalCenter/components/Demand.vue index c81f92ef..76ffa6a3 100644 --- a/front/src/views/personalCenter/components/Demand.vue +++ b/front/src/views/personalCenter/components/Demand.vue @@ -201,6 +201,7 @@ display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; + word-break: break-all; } .result:hover { color: #0058e1; diff --git a/front/src/views/personalCenter/components/MyApplication.vue b/front/src/views/personalCenter/components/MyApplication.vue index 6c2bc7c1..baf33171 100644 --- a/front/src/views/personalCenter/components/MyApplication.vue +++ b/front/src/views/personalCenter/components/MyApplication.vue @@ -222,6 +222,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .content-body-content { margin-top: 10px; @@ -238,6 +239,7 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; color: #999999; + word-break: break-all; } } .content-body-bottom { diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 02be1c6f..376c200f 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -863,6 +863,7 @@ -webkit-box-orient: vertical; max-width: 8.1rem; line-height: 24px; + word-break: break-all; } } .content-body-bottom { diff --git a/front/src/views/personalCenter/components/MyComments.vue b/front/src/views/personalCenter/components/MyComments.vue index a1007e0c..e8316b15 100644 --- a/front/src/views/personalCenter/components/MyComments.vue +++ b/front/src/views/personalCenter/components/MyComments.vue @@ -195,6 +195,7 @@ display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; + word-break: break-all; } .content-body-content { margin-top: 10px; @@ -212,6 +213,7 @@ -webkit-line-clamp: 2; -webkit-box-orient: vertical; color: #999999; + word-break: break-all; } } .content-body-bottom { diff --git a/front/src/views/personalCenter/components/MyPublish.vue b/front/src/views/personalCenter/components/MyPublish.vue index e9c4b535..c17c215c 100644 --- a/front/src/views/personalCenter/components/MyPublish.vue +++ b/front/src/views/personalCenter/components/MyPublish.vue @@ -573,6 +573,7 @@ display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; + word-break: break-all; color: #999999; } } diff --git a/front/src/views/personalCenter/components/OffTheShelf.vue b/front/src/views/personalCenter/components/OffTheShelf.vue index b7bf4d45..394455d2 100644 --- a/front/src/views/personalCenter/components/OffTheShelf.vue +++ b/front/src/views/personalCenter/components/OffTheShelf.vue @@ -194,6 +194,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; + word-break: break-all; -webkit-box-orient: vertical; } .result:hover { diff --git a/front/src/views/personalCenter/components/OtherApplications .vue b/front/src/views/personalCenter/components/OtherApplications .vue index 695a741b..f0ff89e1 100644 --- a/front/src/views/personalCenter/components/OtherApplications .vue +++ b/front/src/views/personalCenter/components/OtherApplications .vue @@ -213,6 +213,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; + word-break: break-all; -webkit-box-orient: vertical; } .result:hover { diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue index 819c1a7b..52f51791 100644 --- a/front/src/views/personalCenter/components/PurchaseVehicle.vue +++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue @@ -862,6 +862,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; + word-break: break-all; -webkit-box-orient: vertical; } } diff --git a/front/src/views/personalCenter/components/PutOnTheShelf .vue b/front/src/views/personalCenter/components/PutOnTheShelf .vue index 74365751..8007ff9f 100644 --- a/front/src/views/personalCenter/components/PutOnTheShelf .vue +++ b/front/src/views/personalCenter/components/PutOnTheShelf .vue @@ -198,6 +198,7 @@ text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; + word-break: break-all; -webkit-box-orient: vertical; } .result:hover { From 52ece255f3fac5126d9e195520e63c4b06e50c9a Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Tue, 19 Jul 2022 09:45:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newHome/components/PopularAbility.vue | 329 +++++++++--------- 1 file changed, 163 insertions(+), 166 deletions(-) diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue index 72f7144f..0ec931e8 100644 --- a/front/src/views/newHome/components/PopularAbility.vue +++ b/front/src/views/newHome/components/PopularAbility.vue @@ -153,200 +153,197 @@ } From cc633449edd833d30bf38933118a27ccb64ca36b Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Tue, 19 Jul 2022 09:55:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8A=A0overflow:=20hidd?= =?UTF-8?q?en;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abilityStatistics/componentUsed.vue | 968 +++++++++--------- .../views/modules/abilityStatistics/index.vue | 677 ++++++------ .../modules/activiti/my-work-dynamics.vue | 2 + .../views/modules/bscatalogue/bscatalogue.vue | 38 +- .../components/AbnormalSituation.vue | 56 +- .../components/AnalysisOfTheRequest.vue | 1 + .../workBench/components/bottom-view.vue | 15 +- .../workBench/components/dept-todo-view.vue | 159 +-- .../components/frequency-top5-view.vue | 1 + 9 files changed, 961 insertions(+), 956 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/componentUsed.vue b/back/src/views/modules/abilityStatistics/componentUsed.vue index de68a125..7c86ca97 100644 --- a/back/src/views/modules/abilityStatistics/componentUsed.vue +++ b/back/src/views/modules/abilityStatistics/componentUsed.vue @@ -5,7 +5,7 @@ 使用情况统计
- +
- +
能力统计 @@ -38,7 +38,7 @@ 部门使用情况 - +
@@ -118,215 +118,208 @@ >
-
+ - + diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue index db462c81..83c0809c 100644 --- a/back/src/views/modules/activiti/my-work-dynamics.vue +++ b/back/src/views/modules/activiti/my-work-dynamics.vue @@ -698,6 +698,7 @@ export default { text-overflow: ellipsis; display: -webkit-box; -webkit-box-orient: vertical; + word-break: break-all; } .boxcontent { width: 100%; @@ -707,6 +708,7 @@ export default { text-overflow: ellipsis; display: -webkit-box; -webkit-box-orient: vertical; + word-break: break-all; } .preview-dialog { width: 100%; diff --git a/back/src/views/modules/bscatalogue/bscatalogue.vue b/back/src/views/modules/bscatalogue/bscatalogue.vue index a3d8593d..a26999b1 100644 --- a/back/src/views/modules/bscatalogue/bscatalogue.vue +++ b/back/src/views/modules/bscatalogue/bscatalogue.vue @@ -570,7 +570,7 @@ export default { height: 28px; margin-left: 14px; margin-top: 9px; - background-image: url('~@/assets/img/capabilityCatalogingManagement/edit-card.png'); + background-image: url("~@/assets/img/capabilityCatalogingManagement/edit-card.png"); } } div:nth-child(2) { @@ -609,7 +609,7 @@ export default { left: 50%; margin-left: -45.5px; margin-top: -45.5px; - background-image: url('~@/assets/img/capabilityCatalogingManagement/add.png'); + background-image: url("~@/assets/img/capabilityCatalogingManagement/add.png"); cursor: pointer; } > span { @@ -618,7 +618,7 @@ export default { padding-top: 5px; padding-left: 20px; font-size: 26px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; } .add-enterprise-input-wrap { // height: 50px; @@ -656,7 +656,7 @@ export default { background: #0fa7f6; span { color: #ffffff; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; font-size: 16px; } } @@ -704,7 +704,7 @@ export default { text-align: center; color: #ffffff; font-size: 14px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; } span:nth-child(2) { display: inline-block; @@ -713,7 +713,7 @@ export default { text-align: center; color: #ffffff; font-size: 14px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; border: 1px solid rgba(255, 255, 255, 0.5); padding-top: 4px; margin-top: 15px; @@ -724,7 +724,7 @@ export default { .enterprise-card-tip-first:before, .enterprise-card-tip-first:after { position: absolute; - content: ' '; + content: " "; top: 32px; left: -16px; display: block; @@ -752,7 +752,7 @@ export default { text-align: center; color: #ffffff; font-size: 14px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; } span:nth-child(2) { display: inline-block; @@ -761,7 +761,7 @@ export default { text-align: center; color: #ffffff; font-size: 14px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; border: 1px solid rgba(255, 255, 255, 0.5); padding-top: 4px; margin-top: 15px; @@ -772,7 +772,7 @@ export default { .enterprise-card-tip-third:before, .enterprise-card-tip-third:after { position: absolute; - content: ' '; + content: " "; top: 32px; left: 180px; display: block; @@ -801,7 +801,7 @@ export default { text-align: center; color: #ffffff; font-size: 14px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; } span:nth-child(2) { display: inline-block; @@ -810,7 +810,7 @@ export default { text-align: center; color: #ffffff; font-size: 14px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; border: 1px solid rgba(255, 255, 255, 0.5); padding-top: 4px; margin-top: 15px; @@ -821,7 +821,7 @@ export default { .enterprise-card-tip-second:before, .enterprise-card-tip-second:after { position: absolute; - content: ' '; + content: " "; top: -15px; left: 78px; display: block; @@ -836,7 +836,7 @@ export default { width: 100%; // height: 373px; height: 176px; - background-image: url('~@/assets/img/capabilityCatalogingManagement/small-card-orange.png'); + background-image: url("~@/assets/img/capabilityCatalogingManagement/small-card-orange.png"); .resource-detail-title { width: 100%; height: 40px; @@ -845,15 +845,17 @@ export default { padding-top: 10px; text-align: center; text-overflow: ellipsis; + word-break: break-all; span { width: 100%; height: 100%; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; font-size: 20px; display: inline-block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + word-break: break-all; color: #ffffff; } } @@ -867,7 +869,7 @@ export default { width: 100%; height: 30px; padding-left: 19px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; font-size: 20px; color: white; vertical-align: middle; @@ -899,7 +901,7 @@ export default { position: absolute; width: 28px; height: 28px; - background-image: url('~@/assets/img/capabilityCatalogingManagement/remove.png'); + background-image: url("~@/assets/img/capabilityCatalogingManagement/remove.png"); top: 0; right: 0; cursor: pointer; @@ -908,7 +910,7 @@ export default { } input::-webkit-input-placeholder { font-size: 14px; - font-family: 'Microsoft YaHei'; + font-family: "Microsoft YaHei"; color: #999999; } diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue index d0406ad0..3094693b 100644 --- a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue +++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AbnormalSituation.vue @@ -76,7 +76,7 @@ import * as echarts from 'echarts' export default { // components: {}, // props: {}, - data() { + data () { return { // 排行榜 RankingData: [ @@ -169,20 +169,20 @@ export default { total: 0 } }, - mounted() { + mounted () { this.myEchars() // 分页 this.total = this.AnomalyStatisticsTable.length }, methods: { // 分页 - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`) }, - handleCurrentChange(val) { + handleCurrentChange (val) { console.log(`当前页: ${val}`) }, - myEchars() { + myEchars () { var chartDom = document.getElementById('main') var myChart = echarts.init(chartDom) var option @@ -276,7 +276,8 @@ export default { } .ApiBox { - background: url('~@/assets/img/CapabilityOperationMonitoring/bg-blue.png') no-repeat; + background: url("~@/assets/img/CapabilityOperationMonitoring/bg-blue.png") + no-repeat; background-size: 100%; width: 22.5rem; height: 6.875rem; @@ -313,7 +314,8 @@ export default { } .ApiBox:last-of-type { - background: url('~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png') no-repeat; + background: url("~@/assets/img/CapabilityOperationMonitoring/bg-yellow.png") + no-repeat; background-size: 100%; div { @@ -383,9 +385,11 @@ export default { display: block; height: 1.25rem; width: 2.25rem; - background: linear-gradient(to right, - rgba(204, 204, 204, 0.6), - rgba(0, 0, 0, 0)); + background: linear-gradient( + to right, + rgba(204, 204, 204, 0.6), + rgba(0, 0, 0, 0) + ); } } @@ -401,6 +405,7 @@ export default { white-space: nowrap; cursor: pointer; font-weight: bold; + word-break: break-all; } span { @@ -412,9 +417,11 @@ export default { .RankingListData:nth-of-type(1) i b { width: 3.75rem; - background: linear-gradient(to right, - rgba(251, 59, 5, 0.6), - rgba(0, 0, 0, 0)); + background: linear-gradient( + to right, + rgba(251, 59, 5, 0.6), + rgba(0, 0, 0, 0) + ); } .RankingListData:nth-of-type(1) span { @@ -423,9 +430,11 @@ export default { .RankingListData:nth-of-type(2) i b { width: 3.125rem; - background: linear-gradient(to right, - rgba(251, 123, 5, 0.6), - rgba(0, 0, 0, 0)); + background: linear-gradient( + to right, + rgba(251, 123, 5, 0.6), + rgba(0, 0, 0, 0) + ); } .RankingListData:nth-of-type(2) span { @@ -434,9 +443,11 @@ export default { .RankingListData:nth-of-type(3) i b { width: 2.75rem; - background: linear-gradient(to right, - rgba(250, 179, 2, 0.6), - rgba(0, 0, 0, 0)); + background: linear-gradient( + to right, + rgba(250, 179, 2, 0.6), + rgba(0, 0, 0, 0) + ); } .RankingListData:nth-of-type(3) span { @@ -447,7 +458,8 @@ export default { .AbnormalDistribution { margin-right: 3.75rem; - .container-body1 {} + .container-body1 { + } } .AnomalyStatistics { @@ -472,12 +484,12 @@ export default { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-all; } - ::v-deep .el-table tbody tr:hover>td { + ::v-deep .el-table tbody tr:hover > td { background-color: transparent; } - } .tablePagination { diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue index 3aed371e..2148c9a4 100644 --- a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue +++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue @@ -1298,6 +1298,7 @@ export default { text-overflow: ellipsis; white-space: nowrap; cursor: pointer; + word-break: break-all; } div:last-child { height: 30px; diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index 359c7e9d..4dae6e13 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -35,7 +35,7 @@ export default { components: { contentTitle }, - data() { + data () { return { title: { dynamic: '部门发布动态', recommend: '部门推荐能力' }, list: [], @@ -77,13 +77,13 @@ export default { loadingTable: false } }, - mounted() { + mounted () { this.getResourceByDept() this.getApplyByDept() }, methods: { // 发布动态 - getResourceByDept() { + getResourceByDept () { const data = { limit: 5, page: 1 @@ -109,7 +109,7 @@ export default { ) }, // 部门推荐能力 - getApplyByDept() { + getApplyByDept () { const data = { limit: 5, page: 1 @@ -132,11 +132,11 @@ export default { } ) }, - jumpTo() { + jumpTo () { this.$router.push({ path: 'activiti-my-work-dynamics' - }); - }, + }) + } } } @@ -146,6 +146,7 @@ export default { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + word-break: break-all; } .bottom-view { diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index c7d872e0..da27db7e 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -43,131 +43,132 @@ \ No newline at end of file + diff --git a/back/src/views/modules/workBench/components/frequency-top5-view.vue b/back/src/views/modules/workBench/components/frequency-top5-view.vue index 61f3133c..199bcbb8 100644 --- a/back/src/views/modules/workBench/components/frequency-top5-view.vue +++ b/back/src/views/modules/workBench/components/frequency-top5-view.vue @@ -113,6 +113,7 @@ export default { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + word-break: break-all; } .flex-row-between { From b407c3e6101b35ef8ff522fb548ef8475d426b5b Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Tue, 19 Jul 2022 09:57:38 +0800 Subject: [PATCH 5/6] bug626 --- .../Algorithm/AlgorithmTopDetails.vue | 2 - .../Application/ApplicationTopDetails.vue | 2 - .../Business/BusinessTopDetails.vue | 2 - .../Developer/DeveloperTopDetails.vue | 2 - .../LayerService/LayerServiceTopDetails.vue | 2 - .../newHome/components/PopularAbility.vue | 329 +++++++++--------- 6 files changed, 163 insertions(+), 176 deletions(-) diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue index 8185cf2d..64311f72 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue @@ -316,8 +316,6 @@ } .ant-btn:nth-of-type(3) { width: 145px; - background: #fff; - color: #526aff; } } } diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue index 3f1c9f01..3f8bc1e0 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue @@ -305,8 +305,6 @@ .ant-btn:nth-of-type(3) { width: 1.45rem; - background: #fff; - color: #526aff; } } } diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue index 160a84dd..688297ce 100644 --- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue +++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue @@ -308,8 +308,6 @@ } .ant-btn:nth-of-type(3) { width: 145px; - background: #fff; - color: #526aff; } } } diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue index 3896918d..a6969519 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue @@ -304,8 +304,6 @@ } .ant-btn:nth-of-type(3) { width: 1.45rem; - background: #fff; - color: #526aff; } } } diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue index 06ba2cf3..10d88d02 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue @@ -298,8 +298,6 @@ } .ant-btn:nth-of-type(3) { width: 1.45rem; - background: #fff; - color: #526aff; } } } diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue index 72f7144f..0ec931e8 100644 --- a/front/src/views/newHome/components/PopularAbility.vue +++ b/front/src/views/newHome/components/PopularAbility.vue @@ -153,200 +153,197 @@ } From ed5ed8c8282bccaaafb1f431fbe49e631fa8d5aa Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 19 Jul 2022 10:22:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=20=20?= =?UTF-8?q?=20=20=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/apply.vue | 53 +++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index e4ff9bc0..849231e5 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -454,11 +454,11 @@ if (res.data.msg === 'success') { mybus.emit('getSgcNum') router.push({ - path: '/DetailsPageconetent', - query: { - select: '组件服务', - }, - }) + path: '/DetailsPageconetent', + query: { + select: '组件服务', + }, + }) } }) } @@ -468,29 +468,36 @@ }) console.log('提交数据==========================>', formName, ids) if (formName.system.length !== 0) { + if (formName.applicationSystem.length == 0) { + formName.applicationSystem = '' + } submitApply(formName).then((res) => { // applySuccess.value = false message.success('申请提交成功，请到消息中心查看！') console.log('能力申请================>', res) - if (ids && ids.length > 0) { - sgcDel({ ids: ids }).then((res) => { - if (res.data.msg === 'success') { - mybus.emit('getSgcNum') - router.push({ - path: '/DetailsPageconetent', - query: { - select: '组件服务', - }, - }) - } - }) + if (res.data.code == 0) { + if (ids && ids.length > 0) { + sgcDel({ ids: ids }).then((res) => { + if (res.data.msg === 'success') { + mybus.emit('getSgcNum') + router.push({ + path: '/DetailsPageconetent', + query: { + select: '组件服务', + }, + }) + } + }) + } else { + router.push({ + path: '/DetailsPageconetent', + query: { + select: '组件服务', + }, + }) + } } else { - router.push({ - path: '/DetailsPageconetent', - query: { - select: '组件服务', - }, - }) + message.error('申请失败！') } }) }