Prechádzať zdrojové kódy

车辆配置详情参数调整

zhangliang2 3 rokov pred
rodič
commit
9fb26f2457

BIN
src/assets/common/image/sensor/l1.png


BIN
src/assets/common/image/sensor/l2.png


BIN
src/assets/common/image/sensor/l3.png


BIN
src/assets/common/image/sensor/l4.png


BIN
src/assets/common/image/sensor/l5.png


+ 28 - 6
src/views/modelLibrary/components/canvasVehicleConfiguration.vue

@@ -9,29 +9,49 @@
 //import  from '';
 
 export default {
-    name: "canvasVehicleConfiguration", //
+    name: "canvasVehicleConfiguration", // 车辆配置详情中的canvas
     components: {},
     data() {
         return {
             // modelImgSrc: require("@/assets/common/image/others/carTopView.png"),
-            aSrc: require("@/assets/common/image/others/sensorIcon.png"),
+            // aSrc: require("@/assets/common/image/others/sensorIcon.png"),
             ctx: null,
             ctxBg: null,
             imgBg: null,
             imgIcon: null,
-            rate: 70, // 换算比例
+            rate: 70 / 1000, // 换算比例 70为给出的比例关系
         };
     },
 
     props: {
         coordinate: {
             type: Object,
-            default: { x: 0, y: 0, h: 60 },
+            default: { x: 0, y: 0, h: 0 },
         },
         modelImgSrc: {
             type: String,
             default: require("@/assets/common/image/others/carTopView.png"),
         },
+        curOneName: {
+            type: String,
+            default: "camera",
+        },
+    },
+
+    computed: {
+        sensorSrc() {
+            if (this.curOneName === "camera") {
+                return require("@/assets/common/image/sensor/l1.png");
+            } else if (this.curOneName === "ogt") {
+                return require("@/assets/common/image/sensor/l2.png");
+            } else if (this.curOneName === "lidar") {
+                return require("@/assets/common/image/sensor/l3.png");
+            } else if (this.curOneName === "gps") {
+                return require("@/assets/common/image/sensor/l5.png");
+            } else {
+                return require("@/assets/common/image/sensor/l1.png");
+            }
+        },
     },
 
     watch: {
@@ -46,6 +66,7 @@ export default {
     methods: {
         draw(data) {
             if (data.x === "" || data.y === "" || data.h === "") return;
+            this.imgIcon.src = this.sensorSrc;
 
             let rate = this.rate;
             // 摄像头从自己左上角的原点开始绘制,需要移到自己的中心点
@@ -55,7 +76,8 @@ export default {
             let h2 = 90 + +data.h / 2;
 
             this.ctx.clearRect(-250, -40, 500, 1000);
-            this.ctx.drawImage(this.imgIcon, x - 6, y - 6, 20.5, 14.5);
+            // this.ctx.drawImage(this.imgIcon, x - 6, y - 6, 20.5, 14.5);
+            this.ctx.drawImage(this.imgIcon, x - 6, y - 6, 20, 20);
             this.ctx.beginPath();
 
             //定义起点
@@ -92,7 +114,7 @@ export default {
             };
 
             this.imgIcon = new Image();
-            this.imgIcon.src = this.aSrc;
+            this.imgIcon.src = this.sensorSrc;
         });
     },
 };

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

@@ -24,6 +24,8 @@
                     >
                     </el-input>
                 </el-form-item>
+            </div>
+            <div class="flexBox headBox">
                 <el-form-item label="车辆名称:" prop="vehicleId">
                     <el-select v-model="form.vehicleId" @change="vehicleChange">
                         <el-option
@@ -68,6 +70,7 @@
                     ref="canvasSensor"
                     :coordinate="coordinate"
                     :modelImgSrc="modelImgSrc"
+                    :curOneName="curOne.name"
                 ></canvas-sensor>
             </div>
 
@@ -85,7 +88,7 @@
                     label-width="108px"
                 >
                     <div class="forms">
-                        <el-form-item label="X(m):" prop="sensorX">
+                        <el-form-item label="X(mm):" prop="sensorX">
                             <el-input
                                 placeholder="请输入"
                                 maxlength="12"
@@ -95,7 +98,7 @@
                             >
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="Y(m):" prop="sensorY">
+                        <el-form-item label="Y(mm):" prop="sensorY">
                             <el-input
                                 placeholder="请输入"
                                 maxlength="12"
@@ -105,7 +108,7 @@
                             >
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="Z(m):" prop="sensorZ">
+                        <el-form-item label="Z(mm):" prop="sensorZ">
                             <el-input
                                 placeholder="请输入"
                                 maxlength="12"
@@ -358,7 +361,7 @@ export default {
                         (i) => i.sensorPort + ""
                     );
                     ports.splice(this.curOne.index, 1);
-                    
+
                     if (ports.includes(value)) {
                         callback(new Error(rule.message));
                         return;

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

@@ -9,7 +9,7 @@
 //import  from '';
 
 export default {
-    name: "canvasProjectInfo", //
+    name: "canvasProjectInfo", // 任务详情中的canvas
     components: {},
     data() {
         return {