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

src/components/grid/TableList.vue

@@ -966,3 +966,8 @@
         text-align: center;
     }
 </style>
+<style>
+.el-tooltip__popper{
+    max-width:900px;
+}
+</style>

src/views/algorithmsLibrary/algorithmsPlatformList.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <search-layout :needBox="true">
-            <template slot="searchItem1">
+            <!--<template slot="searchItem1">
                 <span class="label">ID</span>
                 <el-input
                     v-model="searchParams.algorithmCode"
@@ -11,7 +11,7 @@
                     maxlength="60"
                 >
                 </el-input>
-            </template>
+            </template>-->
             <template slot="searchItem2">
                 <span class="label">算法名称</span>
                 <el-input
@@ -87,17 +87,26 @@ export default {
         return {
             searchParams: {
                 //搜索参数
-                algorithmCode: "", // ID
+                //algorithmCode: "", // ID
                 algorithmName: "", // 算法名称
                 description: "", // 算法描述
-                uploadMode: "", // 私有类型
+                //uploadMode: "", // 私有类型
             },
             getDataWay:{
                     //加载表格数据
                     dataType: "url",
+                    //dataType: "data",
                     type: "post",
                     // firstRequest: false,
                     data: this.$api.algorithmsLibrary.selectAlgoPlatformList,
+                    /*data:[
+                        {
+                            algorithmCode:'111',
+                            algorithmName:'111',
+                            description:
+                            '打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲哈维打款哈对我来讲'
+                        }
+                    ],*/
                     param: {},
             },
             columns: [
@@ -113,6 +122,7 @@ export default {
                 {
                     label: "算法描述",
                     prop: "description",
+                    showOverflowTooltip: true
                 },
             ],
             pagination: {
@@ -142,10 +152,10 @@ export default {
         },
         doReset() {
             this.searchParams = {
-                algorithmCode: "",
+                //algorithmCode: "",
                 algorithmName: "",
                 description: "",
-                uploadMode: "",
+                //uploadMode: "",
             };
             this.doSearch();
         },

src/views/systemManagement/addAccount.vue

@@ -202,6 +202,9 @@ export default {
                     list.push(item)
                 }
             })
+            if(this.roleCode == '0'|| this.roleCode == '1'){
+                list.pop()
+            }
             return list
         }
     },

src/views/systemManagement/editAccount.vue

@@ -2,7 +2,7 @@
     <div>
         <div  style="padding: 45px 30px 0;">
             <el-row>
-                <el-col :span="14" :offset="2">
+                <el-col :span="16" :offset="4">
                      <el-form
                 ref="form"
                 :model="form"
@@ -93,18 +93,7 @@
                 </div>
             </el-form>
                 </el-col>
-                <el-col :span="6">
-                <div class="fileBox">
-                <div class="photo">
-                    <img :src="imgSrc" width="100%" height="100%" />
-                </div>
-                <!--<div class="uploadBox">
-                    <el-button type="primary" plain icon="el-icon-upload2"
-                        >上传头像</el-button
-                    >
-                </div>-->
-            </div>
-                </el-col>
+                
             </el-row>
         </div>
 

src/views/systemManagement/parameterManagement.vue

@@ -96,7 +96,7 @@ export default{
                     prop: "numScenePerPackage",
                 },
                 {
-                    label: "创建时间",
+                    label: "操作时间",
                     prop: "createTime",
                     formatter: (data) => {
                         return this.$timeFormatter(data.createTime)