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

src/router/systemManagement.js

@@ -39,10 +39,27 @@ export default [{
         name: "sceneLibraryManagement",
         meta: {
             tabname: "场景库管理",
-            menuKind: "sysyemManagement"
+            menuKind: "systemManagement"
         },
         component: () => import("@/views/systemManagement/sceneLibraryManagement/sceneLibraryManagement")
     },
+    {
+        path: "/reportTemplateManagement",
+        name: "reportTemplateManagement",
+        meta: {
+            tabname: "报告模板管理",
+            menuKind: "systemManagement"
+        },
+        component: () => import("@/views/systemManagement/reportTemplateManagement")
+    },
+    {
+        path: "/reportTemplateDetail",
+        name: "reportTemplateDetail",
+        meta: {
+
+        },
+        component: () => import("@/views/systemManagement/reportTemplateDetail") 
+    },
     {
         path: "/clusteringManagement",
         name: "clusteringManagement",
@@ -52,15 +69,15 @@ export default [{
         },
         component: () => import("@/views/systemManagement/clusteringManagement")
     },
-    /*{
-        path: "/addClustering",
-        name: "addClustering",
+    {
+        path: "/clusteringDetail",
+        name: "clusteringDetail",
         meta: {
             tabname: "新增集群配置",
-            menuKind: "sysyemManagement"
+            menuKind: "systemManagement"
         },
-        component: () => import("@/views/systemManagement/addClustering")
-    },*/
+        component: () => import("@/views/systemManagement/clusteringDetail")
+    },
     {
         path: "/logManagement",
         name:"logManagement",

src/views/systemManagement/clusteringDetail.vue

@@ -0,0 +1,168 @@
+<template>
+    <div>
+        <el-form
+            ref="form"
+            :model="form"
+            :rules="rules"
+            label-width="200px"
+            class="flexBox"
+        >
+            <div class="formItemBox">
+                <el-form-item label="节点名称:" prop="a1">
+                    <el-input
+                        placeholder="请输入"
+                        maxlength="30"
+                        v-autoTrim="{ obj: form, key: 'a1' }"
+                        v-model="form.a1"
+                    >
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="节点地址:" prop="a2">
+                    <el-input
+                        placeholder="请输入"
+                        maxlength="100"
+                        v-autoTrim="{ obj: form, key: 'a2' }"
+                        v-model="form.a2"
+                    >
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="节点类型:" prop="a3">
+                    <el-input
+                        placeholder="请输入"
+                        maxlength="100"
+                        v-autoTrim="{ obj: form, key: 'a3' }"
+                        v-model="form.a3"
+                    >
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="适用类型:" prop="a4">
+                    <el-input
+                        placeholder="请输入"
+                        maxlength="100"
+                        v-autoTrim="{ obj: form, key: 'a4' }"
+                        v-model="form.a4"
+                    >
+                    </el-input>
+                </el-form-item>
+            </div>
+        </el-form>
+        <div class="title">公有</div>
+        <tableList
+            ref="table"
+            style="width:60%;min-width: 900px;margin: auto;"
+            :columns="columns"
+            :getDataWay="getDataWay"
+            :checkedData="checkedData"
+            index
+            selection
+        >   
+        </tableList>
+        <div class="btns">
+            <el-button type="primary" @click="save">保存</el-button>
+            <el-button type="primary" plain @click="cancel">取消</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import tableList from "@/components/grid/TableList";
+
+export default {
+    name: "clusteringDetail",
+    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: {
+                a1:'',
+                a2:'',
+                a3:'',
+                a4:''
+            },
+            
+            rules: {
+            }
+        };
+    },
+
+    computed: {},
+
+    methods: {
+        save(){
+
+        },
+        cancel(){
+
+        },
+    },
+
+    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;
+}
+.title {
+    width: 60%;
+    min-width: 900px;
+    margin: 4px auto;
+    border-left: 6px solid @themeColor;
+    padding-left: 20px;
+    color: @themeColor;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+</style>

src/views/systemManagement/clusteringManagement.vue

@@ -123,7 +123,7 @@ export default {
     },
     methods: {
         addConfig() {
-            this.$router.push({ path: "/addClustering" });
+            this.$router.push({ path: "/clusteringDetail" });
         },
         addMarkDia() {},
     },

src/views/systemManagement/parameterDetail.vue

@@ -1,6 +1,7 @@
 <template>
     <div>
-    <tableList
+        <div class="title">选择普通账户</div>
+        <tableList
             ref="table"
             style="width:60%;min-width: 900px;margin: auto;"
             :columns="columns"
@@ -23,7 +24,7 @@
                     <el-input
                         placeholder="请输入"
                         maxlength="30"
-                        v-autoTrim="{ obj: form, key: "projectName" }"
+                        v-autoTrim="{ obj: form, key: 'projectName' }"
                         v-model="form.projectName"
                     >
                     </el-input>
@@ -32,7 +33,7 @@
                     <el-input
                         placeholder="请输入"
                         maxlength="100"
-                        v-autoTrim="{ obj: form, key: "parallelism" }"
+                        v-autoTrim="{ obj: form, key: 'parallelism' }"
                         v-model="form.parallelism"
                     >
                     </el-input>
@@ -41,7 +42,7 @@
                     <el-input
                         placeholder="请输入"
                         maxlength="100"
-                        v-autoTrim="{ obj: form, key: "maxSimulationTime" }"
+                        v-autoTrim="{ obj: form, key: 'maxSimulationTime' }"
                         v-model="form.maxSimulationTime"
                     >
                     </el-input>
@@ -61,7 +62,7 @@ import tableList from "@/components/grid/TableList";
 
 let maxCount = 0; // 用于校验
 export default {
-    name: "parameterDetail", // 手动运行项目详情
+    name: "parameterDetail",
     components: {tableList},
     data() {
         return {
@@ -144,4 +145,14 @@ export default {
     padding-top: 30px;
     text-align: center;
 }
+.title {
+    width: 60%;
+    min-width: 900px;
+    margin: 4px auto;
+    border-left: 6px solid @themeColor;
+    padding-left: 20px;
+    color: @themeColor;
+    font-size: 16px;
+    font-weight: bold;
+}
 </style>

src/views/systemManagement/reportTemplateDetail.vue

@@ -0,0 +1,133 @@
+<template>
+    <div class="panel">
+        <div class="leftPanel">
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="200px"
+                class="flexBox"
+            >
+                <div class="formItemBox">
+                    <el-form-item label="节点名称:" prop="a1">
+                        <el-input
+                            placeholder="请输入"
+                            maxlength="30"
+                            v-autoTrim="{ obj: form, key: 'a1' }"
+                            v-model="form.a1"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="节点地址:" prop="a2">
+                        <el-input
+                            placeholder="请输入"
+                            maxlength="100"
+                            v-autoTrim="{ obj: form, key: 'a2' }"
+                            v-model="form.a2"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="节点类型:" prop="a3">
+                        <el-input
+                            placeholder="请输入"
+                            maxlength="100"
+                            v-autoTrim="{ obj: form, key: 'a3' }"
+                            v-model="form.a3"
+                        >
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="适用类型:" prop="a4">
+                        <el-input
+                            placeholder="请输入"
+                            maxlength="100"
+                            v-autoTrim="{ obj: form, key: 'a4' }"
+                            v-model="form.a4"
+                        >
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-form>
+        </div>
+        <div class="rightPanel">
+        
+        </div>
+        
+    </div>
+</template>
+<script>
+import tableList from "@/components/grid/TableList";
+export default {
+    name: "clusteringDetail",
+    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: {
+                a1:'',
+                a2:'',
+                a3:'',
+                a4:''
+            },
+            
+            rules: {
+            }
+        };
+    },
+
+    computed: {},
+
+    methods: {
+        save(){
+
+        },
+        cancel(){
+
+        },
+    },
+
+    mounted() {
+        
+    },
+};
+</script>
+<style scoped lang="less">
+.panel{
+    display: flex;
+    flex: 1;
+    padding: 15px 30px 30px;
+    .leftPanel{
+        width:67%;
+    }
+    .rightPanel{
+        width: 33%;
+        min-width: 322px;
+    }
+}
+</style>

src/views/systemManagement/reportTemplateManagement.vue

@@ -0,0 +1,127 @@
+<template>
+    <div>
+        <search-layout :needBox="true">
+            <template slot="searchItem1">
+                <span class="label">模板</span>
+                <el-input
+                    v-model="searchParams.a1"
+                    size="small"
+                    clearable
+                    placeholder="请输入"
+                >
+                </el-input>
+            </template>
+            
+            <template slot="searchBtn1">
+                <el-button type="primary">查询</el-button>
+            </template>
+            <template slot="searchBtn2">
+                <el-button type="primary">重置</el-button>
+            </template>
+        </search-layout>
+
+        <div class="btnsPanel">
+            <el-button
+                type="primary"
+                icon="el-icon-circle-plus-outline"
+                @click="addConfig"
+                >新建配置</el-button
+            >
+        </div>
+
+        <tableList
+            ref="table"
+            style="border-top: none; margin: 0 30px"
+            :columns="columns"
+            :getDataWay="getDataWay"
+            :pagination="pagination"
+            index
+            selection
+        >
+            <el-table-column label="操作" slot="cgInfos" align="center">
+                <template v-slot="scope">
+                    <i
+                        @click="addMarkDia(scope.row)"
+                        class="el-icon-edit-outline elIcon"
+                    ></i>
+                    <i
+                        @click="addMarkDia(scope.row)"
+                        class="el-icon-video-pause elIcon"
+                    ></i>
+                </template>
+            </el-table-column>
+        </tableList>
+    </div>
+</template>
+
+<script>
+import searchLayout from "@/components/grid/searchLayout";
+import tableList from "@/components/grid/TableList";
+
+export default {
+    name: "reportTemplateManagement", // 报告模板管理
+    components: { searchLayout, tableList },
+    data() {
+        return {
+            searchParams: {
+                //搜索参数
+
+            },
+            list: [],
+            columns: [
+                //表格列
+                {
+                    label: "节点ID",
+                    prop: "a1",
+                },
+                {
+                    label: "节点类型",
+                    prop: "a2",
+                },
+                {
+                    label: "适用类型",
+                    prop: "a3",
+                },
+                {
+                    label: "分配账户",
+                    prop: "a4",
+                },
+                {
+                    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",
+            },
+            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: {},
+            },
+        };
+    },
+    methods: {
+        addConfig() {
+            this.$router.push({ path: "/clusteringDetail" });
+        },
+        addMarkDia() {},
+    },
+};
+</script>
+
+<style scoped lang="less">
+.btnsPanel {
+    margin: 45px 40px 15px;
+}
+</style>