Skip to content

Commit 66b6d82

Browse files
mingfengwangmingfengwang
committed
sprint2 运维中心样式走查修复
1 parent 1502df8 commit 66b6d82

File tree

8 files changed

+79
-21
lines changed

8 files changed

+79
-21
lines changed

‎web/src/apps/workflows/i18n/common/en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
"processStatusStatistics": "Process Status Statistics",
542542
"processDefinitionStatistics": "Process Definition Statistics",
543543
"projectHome": "Project Home",
544-
"home": "Home",
544+
"home": "Dashboard",
545545
"dashboard": "Operation Dashboard",
546546
"processDefinition": "Process Definition",
547547
"processInstance": "Process Instance",

‎web/src/apps/workflows/i18n/common/zh.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@
538538
"taskStatusStatistics": "任务状态统计",
539539
"processStatusStatistics": "流程状态统计",
540540
"processDefinitionStatistics": "流程定义统计",
541-
"projectHome": "项目首页",
542-
"home": "首页",
541+
"projectHome": "运维大屏",
542+
"home": "运维大屏",
543543
"dashboard": "运维大屏",
544544
"processDefinition": "工作流定义",
545545
"processInstance": "工作流实例",

‎web/src/apps/workflows/module/dispatch/components/noData/images/void_page.png‎

9.81 KB
Loading

‎web/src/apps/workflows/module/dispatch/components/noData/noData.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<div class="no-data-model" :style="{height:height + 'px'}">
33
<div class="no-data-box">
44
<div class="img">
5-
<img src="./images/errorTip.png" alt="">
5+
<!--<img src="./images/errorTip.png" alt="">-->
6+
<img src="./images/void_page.png" alt="">
67
</div>
78
<div class="text">{{msg || $t('message.scheduler.noData')}}</div>
89
</div>

‎web/src/apps/workflows/module/dispatch/dashboard/index.vue‎

