zhangliang2 3 years ago
parent
commit
51ce7230c7

+ 1 - 1
src/api/common.js

@@ -5,7 +5,7 @@ const getDictListsByTypes = '/simulation/resource/server/dict/getDictListsByType
 const getDictTreesByTypes = '/simulation/resource/server/dict/getDictTreesByTypes'; // 字典 多级下拉
 
 const uploadWj = basePart + '/simulation/resource/server/file/uploadWj'; // 上传
-const download = basePart + '/simulation/resource/server/file/download'; // 下载方法
+const download = basePart + '/simulation/resource/common/minio/download'; // 下载方法
 
 export default {
     single,

+ 6 - 6
src/api/sceneLibrary.js

@@ -1,11 +1,11 @@
 const basePart = '/simulation/resource/server';
 
 
-const queryScoringRulesList = basePart + '/ScoringRules/queryScoringRulesList'; // 分规则列表
-const queryScoringRules = basePart + '/ScoringRules/queryScoringRules'; // 查询分规则详情
-const saveScoringRules = basePart + '/ScoringRules/saveScoringRules'; // 保存分规则详情
-const fxScoringRules = basePart + '/ScoringRules/fxScoringRules'; // 分享分规则
-const deleteScoringRules = basePart + '/ScoringRules/deleteScoringRules'; // 删除分规则
+const queryScoringRulesList = basePart + '/ScoringRules/queryScoringRulesList'; // 分规则列表
+const queryScoringRules = basePart + '/ScoringRules/queryScoringRules'; // 查询分规则详情
+const saveScoringRules = basePart + '/ScoringRules/saveScoringRules'; // 保存分规则详情
+const fxScoringRules = basePart + '/ScoringRules/fxScoringRules'; // 分享分规则
+const deleteScoringRules = basePart + '/ScoringRules/deleteScoringRules'; // 删除分规则
 
 const queryStandardsRegulationsList = basePart + '/StandardsRegulations/queryStandardsRegulationsList'; // 标准法规仿真场景列表
 const saveStandardsRegulations = basePart + '/StandardsRegulations/saveStandardsRegulations'; // 新增标准法规仿场景
@@ -22,7 +22,7 @@ const deleteList = basePart + '/ScenePackage/deleteList'; // 删除场景测试
 
 const queryScenePackageSublistList = basePart + '/ScenePackage/queryScenePackageSublistList'; // 场景数据包列表
 const saveScenePackage = basePart + '/ScenePackage/saveScenePackage'; // 场景数据包列表保存
-const queryCsb = basePart + '/ScoringRules/queryCsb'; // 测试包添加分规则下拉
+const queryCsb = basePart + '/ScoringRules/queryCsb'; // 测试包添加分规则下拉
 
 
 

+ 1 - 1
src/assets/common/css/theme.less

@@ -216,7 +216,7 @@
     border: none;
 }
 
