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

src/api/algorithmsLibrary.js

@@ -12,6 +12,7 @@ const addOrUpdate = basePart + '/algorithm/addOrUpdate'; // 私有算法新增
 const selectDetailsById = basePart + '/algorithm/selectDetailsById'; // 查询算法详情
 const getProgress = basePart + '/file/getProgress'; // 获取上传进度接口
 
+const selectAlgoPlatformList = basePart + '/algorithm/selectAlgoPlatformList'   //算法平台列表
 
 export default {
     selectSharedAlgorithmList,
@@ -22,5 +23,7 @@ export default {
 
     addOrUpdate,
     selectDetailsById,
-    getProgress
+    getProgress,
+
+    selectAlgoPlatformList
 }

src/router/algorithmsLibrary.js

@@ -26,12 +26,12 @@ export default [{
         component: () => import("@/views/algorithmsLibrary/exportAlgorithms")
     },
     {
-        path: "/platformAlgorithmsList",
-        name: "platformAlgorithmsList",
+        path: "/algorithmsPlatformList",
+        name: "algorithmsPlatformList",
         meta: {
             tabname: "平台算法",
-            menuKind: "platformAlgorithms"
+            menuKind: "algorithmsLibrary"
         },
-        component: () => import("@/views/algorithmsLibrary/platformAlgorithmsList")
+        component: () => import("@/views/algorithmsLibrary/algorithmsPlatformList")
     },
 ]

src/router/systemManagement.js

@@ -21,8 +21,17 @@ export default [{
         name: "paramenterManagement",
         meta: {
             tabname: "参数管理",
-            menuKind: "paramenterManagement"
+            menuKind: "systemManagement"
         },
         component: () => import("@/views/systemManagement/parameterManagement")    
+    },
+    {
+        path: "/parameterDetail",
+        name: "parameterDetail",
+        meta: {
+            tabname: "新增参数配置",
+            menuKind: "systemManagement"
+        },
+        component: () => import("@/views/systemManagement/parameterDetail")
     }
 ]

src/views/algorithmsLibrary/platformAlgorithmsList.vue → src/views/algorithmsLibrary/algorithmsPlatformList.vue

@@ -4,7 +4,7 @@
             <template slot="searchItem1">
                 <span class="label">ID</span>
                 <el-input
-                    v-model="searchParams.algorithmCode"
+                    v-model="searchParams.id"
                     size="small"
                     clearable
                     placeholder="请输入"
@@ -34,7 +34,7 @@
                 >
                 </el-input>
             </template>
-            <template slot="searchItem4">
+            <!--<template slot="searchItem4">
                 <span class="label">校验状态</span>
                 <el-select v-model="searchParams.validationStatus">
                     <el-option
@@ -44,7 +44,7 @@
                         :key="item.code"
                     ></el-option>
                 </el-select>
-            </template>
+            </template>-->
             <template slot="searchBtn1">
                 <el-button type="primary" @click="doSearch">查询</el-button>
             </template>
@@ -54,13 +54,13 @@
         </search-layout>
 
         <div class="myTabsBox myTabsBoxThreeTabs">
-            <el-button
+            <!--<el-button
                 v-bind:class="{ addBtn: true}"
                 icon="el-icon-circle-plus-outline"
                 @click="addOne"
                 type="primary"
                 >新增</el-button
-            >
+            >-->
         </div>
 
         <tableList
@@ -81,33 +81,31 @@ import searchLayout from "@/components/grid/searchLayout";
 import tableList from "@/components/grid/TableList";
 
 export default {
-    name: "algorithmsLibraryList", // 平台算法
+    name: "algorithmsPlatformList", // 平台算法
     components: { searchLayout, tableList },
     data() {
         return {
             searchParams: {
                 //搜索参数
-                algorithmCode: "", // ID
+                id: "", // ID
                 algorithmName: "", // 算法名称
                 description: "", // 算法描述
-                validationStatus: "", // 校验状态
                 uploadMode: "", // 私有类型
             },
             validationStatusList: [],
             getDataWay:{
-
                     //加载表格数据
                     dataType: "url",
                     type: "post",
                     // firstRequest: false,
-                    data: this.$api.algorithmsLibrary.selectSharedAlgorithmList,
+                    data: this.$api.algorithmsLibrary.selectAlgoPlatformList,
                     param: {},
             },
             columns: [
                 //表格列
                 {
                     label: "ID",
-                    prop: "algorithmCode",
+                    prop: "id",
                 },
                 {
                     label: "算法名称",
@@ -117,10 +115,6 @@ export default {
                     label: "算法描述",
                     prop: "description",
                 },
-                {
-                    label: "校验状态",
-                    prop: "validationStatus",
-                },
             ],
             pagination: {
                 //分页使用
@@ -149,10 +143,9 @@ export default {
         },
         doReset() {
             this.searchParams = {
-                algorithmCode: "",
+                id: "",
                 algorithmName: "",
                 description: "",
-                validationStatus: "",
                 uploadMode: "",
             };
             this.doSearch();
@@ -228,6 +221,6 @@ export default {
     }
 }
 .myTabsBox{
-    min-height:99px;
+    min-height:29px;
 }
 </style>

src/views/page/pageMenu.vue

@@ -90,7 +90,7 @@
                         <el-menu-item index="algorithmsLibraryList"
                             >算法库列表</el-menu-item
                         >
-                        <el-menu-item index="platformAlgorithmsList"
+                        <el-menu-item index="algorithmsPlatformList"
                             >算法平台</el-menu-item
                         >
                     </el-submenu>
@@ -134,6 +134,9 @@
                         <el-menu-item index="accountManagement"
                             >账户管理</el-menu-item
                         >
+                        <el-menu-item index="parameterManagement"
+                            >参数管理</el-menu-item
+                        >    
                     </el-submenu> -->
                 </el-menu>
             </div>

src/views/systemManagement/parameterDetail.vue

@@ -0,0 +1,156 @@
+<template>
+    <div>
+    <tableList
+            ref="table"
+            style="width:60%;min-width: 900px;margin: auto;"
+            :columns="columns"
+            :getDataWay="getDataWay"
+            :checkedData="checkedData"
+            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"
+            :model="form"
+            :rules="rules"
+            label-width="200px"
+            class="flexBox"
+        >
+            <div class="formItemBox">
+                <el-form-item label="可创建子账户数量:" prop="projectName">
+                    <el-input
+                        placeholder="请输入"
+                        maxlength="30"
+                        v-autoTrim="{ obj: form, key: 'projectName' }"
+                        v-model="form.projectName"
+                    >
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="最多可创建场景测试包数量:" prop="parallelism">
+                    <el-input
+                        placeholder="请输入"
+                        maxlength="100"
+                        v-autoTrim="{ obj: form, key: 'parallelism' }"
+                        v-model="form.parallelism"
+                    >
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="场景数据包的最大场景数量:" prop="maxSimulationTime">
+                    <el-input
+                        placeholder="请输入"
+                        maxlength="100"
+                        v-autoTrim="{ obj: form, key: 'maxSimulationTime' }"
+                        v-model="form.maxSimulationTime"
+                    >
+                    </el-input>
+                </el-form-item>
+            </div>
+
+        </el-form>
+        <div class="btns">
+            <el-button type="primary" @click="save(false)">保存</el-button>
+            <el-button type="primary" plain @click="cancel">取消</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+//import  from '';
+import tableList from "@/components/grid/TableList";
+
+let maxCount = 0; // 用于校验
+export default {
+    name: "parameterDetail", // 手动运行项目详情
+    components: {tableList},
+    data() {
+        return {
+            getDataWay:{
+                //dataType: "url",
+                dataType: "data",
+                type: "post",
+                // firstRequest: false,
+                // data: this.$api.algorithmsLibrary.selectSharedAlgorithmList,
+                data:[{a1:'1',a2:'2',a3:'3',a4:'4'}],
+                param: {},
+            },
+            columns: [
+                //表格列
+                {
+                    label: "账户名",
+                    prop: "a1",
+                },
+                {
+                    label: "账户类型",
+                    prop: "a2",
+                },
+                {
+                    label: "联系人",
+                    prop: "a3",
+                },
+                {
+                    label: "联系方式",
+                    prop: "a4",
+                },
+            ],
+            form: {
+                
+            },
+            
+            rules: {
+            }
+        };
+    },
+
+    computed: {},
+
+    methods: {
+        
+    },
+
+    mounted() {
+        
+    },
+};
+</script>
+
+<style lang='less' scoped>
+.el-form {
+    width: 60%;
+    min-width: 900px;
+    padding-top: 60px;
+    margin: 0 auto;
+
+    .formItemBox {
+        flex: 1;
+
+        /deep/ .el-input,
+        .el-select {
+            width: 100%;
+        }
+    }
+
+    .el-textarea {
+        height: 96px;
+    }
+}
+
+.btns {
+    padding-top: 30px;
+    text-align: center;
+}
+</style>

src/views/systemManagement/parameterManagement.vue

@@ -68,37 +68,35 @@ export default{
         return {
             searchParams: {
                 //搜索参数
-                algorithmCode: "", // ID
-                algorithmName: "", // 算法名称
-                description: "", // 算法描述
-                validationStatus: "", // 校验状态
-                uploadMode: "", // 私有类型
+                
             },
             validationStatusList: [],
             getDataWay:{
-                dataType: "url",
+                //dataType: "url",
+                dataType: "data",
                 type: "post",
                 // firstRequest: false,
-                data: this.$api.algorithmsLibrary.selectSharedAlgorithmList,
+                // data: this.$api.algorithmsLibrary.selectSharedAlgorithmList,
+                data:[{a1:'1',a2:'2',a3:'3',a4:'4'}],
                 param: {},
             },
             columns: [
                 //表格列
                 {
                     label: "账户名",
-                    prop: "algorithmCode",
+                    prop: "a1",
                 },
                 {
                     label: "可创建子账户数量",
-                    prop: "algorithmName",
+                    prop: "a2",
                 },
                 {
                     label: "最多可创建场景测试包数量",
-                    prop: "description",
+                    prop: "a3",
                 },
                 {
                     label: "场景数量包的最大场景数",
-                    prop: "validationStatus",
+                    prop: "a4",
                 },
                 {
                     label: "操作",
@@ -134,7 +132,7 @@ export default{
             this.doSearch();
         },
         addOne() {
-            
+            this.$router.push('/parameterDetail')
         },
         editRow(row) {