diff --git a/.eslintrc.js b/.eslintrc.js index 72d4664bf..3e4af635c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -21,8 +21,8 @@ module.exports = defineConfig({ extends: [ 'plugin:vue/vue3-recommended', 'plugin:@typescript-eslint/recommended', - 'prettier', - 'plugin:prettier/recommended', + // 'prettier', + // 'plugin:prettier/recommended', '@unocss' ], rules: { diff --git a/index.html b/index.html index e030c5cae..2fe32f5d2 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,8 @@ - + +
- +
%VITE_APP_TITLE%
diff --git a/package.json b/package.json index 0377e6cd4..3c18a391f 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "dev": "vite", "test": "vite build --mode test", "prod": "vite build --mode production", - "preview": "vite preview" + "preview": "vite preview", + "lint": "eslint --fix --ext .js,.vue src" }, "dependencies": { "@element-plus/icons-vue": "^2.1.0", diff --git a/src/App.vue b/src/App.vue index 7407d97ad..be2808dc2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -54,4 +54,7 @@ body { .#{$prefix-cls}-grey-mode { filter: grayscale(100%); } +.el-select{ + width: 100%; +} diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png index 7e1043f21..87c1d32cb 100644 Binary files a/src/assets/imgs/logo.png and b/src/assets/imgs/logo.png differ diff --git a/src/assets/imgs/logo1.png b/src/assets/imgs/logo1.png new file mode 100644 index 000000000..572b2e0ee Binary files /dev/null and b/src/assets/imgs/logo1.png differ diff --git a/src/assets/imgs/logo_w.png b/src/assets/imgs/logo_w.png new file mode 100644 index 000000000..5d8b3fe41 Binary files /dev/null and b/src/assets/imgs/logo_w.png differ diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 3218a63a6..a9fbe9488 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -114,16 +114,16 @@ const setVisible = () => { diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue index 0cdf04569..68aa4cc09 100644 --- a/src/views/bpm/form/index.vue +++ b/src/views/bpm/form/index.vue @@ -1,32 +1,20 @@ - + - + @@ -160,7 +132,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } catch { } } /** 详情操作 */ diff --git a/src/views/bpm/group/index.vue b/src/views/bpm/group/index.vue index 957ffc89e..1791d2eed 100644 --- a/src/views/bpm/group/index.vue +++ b/src/views/bpm/group/index.vue @@ -1,52 +1,29 @@ - + - + @@ -177,7 +137,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } catch { } } /** 初始化 **/ diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue index e5da7519d..a1a609f73 100644 --- a/src/views/bpm/model/index.vue +++ b/src/views/bpm/model/index.vue @@ -1,58 +1,31 @@ - + - + - + - + @@ -141,66 +83,39 @@ - + - + @@ -216,13 +131,8 @@ - + @@ -300,7 +210,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } catch { } } /** 更新状态操作 */ @@ -342,7 +252,7 @@ const handleDeploy = async (row) => { message.success(t('部署成功')) // 刷新列表 await getList() - } catch {} + } catch { } } /** 点击任务分配按钮 */ diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue index 72966db80..0991d60d6 100644 --- a/src/views/bpm/oa/leave/index.vue +++ b/src/views/bpm/oa/leave/index.vue @@ -54,9 +54,9 @@ /> - 搜索 - 重置 - + 搜索 + 重置 + 发起请假 @@ -106,7 +106,7 @@ type="primary" @click="handleDetail(scope.row)" v-hasPermi="['bpm:oa-leave:query']" - > + > 详情 + > 进度 + > 取消 diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue index d2033d5d8..a912d15fb 100644 --- a/src/views/bpm/task/done/index.vue +++ b/src/views/bpm/task/done/index.vue @@ -1,39 +1,22 @@ - + - + diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index c88768873..3e49f2564 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -1,39 +1,22 @@ diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index e12e86d28..59f1eca28 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -1,75 +1,36 @@ - + - + @@ -201,7 +144,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } catch { } } /** 导出按钮操作 */ diff --git a/src/views/infra/dataSourceConfig/index.vue b/src/views/infra/dataSourceConfig/index.vue index 92bd30137..a7c1c4ad8 100644 --- a/src/views/infra/dataSourceConfig/index.vue +++ b/src/views/infra/dataSourceConfig/index.vue @@ -3,12 +3,7 @@ - + 新增 @@ -22,31 +17,17 @@ - + @@ -96,7 +77,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } catch { } } /** 初始化 **/ diff --git a/src/views/infra/dbDoc/index.vue b/src/views/infra/dbDoc/index.vue index 79666562f..51481c76a 100644 --- a/src/views/infra/dbDoc/index.vue +++ b/src/views/infra/dbDoc/index.vue @@ -1,13 +1,13 @@ diff --git a/src/views/infra/fileConfig/index.vue b/src/views/infra/fileConfig/index.vue index f4c5706d3..7be93e10b 100644 --- a/src/views/infra/fileConfig/index.vue +++ b/src/views/infra/fileConfig/index.vue @@ -1,57 +1,29 @@ - - + + - + @@ -187,7 +140,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } catch { } } /** 主配置按钮操作 */ @@ -197,7 +150,7 @@ const handleMaster = async (id) => { await FileConfigApi.updateFileConfigMaster(id) message.success(t('common.updateSuccess')) await getList() - } catch {} + } catch { } } /** 测试按钮操作 */ @@ -205,7 +158,7 @@ const handleTest = async (id) => { try { const response = await FileConfigApi.testFileConfig(id) message.alert('测试通过，上传文件成功！访问地址：' + response) - } catch {} + } catch { } } /** 初始化 **/ diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue index 515f8c996..9f7da9cd7 100644 --- a/src/views/infra/job/index.vue +++ b/src/views/infra/job/index.vue @@ -42,11 +42,10 @@ /> - 搜索 - 重置 + 搜索 + 重置 @@ -54,14 +53,13 @@ 导出 - + 执行日志 @@ -81,7 +79,7 @@ - + diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index acc737c6d..dea773603 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -53,17 +53,16 @@ /> - + 搜索 - + 重置 @@ -73,7 +72,6 @@ @@ -111,17 +109,21 @@ type="primary" @click="openForm('update', scope.row.id)" > + 修改 + - 数据 + 数据 + + 删除 diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue index 90a94b8bf..17e124276 100644 --- a/src/views/system/errorCode/index.vue +++ b/src/views/system/errorCode/index.vue @@ -1,80 +1,42 @@ diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue index 09ca64b5a..295ee3fec 100644 --- a/src/views/system/mail/template/index.vue +++ b/src/views/system/mail/template/index.vue @@ -4,12 +4,7 @@ @@ -18,41 +13,25 @@ - +
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 5ad7a38c5..a0e685861 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -1,60 +1,35 @@ diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue index 81fa22044..2ed6fc0b6 100644 --- a/src/views/system/operatelog/index.vue +++ b/src/views/system/operatelog/index.vue @@ -1,78 +1,40 @@ - +