Ver Fonte

手动运行项目详情增加算法来源字段

zhangliang2 há 3 anos atrás
pai
commit
b9c1f04916

+ 4 - 4
src/views/modelLibrary/components/formCamera.vue

@@ -34,7 +34,7 @@
             <el-form-item label="盲区距离(m):" prop="nearDistance">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'nearDistance' }"
                     v-model="form.nearDistance"
                 >
@@ -43,7 +43,7 @@
             <el-form-item label="探测距离(m):" prop="farDistance">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'farDistance' }"
                     v-model="form.farDistance"
                     @input="inputChange"
@@ -53,7 +53,7 @@
             <el-form-item label="水平视场角(deg):" prop="fovH">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovH' }"
                     v-model="form.fovH"
                     @input="inputChange"
@@ -63,7 +63,7 @@
             <el-form-item label="垂直视场角(deg):" prop="fovV">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovV' }"
                     v-model="form.fovV"
                 >

+ 2 - 2
src/views/modelLibrary/components/formGps.vue

@@ -34,7 +34,7 @@
             <el-form-item label="经度偏移量(deg):" prop="longitudeOffset">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'longitudeOffset' }"
                     v-model="form.longitudeOffset"
                 >
@@ -43,7 +43,7 @@
             <el-form-item label="纬度偏移量(deg):" prop="latitudeOffset">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'latitudeOffset' }"
                     v-model="form.latitudeOffset"
                 >

+ 4 - 4
src/views/modelLibrary/components/formLaserRadar.vue

@@ -34,7 +34,7 @@
             <el-form-item label="盲区距离(m):" prop="nearDistance">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'nearDistance' }"
                     v-model="form.nearDistance"
                 >
@@ -43,7 +43,7 @@
             <el-form-item label="探测距离(m):" prop="farDistance">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'farDistance' }"
                     v-model="form.farDistance"
                     @input="inputChange"
@@ -53,7 +53,7 @@
             <el-form-item label="水平视场角(deg):" prop="fovH">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovH' }"
                     v-model="form.fovH"
                     @input="inputChange"
@@ -63,7 +63,7 @@
             <el-form-item label="垂直视场角(deg):" prop="fovV">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovV' }"
                     v-model="form.fovV"
                 >

+ 6 - 6
src/views/modelLibrary/components/formPerfectSensor.vue

@@ -34,7 +34,7 @@
             <el-form-item label="盲区距离(m):" prop="nearDistance">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'nearDistance' }"
                     v-model="form.nearDistance"
                 >
@@ -43,7 +43,7 @@
             <el-form-item label="探测距离(m):" prop="farDistance">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'farDistance' }"
                     v-model="form.farDistance"
                     @input="inputChange"
@@ -53,7 +53,7 @@
             <el-form-item label="水平视场角左(deg):" prop="fovHLeft">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovHLeft' }"
                     v-model="form.fovHLeft"
                     @input="inputChange"
@@ -63,7 +63,7 @@
             <el-form-item label="水平视场角右(deg):" prop="fovHRight">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovHRight' }"
                     v-model="form.fovHRight"
                     @input="inputChange"
@@ -73,7 +73,7 @@
             <el-form-item label="垂直视场角顶(deg):" prop="fovVTop">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovVTop' }"
                     v-model="form.fovVTop"
                 >
@@ -82,7 +82,7 @@
             <el-form-item label="垂直视场角底(deg):" prop="fovVBottom">
                 <el-input
                     placeholder="请输入"
-                    maxlength="9"
+                    maxlength="12"
                     v-autoTrim="{ obj: form, key: 'fovVBottom' }"
                     v-model="form.fovVBottom"
                 >

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

@@ -88,7 +88,7 @@
                         <el-form-item label="X(m):" prop="sensorX">
                             <el-input
                                 placeholder="请输入"
-                                maxlength="9"
+                                maxlength="12"
                                 v-autoTrim="{ obj: formA, key: 'sensorX' }"
                                 v-model="formA.sensorX"
                                 @input="inputChange"
@@ -98,7 +98,7 @@
                         <el-form-item label="Y(m):" prop="sensorY">
                             <el-input
                                 placeholder="请输入"
-                                maxlength="9"
+                                maxlength="12"
                                 v-autoTrim="{ obj: formA, key: 'sensorY' }"
                                 v-model="formA.sensorY"
                                 @input="inputChange"
@@ -108,7 +108,7 @@
                         <el-form-item label="Z(m):" prop="sensorZ">
                             <el-input
                                 placeholder="请输入"
-                                maxlength="9"
+                                maxlength="12"
                                 v-autoTrim="{ obj: formA, key: 'sensorZ' }"
                                 v-model="formA.sensorZ"
                             >
@@ -117,7 +117,7 @@
                         <el-form-item label="横摆角(deg):" prop="sensorH">
                             <el-input
                                 placeholder="请输入"
-                                maxlength="9"
+                                maxlength="12"
                                 v-autoTrim="{ obj: formA, key: 'sensorH' }"
                                 v-model="formA.sensorH"
                                 @input="inputChange"
