Authored by xuhongyun

Merge branch 'test' into gray

@@ -109,6 +109,7 @@ $(document).on("click", "#saveAllInfo", function() { @@ -109,6 +109,7 @@ $(document).on("click", "#saveAllInfo", function() {
109 res = res; 109 res = res;
110 if (res.code == '200') { 110 if (res.code == '200') {
111 e.$tip(res.message, function() { 111 e.$tip(res.message, function() {
  112 + $("#modelTry-save").click(); //To Do
112 history.go(-1); 113 history.go(-1);
113 }, 'growl-success'); 114 }, 'growl-success');
114 } else { 115 } else {
@@ -12,7 +12,7 @@ module.exports = { @@ -12,7 +12,7 @@ module.exports = {
12 alias: { 12 alias: {
13 jquery: path.resolve(baseName, './jquery.js'), 13 jquery: path.resolve(baseName, './jquery.js'),
14 vue: path.resolve(baseName, './vue.min.js'), 14 vue: path.resolve(baseName, './vue.min.js'),
15 - echarts:path.resolve(baseName, './echarts2.js'), 15 + echarts:path.resolve(baseName, './echarts.simple.min.js'),
16 util:path.resolve(baseName, './util.js') 16 util:path.resolve(baseName, './util.js')
17 }, 17 },
18 extensions: ['', '.js', '.vue', '.scss'] 18 extensions: ['', '.js', '.vue', '.scss']