[Improvement][ui] Introduce remixicon, delete ans-ui license and font-awesome (#4313)
* [Improvement-3878]Tenant list delete user name * [Improvement-3878][ui]Fix the list style * [Improvement][ui] List vacancy optimization and icon icon repair * Add font-awesome license and delete ans-ui license * Introduce remixicon
This commit is contained in:
break60
GitHub
parent
b8dc435727
commit
e2e6a77ffe
|
|
@ -479,7 +479,6 @@ The text of each license is also included at licenses/ui-licenses/LICENSE-[proje
|
|||
========================================
|
||||
MIT licenses
|
||||
========================================
|
||||
ans-UI 1.1.7: https://github.com/analysys/ans-ui MIT
|
||||
axios 0.16.2: https://github.com/axios/axios MIT
|
||||
bootstrap 3.3.7: https://github.com/twbs/bootstrap MIT
|
||||
canvg 1.5.1: https://github.com/canvg/canvg MIT
|
||||
|
|
@ -504,6 +503,7 @@ MIT licenses
|
|||
Apache 2.0 licenses
|
||||
========================================
|
||||
echarts 4.1.0: https://github.com/apache/incubator-echarts Apache-2.0
|
||||
remixicon 2.5.0 https://github.com/Remix-Design/remixicon Apache-2.0
|
||||
|
||||
|
||||
========================================
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2019-present ans-ui
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016-present ElemeFE
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2016-present iView
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
|
@ -0,0 +1,201 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
|
@ -24,7 +24,6 @@
|
|||
"dayjs": "^1.7.8",
|
||||
"echarts": "4.1.0",
|
||||
"element-ui": "2.13.2",
|
||||
"font-awesome": "^4.7.0",
|
||||
"html2canvas": "^0.5.0-beta4",
|
||||
"jquery": "3.3.1",
|
||||
"jquery-ui": "^1.12.1",
|
||||
|
|
@ -32,6 +31,7 @@
|
|||
"jsplumb": "^2.8.6",
|
||||
"lodash": "^4.17.11",
|
||||
"normalize.css": "^8.0.1",
|
||||
"remixicon": "^2.5.0",
|
||||
"vue": "^2.5.17",
|
||||
"vue-router": "^3.0.0",
|
||||
"vuex": "^3.0.0",
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ import 'bootstrap/dist/css/bootstrap.min.css'
|
|||
|
||||
import 'bootstrap/dist/js/bootstrap.min.js'
|
||||
import 'canvg/dist/browser/canvg.min.js'
|
||||
import 'font-awesome/css/font-awesome.min.css'
|
||||
import 'remixicon/fonts/remixicon.css'
|
||||
|
||||
// Component internationalization
|
||||
const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: locale } : {}
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ const tasksState = {
|
|||
id: 0,
|
||||
desc: `${i18n.$t('Submitted successfully')}`,
|
||||
color: '#A9A9A9',
|
||||
icoUnicode: 'fa fa-dot-circle-o',
|
||||
icoUnicode: 'ri-record-circle-fill',
|
||||
isSpin: false
|
||||
},
|
||||
RUNNING_EXECUTION: {
|
||||
|
|
@ -164,7 +164,7 @@ const tasksState = {
|
|||
id: 2,
|
||||
desc: `${i18n.$t('Ready to pause')}`,
|
||||
color: '#07b1a3',
|
||||
icoUnicode: 'fa-pause-circle',
|
||||
icoUnicode: 'ri-settings-3-line',
|
||||
isSpin: false
|
||||
},
|
||||
PAUSE: {
|
||||
|
|
@ -178,14 +178,14 @@ const tasksState = {
|
|||
id: 4,
|
||||
desc: `${i18n.$t('Ready to stop')}`,
|
||||
color: '#FE0402',
|
||||
icoUnicode: 'fa-stop-circle-o',
|
||||
icoUnicode: 'ri-stop-circle-fill',
|
||||
isSpin: false
|
||||
},
|
||||
STOP: {
|
||||
id: 5,
|
||||
desc: `${i18n.$t('Stop')}`,
|
||||
color: '#e90101',
|
||||
icoUnicode: 'fa-stop-circle',
|
||||
icoUnicode: 'ri-stop-circle-line',
|
||||
isSpin: false
|
||||
},
|
||||
FAILURE: {
|
||||
|
|
@ -220,21 +220,21 @@ const tasksState = {
|
|||
id: 10,
|
||||
desc: `${i18n.$t('Waiting for thread')}`,
|
||||
color: '#912eed',
|
||||
icoUnicode: 'fa-hourglass-end',
|
||||
icoUnicode: 'ri-time-line',
|
||||
isSpin: false
|
||||
},
|
||||
WAITTING_DEPEND: {
|
||||
id: 11,
|
||||
desc: `${i18n.$t('Waiting for dependence')}`,
|
||||
color: '#5101be',
|
||||
icoUnicode: 'fa-window-restore',
|
||||
icoUnicode: 'ri-send-to-back',
|
||||
isSpin: false
|
||||
},
|
||||
DELAY_EXECUTION: {
|
||||
id: 12,
|
||||
desc: `${i18n.$t('Delay execution')}`,
|
||||
color: '#5102ce',
|
||||
icoUnicode: 'fa-stop-circle-o',
|
||||
icoUnicode: 'ri-pause-circle-fill',
|
||||
isSpin: false
|
||||
},
|
||||
FORCED_SUCCESS: {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<template slot="history"><a href="javascript:" @click="_seeHistory" ><em class="ansicon el-icon-alarm-clock"></em><em>{{$t('View history')}}</em></a></template>
|
||||
<template slot="log"><a href="javascript:"><em class="ansicon el-icon-document"></em><em>{{$t('View log')}}</em></a></template>
|
||||
</m-log>
|
||||
<a href="javascript:" @click="_goSubProcess" v-if="_isGoSubProcess"><em class="ansicon fa fa-tasks"></em><em>{{$t('Enter this child node')}}</em></a>
|
||||
<a href="javascript:" @click="_goSubProcess" v-if="_isGoSubProcess"><em class="ansicon ri-node-tree"></em><em>{{$t('Enter this child node')}}</em></a>
|
||||
</span>
|
||||
</div>
|
||||
<div class="content-box" v-if="isContentBox">
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ const saveTargetarr = (valId, domId) => {
|
|||
}
|
||||
|
||||
const rtBantpl = () => {
|
||||
return `<em class="fa fa-ban" data-toggle="tooltip" data-html="true" data-container="body" data-placement="left" title="${i18n.$t('Prohibition execution')}"></em>`
|
||||
return `<em class="ri-indeterminate-circle-line" data-toggle="tooltip" data-html="true" data-container="body" data-placement="left" title="${i18n.$t('Prohibition execution')}"></em>`
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<div class="starting-params-dag-index">
|
||||
<template v-if="isView && isActive">
|
||||
<div class="box">
|
||||
<p class="box-hd"><em class="fa fa-chevron-circle-right"></em><strong>{{$t('Startup parameter')}}</strong></p>
|
||||
<p class="box-hd"><em class="ri-terminal-line"></em><strong>{{$t('Startup parameter')}}</strong></p>
|
||||
<ul class="box-bd">
|
||||
<li><span class="tab">{{$t('Startup type')}}：</span><span class="content">{{_rtRunningType(startupParam.commandType)}}</span></li>
|
||||
<li><span class="tab">{{$t('Complement range')}}：</span><span class="content" v-if="startupParam.commandParam && startupParam.commandParam.complementStartDate">{{startupParam.commandParam.complementStartDate}}-{{startupParam.commandParam.complementEndDate}}</span><span class="content" v-else>-</span></li>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<div class="variable-model">
|
||||
<template v-if="list">
|
||||
<div class="list">
|
||||
<div class="name"><em class="fa fa-tasks"></em><strong style="padding-top: 3px;display: inline-block">{{$t('Global parameters')}}</strong></div>
|
||||
<div class="name"><em class="ri-code-s-slash-line"></em><strong style="padding-top: 3px;display: inline-block">{{$t('Global parameters')}}</strong></div>
|
||||
<div class="var-cont">
|
||||
<template v-for="(item,$index) in list.globalParams">
|
||||
<el-button
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="list" style="height: 30px;">
|
||||
<div class="name"><em class="fa fa-code"></em><strong style="padding-top: 3px;display: inline-block">{{$t('Local parameters')}}</strong></div>
|
||||
<div class="name"><em class="ri-code-s-slash-line"></em><strong style="padding-top: 3px;display: inline-block">{{$t('Local parameters')}}</strong></div>
|
||||
<div class="var-cont">
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
<span>{{$t('Task Status')}}</span>
|
||||
</a>
|
||||
<a href="javascript:" v-for="(item) in tasksState" :key="item.id">
|
||||
<em class="fa fa-square" :style="{color:item.color}"></em>
|
||||
<em class="ri-checkbox-blank-fill" :style="{color:item.color}"></em>
|
||||
<span>{{item.desc}}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<span>{{$t('Task Status')}}</span>
|
||||
</a>
|
||||
<a href="javascript:" v-for="(item) in tasksState" :key="item.id">
|
||||
<em class="fa fa-square" :style="{color:item.color}"></em>
|
||||
<em class="ri-checkbox-blank-fill" :style="{color:item.color}"></em>
|
||||
<span>{{item.desc}}</span>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
</el-option>
|
||||
</el-select>
|
||||
<el-button type="primary"
|
||||
icon="fa-dot-circle-o"
|
||||
icon="ri-record-circle-fill"
|
||||
size="mini"
|
||||
v-tooltip.small.top.start="$t('Reset')"
|
||||
@click="reset"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ import i18n from '@/module/i18n'
|
|||
|
||||
import 'sass/conf/login/index.scss'
|
||||
import 'bootstrap/dist/js/bootstrap.min.js'
|
||||
import 'font-awesome/css/font-awesome.min.css'
|
||||
|
||||
i18n.globalScope.LOCALE === 'en_US' ? Vue.use(ElementUI, { locale }) : Vue.use(ElementUI)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,9 +33,6 @@
|
|||
<em class="ans el-icon-warning"></em>
|
||||
<span>{{$t('Drag the file into the current upload window')}}</span>
|
||||
</div>
|
||||
<!--<div class="hide-archive" v-if="progress !== 0" @click="_ckArchive">
|
||||
<em class="fa fa-minus" data-toggle="tooltip" title="关闭窗口 继续上传" data-container="body" ></em>
|
||||
</div>-->
|
||||
<div class="update-popup" v-if="dragOver">
|
||||
<div class="icon-box">
|
||||
<em class="ans el-icon-upload"></em>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<div class="clearfix list">
|
||||
<div class="nav-links">
|
||||
<router-link :to="{ path: '/home'}" tag="a" active-class="active">
|
||||
<span><em class="fa icon ansiconfont fa-home"></em>{{$t('Home')}}</span><strong></strong>
|
||||
<span><em class="ansfont ri-home-4-line"></em>{{$t('Home')}}</span><strong></strong>
|
||||
</router-link>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
<div class="clearfix list">
|
||||
<div class="nav-links">
|
||||
<router-link :to="{ path: '/datasource'}" tag="a" active-class="active">
|
||||
<span><em class="ansiconfont fa fa-database"></em>{{$t('Datasource manage')}}</span><strong></strong>
|
||||
<span><em class="ansfont ri-database-2-line"></em>{{$t('Datasource manage')}}</span><strong></strong>
|
||||
</router-link>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<div class="clearfix list" >
|
||||
<div class="nav-links">
|
||||
<router-link :to="{ path: '/security'}" tag="a" active-class="active" v-ps="['ADMIN_USER']">
|
||||
<span><em class="ansiconfont fa fa-shield"></em>{{$t('Security')}}</span><strong></strong>
|
||||
<span><em class="ansfont ri-shield-check-line"></em>{{$t('Security')}}</span><strong></strong>
|
||||
</router-link>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
</div>
|
||||
<div class="adaptive-m-nav">
|
||||
<div class="m-nav-box ">
|
||||
<a href="javascript:" @click="mIsNav = !mIsNav"><em class="fa fa-database"></em></a>
|
||||
<a href="javascript:" @click="mIsNav = !mIsNav"><em class="ansfont ri-database-2-line"></em></a>
|
||||
</div>
|
||||
<div class="m-title-box">
|
||||
<div class="logo-m"></div>
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
<div class="m-nav-list" v-if="mIsNav">
|
||||
<ul @click="mIsNav = false">
|
||||
<router-link :to="{ path: '/home'}" tag="li" active-class="active">
|
||||
<em class="fa icon fa-home"></em>
|
||||
<em class="ansfont ri-home-4-line"></em>
|
||||
<span>{{$t('Home')}}</span>
|
||||
</router-link>
|
||||
<router-link :to="{ path: '/projects'}" tag="li" active-class="active">
|
||||
|
|
@ -124,11 +124,11 @@
|
|||
<span>{{$t('Resources manage')}}</span>
|
||||
</router-link>
|
||||
<router-link :to="{ path: '/datasource'}" tag="li" active-class="active">
|
||||
<em class="fa fa-database"></em>
|
||||
<em class="ansfont ri-database-2-line"></em>
|
||||
<span>{{$t('Datasource manage')}}</span>
|
||||
</router-link>
|
||||
<router-link :to="{ path: '/security'}" tag="li" active-class="active" v-ps="['ADMIN_USER']">
|
||||
<em class="fa fa-shield"></em>
|
||||
<em class="ansfont ri-shield-check-line"></em>
|
||||
<span>{{$t('Security')}}</span>
|
||||
</router-link>
|
||||
</ul>
|
||||
|
|
@ -435,6 +435,11 @@
|
|||
font-size: 22px;
|
||||
margin-right: 4px;
|
||||
}
|
||||
.ansfont {
|
||||
vertical-align: -6px;
|
||||
font-size: 24px;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
&:hover {
|
||||
span {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ const menu = {
|
|||
path: 'projects-index',
|
||||
isOpen: true,
|
||||
disabled: true,
|
||||
icon: 'fa-home',
|
||||
icon: 'ri-home-4-line',
|
||||
children: []
|
||||
},
|
||||
{
|
||||
|
|
@ -36,7 +36,7 @@ const menu = {
|
|||
path: 'projects-kinship',
|
||||
isOpen: true,
|
||||
disabled: true,
|
||||
icon: 'fa-tasks',
|
||||
icon: 'ri-node-tree',
|
||||
children: []
|
||||
},
|
||||
{
|
||||
|
|
@ -124,7 +124,7 @@ const menu = {
|
|||
path: 'queue-manage',
|
||||
isOpen: true,
|
||||
disabled: true,
|
||||
icon: 'fa-recycle',
|
||||
icon: 'ri-group-line',
|
||||
children: []
|
||||
},
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue