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 1/2] =?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 2/2] =?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 {