diff --git a/frontend/src/modules/attractMgt/views/ChannelDetail.vue b/frontend/src/modules/attractMgt/views/ChannelDetail.vue
index 10077b1..8b3273f 100644
--- a/frontend/src/modules/attractMgt/views/ChannelDetail.vue
+++ b/frontend/src/modules/attractMgt/views/ChannelDetail.vue
@@ -210,29 +210,30 @@ export default {
custTyNm: '',
}
},
- props: {
- userSeq: {
- type: String,
- default: "",
- },
- },
+ // props: {
+ // userSeq: {
+ // type: String,
+ // default: "",
+ // },
+ // },
components: {
channelMgtApi,
AdminNmPop,
},
created() {
this.getExcelHeader();
- if(this.$route.params.userSeq != null){ //리스트에서 상세 호출
- this.loginId = this.$route.params.loginId;
+ if(this.$route.params.userSeq != null){ //리스트에서 상세 호출
+ //this.loginId = this.$route.params.loginId;
this.$store.commit('dataStore/updateUserSeq', this.$route.params.userSeq);
- this.$store.commit('dataStore/updateUserId', this.$route.params.userId);
+ //this.$store.commit('dataStore/updateUserId', this.$route.params.userId);
this.channelDetail(this.$route.params.userSeq);
- }else{
- var userSeq = this.$store.getters["dataStore/getUserSeq"];
- var userId = this.$store.getters["dataStore/getUserId"];
- this.loginId = userId;
- this.channelDetail(userSeq);
- }
+ }
+ // else{
+ // var userSeq = this.$store.getters["dataStore/getUserSeq"];
+ // var userId = this.$store.getters["dataStore/getUserId"];
+ // this.loginId = userId;
+ // this.channelDetail(userSeq);
+ // }
},
destroyed() {
this.$store.commit('dataStore/updateUserSeq', '');
@@ -356,6 +357,9 @@ export default {
}
}, // end of getExcelDataDown
goChannelList() {
+ // this.row.userSeq = this.$route.params.userSeq;
+
+ // alert(this.row.userSeq);
this.$router.push({name: 'channelList'});
},
searchIDPopOpen: function () {
diff --git a/frontend/src/modules/calculate/views/CalcList.vue b/frontend/src/modules/calculate/views/CalcList.vue
index 0d57455..48918d0 100644
--- a/frontend/src/modules/calculate/views/CalcList.vue
+++ b/frontend/src/modules/calculate/views/CalcList.vue
@@ -25,7 +25,7 @@
:picker-options="startDateOptions"
>
- ~
+ ~
-
+
diff --git a/frontend/src/router.js b/frontend/src/router.js
index ba931a4..33a4997 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -97,22 +97,61 @@ router.beforeEach((to, from, next) => {
}
}
+
+
if((nextUrl == '/custMgt/memberList') || (nextUrl == '/custMgt/memberDetail')
|| (nextUrl == '/custMgt/subsDetail') || (nextUrl == '/custMgt/memberAdminDetail')){
- for(var i=0; i {
}
return next(rootUrl);
}
+
}
}
diff --git a/frontend/src/store/dataStore.js b/frontend/src/store/dataStore.js
index 80b2413..5bc4d26 100644
--- a/frontend/src/store/dataStore.js
+++ b/frontend/src/store/dataStore.js
@@ -16,6 +16,7 @@ const mutations = {
},
updateUserSeq: (state, data) => {
state.userSeq = data;
+ console.log('mutate: '+state.userSeq);
},
updateUserId: (state, data) => {
state.userId = data;