"redis/Jenkinsfile" did not exist on "b5b9ce7456edde90404e484ca5ae4b2af019dea1"
Commit 4de6c1b1 authored by 刘殿昕's avatar 刘殿昕

Merge branch 'dev'

parents c66233bb 6f02be43
......@@ -11,21 +11,21 @@ module.exports = {
assetsPublicPath: "/apaas/ui/",
proxyTable: {
"/apaas": {
target: "https://apaas.test.wodcloud.com/apaas/",
target: "https://apaas3.wodcloud.com/apaas/",
changeOrigin: true,
pathRewrite: {
"^/apaas": ""
}
},
"/awecloud": {
target: "https://apaas.test.wodcloud.com/awecloud/",
target: "https://apaas3.wodcloud.com/awecloud/",
changeOrigin: true,
pathRewrite: {
"^/awecloud": ""
}
},
"/vmap": {
target: "https://apaas.test.wodcloud.com/vmap/",
target: "https://apaas3.wodcloud.com/vmap/",
changeOrigin: true,
pathRewrite: {
"^/vmap": ""
......
......@@ -353,6 +353,7 @@ import { mapGetters, mapState } from "vuex";
import { getCookie } from "../../services/cookie";
var echarts = require("echarts");
const state = window.serviceConfig.state;
const cloudServiceRoot = window.serviceConfig.cloudServiceRoot;
export default {
data() {
return {
......@@ -1056,7 +1057,9 @@ export default {
...mapGetters(["level"]),
...mapState(["userInfo"])
},
created() {},
created() {
this.manage_arr[this.manage_arr.length - 1].url = cloudServiceRoot;
},
mounted() {
console.log(this.level);
if (this.userInfo) {
......
window.serviceConfig = {
gisServiceRoot: 'https://apaasgis.wodcloud.com',
state: "needLogin" // needLogin / notNeedLogin
state: "needLogin", // needLogin / notNeedLogin
cloudServiceRoot: 'https://cloud4.wodcloud.com/awecloud/login/#/',
};
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment