diff --git a/back/services/cron.ts b/back/services/cron.ts index 95eb6f44..0b32e99f 100644 --- a/back/services/cron.ts +++ b/back/services/cron.ts @@ -182,7 +182,10 @@ export default class CronService { this.logger.silly('Original command: ' + command); let logFile = `${config.manualLogPath}${_id}.log`; - fs.writeFileSync(logFile, `开始执行...\n${new Date().toString()}\n`); + fs.writeFileSync( + logFile, + `开始执行... ${new Date().toLocaleString()}\n\n`, + ); let cmdStr = command; if (!cmdStr.includes('task ') && !cmdStr.includes('ql ')) { diff --git a/src/layouts/index.less b/src/layouts/index.less index 5b79677a..01730bfa 100644 --- a/src/layouts/index.less +++ b/src/layouts/index.less @@ -6,18 +6,6 @@ body { @import '~codemirror/lib/codemirror.css'; -.log-modal-code { - .CodeMirror { - height: auto; - } - - .CodeMirror-scroll { - height: auto; - overflow-y: hidden; - overflow-x: auto; - } -} - .ql-container-wrapper { .CodeMirror { position: absolute; @@ -78,13 +66,4 @@ body { height: calc(100vh - var(--vh-offset, 0px) - 176px); } } - - .log-modal-code { - .CodeMirror-sizer { - width: 380px; - transform: scale(0.83); - transform-origin: top left; - min-height: auto; - } - } } diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx index 11e92bdb..e83a153b 100644 --- a/src/pages/crontab/logModal.tsx +++ b/src/pages/crontab/logModal.tsx @@ -99,20 +99,7 @@ const CronLogModal = ({ onOk={() => cancel()} onCancel={() => cancel()} > - {!loading && value && ( - { - setValue(value); - }} - onChange={(editor, data, value) => {}} - /> - )} + {!loading && value &&
{value}
} ); };