Lines changed: 62 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="time-model">
1818
<template>
1919
<Date-picker
20-
style="width: 430px"
20+
style="width: 250px"
2121
v-model="dataTime"
2222
type="datetimerange"
2323
@on-change="_datepicker"
@@ -45,7 +45,7 @@
4545
</div>
4646
</div>
4747
<div class="row dashboard-module-content">
48-
<div id="areaChart" style="height: 430px"></div>
48+
<div id="areaChart" style="height: 330px"></div>
4949
<Spin size="large" fix v-if="loading"></Spin>
5050
</div>
5151
</div>
@@ -68,7 +68,7 @@
6868
<div class="time-model">
6969
<template>
7070
<Date-picker
71-
style="width: 520px"
71+
style="width: 250px"
7272
v-model="consumptionTime"
7373
type="datetimerange"
7474
@on-change="changeTime"
@@ -380,12 +380,34 @@ export default {
380380
xAxis: {
381381
type: 'category',
382382
boundaryGap: false,
383-
data: ['2时','4时', '6时', '8时', '10时','12时','14时','16时','18时','20时','22时','24时']
383+
data: ['2时','4时', '6时', '8时', '10时','12时','14时','16时','18时','20时','22时','24时'],
384+
nameTextStyle: {
385+
color: 'rgb(150, 150, 150)'
386+
},
387+
axisLine: {
388+
lineStyle: {
389+
color: 'rgb(237, 237, 237)'
390+
}
391+
},
392+
axisLabel: {
393+
color: 'rgb(150, 150, 150)'
394+
}
384395
},
385396
yAxis: {
386397
type: 'value',
387398
minInterval: 1,
388-
name: '实例数(个)'
399+
name: '实例数(个)',
400+
nameTextStyle: {
401+
color: 'rgb(150, 150, 150)'
402+
},
403+
axisLine: {
404+
lineStyle: {
405+
color: 'rgb(237, 237, 237)'
406+
}
407+
},
408+
axisLabel: {
409+
color: 'rgb(150, 150, 150)'
410+
}
389411
},
390412
series: [
391413
{
@@ -437,6 +459,17 @@ export default {
437459
'13时', '14时', '15时', '16时', '17时', '18时', '19时', '20时', '21时', '22时', '23时', '24时'],
438460
axisPointer: {
439461
type: 'shadow'
462+
},
463+
nameTextStyle: {
464+
color: 'rgb(150, 150, 150)'
465+
},
466+
axisLine: {
467+
lineStyle: {
468+
color: 'rgb(237, 237, 237)'
469+
}
470+
},
471+
axisLabel: {
472+
color: 'rgb(150, 150, 150)'
440473
}
441474
}
442475
],
@@ -449,7 +482,16 @@ export default {
449482
max: 250,
450483
interval: 50,*/
451484
axisLabel: {
452-
formatter: '{value} 个'
485+
formatter: '{value} 个',
486+
color: 'rgb(150, 150, 150)'
487+
},
488+
nameTextStyle: {
489+
color: 'rgb(150, 150, 150)'
490+
},
491+
axisLine: {
492+
lineStyle: {
493+
color: 'rgb(237, 237, 237)'
494+
}
453495
}
454496
},
455497
{
@@ -459,7 +501,16 @@ export default {
459501
max: 100,
460502
interval: 20,
461503
axisLabel: {
462-
formatter: '{value} %'
504+
formatter: '{value} %',
505+
color: 'rgb(150, 150, 150)'
506+
},
507+
nameTextStyle: {
508+
color: 'rgb(150, 150, 150)'
509+
},
510+
axisLine: {
511+
lineStyle: {
512+
color: 'rgb(237, 237, 237)'
513+
}
463514
}
464515
}
465516
],
@@ -588,9 +639,9 @@ export default {
588639
top: -40px;
589640
}
590641
.time-model {
591-
position: absolute;
592-
right: 8px;
593-
top: 0;
642+
position: relative;
643+
top: -60px;
644+
left: calc(100% - 230px);
594645
}
595646
.chart-title {
596647
padding: 0 30px;
@@ -660,7 +711,7 @@ export default {
660711
display: inline-block;
661712
cursor: pointer;
662713
&.selected {
663-
border-bottom: 2px solid #2A6F97;
714+
border-bottom: 2px solid #2E92F7;
664715
}
665716
}
666717
}

‎web/src/apps/workflows/module/dispatch/dashboard/source/processStateCount.vue‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<div class="process-state-count-model">
33
<div v-show="!msg">
4-
<div class="data-area" style="height: 430px;">
4+
<div class="data-area" style="height: 330px;">
55
<div class="col-md-7">
6-
<div id="process-state-pie" style="width:100%;height:260px;margin-top: 100px;"></div>
6+
<div id="process-state-pie" style="width:100%;height:260px;"></div>
77
</div>
88
<div class="col-md-5">
99
<div class="table-small-model">
@@ -27,7 +27,7 @@
2727
</div>
2828
</div>
2929
<div v-show="msg">
30-
<m-no-data :msg="msg" v-if="msg" :height="430"></m-no-data>
30+
<m-no-data :msg="msg" v-if="msg" :height="330"></m-no-data>
3131
</div>
3232
</div>
3333
</template>
@@ -137,4 +137,7 @@ export default {
137137
td {
138138
border-bottom: none !important;
139139
}
140+
.table-small-model {
141+
margin-top: 50px;
142+
}
140143
</style>

‎web/src/apps/workflows/module/dispatch/index.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1585,6 +1585,9 @@ export default {
15851585
.scheduler-center{
15861586
position: relative;
15871587
overflow: hidden;
1588+
margin: 20px 30px 0;
1589+
border: 1px solid rgb(237,237,237);
1590+
border-left: none;
15881591
.scheduler-wrapper{
15891592
padding-top: 0;
15901593
.scheduler-menu{
@@ -1604,7 +1607,7 @@ export default {
16041607
16051608
.scheduler-menu{
16061609
float: left;
1607-
width: 250px;
1610+
width: 200px;
16081611
padding-top: 16px;
16091612
font-size: 14px;
16101613
min-height: calc(80vh - 16px);

‎web/vue.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,10 @@ module.exports = {
240240
devServer: {
241241
proxy: {
242242
"/api": {
243-
target: "http://***REMOVED***:8088",
243+
//target: "http://***REMOVED***:8088",
244244
//target: 'http://***REMOVED***:9202', //yichao
245245
// target: "http://***REMOVED***:9202", //jiawei
246-
//target: "http://luban.ctyun.cn:8088",
246+
target: "http://luban.ctyun.cn:8088",
247247
//target: "http://devluban.ctyun.cn:8088",
248248
changeOrigin: true,
249249
pathRewrite: {

0 commit comments

Comments
 (0)