优化

src/api/modelLibrary.js

@@ -6,6 +6,7 @@ const saveVehicle = basePart + '/vehicle/saveVehicle'; // 动力学配置保存
 const shareVehicle = basePart + '/vehicle/shareVehicle'; // 动力学配置分享详情
 const delVehicleById = basePart + '/vehicle/delVehicleById'; // 动力学配置删除详情
 const getVehicleTempTree = basePart + '/vehicleTemp/getVehicleTempTree'; // 动力学配置模板
+const parsePar = basePart + '/vehicle/parsePar'; // 动力学配置-par文件上传
 
 const getCameraList = basePart + '/camera/getCameraList'; // 摄像头-列表查询
 const getCameraInfo = basePart + '/camera/getCameraInfo'; // 摄像头-详情查询
@@ -51,6 +52,7 @@ export default {
     shareVehicle,
     delVehicleById,
     getVehicleTempTree,
+    parsePar,
 
     getCameraList,
     getCameraInfo,

src/components/echarts/lineChartCarsim.vue

@@ -24,6 +24,14 @@ export default {
             },
             type: Array,
         },
+        xName: {
+            default: "",
+            type: String,
+        },
+        yName: {
+            default: "",
+            type: String,
+        },
     },
 
     data() {
@@ -78,13 +86,14 @@ export default {
                             confine: true,
                         },
                         xAxis: {
-                            // name: "t(s)",
+                            name: this.xName,
+                            nameLocation: "end",
                             type: "category",
                             boundaryGap: false,
                             data: [],
                         },
                         yAxis: {
-                            // name: this.yUnit,
+                            name: this.yName,
                         },
                         series: [
                             {
@@ -108,8 +117,8 @@ export default {
                         ],
                         grid: {
                             top: "30px",
-                            left: "30px",
-                            right: "40px",
+                            left: "60px",
+                            right: "108px",
                             bottom: "10%",
                             containLabel: true,
                         },
@@ -186,20 +195,21 @@ export default {
                     confine: true,
                 },
                 xAxis: {
-                    // name: "t(s)",
+                    name: this.xName,
+                    nameLocation: "end",
                     type: "category",
                     boundaryGap: false,
                     data: xData,
                 },
                 yAxis: {
-                    // name: this.yUnit,
+                    name: this.yName,
                 },
                 legend: {},
                 series,
                 grid: {
-                    top: "36px",
-                    left: "30px",
-                    right: "30px",
+                    top: "30px",
+                    left: "60px",
+                    right: "108px",
                     bottom: "10%",
                     containLabel: true,
                 },

src/components/echarts/lineChartCarsimA.vue

@@ -37,6 +37,8 @@ export default {
             tipData: [], //线数据
             showData: [], //展示数据
             charts: "",
+            xName: "油门位置",
+            yName: "低档输出转速(rpm)",
         };
     },
 
@@ -93,11 +95,14 @@ export default {
                             confine: true,
                         },
                         xAxis: {
+                            name: this.xName,
                             type: "category",
                             boundaryGap: false,
                             data: [],
                         },
-                        yAxis: {},
+                        yAxis: {
+                            name: this.yName,
+                        },
                         series: [
                             {
                                 data: [],
@@ -120,8 +125,8 @@ export default {
                         ],
                         grid: {
                             top: "30px",
-                            left: "30px",
-                            right: "40px",
+                            left: "60px",
+                            right: "108px",
                             bottom: "10%",
                             containLabel: true,
                         },
@@ -157,11 +162,14 @@ export default {
                             confine: true,
                         },
                         xAxis: {
+                            name: this.xName,
                             type: "category",
                             boundaryGap: false,
                             data: [],
                         },
-                        yAxis: {},
+                        yAxis: {
+                            name: this.yName,
+                        },
                         series: [
                             {
                                 data: [],
@@ -184,8 +192,8 @@ export default {
                         ],
                         grid: {
                             top: "30px",
-                            left: "30px",
-                            right: "40px",
+                            left: "60px",
+                            right: "108px",
                             bottom: "10%",
                             containLabel: true,
                         },
@@ -272,17 +280,22 @@ export default {
                     confine: true,
                 },
                 xAxis: {
+                    name: this.xName,
                     type: "category",
                     boundaryGap: false,
                     data: xData,
+                    // min: 0,
+                    // max: 1,
+                },
+                yAxis: {
+                    name: this.yName,
                 },
-                yAxis: {},
                 legend: {},
                 series,
                 grid: {
-                    top: "36px",
-                    left: "30px",
-                    right: "30px",
+                    top: "30px",
+                    left: "60px",
+                    right: "108px",
                     bottom: "10%",
                     containLabel: true,
                 },

src/components/echarts/lineChartCarsimB.vue

@@ -24,6 +24,14 @@ export default {
             },
             type: Array,
         },
+        xName: {
+            default: "",
+            type: String,
+        },
+        yName: {
+            default: "",
+            type: String,
+        },
     },
 
     data() {
@@ -78,11 +86,14 @@ export default {
                             confine: true,
                         },
                         xAxis: {
+                            name: this.xName,
                             type: "category",
                             boundaryGap: false,
                             data: [],
                         },
-                        yAxis: {},
+                        yAxis: {
+                            name: this.yName,
+                        },
                         series: [
                             {
                                 data: [],
@@ -105,8 +116,8 @@ export default {
                         ],
                         grid: {
                             top: "30px",
-                            left: "30px",
-                            right: "40px",
+                            left: "60px",
+                            right: "108px",
                             bottom: "10%",
                             containLabel: true,
                         },
@@ -140,7 +151,7 @@ export default {
 
             yData.forEach((i, index) => {
                 series.push({
-                    name: '数据',
+                    name: "数据",
                     data: i,
                     type: "line",
                     smooth: true,
@@ -179,17 +190,20 @@ export default {
                     confine: true,
                 },
                 xAxis: {
+                    name: this.xName,
                     type: "category",
                     boundaryGap: false,
                     data: xData,
                 },
-                yAxis: {},
+                yAxis: {
+                    name: this.yName,
+                },
                 legend: {},
                 series,
                 grid: {
-                    top: "36px",
-                    left: "30px",
-                    right: "30px",
+                    top: "30px",
+                    left: "60px",
+                    right: "108px",
                     bottom: "10%",
                     containLabel: true,
                 },

src/store/index.js

@@ -10,7 +10,8 @@ export default new Vuex.Store({
     // fileHost: 'http://10.12.10.70:8001', // 开发环境需要连开发服务器地址，上线后会用相对地址拼接fileUrl
     // fileHost: 'http://47.94.105.148', // 开发环境需要连开发服务器地址，上线后会用相对地址拼接fileUrl
     // fileHost: 'http://47.94.105.148:81', // 开发环境需要连开发服务器地址，上线后会用相对地址拼接fileUrl
-    fileHost: 'http://47.94.105.148:80', // 开发环境需要连开发服务器地址，上线后会用相对地址拼接fileUrl
+    // fileHost: 'http://47.94.105.148:80', // 开发环境需要连开发服务器地址，上线后会用相对地址拼接fileUrl
+    fileHost: 'http://36.110.106.156:80', // 开发环境需要连开发服务器地址，上线后会用相对地址拼接fileUrl
     fileUrl: '/simulation/resource/common/minio/preview',
     themeColor: '#3397FF',
     id: '', //用户id

src/views/modelLibrary/components/uploadPar.vue

@@ -0,0 +1,233 @@
+<template>
+    <div>
+        <el-upload
+            ref="upload"
+            action=""
+            :before-upload="beforeUpload"
+            :on-change="handleChange"
+            :on-remove="handleRemove"
+            :on-preview="preview"
+            :on-success="success"
+            :on-error="error"
+            :http-request="toUpload"
+            :auto-upload="true"
+            :file-list="fileList"
+            :limit="limit"
+            :on-exceed="handleExceed"
+            :multiple="multiple"
+        >
+            <el-button size="small" type="primary">点击上传</el-button>
+        </el-upload>
+        <!--        <el-button @click="download">下载</el-button>-->
+    </div>
+</template>
+
+<script>
+export default {
+    name: "uploadPar", // 处理par文件
+    props: {
+        // 限制上传的个数
+        limit: {
+            type: Number,
+            default: 1,
+        },
+        // 一组文件传相同的值，保证其为一组
+        objectPath: {
+            type: String,
+            default: "1",
+        },
+        type: {
+            type: String,
+            default: "1",
+        },
+        // 是否需要处理大文件上传
+        needInstance: {
+            type: Boolean,
+            default: false,
+        },
+        multiple: {
+            type: Boolean,
+            default: true,
+        },
+        // 上传url
+        uploadUrl: {
+            type: String,
+            default: "",
+        },
+    },
+    data() {
+        return {
+            fileList: [],
+            attachmentList: [],
+            defaultParam: {},
+        };
+    },
+    methods: {
+        beforeUpload(file) {
+            let arr = ["par"];
+            let i = file.name.lastIndexOf(".");
+
+            if (!arr.includes(file.name.slice(i + 1).toLowerCase())) {
+                this.$message.warning("请上传以par为后缀名的文件");
+                return false;
+            }
+        },
+        handleChange(file, fileList) {
+            this.fileList = fileList;
+        },
+        handleExceed(files, fileList) {
+            this.$message.warning(
+                `当前限制选择 ${this.limit} 个文件，本次选择了 ${
+                    files.length
+                } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+            );
+        },
+        async handleRemove(file, fileList) {
+            let md5 = "";
+            if (file.raw) {
+                await this.$md5(file.raw).then((res) => {
+                    md5 = res;
+                });
+            } else {
+                md5 = file.md5;
+            }
+
+            let removeIndex = "";
+            this.attachmentList.forEach((item, index) => {
+                if (md5 === item.md5) {
+                    removeIndex = index;
+                }
+            });
+
+            // if (removeIndex < 0) {
+            //     this.$message.error("删除失败");
+            // }
+
+            this.attachmentList.splice(removeIndex, 1);
+            this.$emit("attachmentChange", false);
+        },
+        async toUpload(file) {
+            let _this = this;
+
+            return new Promise(async (resolve, reject) => {
+                let formData = new FormData();
+                // await formData.append("name", file.file.name);
+                // await formData.append('type', _this.defaultParam.md5)
+                // await formData.append("type", this.type);
+                // await formData.append("objectPath", this.objectPath);
+                // await formData.append("md5", _this.defaultParam.md5);
+                await formData.append("par", file.file);
+                let fileName = file.file.name;
+
+                let axios = this.$axios;
+                // 处理大文件上传 instance已被设置不携带token
+                // if (this.needInstance) {
+                //     axios = this.$instance;
+                // }
+
+                // 上传前进行通知
+                this.$emit("willUpload");
+
+                /* let url = this.uploadUrl;
+                let defaultParam = {};
+                if (!url) {
+                    url = this.$api.common.uploadWj;
+                    // 获取MD5值
+                    await this.$md5(file.file).then((res) => {
+                        defaultParam = {
+                            // file: file.file,
+                            md5: res,
+                        };
+                    });
+                } */
+
+                let url = this.$api.modelLibrary.parsePar;
+                // let defaultParam = {};
+                // 获取MD5值
+                // await this.$md5(file.file).then((res) => {
+                //     defaultParam = {
+                //         // file: file.file,
+                //         md5: res,
+                //     };
+                // });
+
+                await axios({
+                    method: "post",
+                    url,
+                    data: formData,
+                    withCredentials: true,
+                    headers: {
+                        "Content-type": "multipart/form-data",
+                    },
+                })
+                    .then((res) => {
+                        if (res.code == 200 && res.info) {
+                            this.attachmentList.push({
+                                info: res.info,
+                            });
+                            resolve("成功");
+                            this.$emit("attachmentChange", res.info, fileName);
+                            // 上传完成后进行通知
+                            this.$emit("didUpload", "success");
+                        } else {
+                            this.$message.error(res.message || "上传失败");
+                            this.$emit("didUpload", "fail");
+                            reject("失败");
+                        }
+                    })
+                    .catch((err) => {
+                        this.$emit("didUpload", "error");
+                        reject(err);
+                    });
+            });
+        },
+        success(response, file, fileList) {
+            this.$message.success("上传成功 ");
+        },
+        error(response, file, fileList) {
+            this.$message.warning("上传失败");
+        },
+        preview(file) {
+            return false;
+            console.log(file);
+            console.log(this.attachmentList);
+            let item = this.attachmentList.find((item) =>
+                item.fileName.endsWith(file.name)
+            );
+            this.download(item.fileName, item.attachmentName);
+        },
+        download(downPath, downName) {
+            this.$axios({
+                method: "post",
+                url: this.$api.common.download,
+                responseType: "blob",
+                data: {
+                    objectName: downPath,
+                },
+            }).then((res) => {
+                const blob = new Blob([res]); //构造一个blob对象来处理数据
+                const fileName = downName;
+                //对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+                //IE10以上支持blob但是依然不支持download
+                if ("download" in document.createElement("a")) {
+                    //支持a标签download的浏览器
+                    const link = document.createElement("a"); //创建a标签
+                    link.download = fileName; //a标签添加属性
+                    link.style.display = "none";
+                    link.href = URL.createObjectURL(blob);
+                    document.body.appendChild(link);
+                    link.click(); //执行下载
+                    URL.revokeObjectURL(link.href); //释放url
+                    document.body.removeChild(link); //释放标签
+                } else {
+                    //其他浏览器
+                    navigator.msSaveBlob(blob, fileName);
+                }
+            });
+        },
+    },
+};
+</script>
+
+<style scoped>
+</style>

src/views/modelLibrary/components/vehicleModelCarsim.vue

@@ -872,7 +872,10 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="转向器传动比:" prop="steeringGearRatio">
+                <el-form-item
+                    label="转向器传动比(mm/rev):"
+                    prop="steeringGearRatio"
+                >
                     <el-input
                         placeholder="请输入"
                         maxlength="12"
@@ -911,6 +914,8 @@
                         :id="'carsimChartA' + chartIndex"
                         :dataList="getDataWay1.data"
                         :columns="columns1"
+                        :xName="xName"
+                        :yName="yName"
                     >
                     </line-chart>
                 </div>
@@ -1141,6 +1146,8 @@
                         :id="'carsimChartC' + chartIndex"
                         :dataList="getDataWay3.data"
                         :columns="columns3"
+                        xName="齿条位移(mm)"
+                        yName="右轮转角(deg)"
                     >
                     </line-chart-b>
                 </div>
@@ -1208,6 +1215,8 @@
                         :id="'carsimChartD' + chartIndex"
                         :dataList="getDataWay3A.data"
                         :columns="columns3A"
+                        xName="齿条位移(mm)"
+                        yName="左轮转角(deg)"
                     >
                     </line-chart-b>
                 </div>
@@ -1388,7 +1397,7 @@ export default {
                 shiftTimeUp56: [],
                 shiftTimeDown56: [],
 
-                brakeType: "", // 制动类型
+                // brakeType: "", // 制动类型
                 frontLeftWheelBrakingTorque: "", // 前轮制动力矩
                 rearLeftWheelBrakingTorque: "", // 后轮制动力矩
                 // frontRightWheelBrakingTorque: "", // 右前轮制动力矩
@@ -1940,6 +1949,8 @@ export default {
             chartIndex: 0, // 配合每个echarts有不同的id
             dia1Type: 0, // 判断可输入多y轴数据的dialog类型
             dia2Type: 0, // 判断可输入单y轴数据的dialog类型
+            // xName: "", // 图表x轴name
+            // yName: "", // 图表y轴name
         };
     },
 
@@ -1976,6 +1987,49 @@ export default {
         },
     },
 
+    computed: {
+        // 图表x轴name
+        xName() {
+            switch (this.dia1Type) {
+                case 1:
+                    return "侧偏角(deg)";
+                    break;
+                case 2:
+                    return "侧偏角(deg)";
+                    break;
+                case 3:
+                    return "滑移率(kappa)";
+                    break;
+                case 4:
+                    return "发动机转速(rpm)";
+                    break;
+                default:
+                    return "";
+                    break;
+            }
+        },
+        // 图表y轴name
+        yName() {
+            switch (this.dia1Type) {
+                case 1:
+                    return "回正力矩(N·m)";
+                    break;
+                case 2:
+                    return "侧向力(N)";
+                    break;
+                case 3:
+                    return "纵向力(N)";
+                    break;
+                case 4:
+                    return "发动机扭矩(N·m)";
+                    break;
+                default:
+                    return "";
+                    break;
+            }
+        },
+    },
+
     methods: {
         pageControl(data) {
             this.activeName = data.name;
@@ -2464,10 +2518,10 @@ export default {
 
             let columns = []; // column数组
 
-            // let flag = false; // 简单的校验是否是只有x、y轴的单y轴数据
+            let flag = false; // 简单的校验是否是只有x、y轴的单y轴数据
 
             fileInfo[0].forEach((i) => {
-                // if (i.toLowerCase().includes("y")) flag = true;
+                if (i.toLowerCase().includes("y")) flag = true;
                 columns.push({
                     label: i,
                     prop: i.toLowerCase().includes("x") ? "x" : i,
@@ -2475,7 +2529,7 @@ export default {
                 });
             });
 
-            // if (flag) return;
+            if (flag) return;
 
             let data = []; // 表格数据
 
@@ -2844,10 +2898,19 @@ rearRightWheelRelationCurveLongitudinalForceAndSideslipAngle:
             */
 
             let dataArray = this.getDataWay.data;
+            console.log(dataArray);
 
             for (let index = 0; index < dataArray.length; index++) {
                 const element = dataArray[index];
 
+                if (index === 1) {
+                    if (element.gearRatio === "") element.gearRatio = null;
+                    if (element.driving === "") element.driving = null;
+                    if (element.coasting === "") element.coasting = null;
+                }
+
+                console.log(element);
+
                 let flag = Object.values(element).some((i) => i === "");
 
                 if (flag) {

src/views/modelLibrary/vehicleModel.vue

@@ -23,6 +23,7 @@
                         <el-select
                             v-model="form.parameterType"
                             :disabled="form.share != ''"
+                            @change="parameterTypeChange"
                         >
                             <el-option
                                 v-for="item in parameterTypeList"
@@ -74,18 +75,17 @@
                         >
                         </el-input>
                     </el-form-item>
-                    <!-- <el-form-item
+                    <el-form-item
                         v-if="form.parameterType != '1'"
                         label="参数文件:"
-                        prop="file"
+                        prop=""
                     >
                         <el-input
                             placeholder="请输入"
                             maxlength="120"
-                            v-autoTrim="{ obj: form, key: 'file' }"
-                            v-model="form.file"
+                            v-model="file"
                             disabled
-                            :title="form.file"
+                            :title="file"
                         >
                         </el-input>
                         <upload
@@ -93,17 +93,17 @@
                             :multiple="false"
                             @attachmentChange="attachmentChange"
                         ></upload>
-                    </el-form-item> -->
+                    </el-form-item>
                 </div>
 
                 <vtd
                     ref="vtd"
-                    v-show="form.parameterType === '1'"
+                    v-if="form.parameterType === '1'"
                     :wheelDriveList="wheelDriveList"
                 ></vtd>
                 <Carsim
                     ref="carsim"
-                    v-show="form.parameterType != '1'"
+                    v-if="form.parameterType != '1'"
                     :suspensionTypeList="suspensionTypeList"
                     :brakeTypeList="brakeTypeList"
                     :steeringTypeList="steeringTypeList"
@@ -159,7 +159,7 @@ import { mapState } from "vuex";
 import threeShow from "./components/threeVehicleModel.vue";
 import vtd from "./components/vehicleModelVTD.vue";
 import Carsim from "./components/vehicleModelCarsim.vue";
-import upload from "./components/upload.vue";
+import upload from "./components/uploadPar.vue";
 
 export default {
     name: "vehicleModel", // 车辆模型
@@ -214,6 +214,7 @@ export default {
                 // heightDistance: "", // 车高
                 // wheelbase: "", // 轴距
                 // mass: "", // 质量
+
                 share: "", // 分享
                 // vehicleImage: "", // 对应的图片相对地址
                 id: "",
@@ -416,6 +417,7 @@ export default {
                 id: "",
             },
             carModel: "",
+            file: "", // 参数文件
         };
     },
 
@@ -524,6 +526,7 @@ export default {
                 form.engineCrankshaftMomentInertia =
                     o.engineCrankshaftMomentInertia;
                 form.idleSpeed = o.idleSpeed;
+                form.driverType = o.driverType;
 
                 form.relationCurveEngineTorqueSpeedAndThrottleOpening =
                     o.relationCurveEngineTorqueSpeedAndThrottleOpening;
@@ -552,14 +555,12 @@ export default {
                 form.shiftTimeUp56 = o.shiftTimeUp56;
                 form.shiftTimeDown56 = o.shiftTimeDown56;
 
-                form.brakeType = o.brakeType;
+                // form.brakeType = o.brakeType;
                 form.frontLeftWheelBrakingTorque =
                     o.frontLeftWheelBrakingTorque;
                 form.rearLeftWheelBrakingTorque = o.rearLeftWheelBrakingTorque;
-                form.frontRightWheelBrakingTorque =
-                    o.frontRightWheelBrakingTorque;
-                form.rearRightWheelBrakingTorque =
-                    o.rearRightWheelBrakingTorque;
+                // form.frontRightWheelBrakingTorque = o.frontRightWheelBrakingTorque;
+                // form.rearRightWheelBrakingTorque = o.rearRightWheelBrakingTorque;
 
                 form.steeringType = o.steeringType;
                 form.steeringGearType = o.steeringGearType;
@@ -576,6 +577,8 @@ export default {
             }
         },
         showInfo(id) {
+            this.file = "";
+            
             this.$axios({
                 method: "post",
                 url: this.$api.modelLibrary.getVehicleInfo,
@@ -664,8 +667,6 @@ export default {
                             this.$message.error(res.message || "保存失败");
                         }
                     });
-                } else {
-                    console.log(6);
                 }
             });
         },
@@ -715,12 +716,20 @@ export default {
             });
         },
         share() {
+            let form = {};
+
+            if (this.form.parameterType === "1") {
+                form = this.$refs.vtd.form;
+            } else {
+                form = this.$refs.carsim.form;
+            }
+
+            let data = Object.assign({}, this.form, form);
+
             this.$axios({
                 method: "post",
                 url: this.$api.modelLibrary.shareVehicle,
-                data: {
-                    ...this.form,
-                },
+                data,
             }).then((res) => {
                 if (res.code == 200) {
                     this.$message.success("分享成功");
@@ -757,7 +766,9 @@ export default {
                 this.$refs.cascader.getCheckedNodes(true)[0].data.vo
             );
 
-            this.updateForm("1", this.form);
+            if (this.form.parameterType === "1") {
+                this.updateForm("1", this.form);
+            }
 
             // this.modelImgSrc = this.getImgUrl(this.form.vehicleFrontView);
             this.carModel = this.getImgUrl(this.form.vehicleFrontView);
@@ -775,9 +786,19 @@ export default {
                 }
             });
         },
-        attachmentChange(fileInfo) {
-            this.form.file = fileInfo;
-            // this.$refs.form.clearValidate("file");
+        attachmentChange(fileInfo, name) {
+            if (!fileInfo) {
+                this.file = "";
+                return;
+            }
+
+            this.file = name;
+
+            this.$refs.form.clearValidate();
+            this.updateForm("2", fileInfo);
+        },
+        parameterTypeChange() {
+            this.file = "";
         },
     },
 

vue.config.js

@@ -79,7 +79,8 @@ module.exports = {
             '/simulation/oauth': {
                 // target: 'http://10.12.10.70', // windowstest
                 // target: 'http://47.94.105.148:81', // aliyun-new-dev 1
-                target: 'http://47.94.105.148:80', // aliyun-new
+                // target: 'http://47.94.105.148:80', // aliyun-new
+                target: 'http://36.110.106.156', // online-new
                 changeOrigin: true,
                 secure: false, // 如果是https接口，需要配置这个参数
                 pathRewrite: {
@@ -95,7 +96,8 @@ module.exports = {
                 // target: 'http://10.12.10.87:8001', // 赵艳
                 // target: 'http://10.12.10.72:8001', // 王晓峰
                 // target: 'http://192.168.30.75', // gq
-                target: 'http://47.94.105.148', // aliyun
+                // target: 'http://47.94.105.148', // aliyun
+                target: 'http://36.110.106.156', // online-new
                 // target: 'http://47.94.105.148:81', // aliyun-new-dev
                 // target: 'http://47.93.217.159', // aliyun-dev
                 // target: 'http://47.94.105.148:80', // aliyun-new
@@ -113,7 +115,8 @@ module.exports = {
                 // target: 'http://10.12.10.87:7003', // 赵艳
                 // target: 'http://10.12.10.70', // windowstest
                 // target: 'http://192.168.30.75', // gq
-                target: 'http://47.94.105.148', // aliyun
+                // target: 'http://47.94.105.148', // aliyun
+                target: 'http://36.110.106.156', // online-new
                 // target: 'http://47.94.105.148:81', // aliyun-new-dev
                 // target: 'http://47.93.217.159', // aliyun-dev
                 // target: 'http://47.94.105.148:80', // aliyun-new
@@ -131,7 +134,8 @@ module.exports = {
                 // target: 'http://10.12.10.87:7003', // 赵艳
                 // target: 'http://10.12.10.70', // windowstest
                 // target: 'http://192.168.30.75', // gq
-                target: 'http://47.94.105.148', // aliyun
+                // target: 'http://47.94.105.148', // aliyun
+                target: 'http://36.110.106.156', // online-new
                 // target: 'http://47.94.105.148:81', // aliyun-new-dev
                 // target: 'http://47.94.105.148:80', // aliyun-new
                 // target: 'http://47.93.217.159', // aliyun-dev