分公有私有

src/views/systemManagement/scenePacketListManagement/detail.vue

@@ -89,6 +89,7 @@
                 :sceneType="types[3]"
                 @selectedData="selectedData"
                 :scenarioWeatherList="scenarioWeatherList"
+                :scenarioRoadTypeList="scenarioRoadTypeList"
             ></generalization-list>
         </div>
 
@@ -149,6 +150,7 @@ export default {
             regulationTypeList: [],
             fileNameList: [],
             scenarioWeatherList: [],
+            scenarioRoadTypeList: [],
         };
     },
 
@@ -218,6 +220,7 @@ export default {
             conflictTypeList: "conflictType",
             regulationTypeList: "regulationType",
             scenarioWeatherList: "scenarioWeather",
+            scenarioRoadTypeList: "scenarioRoadType",
         });
 
         await this.$dicsTreesInit({

src/views/systemManagement/scenePacketListManagement/generalizationList.vue

@@ -30,6 +30,22 @@
                 </el-select>
             </template>
             <template slot="searchItem3">
+                <span class="label">道路类型</span>
+                <el-select
+                    v-model="searchParams.scenarioRoadType"
+                    multiple
+                    size="small"
+                    clearable
+                >
+                    <el-option
+                        v-for="item in scenarioRoadTypeList"
+                        :label="item.caption"
+                        :value="item.code"
+                        :key="item.code"
+                    ></el-option>
+                </el-select>
+            </template>
+            <!-- <template slot="searchItem3">
                 <span class="label">天气</span>
                 <el-select
                     v-model="searchParams.scenarioWeather"
@@ -53,7 +69,7 @@
                     placeholder="时间"
                 >
                 </el-time-picker>
-            </template>
+            </template> -->
             <template slot="searchBtn1">
                 <el-button type="primary" @click="doSearch">查询</el-button>
             </template>
@@ -96,8 +112,10 @@ export default {
                 //搜索参数
                 sceneId: "", // 场景类型编号
                 fileName: [], // 功能模块
-                scenarioWeather: [], // 天气
-                scenarioTime: "", // 时间
+                scenarioRoadType: [], // 道路类型
+                share: "0",
+                // scenarioWeather: [], // 天气
+                // scenarioTime: "", // 时间
             },
             labels: [],
             fileNameList: [],
@@ -125,13 +143,17 @@ export default {
                     prop: "scenarioRoadType",
                 },
                 {
-                    label: "时间",
-                    prop: "scenarioTime",
-                },
-                {
-                    label: "天气",
-                    prop: "scenarioWeather",
+                    label: "场景简述",
+                    prop: "scenarioResume",
                 },
+                // {
+                //     label: "时间",
+                //     prop: "scenarioTime",
+                // },
+                // {
+                //     label: "天气",
+                //     prop: "scenarioWeather",
+                // },
             ],
             getDataWay: {
                 //加载表格数据
@@ -139,7 +161,9 @@ export default {
                 type: "post",
                 // firstRequest: false,
                 data: this.$api.sceneLibrary.querySceneGeneralTemplateList,
-                param: {},
+                param: {
+                    share: "0",
+                },
             },
         };
     },
@@ -149,6 +173,10 @@ export default {
             type: Array,
             default: [],
         },
+        scenarioRoadTypeList: {
+            type: Array,
+            default: [],
+        },
     },
 
     methods: {
@@ -156,8 +184,10 @@ export default {
             this.searchParams = {
                 sceneId: "",
                 fileName: [],
-                scenarioWeather: [],
-                scenarioTime: "",
+                scenarioRoadType: [],
+                share: "0",
+                // scenarioWeather: [],
+                // scenarioTime: "",
             };
             this.doSearch();
         },

src/views/systemManagement/scenePacketListManagement/naturalDrivingList.vue

@@ -130,6 +130,7 @@ export default {
                 selfBehavior: [], // 自车行为
                 targetBehavior: [], // 目标行为
                 naturalEnvironment: [], // 自然环境
+                share: "0",
             },
             props: {
                 multiple: true,
@@ -161,7 +162,9 @@ export default {
                 type: "post",
                 // firstRequest: false,
                 data: this.$api.sceneLibrary.querySceneNaturalList,
-                param: {},
+                param: {
+                    share: "0",
+                },
             },
         };
     },
@@ -208,6 +211,7 @@ export default {
                 targetBehavior: [],
                 naturalEnvironment: [],
                 temporaryOperation: [],
+                share: "0",
             };
             this.doSearch();
         },

src/views/systemManagement/scenePacketListManagement/standardRegulationSimulationList.vue

@@ -84,6 +84,7 @@ export default {
                 sceneName: "", //场景名称
                 regulationType: [], //法规类型
                 standardType: "", //标准类型
+                share: "0",
             },
             columns: [
                 //表格列
@@ -106,7 +107,9 @@ export default {
                 type: "post",
                 // firstRequest: false,
                 data: this.$api.sceneLibrary.queryStandardsRegulationsList,
-                param: {},
+                param: {
+                    share: "0",
+                },
             },
         };
     },
@@ -124,6 +127,7 @@ export default {
                 sceneName: "",
                 regulationType: [],
                 standardType: "",
+                share: "0",
             };
             this.doSearch();
         },

src/views/systemManagement/scenePacketListManagement/trafficAccidentSimulationList.vue

@@ -134,6 +134,7 @@ export default {
                 selfReaction: [], //自车反应行为
                 conflictBehavior: [], //冲突行为
                 conflictType: [], //冲突类型
+                share: "0",
             },
             columns: [
                 //表格列
@@ -168,7 +169,9 @@ export default {
                 type: "post",
                 // firstRequest: false,
                 data: this.$api.sceneLibrary.querySceneAccidentList,
-                param: {},
+                param: {
+                    share: "0",
+                },
             },
         };
     },
@@ -205,6 +208,7 @@ export default {
                 selfReaction: [],
                 conflictBehavior: [],
                 conflictType: [],
+                share: "0",
             };
             this.doSearch();
         },