feat:标准化测试字段添加

src/views/sceneLibrary/components/realSceneList.vue

@@ -10,6 +10,7 @@
                     <el-tab-pane label="自然驾驶场景" name="1"></el-tab-pane>
                     <el-tab-pane label="标准法规场景" name="2"></el-tab-pane>
                     <el-tab-pane label="交通事故场景" name="3"></el-tab-pane>
+                    <el-tab-pane label="基准场景库" name="4"></el-tab-pane>
                 </el-tabs>
             </div>
 
@@ -100,6 +101,88 @@
                                 :key="item.code"
                             ></el-option>
                         </el-select>
+                    </template>
+                                             <!-- 复杂度 -->
+                                             <template slot="searchItem5">
+                        <span class="label">复杂度</span>
+                        <el-input
+                        v-model="searchParamsB.a"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                        <span class="dateSeparator">至</span>
+                        <el-input
+                        v-model="searchParamsB.b"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                    </template>
+                    <!-- 危险度 -->
+                    <template slot="searchItem6">
+                        <span class="label">危险度</span>
+                        <el-input
+                        v-model="searchParamsB.a"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                        <span class="dateSeparator">至</span>
+                        <el-input
+                        v-model="searchParamsB.b"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                    </template>
+                    <template slot="searchItem7">
+                        <span class="label">复杂度等级</span>
+                        <el-select
+                        v-model="searchParamsB.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="searchItem7">
+                        <span class="label">危险度等级</span>
+                        <el-select
+                        v-model="searchParamsB.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="searchBtn1">
                         <el-button type="primary" @click="doSearchA"
@@ -226,6 +309,88 @@
                             clearable=""
                             size="small"
                         ></el-cascader>
+                    </template>
+                                    <!-- 复杂度 -->
+                    <template slot="searchItem7">
+                        <span class="label">复杂度</span>
+                        <el-input
+                        v-model="searchParamsB.a"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                        <span class="dateSeparator">至</span>
+                        <el-input
+                        v-model="searchParamsB.b"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                    </template>
+                    <!-- 危险度 -->
+                    <template slot="searchItem5">
+                        <span class="label">危险度</span>
+                        <el-input
+                        v-model="searchParamsB.a"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                        <span class="dateSeparator">至</span>
+                        <el-input
+                        v-model="searchParamsB.b"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                    </template>
+                    <template slot="searchItem6">
+                        <span class="label">复杂度等级</span>
+                        <el-select
+                        v-model="searchParamsB.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="searchItem8">
+                        <span class="label">危险度等级</span>
+                        <el-select
+                        v-model="searchParamsB.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="searchBtn1">
                         <el-button type="primary" @click="doSearchB"
@@ -309,6 +474,88 @@
                         >
                         </el-input>
                     </template>
+                    <!-- 复杂度 -->
+                     <template slot="searchItem4">
+                        <span class="label">复杂度</span>
+                        <el-input
+                        v-model="searchParamsB.a"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                        <span class="dateSeparator">至</span>
+                        <el-input
+                        v-model="searchParamsB.b"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                    </template>
+                    <!-- 危险度 -->
+                    <template slot="searchItem5">
+                        <span class="label">危险度</span>
+                        <el-input
+                        v-model="searchParamsB.a"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                        <span class="dateSeparator">至</span>
+                        <el-input
+                        v-model="searchParamsB.b"
+                        size="small"
+                        clearable
+                        placeholder="请输入"
+                        maxlength="60"
+                        @keyup.enter.native="doSearch"
+                        style="width: 100px"
+                        >
+                        </el-input>
+                    </template>
+                    <template slot="searchItem5">
+                        <span class="label">复杂度等级</span>
+                        <el-select
+                        v-model="searchParamsB.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="searchItem6">
+                        <span class="label">危险度等级</span>
+                        <el-select
+                        v-model="searchParamsB.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="searchBtn1">
                         <el-button type="primary" @click="doSearchC"
                             >查询</el-button
@@ -351,6 +598,161 @@
                 >
                 </tableList>
             </div>
