场景库添加标签

src/views/sceneLibrary/naturalDrivingScenarioList.vue

@@ -76,24 +76,27 @@
                 ></el-cascader>
             </template>
             <template slot="searchItem27">
-                <el-checkbox-group v-model="searchParams.c">
-                    <el-checkbox-button :label="1" :key="1" class="labelA"
-                        >绿灯</el-checkbox-button
+                <el-checkbox-group v-model="labels">
+                    <el-checkbox-button label="1" :key="1" class="labelA"
+                        >高速</el-checkbox-button
                     >
-                    <el-checkbox-button :label="2" :key="2" class="labelB"
-                        >桥梁</el-checkbox-button
+                    <el-checkbox-button label="2" :key="2" class="labelB"
+                        >切入</el-checkbox-button
                     >
-                    <el-checkbox-button :label="3" :key="3" class="labelC"
-                        >晴天</el-checkbox-button
+                    <el-checkbox-button label="3" :key="3" class="labelC"
+                        >切出</el-checkbox-button
                     >
-                    <el-checkbox-button :label="4" :key="4" class="labelD"
-                        >直道</el-checkbox-button
+                    <el-checkbox-button label="4" :key="4" class="labelD"
+                        >变道</el-checkbox-button
                     >
-                    <el-checkbox-button :label="5" :key="5" class="labelC"
-                        >晴天</el-checkbox-button
+                    <el-checkbox-button label="5" :key="5" class="labelA"
+                        >匝道</el-checkbox-button
                     >
-                    <el-checkbox-button :label="6" :key="6" class="labelD"
-                        >直道</el-checkbox-button
+                    <el-checkbox-button label="6" :key="6" class="labelB"
+                        >隧道</el-checkbox-button
+                    >
+                    <el-checkbox-button label="7" :key="7" class="labelC"
+                        >掉头</el-checkbox-button
                     >
                 </el-checkbox-group>
             </template>
@@ -131,16 +134,6 @@
             :pagination="pagination"
             index
         >
-            <el-table-column label="标签" slot="asd" align="center">
-                <template>
-                    <div class="labelPanel">
-                        <span class="labelBox labelA">绿灯</span>
-                        <span class="labelBox labelB">桥梁</span>
-                        <span class="labelBox labelC">晴天</span>
-                        <span class="labelBox labelD">直道</span>
-                    </div>
-                </template>
-            </el-table-column>
             <el-table-column
                 label="操作"
                 slot="cgInfos"
@@ -199,8 +192,16 @@ export default {
                 selfBehavior: [], // 自车行为
                 targetBehavior: [], // 目标行为
                 naturalEnvironment: [], // 自然环境
-                c: [],
+
+                highSpeed: [], // 高速
+                ramp: [], // 匝道
+                tunnel: [], // 隧道
+                cutIn: [], // 切入
+                cutOut: [], // 切出
+                laneChange: [], // 变道
+                turnAround: [], // 掉头
             },
+            labels: [],
             list: [],
             roadList: [],
             infrastructureList: [],