-.addBtn {
+.addBtn.disabled {
     &.el-button {
         background: #F5F7FA;
         border: 1px solid #DEE6F3;

BIN
src/assets/common/image/menu/home.png


BIN
src/assets/common/image/menu/icon.png


BIN
src/assets/common/image/menu/icon1.png


BIN
src/assets/common/image/menu/iconFold.png


BIN
src/assets/common/image/menu/iconFold1.png


+ 1 - 1
src/axios/filter.js

@@ -40,7 +40,7 @@ Vue.use(VueAxios, axios);
 axios.defaults.baseURL = ''; //项目的的基础url
 axios.defaults.headers.common['Authorization'] = ""; //请求token信息配置
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; //请求type设置
-axios.defaults.timeout = 30000; //在超时前,所有请求都会等待24秒
+axios.defaults.timeout = 24000; //在超时前,所有请求都会等待24秒
 axios.defaults.withCredentials = true;
 
 // 添加请求拦截器

+ 6 - 2
src/components/grid/searchLayout.vue

@@ -25,8 +25,8 @@
             <div class="inputBox">
                 <slot name="searchItem8"></slot>
             </div>
-            <div class="inputBox">
-                <slot name="searchItem9"></slot>
+            <div class="inputBox searchItem27">
+                <slot name="searchItem27"></slot>
             </div>
             <!-- <div class="speBox">
                 <slot name="searchItemSpe1"></slot>
@@ -74,5 +74,9 @@ export default {
             align-items: center;
         }
     }
+
+    .searchItem27 {
+        flex-basis: 100%;
+    }
 }
 </style>

+ 2 - 2
src/router/sceneLibrary.js

@@ -42,7 +42,7 @@ export default [{
         path: "/gradingRulesList",
         name: "gradingRulesList",
         meta: {
-            tabname: "分规则列表"
+            tabname: "分规则列表"
         },
         component: () => import("@/views/sceneLibrary/gradingRulesList")
     },
@@ -50,7 +50,7 @@ export default [{
         path: "/gradingRule",
         name: "gradingRule",
         meta: {
-            tabname: "分规则"
+            tabname: "分规则"
         },
         component: () => import("@/views/sceneLibrary/gradingRule")
     },

+ 1 - 1
src/views/algorithmsLibrary/algorithmsLibraryList.vue

@@ -60,7 +60,7 @@
                 <el-tab-pane label="私有仓库" name="3" disabled></el-tab-pane>
             </el-tabs>
             <el-button
-                class="addBtn"
+                v-bind:class="{ addBtn: true, disabled: activeName === '1' }"
                 icon="el-icon-circle-plus-outline"
                 @click="addOne"
                 type="primary"

+ 1 - 1
src/views/mainPage.vue

@@ -97,7 +97,7 @@
         <div v-show="activeName === '2'" class="tabBox">
             <div class="boxContent">
                 <div class="titlePanel">
-                    <div class="titlePanelBor">数据橄榄</div>
+                    <div class="titlePanelBor">数据概览</div>
                 </div>
                 <ul class="listPanel listPanelB listPanelC">
                     <li class="shadowBox">

+ 8 - 8
src/views/modelLibrary/components/handleConfigList.vue

@@ -19,7 +19,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.camera"
-                    :key="item.id"
+                    :key="item.id + index"
                 >
                     <div
                         class="nameBox"
@@ -61,7 +61,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.ogt"
-                    :key="item.id"
+                    :key="item.id + index"
                 >
                     <div
                         class="nameBox"
@@ -102,7 +102,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.lidar"
-                    :key="item.id"
+                    :key="item.id + index"
                 >
                     <div
                         class="nameBox"
@@ -144,7 +144,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.gps"
-                    :key="item.id"
+                    :key="item.id + index"
                 >
                     <div
                         class="nameBox"
@@ -304,7 +304,7 @@ export default {
                 default:
                     break;
             }
-            
+
             let apis = [
                 this.$api.modelLibrary.getMyCameraList,
                 this.$api.modelLibrary.getMyOgtList,
@@ -354,19 +354,19 @@ export default {
                     let type = this.currentType;
                     this.$emit("addOne", info, type);
                     this.dialogVisible = false;
-                    this.configHandle(type, 0);
+                    this.configHandle(type, 0, true);
                 }
             });
         },
         handleClose(done) {
             done();
         },
-        configHandle(type, index) {
+        configHandle(type, index, isAdd = false) {
             let curOne = {
                 name: type,
                 index,
             };
-            this.$emit("curItem", curOne);
+            this.$emit("curItem", curOne, isAdd);
         },
     },
 

+ 33 - 4
src/views/modelLibrary/vehicleConfigurationDetail.vue

@@ -147,7 +147,11 @@
                             >
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="端口" prop="sensorPort">
+                        <el-form-item
+                            label="端口"
+                            prop="sensorPort"
+                            v-show="curOne.name === 'ogt'"
+                        >
                             <el-input
                                 placeholder="请输入"
                                 maxlength="10"
@@ -278,7 +282,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                 ],
                 sensorPort: [
-                    { required: true, message: "请输入", trigger: "blur" },
+                    { required: false, message: "请输入", trigger: "blur" },
                 ],
             },
             // 传感器对象集合
@@ -296,6 +300,16 @@ export default {
         };
     },
 
