diff --git a/WebSite/.env.development b/WebSite/.env.development index 7310cb2a4062ac7ca3ffc3e90f56c1b050c33e9d..f27afd447cd12c91a7dd681ea218a113a262f64f 100644 --- a/WebSite/.env.development +++ b/WebSite/.env.development @@ -1,2 +1,2 @@ -NODE_ENV = jk +NODE_ENV = development VUE_APP_BASE_API = '/api' diff --git a/WebSite/src/core/base/Realm.js b/WebSite/src/core/base/Realm.js index 8b417197116254930dc75538f26ceeca1195d6c1..264a170577b1eba72582be13bb30cb80514c70e0 100644 --- a/WebSite/src/core/base/Realm.js +++ b/WebSite/src/core/base/Realm.js @@ -36,32 +36,7 @@ class Realm { username: 'admin', enabled: 'YES', isInitial: 'NO', - users: [ - // { - // id: 'ProjectRegistry', - // name: '椤圭洰搴�' - // }, - // { - // id: 'deptBZ', - // name: '閮ㄩ棬棰勭畻缂栧埗' - // }, - // { - // id: 'deptSP', - // name: '閮ㄩ棬棰勭畻瀹℃壒' - // }, - // // { - // // id: 'search', - // // name: '鏌ヨ' - // // }, - // { - // id: 'base', - // name: '鍩虹璁剧疆' - // }, - // { - // id: 'merits', - // name: '缁╂晥绠$悊' - // } - ], + users: [], role: 'admin', token: authenticationToken }); @@ -110,7 +85,6 @@ class Realm { static async beforeLogout() { try { const res = await ProjectLibrary.loginOut(); - console.warn('鎺ュ彛杩斿洖', res); res.login = res.login || res.data[0]; return res; } catch (err) { diff --git a/WebSite/src/views/login/components/SelectUser.vue b/WebSite/src/views/login/components/SelectUser.vue index 6cc621fed3407e1ae15311adb4cd00c07dec30e4..c4532d1970236140c989ebaf18851c67ee4c9673 100644 --- a/WebSite/src/views/login/components/SelectUser.vue +++ b/WebSite/src/views/login/components/SelectUser.vue @@ -15,8 +15,8 @@ ? 'Please select a user:' : 'No user can be selected.' }}</span> --> + <!-- <span class="big" v-if="env == 'jk'">涓婃捣鍋ュ悍鍖诲闄�</span> --> <span class="big" v-if="env == 'jk'">涓婃捣鍋ュ悍鍖诲闄�</span> - <!-- <span class="big" v-if="env == 'jk'">涓婃捣绔嬩俊浼氳閲戣瀺瀛﹂櫌</span> --> <span class="big" v-if="env == 'lg'">涓婃捣鐞嗗伐澶у</span> <span class="big" v-if="env == 'sd'">涓婃捣澶у</span> <!-- <span class="big" v-if="env == 'sd'">娴峰ぉ淇℃伅</span> --> @@ -66,7 +66,7 @@ export default { { deep: true } ); onMounted(() => { - console.log(process.env.NODE_ENV,'test1') + console.log(process.env.NODE_ENV, 'test1'); props.userList.forEach(u => { transitionList.push({ ...u, diff --git a/WebSite/src/views/yo-dept-bz/second/SecondIncomeApply/components/List.vue b/WebSite/src/views/yo-dept-bz/second/SecondIncomeApply/components/List.vue index 13f6af2a4e3d304904b542d42997f39a34dd169c..7a74be1b3ba047b34603161e0e30d037c75daf16 100644 --- a/WebSite/src/views/yo-dept-bz/second/SecondIncomeApply/components/List.vue +++ b/WebSite/src/views/yo-dept-bz/second/SecondIncomeApply/components/List.vue @@ -90,11 +90,11 @@ export default { primaryKey: 'id' }); const getIncomeList = () => { - Api.getInComeList({ + Api.getqueryInComePlanPageByCurrentUserDept({ pageIndex: data.pageNO, pageSize: data.pageSize, departmentCode: '', - planType: 'ERSHANG', + // planType: 'ERSHANG', year: data.year, id: null, inComePlanType: 'ERSHANG'