zhangliang2 3 роки тому
батько
коміт
a76a073883

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

@@ -19,7 +19,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.camera"
-                    :key="item.id + index"
+                    :key="item.id + index.toString()"
                 >
                     <div
                         class="nameBox"
@@ -61,7 +61,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.ogt"
-                    :key="item.id + index"
+                    :key="item.id + index.toString()"
                 >
                     <div
                         class="nameBox"
@@ -102,7 +102,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.lidar"
-                    :key="item.id + index"
+                    :key="item.id + index.toString()"
                 >
                     <div
                         class="nameBox"
@@ -144,7 +144,7 @@
                 <li
                     class="content"
                     v-for="(item, index) in configList.gps"
-                    :key="item.id + index"
+                    :key="item.id + index.toString()"
                 >
                     <div
                         class="nameBox"

+ 8 - 2
src/views/workManagement/projectInfo.vue

@@ -262,8 +262,14 @@ export default {
     },
 
     methods: {
-        viewRow() {
-            this.$router.push({ path: "/taskInfo" });
+        viewRow(row) {
+            this.$router.push({
+                path: "/taskInfo",
+                query: {
+                    taskId: row.id,
+                    id: row.pid,
+                },
+            });
         },
         toReport() {
             if (this.info.nowRunState === "30") {

+ 42 - 39
src/views/workManagement/taskInfo.vue

@@ -27,7 +27,7 @@
                 </div>
                 <div class="info">
                     <span>结束时间:</span>
-                   <b>{{ info.runEndTime }}</b>
+                    <b>{{ info.runEndTime }}</b>
                 </div>
                 <div class="info">
                     <span>完成状态:</span>
@@ -38,7 +38,7 @@
 
         <div class="panel boxB">
             <div class="titlePanel">
-                <div class="titlePanelBor">三维仿真动画</div>
+                <div class="titlePanelBor">仿真动画</div>
             </div>
             <div class="contentBox">
                 <div class="content">
@@ -89,7 +89,7 @@
             <div class="contentBox">
                 <div class="content">
                     <div class="tip">
-                        自车速度方差:{{info.speedVariance}}
+                        自车速度方差:{{ info.speedVariance }}
                     </div>
                     <tableList
                         :columns="columns"
@@ -100,7 +100,9 @@
                 </div>
                 <div class="content">
                     <div class="tip">
-                        自车横摆角速度均方根:{{info.swingSpeedMeanSquareRoot}}
+                        自车横摆角速度均方根:{{
+                            info.swingSpeedMeanSquareRoot
+                        }}
                     </div>
                     <tableList
                         :columns="columnsA"
@@ -119,31 +121,31 @@
             <div class="contentBox">
                 <div class="content">
                     <div class="chart">
-                        <div class="title">变化曲线</div>
+                        <div class="title">acceleration变化曲线</div>
                         <line-chart id="lineA"></line-chart>
                     </div>
                     <div class="chart">
-                        <div class="title">变化曲线</div>
+                        <div class="title">lane_offset变化曲线</div>
                         <line-chart id="lineB"></line-chart>
                     </div>
                     <div class="chart">
-                        <div class="title">变化曲线</div>
+                        <div class="title">brake变化曲线</div>
                         <line-chart id="lineC"></line-chart>
                     </div>
                     <div class="chart">
-                        <div class="title">变化曲线</div>
+                        <div class="title">steeting_wheel变化曲线</div>
                         <line-chart id="lineD"></line-chart>
                     </div>
                     <div class="chart">
-                        <div class="title">变化曲线</div>
+                        <div class="title">throttle变化曲线</div>
                         <line-chart id="lineE"></line-chart>
                     </div>
                     <div class="chart">
-                        <div class="title">变化曲线</div>
+                        <div class="title">yaw_rate变化曲线</div>
                         <line-chart id="lineF"></line-chart>
                     </div>
                     <div class="chart">
-                        <div class="title">变化曲线</div>
+                        <div class="title">velocity变化曲线</div>
                         <line-chart id="lineG"></line-chart>
                     </div>
                 </div>
@@ -161,12 +163,12 @@ export default {
     components: { tableList, lineChart },
     data() {
         return {
-            id: "",
+            // id: "",
             info: {},
             columns: [
                 {
                     label: "方差范围",
-                    prop: "id",
+                    prop: "range",
                 },
                 {
                     label: "舒适程度",
@@ -180,15 +182,15 @@ export default {
                 firstRequest: false,
                 data: [
                     {
-                        id: "0<方差值<5",
+                        range: "0≤方差值≤5",
                         ktName: "舒适",
                     },
                     {
-                        id: "5<方差值<10",
+                        range: "5<方差值≤10",
                         ktName: "不舒适",
                     },
                     {
-                        id: "方差值>10",
+                        range: "方差值>10",
                         ktName: "极不舒适",
                     },
                 ],
@@ -197,7 +199,7 @@ export default {
             columnsA: [
                 {
                     label: "均方根范围",
-                    prop: "id",
+                    prop: "range",
                 },
                 {
                     label: "舒适程度",
@@ -211,15 +213,15 @@ export default {
                 firstRequest: false,
                 data: [
                     {
-                        id: "0<均方根值<0.02",
+                        range: "0≤均方根值≤0.02",
                         ktName: "舒适",
                     },
                     {
-                        id: "0.02<均方根值<0.04",
+                        range: "0.02<均方根值≤0.04",
                         ktName: "不舒适",
                     },
                     {
-                        id: "均方根值>0.04",
+                        range: "均方根值>0.04",
                         ktName: "极不舒适",
                     },
                 ],
@@ -233,25 +235,26 @@ export default {
     methods: {},
 
     mounted() {
-        if (this.$route.query.id) {
-            this.id = this.$route.query.id;
-
-            if (this.id) {
-                this.$axios({
-                    method: "post",
-                    url: this.$api.workManagement.selectProjectTaskById,
-                    data: {
-                        id: this.id,
-                        taskId: "1",
-                    },
-                }).then((res) => {
-                    if (res.code == 200 && res.info) {
-                        this.info = res.info;
-                    } else {
-                        this.$message.error(res.message || "获取信息失败");
-                    }
-                });
-            }
+        let taskId = this.$route.query.taskId;
+        let id = this.$route.query.id;
+
+        if (taskId && id) {
+            let id = this.$route.query.id;
+
+            this.$axios({
+                method: "post",
+                url: this.$api.workManagement.selectProjectTaskById,
+                data: {
+                    id,
+                    taskId,
+                },
+            }).then((res) => {
+                if (res.code == 200 && res.info) {
+                    this.info = res.info;
+                } else {
+                    this.$message.error(res.message || "获取信息失败");
+                }
+            });
         }
     },
 };