+
+            <div v-show="activeName === '4'">
+                <search-layout>
+                    <template slot="searchItem1">
+        <span class="label">场景名称</span>
+        <el-input
+          v-model="searchParamsD.sceneId"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem2">
+        <span class="label">主车动作</span>
+        <el-select
+          v-model="searchParamsD.fileName"
+          multiple
+          size="small"
+          clearable
+        >
+          <el-option
+            v-for="item in fileNameList"
+            :label="item.caption"
+            :value="item.code"
+            :key="item.code"
+          ></el-option>
+        </el-select>
+      </template>
+      <!-- 复杂度 -->
+      <template slot="searchItem3">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParamsD.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParamsD.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem3">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParamsD.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParamsD.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem5">
+        <span class="label">复杂度等级</span>
+        <el-select
+          v-model="searchParamsD.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="searchItem5">
+        <span class="label">危险度等级</span>
+        <el-select
+          v-model="searchParamsD.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="searchBtn1">
+                        <el-button type="primary" @click="doSearchC"
+                            >查询</el-button
+                        >
+                    </template>
+                    <template slot="searchBtn2">
+                        <el-button type="primary" @click="doResetC"
+                            >重置</el-button
+                        >
+                    </template>
+                </search-layout>
+                <div class="isSelected">
+                    <el-checkbox v-model="selectedC" @change="selectedShowC"
+                        >已选择</el-checkbox
+                    >
+                </div>
+                <div class="myTabsBox myTabsBoxInline">
+                    <el-tabs
+                        v-model="activeNameC"
+                        type="card"
+                        @tab-click="pageControlC"
+                    >
+                        <el-tab-pane label="公有" name="1"></el-tab-pane>
+                        <el-tab-pane label="私有" name="2"></el-tab-pane>
+                    </el-tabs>
+                </div>
+                <tableList
+                    ref="tableC"
+                    :columns="columnsD"
+                    :getDataWay="getDataWayC"
+                    :pagination="paginationC"
+                    :checkedData="checkedArrC"
+                    :needLoadedCallBack="true"
+                    :loadedCallBack="loadedCallBackC"
+                    :needSelectedCallBack="true"
+                    :selectedCallBack="selectedCallBackC"
+                    :selectedAllCallBack="selectedAllCallBackC"
+                    index
+                    selection
+                >
+                </tableList>
+            </div>
         </div>
 
         <div class="flexBox summaryBox">
@@ -420,6 +822,22 @@ export default {
                     label: "冲突类型",
                     prop: "conflictType",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
             ],
             paginationA: {
                 //分页使用
@@ -485,6 +903,22 @@ export default {
                     label: "道路类型",
                     prop: "roadType",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
             ],
             paginationB: {
                 //分页使用
@@ -527,6 +961,22 @@ export default {
                     label: "标准类型",
                     prop: "standardType",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
             ],
             paginationC: {
                 //分页使用
@@ -547,17 +997,103 @@ export default {
                 },
             },
             selectedC: false,
+
+            searchParamsD:{
+                sceneId: '', // 场景编号
+                fileName: [], // 功能模块
+                scenarioRoadType: [], // 道路类型
+                scenarioResume: '', // 场景简述
+                share: '0',
+            },
+
+            columnsD: [
+        //表格列
+        {
+          label: '场景名称',
+          prop: 'sceneName',
+          fixed: 'left',
+        },
+        {
+          label: '主车动作',
+          prop: 'mainBehavior',
+        },
+        {
+          label: '他车动作',
+          prop: 'otherBehavior',
+        },
+        {
+          label: '天气',
+          prop: 'weather',
+        },
+        {
+          label: '道路类型',
+          prop: 'roadType',
+        },
+        {
+          label: '道路几何-平面',
+          prop: 'roadGeometryPlane',
+        },
+        {
+          label: '道路几何-纵断面',
+          prop: 'roadGeometryVertical',
+        },
+        {
+          label: '支持智驾功能',
+          prop: 'autoDriveFunction',
+        },
+        {
+          label: '运行区域',
+          prop: 'operationArea',
+        },
+        {
+          label: '复杂度',
+          prop: 'complexity',
+        },
+        {
+          label: '复杂度等级',
+          prop: 'complexityLevel',
+        },
+        {
+          label: '危险度',
+          prop: 'risk',
+        },
+        {
+          label: '危险度等级',
+          prop: 'riskLevel',
+        },
+        {
+          label: '便签',
+          prop: 'label',
+        },
+        {
+          label: '场景描述',
+          prop: 'sceneDescription',
+        },
+        {
+          label: '操作',
+          prop: 'cgInfos',
+          template: true,
+        },
+      ],
+
+
+
             checkedArrA: [], // 交通事故列表已选
             checkedArrB: [], // 自然驾驶列表已选
             checkedArrC: [], // 标准法规列表已选
+            checkedArrD: [], // 基准场景列表已选
+
 
             checkedIdsA: [], // 当前交通事故列表已选
             checkedIdsB: [], // 当前自然驾驶列表已选
             checkedIdsC: [], // 当前标准法规列表已选
+            checkedIdsD: [], // 当前基准场景列表已选
+
 
             activeNameA: "2",
             activeNameB: "2",
             activeNameC: "2",
+            activeNameD: "2",
         };
     },
 

