提交 5fb9b097 编写于 作者: huangwensu's avatar huangwensu

上传环境修改

上级 3b0f0b76
......@@ -22,7 +22,7 @@
import VHeader from './views/layout/header.vue'
import VSlidebar from './views/layout/slidebar.vue'
import VFooter from './views/layout/footer.vue'
import { base64decode, isNotEmptyUtils, getUrlParamsMap } from "./utils/utils.js"
import { base64decode, isNotEmptyUtils, getUrlParamsMap, ssoLogin } from "./utils/utils.js"
import { mapActions, mapGetters } from 'vuex'
import { getLoginUrl, getInnerLoginUrl } from './utils/index.js'
let vm = null
......@@ -62,9 +62,10 @@ export default {
let paramStr = href.substring(offset + 1, href.length)
let pars = base64decode(paramStr)
let paramMap = getUrlParamsMap(pars, "&")
if (isNotEmptyUtils(paramMap["token"])) {
if (isNotEmptyUtils(paramMap["token"]) && isNotEmptyUtils(paramMap["ssoOrigin"])) {
vm.token = paramMap["token"]
localStorage.setItem('storageToken', vm.token)
ssoLogin(href, paramMap)
//vm.$router.push({ path: 'home' })
} else {
if(!localStorage.getItem('storageToken')) {
......
......@@ -34,8 +34,8 @@ export const envConfig = {
uat: {
baseUrl: 'https://uat-sc.yunqueyi.com',
qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://videos.yunqueyi.com", // 视频
qiniuImgUrl: "https://file.yunqueyi.com",
qiniuResourceUrl: "https://video.yunqueyi.com", // 视频
qiniuImgUrl: "https://files.yunqueyi.com",
loginUrl: 'https://uat.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://uat.yunqueyi.com/pica_index.html'
......@@ -43,8 +43,8 @@ export const envConfig = {
pro: {
baseUrl: 'https://sc.yunqueyi.com',
qiniuFileUrl: "https://sc.yunqueyi.com/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://videos.yunqueyi.com",
qiniuImgUrl: "https://file.yunqueyi.com",
qiniuResourceUrl: "https://video.yunqueyi.com",
qiniuImgUrl: "https://files.yunqueyi.com",
loginUrl: 'https://yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
yuequeyiIndexUrl: 'https://www.yunqueyi.com/pica_index.html'
......
......@@ -440,7 +440,7 @@ export const ssoLogin = (href, paramMap) => {
}
}
//获取用户系统信息
initEnvironment();
// initEnvironment();
}
};
......
......@@ -94,7 +94,6 @@ export default {
url = forwardData.picapMenuModels[0].picapSecondMenus[0].picapThirdMenus[0].url;
}
}
let param = "token=" + localStorage.getItem("storageToken") + "&ssoOrigin=" + localStorage.getItem("ssoOrigin") + "&system_type=" + obj.id;
window.location.href = obj.domainName + url + "?" + base64encode(param);
}, function (error) {
......
......@@ -340,9 +340,9 @@ export default {
// 新增问卷
addQuestion() {
vm.discussEditVisible = true
vm.$nextTick(() => {
if (vm.$refs.questionForm !== undefined) {
vm.$refs.questionForm.resetFields();
})
}
vm.questionEditList = Object.assign({},{
id: '',
showType: 1,
......@@ -364,9 +364,9 @@ export default {
},
// 编辑
editQuestion(row) {
vm.$nextTick(() => {
if (vm.$refs.questionForm !== undefined) {
vm.$refs.questionForm.resetFields();
})
}
vm.discussEditVisible = true
vm.excelFileName = ''
vm.fileName = ''
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册