Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-02-01 5562436e2898f5d013a2ccd7138d4dfe0888c5f5

Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

 .angular-cli.json

@@ -23,7 +23,7 @@
        "scripts": [
            "../node_modules/@antv/g2/dist/g2.min.js",
            "../node_modules/@antv/data-set/dist/data-set.min.js",
            "../node_modules/@antv/g2-plugin-slider/dist/g2-plugin-slider.min.js"
            "../node_modules/@antv/g2-plugin-slider/dist/g-2.0.0.min.js"
        ],
        "environmentSource": "environments/environment.ts",
        "environments": {

 package.json

@@ -18,6 +18,8 @@
    "start": "ng serve --host=0.0.0.0",
    "serve:hmr": "ng serve -o --hmr -e=hmr",
    "build": "ng build --prod --build-optimizer",
    "build-dev": "ng build --build-optimizer --aot --dev",
    "build-prod": "ng build --build-optimizer --prod",
    "analyze": "ng build --prod --build-optimizer --stats-json",
    "lint": "run-s lint:ts lint:style",
    "lint:ts": "ng lint",

 src/environments/environment.prod.ts

@@ -4,5 +4,5 @@
    production: true,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL:`http://47.96.171.62:8080/screen_api_v2/`
    SERVER_BASH_URL:`http://47.96.15.25:8080/screen_api_v2/`
};