Merge branch 'master' into 'mhy'

Master

See merge request !80

xichongSys/src/utils/global.js

-/**
- * 全局常量、方法封装模块
- * 通过原型挂载到Vue属性
- * 通过 this.Global 调用
- */
+//ww
+//  export const baseUrl = 'http://xc.rensheju.com'
+//  export const baseUrl2 = 'http://xclc.rensheju.com'
+export const baseUrl = 'http://172.16.10.33:9002'
+export const baseUrl2 = 'http://172.16.10.25:9007'
 
-// 后台管理系统服务器地址
-// export const baseUrl2 = 'http://xclc.rensheju.com'
-export const baseUrl = 'http://xc.rensheju.com'
-//export const baseUrl = 'http://172.16.10.33:9002'
-export const baseUrl2 = 'http://xclc.rensheju.com'
-//export const baseUrl = 'http://xc.rensheju.com'
 
 export default {
     baseUrl,

xichongSys/src/views/Core/PersonalPanel.vue

@@ -33,12 +33,12 @@
 
     <el-dialog :modal-append-to-body='false'  title="修改密码" :visible.sync="updatePasswordDialogVisible" width="25%">
       <el-form :model="item">
-        <el-input placeholder="请输入原密码" v-model="item.password" show-password maxlength = 8 minlength = 6  ></el-input>
+        <el-input placeholder="请输入原密码" v-model="item.password" show-password maxlength = 18 minlength = 6  ></el-input>
         <div style="margin: 20px 0;">
         </div>
-        <el-input placeholder="请输入新密码 6~8位" v-model="item.newpassword" show-password maxlength = 8 minlength = 6></el-input>
+        <el-input placeholder="请输入新密码 6~18位" v-model="item.newpassword" show-password maxlength = 18 minlength = 6></el-input>
         <div style="margin: 20px 0;"/>
-        <el-input placeholder="再次输入新密码 6~8位" v-model="item.newpasswordagain" show-password maxlength = 8 minlength = 6></el-input>
+        <el-input placeholder="再次输入新密码 6~18位" v-model="item.newpasswordagain" show-password maxlength = 18 minlength = 6></el-input>
         <div style="margin: 20px 0;"/>
       </el-form>
 
@@ -69,7 +69,7 @@ export default {
         name: "admin",
         avatar: "@/assets/user.png",
         role: "超级管理员",
-        registeInfo: "注册时间：2018-12-25 "
+        registeInfo: "注册时间g：2018-12-25 "
       }
     }
   },

xichongSys/src/views/Myvue/table.vue

@@ -20,7 +20,13 @@
   <el-table
     :data="tableData"
     style="width: 100%"
+    @selection-change="handleSelectionChange"
+    tooltip-effect="dark"
     >
+     <el-table-column
+      type="selection"
+      width="55">
+    </el-table-column>
     <el-table-column
       prop="idcard"
       label="身份证号"
@@ -90,6 +96,8 @@
       </template>
     </el-table-column>
   </el-table>
+  <div class="bottom">
+   <kt-button class="check" icon="el-icon-delete" label="删除已选" perms="sys:user:add" type="primary" />
   <el-pagination
   	class="pone"
       :page-size='10'
@@ -102,6 +110,7 @@
 >
 
     </el-pagination>
+    </div>
   </div>
 </template>
 
@@ -126,8 +135,16 @@
   .el-table .success-row {
     background: #f0f9eb;
   }
+  .bottom{
+    margin-top: 40px;
+    overflow: hidden;
+  }
   .pone{
-    margin-top: 40px
+    margin-left: 250px;
+    float: left;
+  }
+  .check{
+    float: left;
   }
 </style>
 
@@ -135,9 +152,11 @@
  import CryptoJS from 'crypto-js'
  import { Loading } from 'element-ui';
  import Candode from "../Core/candode"
+ import KtButton from "@/views/Core/KtButton"
 // import baseUrl from "../../globe/globeUrl"
   export default {
     components:{
+      KtButton,
     Candode
     },
    data() {
@@ -151,10 +170,14 @@
         ywtype:"",
         info:'',
         pageSize:10,
-        tableData: []
+        tableData: [],
+        multipleSelection: []
       }
     },
     methods: {
+      handleSelectionChange(val){
+        this.multipleSelection=val
+      },
       handleSizeChange(val){
         this.pageSize=val
         this.serchh(this.Page)