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

src/lib/util.js

@@ -206,4 +206,14 @@ function TimeFormatter(time){
     }
  }
 
- Vue.prototype.$validatePhone = ValidatePhone
+ Vue.prototype.$validatePhone = ValidatePhone
+
+ function ValidateInteger(val,max){
+    let reg = /(^[0-9]\d*$)/
+    if(reg.test(val)){
+        return true 
+    }else{
+        return false
+    }
+ }
+ Vue.prototype.$validateInteger = ValidateInteger

src/router/systemManagement.js

@@ -38,7 +38,7 @@ export default [{
         path: "/parameterDetail",
         name: "parameterDetail",
         meta: {
-            tabname: "新增参数配置",
+            tabname: "编辑参数配置",
             menuKind: "systemManagement"
         },
         component: () => import("@/views/systemManagement/parameterDetail")

src/views/mainPage.vue

@@ -321,19 +321,22 @@ export default {
         }
     },
     watch:{
-        roleCode(newV){
-            if(newV == '0'|| newV == '1'){
-                this.tabsList=[
-                    {label: '系统监控', name: '1'},
-                    {label: '系统监控', name: '2'},
-                ]
-                this.activeName = '1'
-            }else{
-                this.tabsList=[
-                    {label: '系统监控', name: '2'},
-                ]
-                this.activeName = '2'
-            }
+        roleCode:{
+            handler(newV){
+                if(newV == '0'|| newV == '1'){
+                    this.tabsList=[
+                        {label: '系统监控', name: '1'},
+                        {label: '系统监控', name: '2'},
+                    ]
+                    this.activeName = '1'
+                }else{
+                    this.tabsList=[
+                        {label: '系统监控', name: '2'},
+                    ]
+                    this.activeName = '2'
+                }
+            },
+            immediate: true
         }
     },
     methods: {

src/views/personalInformation/personalInformation.vue

@@ -8,7 +8,7 @@
             <div class="flexBox">
                 <div class="flexItem"><span class="label">用户名：</span>{{userInfo.username}}</div>
                 <div class="flexItem"><span class="label">账户类型：</span>{{roleType}}</div>
-                <div class="flexItem"><span class="label">所属父账户：</span>{{userInfo.createUserName}}</div>
+                <div class="flexItem"><span class="label">独占类型：</span>{{userInfo.useTypeName}}</div>
                 <div class="flexItem"><span class="label">所属公司：</span>{{userInfo.company}}</div>
                 <div class="flexItem"><span class="label">联系人：</span>{{userInfo.nickname}}</div>
                 <div class="flexItem"><span class="label">联系方式：</span>{{userInfo.phone}}<span class="textButton" @click="changePhone">修改联系方式</span></div>

src/views/systemManagement/accountManagement.vue

@@ -199,7 +199,6 @@ export default {
         },
         editAccount(row) {
             let query = {...row}
-            console.log(row)
             this.$router.push({
                 path: "/editAccount",
                 query

src/views/systemManagement/addAccount.vue

@@ -32,7 +32,7 @@
                 <el-form-item label="账户类型:" prop="roleCode">
                     <el-select v-model="form.roleCode">
                         <el-option
-                            v-for="item in roleCodeList"
+                            v-for="item in limitRoleCodeList"
                             :label="item.caption"
                             :value="item.code"
                             :key="item.code"
@@ -155,7 +155,7 @@ export default {
         };
     },
     async created(){
-
+        this.form.useType = this.$store.state.useType
     },
     async mounted() {
         await this.$dicsListsInit({
@@ -164,24 +164,40 @@ export default {
         });
     },
     computed: {
-
+        roleCode(){
+            return this.$store.state.roleCode
+        },
+        limitRoleCodeList(){
+            let list = []
+            this.roleCodeList.map(item=>{
+                if(Number(item.code)>=this.roleCode){
+                    list.push(item)
+                }
+            })
+            return list
+        }
     },
     methods: {
         saveForm(){
-            this.$axios({
-                method:'POST',
-                url:this.$api.systemManagement.saveUser,
-                data:{
-                    ...this.form
-                }
-            }).then(res => {
-                if(res.code == 200){
-                    this.$message.success("保存成功");
-                    this.cancel()
-                }else{
-                    this.$message.error(res.message || "保存失败");
+            this.$refs.form.validate(valid=>{
+                if(valid){
+                    this.$axios({
+                        method:'POST',
+                        url:this.$api.systemManagement.saveUser,
+                        data:{
+                            ...this.form
+                        }
+                    }).then(res => {
+                        if(res.code == 200){
+                            this.$message.success("保存成功");
+                            this.cancel()
+                        }else{
+                            this.$message.error(res.message || "保存失败");
+                        }
+                    })
                 }
             })
+            
         },
         cancel() {
             this.$router.replace({

src/views/systemManagement/clusteringDetail.vue

@@ -173,20 +173,24 @@ export default {
     computed: {},
     methods: {
         save(){
-            this.$axios({
-                method:"POST",
-                url:this.$api.systemManagement.saveCluster,
-                data:{
-                    ...this.form
+            this.$refs.form.validate(valid=>{
+                if(valid){
+                    this.$axios({
+                        method:"POST",
+                        url:this.$api.systemManagement.saveCluster,
+                        data:{
+                            ...this.form
+                        }
+                    }).then(res=>{
+                        if(res.code == 200){
+                            this.$message.success("保存成功");
+                            this.cancel()
+                        }else{
+                            this.$message.error(res.message || "保存失败");
+                        }
+                    })
                 }
-            }).then(res=>{
-                if(res.code == 200){
-                    this.$message.success("保存成功");
-                    this.cancel()
-                }else{
-                    this.$message.error(res.message || "保存失败");
-                }
-            })
+            }) 
         },
         cancel(){
             this.$router.replace({path: '/clusteringManagement'})

src/views/systemManagement/clusteringManagement.vue

@@ -16,9 +16,9 @@
                 <span class="label">操作时间</span>
                 <el-date-picker
                     v-model="modifyTimeRange"
-                    type="daterange"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
+                    type="datetimerange"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
@@ -194,8 +194,8 @@ export default {
         doSearch(){
             this.searchParams.modifyTimeStart=this.modifyTimeRange[0]||''
             this.searchParams.modifyTimeEnd=this.modifyTimeRange[1]||''
-            this.searchParams.dueTimeStart=this.modifyTimeRange[0]||''
-            this.searchParams.dueTimeEnd=this.modifyTimeRange[1]||''
+            this.searchParams.dueTimeStart=this.dueTimeRange[0]||''
+            this.searchParams.dueTimeEnd=this.dueTimeRange[1]||''
             this.refreshList(this.searchParams)
         },
         reset(){

src/views/systemManagement/editAccount.vue

@@ -211,24 +211,29 @@ export default {
             roleCodeList: "roleCode",
             useTypeList: "useType"
         });
+        console.log(this.userTypeList)
     },
     computed: {
 
     },
     methods: {
         saveForm(){
-            this.$axios({
-                method:'POST',
-                url:this.$api.systemManagement.saveUser,
-                data:{
-                    ...this.form
-                }
-            }).then(res => {
-                if(res.code == 200){
-                    this.$message.success("保存成功");
-                    this.cancel()      
-                }else{
-                    this.$message.error(res.message || "保存失败");
+            this.$refs.form.validate(valid=>{
+                if(valid){
+                    this.$axios({
+                        method:'POST',
+                        url:this.$api.systemManagement.saveUser,
+                        data:{
+                            ...this.form
+                        }
+                    }).then(res => {
+                        if(res.code == 200){
+                            this.$message.success("保存成功");
+                            this.cancel()      
+                        }else{
+                            this.$message.error(res.message || "保存失败");
+                        }
+                    })
                 }
             })
         },

src/views/systemManagement/parameterDetail.vue

@@ -82,9 +82,55 @@ export default {
                 numScenePerPackage: '',
             },
             rules: {
-                numCreateUser:  [{ required: true, message: "请输入", trigger: "blur" }],
-                numCreateScenePackage:  [{ required: true, message: "请输入", trigger: "blur" }],
-                numScenePerPackage:  [{ required: true, message: "请输入", trigger: "blur" }],
+                numCreateUser:  [
+                    { required: true, message: "请输入", trigger: "blur" },
+                    {
+                        validator: (rule, value, callback) => {
+                            if(this.$validateInteger(value)){
+                                callback()
+                            }else{
+                                callback(new Error('格式错误'))
+                            }
+                        },
+                        trigger: "blur"
+                    },
+                ],
+                numCreateScenePackage:  [
+                    { required: true, message: "请输入", trigger: "blur" },
+                    {
+                        validator: (rule, value, callback) => {
+                            if(this.$validateInteger(value)){
+                                callback()
+                            }else{
+                                callback(new Error('格式错误'))
+                            }
+                        },
+                        trigger: "blur"
+                    }
+                ],
+                numScenePerPackage:  [
+                    { required: true, message: "请输入", trigger: "blur" },
+                    {
+                        validator: (rule, value, callback) => {
+                            if(this.$validateInteger(value)){
+                                callback()
+                            }else{
+                                callback(new Error('格式错误'))
+                            }
+                        },
+                        trigger: "blur"
+                    },
+                    {
+                        validator: (rule, value, callback) => {
+                            if(Number(value)<=10000){
+                                callback()
+                            }else{
+                                callback(new Error('超出最大值'))
+                            }
+                        },
+                        trigger: "blur"
+                    },
+                ],
             }
         };
     },
@@ -106,18 +152,22 @@ export default {
     },
     methods: {
         save(){
-            this.$axios({
-                method:'POST',
-                url:this.$api.systemManagement.saveParameter,
-                data:{
-                    ...this.form
-                }
-            }).then(res => {
-                if(res.code == 200){
-                    this.$message.success("保存成功");
-                    this.cancel()    
-                }else{
-                    this.$message.error(res.message || "保存失败");
+            this.$refs.form.validate(valid=>{
+                if(valid){
+                    this.$axios({
+                        method:'POST',
+                        url:this.$api.systemManagement.saveParameter,
+                        data:{
+                            ...this.form
+                        }
+                    }).then(res => {
+                        if(res.code == 200){
+                            this.$message.success("保存成功");
+                            this.cancel()    
+                        }else{
+                            this.$message.error(res.message || "保存失败");
+                        }
+                    }) 
                 }
             })
         },