Merge branch 'master' of http://10.15.12.70:3000/zhangliang/simulation-front

src/router/systemManagement.js

@@ -33,5 +33,14 @@ export default [{
             menuKind: "systemManagement"
         },
         component: () => import("@/views/systemManagement/parameterDetail")
+    },
+    {
+        path: "/sceneLibraryManagement",
+        name: "sceneLibraryManagement",
+        meta:{
+            tabname: "场景库管理",
+            menuKind: "sysyemMnagement"
+        },
+        component: () => import("@/views/systemManagement/sceneLibraryManagement/sceneLibraryManagement")
     }
 ]

src/views/systemManagement/parameterDetail.vue

@@ -9,20 +9,7 @@
             index
             selection
         >
-            <el-table-column label="操作" slot="cgInfos" align="center">
-                <template v-slot="scope">
-                    <i
-                        @click="editRow(scope.row)"
-                        class="el-icon-edit-outline elIcon"
-                        title="编辑"
-                    ></i>
-                    <i
-                        @click="delOne(scope.row)"
-                        class="el-icon-delete elIcon"
-                        title="删除"
-                    ></i>
-                </template>
-            </el-table-column>
+            
         </tableList>
         <el-form
             ref="form"
@@ -63,7 +50,7 @@
 
         </el-form>
         <div class="btns">
-            <el-button type="primary" @click="save(false)">保存</el-button>
+            <el-button type="primary" @click="save">保存</el-button>
             <el-button type="primary" plain @click="cancel">取消</el-button>
         </div>
     </div>
@@ -119,7 +106,12 @@ export default {
     computed: {},
 
     methods: {
-        
+        save(){
+
+        },
+        cancel(){
+
+        },
     },
 
     mounted() {

src/views/systemManagement/sceneLibraryManagement/naturalDrivingScene.vue

@@ -0,0 +1,213 @@
+<template>
+    <div>
+        <search-layout :needBox="true">
+            <template slot="searchItem1">
+                <span class="label">场景名称</span>
+                <el-input
+                    v-model="searchParams.a1"
+                    size="small"
+                    clearable
+                    placeholder="请输入"
+                    maxlength="60"
+                >
+                </el-input>
+            </template>
+            <template slot="searchItem2">
+                <span class="label">场景要素</span>
+                <el-select v-model="searchParams.a2">
+                    <!--<el-option
+                        v-for="item in list"
+                        :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.a3">
+                    <!--<el-option
+                        v-for="item in list"
+                        :label="item.caption"
+                        :value="item.code"
+                        :key="item.code"
+                    ></el-option>-->
+                </el-select>
+            </template>
+            <template slot="searchItem4">
+                <span class="label">地区</span>
+                <el-select v-model="searchParams.a4">
+                    <!--<el-option
+                        v-for="item in list"
+                        :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="searchParams.a5">
+                    <!--<el-option
+                        v-for="item in list"
+                        :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="searchParams.a6">
+                    <!--<el-option
+                        v-for="item in list"
+                        :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>
+            <template slot="searchBtn2">
+                <el-button type="primary" @click="doReset">重置</el-button>
+            </template>
+        </search-layout>
+
+        <div class="myTabsBox myTabsBoxThreeTabs">
+            <el-button
+                v-bind:class="{ addBtn: true}"
+                icon="el-icon-circle-plus-outline"
+                @click="addOne"
+                type="primary"
+                >数据导入</el-button
+            >
+        </div>
+
+        <tableList
+            ref="table"
+            style="margin: 0 30px"
+            :columns="columns"
+            :getDataWay="getDataWay"
+            :pagination="pagination"
+            index
+        >
+            <el-table-column label="操作" slot="cgInfos" align="center">
+                <template v-slot="scope">
+                    <i
+                        @click="editRow(scope.row)"
+                        class="el-icon-edit-outline elIcon"
+                        title="编辑"
+                    ></i>
+                    <i
+                        @click="delOne(scope.row)"
+                        class="el-icon-delete elIcon"
+                        title="删除"
+                    ></i>
+                </template>
+            </el-table-column>
+        </tableList>
+    </div>
+</template>
+
+<script>
+import searchLayout from "@/components/grid/searchLayout";
+import tableList from "@/components/grid/TableList";
+
+export default{
+    name:'naturalDrivingScene',
+    components:{searchLayout, tableList},
+    data(){
+        return {
+            searchParams: {
+                //搜索参数
+                
+            },
+            getDataWay:{
+                //dataType: "url",
+                dataType: "data",
+                type: "post",
+                // firstRequest: false,
+                // data: this.$api.algorithmsLibrary.selectSharedAlgorithmList,
+                data:[{a1:'1',a2:'2',a3:'3',a4:'4',a5:'5',a6:'6'}],
+                param: {},
+            },
+            columns: [
+                //表格列
+                {
+                    label: "场景名称",
+                    prop: "a1",
+                },
+                {
+                    label: "场景要素",
+                    prop: "a2",
+                },
+                {
+                    label: "场景分类",
+                    prop: "a3",
+                },
+                {
+                    label: "地区",
+                    prop: "a4",
+                },
+                {
+                    label: "目标类型",
+                    prop: "a5",
+                },
+                {
+                    label: "适用功能",
+                    prop: "a6",
+                },
+                {
+                    label: "操作",
+                    prop: "cgInfos",
+                    template: true
+                }
+            ],
+            pagination: {
+                //分页使用
+                currentPage: 1,
+                pageSize: 10,
+                position: "right",
+                pageSizes: [10, 30, 50, 100, 200],
+                layout: "sizes, total, prev, pager, next, jumper",
+            },
+        }
+    },
+    methods:{
+        doSearch() {
+            this.$nextTick(() => {
+                this.refreshList(this.searchParams);
+            });
+        },
+        refreshList(param) {
+            param
+                ? this.$refs["table"].loadData(param)
+                : this.$refs["table"].loadData();
+        },
+        doReset() {
+            this.searchParams = {
+                
+            };
+            this.doSearch();
+        },
+        addOne() {
+            
+        },
+        editRow(row) {
+            
+        },
+        delOne(row) {
+            this.$confirm("确认是否删除？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                
+            });
+        },
+    }
+}
+</script>

src/views/systemManagement/sceneLibraryManagement/sceneLibraryManagement.vue

@@ -0,0 +1,96 @@
+<template>
+    <div>
+        <toolbarTab
+            :isConnect="true"
+            position="top"
+            :subPageActiveName="subPageActiveName"
+            :toolbarItem="subPageList"
+            @toolbarClick="toolsControl"
+        >
+        </toolbarTab>
+        <naturalDrivingScene
+            v-show="subPageActiveName==1"
+        >
+        </naturalDrivingScene>
+    </div>
+</template>
+
+<script>
+import toolbarTab from "@/components/toolbar/toolbarTab";
+import naturalDrivingScene from "./naturalDrivingScene"
+
+export default{
+    name: "sceneManagement",
+    components: { toolbarTab,naturalDrivingScene},
+    data() {
+        return {
+            subPageActiveName:1,
+            
+        };
+    },
+    computed: {
+        subPageList(){
+            return [
+                {
+                    type: "primary",
+                    plain: true,
+                    title: "自然驾驶场景",
+                    disabled: false,
+                    api: "",
+                    fromId: 1,
+                },
+                {
+                    type: "primary",
+                    plain: true,
+                    title: "标准法规仿真场景",
+                    disabled: false,
+                    api: "",
+                    fromId: 2,
+                },
+                {
+                    type: "primary",
+                    plain: true,
+                    title: "交通事故仿真场景",
+                    disabled: false,
+                    api: "",
+                    fromId: 3,
+                },
+                {
+                    type: "primary",
+                    plain: true,
+                    title: "泛化场景",
+                    disabled: false,
+                    api: "",
+                    fromId: 4,
+                },
+            ]
+        }
+    },
+    methods: {
+        toolsControl(item){
+            console.log(item)
+            console.log(this.subPageActiveName)
+        }
+    },
+}
+</script>
+
+<style scoped lang="less">
+.tabsBox {
+    position: relative;
+    overflow: hidden;
+
+    .el-button {
+        position: absolute;
+        right: 40px;
+        top: 45px;
+    }
+}
+.myTabsBox{
+    min-height:99px;
+}
+/deep/ .el-tabs__nav .el-tabs__item{
+    width:auto;
+    padding:0 10px;
+}
+</style>