diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 9439a1d..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - // 使用 IntelliSense 了解相关属性。 - // 悬停以查看现有属性的描述。 - // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - - { - "type": "node-terminal", - "name": "运行脚本: dev", - "request": "launch", - "command": "npm run dev", - "cwd": "${workspaceFolder}" - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 0ae29b4..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "workbench.colorCustomizations": { - "activityBar.background": "#46260E", - "titleBar.activeBackground": "#613514", - "titleBar.activeForeground": "#FDF9F6" - } -} \ No newline at end of file diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 47b91c4..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/api/http.ts b/src/api/http.ts index 90af107..c78cadd 100644 --- a/src/api/http.ts +++ b/src/api/http.ts @@ -11,7 +11,7 @@ type TAxiosOption = { //记得修改上传路径/api/common/upload const baseURL = 'http://yfyd.hschool.com.cn' // 设置基础URL前缀 //const baseURL="http://127.0.0.1"; - + // 导出baseURL,使其可以在其他页面使用 export { baseURL }; diff --git a/src/views/month_evaluation/examine.vue b/src/views/month_evaluation/examine.vue index 8c0ed0f..0b609a9 100644 --- a/src/views/month_evaluation/examine.vue +++ b/src/views/month_evaluation/examine.vue @@ -43,7 +43,7 @@ - + 查询 重置 @@ -114,8 +114,8 @@ - 查询 - 重置 + 查询 + 重置 diff --git a/src/views/season_evaluation/examine.vue b/src/views/season_evaluation/examine.vue index 4111226..ad0089e 100644 --- a/src/views/season_evaluation/examine.vue +++ b/src/views/season_evaluation/examine.vue @@ -38,7 +38,7 @@ - + 查询 重置 @@ -108,8 +108,8 @@ - 查询 - 重置 + 查询 + 重置 diff --git a/src/views/system/index.vue b/src/views/system/index.vue index b88128a..46ff2e4 100644 --- a/src/views/system/index.vue +++ b/src/views/system/index.vue @@ -25,8 +25,8 @@ - - + @@ -204,6 +204,8 @@ onMounted(() => { getPartyList(); getAuthList(); }) +const dataSource = ref([]) + const getUserList = () => { userData({group_id: leftId.value, size: page.limit, page: page.current}).then((res) => { console.log(res) @@ -211,6 +213,7 @@ const getUserList = () => { dataSource.value = res.data.data; page.total = res.data.count; } else { + dataSource.value = []; layer.msg(res.msg, {icon: 2}) } }) @@ -263,14 +266,14 @@ const data = ref([]) const selectedKey = ref('') const isFold = ref(false) const searchQuery = ref({ - username: '', + nickname: '', mobile: '', gender: 0 }) function toReset() { searchQuery.value = { - username: '', + nickname: '', mobile: '', gender: 0 } @@ -298,7 +301,6 @@ const columns = ref([ const change = (page: any) => { } -const dataSource = ref([]) const model11 = reactive({ username: '', diff --git a/src/views/year_evaluation/examine.vue b/src/views/year_evaluation/examine.vue index c0a8526..705c7dc 100644 --- a/src/views/year_evaluation/examine.vue +++ b/src/views/year_evaluation/examine.vue @@ -29,7 +29,7 @@ - + 查询 重置 @@ -86,7 +86,7 @@ - + @@ -101,8 +101,8 @@ - 查询 - 重置 + 查询 + 重置 @@ -110,9 +110,10 @@ - - - + + + - - - diff --git a/vite.config.ts b/vite.config.ts index 93d7703..8edcdb1 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ server: { proxy: { '/api': { - target: 'http://127.0.0.1/', + target: 'http://yfyd.hschool.com.cn', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }