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

src/router/systemManagement.js

@@ -37,10 +37,37 @@ export default [{
     {
         path: "/sceneLibraryManagement",
         name: "sceneLibraryManagement",
-        meta:{
+        meta: {
             tabname: "场景库管理",
-            menuKind: "sysyemMnagement"
+            menuKind: "sysyemManagement"
         },
         component: () => import("@/views/systemManagement/sceneLibraryManagement/sceneLibraryManagement")
+    },
+    {
+        path: "/clusteringManagement",
+        name: "clusteringManagement",
+        meta: {
+            tabname: "集群管理",
+            menuKind: "sysyemManagement"
+        },
+        component: () => import("@/views/systemManagement/clusteringManagement")
+    },
+    /*{
+        path: "/addClustering",
+        name: "addClustering",
+        meta: {
+            tabname: "新增集群配置",
+            menuKind: "sysyemManagement"
+        },
+        component: () => import("@/views/systemManagement/addClustering")
+    },*/
+    {
+        path: "/logManagement",
+        name:"logManagement",
+        meta: {
+            tabname: "日志管理",
+            menuKind: "systemManagement"
+        },
+        component: () => import("@/views/systemManagement/logManagement")
     }
 ]

src/views/algorithmsLibrary/algorithmsPlatformList.vue

@@ -4,7 +4,7 @@
             <template slot="searchItem1">
                 <span class="label">ID</span>
                 <el-input
-                    v-model="searchParams.id"
+                    v-model="searchParams.algorithmCode"
                     size="small"
                     clearable
                     placeholder="请输入"
@@ -87,12 +87,11 @@ export default {
         return {
             searchParams: {
                 //搜索参数
-                id: "", // ID
+                algorithmCode: "", // ID
                 algorithmName: "", // 算法名称
                 description: "", // 算法描述
                 uploadMode: "", // 私有类型
             },
-            validationStatusList: [],
             getDataWay:{
                     //加载表格数据
                     dataType: "url",
@@ -105,7 +104,7 @@ export default {
                 //表格列
                 {
                     label: "ID",
-                    prop: "id",
+                    prop: "algorithmCode",
                 },
                 {
                     label: "算法名称",
@@ -143,7 +142,7 @@ export default {
         },
         doReset() {
             this.searchParams = {
-                id: "",
+                algorithmCode: "",
                 algorithmName: "",
                 description: "",
                 uploadMode: "",

src/views/systemManagement/clusteringManagement.vue

@@ -0,0 +1,137 @@
+<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="searchItem3">
+                <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="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: "clusteringManagement", // 账户管理
+    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: "/addClustering" });
+        },
+        addMarkDia() {},
+    },
+};
+</script>
+
+<style scoped lang="less">
+.btnsPanel {
+    margin: 45px 40px 15px;
+}
+</style>

src/views/systemManagement/logManagement.vue

@@ -0,0 +1,186 @@
+<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-input
+                    v-model="searchParams.a2"
+                    size="small"
+                    clearable
+                    placeholder="请输入"
+                    maxlength="60"
+                >
+                </el-input>
+            </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-date-picker
+                    v-model="searchDate"
+                    type="daterange"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                >
+                </el-date-picker>
+            </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
+        >
+        
+        </tableList>
+    </div>
+</template>
+
+<script>
+import searchLayout from "@/components/grid/searchLayout";
+import tableList from "@/components/grid/TableList";
+
+export default {
+    name: "logManagement",
+    components: { searchLayout, tableList },
+    data() {
+        return {
+            searchParams: {
+                //搜索参数
+                a1: "", // ID
+                a2: "", // 算法名称
+                a3: "", // 算法描述
+                a4: "", // 私有类型
+            },
+            searchDate:[],
+            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"
+                }
+            ],
+            pagination: {
+                //分页使用
+                currentPage: 1,
+                pageSize: 10,
+                position: "right",
+                pageSizes: [10, 30, 50, 100, 200],
+                layout: "sizes, total, prev, pager, next, jumper",
+            },
+        };
+    },
+    computed: {
+    
+    },
+    methods: {
+        doSearch() {
+            this.$nextTick(() => {
+                this.refreshList(this.searchParams);
+            });
+        },
+        //刷新table
+        refreshList(param) {
+            param
+                ? this.$refs["table"].loadData(param)
+                : this.$refs["table"].loadData();
+        },
+        doReset() {
+            this.searchParams = {
+                
+            };
+            this.doSearch();
+        },
+        addOne() {
+            
+        },
+        editRow(row) {
+            
+        },
+    },
+    async mounted() {
+        await this.$dicsListsInit({
+            validationStatusList: "validationStatus",
+        });
+    },
+};
+</script>
+
+<style scoped lang="less">
+.tabsBox {
+    position: relative;
+    overflow: hidden;
+
+    .el-button {
+        position: absolute;
+        right: 40px;
+        top: 45px;
+    }
+}
+.myTabsBox{
+    min-height:29px;
+}
+</style>