Эх сурвалжийг харах

优化系统设置中的面包屑逻辑,车辆配置详情中选择传感器时展示二级分类

ronaldo9Zhang 2 жил өмнө
parent
commit
035fcb14c1

+ 11 - 0
src/api/modelLibrary.js

@@ -34,6 +34,7 @@ const delGpsById = basePart + '/gps/delGpsById'; // GPS-删除
 
 
 const getConfigPageList = basePart + '/config/getConfigPageList'; // 车辆配置列表查询
 const getConfigPageList = basePart + '/config/getConfigPageList'; // 车辆配置列表查询
 const getConfigInfo = basePart + '/config/getConfigInfo'; // 车辆配置详情查询
 const getConfigInfo = basePart + '/config/getConfigInfo'; // 车辆配置详情查询
+const getConfigInfoNew = basePart + '/config/getConfigInfoNew'; // 车辆配置详情查询-new
 const saveConfig = basePart + '/config/saveConfig'; //车辆配置新增修改
 const saveConfig = basePart + '/config/saveConfig'; //车辆配置新增修改
 const shareConfigByInfo = basePart + '/config/shareConfigByInfo'; // 车辆配置页面分享
 const shareConfigByInfo = basePart + '/config/shareConfigByInfo'; // 车辆配置页面分享
 const shareConfigById = basePart + '/config/shareConfigById'; // 车辆配置列表分享
 const shareConfigById = basePart + '/config/shareConfigById'; // 车辆配置列表分享
@@ -41,10 +42,15 @@ const delConfigById = basePart + '/config/delConfigById'; // 车辆配置删除
 const getMyVehicleList = basePart + '/vehicle/getMyVehicleList'; // 车辆名称私有下拉列表
 const getMyVehicleList = basePart + '/vehicle/getMyVehicleList'; // 车辆名称私有下拉列表
 const getMyVehicleListNew = basePart + '/vehicle/getMyVehicleListNew'; // 车辆名称私有下拉列表-new
 const getMyVehicleListNew = basePart + '/vehicle/getMyVehicleListNew'; // 车辆名称私有下拉列表-new
 const getMyVehicleListNew1 = basePart + '/vehicle/getMyVehicleListNew1'; // 车辆名称私有下拉列表-new1
 const getMyVehicleListNew1 = basePart + '/vehicle/getMyVehicleListNew1'; // 车辆名称私有下拉列表-new1
+
 const getMyCameraList = basePart + '/camera/getMyCameraList'; // 摄像头-私有列表查询
 const getMyCameraList = basePart + '/camera/getMyCameraList'; // 摄像头-私有列表查询
+const getMyCameraListNew = basePart + '/camera/getMyCameraListNew'; // 摄像头-私有列表查询-new
 const getMyOgtList = basePart + '/ogt/getMyOgtList'; // 完美传感器-私有列表查询
 const getMyOgtList = basePart + '/ogt/getMyOgtList'; // 完美传感器-私有列表查询
+const getMyOgtListNew = basePart + '/ogt/getMyOgtListNew'; // 完美传感器-私有列表查询-new
 const getMyLidarList = basePart + '/lidar/getMyLidarList'; // 激光雷达对象-私有列表查询
 const getMyLidarList = basePart + '/lidar/getMyLidarList'; // 激光雷达对象-私有列表查询
+const getMyLidarListNew = basePart + '/lidar/getMyLidarListNew'; // 激光雷达对象-私有列表查询-new
 const getMyGpsList = basePart + '/gps/getMyGpsList'; // GPS-私有列表查询
 const getMyGpsList = basePart + '/gps/getMyGpsList'; // GPS-私有列表查询
+const getMyGpsListNew = basePart + '/gps/getMyGpsListNew'; // GPS-私有列表查询-new
 const getMySensorList = basePart + '/sensor/getMySensorList'; // 所有传感器列表查询
 const getMySensorList = basePart + '/sensor/getMySensorList'; // 所有传感器列表查询
 
 
 
 
@@ -83,6 +89,7 @@ export default {
 
 
     getConfigPageList,
     getConfigPageList,
     getConfigInfo,
     getConfigInfo,
+    getConfigInfoNew,
     saveConfig,
     saveConfig,
     shareConfigByInfo,
     shareConfigByInfo,
     shareConfigById,
     shareConfigById,
@@ -91,8 +98,12 @@ export default {
     getMyVehicleListNew,
     getMyVehicleListNew,
     getMyVehicleListNew1,
     getMyVehicleListNew1,
     getMyCameraList,
     getMyCameraList,
+    getMyCameraListNew,
     getMyOgtList,
     getMyOgtList,
+    getMyOgtListNew,
     getMyLidarList,
     getMyLidarList,
+    getMyLidarListNew,
     getMyGpsList,
     getMyGpsList,
+    getMyGpsListNew,
     getMySensorList
     getMySensorList
 }
 }

+ 6 - 0
src/views/algorithmsLibrary/algorithmsLibraryList.vue

@@ -216,12 +216,18 @@ export default {
         addOne() {
         addOne() {
             if (this.activeName === "2") {
             if (this.activeName === "2") {
                 // 私有导入
                 // 私有导入
+                this.$store.commit("getTabname", "exportAlgorithmsTabName", "");
+                localStorage.setItem("exportAlgorithmsTabName", "");
+
                 this.$router.push({
                 this.$router.push({
                     path: "/exportAlgorithms",
                     path: "/exportAlgorithms",
                     query: { activeName: this.activeName },
                     query: { activeName: this.activeName },
                 });
                 });
             } else {
             } else {
                 // 私有仓库
                 // 私有仓库
+                this.$store.commit("getTabname", "gitAlgorithmsTabName", "");
+                localStorage.setItem("gitAlgorithmsTabName", "");
+
                 this.$router.push({
                 this.$router.push({
                     path: "/gitAlgorithms",
                     path: "/gitAlgorithms",
                     query: { activeName: this.activeName },
                     query: { activeName: this.activeName },

+ 48 - 13
src/views/modelLibrary/components/handleConfigList.vue

@@ -180,15 +180,22 @@
                 :rules="rules"
                 :rules="rules"
                 label-width="108px"
                 label-width="108px"
             >
             >
-                <el-form-item label="传感器:" prop="sensorId">
-                    <el-select v-model="form.sensorId" @change="sensorChange">
+                <el-form-item label="传感器:" prop="sensorArrayS">
+                    <el-cascader
+                        ref="cascader"
+                        v-model="form.sensorArrayS"
+                        :options="sensorNameList"
+                        :props="props"
+                        @change="sensorChange"
+                    ></el-cascader>
+                    <!-- <el-select v-model="form.sensorId" @change="sensorChange">
                         <el-option
                         <el-option
                             v-for="item in sensorNameList"
                             v-for="item in sensorNameList"
                             :label="item.sensorName"
                             :label="item.sensorName"
                             :value="item.id"
                             :value="item.id"
                             :key="item.id"
                             :key="item.id"
                         ></el-option>
                         ></el-option>
-                    </el-select>
+                    </el-select> -->
                 </el-form-item>
                 </el-form-item>
                 <el-form-item label="传感器描述:" prop="sensorDescription">
                 <el-form-item label="传感器描述:" prop="sensorDescription">
                     <el-input
                     <el-input
@@ -237,15 +244,21 @@ export default {
                 sensorDescription: "",
                 sensorDescription: "",
                 sensorId: "",
                 sensorId: "",
                 sensorType: "",
                 sensorType: "",
+                sensorArrayS: []
             },
             },
             rules: {
             rules: {
-                sensorId: [
+                sensorArrayS: [
                     { required: true, message: "请选择", trigger: "change" },
                     { required: true, message: "请选择", trigger: "change" },
                 ],
                 ],
                 sensorDescription: [
                 sensorDescription: [
                     { required: true, message: "请输入", trigger: "blur" },
                     { required: true, message: "请输入", trigger: "blur" },
                 ],
                 ],
             },
             },
+            props: {
+                multiple: false,
+                label: "name",
+                value: "code",
+            },
         };
         };
     },
     },
     props: {
     props: {
@@ -311,14 +324,14 @@ export default {
             }
             }
 
 
             let apis = [
             let apis = [
-                this.$api.modelLibrary.getMyCameraList,
-                this.$api.modelLibrary.getMyOgtList,
-                this.$api.modelLibrary.getMyLidarList,
-                this.$api.modelLibrary.getMyGpsList,
+                this.$api.modelLibrary.getMyCameraListNew,
+                this.$api.modelLibrary.getMyOgtListNew,
+                this.$api.modelLibrary.getMyLidarListNew,
+                this.$api.modelLibrary.getMyGpsListNew,
             ];
             ];
             this.currentType = type;
             this.currentType = type;
             this.dialogTitle = "添加" + this.configTitleList[index];
             this.dialogTitle = "添加" + this.configTitleList[index];
-            this.sensorNameList = [];
+            // this.sensorNameList = [];
 
 
             this.$axios({
             this.$axios({
                 method: "post",
                 method: "post",
@@ -338,10 +351,16 @@ export default {
                 }
                 }
             });
             });
         },
         },
-        sensorChange(id) {
-            let val = this.sensorNameList.find((i) => i.id == id);
-            this.form.sensorName = val.sensorName;
-            this.form.sensorDescription = val.description;
+        sensorChange(v) {
+            // let val = this.sensorNameList.find((i) => i.id == id);
+            // this.form.sensorName = val.sensorName;
+            // this.form.sensorDescription = val.description;
+            
+            let item = this.$refs.cascader.getCheckedNodes(true)[0].data.vo;
+
+            this.form.sensorId = item.id;
+            this.form.sensorName = `${v[0]}/${item.sensorName}`;
+            this.form.sensorDescription = item.description;
         },
         },
         delOne(type, index) {
         delOne(type, index) {
             this.$confirm("确认是否删除?", "提示", {
             this.$confirm("确认是否删除?", "提示", {
@@ -495,6 +514,22 @@ export default {
     }
     }
 }
 }
 
 
+/deep/ .el-form {
+    .el-input,
+    .el-cascader {
+        width: 100%;
+    }
+
+    .el-cascader {
+        height: 32px;
+        line-height: 32px;
+    }
+
+    .el-cascader /deep/ .el-input {
+        width: 100%;
+    }
+}
+
 /deep/ .el-dialog__footer {
 /deep/ .el-dialog__footer {
     padding: 10px 20px 20px;
     padding: 10px 20px 20px;
     text-align: right;
     text-align: right;

+ 1 - 1
src/views/modelLibrary/components/threeSensorModel.vue

@@ -418,7 +418,7 @@ export default {
                 this.renderer.domElement
                 this.renderer.domElement
             ); //创建控件对象
             ); //创建控件对象
             this.controls.minDistance = 30;
             this.controls.minDistance = 30;
-            this.controls.maxDistance = 600;
+            this.controls.maxDistance = 720;
             this.controls.update();
             this.controls.update();
         },
         },
         animate() {
         animate() {

+ 10 - 4
src/views/modelLibrary/components/threeVehicleConfiguration.vue

@@ -1141,7 +1141,7 @@ export default {
                 document.getElementById("container")
                 document.getElementById("container")
             ); //创建控件对象
             ); //创建控件对象
             this.controls.minDistance = 30;
             this.controls.minDistance = 30;
-            this.controls.maxDistance = 600;
+            this.controls.maxDistance = 720;
             this.controls.update();
             this.controls.update();
             // this.controls.target = this.cube.position
             // this.controls.target = this.cube.position
             // this.controls.addEventListener("change", (e) => {
             // this.controls.addEventListener("change", (e) => {
@@ -1398,7 +1398,9 @@ export default {
                 //     // spinner: "el-icon-loading",
                 //     // spinner: "el-icon-loading",
                 //     background: "rgba(0, 0, 0, 0.2)",
                 //     background: "rgba(0, 0, 0, 0.2)",
                 // });
                 // });
-                showFullScreenLoading();
+                // showFullScreenLoading();
+                this.$emit('loadingDone', 'carStart');
+                // this.isLoading = true;
             }
             }
 
 
             Loader.load(
             Loader.load(
@@ -1416,7 +1418,9 @@ export default {
 
 
                         if (type === "ogt") {
                         if (type === "ogt") {
                             // loading.close();
                             // loading.close();
-                            tryHideFullScreenLoading();
+                            // tryHideFullScreenLoading();
+                            that.$emit('loadingDone', 'carDone');
+                            // that.isLoading = false;
                         }
                         }
 
 
                         that.cacheList.push(obj);
                         that.cacheList.push(obj);
@@ -1457,7 +1461,9 @@ export default {
                 (error) => {
                 (error) => {
                     if (type === "ogt") {
                     if (type === "ogt") {
                         // loading.close();
                         // loading.close();
-                        tryHideFullScreenLoading();
+                        // tryHideFullScreenLoading();
+                        that.$emit('loadingDone', 'carDone');
+                        // that.isLoading = false;
                     }
                     }
                     console.error(error);
                     console.error(error);
                 }
                 }

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

@@ -926,7 +926,7 @@ export default {
             // if (id) {
             // if (id) {
             this.$axios({
             this.$axios({
                 method: "post",
                 method: "post",
-                url: this.$api.modelLibrary.getConfigInfo,
+                url: this.$api.modelLibrary.getConfigInfoNew,
                 data: {
                 data: {
                     id,
                     id,
                 },
                 },

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

@@ -223,6 +223,9 @@ export default {
             this.doSearch();
             this.doSearch();
         },
         },
         addOne() {
         addOne() {
+            this.$store.commit("getTabname", "vehicleConfigurationDetailTabName", "");
+            localStorage.setItem("vehicleConfigurationDetailTabName", "");
+            
             this.$router.push({ path: "/vehicleConfigurationDetail" });
             this.$router.push({ path: "/vehicleConfigurationDetail" });
         },
         },
         editRow(row) {
         editRow(row) {
@@ -334,5 +337,4 @@ export default {
         color: red;
         color: red;
     }
     }
 }
 }
-
 </style>
 </style>

+ 1 - 1
src/views/page/breadCrumb.vue

@@ -137,7 +137,7 @@ export default {
                         this.scenePacketDistributionDetailTabName ||
                         this.scenePacketDistributionDetailTabName ||
                         localStorage.getItem("scenePacketDistributionDetailTabName") ||
                         localStorage.getItem("scenePacketDistributionDetailTabName") ||
                         "场景包分配详情";
                         "场景包分配详情";
-                } else if (item.name === "editAccountTab") {
+                } else if (item.name === "editAccount") {
                     item.meta.tabname =
                     item.meta.tabname =
                         this.editAccountTabName ||
                         this.editAccountTabName ||
                         localStorage.getItem("editAccountTabName") ||
                         localStorage.getItem("editAccountTabName") ||

+ 3 - 0
src/views/sceneLibrary/gradingRulesList.vue

@@ -234,6 +234,9 @@ export default {
             this.dialogVisible = true;
             this.dialogVisible = true;
         },
         },
         addOne() {
         addOne() {
+            this.$store.commit("getTabname", "gradingRuleDetailTabName", "");
+            localStorage.setItem("gradingRuleDetailTabName", "");
+
             this.$router.push({ path: "/gradingRuleDetail" });
             this.$router.push({ path: "/gradingRuleDetail" });
         },
         },
         shareRow(row) {
         shareRow(row) {

+ 3 - 0
src/views/sceneLibrary/scenarioTestPackageManagementList.vue

@@ -232,6 +232,9 @@ export default {
                 }
                 }
             }
             }
 
 
+            this.$store.commit("getTabname", "scenePacketListTabName", "");
+            localStorage.setItem("scenePacketListTabName", "");
+
             this.$router.push({ path: "/scenePacketList" });
             this.$router.push({ path: "/scenePacketList" });
         },
         },
         shareRow(row) {
         shareRow(row) {

+ 3 - 0
src/views/systemManagement/scenePacketListManagement/index.vue

@@ -302,6 +302,9 @@ export default {
             this.doSearch();
             this.doSearch();
         },
         },
         addOne() {
         addOne() {
+            this.$store.commit("getTabname", "scenePacketDetailTabName", "");
+            localStorage.setItem("scenePacketDetailTabName", "");
+
             this.$router.push({ path: "/scenePacketDetail" });
             this.$router.push({ path: "/scenePacketDetail" });
         },
         },
         editRow(row) {
         editRow(row) {

+ 3 - 0
src/views/systemManagement/vehicleModelManagement.vue

@@ -138,6 +138,9 @@ export default {
             this.doSearch();
             this.doSearch();
         },
         },
         addOne() {
         addOne() {
+            this.$store.commit("getTabname", "vehicleModelDetailTabName", "");
+            localStorage.setItem("vehicleModelDetailTabName", "");
+
             this.$router.push({ path: "/vehicleModelDetail" });
             this.$router.push({ path: "/vehicleModelDetail" });
         },
         },
         editRow(row) {
         editRow(row) {

+ 1 - 1
src/views/workManagement/components/threeProjectInfo.vue

@@ -505,7 +505,7 @@ export default {
                 this.renderer.domElement
                 this.renderer.domElement
             ); //创建控件对象
             ); //创建控件对象
             this.controls.minDistance = 30;
             this.controls.minDistance = 30;
-            this.controls.maxDistance = 600;
+            this.controls.maxDistance = 720;
             this.controls.update();
             this.controls.update();
         },
         },
         animate() {
         animate() {