diff --git a/package.json b/package.json index db85c52..8aabfeb 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@element-plus/icons-vue": "0.2.4", "axios": "0.24.0", "echarts": "5.2.2", - "element-plus": "1.2.0-beta.6", + "element-plus": "1.3.0-beta.3", "file-saver": "2.0.5", "fuse.js": "6.4.6", "js-cookie": "3.0.1", diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index aa2cdb4..3c243e9 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -112,6 +112,7 @@ border: 1px solid #e5e6e7; background: #FFFFFF none; border-radius:4px; + width: 100%; } .pagination-container .el-pagination { @@ -128,7 +129,7 @@ } } -.el-table .fixed-width .el-button--mini { +.el-table .fixed-width .el-button--small { padding-left: 0; padding-right: 0; width: inherit; @@ -138,7 +139,7 @@ .el-table .el-dropdown-link { cursor: pointer; color: #409EFF; - margin-left: 5px; + margin-left: 10px; } .el-table .el-dropdown, .el-icon-arrow-down { @@ -175,12 +176,12 @@ } .el-card__header { - padding: 14px 15px 7px; + padding: 14px 15px 7px !important; min-height: 40px; } .el-card__body { - padding: 15px 20px 20px 20px; + padding: 15px 20px 20px 20px !important; } .card-box { diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 0bec834..706aa88 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -14,7 +14,7 @@ ref="upload" > - 选取文件 + 选取文件
请上传 diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue index 78caa84..fcdd1a6 100644 --- a/src/components/RightToolbar/index.vue +++ b/src/components/RightToolbar/index.vue @@ -2,13 +2,13 @@
- + - + - + @@ -76,7 +76,6 @@ for (let item in props.columns) { \ No newline at end of file diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue index cb008b7..50cea63 100644 --- a/src/views/monitor/job/index.vue +++ b/src/views/monitor/job/index.vue @@ -6,7 +6,6 @@ v-model="queryParams.jobName" placeholder="请输入任务名称" clearable - size="small" @keyup.enter="handleQuery" /> @@ -31,8 +30,8 @@ - 搜索 - 重置 + 搜索 + 重置 @@ -42,7 +41,6 @@ type="primary" plain icon="Plus" - size="mini" @click="handleAdd" v-hasPermi="['monitor:job:add']" >新增 @@ -52,7 +50,6 @@ type="success" plain icon="Edit" - size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['monitor:job:edit']" @@ -63,7 +60,6 @@ type="danger" plain icon="Delete" - size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']" @@ -74,7 +70,6 @@ type="warning" plain icon="Download" - size="mini" @click="handleExport" v-hasPermi="['monitor:job:export']" >导出 @@ -84,7 +79,6 @@ type="info" plain icon="Operation" - size="mini" @click="handleJobLog" v-hasPermi="['monitor:job:query']" >日志 @@ -115,35 +109,46 @@ @@ -211,7 +216,7 @@ - + 立即执行 执行一次 放弃执行 @@ -220,7 +225,7 @@ - + 允许 禁止 @@ -249,7 +254,7 @@ - + {{ form.jobId }} diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue index 6bc0724..d057f1f 100644 --- a/src/views/monitor/job/log.vue +++ b/src/views/monitor/job/log.vue @@ -6,7 +6,6 @@ v-model="queryParams.jobName" placeholder="请输入任务名称" clearable - size="small" style="width: 240px" @keyup.enter="handleQuery" /> @@ -16,7 +15,6 @@ v-model="queryParams.jobGroup" placeholder="请任务组名" clearable - size="small" style="width: 240px" > - + - 搜索 - 重置 + 搜索 + 重置 @@ -67,7 +62,6 @@ type="danger" plain icon="Delete" - size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']" @@ -78,7 +72,6 @@ type="danger" plain icon="Delete" - size="mini" @click="handleClean" v-hasPermi="['monitor:job:remove']" >清空 @@ -88,7 +81,6 @@ type="warning" plain icon="Download" - size="mini" @click="handleExport" v-hasPermi="['monitor:job:export']" >导出 @@ -98,7 +90,6 @@ type="warning" plain icon="Close" - size="mini" @click="handleClose" >关闭 @@ -129,7 +120,6 @@