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

src/router/systemManagement.js

@@ -11,7 +11,7 @@ export default [{
         path: "/addAccount",
         name: "addAccount",
         meta: {
-            tabname: "创建账户",
+            tabname: "新增账户",
             menuKind: "systemManagement"
         },
         component: () => import("@/views/systemManagement/addAccount")

src/views/personalInformation/personalInformation.vue

@@ -385,7 +385,7 @@
     margin-bottom: 10px;
     .label{
         display: inline-block;
-        width: 120px;
+        width: 140px;
         text-align: right;
     }
     .label2{

src/views/systemManagement/accountManagement.vue

@@ -62,7 +62,7 @@
                 type="primary"
                 icon="el-icon-circle-plus-outline"
                 @click="addAccount"
-                >创建账户</el-button
+                >新增账户</el-button
             >
         </div>
 
@@ -192,19 +192,22 @@ export default {
         await this.$dicsListsInit({
             roleCodeList: "roleCode",
         });
-        console.log(this.$store.state.roleCode)
     },
     computed:{
+        roleCode(){
+            return this.$store.state.roleCode
+        },
         limitRoleCodeList(){
-            let temp = []
-            temp = this.roleCodeList.filter(item=>{
-                if(item.code > this.$store.state.roleCode){
-                    return true
-                }else{
-                    return false
+            let list = []
+            this.roleCodeList.map(item=>{
+                if(Number(item.code)>this.roleCode){
+                    list.push(item)
                 }
             })
-            return temp
+            if(this.roleCode == '0'|| this.roleCode == '1'){
+                list.pop()
+            }
+            return list
         }
     },
     methods: {

src/views/systemManagement/clusteringDetail.vue

@@ -48,6 +48,7 @@
                         type="date"
                         placeholder="选择日期"
                         value-format="yyyy-MM-dd"
+                        :picker-options="pickerOptionsSimulation"
                     ></el-date-picker>
                 </el-form-item>
                 <el-form-item label="动力学软件license数量:" prop="numDynamicLicense">
@@ -65,6 +66,7 @@
                         type="date"
                         placeholder="选择日期"
                         value-format="yyyy-MM-dd"
+                        :picker-options="pickerOptionsDynamic"
                     ></el-date-picker>
                 </el-form-item>
             </div>
@@ -145,8 +147,36 @@ export default {
                 numDynamicLicense: "",
                 dateDynamicLicense: ""
             },
+            pickerOptionsSimulation:{
+                disabledDate: (date)=>{
+                    if(this.validDateSimulation){
+                        if(new Date(date).getTime() > new Date(this.validDateSimulation).getTime()){
+                            return true
+                        }else{
+                            return false
+                        }
+                    }else{
+                        return false
+                    }
+                }
+            },
+            pickerOptionsDynamic:{
+                disabledDate: (date)=>{
+                    if(this.validDateDynamic){
+                        if(new Date(date).getTime() > new Date(this.validDateDynamic).getTime()){
+                            return true
+                        }else{
+                            return false
+                        }
+                    }else{
+                        return false
+                    }
+                }
+            },
             validNumSimLicense: undefined,
             validNumDynLicense: undefined,
+            validDateSimulation: undefined,
+            validDateDynamic: undefined,
             rules: {
                 numSimulationLicense: [
                     { required: true, message: "请输入", trigger: "blur" },
@@ -212,6 +242,8 @@ export default {
                 if(res.code == '200' && res.info){
                     this.validNumDynLicense = res.info.validNumDynLicense
                     this.validNumSimLicense = res.info.validNumSimLicense
+                    this.validDateDynamic = res.info.dateSimulationLicense
+                    this.validDateSimulation = res.info.dateDynamicLicense
                 }
             })
         },

src/views/systemManagement/parameterManagement.vue

@@ -3,7 +3,7 @@
     <div>
         <search-layout :needBox="true">
             <template slot="searchItem1">
-                <span class="label">账户名</span>
+                <span class="label">账户名称</span>
                 <el-input
                     v-model="searchParams.userName"
                     size="small"

src/views/systemManagement/scenePacketDistributionDetail.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="infoBox">
             <div class="info">
-                <span>账户名:</span>
+                <span>账户名称:</span>
                 <b>{{ info.userName || "" }}</b>
             </div>
             <div class="info">
@@ -114,6 +114,7 @@ export default {
                 {
                     label: "场景包名称",
                     prop: "packageName",
+                    showOverflowTooltip:true
                 },
                 {
                     label: "描述",
@@ -344,7 +345,7 @@ export default {
 <style lang='less' scoped>
 .infoBox {
     display: flex;
-    padding: 24px 12px 0;
+    padding: 24px 40px 0;
 
     .info {
         display: flex;

src/views/systemManagement/scenePacketListManagement/detail.vue

@@ -93,7 +93,7 @@
         </div>
 
         <div class="btns">
-            <el-button type="primary" @click="save">确定</el-button>
+            <el-button type="primary" @click="save">保存</el-button>
             <el-button type="primary" plain @click="cancel">取消</el-button>
         </div>
     </div>

src/views/systemManagement/scenePacketListManagement/index.vue

@@ -14,7 +14,7 @@
                 </el-input>
             </template>
             <template slot="searchItem2">
-                <span class="label">创建时间</span>
+                <span class="label">操作时间</span>
                 <el-date-picker
                     v-model="createDate"
                     type="daterange"
@@ -40,7 +40,7 @@
                 type="primary"
                 icon="el-icon-circle-plus-outline"
                 @click="addOne"
-                >创建</el-button
+                >新增</el-button
             >
         </div>
 
@@ -162,10 +162,12 @@ export default {
                 {
                     label: "场景包名称",
                     prop: "packageName",
+                    showOverflowTooltip: true,
                 },
                 {
                     label: "描述",
                     prop: "sceneDescribe",
+                    showOverflowTooltip: true,
                 },
                 {
                     label: "自然驾驶场景",
@@ -184,7 +186,7 @@ export default {
                     prop: "fhCount",
                 },
                 {
-                    label: "创建时间",
+                    label: "操作时间",
                     prop: "createTime",
                 },
                 {

src/views/systemManagement/vehicleModelManagement.vue

@@ -39,7 +39,7 @@
                 type="primary"
                 icon="el-icon-circle-plus-outline"
                 @click="addOne"
-                >创建</el-button
+                >新增</el-button
             >
         </div>
 

src/views/workManagement/manualRunProjectList.vue

@@ -95,7 +95,7 @@
                     type="primary"
                     icon="el-icon-circle-plus-outline"
                     @click="addOne"
-                    >创建</el-button
+                    >新增</el-button
                 >
             </div>