Эх сурвалжийг харах

shiyu集群校验修改和创建账户修改

shiyu 2 жил өмнө
parent
commit
c3b86377ee

+ 1 - 2
src/views/systemManagement/accountManagement.vue

@@ -198,13 +198,12 @@ export default {
         limitRoleCodeList(){
             let temp = []
             temp = this.roleCodeList.filter(item=>{
-                if(item.code >= this.$store.state.roleCode){
+                if(item.code > this.$store.state.roleCode){
                     return true
                 }else{
                     return false
                 }
             })
-            console.log(temp)
             return temp
         }
     },

+ 20 - 2
src/views/systemManagement/addAccount.vue

@@ -156,7 +156,7 @@ export default {
         };
     },
     async created(){
-        this.form.useType = this.$store.state.useType
+        //this.form.useType = this.$store.state.useType
     },
     async mounted() {
         await this.$dicsListsInit({
@@ -164,9 +164,27 @@ export default {
             useTypeList: "useType"
         });
         //管理员用户创建时可以选择useType,普通账户只能继承useType且不可修改
+    },
+    watch:{
+        activeInfo:{
+            handler(newV){
+                if(newV.roleCode == '0'||newV.roleCode == '1'){
 
+                }else{
+                    this.form.useType = newV.useType
+                }
+            },
+            deep:true,
+            immediate:true
+        }
     },
     computed: {
+        activeInfo(){
+            return {
+                roleCode:this.$store.state.roleCode,
+                useType:this.$store.state.useType
+            }
+        },
         roleCode(){
             return this.$store.state.roleCode
         },
@@ -180,7 +198,7 @@ export default {
         limitRoleCodeList(){
             let list = []
             this.roleCodeList.map(item=>{
-                if(Number(item.code)>=this.roleCode){
+                if(Number(item.code)>this.roleCode){
                     list.push(item)
                 }
             })

+ 5 - 3
src/views/systemManagement/clusteringDetail.vue

@@ -130,9 +130,9 @@ export default {
                 {
                     label: "操作时间",
                     prop: "modifyTime",
-                    formatter:(data)=>{
+                    /*formatter:(data)=>{
                         return this.$timeFormatter(data.modifyTime)
-                    }
+                    }*/
                 }
             ],
             form: {
@@ -163,6 +163,9 @@ export default {
                 ],
                 dateSimulationLicense: [
                     { required: true, message: "请选择", trigger: "blur" },
+                ],
+                numDynamicLicense: [
+                    { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: (rule, value, callback) => {
                             if(this.$validateInteger(value)){
@@ -174,7 +177,6 @@ export default {
                         trigger: "blur"
                     }
                 ],
-                numDynamicLicense: [{ required: true, message: "请输入", trigger: "blur" }],
                 dateDynamicLicense: [{ required: true, message: "请选择", trigger: "blur" }]
             }
         };

+ 4 - 0
src/views/systemManagement/clusteringManagement.vue

@@ -148,6 +148,10 @@ export default {
                         return data.dateDynamicLicense?data.dateDynamicLicense.slice(0,10):''
                     }
                 },
+                {   
+                    label: "操作时间",
+                    prop: "modifyTime",
+                },
                 {
                     label: "操作",
                     prop: "cgInfos",