@@ -127,7 +127,7 @@
                         <el-form-item label="俯仰角(deg):" prop="sensorP">
                             <el-input
                                 placeholder="请输入"
-                                maxlength="9"
+                                maxlength="12"
                                 v-autoTrim="{ obj: formA, key: 'sensorP' }"
                                 v-model="formA.sensorP"
                             >
@@ -136,7 +136,7 @@
                         <el-form-item label="翻滚角(deg):" prop="sensorR">
                             <el-input
                                 placeholder="请输入"
-                                maxlength="9"
+                                maxlength="12"
                                 v-autoTrim="{ obj: formA, key: 'sensorR' }"
                                 v-model="formA.sensorR"
                             >
@@ -436,7 +436,7 @@ export default {
                 let oneIndex = element[1].findIndex(
                     (i) => i.sensorX == null && i.sensorY == null
                 );
-                // console.log(oneIndex);
+
                 if (oneIndex > -1) {
                     this.$refs.handleConfigList.configHandle(
                         element[0],
@@ -480,17 +480,6 @@ export default {
                     }
 
                     if (!this.validateSensorsList()) return;
-                    // console.log(this.configList);
-                    // console.log(Object.keys(this.configList));
-                    // console.log(Object.values(this.configList));
-                    // console.log(Object.entries(this.configList));
-
-                    // this.curOne = {
-                    //     name: "gps",
-                    //     index: 0,
-                    // };
-
-                    // return;
 
                     let data = Object.assign({}, this.form, {
                         configSensors: this.configList,

+ 23 - 10
src/views/workManagement/manualRunProjectDetail.vue

@@ -28,6 +28,14 @@
                     >
                     </el-input>
                 </el-form-item>
+                <el-form-item label="算法来源:" prop="algorithmType">
+                    <el-radio v-model="form.algorithmType" label="1"
+                        >私有导入</el-radio
+                    >
+                    <el-radio v-model="form.algorithmType" label="3"
+                        >算法平台</el-radio
+                    >
+                </el-form-item>
                 <el-form-item label="选择算法:" prop="algorithm">
                     <el-select v-model="form.algorithm">
                         <el-option
@@ -149,6 +157,7 @@ export default {
                 id: "",
                 projectName: "", // 项目名称
                 projectDescribe: "", // 项目描述
+                algorithmType: "1", // 算法来源
                 algorithm: "", // 选择算法
                 vehicle: "", // 选择车辆
                 scene: "", // 选择场景
@@ -169,6 +178,9 @@ export default {
                 projectDescribe: [
                     { required: true, message: "请输入", trigger: "blur" },
                 ],
+                algorithmType: [
+                    { required: true, message: "请选择", trigger: "change" },
+                ],
                 algorithm: [
                     { required: true, message: "请选择", trigger: "change" },
                 ],
@@ -211,6 +223,7 @@ export default {
                 url: this.$api.workManagement.selectDropDownByType,
                 data: {
                     dropDownType: "",
+                    algorithmType: this.form.algorithmType,
                 },
             }).then((res) => {
                 if (res.code == 200 && res.info) {
@@ -256,7 +269,6 @@ export default {
             } else {
                 this.sensors = sensor.split(",");
             }
-            console.log(this.sensors);
         },
         save(isAdd = false, needChange = false) {
             // isAdd是否强制新增,needChange是否需要改变状态
@@ -314,9 +326,6 @@ export default {
     },
 
     mounted() {
-        this.getLists();
-        this.getMaxSimulationTime();
-
         if (this.$route.query.id) {
             let id = "";
             this.form.id = id = this.$route.query.id;
@@ -338,6 +347,9 @@ export default {
                     }
                 });
             }
+        }else {
+            this.getLists();
+            this.getMaxSimulationTime();
         }
     },
 };
@@ -374,32 +386,33 @@ export default {
 
         .tipA {
             height: 32px;
-            margin-top: 226px;
+            // 按54往上加
+            margin-top: 280px;
 
             .iconA {
                 background: url("../../assets/common/image/sensor/001.png")
                     center no-repeat;
-                    background-size: contain;
+                background-size: contain;
             }
             .iconB {
                 background: url("../../assets/common/image/sensor/002.png")
                     center no-repeat;
-                    background-size: contain;
+                background-size: contain;
             }
             .iconC {
                 background: url("../../assets/common/image/sensor/003.png")
                     center no-repeat;
-                    background-size: contain;
+                background-size: contain;
             }
             .iconD {
                 background: url("../../assets/common/image/sensor/004.png")
                     center no-repeat;
-                    background-size: contain;
+                background-size: contain;
             }
             .iconE {
                 background: url("../../assets/common/image/sensor/005.png")
                     center no-repeat;
-                    background-size: contain;
+                background-size: contain;
             }
 
             span {

+ 2 - 2
vue.config.js

@@ -101,8 +101,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',  // 赵艳
                 // target: 'http://10.15.12.70',  // windowstest