Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/views/system/device/index.vue

@@ -10,7 +10,7 @@
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" 
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" maxlength="50"
                 @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="资产类别" prop="assetType">
@@ -148,7 +148,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备品牌" prop="deviceBrand">
-              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="30" />
+              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -243,7 +243,7 @@ export default {
           { required: true, message: '请选择所属机构', trigger: 'blur' },
         ],
         assetType: [
-          { required: true, message: '请选择资产类别', trigger: 'blur' },
+          { required: true, message: '请选择资产类别', trigger: 'change' },
         ],
         hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],

src/views/system/dict/data.vue

@@ -152,13 +152,6 @@
         prop="remark"
         :show-overflow-tooltip="true"
       >
-        <template slot-scope="scope">
-          <el-tooltip  placement="top">
-            <div slot="content" class="tooltipClass">
-              {{ scope.row.remark }}
-            </div>
-          </el-tooltip>
-        </template>
       </el-table-column>
 
       <el-table-column
@@ -523,7 +516,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-  .tooltipClass{
-    width: 300px;
-  }
+.tooltipClass {
+  width: 300px;
+}
+</style>
+<style >
+.el-tooltip__popper {
+  max-width: 200px;
+  
+  overflow: hidden;
+}
 </style>

src/views/system/user/extend.vue

@@ -181,7 +181,7 @@ import { extendUserInformation } from "@/api/system/information";
 export default {
   props: [],
   components: { TreeSelect ,ImgsUpload},
-  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position'],
+  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
   data() {
     return {
       startDatepickerOptions: {

src/views/system/user/index.vue

@@ -34,7 +34,7 @@
           </el-form-item>
           <el-form-item label="姓名" prop="name">
             <el-input
-              :maxlength="20"
+              :maxlength="50"
               v-model="queryParams.name"
               placeholder="请输入姓名"
               clearable