+    watch: {
+        curOne(val) {
+            if (val.name === "ogt") {
+                this.rulesA.sensorPort[0].required = true;
+            } else {
+                this.rulesA.sensorPort[0].required = false;
+            }
+        },
+    },
+
     computed: {},
 
     methods: {
@@ -379,10 +393,25 @@ export default {
         delOne(type, index) {
             this.configList[type].splice(index, 1);
         },
-        curItem(item) {
+        curItem(item, isAdd) {
             this.$refs.formA.resetFields();
             this.curOne = item;
-            Object.assign(this.formA, this.configList[item.name][item.index]);
+            if (isAdd) {
+                this.formA.sensorX = "0";
+                this.formA.sensorY = "0";
+                this.formA.sensorZ = "0";
+                this.formA.sensorH = "0";
+                this.formA.sensorP = "0";
+                this.formA.sensorR = "0";
+                if(this.curOne.name==="ogt") {
+                    this.formA.sensorPort = "62001";
+                }
+            } else {
+                Object.assign(
+                    this.formA,
+                    this.configList[item.name][item.index]
+                );
+            }
         },
         saveConfig() {
             if (this.curOne.index < 0) {

+ 1 - 1
src/views/modelLibrary/vehicleConfigurationList.vue

@@ -71,7 +71,7 @@
                 <el-tab-pane label="私有" name="2"></el-tab-pane>
             </el-tabs>
             <el-button
-                class="addBtn"
+                v-bind:class="{ addBtn: true, disabled: activeName === '1' }"
                 icon="el-icon-circle-plus-outline"
                 @click="addOne"
                 type="primary"

+ 13 - 12
src/views/page/breadCrumb.vue

@@ -34,8 +34,9 @@
             </el-breadcrumb>
         </div>
 
-        <div class="close">
-            <i class="el-icon-switch-button"></i>
+        <div class="avatarBox">
+            <!-- <i class="el-icon-switch-button"></i> -->
+            <img :src="imgSrc" width="100%" height="100%" />
         </div>
     </div>
 </template>
@@ -52,6 +53,7 @@ export default {
                 "systemManagement",
                 "workManagement",
             ], // 相关页面只为占位,页面是空白,无法展示
+            imgSrc: require("@/assets/common/image/photoF.png"),
         };
     },
     methods: {},
@@ -79,8 +81,8 @@ export default {
 <style lang="less" scoped>
 .topClass {
     position: relative;
-    height: 35px;
-    line-height: 33px;
+    height: 50px;
+    line-height: 48px;
     border-bottom: 2px solid #f5f7fa;
     overflow: hidden;
 
@@ -88,7 +90,7 @@ export default {
         // width: 1100px;
         // margin: 0 auto;
         // flex: 1;
-        padding-top: 6px;
+        padding-top: 15px;
         padding-left: 12px;
 
         // .breadcrumb {
@@ -125,17 +127,16 @@ export default {
         }
     }
 
-    .close {
+    .avatarBox {
         position: absolute;
-        top: 7px;
+        top: 4px;
         right: 20px;
         z-index: 3;
-        width: 18px;
-        height: 18px;
-        line-height: 1;
-        font-size: 18px;
-        color: @themeColor;
+        width: 40px;
+        height: 40px;
         cursor: pointer;
+        border-radius: 50%;
+        overflow: hidden;
     }
 }
 </style>

+ 38 - 11
src/views/page/pageMenu.vue

@@ -8,11 +8,17 @@
                 <b></b>
             </div>
             <ul class="menuFold" v-show="menuFold">
+                <li
+                    @click="menuFoldHandle(1)"
+                    v-bind:class="{ isOpened: opened === 'mainPage' }"
+                >
+                    <b class="my-icon-home is"></b>
+                </li>
                 <li
                     @click="menuFoldHandle(1)"
                     v-bind:class="{ isOpened: opened === 'modelLibrary' }"
                 >
-                    <b class="my-icon-menuA is"></b>
+                    <b class="my-icon-menuA"></b>
                 </li>
                 <li
                     @click="menuFoldHandle(1)"
@@ -32,7 +38,7 @@
                 >
                     <b class="my-icon-menuD"></b>
                 </li>
-                <li
+                <!-- <li
                     @click="menuFoldHandle(1)"
                     v-bind:class="{ isOpened: opened === 'systemManagement' }"
                 >
@@ -43,18 +49,23 @@
                     v-bind:class="{ isOpened: opened === 'systemManagement' }"
                 >
                     <b class="my-icon-menuF"></b>
-                </li>
+                </li> -->
             </ul>
 
             <div class="menuList" v-show="!menuFold">
                 <el-menu
-                    default-active="modelLibrary"
+                    default-active="mainPage"
                     class="el-menu-vertical-demo"
                     background-color="#3397FF"
+                    :unique-opened="true"
                     :router="true"
                     @select="menuSel"
                 >
                     <!-- active-text-color="#ffffff" -->
+                    <el-menu-item index="mainPage" class="indexMenu">
+                        <i class="my-icon-home"></i>
+                        <span>首页</span>
+                    </el-menu-item>
                     <el-submenu index="modelLibrary">
                         <template slot="title">
                             <i class="my-icon-menuA"></i>
@@ -99,7 +110,7 @@
                             >场景测试包管理</el-menu-item
                         >
                         <el-menu-item index="gradingRulesList"
-                            >分规则</el-menu-item
+                            >分规则</el-menu-item
                         >
                     </el-submenu>
                     <el-submenu index="workManagement">
@@ -123,12 +134,12 @@
                 </el-menu>
             </div>
         </div>
-        <div class="fold" v-show="menuFold">
+        <!-- <div class="fold" v-show="menuFold">
             <img :src="imgSrc" width="100%" height="100%" />
         </div>
         <div class="unfold" v-show="!menuFold">
             <img :src="imgSrc" width="100%" height="100%" />
-        </div>
+        </div> -->
     </div>
 </template>
 
@@ -152,7 +163,7 @@ export default {
             this.$emit("menuFold", this.menuFold);
         },
         menuSel(index, indexPath) {
-            // console.log(index, indexPath);
+            console.log(index, indexPath);
             this.opened = indexPath[0];
         },
     },
@@ -231,7 +242,6 @@ export default {
 
     b {
         display: block;
-        background-size: contain;
     }
 }
 
@@ -242,6 +252,7 @@ export default {
         height: 38px;
         background: url("../../assets/common/image/menu/iconFold.png") center
             no-repeat;
+        background-size: contain;
     }
 }
 
@@ -252,15 +263,30 @@ export default {
         height: 27px;
         background: url("../../assets/common/image/menu/icon.png") center
             no-repeat;
+        background-size: contain;
     }
 }
 
-.el-submenu [class^="my-icon-"] {
+.el-submenu [class^="my-icon-"],
+.el-menu-item [class^="my-icon-"] {
     width: 24px;
     height: 18px;
     margin-right: 5px;
 }
 
+.indexMenu {
+    padding-left: 15px !important;
+    padding-right: 10px !important;
+
+    span {
+        color: #ffffff !important;
+    }
+}
+
+.my-icon-home {
+    background: url("../../assets/common/image/menu/home.png") center no-repeat;
+}
+
 .my-icon-menuA {
     background: url("../../assets/common/image/menu/menuA.png") center no-repeat;
 }
@@ -308,10 +334,11 @@ export default {
 
 .el-menu {
     // background: @themeColor;
+    border-right-color: @themeColor;
 
     /deep/ .el-submenu__title,
     .el-menu-item {
-        color: #D7E7FE;
+        color: #d7e7fe;
 
         &.is-active {
             color: #ffffff;

+ 1 - 1
src/views/sceneLibrary/gradingRule.vue

@@ -61,7 +61,7 @@
 //import  from '';
 
 export default {
-    name: "gradingRule", // 分规则
+    name: "gradingRule", // 分规则
     components: {},
     data() {
         return {

+ 2 - 2
src/views/sceneLibrary/gradingRulesList.vue

@@ -61,7 +61,7 @@
                 <el-tab-pane label="私有" name="2"></el-tab-pane>
             </el-tabs>
             <el-button
-                class="addBtn"
+                v-bind:class="{ addBtn: true, disabled: activeName === '1' }"
                 icon="el-icon-circle-plus-outline"
                 @click="addOne"
                 type="primary"
@@ -123,7 +123,7 @@ import tableList from "@/components/grid/TableList";
 import toolbarTab from "@/components/toolbar/toolbarTab";
 
 export default {
-    name: "gradingRulesList", // 分规则列表
+    name: "gradingRulesList", // 分规则列表
     components: { searchLayout, tableList, toolbarTab },
     data() {
         return {

+ 28 - 3
src/views/sceneLibrary/naturalDrivingScenarioList.vue

@@ -75,7 +75,7 @@
                     clearable=""
                 ></el-cascader>
             </template>
-            <template slot="searchItem9">
+            <template slot="searchItem27">
                 <el-checkbox-group v-model="searchParams.c">
                     <el-checkbox-button :label="1" :key="1" class="labelA"
                         >绿灯</el-checkbox-button
@@ -159,7 +159,7 @@
         </tableList>
 
         <el-dialog
-            title="CAMERAO"
+            :title="videoDiaTitle"
             :visible.sync="dialogVisible"
             width="690px"
             :close-on-click-modal="false"
@@ -256,6 +256,8 @@ export default {
             autoplay: false,
             videoSrc: "",
             objectPath: "",
+            videoDiaTitle: "",
+            abc: "http://10.15.12.72:8001/simulation/resource/common/minio/preview?objectName=自然驾驶场景/20220314/0.2378730429515783/simulation.mp4&access_token=9882c634-9af6-4647-89dc-8ad53c04a56b",
         };
     },
     methods: {
@@ -282,9 +284,28 @@ export default {
             this.doSearch();
         },
         viewRow(row) {
+            console.log(123);
             this.dialogVisible = true;
-            this.videoSrc = row.videoPreview;
+            this.videoDiaTitle = row.naturalName;
+            // this.videoSrc =
+            //     "http://10.15.12.72:8001/simulation/resource/common/minio/preview?objectName=" +
+            //     row.videoAddress+"&access_token=9882c634-9af6-4647-89dc-8ad53c04a56b";
+            this.videoSrc = this.abc;
             this.autoplay = true;
+
+            // this.$axios({
+            //     method: "post",
+            //     url: this.$api.common.download,
+            //     data: {
+            //         objectName: row.videoAddress,
+            //     },
+            // }).then((res) => {
+            //     if (res.code == 200 && res.info) {
+            //         this.form = res.info;
+            //     } else {
+            //         this.$message.error(res.message || "获取信息失败");
+            //     }
+            // });
         },
         diaClose(done) {
             this.autoplay = false;
@@ -322,4 +343,8 @@ export default {
         min-width: 75px;
     }
 }
+
+.btnsPanel {
+    text-align: right;
+}
 </style>

+ 1 - 1
src/views/sceneLibrary/scenarioTestPackageManagementList.vue

@@ -51,7 +51,7 @@
                 <el-tab-pane label="私有" name="2"></el-tab-pane>
             </el-tabs>
             <el-button
-                class="addBtn"
+                v-bind:class="{ addBtn: true, disabled: activeName === '1' }"
                 icon="el-icon-circle-plus-outline"
                 @click="addConfig"
                 type="primary"

+ 1 - 1
src/views/sceneLibrary/scenePacketList.vue

@@ -596,7 +596,7 @@ export default {
                 if (res.code == 200 && res.info) {
                     this.ruleList = res.info;
                 } else {
-                    this.$message.error(res.message || "获取分规则列表失败");
+                    this.$message.error(res.message || "获取分规则列表失败");
                 }
             });
         },

+ 7 - 2
src/views/sceneLibrary/standardRegulationSimulationScenarioList.vue

@@ -34,7 +34,7 @@
                 >
                 </el-input>
             </template>
-            <template slot="searchItem4">
+            <template slot="searchItem27">
                 <el-checkbox-group v-model="searchParams.c">
                     <el-checkbox-button :label="1" :key="1" class="labelA"
                         >绿灯</el-checkbox-button
@@ -118,7 +118,7 @@
         </tableList>
 
         <el-dialog
-            title="CAMERAO"
+            :title="videoDiaTitle"
             :visible.sync="dialogVisible"
             width="690px"
             :close-on-click-modal="false"
@@ -196,6 +196,7 @@ export default {
             autoplay: false,
             videoSrc: "",
             objectPath: "",
+            videoDiaTitle: "",
         };
     },
     methods: {
@@ -218,6 +219,7 @@ export default {
         },
         viewRow(row) {
             this.dialogVisible = true;
+            this.videoDiaTitle = row.sceneName;
             this.videoSrc = row.videoPreview;
             this.autoplay = true;
         },
@@ -246,4 +248,7 @@ export default {
 
 <style lang='less' scoped>
 @import "./common/util.less";
+.btnsPanel {
+    text-align: right;
+}
 </style>

+ 8 - 2
src/views/sceneLibrary/trafficAccidentSimulationScenarioList.vue

@@ -67,7 +67,7 @@
                     ></el-option>
                 </el-select>
             </template>
-            <template slot="searchItem7">
+            <template slot="searchItem27">
                 <el-checkbox-group v-model="searchParams.c">
                     <el-checkbox-button :label="1" :key="1" class="labelA"
                         >绿灯</el-checkbox-button
@@ -151,7 +151,7 @@
         </tableList>
 
         <el-dialog
-            title="CAMERAO"
+            :title="videoDiaTitle"
             :visible.sync="dialogVisible"
             width="690px"
             :close-on-click-modal="false"
@@ -247,6 +247,7 @@ export default {
             autoplay: false,
             videoSrc: "",
             objectPath: "",
+            videoDiaTitle: "",
         };
     },
     methods: {
@@ -272,6 +273,7 @@ export default {
         },
         viewRow(row) {
             this.dialogVisible = true;
+            this.videoDiaTitle = row.sceneName;
             this.videoSrc = row.videoPreview;
             this.autoplay = true;
         },
@@ -313,4 +315,8 @@ export default {
         min-width: 90px;
     }
 }
+
+.btnsPanel {
+    text-align: right;
+}
 </style>

+ 18 - 17
src/views/workManagement/manualRunProjectList.vue

@@ -119,19 +119,22 @@
             <el-table-column label="操作" slot="cgInfos" align="center">
                 <template v-slot="scope">
                     <i
-                        v-if="scope.row.nowRunState === '20'"
-                        @click="stopRow(scope.row.id)"
-                        class="el-icon-video-pause elIcon"
-                        title="中止"
+                        v-if="
+                            scope.row.nowRunState === '10' ||
+                            scope.row.nowRunState === '40'
+                        "
+                        @click="runRow(scope.row.id)"
+                        class="el-icon-video-play elIcon"
+                        title="运行"
                     ></i>
                     <i
                         v-if="
                             scope.row.nowRunState === '10' ||
                             scope.row.nowRunState === '40'
                         "
-                        @click="delRow(scope.row.id)"
-                        class="el-icon-delete elIcon"
-                        title="删除"
+                        @click="editRow(scope.row)"
+                        class="el-icon-edit-outline elIcon"
+                        title="编辑"
                     ></i>
                     <i
                         @click="viewRow(scope.row.id)"
@@ -139,22 +142,19 @@
                         title="查看"
                     ></i>
                     <i
-                        v-if="
-                            scope.row.nowRunState === '10' ||
-                            scope.row.nowRunState === '40'
-                        "
-                        @click="runRow(scope.row.id)"
-                        class="el-icon-video-play elIcon"
-                        title="运行"
+                        v-if="scope.row.nowRunState === '20'"
+                        @click="stopRow(scope.row.id)"
+                        class="el-icon-video-pause elIcon"
+                        title="中止"
                     ></i>
                     <i
                         v-if="
                             scope.row.nowRunState === '10' ||
                             scope.row.nowRunState === '40'
                         "
-                        @click="editRow(scope.row)"
-                        class="el-icon-edit-outline elIcon"
-                        title="编辑"
+                        @click="delRow(scope.row.id)"
+                        class="el-icon-delete elIcon"
+                        title="删除"
                     ></i>
                     <!-- <i
                         v-if="scope.row.nowRunState != '10'"
@@ -442,6 +442,7 @@ export default {
 <style lang='less' scoped>
 .btnsPanel {
     margin: 45px 40px 15px;
+    text-align: right;
 }
 
 .checkboxPanel {

+ 4 - 3
vue.config.js

@@ -80,7 +80,8 @@ module.exports = {
                 // target: 'http://10.10.83.145:6888/user-center',
                 // target: 'http://10.15.12.70/simulation',
                 // target: 'http://10.15.12.70:7001', // 登录
-                target: 'http://10.15.12.73:7003',  // 王志强
+                target: 'http://10.15.12.70:8001', //
+                // target: 'http://10.15.12.73:7003',  // 王志强
                 // target: 'http://10.15.12.74:8001',
                 changeOrigin: true,
                 secure: false, // 如果是https接口,需要配置这个参数
@@ -89,8 +90,8 @@ module.exports = {
                 }
             },
             '/simulation/resource/server': {
-                // target: 'http://10.15.12.73:7003',  // 王志强
-                target: 'http://10.15.12.88:7003',  // 王耀栋
+                target: 'http://10.15.12.73:7003',  // 王志强
+                // target: 'http://10.15.12.88:7003',  // 王耀栋
                 // target: 'http://10.15.12.72:7003',  // 王晓峰
                 // target: 'http://10.15.12.87:7003',  // 赵艳
                 changeOrigin: true,