diff --git a/src/axios.js b/src/axios.js index cff0fda..08eb62e 100644 --- a/src/axios.js +++ b/src/axios.js @@ -8,7 +8,8 @@ export var getHeader = () => { return { 'Content-Type': 'application/json', - 'Authorization': 'Bearer ' + localStorage.getItem("accessToken") || localStorage.accessToken + //'Authorization': 'Bearer ' + localStorage.getItem("accessToken") || localStorage.accessToken + 'Authorization': 'Bearer ' + sessionStorage.getItem("accessToken") || sessionStorage.accessToken }; } @@ -21,7 +22,7 @@ var myax= new axios.create({ myax.interceptors.request.use( config => { - config.headers["Authorization"] = "Bearer " + localStorage.getItem("accessToken"); + config.headers["Authorization"] = "Bearer " + sessionStorage.getItem("accessToken"); return config; }, error => { @@ -29,6 +30,17 @@ myax.interceptors.request.use( } ); +myax.interceptors.request.use( + config => { + config.headers["Authorization"] = "Bearer " + sessionStorage.getItem("accessToken"); + return config; + }, + error => { + Promise.reject(error); + } +); + + export default myax; diff --git a/src/layouts/components/navbar/components/ProfileDropDown.vue b/src/layouts/components/navbar/components/ProfileDropDown.vue index bb82ec5..192fb6b 100644 --- a/src/layouts/components/navbar/components/ProfileDropDown.vue +++ b/src/layouts/components/navbar/components/ProfileDropDown.vue @@ -47,14 +47,14 @@ // }, username(){ const data = localStorage.getItem('user') - console.log(data,'dayaaaaaaa'); + // console.log(data,'dayaaaaaaa'); } }, methods: { logout() { - if (localStorage.getItem('accessToken')) { - localStorage.removeItem('user'); - localStorage.removeItem('accessToken'); + if (sessionStorage.getItem('accessToken')) { + sessionStorage.removeItem('user'); + sessionStorage.removeItem('accessToken'); } this.$router.push('/auth/login').catch(() => { }); diff --git a/src/main.js b/src/main.js index ac0206f..58770b7 100644 --- a/src/main.js +++ b/src/main.js @@ -9,8 +9,9 @@ import Vue from 'vue' -import App from './App.vue' import Antd from 'ant-design-vue'; +import App from './App.vue' + import 'ant-design-vue/dist/antd.less'; // Vuesax Component Framework diff --git a/src/router.js b/src/router.js index 6220b1d..aea703d 100644 --- a/src/router.js +++ b/src/router.js @@ -103,11 +103,12 @@ router.afterEach(() => { }) router.beforeEach((to, from, next) => { - return next(); - let isLogin = localStorage.getItem('accessToken'); + // return next(); + let isLogin = sessionStorage.getItem('accessToken'); console.log("to.path ==> ", to.path); if ( ( + to.path === "/register/form" || to.path === "/auth/login" || to.path === "/auth/register" || to.path === "/pages/error-404" || diff --git a/src/store/auth/moduleAuthActions.js b/src/store/auth/moduleAuthActions.js index 2a66126..b2d248b 100644 --- a/src/store/auth/moduleAuthActions.js +++ b/src/store/auth/moduleAuthActions.js @@ -93,7 +93,8 @@ export default { .then(response => { if (response.data) { // Navigate User to homepage - localStorage.setItem("accessToken", response.data.api_token) + sessionStorage.setItem("accessToken", response.data.api_token); + //localStorage.setItem("accessToken", response.data.api_token) // Set accessToken // Update user details commit('UPDATE_USER_INFO', response.data, {root: true}) @@ -390,7 +391,8 @@ export default { .then(response => { if (response.data) { // Navigate User to homepage - localStorage.setItem("accessToken", response.data.api_token) + sessionStorage.setItem("accessToken", response.data.api_token); + //localStorage.setItem("accessToken", response.data.api_token) // Set accessToken // Update user details @@ -428,7 +430,8 @@ export default { router.push(router.currentRoute.query.to || '/') // Update data in localStorage - localStorage.setItem("accessToken", response.data.accessToken) + sessionStorage.setItem("accessToken", response.data.accessToken); + //localStorage.setItem("accessToken", response.data.accessToken) commit('UPDATE_USER_INFO', response.data.userData, {root: true}) resolve(response) diff --git a/src/views/DashboardAnalytics.vue b/src/views/DashboardAnalytics.vue index 56a45b8..cf84e7a 100644 --- a/src/views/DashboardAnalytics.vue +++ b/src/views/DashboardAnalytics.vue @@ -60,7 +60,7 @@
- + { - this.model=res.data; - this.personelPerMonth=res.data.personnel; - }).catch((error)=>{ - console.log(error); - }); + //console.log('111111111',axios.defaults.headers); + try { + await axios.get('dashboard') + .then((res)=>{ + //console.log('dsfsdfsdfds'); + this.model=res.data; + this.personelPerMonth=res.data.personnel; + }).catch((error)=>{ + //console.log('dsafsdfsdfsdf'); + console.log(error); + }); + } + catch (error) + { + // console.log('gggggggg'); + } }, } diff --git a/src/views/apps/product/ProductList.vue b/src/views/apps/product/ProductList.vue index f0c7327..afff8ab 100644 --- a/src/views/apps/product/ProductList.vue +++ b/src/views/apps/product/ProductList.vue @@ -93,7 +93,7 @@ title="از حذف این تنوع مطمئنید؟" ok-text="بله" - cancel-text="بی خیال" + cancel-text="انصراف" style="z-index: 20000000">
diff --git a/src/views/personel/Personel.vue b/src/views/personel/Personel.vue index 0b4b470..9c47a0d 100644 --- a/src/views/personel/Personel.vue +++ b/src/views/personel/Personel.vue @@ -257,41 +257,41 @@ - نوع 1 + نوع 1 - نوع 2 + نوع 2 - نوع 3 + نوع 3 - نوع 4 + نوع 4 - نوع 5 + نوع 5 - نوع 6 + نوع 6 - نوع 7 + نوع 7 - نوع 8 + نوع 8 - نوع 9 + نوع 9 - نوع 10 + نوع 10 - چاپ + چاپ
diff --git a/src/views/proposal/Proposal.vue b/src/views/proposal/Proposal.vue index 020f1fc..aa52e62 100644 --- a/src/views/proposal/Proposal.vue +++ b/src/views/proposal/Proposal.vue @@ -357,43 +357,56 @@
تلفن ثابت : {{ personalInformation.phone }}
شماره بیمه : {{ personalInformation.name }}
تلفن ضروری : {{ personalInformation.phone_emergency }}
-
نام طرف مرتبط : {{ personalInformation.phone_emergency_related }}
-
نسبت طرف :
+
نام فرد مرتبط : {{ personalInformation.phone_emergency_related }}
+
نسبت فرد :
+
+ +
-
-
مقطع : {{ personalDetails[0].university }}
-
دانشگاه : {{ personalDetails[0].university }}
-
رشته تحصیلی: {{ personalDetails[0].title }}
-
گرایش: {{ personalDetails[0].trend }}
-
سال شروع: {{ personalDetails[0].start_at }}
-
سال خاتمه: {{ personalDetails[0].end_at }}
+
+
مقطع : {{ personalDetails.pro[0].university }}
+
دانشگاه : {{ personalDetails.pro[0].university }}
+
رشته تحصیلی: {{ personalDetails.pro[0].title }}
+
گرایش: {{ personalDetails.pro[0].trend }}
+
سال شروع: {{ personalDetails.pro[0].start_at }}
+
سال خاتمه: {{ personalDetails.pro[0].end_at }}

- +
- -
-
نام سازمان : {{ personalDetails[2].university }}
-
عنوان شغل : {{ personalDetails[2].title }}
-
سال شروع : {{ personalDetails[2].start_at }}
-
سال خاتمه : {{ personalDetails[2].end_at }}
+ @@ -512,6 +525,7 @@ .then((res)=>{ this.personalInformation=record; this.personalDetails=res.data; + console.log(this.personalDetails); this.showInformationModal=true; }).catch((error)=>{ this.$message.error('خطا در دریافت اطلاعات'); @@ -522,7 +536,7 @@ this.$confirm({ title: 'آیا مطمئن به استخدام هستید ؟', content: 'در صورتی که گزینه بله را انتخاب کنید کد پرسنلی برای فرد درخواست کننده در سیستم اختصاص خواهد یافت', - cancelText:'بی خیال ', + cancelText:'انصراف', okText:'بله', onOk() { diff --git a/src/views/register/Register.vue b/src/views/register/Register.vue index 9a1bb3b..cb9d6f0 100644 --- a/src/views/register/Register.vue +++ b/src/views/register/Register.vue @@ -31,7 +31,19 @@
- + + + + + + + + + + + + +
افزودن ردیف @@ -236,7 +248,7 @@
- + @@ -270,11 +282,53 @@ - +
+ + + + +
+
نام :{{ item.name }}
+
نسبت : {{ item.relation }}
+
+
+
مقطع :{{ item.edu.title }}
+
رشته تحصیلی : {{ item.edu_title }}
+
+
+
شغل : {{ item.job }}
+
+ +
+ + حذف + + + + مشاهده و ویرایش + + +
+ + + + + + افزودن اطلاعات خانوادگی + + + +
@@ -446,6 +500,76 @@
+ + + + + + + + + + + + {{ item.title }} + + + + + + + + + + + + + @@ -492,6 +616,8 @@ + + @@ -520,7 +646,6 @@ - @@ -528,7 +653,7 @@ - +
@@ -583,12 +708,14 @@ current: 0, from: this.$form.createForm(this, {name: 'coordinated'}), formEdu: this.$form.createForm(this, {name: 'coordinated'}), + formFamily: this.$form.createForm(this, {name: 'coordinated'}), formEducational: this.$form.createForm(this, {name: 'coordinated'}), formWork: this.$form.createForm(this, {name: 'coordinated'}), formFirst: this.$form.createForm(this, {name: 'coordinated'}), city:[], job:[], edu:[], + family:[], work:[], jobs:[{city:null,job:null}], //model:[], @@ -596,6 +723,7 @@ birth_day:'', has_instructor: '-1', visibleEdu: false, + visibleFamily: false, visibleEducational: false, visibleWork: false, visibleAccept: false, @@ -631,7 +759,8 @@ { this.formFirst.validateFields(async(err, values) => { if (!err) { - this.current++; + //this.current++; + console.log(values,'first') } }); @@ -645,12 +774,13 @@ this.loading = true console.log(values,'values') values.model = this.formFirst.getFieldsValue(); - values.birth_date = this.birth_day - values.work = this.work - values.training = this.educational - values.academic = this.edu + values.birth_date = this.birth_day; + values.work = this.work; + values.training = this.educational; + values.academic = this.edu; + values.family= this.family; await axios.post('register/save', values) - this.$ntSet() + this.$ntSet(); // this.from.resetFields() this.current++ }catch (e) { @@ -694,6 +824,11 @@ this.editMode = false this.formEdu.resetFields() }, + openModalFamily(){ + this.visibleFamily = true + this.editMode = false + this.formFamily.resetFields(); + }, openModalEducational(){ this.visibleEducational = true this.editMode = false @@ -704,6 +839,13 @@ this.editMode = false this.formWork.resetFields() }, + openModalFamilyModeEDit(item){ + //console.log(item,'item') + this.visibleFamily = true + this.editMode = true + this.tempRow = item + this.formFamily.setFieldsValue(item) + }, openModalEduModeEDit(item){ console.log(item,'item') this.visibleEdu = true @@ -726,12 +868,46 @@ cancelEdu(){ this.visibleEdu = false }, + cancelFamily(){ + this.visibleFamily = false + }, cancelEducational(){ this.visibleEducational = false }, cancelWork(){ this.visibleWork = false }, + createFamily(e){ + e.preventDefault(); + this.formFamily.validateFields(async(err, values) => { + if (!err) { + try{ + if(this.find_grade) + { + values.edu = this.find_grade; + values.edu_level=this.find_grade.level; + } + + if(this.editMode){ + const find = this.family.findIndex(item=> item.id == this.tempRow.id) + Object.assign(this.family[find],values); + this.visibleFamily = false; + }else{ + values.id = this.id + this.family.push(values) + this.id +=1 + this.formFamily.resetFields() + this.visibleFamily = false + } + }catch (e) { + this.$ntSetError() + throw e + }finally { + + } + } + }); + }, createEdu(e){ e.preventDefault(); this.formEdu.validateFields(async(err, values) => { @@ -815,6 +991,11 @@ this.is_work_check = e.target.checked if(this.is_work_check) this.formWork.resetFields('end') }, + removeFamily(item){ + console.log(item); + const index = this.family.indexOf(item) + this.family.splice(index,1) + }, removeEdu(item){ const index = this.edu.indexOf(item) this.edu.splice(index,1)