diff --git a/public/doc/ExtGantt/Ext甘特图.html b/public/doc/ExtGantt/Ext甘特图.html index 5e463a74..9c9dbcf9 100644 --- a/public/doc/ExtGantt/Ext甘特图.html +++ b/public/doc/ExtGantt/Ext甘特图.html @@ -334,9 +334,6 @@ editor: { type: "textbox", }, - style:{ - display:'hidden' - } }; columns.push(idColumn); var stringColumn = { diff --git a/public/js/config.js b/public/js/config.js index 9210af6b..93f5448a 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.local_test +var PROJECT_TYPE = PROJECT.online_zjsj var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index c06e5588..672b7333 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,11 +40,11 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 + // axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 diff --git a/src/store/index.js b/src/store/index.js index 230888e9..64f0bb0c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -12,6 +12,7 @@ export default new Vuex.Store({ createPersistedState({ storage: window.sessionStorage, reducer(val) { + console.log('---------存进去',val) return { userInfo: val.userInfo, currentUrl: val.currentUrl, diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue index c784ed35..df1b4443 100644 --- a/src/views/home/login_v1.vue +++ b/src/views/home/login_v1.vue @@ -541,10 +541,9 @@ export default { }); }, parseLoginData(data) { - // console.log("登录进来的data", data); - // if( this.projectType == "zjsj"){ - // localStorage.setItem('sn',data.sn) - // } + if( this.projectType == "zjsj"){ + this.$store.commit("setProjectSn", data.sn); + } window._paq.push(["trackEvent", "点击", "登录", "登录账号"]); this.$message.success(this.$t("message.login.login_success_msg")); //登录成功! this.$http.defaults.headers.common["Authorization"] = @@ -622,7 +621,7 @@ export default { case 6: // 中建四局 if (this.projectType == "zjsj"){ - console.log('是这里吗') + console.log('是这里吗',data) //看看项目看板内有没有菜单 let arr = data.menuAuthority.moduleList let arr2=[]