src/views/sceneLibrary/generalizationScenarioList.vue

@@ -27,6 +27,88 @@
                     @keyup.enter.native="doSearch">
                 </el-input>
             </template>
+                         <!-- 复杂度 -->
+      <template slot="searchItem6">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem6">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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
@@ -141,6 +223,22 @@ export default {
                     label: "场景简述",
                     prop: "scenarioResume",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
                 // {
                 //     label: "场景发生时刻",
                 //     prop: "scenarioTime",

src/views/sceneLibrary/naturalDrivingScenarioList.vue

@@ -73,7 +73,7 @@
                     size="small"
                 ></el-cascader>
             </template>
-            <template slot="searchItem8">
+            <template slot="searchItem7">
                 <span class="label">临时性操纵</span>
                 <el-cascader
                     v-model="searchParams.temporaryOperation"
@@ -83,6 +83,88 @@
                     size="small"
                 ></el-cascader>
             </template>
+             <!-- 复杂度 -->
+      <template slot="searchItem8">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem8">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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="searchItem27">
                 <!-- <el-checkbox-group v-model="labels">
                     <el-checkbox-button
@@ -249,6 +331,23 @@ export default {
                     prop: "label",
                 },
                 {
+          label: '复杂度',
+          prop: 'complexity',
+        },
+        {
+          label: '复杂度等级',
+          prop: 'complexityLevel',
+        },
+        {
+          label: '危险度',
+          prop: 'risk',
+        },
+        
+        {
+          label: '危险度等级',
+          prop: 'riskLevel',
+        },
+                {
                     label: "操作",
                     prop: "cgInfos",
                     template: true,

src/views/sceneLibrary/standardRegulationSimulationScenarioList.vue

@@ -41,6 +41,88 @@
                 >
                 </el-input>
             </template>
+                 <!-- 复杂度 -->
+      <template slot="searchItem6">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem6">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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="searchItem27">
                 <!-- <el-checkbox-group v-model="labels">
                     <el-checkbox-button label="ISO" :key="1" class="labelA"
@@ -157,6 +239,22 @@ export default {
                     label: "标签",
                     prop: "regulationType",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",

src/views/sceneLibrary/trafficAccidentSimulationScenarioList.vue

@@ -93,6 +93,88 @@
                     ></el-option>
                 </el-select>
             </template>
+                         <!-- 复杂度 -->
+      <template slot="searchItem6">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem6">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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="searchItem27">
                 <!-- <el-checkbox-group v-model="labels">
                     <el-checkbox-button label="追尾" :key="1" class="labelA"
@@ -241,6 +323,22 @@ export default {
                     label: "标签",
                     prop: "label",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",

src/views/systemManagement/sceneLibraryManagement/generalizationScene.vue

@@ -27,6 +27,88 @@
                     @keyup.enter.native="doSearch">
                 </el-input>
             </template>
+                         <!-- 复杂度 -->
+      <template slot="searchItem6">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem6">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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="searchBtn1">
                 <el-button type="primary" @click="doSearch">查询</el-button>
             </template>
@@ -111,6 +193,22 @@ export default {
                     label: "场景简述",
                     prop: "scenarioResume",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",

src/views/systemManagement/sceneLibraryManagement/naturalDrivingScene.vue

@@ -83,6 +83,88 @@
                     size="small"
                 ></el-cascader>
             </template>
+                         <!-- 复杂度 -->
+      <template slot="searchItem6">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem6">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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="searchItem27">
                 <!-- <el-checkbox-group v-model="labels">
                     <el-checkbox-button label="1" :key="1" class="labelA"
@@ -280,6 +362,22 @@ export default {
                     label: "标签",
                     prop: "label",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",

src/views/systemManagement/sceneLibraryManagement/standardRegulationSimulationScene.vue

@@ -41,6 +41,88 @@
                 >
                 </el-input>
             </template>
+                         <!-- 复杂度 -->
+      <template slot="searchItem6">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem6">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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="searchItem27">
                 <!-- <el-checkbox-group v-model="labels">
                     <el-checkbox-button label="ISO" :key="1" class="labelA"
@@ -175,6 +257,22 @@ export default {
                     label: "标签",
                     prop: "regulationType",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",

src/views/systemManagement/sceneLibraryManagement/trafficAccidentSimulationScene.vue

@@ -93,6 +93,88 @@
                     ></el-option>
                 </el-select>
             </template>
+                         <!-- 复杂度 -->
+      <template slot="searchItem6">
+        <span class="label">复杂度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <!-- 危险度 -->
+      <template slot="searchItem6">
+        <span class="label">危险度</span>
+        <el-input
+          v-model="searchParams.a"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+        <span class="dateSeparator">至</span>
+        <el-input
+          v-model="searchParams.b"
+          size="small"
+          clearable
+          placeholder="请输入"
+          maxlength="60"
+          @keyup.enter.native="doSearch"
+          style="width: 100px"
+        >
+        </el-input>
+      </template>
+      <template slot="searchItem8">
+        <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="searchItem8">
+        <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="searchItem27">
                 <!-- <el-checkbox-group v-model="labels">
                     <el-checkbox-button label="追尾" :key="1" class="labelA"
@@ -259,6 +341,22 @@ export default {
                     label: "标签",
                     prop: "label",
                 },
+                {
+                label: '复杂度',
+                prop: 'complexity',
+                },
+                {
+                label: '复杂度等级',
+                prop: 'complexityLevel',
+                },
+                {
+                label: '危险度',
+                prop: 'risk',
+                },
+                {
+                label: '危险度等级',
+                prop: 'riskLevel',
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",

src/views/workManagement/manualRunProjectDetail.vue

@@ -62,6 +62,27 @@
                         v-autoTrim="{ obj: form, key: 'parallelism' }" v-model="form.parallelism">
                     </el-input>
                 </el-form-item>
+                <el-form-item label="场景评价规则:"  ></el-form-item>
+                    <el-form-item label="危险度" class="rule-item">
+                        <el-select>
+                            <el-option label="暂不评价"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="复杂度" class="rule-item">
+                        <el-select>
+                            <el-option label="暂不评价"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="暴露率" class="rule-item">
+                        <el-select>
+                            <el-option label="暂不评价" class="rule-item"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="覆盖率" class="rule-item">
+                        <el-select>
+                            <el-option label="暂不评价"></el-option>
+                        </el-select>
+                    </el-form-item>
                 <el-form-item label="最大仿真时间(s):" prop="maxSimulationTime">
                     <el-input placeholder="请输入" maxlength="10" v-autoTrim="{ obj: form, key: 'maxSimulationTime' }"
                         v-model="form.maxSimulationTime">
@@ -84,12 +105,6 @@
                     }"></span>
                 </div>
                 <div class="tip">(场景数量：{{ sceneCount }})</div>
-                <!-- <div class="tip flexBox">
-                    <div>(下次运行时间：XX时XX分XX秒)</div>
-                    <div class="tipBtnBox">
-                        <el-button type="primary">规则查看</el-button>
-                    </div>
-                </div> -->
                 <div class="tip">(最多可用资源：{{ maxCount }})</div>
                 <div class="tip">(最小是5，最大是600)</div>
             </div>
@@ -482,7 +497,9 @@ export default {
         }
     }
 }
-
+.rule-item{
+    margin-left: 60px;
+}
 .btns {
     padding-top: 30px;
     text-align: center;

src/views/workManagement/projectInfo.vue

@@ -65,6 +65,38 @@
                 </div>
             </div>
 
+            <div class="headPanel panel">
+                <div class="titlePanel">
+                    <div class="titlePanelBor">场景评价</div>
+                </div>
+                <div class="boxContent">
+                    <div class="info">
+                        <span>危险度规则:XXX</span>
+                        <b>{{ info.projectId }}</b>
+                    </div>
+                    <div class="info">
+                        <span>覆盖率规则:XXX</span>
+                        <b>{{ info.projectName }}</b>
+                    </div>
+                    <div class="info">
+                        <span>暴露率规则:XXX</span>
+                        <b>{{ info.projectName }}</b>
+                    </div>
+                    <div class="info">
+                        <span>场景数量:10</span>
+                        <b>{{ info.projectName }}</b>
+                    </div>
+                    <div class="info">
+                        <span>场景测试包覆盖率:10</span>
+                        <b>{{ info.projectName }}</b>
+                    </div>
+                    <div class="info">
+                        <span>场景测试包暴露率:20</span>
+                        <b>{{ info.projectName }}</b>
+                    </div>
+                    </div>
+            </div>
+
             <div class="flexBox topPanel">
                 <div class="box panel boxB">
                     <div class="titlePanel">
@@ -644,7 +676,7 @@ export default {
 
             span {
                 display: block;
-                width: 105px;
+                min-width: 105px;
                 color: @gray;
             }