@@ -234,8 +235,7 @@ export default {
                 },
                 {
                     label: "标签",
-                    prop: "asd",
-                    template: true,
+                    prop: "label",
                 },
                 {
                     label: "操作",
@@ -276,6 +276,101 @@ export default {
 
     methods: {
         doSearch() {
+            this.searchParams.highSpeed = this.labels.includes("1")
+                ? [["roadType", "高速"]]
+                : [];
+            this.searchParams.cutIn = this.labels.includes("2")
+                ? [
+                      [
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "机动车从左侧切入成功",
+                      ],
+                      [
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "机动车从右侧切入成功",
+                      ],
+                  ]
+                : [];
+            this.searchParams.cutOut = this.labels.includes("3")
+                ? [
+                      [
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "机动车向左侧切出成功",
+                      ],
+                      [
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "targetBehavior",
+                          "机动车向右侧切出成功",
+                      ],
+                  ]
+                : [];
+            this.searchParams.laneChange = this.labels.includes("4")
+                ? [
+                      [
+                          "selfBehavior",
+                          "selfBehavior",
+                          "selfBehavior",
+                          "向左变道成功",
+                      ],
+                      [
+                          "selfBehavior",
+                          "selfBehavior",
+                          "selfBehavior",
+                          "向右变道成功",
+                      ],
+                      [
+                          "selfBehavior",
+                          "selfBehavior",
+                          "selfBehavior",
+                          "向左连续变道",
+                      ],
+                      [
+                          "selfBehavior",
+                          "selfBehavior",
+                          "selfBehavior",
+                          "向右连续变道",
+                      ],
+                      [
+                          "selfBehavior",
+                          "selfBehavior",
+                          "selfBehavior",
+                          "向左变道超车",
+                      ],
+                      [
+                          "selfBehavior",
+                          "selfBehavior",
+                          "selfBehavior",
+                          "向右变道超车",
+                      ],
+                  ]
+                : [];
+            this.searchParams.ramp = this.labels.includes("5")
+                ? [["ramp", "是"]]
+                : [];
+            this.searchParams.tunnel = this.labels.includes("6")
+                ? [["tunnel", "是"]]
+                : [];
+            this.searchParams.turnAround = this.labels.includes("7")
+                ? [
+                      ["selfBehavior", "直路掉头"],
+                      ["selfBehavior", "selfBehavior", "路口掉头"],
+                  ]
+                : [];
             this.refreshList(this.searchParams);
         },
         //刷新table
@@ -294,6 +389,13 @@ export default {
                 targetBehavior: [],
                 naturalEnvironment: [],
                 temporaryOperation: [],
+                highSpeed: [],
+                ramp: [],
+                tunnel: [],
+                cutIn: [],
+                cutOut: [],
+                laneChange: [],
+                turnAround: [],
             };
             this.doSearch();
         },

src/views/sceneLibrary/standardRegulationSimulationScenarioList.vue

@@ -35,24 +35,18 @@
                 </el-input>
             </template>
             <template slot="searchItem27">
-                <el-checkbox-group v-model="searchParams.c">
-                    <el-checkbox-button :label="1" :key="1" class="labelA"
-                        >绿灯</el-checkbox-button
+                <el-checkbox-group v-model="labels">
+                    <el-checkbox-button label="ISO" :key="1" class="labelA"
+                        >ISO</el-checkbox-button
                     >
-                    <el-checkbox-button :label="2" :key="2" class="labelB"
-                        >桥梁</el-checkbox-button
+                    <el-checkbox-button label="GB" :key="2" class="labelB"
+                        >GB</el-checkbox-button
                     >
-                    <el-checkbox-button :label="3" :key="3" class="labelC"
-                        >晴天</el-checkbox-button
+                    <el-checkbox-button label="C-NCAP" :key="3" class="labelC"
+                        >C-NCAP</el-checkbox-button
                     >
-                    <el-checkbox-button :label="4" :key="4" class="labelD"
-                        >直道</el-checkbox-button
-                    >
-                    <el-checkbox-button :label="5" :key="5" class="labelC"
-                        >晴天</el-checkbox-button
-                    >
-                    <el-checkbox-button :label="6" :key="6" class="labelD"
-                        >直道</el-checkbox-button
+                    <el-checkbox-button label="E-NCAP" :key="4" class="labelD"
+                        >E-NCAP</el-checkbox-button
                     >
                 </el-checkbox-group>
             </template>
@@ -90,16 +84,6 @@
             :pagination="pagination"
             index
         >
-            <el-table-column label="标签" slot="asd" align="center">
-                <template>
-                    <div class="labelPanel">
-                        <span class="labelBox labelA">绿灯</span>
-                        <span class="labelBox labelB">桥梁</span>
-                        <span class="labelBox labelC">晴天</span>
-                        <span class="labelBox labelD">直道</span>
-                    </div>
-                </template>
-            </el-table-column>
             <el-table-column
                 label="操作"
                 slot="cgInfos"
@@ -154,8 +138,9 @@ export default {
                 sceneName: "", //场景名称
                 regulationType: [], //法规类型
                 standardType: "", //标准类型
-                c: "", // 标签
+                label: [],
             },
+            labels: [], // 标签
             regulationTypeList: [],
             columns: [
                 //表格列
@@ -173,8 +158,7 @@ export default {
                 },
                 {
                     label: "标签",
-                    prop: "asd",
-                    template: true,
+                    prop: "regulationType",
                 },
                 {
                     label: "操作",
@@ -213,6 +197,7 @@ export default {
 
     methods: {
         doSearch() {
+            this.searchParams.label = [...this.labels];
             this.refreshList(this.searchParams);
         },
         //刷新table
@@ -226,7 +211,9 @@ export default {
                 sceneName: "",
                 regulationType: [],
                 standardType: "",
+                label: [],
             };
+            this.labels = [];
             this.doSearch();
         },
         viewRow(row) {

src/views/sceneLibrary/trafficAccidentSimulationScenarioList.vue

@@ -68,24 +68,24 @@
                 </el-select>
             </template>
             <template slot="searchItem27">
-                <el-checkbox-group v-model="searchParams.c">
-                    <el-checkbox-button :label="1" :key="1" class="labelA"
-                        >绿灯</el-checkbox-button
+                <el-checkbox-group v-model="labels">
+                    <el-checkbox-button label="追尾" :key="1" class="labelA"
+                        >追尾</el-checkbox-button
                     >
-                    <el-checkbox-button :label="2" :key="2" class="labelB"
-                        >桥梁</el-checkbox-button
+                    <el-checkbox-button label="切入" :key="2" class="labelB"
+                        >目标车切入</el-checkbox-button
                     >
-                    <el-checkbox-button :label="3" :key="3" class="labelC"
-                        >晴天</el-checkbox-button
+                    <el-checkbox-button
+                        label="沿弯道行驶"
+                        :key="3"
+                        class="labelC"
+                        >目标车沿弯道行驶</el-checkbox-button
                     >
-                    <el-checkbox-button :label="4" :key="4" class="labelD"
-                        >直道</el-checkbox-button
-                    >
-                    <el-checkbox-button :label="5" :key="5" class="labelC"
-                        >晴天</el-checkbox-button
-                    >
-                    <el-checkbox-button :label="6" :key="6" class="labelD"
-                        >直道</el-checkbox-button
+                    <el-checkbox-button
+                        label="机动车-机动车冲突"
+                        :key="4"
+                        class="labelD"
+                        >机动车-机动车冲突</el-checkbox-button
                     >
                 </el-checkbox-group>
             </template>
@@ -123,16 +123,6 @@
             :pagination="pagination"
             index
         >
-            <el-table-column label="标签" slot="asd" align="center">
-                <template>
-                    <div class="labelPanel">
-                        <span class="labelBox labelA">绿灯</span>
-                        <span class="labelBox labelB">桥梁</span>
-                        <span class="labelBox labelC">晴天</span>
-                        <span class="labelBox labelD">直道</span>
-                    </div>
-                </template>
-            </el-table-column>
             <el-table-column
                 label="操作"
                 slot="cgInfos"
@@ -190,8 +180,12 @@ export default {
                 selfReaction: [], //自车反应行为
                 conflictBehavior: [], //冲突行为
                 conflictType: [], //冲突类型
-                c: "",
+                rearEndCollision: "", // 追尾
+                cutIn: "", // 切入
+                driveCurve: "", // 沿弯道行驶
+                carConflict: "", // 机动车-机动车冲突
             },
+            labels: [],
             selfDrivingList: [],
             targetDrivingList: [],
             selfReactionList: [],
@@ -225,8 +219,7 @@ export default {
                 },
                 {
                     label: "标签",
-                    prop: "asd",
-                    template: true,
+                    prop: "label",
                 },
                 {
                     label: "操作",
@@ -264,6 +257,20 @@ export default {
 
     methods: {
         doSearch() {
+            this.searchParams.rearEndCollision = this.labels.includes("追尾")
+                ? "追尾"
+                : "";
+            this.searchParams.cutIn = this.labels.includes("切入")
+                ? "切入"
+                : "";
+            this.searchParams.driveCurve = this.labels.includes("沿弯道行驶")
+                ? "沿弯道行驶"
+                : "";
+            this.searchParams.carConflict = this.labels.includes(
+                "机动车-机动车冲突"
+            )
+                ? "机动车-机动车冲突"
+                : "";
             this.refreshList(this.searchParams);
         },
         //刷新table
@@ -280,7 +287,12 @@ export default {
                 selfReaction: [],
                 conflictBehavior: [],
                 conflictType: [],
+                rearEndCollision: "",
+                cutIn: "",
+                driveCurve: "",
+                carConflict: "",
             };
+            this.labels = [];
             this.doSearch();
         },
         viewRow(row) {