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

src/lib/util.js

@@ -177,4 +177,33 @@ Vue.prototype.$getObjectPathByRandom = function () {
     return a + b;
 }
 
-Vue.prototype.$md5 = md5
+Vue.prototype.$md5 = md5
+
+function TimeFormatter(time){
+    let date = new Date(time)
+    let year = date.getFullYear()
+    let month = date.getMonth()+1
+    let day = date.getDate()
+    let hour = date.getHours()
+    let min = date.getMinutes()
+    let second = date.getSeconds()
+    month<10?month = '0' + month:undefined
+    day<10?day = '0' + day:undefined
+    hour<10?hour = '0' + hour:undefined
+    min<10?min = '0' + min:undefined
+    second<10?second = '0' +second:undefined
+    return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + second
+}
+ Vue.prototype.$timeFormatter = TimeFormatter
+
+ function ValidatePhone(val){
+    let phoneReg = /^([0-9]{3,4}-)?[0-9]{7,8}$/;
+    let mobReg = /0?1[3|4|5|8][0-9]\d{8}$/;
+    if(phoneReg.test(val)||mobReg.test(val)){
+        return true
+    }else{
+        return false
+    }
+ }
+
+ Vue.prototype.$validatePhone = ValidatePhone

src/router/index.js

@@ -9,7 +9,13 @@ import workManagement from "./workManagement"; // 工作管理
 
 Vue.use(VueRouter);
 
-const routes = [{
+const routes = [
+  {
+    path: "/login",
+    name: "login",
+    component: () => import("../views/login.vue")
+  },
+  {
   path: "/",
   name: "index",
   meta: {
@@ -82,7 +88,8 @@ const routes = [{
       name: "*",
       component: () => import("../views/mainPage.vue")
     }, ]),
-}];
+  },
+];
 // {
 //   path: "/",
 //   name: "About",
@@ -100,7 +107,7 @@ const router = new VueRouter({
   routes,
   scrollBehavior(to, from, savedPosition) {
     return {x: 0, y: 0}
-}
+  }
 });
 
 export default router;

src/views/algorithmsLibrary/gitAlgorithms.vue

@@ -102,7 +102,7 @@ export default {
                 description: [{ required: true, message: "请输入", trigger: "blur" }],
                 gitUrl: [{ required: true, message: "请输入", trigger: "blur" }],
                 gitUserName: [{ required: true, message: "请输入", trigger: "blur" }],
-                gitPassword: [{ required: true, message: "请输入", trigger: "blur" }],
+                //gitPassword: [{ required: true, message: "请输入", trigger: "blur" }],
             },
         };
     },

src/views/login.vue

