Skip to content

Commit

Permalink
fix: 🐛 样式问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@nsnail
tk authored and nsnail committed Dec 20, 2024
1 parent 4d45a72 commit 377c28c
Show file tree
Hide file tree
Showing 14 changed files with 218 additions and 134 deletions.
2 changes: 1 addition & 1 deletion src/frontend/admin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"prettier-plugin-organize-attributes": "1.0.0",
"sass": "1.82.0",
"terser": "5.37.0",
"vite": "6.0.3"
"vite": "5.1.8"
},
"browserslist": [
"> 1%",
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/admin/src/components/scIconSelect/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</el-tabs>
</div>
<template #footer>
<el-button @click="clear" text>{{ $t('清除') }}</el-button>
<el-button @click="clear">{{ $t('清除') }}</el-button>
<el-button @click="dialogVisible = false">{{ $t('取消') }}</el-button>
</template>
</el-dialog>
Expand Down
18 changes: 11 additions & 7 deletions src/frontend/admin/src/components/scTable/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
:page-size="scPageSize"
:page-sizes="pageSizes"
:pager-count="pagerCount"
:small="true"
:total="total"
@current-change="paginationChange"
@update:page-size="pageSizeChange"
background></el-pagination>
background
size="small"></el-pagination>
</div>
<div v-if="!hideDo" class="scTable-do">
<el-button
Expand Down Expand Up @@ -105,9 +105,9 @@
<el-form label-position="left" label-width="10rem">
<el-form-item :label="$t('表格尺寸')">
<el-radio-group v-model="config.size" @change="configSizeChange" size="small">
<el-radio-button label="large">{{ $t('大') }}</el-radio-button>
<el-radio-button label="default">{{ $t('正常') }}</el-radio-button>
<el-radio-button label="small">{{ $t('小') }}</el-radio-button>
<el-radio-button value="large">{{ $t('大') }}</el-radio-button>
<el-radio-button value="default">{{ $t('正常') }}</el-radio-button>
<el-radio-button value="small">{{ $t('小') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('样式')">
Expand Down Expand Up @@ -232,6 +232,7 @@ export default {
fieldFilter,
},
props: {
dblClickDisable: { type: Boolean, default: false },
vue: { type: Object },
contextMenus: { type: Array },
contextOpers: { type: Array, default: ['copy', 'add', 'view', 'edit', 'del'] },
Expand Down Expand Up @@ -309,7 +310,7 @@ export default {
},
data() {
return {
pagerCount: 10,
pagerCount: 11,
current: {
row: null,
column: null,
Expand Down Expand Up @@ -338,7 +339,7 @@ export default {
}
},
mounted() {
this.pagerCount = document.body.clientWidth < 1000 ? 3 : 10
this.pagerCount = document.body.clientWidth < 1000 ? 3 : 11
//判断是否开启自定义列
if (this.column) {
this.getCustomColumn()
Expand All @@ -363,6 +364,9 @@ export default {
},
methods: {
dbClick(row) {
if (this.dblClickDisable) {
return
}
if (this.vue.dialog) {
this.vue.dialog.save = { mode: 'view', row: { id: row.id } }
}
Expand Down
9 changes: 5 additions & 4 deletions src/frontend/admin/src/layout/components/search.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export default {
data() {
return {
cursor: {
position: 0,
index: 0,
},
input: '',
Expand All @@ -59,7 +58,6 @@ export default {
},
watch: {
result() {
this.cursor.position = 0
this.cursor.index = 0
},
},
Expand All @@ -86,12 +84,15 @@ export default {
return
}
if (e.keyCode === 40) {
this.cursor.index = Math.abs(++this.cursor.position % this.result.length)
this.cursor.index = ++this.cursor.index % this.result.length
e.preventDefault()
return
}
if (e.keyCode === 38) {
this.cursor.index = Math.abs(--this.cursor.position % this.result.length)
this.cursor.index = --this.cursor.index % this.result.length
if (this.cursor.index < 0) {
this.cursor.index += this.result.length
}
e.preventDefault()
return
}
Expand Down
117 changes: 54 additions & 63 deletions src/frontend/admin/src/layout/components/tasks.vue
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,41 @@
<template>
<el-container v-loading="loading">
<el-header class="flex" style="justify-content: space-evenly; height: unset">
<div v-if="failJobs">
<el-badge :hidden="fail === 0" :value="`${$TOOL.time.getFormatTime(new Date(failJobViewTime).getTime())} 至今 ${fail}个`">
<el-button
@click="
() => {
this.$router.push({ path: '/sys/job', query: { view: 'fail' } })
this.$emit('closed')
}
"
plain
type="danger"
>{{ $t('异常日志') }}
</el-button>
</el-badge>
</div>
<el-button @click="refresh" circle icon="el-icon-refresh"></el-button>
<div>
<el-badge :hidden="jobsCnt === 0" :value="jobsCnt" type="primary">
<el-button
@click="
() => {
this.$router.push({ path: '/sys/job' })
this.$emit('closed')
}
"
>{{ $t('作业管理') }}
</el-button>
</el-badge>
</div>
</el-header>
<el-main>
<el-empty v-if="jobs.length === 0" :image-size="120">
<template #description>
<h2>{{ $t('没有正在执行的作业') }}</h2>
</template>
<p style="color: var(--el-color-info); line-height: 1.5; margin: 0 3rem">
在处理耗时过久的作业时为了不阻碍正在处理的工作，可在作业中心进行异步执行。
</p>
</el-empty>
<el-row :gutter="10">
<el-col :lg="12">
Expand All @@ -18,7 +46,13 @@
<p>未发现新的异常作业</p>
</template>
</el-empty>
<el-card v-else v-for="job in failJobs" :class="`user-bar-jobs-item alert`" :key="job.job.id" shadow="hover">
<el-card
v-else
v-for="job in failJobs"
:class="`user-bar-jobs-item alert`"
:key="job.job.id"
@click="dialog.jobRecordSave = { mode: 'view', row: { id: job.id } }"
shadow="hover">
<div class="user-bar-jobs-item-body">
<div class="jobIcon">
{{ job.httpStatusCode.toUpperCase().slice(0, 2) }}
Expand All @@ -32,15 +66,8 @@
</p>
</div>
<div class="bottom">
<div class="status failJobs">
{{ job.responseBody }}
</div>
<div class="handler">
<el-button
@click="dialog.jobRecordSave = { mode: 'view', row: { id: job.id } }"
circle
icon="el-icon-view"
type="danger"></el-button>
<div class="status">
<el-tag type="danger">{{ job.responseBody }}</el-tag>
</div>
</div>
</div>
Expand All @@ -52,6 +79,7 @@
v-for="job in jobs"
:class="`user-bar-jobs-item ${job.lastStatusCode === 'oK' ? '' : 'alert'}`"
:key="job.id"
@click="dialog.jobSave = { mode: 'view', row: { id: job.id }, tabId: 'record' }"
shadow="hover">
<div class="user-bar-jobs-item-body">
<div class="jobIcon">
Expand All @@ -72,51 +100,13 @@
>{{ $t('空闲') }}
</el-tag>
</div>
<div class="handler">
<el-button
:type="job.lastStatusCode === 'oK' ? 'primary' : 'danger'"
@click="dialog.jobSave = { mode: 'view', row: { id: job.id }, tabId: 'record' }"
circle
icon="el-icon-view"></el-button>
</div>
</div>
</div>
</div>
</el-card>
</el-col>
</el-row>
</el-main>
<el-footer class="flex" style="justify-content: space-evenly; height: unset">
<div v-if="failJobs">
<el-badge :hidden="fail === 0" :value="`${$TOOL.time.getFormatTime(new Date(failJobViewTime).getTime())} 至今 ${fail}个`">
<el-button
@click="
() => {
this.$router.push({ path: '/sys/job', query: { view: 'fail' } })
this.$emit('closed')
}
"
plain
type="danger"
>{{ $t('异常日志') }}</el-button
>
</el-badge>
</div>
<el-button @click="refresh" circle icon="el-icon-refresh"></el-button>
<div>
<el-badge :hidden="jobsCnt === 0" :value="jobsCnt">
<el-button
@click="
() => {
this.$router.push({ path: '/sys/job' })
this.$emit('closed')
}
"
>{{ $t('作业管理') }}</el-button
>
</el-badge>
</div>
</el-footer>
</el-container>

<jobSaveDialog
Expand All @@ -133,6 +123,7 @@

<script>
import { defineAsyncComponent } from 'vue'
import scPageHeader from '@/components/scPageHeader'
const jobSaveDialog = defineAsyncComponent(() => import('@/views/sys/job/all/save.vue'))
const jobRecordSaveDialog = defineAsyncComponent(() => import('@/views/sys/job/record/save.vue'))
Expand All @@ -144,6 +135,7 @@ export default {
},
},
components: {
scPageHeader,
jobSaveDialog,
jobRecordSaveDialog,
},
Expand All @@ -170,6 +162,7 @@ export default {
value: true,
operator: 'eq',
},
pageSize: 10,
}),
this.$API.sys_job.pagedQueryRecord.post({
dynamicFilter: {
Expand Down Expand Up @@ -204,6 +197,7 @@ export default {
operator: 'greaterThan',
value: this.failJobViewTime,
},
pageSize: 10,
}),
])
Expand All @@ -229,6 +223,7 @@ export default {
<style scoped>
.user-bar-jobs-item {
margin-bottom: 0.5rem;
cursor: pointer;
}
.user-bar-jobs-item:hover {
Expand All @@ -241,48 +236,44 @@ export default {
.user-bar-jobs-item-body {
display: flex;
gap: 1rem;
}
.user-bar-jobs-item-body .jobIcon {
width: 3rem;
height: 3rem;
background: var(--el-color-primary-light-9);
margin-right: 2rem;
display: flex;
justify-content: center;
align-items: center;
color: var(--el-color-primary);
border-radius: 1.5rem;
text-align: center;
color: var(--el-color-primary);
line-height: 3rem;
}
.user-bar-jobs-item-body .jobMain {
flex: 1;
overflow: hidden;
}
.user-bar-jobs-item-body .title h2 {
font-size: 1rem;
margin-bottom: 0.5rem;
}
.user-bar-jobs-item-body .title p {
font-size: 1rem;
color: var(--el-color-info);
margin-top: 0.5rem;
line-height: 1.5rem;
}
.user-bar-jobs-item-body .bottom {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 0.5rem;
}
.user-bar-jobs-item.alert .jobIcon {
background: var(--el-color-danger-light-9);
color: var(--el-color-danger);
}
.status.failJobs {
color: var(--el-color-danger);
width: 18rem;
overflow: hidden;
}
</style>
Loading

0 comments on commit 377c28c

Please sign in to comment.