From b8fa7dac9d2ff3a4885fa9937f3f676546056a9a Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 7 Jan 2020 10:36:43 +0800
Subject: [PATCH] Fix front-end code specifications (#1726)
* Fix api url
* Fixed DAG zoom in and zoom out nodes separated from arrows
* Fix front-end code specifications
* Fix front-end code specifications
* Fix front-end code specifications
---
.../src/js/conf/home/pages/dag/_source/dag.js | 7 +---
.../js/conf/home/pages/dag/_source/dag.scss | 19 ++++------
.../js/conf/home/pages/dag/_source/dag.vue | 8 ++--
.../_source/formModel/_source/selectInput.vue | 4 +-
.../dag/_source/formModel/formModel.scss | 2 -
.../pages/dag/_source/formModel/formModel.vue | 6 +--
.../home/pages/dag/_source/formModel/log.vue | 8 ++--
.../tasks/_source/dependItemList.vue | 10 ++---
.../formModel/tasks/_source/httpParams.vue | 6 +--
.../formModel/tasks/_source/localParams.vue | 6 +--
.../formModel/tasks/_source/scriptBox.vue | 2 +-
.../formModel/tasks/_source/statementList.vue | 6 +--
.../dag/_source/formModel/tasks/dependent.vue | 8 ++--
.../dag/_source/formModel/tasks/shell.vue | 2 +-
.../pages/dag/_source/formModel/tasks/sql.vue | 4 +-
.../pages/dag/_source/jumpAffirm/index.js | 1 -
.../pages/dag/_source/plugIn/downChart.js | 6 +--
.../pages/dag/_source/plugIn/jsPlumbHandle.js | 8 ++--
.../home/pages/dag/_source/plugIn/util.js | 2 +-
.../pages/dag/_source/startingParam/index.vue | 2 +-
.../dag/_source/variable/variablesView.vue | 10 ++---
.../pages/list/_source/createDataSource.vue | 14 +++----
.../datasource/pages/list/_source/list.vue | 16 ++++----
.../pages/servers/_source/zookeeperList.vue | 4 +-
.../home/pages/monitor/pages/servers/db.vue | 12 +++---
.../pages/monitor/pages/servers/master.vue | 2 +-
.../monitor/pages/servers/statistics.vue | 8 ++--
.../pages/monitor/pages/servers/worker.vue | 2 +-
.../_source/instanceConditions/index.vue | 4 +-
.../taskRecordList/_source/conditions.vue | 4 +-
.../definition/pages/list/_source/email.vue | 2 +-
.../definition/pages/list/_source/list.vue | 18 ++++-----
.../definition/pages/list/_source/start.vue | 4 +-
.../definition/pages/list/_source/timing.vue | 4 +-
.../pages/definition/pages/tree/index.vue | 4 +-
.../pages/instance/pages/gantt/index.vue | 2 +-
.../instance/pages/list/_source/list.vue | 26 ++++++-------
.../pages/list/_source/createProject.vue | 2 +-
.../projects/pages/list/_source/list.vue | 18 ++++-----
.../pages/taskInstance/_source/list.vue | 24 ++++++------
.../pages/file/pages/create/index.vue | 6 +--
.../pages/file/pages/details/index.vue | 2 +-
.../pages/file/pages/list/_source/list.vue | 14 +++----
.../pages/file/pages/list/_source/rename.vue | 2 +-
.../udf/pages/function/_source/createUdf.vue | 8 ++--
.../pages/udf/pages/function/_source/list.vue | 20 +++++-----
.../pages/udf/pages/resource/_source/list.vue | 16 ++++----
.../udf/pages/resource/_source/rename.vue | 2 +-
.../pages/queue/_source/createQueue.vue | 4 +-
.../pages/tenement/_source/createTenement.vue | 6 +--
.../pages/users/_source/createUser.vue | 12 +++---
.../warningGroups/_source/createWarning.vue | 4 +-
.../workerGroups/_source/createWorker.vue | 4 +-
.../user/pages/token/_source/createToken.vue | 4 +-
.../module/components/crontab/source/app.vue | 12 +++---
.../fileUpdate/definitionUpdate.vue | 8 ++--
.../components/fileUpdate/fileUpdate.vue | 10 ++---
.../src/js/module/components/nav/nav.vue | 38 +++++++++----------
.../module/components/priority/priority.vue | 6 +--
.../secondaryMenu/secondaryMenu.vue | 8 ++--
.../components/tooltipsJSON/tooltipsJSON.vue | 4 +-
.../module/components/transfer/resource.vue | 4 +-
.../module/components/transfer/transfer.vue | 4 +-
.../src/sass/common/index.scss | 24 ++++--------
64 files changed, 250 insertions(+), 269 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
index 11f22132c7..8225673ecd 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
@@ -177,8 +177,6 @@ Dag.prototype.backfill = function (arg) {
// Number of tree node levels
let countTree = getLeafCountTree(datas[0])
function getMaxFloor(treeData) {
- let floor = 0
- let v = this
let max = 0
function each (data, floor) {
data.forEach(e => {
@@ -224,9 +222,8 @@ Dag.prototype.backfill = function (arg) {
return []
}
function toLine(data){
- return data.reduce((arr, {id, name, targetarr, x, y, children = []}) =>
- arr.concat([{id, name, targetarr, x, y}], toLine(children)), [])
- return result;
+ return data.reduce((arrData, {id, name, targetarr, x, y, children = []}) =>
+ arrData.concat([{id, name, targetarr, x, y}], toLine(children)), [])
}
let listarr = toLine(datas);
let listarrs = toLine(datas)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
index 88a8bdad39..237e6f5cd9 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@@ -317,6 +317,7 @@ svg path:hover {
.jtk-demo-canvas {
position: relative;
height: 100%;
+ display: flex;
}
.jtk-bootstrap {
@@ -359,10 +360,6 @@ svg path:hover {
list-style-type: disc !important;
}
-.jtk-demo-canvas {
- display: flex;
-}
-
.canvas-wide {
padding-top: 10px;
margin-left: 0;
@@ -459,6 +456,12 @@ svg path:hover {
-webkit-transition: background-color 0.25s ease-in;
-moz-transition: background-color 0.25s ease-in;
transition: background-color 0.25s ease-in;
+ background-color: white;
+ opacity: 0.8;
+ padding: 0.3em;
+ border-radius: 0.5em;
+ border: 1px solid #346789;
+ cursor: pointer;
}
.aLabel.jtk-hover,
@@ -485,14 +488,6 @@ svg path:hover {
}
}
-.aLabel {
- background-color: white;
- opacity: 0.8;
- padding: 0.3em;
- border-radius: 0.5em;
- border: 1px solid #346789;
- cursor: pointer;
-}
.jtk-ep {
.ep {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 01da782246..feb756dabe 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -58,7 +58,7 @@
{{name}}
-
+
@@ -68,7 +68,7 @@
:id="item.code"
:key="$index"
@click="_ckOperation(item,$event)">
-
+
@@ -257,8 +257,8 @@
let state = dom.find('.state-p')
dom.attr('data-state-id', v1.stateId)
dom.attr('data-dependent-result', v1.dependentResult || '')
- state.append(`
`)
- state.find('b').attr('title', titleTpl(v2, v1.desc))
+ state.append(`
`)
+ state.find('strong').attr('title', titleTpl(v2, v1.desc))
}
})
})
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
index f04e8f41d9..1d3902c83b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
@@ -32,8 +32,8 @@
:value="selectedModel === null ? '0' : selectedModel.value"
style="width: 100%;"
@on-click-icon.stop="_ckIcon">
-
-
+
+
- {{$t('View history')}}
- {{$t('View log')}}
+ {{$t('View history')}}
+ {{$t('View log')}}
- {{$t('Enter this child node')}}
+ {{$t('Enter this child node')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
index 7ec9cdfa7a..dbe3e1d6b1 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
@@ -29,16 +29,16 @@
{{$t('View log')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index 8ae0a7866a..d6c865716a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -39,17 +39,17 @@
-
-
-
+
+
+
-
+
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue
index c5e635bfeb..de5f781132 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue
@@ -52,18 +52,18 @@
-
+
-
+
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
index 2b4ade1ad5..0bbbb661f4 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
@@ -66,18 +66,18 @@
-
+
-
+
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
index c16d18cc38..91e1cb7e08 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
@@ -28,7 +28,7 @@
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue
index 226e23219a..ecd10a9411 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue
@@ -32,18 +32,18 @@
-
+
-
+
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
index 785a4fe193..cca9ec7003 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
@@ -23,8 +23,8 @@
-
-
+
+
@@ -40,13 +40,13 @@
@click="!isDetails && _setRelation($index)">
{{el.relation === 'AND' ? $t('and') : $t('or')}}
-
-
+
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 9cef7bb801..7ab032a798 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -45,7 +45,7 @@
- *{{$t('Title')}}
+ *{{$t('Title')}}
- *{{$t('Recipient')}}
+ *{{$t('Recipient')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
index 72e7d5a2b9..6ac87b3372 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
@@ -67,7 +67,6 @@ Affirm.paramVerification = (name) => {
if (!dagStore.name) {
store.commit('dag/setName', `${uuid('dag_')}${uuid() + uuid()}`)
}
- flag = false
} else {
flag = true
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
index 8ee991f3e6..3dd13895b0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
@@ -54,12 +54,12 @@ DownChart.prototype.download = function ({ dagThis }) {
const copyDom = $('#canvas')
// gain
const scale = 1
- // svg handle
- const nodesToRecover = []
- const nodesToRemove = []
// divReport is the id of the dom that needs to be intercepted into a picture
const svgElem = copyDom.find('svg')
svgElem.each((index, node) => {
+ // svg handle
+ const nodesToRecover = []
+ const nodesToRemove = []
let parentNode = node.parentNode
let svg = node.outerHTML.trim()
let canvas = document.createElement('canvas')
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index a918b80ca1..6523a1c298 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -266,10 +266,10 @@ JSP.prototype.tasksContextmenu = function (event) {
let isTwo = store.state.dag.isDetails
let html = [
- `${i18n.$t('Start')}`,
- `${i18n.$t('Edit')}`,
- `${i18n.$t('Copy')}`,
- `${i18n.$t('Delete')}`
+ `${i18n.$t('Start')}`,
+ `${i18n.$t('Edit')}`,
+ `${i18n.$t('Copy')}`,
+ `${i18n.$t('Delete')}`
]
let operationHtml = () => {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
index d9338a01d4..c10dfda5d6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
@@ -37,7 +37,7 @@ const saveTargetarr = (valId, domId) => {
}
const rtBantpl = () => {
- return ``
+ return ``
}
/**
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
index d5956a4c4b..892cead413 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
@@ -18,7 +18,7 @@
-
{{$t('Startup parameter')}}
+
{{$t('Startup parameter')}}
- {{$t('Startup type')}}:{{_rtRunningType(startupParam.commandType)}}
- {{$t('Complement range')}}:{{startupParam.commandParam.complementStartDate}}-{{startupParam.commandParam.complementEndDate}}-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
index d139e5de41..7209c4daff 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
@@ -18,7 +18,7 @@
-
{{$t('Global parameters')}}
+
{{$t('Global parameters')}}
- {{item.prop}} = {{item.value}}
+ {{item.prop}} = {{item.value}}
-
{{$t('Local parameters')}}
+
{{$t('Local parameters')}}
@@ -47,11 +47,11 @@
- {{k}} = {{e}}
+ {{k}} = {{e}}
- {{k}} = {{e}}
+ {{k}} = {{e}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
index d308ceee15..07e0e8d83e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
@@ -22,7 +22,7 @@
- *{{$t('Datasource')}}
+ *{{$t('Datasource')}}
MYSQL
@@ -37,7 +37,7 @@
- *{{$t('Datasource Name')}}
+ *{{$t('Datasource Name')}}
- *{{$t('IP')}}
+ *{{$t('IP')}}
- *{{$t('Port')}}
+ *{{$t('Port')}}
- *Principal
+ *Principal
- *{{$t('User Name')}}
+ *{{$t('User Name')}}
- *{{$t('Database Name')}}
+ *{{$t('Database Name')}}
-
+ |
{{$t('#')}}
|
-
+ |
{{$t('Datasource Name')}}
|
-
+ |
{{$t('Datasource Type')}}
|
-
+ |
{{$t('Datasource Parameter')}}
|
-
+ |
{{$t('Description')}}
|
-
+ |
{{$t('Create Time')}}
|
-
+ |
{{$t('Update Time')}}
|
-
+ |
{{$t('Operation')}}
|
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
index 24902ee469..de187dddc8 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
@@ -97,8 +97,8 @@
-
-
+
+
|
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
index 2fca9663f8..873cd4a1e8 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
@@ -30,8 +30,8 @@
-
-
+
+
{{$t('Health status')}}
@@ -43,7 +43,7 @@
{{$t('Max connections')}} - {{item.date | formatDate}}
- {{item.maxConnections}}
+ {{item.maxConnections}}
{{$t('Max connections')}}
@@ -54,7 +54,7 @@
{{$t('Threads connections')}}
- {{item.threadsConnections}}
+ {{item.threadsConnections}}
{{$t('Threads connections')}}
@@ -65,7 +65,7 @@
{{$t('Max used connections')}}
- {{item.maxUsedConnections}}
+ {{item.maxUsedConnections}}
{{$t('Max used connections')}}
@@ -78,7 +78,7 @@
{{$t('Threads running connections')}}
- {{item.threadsRunningConnections}}
+ {{item.threadsRunningConnections}}
{{$t('Threads running connections')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
index bd760d51cd..dc06712cd2 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
@@ -48,7 +48,7 @@
- {{item.resInfo.loadAverage > 0? item.resInfo.loadAverage.toFixed(2):0}}
+ {{item.resInfo.loadAverage > 0? item.resInfo.loadAverage.toFixed(2):0}}
loadAverage
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue
index f660b38682..e47c163c78 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue
@@ -25,7 +25,7 @@
{{$t('command number of waiting for running')}}
- {{commandCountData.normalCount}}
+ {{commandCountData.normalCount}}
@@ -35,7 +35,7 @@
{{$t('failure command number')}}
- {{commandCountData.errorCount}}
+ {{commandCountData.errorCount}}
@@ -45,7 +45,7 @@
{{$t('tasks number of waiting running')}}
- {{queueCount.taskQueue}}
+ {{queueCount.taskQueue}}
@@ -55,7 +55,7 @@
{{$t('task number of ready to kill')}}
- {{queueCount.taskKill}}
+ {{queueCount.taskKill}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
index f935628520..b386ea0cc0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
@@ -48,7 +48,7 @@
- {{item.resInfo.loadAverage > 0? item.resInfo.loadAverage.toFixed(2):0}}
+ {{item.resInfo.loadAverage > 0? item.resInfo.loadAverage.toFixed(2):0}}
loadAverage
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
index 6ca3836d05..bbade46f2c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue
@@ -30,12 +30,12 @@
:value="[searchParams.startDate,searchParams.endDate]"
:panelNum="2">
-
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue
index 459f0fcfdc..a82bd45b02 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue
@@ -30,12 +30,12 @@
placement="bottom-end"
:panelNum="2">
-
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue
index ba99b14b08..2585744198 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue
@@ -19,7 +19,7 @@