diff --git a/config/dev.env.js b/config/dev.env.js
index 1e22973ae71e949faa15f7a8ab392786918fb22d..6e155210068758a3a584917f5f10b281b8ecb6ed 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -3,5 +3,6 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  BASE_URL: '"/rsbi/"'
 })
diff --git a/config/index.js b/config/index.js
index 7493d6375072c97a7de2be89c6afd27c432b3f5c..86bf2a7d2946861b567e93cad5f922497341a1a8 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,11 +11,11 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      "/": {
+      "/rsbi/": {
         target: "http://localhost:8080/",
         // changeOrigin: true,
         // pathRewrite: {
-        //   '^/': '/rsbi-os-4.7/'
+          // '^/api': '/'
         // }
       }
     },
@@ -58,7 +58,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: './',
+    assetsPublicPath: '/',
 
     /**
      * Source Maps
diff --git a/config/prod.env.js b/config/prod.env.js
index a6f997616eff680e4b2d437e7f31de2cadbfa1de..d30ddfcd72b4d7b48ba7ef58c9a3fd4c2ede366b 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,4 +1,5 @@
 'use strict'
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  BASE_URL: '"/rsbi/"'
 }
diff --git a/src/common/biConfig.js b/src/common/biConfig.js
index 8b6450570ae8e802dba1c3394ceccbe328bf21a8..67db366fcf19fc244421ec86e8696bcd5b940273 100644
--- a/src/common/biConfig.js
+++ b/src/common/biConfig.js
@@ -7,8 +7,8 @@
 import $ from 'jquery'
 import { Message } from 'element-ui'
 
-const baseUrl = 'http://localhost:8080/';
-//const baseUrl = "http://112.124.13.251:8081/";
+const baseUrl = process.env.BASE_URL;
+// const baseUrl = "http://localhost:8080";
 
 export {
 	baseUrl
diff --git a/src/view/Login.vue b/src/view/Login.vue
index 5d128cd7dd02c9ea99fc7026e237a6d07dd69933..9a437df3c21608dc1bfb271cec8d2b8c2779e0ad 100644
--- a/src/view/Login.vue
+++ b/src/view/Login.vue
@@ -77,6 +77,9 @@
 				this.$refs[formName].validate(async (valid) => {
 					if (valid) {
 						ts.fullscreenLoading = true;
+						// console.log(baseUrl)
+						// debugger;
+
 						$.ajax({
 							type:"POST",
 							data:{userName:this.loginForm.username, password:this.loginForm.password},
@@ -96,7 +99,9 @@
 									});
 								}
 							},
-							error:function(){
+							error:function(e){
+								console.error(e.statusText);
+
 								ts.fullscreenLoading = false;
 								ts.$notify.error({
 										title: '网络错误',
diff --git a/src/view/bireport/ReportDesign.vue b/src/view/bireport/ReportDesign.vue
index 9ec0af37781a86c1806b9d46ef2269b15294203f..bc09ccadbfa7b1fde12878fd69a98d24224407d4 100644
--- a/src/view/bireport/ReportDesign.vue
+++ b/src/view/bireport/ReportDesign.vue
@@ -149,10 +149,12 @@
 							}
 						});
 					}
+					// console.log(baseUrl+'model/treeCube.action?cubeId=' + this.pageInfo.selectDs + '&t=' + Math.random());
+					// debugger
 					$('#datasettree').jstree({
 						core: {
 							data: {
-								url: 'model/treeCube.action?cubeId=' + this.pageInfo.selectDs + '&t=' + Math.random()
+								url: baseUrl+'model/treeCube.action?cubeId=' + this.pageInfo.selectDs + '&t=' + Math.random()
 							},
 							check_callback: false
 						},
diff --git a/src/view/model/DsetColModify.vue b/src/view/model/DsetColModify.vue
index 9160735a4deb934f796bf77eefe6b604ae247527..1df380ae9f8e615d23e4b3792d91348911e36de3 100644
--- a/src/view/model/DsetColModify.vue
+++ b/src/view/model/DsetColModify.vue
@@ -60,6 +60,8 @@ export default {
           value:"Date",label:"Date"
         },{
           value:"Datetime",label:"Datetime"
+        },{
+          value:"Decimal",label:"Decimal"
         }]
       }
     }
diff --git a/src/view/model/DsourceAdd.vue b/src/view/model/DsourceAdd.vue
index 62292e88adc5ce45e639e4f76ed7f2badc48a107..c813f5d7bc851f698f55454deef6e4ba41701360 100644
--- a/src/view/model/DsourceAdd.vue
+++ b/src/view/model/DsourceAdd.vue
@@ -106,6 +106,7 @@ export default {
           { label: "PostgreSQL", value: "postgresql" },
           { label: "Hive", value: "hive" },
           { label: "Kylin", value: "kylin" },
+          { label: "Clickhouse", value: "clickhouse" },
         ],
       },
     };
diff --git a/src/view/portal/LayoutLeft.vue b/src/view/portal/LayoutLeft.vue
index 1345b62c95085caf01a72a5236802f4a2fb8dc10..fa5bd8c1347c365229fbbbfc9836f0f0677265dd 100644
--- a/src/view/portal/LayoutLeft.vue
+++ b/src/view/portal/LayoutLeft.vue
@@ -283,10 +283,12 @@ export default {
                     }
                 });
             }
+            // console.log(baseUrl+'model/treeCube.action?cubeId=' + cubeId + '&t=' + Math.random());
+            // debugger
             $('#datasettree').jstree({
                 core: {
                     data: {
-                        url: 'model/treeCube.action?cubeId=' + cubeId + '&t=' + Math.random()
+                        url: baseUrl+'model/treeCube.action?cubeId=' + cubeId + '&t=' + Math.random()
                     },
                     check_callback: false
                 },