From 58f4ab3ff44ddd59c1ab452575cb1b55eed1792e Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Thu, 25 Aug 2022 17:54:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20b?= =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/assets/None.png | Bin 0 -> 2585 bytes frontend/src/assets/None_Select.png | Bin 0 -> 3354 bytes frontend/src/assets/nothing.png | Bin 0 -> 3061 bytes frontend/src/components/cron/cron.vue | 1 - .../template/component/TemplateImport.vue | 2 + .../panel/template/component/TemplateItem.vue | 2 +- frontend/src/views/panel/template/index.vue | 79 +++-- frontend/src/views/system/plugin/index.vue | 17 +- .../src/views/system/task/DatasetTaskList.vue | 114 ++++--- frontend/src/views/system/task/TaskRecord.vue | 296 +++++++++++------- frontend/src/views/system/task/dataset.vue | 14 +- frontend/src/views/system/task/filterUser.vue | 27 +- .../views/system/task/filterUserRecord.vue | 25 +- 13 files changed, 372 insertions(+), 205 deletions(-) create mode 100644 frontend/src/assets/None.png create mode 100644 frontend/src/assets/None_Select.png create mode 100644 frontend/src/assets/nothing.png diff --git a/frontend/src/assets/None.png b/frontend/src/assets/None.png new file mode 100644 index 0000000000000000000000000000000000000000..700664ed24bce25c0a3834dc841b3d6730166005 GIT binary patch literal 2585 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 literal 0 HcmV?d00001 diff --git a/frontend/src/assets/None_Select.png b/frontend/src/assets/None_Select.png new file mode 100644 index 0000000000000000000000000000000000000000..90e625123840e0147e1de4342d305d29d79c8057 GIT binary patch literal 3354 zcmV+#4dwEQP)80rCXnJc0NGt4~0D0<*PMvo*Wc z1YKQ_00}}s3Bf)8raRk&{!Vx9?c4pUN;UaH>3^Sd&&R#Dhe#o6wOS#c&lg8VM&`eM z{aPFz9=^`U0>4!p8XCf}U_3tszt`kLliyo4p09Q~owxjBRnxTQ-riodR4O$|5r!zi zynp|Go&_$mFhB6qGK8l1sPbc#|BY9NhliD`SFctnp(ILlSn}A|*aH^%EXSIU@ z-hu!93O`=5SEyXRe0h};g7l&rLND-1zRyp~BrmuCp0`@97qSlp(u%&ewpQjb8CLyJ zq(z5;FVJON0JF2R6_OC?MF05lBZPiTa$B`usx1Dmb8~acBoWexzOk{fz+x}P9E=G8 z*}(Df@scd!3l|-h&2Ib`6~*pF7V(9Njxjrz%Po=`ZafeWzuj)%6BY3fTy#X^4k1r9q27P|;!CTrqo=23PJE5iWlqqG#6ai>Ex?Elo{L#h&BGE;?Ixk*#|r zvu4_WZnnc)7wd17mSy}rI4t4EAY^sTKeQ2_6gc zM@L61IKLDTkyv^bp~p{@k$vBm4wue>$BRtxcrhaTzcm_-z60aFMbBLNK+#=&zryz= zI_KffGQkJVe5cd-h58`0=tdsCKp6uE=e?giK2#vbf`5lL+yrs+o|XqvyWSA0s1qN;9n4k6g5Q;rPDWm$|lH zlVL31Ywc5gt3i8v`_wr;_Wb<#*tax2HA&Nj^OQyq)UoI#$M>Dykip6i58L$a!@4ed z7-0REF3zMe^C>rUnbvhj$|Bq}a~JgE8T53G^os$X!NubwK3*Rk{YD?>(*WxU7hkcyc1m5e=(v>E zAOY0geb6n{jxd23#&N_2b_@?|bo=`o`Y{DGxuROK*5pt9)$Mls0SN#pnUmnK+%Sj&U6qMM@}q`SNAK`obyEv6B-CV7u|j_H{kao|~btVElG+8bPfxx4`c#{+eNo!vc35e4j;joqtFb1G8;u?h|l5aMBW*T%mcb-Z}+dRhuJ zCY-OA3G3bQ1W~()DqKInQk{kdy#DU}n*OsN>rV^DzW68Zou6DMLG%V!CJ6AR3(hXy zth;*=#QIf-buQzWGfJ=XBnYQ~ZRgXj>*NOnXRuzsxprp#C+$|~t%(#IOrD>xeH~(Y zwLy`Fg#nh2HtTP{|G__h(uaz)&}y}cnsGxLVVD-%3k3JmX6>hGVp{)i|N4WE>#3;F z;ig6!_o9VbI&iL!H*`yM|L!zJL0YUIE*@r5B*7qWb_(cViEhHXrCqmfT-V2Mr{8Ud z>ekPm{d&&0cNvKWZBSU69S{MQXE%ns1#~;Rt!{f&kK(zT7equABY)OAb>DFr<%ORxQ1%uE0^)G)u_1eh{oh|)4PITai&O;fciMZ z=v}>H0+IAtvK-`Dt=6+V+dnivq365XkR1L9cV05@+wk^qc6$2q!Eq63VZZ)#`V zE*3b1ZO2-Hz;NyL&F#R;sZX{^IY**ky;pO`$H#9qO%vW}i;^G}I=|q%7{{^vDohkV ztZ5v079zRm`UPcJE)Qp*Be{msa=o3q+w?Iv-a_K@iZ{ ziEajTUIO&9-wmu9jUk9F(v{o6qQA{yZxT`vx0WjcIxjbiB2UoZ%ykXDJm_7vDk)0X zfDYrfU%?TWq1=k$Bnj)?Ieu&A^7;Jg(a{m9NZ5eRX|2488I(<)A4^HSAEJ zs*49sbLbGz*@3a#sk;Y(u|dM^TQ~SPo5YC}Rp_nzBd%k=B1H*Wq1)THUqx${aq;_- zx@`&4a~$>mJzKi6<9g5v9SSaXM7eZY6dbu%a5OL33Mq_J(AK*J36?I~&Dha{H3haB z<=Cx)qb~Z~++0<)#)}oFMG?JQkT})m6LO@e|NF6=G&*l7Dk5 z9?!dRTUT_p^a?4AS3sw)YO%@9Pxg?PtEv_T*0;O=dslSM*I$srcm;IZ4f`~0b|#u- zQ=(x{UNL{}if-iV6;c?tfX;E3t8Yh10V>wJG@goX*zYSnuDb<4dK%o&;|WW0;t;En9r$m@GB{d*R~~5?Mo{fwsKn?ZU1uI$PII; zNMYOpIz^f*t4_D*a_bQ;k-|6ybnpO^6XT=+j`}%@j;lmvYj+ChCMPBmf13|CD+jKB zou+9&lfqoPa_Q7^By(b;0=Rl<&kbQ^+LI z5FBu0<(}7PJViJ1cBNA|RY3L4+E{VISHvJ78Wsd;L^px>Ec|0qqm-*pCdDdX zk_hQUH{pt2nJr`?fs-^)TzQTiJw%P!UPvptNv&2ZjE#*w;L6@Z$=B3X`2Y8kqw(da zYvoZRz35hqh`-Diz literal 0 HcmV?d00001 diff --git a/frontend/src/assets/nothing.png b/frontend/src/assets/nothing.png new file mode 100644 index 0000000000000000000000000000000000000000..7b1fa548bf76deb8ac4fbce166a93047d199bb97 GIT binary patch literal 3061 zcmVw)vdq^ELLFd3QShuWCg$qf>&U?f{RyxyaFr#q$*WO zNjMPk5FiY~20fhfjb{`+=BatLH2tfh20e`A`TCqbefo6w2n`X1LLrq%B+_GJV~bzD zd`XXvjy~pVieE~PjEvx#QXhA~uT}U`;n#}l<6@)H*yUgIu~@8fd3l-7WHJ>R5=Ll% z+1uM&WP!6R%n$r93!%wB^88ce&vXTKX2J9kzFS;u9D&OSi{4h)6f(G!WTCHx2-W3QddZ|>(a-R&Vei5cc z_X9W3Ei{1p_wVOOK!g+h@bC~qza+7(+Aet(|JCg5>=p@xFrptF9j&t1Yd!~Kp@7jq zv)SAbMf}i3hh?)H|794(?nV^xLlYf+c03+mqv3Glj)3^JT5UP3h(B=A5sfF4Nr?Ru zMH~ctEdEB&;s+`^teZ1tucP3~?GlE|4@7in-L}}|?rvjxdfN9fzVD*5b*I_7ccgV& z6I5RxBOfW3%P&~)_fl|s;6AanzdtxQ@YN&wCi=2T>Bcx+3-{Y8!J|9^IN<~lHTExL5+fugv2x5B#;oyXy? zrQm_H*l09T$Q{LPJ2ylx1X>8BgWg=OVtBq#0!9zdOcyf78@)925M#Ur>A zEvkopSR6VxH@DsWny%!^e zHp`bqlGp~qf7m-90m-U*cF-fbER5)n)5^J!!n2+|!?zC6F-6C&{RK(-0>bZ?jz}b+ zXZO@=hv>ChZG|MRI6gU}gQF7?h}8A<^=kVQ9in3=Cz814;HWH=@H}Dmy!~-YbWE(U z|Id=d69f}J+wS69qH}A=lEhOW{Q1Qti9mbT-4b0d%9FT9pp4x!?U!~-e@2p_g`@aR zOXsxfqO5QodQ#Xm8^362*epqUc=Fx1w%>bxeo6ZWVvW(eiO1tv!g_Z+K-A9WPm)eh zDPxxbD5D~EU;MA`ogaudTOjcq);X(O)$yC0V2J>jZiU{ldc7_Mj}X;rH62qAw2?#v z9BLG6G#b*TXi` z5giQArF)MU2;3pMjNT&z=2&8Kq9t;q#7`JYJVyp{7NDm6)2C~?snuK0jo-e-Nsc&Q zZ_^+mMc3i7dPV0St8{u+F2l+L_)E2 zz7{Eh!2KHSQ+NNHX(b@D0^*}leAq834WJu%68z{joUmZgcTqW0qzHmYU5}~Bq%FZU z;PM|moL3Syx}PInP?tyao~MWb>(jGx^xIAZ*MRVuM-Lr+R#H{6@P>*(`BAP>EjS++)_@s1*d-ll(W z(Qb!VMiVfiY%+-9Ij)N6Z0V8f*So zkDM$;m`2n6p0uKF8LCoQSXfXzddnYizy6jY!uWV^-wVO)PN^DUwAF|R#TMM3x8k;z z=xpgZiU`Sxaoy)n&)iLtoSvQQKA%jEQ`oS+t?fcvqVsrtn<9cy_6&34D39s~q;-uv z#rUmT6gKS1bK37M(be&Kjv@eZ;YRuJ!mjh}yfGv*O6wwFBfv~suKkq8jxh%N{mAs| zm?hH#DbwHoDB2!d<9*78{|2d6qt6Kv9;$Vm$J!w}yZEiBMDb?UuASU~5-KCB$Mcv> zQ5uMW;G&G%ySwh5jb@IHjyA*G?;XJq=ApZJv@q}ae($i--~TLHx^pxRMBx7xQGB)? z>4$y76KlCOGc)sJ`*Sg!H$^6(gAhiuW9>lTr z+Z{!CKV5N%!sqo4<}<2$e?@}rEeE&XPx1uAGppG%OsPJ-oi+`~>@XUO8CKM4!UyT< z*~(w(J#V;q9QW-7w)iv!j8UK7FR)}Mb!rIC@Ex3p53wK2%_vnjRt+bpJ|4AjoLKOLpm+cXst2COVL}k_zu*5y@g@*b5!7VUK{SYfc9t~M&vcu} zFswanOVjDy+rW9VJrDFjIFYg`1bw7Ak5(H>>SK z%`6_C#81IhOue+}-R1G!cF>W$R$c03Use&(6CQ#;n4KX%QLTK->^+vd0ITPE?NA7K zRYe+R1A?nRKB*|{*#od}6iQ^;^Xz)q+WNU%E^l%R67Ez+Nhf;QH$7~1o*cNW!)=g6 zSfEd>RQ9hskPs_7zEl1DQ9g;H@1;V#-TvjU;$k;!Bn>ESpFf_|gfYzCgRk@Uh=Zo40Er?1qP+J8hcH!lio zcpI$4CiQ`$4<}eXKV(389;(Y-Y zj{DnBq^^gjXKl(p-g`8c?uCVGcv`IhSI_C%CB3p+iF0rty%rq!cB(GV!>{vYjU;`6 zaX3fm>*NEz9;M9V_@832*qYpB+7Z~5`)4N;C{FSH{OnSxl;(+=oiNI&2Mt8%UIuJN z_+EjC|3D&Fuz)U**f1wEBO6b)!HhN40cD^??*?5#GMQXtfl{0VT4b;An4eCo zFQ?UsA3g6-QI8+hPPsrm`7Zx^RIB9KWfup@lCAg$I|9{2olUoH00000NkvXXu0mjf D save(this.templateInfo).then((response) => { this.openMessageSuccess("system_parameter_setting.import_succeeded"); + this.$emit("refresh"); this.$emit("closeEditTemplateDialog"); }), confirmButtonText: this.$t('template.override') @@ -154,6 +155,7 @@ export default { } else { save(this.templateInfo).then((response) => { this.openMessageSuccess("system_parameter_setting.import_succeeded"); + this.$emit("refresh"); this.$emit("closeEditTemplateDialog"); }); } diff --git a/frontend/src/views/panel/template/component/TemplateItem.vue b/frontend/src/views/panel/template/component/TemplateItem.vue index 0f859e9cb9..b9e6368dea 100644 --- a/frontend/src/views/panel/template/component/TemplateItem.vue +++ b/frontend/src/views/panel/template/component/TemplateItem.vue @@ -72,7 +72,7 @@ export default { background: #ffffff; border: 1px solid var(--deCardStrokeColor, #dee0e3); border-radius: 4px; - margin: 0 25px 25px 0; + margin: 0 12.5px 25px 12.5px; .card-img-model { border-bottom: 1px solid var(--deCardStrokeColor, #dee0e3); height: 144px; diff --git a/frontend/src/views/panel/template/index.vue b/frontend/src/views/panel/template/index.vue index 217dbfcbe5..478fd8d8d5 100644 --- a/frontend/src/views/panel/template/index.vue +++ b/frontend/src/views/panel/template/index.vue @@ -33,7 +33,9 @@
- {{ currentTemplateLabel }}  ({{ currentTemplateShowList.length }}) + {{ currentTemplateLabel }}  ({{ + currentTemplateShowList.length + }}) -
+
@@ -60,7 +66,7 @@
- + @@ -97,6 +100,8 @@ @@ -109,10 +114,10 @@ import TemplateList from "./component/TemplateList"; import TemplateItem from "./component/TemplateItem"; import TemplateImport from "./component/TemplateImport"; import { save, templateDelete, find } from "@/api/system/template"; -import elementResizeDetectorMaker from 'element-resize-detector' +import elementResizeDetectorMaker from "element-resize-detector"; import msgCfm from "@/components/msgCfm/index"; -import { log } from '@antv/g2plot/lib/utils'; +import { log } from "@antv/g2plot/lib/utils"; export default { name: "PanelMain", mixins: [msgCfm], @@ -129,7 +134,7 @@ export default { { required: true, message: this.$t("commons.input_content"), - trigger: "change", + trigger: "blur", }, { max: 50, @@ -171,17 +176,20 @@ export default { }, mounted() { this.getTree(); - const _this = this - const erd = elementResizeDetectorMaker() - const templateMainDom = document.getElementById('template-box') + const _this = this; + const erd = elementResizeDetectorMaker(); + const templateMainDom = document.getElementById("template-box"); // 监听div变动事件 - erd.listenTo(templateMainDom, element => { + erd.listenTo(templateMainDom, (element) => { _this.$nextTick(() => { - const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth) - console.log(1, curSeparator) - _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 50 - }) - }) + const curSeparator = Math.trunc( + templateMainDom.offsetWidth / _this.templateMiniWidth + ); + console.log(1, curSeparator); + _this.templateCurWidth = + Math.trunc(templateMainDom.offsetWidth / curSeparator) - 50; + }); + }); }, methods: { roleValidator(rule, value, callback) { @@ -226,11 +234,11 @@ export default { }, templateDeleteConfirm(template) { const options = { - title: 'system_parameter_setting.delete_this_template', - type: "primary", - cb: () => this.templateDelete(template.id), - }; - this.handlerConfirm(options); + title: "system_parameter_setting.delete_this_template", + type: "primary", + cb: () => this.templateDelete(template.id), + }; + this.handlerConfirm(options); }, handleClick(tab, event) { this.getTree(); @@ -247,7 +255,7 @@ export default { templateDelete(id) { if (id) { templateDelete(id).then((response) => { - this.openMessageSuccess('commons.delete_success'); + this.openMessageSuccess("commons.delete_success"); this.getTree(); }); } @@ -257,7 +265,13 @@ export default { this.formType = type; if (type === "edit") { this.templateEditForm = JSON.parse(JSON.stringify(templateInfo)); - this.dialogTitle = this.$t(`system_parameter_setting.${"folder" === this.templateEditForm.nodeType ? 'edit_classification' : 'edit_template'}`); + this.dialogTitle = this.$t( + `system_parameter_setting.${ + "folder" === this.templateEditForm.nodeType + ? "edit_classification" + : "edit_template" + }` + ); this.originName = this.templateEditForm.label; } else { this.dialogTitle = this.$t("panel.add_category"); @@ -268,7 +282,13 @@ export default { level: 0, }; } - this.dialogTitleLabel = this.$t(`system_parameter_setting.${ "folder" === this.templateEditForm.nodeType ? 'classification_name' : 'template_name'}`) + this.dialogTitleLabel = this.$t( + `system_parameter_setting.${ + "folder" === this.templateEditForm.nodeType + ? "classification_name" + : "template_name" + }` + ); this.editTemplate = true; }, templateEdit(templateInfo) { @@ -365,7 +385,7 @@ export default { .de-tabs-right { flex: 1; background: #fff; - padding: 24px; + padding: 24px 12px 24px 12px; overflow: hidden; .template-box { @@ -373,6 +393,7 @@ export default { flex-wrap: wrap; overflow-y: auto; box-sizing: border-box; + align-content: flex-start; height: calc(100% - 10px); width: 100%; padding-bottom: 24px; diff --git a/frontend/src/views/system/plugin/index.vue b/frontend/src/views/system/plugin/index.vue index 62c4c91f56..c033ddd8a3 100644 --- a/frontend/src/views/system/plugin/index.vue +++ b/frontend/src/views/system/plugin/index.vue @@ -78,7 +78,7 @@

-
+
更新
- + {{ $t("user.clear_filter") }}
-
+ :class="[filterTexts.length ? 'table-container-filter' : '']" + > @@ -263,7 +268,6 @@
- @@ -316,9 +320,7 @@ const columnOptions = [ props: "status", }, ]; -import { - formatOrders, -} from "@/utils/index"; +import { formatOrders } from "@/utils/index"; import { datasetTaskList, post } from "@/api/dataset/dataset"; import cron from "@/components/cron/cron"; import TableSelector from "@/views/chart/view/TableSelector"; @@ -326,12 +328,18 @@ import { hasDataPermission } from "@/utils/permission"; import GridTable from "@/components/gridTable/index.vue"; import filterUser from "./filterUser.vue"; import msgCfm from "@/components/msgCfm/index"; -import _ from 'lodash'; +import _ from "lodash"; export default { name: "DatasetTaskList", components: { GridTable, cron, filterUser, TableSelector }, mixins: [msgCfm], + props: { + transCondition: { + type: Object, + default: () => {}, + }, + }, data() { return { nikeName: "", @@ -366,7 +374,11 @@ export default { }, }, created() { - this.initSearch(); + const { taskId, name } = this.transCondition; + if (taskId) { + this.nikeName = name; + } + this.search(); this.timer = setInterval(() => { this.search(false); }, 10000); @@ -385,28 +397,30 @@ export default { }); }, resizeObserver() { - this.resizeForFilter = new ResizeObserver(entries => { + this.resizeForFilter = new ResizeObserver((entries) => { if (!this.filterTexts.length) return; this.layoutResize(); }); - this.resizeForFilter.observe(document.querySelector('#resize-for-filter')); + this.resizeForFilter.observe( + document.querySelector("#resize-for-filter") + ); }, layoutResize: _.debounce(function () { - this.getScrollStatus() + this.getScrollStatus(); }, 200), scrollPre() { - const dom = document.querySelector('.filter-texts-container'); - dom.scrollLeft -= 10 + const dom = document.querySelector(".filter-texts-container"); + dom.scrollLeft -= 10; if (dom.scrollLeft <= 0) { - dom.scrollLeft = 0 + dom.scrollLeft = 0; } }, scrollNext() { - const dom = document.querySelector('.filter-texts-container'); - dom.scrollLeft += 10 - const width = dom.scrollWidth - dom.offsetWidth + const dom = document.querySelector(".filter-texts-container"); + dom.scrollLeft += 10; + const width = dom.scrollWidth - dom.offsetWidth; if (dom.scrollLeft > width) { - dom.scrollLeft = width + dom.scrollLeft = width; } }, clearFilter() { @@ -467,6 +481,7 @@ export default { this.handleCurrentChange(1); }, search(showLoading = true) { + const { taskId, name } = this.transCondition; const param = { orders: formatOrders(this.orderConditions), conditions: [...this.cacheCondition], @@ -478,6 +493,13 @@ export default { value: this.nikeName, }); } + if (taskId && this.nikeName === name) { + param.conditions.push({ + operator: "eq", + value: taskId, + field: "dataset_table_task.id", + }); + } const { currentPage, pageSize } = this.paginationConfig; datasetTaskList(currentPage, pageSize, param, showLoading).then( (response) => { @@ -490,18 +512,22 @@ export default { ); }, batchDelete() { - post("/dataset/task/batchDelete", this.multipleSelection.map(ele => ele.id), false).then(() => { + post( + "/dataset/task/batchDelete", + this.multipleSelection.map((ele) => ele.id), + false + ).then(() => { this.initSearch(); - this.openMessageSuccess('commons.delete_success'); + this.openMessageSuccess("commons.delete_success"); }); }, confirmDelete() { const options = { - title: '确定删除该任务吗？', - type: "primary", - cb: this.batchDelete, - }; - this.handlerConfirm(options); + title: "确定删除该任务吗？", + type: "primary", + cb: this.batchDelete, + }; + this.handlerConfirm(options); }, taskStatus(item) { post("/dataset/task/lastExecStatus", item, false).then((response) => { @@ -552,23 +578,23 @@ export default { ) .then(() => { post("/dataset/task/execTask", task).then((response) => { - this.initSearch( true); + this.initSearch(true); }); }) .catch(() => {}); }, selectDataset(row) { if (row) { - const { datasetName, id } = row; + const { datasetName, id } = row; this.$router.push({ - path: '/task-ds-form', + path: "/task-ds-form", query: { datasetName, id, - } - }) + }, + }); } else { - this.$router.push('/task-ds-form') + this.$router.push("/task-ds-form"); } }, disableEdit(task) { @@ -592,16 +618,16 @@ export default { }, deleteTask(task) { const options = { - title: '确定删除该任务吗？', - type: "primary", - cb: () => { - post("/dataset/task/delete/" + task.id, null).then((response) => { - this.openMessageSuccess('commons.delete_success'); + title: "确定删除该任务吗？", + type: "primary", + cb: () => { + post("/dataset/task/delete/" + task.id, null).then((response) => { + this.openMessageSuccess("commons.delete_success"); this.initSearch(); }); - }, - }; - this.handlerConfirm(options); + }, + }; + this.handlerConfirm(options); }, showErrorMassage(massage) { this.show_error_massage = true; @@ -694,7 +720,7 @@ span { } .mar3 { - margin-left: -3px; + margin-left: -3px; } } @@ -750,14 +776,16 @@ span { color: #3370ff; } - .filter-texts-container::-webkit-scrollbar { display: none; } + .filter-texts-container::-webkit-scrollbar { + display: none; + } .arrow-filter { font-size: 16px; width: 24px; height: 24px; cursor: pointer; - color: #646A73; + color: #646a73; display: flex; justify-content: center; align-items: center; diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue index 0e2dcc30bf..b9d3fd61bc 100644 --- a/frontend/src/views/system/task/TaskRecord.vue +++ b/frontend/src/views/system/task/TaskRecord.vue @@ -1,8 +1,8 @@