فهرست منبع

改名,和menu同步

zhangliang2 2 سال پیش
والد
کامیت
0dcc58a417

+ 6 - 6
src/api/modelLibrary.js

@@ -1,11 +1,11 @@
 const basePart = '/simulation/resource/server';
 
-const getVehicleList = basePart + '/vehicle/getVehicleList'; // 车辆模型查询列表
-const getVehicleInfo = basePart + '/vehicle/getVehicleInfo'; // 车辆模型查询详情
-const saveVehicle = basePart + '/vehicle/saveVehicle'; // 车辆模型保存修改详情
-const shareVehicle = basePart + '/vehicle/shareVehicle'; // 车辆模型分享详情
-const delVehicleById = basePart + '/vehicle/delVehicleById'; // 车辆模型删除详情
-const getVehicleTempTree = basePart + '/vehicleTemp/getVehicleTempTree'; // 车辆模型模板
+const getVehicleList = basePart + '/vehicle/getVehicleList'; // 动力学配置查询列表
+const getVehicleInfo = basePart + '/vehicle/getVehicleInfo'; // 动力学配置查询详情
+const saveVehicle = basePart + '/vehicle/saveVehicle'; // 动力学配置保存修改详情
+const shareVehicle = basePart + '/vehicle/shareVehicle'; // 动力学配置分享详情
+const delVehicleById = basePart + '/vehicle/delVehicleById'; // 动力学配置删除详情
+const getVehicleTempTree = basePart + '/vehicleTemp/getVehicleTempTree'; // 动力学配置模板
 
 const getCameraList = basePart + '/camera/getCameraList'; // 摄像头-列表查询
 const getCameraInfo = basePart + '/camera/getCameraInfo'; // 摄像头-详情查询

+ 2 - 2
src/router/modelLibrary.js

@@ -22,7 +22,7 @@ export default [{
         path: "/sensorModel",
         name: "sensorModel",
         meta: {
-            tabname: "传感器模型",
+            tabname: "传感器配置",
             menuKind: "modelLibrary",
             login: true
         },
@@ -32,7 +32,7 @@ export default [{
         path: "/vehicleModel",
         name: "vehicleModel",
         meta: {
-            tabname: "车辆模型",
+            tabname: "动力学配置",
             menuKind: "modelLibrary",
             login: true
         },

+ 7 - 17
src/views/modelLibrary/components/threeVehicleModel.vue

@@ -12,9 +12,10 @@ import {
     showFullScreenLoading,
     tryHideFullScreenLoading,
 } from "../../../axios/filter";
+import { mapState } from "vuex";
 
 export default {
-    name: "threeVehicleModel", // 车辆模型中的threeJS
+    name: "threeVehicleModel", // 动力学配置中的threeJS
 
     data() {
         return {
@@ -31,10 +32,14 @@ export default {
             car: null,
             cubeTexture: null,
             raf: null,
-            scale: 1.5, // 物体加载换算倍数
+            // scale: 2, // 物体加载换算倍数
         };
     },
 
+    computed: {
+        ...mapState(["scale"]),
+    },
+
     props: {
         carModel: {
             type: String,
@@ -44,7 +49,6 @@ export default {
 
     watch: {
         carModel(newVal, oldVal) {
-            console.log(newVal, oldVal);
             if (newVal != oldVal) {
                 this.initCar(newVal);
             }
@@ -106,29 +110,17 @@ export default {
                 this.car = null;
             }
 
-            console.log(model);
             if (!model) return;
             if (!model.includes(".glb")) return;
 
             let that = this;
             let loader = new GLTFLoader();
 
-            // const loading = this.$loading({
-            //     lock: true,
-            //     text: "模型加载中,请稍等...",
-            //     // spinner: "el-icon-loading",
-            //     background: "rgba(0, 0, 0, 0.2)",
-            // });
-
             showFullScreenLoading();
 
-            // model = `${this.publicPath}glb/AudiA6_10.glb`
-
             loader.load(
                 model,
                 function (obj) {
-                    console.log(obj);
-                    // loading.close();
                     tryHideFullScreenLoading();
 
                     obj.scene.rotation.set(
@@ -146,7 +138,6 @@ export default {
                     // console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
                 },
                 (error) => {
-                    // loading.close();
                     tryHideFullScreenLoading();
                     console.error(error);
                 }
@@ -158,7 +149,6 @@ export default {
             this.initCamera();
             this.initRenderer();
             this.initLight();
-            // this.initCar(this.carModel);
 
             this.controls = new OrbitControls(
                 this.camera,

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

@@ -119,7 +119,7 @@ import canvasSensorA from "./components/canvasSensorModelA.vue";
 import threeShow from "./components/threeSensorModel.vue";
 
 export default {
-    name: "sensorModel", // 传感器模型
+    name: "sensorModel", // 传感器配置
     components: {
         modelList,
         toolbarTab,

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

@@ -111,7 +111,7 @@ import canvasSensor from "./components/canvasSensorModel.vue";
 import canvasSensorA from "./components/canvasSensorModelA.vue";
 
 export default {
-    name: "sensorModel", // 传感器模型
+    name: "sensorModel", // 传感器配置
     components: {
         modelList,
         toolbarTab,

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

@@ -119,7 +119,7 @@ import canvasSensorA from "./components/canvasSensorModelA.vue";
 import threeShow from "./components/threeSensorModel.vue";
 
 export default {
-    name: "sensorModel", // 传感器模型
+    name: "sensorModel", // 传感器配置
     components: {
         modelList,
         toolbarTab,

+ 2 - 2
src/views/page/pageMenu.vue

@@ -90,10 +90,10 @@
                             <span>模型库</span>
                         </template>
                         <el-menu-item index="/sensorModel"
-                            >传感器模型</el-menu-item
+                            >传感器配置</el-menu-item
                         >
                         <el-menu-item index="/vehicleModel"
-                            >车辆模型</el-menu-item
+                            >动力学配置</el-menu-item
                         >
                         <el-menu-item index="/vehicleConfigurationList"
                             >车辆配置</el-menu-item

+ 3 - 3
src/views/personalInformation/personalInformation.vue

@@ -179,15 +179,15 @@
                         prop: "packageName",
                     },
                     {
-                        label: "自然驾驶仿真场景",
+                        label: "自然驾驶场景",
                         prop: "zrCount",
                     },
                     {
-                        label: "交通事故仿真场景",
+                        label: "交通事故场景",
                         prop: "jtCount",
                     },
                     {
-                        label: "标准法规仿真场景",
+                        label: "标准法规场景",
                         prop: "bzCount",
                     },
                     {