test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-04 04:49:48 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix time js

Browse Source
This commit is contained in:
bwcx_jzy 2023-02-12 20:36:06 +08:00
parent df63bc4177
commit 1e5f70dc68
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
46 changed files with 204 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-vue/src/api/node-stat.js
View File

@ -1,5 +1,5 @@
import axios from "./config";
import { parseTime } from "@/utils/time";
import { parseTime } from "@/utils/const";
import echarts from "echarts";
// node 列表

3
web-vue/src/components/upgrade/index.vue
View File

@ -67,10 +67,9 @@
<script>
import { systemInfo, uploadUpgradeFile, changelog, checkVersion, remoteUpgrade, uploadUpgradeFileMerge } from "@/api/system";
import Vue from "vue";
import { parseTime } from "@/utils/time";
import MarkdownItVue from "markdown-it-vue";
import "markdown-it-vue/dist/markdown-it-vue.css";
import { RESTART_UPGRADE_WAIT_TIME_COUNT } from "@/utils/const";
import { RESTART_UPGRADE_WAIT_TIME_COUNT, parseTime } from "@/utils/const";
import { uploadPieces } from "@/utils/upload-pieces";
export default {

4
web-vue/src/pages/build/history.vue
View File

@ -108,9 +108,7 @@
<script>
import BuildLog from "./log";
import { deleteBuildHistory, downloadBuildFile, downloadBuildLog, getBuildListAll, geteBuildHistory, releaseMethodMap, rollback, statusMap, triggerBuildTypeMap } from "@/api/build-info";
import { formatDuration, parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, formatDuration, parseTime } from "@/utils/const";
export default {
components: {

3
web-vue/src/pages/build/list-info.vue
View File

@ -957,9 +957,8 @@ import {
import { afterOptList, afterOptListSimple, getDishPatchListAll } from "@/api/dispatch";
import { getNodeListAll, getProjectListAll } from "@/api/node";
import { getSshListAll } from "@/api/ssh";
import { itemGroupBy, parseTime } from "@/utils/time";
import codeEditor from "@/components/codeEditor";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY, itemGroupBy, parseTime } from "@/utils/const";
import Vue from "vue";
import { dockerSwarmListAll, dockerSwarmServicesList } from "@/api/docker-swarm";
import { getScriptListAll } from "@/api/server-script";

15
web-vue/src/pages/dispatch/list.vue
View File

@ -731,8 +731,19 @@ import {
} from "@/api/dispatch";
import { getNodeListAll, getProjectListAll } from "@/api/node";
import { getProjectData, javaModes, noFileModes, runModeList, getRuningProjectInfo, getProjectGroupAll } from "@/api/node-project";
import { itemGroupBy, parseTime, renderSize, formatDuration } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, PROJECT_DSL_DEFATUL, readJsonStrField, concurrentExecution, randomStr } from "@/utils/const";
import {
CHANGE_PAGE,
COMPUTED_PAGINATION,
PAGE_DEFAULT_LIST_QUERY,
PROJECT_DSL_DEFATUL,
readJsonStrField,
concurrentExecution,
randomStr,
itemGroupBy,
parseTime,
renderSize,
formatDuration,
} from "@/utils/const";
import FileRead from "@/pages/node/node-layout/project/project-file-read";
import { uploadPieces } from "@/utils/upload-pieces";
import CustomSelect from "@/components/customSelect";

4
web-vue/src/pages/dispatch/log.vue
View File

@ -73,9 +73,7 @@
<script>
import { getNodeListAll } from "@/api/node";
import { dispatchStatusMap, getDishPatchListAll, getDishPatchLogList } from "@/api/dispatch";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, readJsonStrField } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, readJsonStrField, parseTime } from "@/utils/const";
export default {
data() {

3
web-vue/src/pages/dispatch/logRead.vue
View File

@ -116,9 +116,8 @@
</template>
<script>
import { deleteLogRead, editLogRead, getLogReadList } from "@/api/log-read";
import { itemGroupBy, parseTime } from "@/utils/time";
import { getNodeListAll, getProjectListAll } from "@/api/node";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, itemGroupBy, parseTime } from "@/utils/const";
import { mapGetters } from "vuex";
import logReadView from "./logReadView";

3
web-vue/src/pages/dispatch/logReadView.vue
View File

@ -121,9 +121,8 @@
</template>
<script>
import { getNodeListAll, getProjectListAll } from "@/api/node";
import { itemGroupBy } from "@/utils/time";
import { getFileList } from "@/api/node-project";
import { getWebSocketUrl } from "@/utils/const";
import { getWebSocketUrl, itemGroupBy } from "@/utils/const";
import { mapGetters } from "vuex";
import viewPre from "@/components/logView/view-pre";
import { updateCache } from "@/api/log-read";

2
web-vue/src/pages/docker/container.vue
View File

@ -328,7 +328,7 @@
</div>
</template>
<script>
import { parseTime, renderSize } from "@/utils/time";
import { parseTime, renderSize } from "@/utils/const";
import {
dockerContainerList,
dockerContainerRemove,

2
web-vue/src/pages/docker/images.vue
View File

@ -303,7 +303,7 @@
</div>
</template>
<script>
import { parseTime, renderSize } from "@/utils/time";
import { parseTime, renderSize } from "@/utils/const";
import { dockerImageCreateContainer, dockerImageInspect, dockerImagePullImage, dockerImageRemove, dockerImagesList } from "@/api/docker-api";
import PullImageLog from "@/pages/docker/pull-image-log";

2
web-vue/src/pages/docker/info.vue
View File

@ -109,7 +109,7 @@
</template>
<script>
import { dockerInfo, dockerPrune } from "@/api/docker-api";
import { renderSize } from "@/utils/time";
import { renderSize } from "@/utils/const";
export default {
props: {
id: {

3
web-vue/src/pages/docker/list.vue
View File

@ -244,9 +244,8 @@
</template>
<script>
import { apiVersions, dcokerSwarmLeaveForce, deleteDcoker, dockerList, editDocker, editDockerByFile, tryLocalDocker } from "@/api/docker-api";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import { dockerSwarmListAll, initDockerSwarm, joinDockerSwarm } from "@/api/docker-swarm";
import { parseTime } from "@/utils/time";
import Console from "./console";
import { mapGetters } from "vuex";

2
web-vue/src/pages/docker/networks.vue
View File

@ -61,7 +61,7 @@
</a-table>
</template>
<script>
import { renderSize, parseTime } from "@/utils/time";
import { renderSize, parseTime } from "@/utils/const";
import { dockerNetworksList, dockerVolumesRemove } from "@/api/docker-api";
export default {
props: {

3
web-vue/src/pages/docker/swarm/list.vue
View File

@ -68,9 +68,8 @@
</template>
<script>
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import { dockerSwarmList, editDockerSwarm, unbindSwarm } from "@/api/docker-swarm";
import { parseTime } from "@/utils/time";
import { mapGetters } from "vuex";
import Console from "./console";

2
web-vue/src/pages/docker/swarm/service.vue
View File

@ -398,7 +398,7 @@
import { dockerSwarmServicesDel, dockerSwarmServicesEdit, dockerSwarmServicesList } from "@/api/docker-swarm";
import SwarmTask from "./task";
import PullLog from "./pull-log";
import { renderSize } from "@/utils/time";
import { renderSize } from "@/utils/const";
export default {
components: { SwarmTask, PullLog },

2
web-vue/src/pages/docker/swarm/task.vue
View File

@ -94,7 +94,7 @@
<script>
import { dockerSwarmNodeLeave, dockerSwarmNodeUpdate, dockerSwarmServicesTaskList, TASK_STATE } from "@/api/docker-swarm";
import { parseTime } from "@/utils/time";
import { parseTime } from "@/utils/const";
import PullLog from "./pull-log";
export default {

2
web-vue/src/pages/docker/volumes.vue
View File

@ -49,7 +49,7 @@
</a-table>
</template>
<script>
import { renderSize, parseTime } from "@/utils/time";
import { renderSize, parseTime } from "@/utils/const";
import { dockerVolumesList, dockerVolumesRemove } from "@/api/docker-api";
export default {
props: {

3
web-vue/src/pages/monitor/list.vue
View File

@ -137,8 +137,7 @@ import { deleteMonitor, editMonitor, getMonitorList } from "@/api/monitor";
import { noFileModes } from "@/api/node-project";
import { getUserListAll } from "@/api/user/user";
import { getNodeListAll, getProjectListAll } from "@/api/node";
import { itemGroupBy, parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY, itemGroupBy, parseTime } from "@/utils/const";
export default {
data() {

3
web-vue/src/pages/monitor/log.vue
View File

@ -52,8 +52,7 @@
<script>
import { getMonitorLogList, notifyStyle } from "@/api/monitor";
import { getNodeListAll } from "@/api/node";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
data() {

3
web-vue/src/pages/monitor/operate-log.vue
View File

@ -90,8 +90,7 @@
<script>
import { deleteMonitorOperate, editMonitorOperate, getMonitorOperateLogList, getMonitorOperateTypeList } from "@/api/monitor";
import { getUserListAll } from "@/api/user/user";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
data() {

3
web-vue/src/pages/node/list.vue
View File

@ -345,8 +345,7 @@ import { getSshListAll } from "@/api/ssh";
import { syncScript } from "@/api/node-other";
import NodeLayout from "./node-layout";
import Terminal from "@/pages/ssh/terminal";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import { getWorkSpaceListAll } from "@/api/workspace";
import CustomSelect from "@/components/customSelect";
import fastInstall from "./fast-install.vue";

4
web-vue/src/pages/node/node-layout/nginx/cert.vue
View File

@ -65,8 +65,8 @@
</div>
</template>
<script>
import { deleteCert, downloadCert, editCert, getCertList, getCertWhiteList } from "../../../../api/node-nginx";
import { parseTime } from "../../../../utils/time";
import { deleteCert, downloadCert, editCert, getCertList, getCertWhiteList } from "@/api/node-nginx";
import { parseTime } from "@/utils/const";
export default {
props: {

3
web-vue/src/pages/node/node-layout/other/script-list.vue
View File

@ -83,8 +83,7 @@
import { getScriptList, editScript, deleteScript, itemScript, syncScript } from "@/api/node-other";
import codeEditor from "@/components/codeEditor";
import ScriptConsole from "./script-console";
import { CRON_DATA_SOURCE, COMPUTED_PAGINATION, CHANGE_PAGE, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CRON_DATA_SOURCE, COMPUTED_PAGINATION, CHANGE_PAGE, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
components: {
ScriptConsole,

3
web-vue/src/pages/node/node-layout/other/script-log.vue
View File

@ -64,8 +64,7 @@
import { getScriptLogList, scriptDel, triggerExecTypeMap } from "@/api/node-other";
// import {triggerExecTypeMap} from "@/api/node-script";
import ScriptLogView from "@/pages/node/node-layout/other/script-log-view";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
components: {

4
web-vue/src/pages/node/node-layout/project/project-file.vue
View File

@ -278,9 +278,7 @@ import {
uploadProjectFile,
shardingMerge,
} from "@/api/node-project";
import { ZIP_ACCEPT } from "@/utils/const";
import { renderSize, formatDuration } from "@/utils/time";
import { ZIP_ACCEPT, renderSize, formatDuration } from "@/utils/const";
import codeEditor from "@/components/codeEditor";
import projectFileBackup from "./project-file-backup.vue";
import { uploadPieces } from "@/utils/upload-pieces";

3
web-vue/src/pages/node/node-layout/project/project-list.vue
View File

@ -425,9 +425,8 @@ import Console from "./project-console";
import FileRead from "./project-file-read";
import CustomSelect from "@/components/customSelect";
// import Replica from "./project-replica";
import { parseTime } from "@/utils/time";
import codeEditor from "@/components/codeEditor";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, PROJECT_DSL_DEFATUL, randomStr } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, PROJECT_DSL_DEFATUL, randomStr, parseTime } from "@/utils/const";
import {
deleteProject,

2
web-vue/src/pages/node/node-layout/system/cache.vue
View File

@ -60,7 +60,7 @@
<script>
import { getNodeCache, clearCache } from "@/api/system";
import TaskStat from "@/pages/system/taskStat";
import { parseTime } from "@/utils/time";
import { parseTime } from "@/utils/const";
export default {
components: {
TaskStat,

2
web-vue/src/pages/node/node-layout/welcome.vue
View File

@ -76,7 +76,7 @@
</template>
<script>
import { nodeMonitorData, getProcessList, killPid } from "@/api/node";
import { renderSize, formatPercent, parseTime, formatDuration } from "@/utils/time";
import { renderSize, formatPercent, parseTime, formatDuration } from "@/utils/const";
import CustomSelect from "@/components/customSelect";
import NodeTop from "@/pages/node/node-layout/node-top";
import { generateNodeTopChart, drawChart } from "@/api/node-stat";

3
web-vue/src/pages/node/script-list.vue
View File

@ -193,8 +193,7 @@ import { delAllCache, deleteScript, editScript, getScriptListAll, itemScript, ge
import codeEditor from "@/components/codeEditor";
import { getNodeListAll } from "@/api/node";
import ScriptConsole from "@/pages/node/node-layout/other/script-console";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import ScriptLog from "@/pages/node/node-layout/other/script-log";
import Vue from "vue";

3
web-vue/src/pages/node/search.vue
View File

@ -216,8 +216,7 @@ import { delAllProjectCache, getNodeListAll, getProjectList, sortItemProject } f
import { getRuningProjectInfo, noFileModes, restartProject, runModeList, startProject, stopProject, getProjectTriggerUrl, getProjectGroupAll } from "@/api/node-project";
import File from "@/pages/node/node-layout/project/project-file";
import Console from "../node/node-layout/project/project-console";
import { itemGroupBy, parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, concurrentExecution } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, concurrentExecution, itemGroupBy, parseTime } from "@/utils/const";
import FileRead from "@/pages/node/node-layout/project/project-file-read";
import Vue from "vue";

3
web-vue/src/pages/node/stat.vue
View File

@ -222,8 +222,7 @@
</template>
<script>
import { getStatist, status, statusStat } from "@/api/node-stat";
import { formatDuration, parseTime } from "@/utils/time";
import { PAGE_DEFAULT_LIST_QUERY, PAGE_DEFAULT_SHOW_TOTAL } from "@/utils/const";
import { PAGE_DEFAULT_LIST_QUERY, PAGE_DEFAULT_SHOW_TOTAL, formatDuration, parseTime } from "@/utils/const";
import NodeTop from "@/pages/node/node-layout/node-top";
import { getNodeGroupAll } from "@/api/node";

3
web-vue/src/pages/repository/list.vue
View File

@ -232,8 +232,7 @@
</template>
<script>
import { authorizeRepos, deleteRepository, editRepository, getRepositoryList, restHideField, sortItem } from "@/api/repository";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
components: {},

3
web-vue/src/pages/script/script-list.vue
View File

@ -220,8 +220,7 @@ import { deleteScript, editScript, getScriptList, syncToWorkspace, unbindScript,
import codeEditor from "@/components/codeEditor";
import { getNodeListAll } from "@/api/node";
import ScriptConsole from "@/pages/script/script-console";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import { mapGetters } from "vuex";
import { getWorkSpaceListAll } from "@/api/workspace";
import Vue from "vue";

4
web-vue/src/pages/script/script-log.vue
View File

@ -51,10 +51,8 @@
</template>
<script>
import { getScriptLogList, scriptDel, triggerExecTypeMap } from "@/api/server-script";
import ScriptLogView from "@/pages/script/script-log-view";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
components: {

3
web-vue/src/pages/ssh/command-log.vue
View File

@ -46,8 +46,7 @@
<script>
import { deleteCommandLog, downloadLog, getCommandLogList, statusMap, triggerExecTypeMap } from "@/api/command";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import CommandLog from "./command-view-log";
export default {

3
web-vue/src/pages/ssh/command.vue
View File

@ -236,8 +236,7 @@
<script>
import { deleteCommand, editCommand, executeBatch, getCommandList, syncToWorkspace, getTriggerUrl } from "@/api/command";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, CRON_DATA_SOURCE, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import { getSshListAll } from "@/api/ssh";
import codeEditor from "@/components/codeEditor";
import CommandLog from "./command-view-log";

3
web-vue/src/pages/ssh/ssh.vue
View File

@ -329,8 +329,7 @@
import { deleteSsh, editSsh, getSshCheckAgent, getSshList, getSshOperationLogList, syncToWorkspace } from "@/api/ssh";
import SshFile from "@/pages/ssh/ssh-file";
import Terminal from "@/pages/ssh/terminal";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import { getWorkSpaceListAll } from "@/api/workspace";
import Vue from "vue";
import { mapGetters } from "vuex";

3
web-vue/src/pages/system/backup.vue
View File

@ -101,8 +101,7 @@
</template>
<script>
import { backupStatusMap, backupTypeArray, backupTypeMap, createBackup, deleteBackup, downloadBackupFile, getBackupList, getTableNameList, restoreBackup, uploadBackupFile } from "@/api/backup-info";
import { parseTime, renderSize } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime, renderSize } from "@/utils/const";
import Vue from "vue";
export default {

2
web-vue/src/pages/system/taskStat.vue
View File

@ -14,7 +14,7 @@
</div>
</template>
<script>
import { parseTime } from "@/utils/time";
import { parseTime } from "@/utils/const";
export default {
name: "TaskStat",
props: {

3
web-vue/src/pages/system/workspace-env.vue
View File

@ -91,8 +91,7 @@
<script>
import { deleteWorkspaceEnv, editWorkspaceEnv, getWorkspaceEnvList } from "@/api/workspace";
import { getNodeListByWorkspace } from "@/api/node";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
props: {

3
web-vue/src/pages/system/workspace.vue
View File

@ -55,8 +55,7 @@
</template>
<script>
import { deleteWorkspace, editWorkSpace, getWorkSpaceList } from "@/api/workspace";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import workspaceEnv from "./workspace-env.vue";
export default {

3
web-vue/src/pages/user/index.vue
View File

@ -155,8 +155,7 @@
<script>
import { closeUserMfa, deleteUser, editUser, getUserList, unlockUser, restUserPwd } from "@/api/user/user";
import { getUserPermissionListAll } from "@/api/user/user-permission";
import { parseTime } from "@/utils/time";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import Vue from "vue";
export default {
data() {

3
web-vue/src/pages/user/operation-log.vue
View File

@ -63,9 +63,8 @@ import { getOperationLogList } from "@/api/operation-log";
import { getMonitorOperateTypeList } from "@/api/monitor";
import { getNodeListAll } from "@/api/node";
import { getUserListAll } from "@/api/user/user";
import { parseTime } from "@/utils/time";
import JsonViewer from "vue-json-viewer";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
export default {
components: { JsonViewer },

3
web-vue/src/pages/user/permission-group.vue
View File

@ -168,9 +168,8 @@ import { workspaceList } from "@/api/user/user";
import { getList, editPermissionGroup, deletePermissionGroup } from "@/api/user/user-permission";
import { getWorkSpaceListAll } from "@/api/workspace";
import { getMonitorOperateTypeList } from "@/api/monitor";
import { parseTime } from "@/utils/time";
import moment from "moment";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY } from "@/utils/const";
import { CHANGE_PAGE, COMPUTED_PAGINATION, PAGE_DEFAULT_LIST_QUERY, parseTime } from "@/utils/const";
import Transfer from "@/components/compositionTransfer/composition-transfer.vue";
export default {

147
web-vue/src/utils/const.js
View File

@ -309,3 +309,150 @@ export function randomStr(len = 2) {
}
return repliccaId;
}
/**
* 转换时间函数
* @param {*} time
* @param {*} cFormat
*/
export function parseTime(time, cFormat) {
if (arguments.length === 0) {
return "-";
}
if (!time) {
return "-";
}
// 处理 time 参数
if (isNaN(Number(time)) === false) {
time = Number(time);
}
const format = cFormat || "{y}-{m}-{d} {h}:{i}:{s}";
let date;
if (typeof time === "object") {
date = time;
} else {
if (("" + time).length === 10) time = parseInt(time) * 1000;
date = new Date(time);
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay(),
};
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key];
// Note: getDay() returns 0 on Sunday
if (key === "a") {
return ["日", "一", "二", "三", "四", "五", "六"][value];
}
if (result.length > 0 && value < 10) {
value = "0" + value;
}
return value || 0;
});
return time_str;
}
/**
* 格式化文件大小
* @param {*} value
* @returns
*/
export function renderSize(value, defaultValue = "-") {
if (null == value || value == "") {
return defaultValue;
}
var unitArr = new Array("Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB");
var index = 0;
var srcsize = parseFloat(value);
if (srcsize <= 0) {
return defaultValue;
}
// console.log(value, srcsize);
index = Math.floor(Math.log(srcsize) / Math.log(1024));
var size = srcsize / Math.pow(1024, index);
size = size.toFixed(2); //保留的小数位数
return size + unitArr[index];
}
/**
* 数组分组 [{id:1,value:1},{id:2,value:3}] => {1:{id:1,value:1},2:{id:2,value:3}}
* @param {function} group
* @returns Object
*/
Array.prototype.groupBy = function (group) {
return group && typeof group === "function"
? Array.prototype.reduce.call(
this,
function (c, v) {
var k = group(v);
c[k] = v;
return c;
},
{}
)
: this;
};
//
export function itemGroupBy(arr, groupKey, key, dataKey) {
key = key || "type";
dataKey = dataKey || "data";
let newArr = [],
types = {},
// newItem,
i,
j,
cur;
for (i = 0, j = arr.length; i < j; i++) {
cur = arr[i];
if (!(cur[groupKey] in types)) {
types[cur[groupKey]] = { [key]: cur[groupKey], [dataKey]: [] };
newArr.push(types[cur[groupKey]]);
}
types[cur[groupKey]][dataKey].push(cur);
}
return newArr;
}
/**
* 格式化时长
* @param {String} ms
* @param {String} seg 分割符
* @param {String} levelCount 格式化个数
* @returns
*/
export function formatDuration(ms, seg, levelCount) {
if (isNaN(new Number(ms))) {
return ms;
}
seg = seg || "";
levelCount = levelCount || 5;
if (ms < 0) ms = -ms;
const time = {
天: Math.floor(ms / 86400000),
小时: Math.floor(ms / 3600000) % 24,
分钟: Math.floor(ms / 60000) % 60,
秒: Math.floor(ms / 1000) % 60,
毫秒: Math.floor(ms) % 1000,
};
return Object.entries(time)
.filter((val) => val[1] !== 0)
.map(([key, val]) => `${val}${key}`)
.splice(0, levelCount)
.join(seg);
}
//小数转换为分数(小数先转换成number类型，再乘以100，并且保留2位小数)
export function formatPercent(point, keep = 2) {
if (null == point) {
return "--";
}
var percent = (Number(point) * 100).toFixed(keep);
percent += "%";
return percent;
}

146
web-vue/src/utils/time.js
View File

@ -1,146 +0,0 @@
/**
* 转换时间函数
* @param {*} time
* @param {*} cFormat
*/
export function parseTime(time, cFormat) {
if (arguments.length === 0) {
return "-";
}
if (!time) {
return "-";
}
// 处理 time 参数
if (isNaN(Number(time)) === false) {
time = Number(time);
}
const format = cFormat || "{y}-{m}-{d} {h}:{i}:{s}";
let date;
if (typeof time === "object") {
date = time;
} else {
if (("" + time).length === 10) time = parseInt(time) * 1000;
date = new Date(time);
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay(),
};
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key];
// Note: getDay() returns 0 on Sunday
if (key === "a") {
return ["日", "一", "二", "三", "四", "五", "六"][value];
}
if (result.length > 0 && value < 10) {
value = "0" + value;
}
return value || 0;
});
return time_str;
}
/**
* 格式化文件大小
* @param {*} value
* @returns
*/
export function renderSize(value, defaultValue = "-") {
if (null == value || value == "") {
return defaultValue;
}
var unitArr = new Array("Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB");
var index = 0;
var srcsize = parseFloat(value);
if (srcsize <= 0) {
return defaultValue;
}
// console.log(value, srcsize);
index = Math.floor(Math.log(srcsize) / Math.log(1024));
var size = srcsize / Math.pow(1024, index);
size = size.toFixed(2); //保留的小数位数
return size + unitArr[index];
}
/**
* 数组分组 [{id:1,value:1},{id:2,value:3}] => {1:{id:1,value:1},2:{id:2,value:3}}
* @param {function} group
* @returns Object
*/
Array.prototype.groupBy = function (group) {
return group && typeof group === "function"
? Array.prototype.reduce.call(
this,
function (c, v) {
var k = group(v);
c[k] = v;
return c;
},
{}
)
: this;
};
//
export function itemGroupBy(arr, groupKey, key, dataKey) {
key = key || "type";
dataKey = dataKey || "data";
let newArr = [],
types = {},
// newItem,
i,
j,
cur;
for (i = 0, j = arr.length; i < j; i++) {
cur = arr[i];
if (!(cur[groupKey] in types)) {
types[cur[groupKey]] = { [key]: cur[groupKey], [dataKey]: [] };
newArr.push(types[cur[groupKey]]);
}
types[cur[groupKey]][dataKey].push(cur);
}
return newArr;
}
/**
* 格式化时长
* @param {String} ms
* @param {String} seg 分割符
* @param {String} levelCount 格式化个数
* @returns
*/
export function formatDuration(ms, seg, levelCount) {
if (isNaN(new Number(ms))) {
return ms;
}
seg = seg || "";
levelCount = levelCount || 5;
if (ms < 0) ms = -ms;
const time = {
天: Math.floor(ms / 86400000),
小时: Math.floor(ms / 3600000) % 24,
分钟: Math.floor(ms / 60000) % 60,
秒: Math.floor(ms / 1000) % 60,
毫秒: Math.floor(ms) % 1000,
};
return Object.entries(time)
.filter((val) => val[1] !== 0)
.map(([key, val]) => `${val}${key}`)
.splice(0, levelCount)
.join(seg);
}
//小数转换为分数(小数先转换成number类型，再乘以100，并且保留2位小数)
export function formatPercent(point, keep = 2) {
if (null == point) {
return "--";
}
var percent = (Number(point) * 100).toFixed(keep);
percent += "%";
return percent;
}