@@ -48,7 +48,7 @@ export default {
                 password: [
                     {
                         required: true,
-                        message: "请输入最多16位密码",
+                        message: "请输入密码",
                         trigger: "blur",
                     },
                 ],

src/views/systemManagement/accountManagement.vue

@@ -73,7 +73,6 @@
             :getDataWay="getDataWay"
             :pagination="pagination"
             index
-            selection
         >
             <el-table-column label="停/启用" slot="visible" align="center">
                 <template v-slot="scope">
@@ -81,7 +80,7 @@
                         v-model="scope.row.visible"
                         active-value="1"
                         inactive-value="0"
-                        active-color="#13ce66"
+                        active-color="#3397ff"
                         inactive-color="#ff4949"
                         @change="$event=>{switchVisible($event, scope.row)}"
                     ></el-switch>
@@ -161,6 +160,9 @@ export default {
                 {
                     label: "创建时间",
                     prop: "createTime",
+                    formatter: (data) => {
+                        return this.$timeFormatter(data.createTime)
+                    }
                 },
                 {
                     label: "操作",
@@ -197,6 +199,7 @@ export default {
         },
         editAccount(row) {
             let query = {...row}
+            console.log(row)
             this.$router.push({
                 path: "/editAccount",
                 query

src/views/systemManagement/addAccount.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flexBox box">
+        <div style="padding: 45px 30px 0;">
             <!--<div class="fileBox">
                 <div class="til">头像</div>
                 <div class="photo">
@@ -12,7 +12,9 @@
                     >
                 </div>
             </div>-->
-            <el-form
+            <el-row>
+                <el-col :span="16" :offset="4">
+                <el-form
                 ref="form"
                 :model="form"
                 :rules="rules"
@@ -41,7 +43,7 @@
                 <el-form-item label="所属公司:" prop="company">
                     <el-input
                         placeholder="请输入"
-                        maxlength="15"
+                        maxlength="30"
                         v-autoTrim="{ obj: form.company, key: 'company' }"
                         v-model="form.company"
                     >
@@ -100,6 +102,8 @@
                     >取消</el-button>
                 </div>
             </el-form>
+                </el-col>
+            </el-row>    
         </div>
 
     </div>
@@ -132,7 +136,19 @@ export default {
                 roleCode: [{ required: true, message: "请选择", trigger: "change" }],
                 company: [{ required: true, message: "请输入", trigger: "blur" }],
                 nickname: [{ required: true, message: "请输入", trigger: "blur" }],
-                phone: [{ required: true, message: "请输入", trigger: "blur" }],
+                phone: [
+                    { required: true, message: "请输入", trigger: "blur" },
+                    {
+                        validator: (rule, value, callback) => {
+                            if(this.$validatePhone(value)){
+                                callback()
+                            }else{
+                                callback(new Error('格式错误'))
+                            }
+                        },
+                        trigger: "blur"
+                    }
+                ],
                 //password: [{ required: true, message: "请输入", trigger: "blur" }],
                 useType: [{ required: true, message: "请选择", trigger: "change" }],
             },

src/views/systemManagement/clusteringDetail.vue

@@ -12,21 +12,26 @@
                 <el-form-item label="账户名称:" prop="userName">
                     <el-input
                         placeholder="请输入"
-                        readOnly
-                        v-autoTrim="{ obj: form, key: 'userName' }"
+                        disabled
                         v-model="form.userName"
                     >
                     </el-input>
                 </el-form-item>
                 <el-form-item label="独占类型:" prop="userType">
-                    <el-select v-model="form.userType" disabled>
+                    <!--<el-select v-model="form.userType" disabled>
                         <el-option
                             v-for="item in userTypeList"
                             :label="item.caption"
                             :value="item.code"
                             :key="item.code"
                         ></el-option>
-                    </el-select>
+                    </el-select>-->
+                    <el-input
+                        placeholder="请输入"
+                        disabled
+                        v-model="form.userType"
+                    >
+                    </el-input>
                 </el-form-item>
                 <el-form-item label="仿真软件license数量:" prop="numSimulationLicense">
                     <el-input
@@ -113,7 +118,7 @@ export default {
                 },
                 {
                     label: "动力学软件license",
-                    prop: "numDynamicLicnese",
+                    prop: "numDynamicLicense",
                 },
                 {
                     label: "到期时间",
@@ -126,7 +131,7 @@ export default {
                     label: "操作时间",
                     prop: "modifyTime",
                     formatter:(data)=>{
-                        return data.modifyTime.slice(0,10)
+                        return this.$timeFormatter(data.modifyTime)
                     }
                 }
             ],

src/views/systemManagement/clusteringManagement.vue

@@ -67,13 +67,13 @@
             :pagination="pagination"
             index
         >
-            <el-table-column label="独占类型" slot="userType" align="center">
+            <!--<el-table-column label="独占类型" slot="userType" align="center">
                 <template v-slot="scope">
                     <span>
                         {{(userTypeList.find(item=>item.code==scope.row.userType)||{}).caption||''}}
                     </span>
                 </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="操作" slot="cgInfos" align="center">
                 <template v-slot="scope">
                     <i
@@ -118,7 +118,7 @@ export default {
                 {
                     label: "独占类型",
                     prop: "userType",
-                    template:true
+                    //template:true
                 },
                 {
                     label: "仿真软件license",

src/views/systemManagement/editAccount.vue

@@ -1,7 +1,9 @@
 <template>
     <div>
-        <div class="flexBox box">
-            <el-form
+        <div  style="padding: 45px 30px 0;">
+            <el-row>
+                <el-col :span="14" :offset="2">
+                     <el-form
                 ref="form"
                 :model="form"
                 :rules="rules"
@@ -30,8 +32,8 @@
                 <el-form-item label="所属公司:" prop="company">
                     <el-input
                         placeholder="请输入"
-                        maxlength="15"
-                        v-autoTrim="{ obj: form.company, key: 'company' }"
+                        maxlength="30"
+                        v-autoTrim="{ obj: form, key: 'company' }"
                         v-model="form.company"
                     >
                     </el-input>
@@ -41,7 +43,7 @@
                     <el-input
                         placeholder="请输入"
                         maxlength="15"
-                        v-autoTrim="{ obj: form.nickname, key: 'nickname' }"
+                        v-autoTrim="{ obj: form, key: 'nickname' }"
                         v-model="form.nickname"
                     >
                     </el-input>
@@ -51,12 +53,12 @@
                     <el-input
                         placeholder="请输入"
                         maxlength="15"
-                        v-autoTrim="{ obj: form.phone, key: 'password' }"
+                        v-autoTrim="{ obj: form, key: 'password' }"
                         v-model="form.phone"
                     >
                     </el-input>
                 </el-form-item>
-                
+                <!--
                 <el-form-item label="密码:" prop="password">
                     <el-input
                         placeholder="请输入"
@@ -67,7 +69,7 @@
                     >
                     </el-input>
                 </el-form-item>
-
+                
                 <el-form-item label="确认密码:" prop="password">
                     <el-input
                         placeholder="请输入"
@@ -78,18 +80,21 @@
                     >
                     </el-input>
                 </el-form-item>
-
+                -->
                 <el-form-item label="独占类型:" prop="useType">
                     <el-radio v-for="item in useTypeList" :key="item.code" :label="item.code" v-model="form.useType">{{item.caption}}</el-radio>
                 </el-form-item>
 
                 <div class="btns">
+                    <el-button type="primary" @click="resetPassword">重置密码</el-button>
                     <el-button type="primary" @click="saveForm">保存</el-button>
                     <el-button type="primary" plain @click="cancel"
                     >取消</el-button>
                 </div>
             </el-form>
-            <div class="fileBox">
+                </el-col>
+                <el-col :span="6">
+                <div class="fileBox">
                 <div class="photo">
                     <img :src="imgSrc" width="100%" height="100%" />
                 </div>
@@ -99,6 +104,8 @@
                     >
                 </div>-->
             </div>
+                </el-col>
+            </el-row>
         </div>
 
         <el-dialog
@@ -121,7 +128,7 @@
                 >
                     <el-input
                         placeholder="请输入"
-                        maxlength="30"
+                        maxlength="10"
                         class="name"
                         v-autoTrim="{ obj: form, key: 'name' }"
                         v-model="formA.name"
@@ -169,8 +176,20 @@ export default {
                 roleCode: [{ required: true, message: "请选择", trigger: "change" }],
                 company: [{ required: true, message: "请输入", trigger: "blur" }],
                 nickname: [{ required: true, message: "请输入", trigger: "blur" }],
-                phone: [{ required: true, message: "请输入", trigger: "blur" }],
-                password: [{ required: true, message: "请输入", trigger: "blur" }],
+                phone: [
+                    { required: true, message: "请输入", trigger: "blur" },
+                    {
+                        validator: (rule, value, callback) => {
+                            if(this.$validatePhone(value)){
+                                callback()
+                            }else{
+                                callback(new Error('格式错误'))
+                            }
+                        },
+                        trigger: "blur"
+                    }
+                ],
+                //password: [{ required: true, message: "请输入", trigger: "blur" }],
                 useType: [{ required: true, message: "请选择", trigger: "change" }],
             },
             formA: {
@@ -218,6 +237,22 @@ export default {
                 path: '/accountManagement'
             })
         },
+        resetPassword(){
+            this.$axios({
+                method: "POST",
+                url: this.$api.systemManagement.saveDefaultPassword,
+                data: {
+                    id: this.form.id,
+                    username: this.form.username
+                }
+            }).then(res => {
+                if(res.code == "200"){
+                    this.$message.success("重置密码成功")
+                }else{
+                    this.$message.warning(res.message||"重置密码失败")
+                }
+            })
+        }
     },
     // mounted: {},
 };

src/views/systemManagement/parameterManagement.vue

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