*

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -243,7 +243,7 @@ export default {
     display: none;
     .bg{
       width: 244px;
-      height: 176px;
+      /*height: 176px;*/
       background: #FFFFFF;
       box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
       border-radius: 4px;

dsk-operate-ui/src/views/system/user/index.vue

@@ -150,7 +150,7 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <!--<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />-->
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
@@ -219,7 +219,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户名称" prop="nickName">
+            <el-form-item label="用户昵称" prop="nickName">
               <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
@@ -353,22 +353,30 @@
     <!--导入结果-->
     <el-dialog title="导入失败" :visible.sync="showupload" width="60%" append-to-body>
       <template>
-        <el-table max-height="600px"
+        <el-table max-height="500px"
           :data="tableData" border
           style="width: 100%">
           <el-table-column
-            prop="date"
-            label="日期"
-            width="180">
+            prop=""
+            label="导入状态">
+            <template slot-scope="scope">
+              <font color="red">导入失败</font>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="nickname"
+            label="用户昵称">
           </el-table-column>
           <el-table-column
-            prop="name"
-            label="姓名"
-            width="180">
+            prop="phonenumber"
+            label="手机号码">
           </el-table-column>
           <el-table-column
-            prop="address"
-            label="地址">
+            prop=""
+            label="失败原因">
+            <template slot-scope="scope">
+              <font color="red">{{scope.row.failReason}}</font>
+            </template>
           </el-table-column>
         </el-table>
         <el-row style="padding-top: 20px;text-align: right">
@@ -394,23 +402,7 @@ export default {
     return {
       //导入失败数据
       showupload:false,
-      tableData: [{
-        date: '2016-05-02',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1518 弄'
-      }, {
-        date: '2016-05-04',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1517 弄'
-      }, {
-        date: '2016-05-01',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1519 弄'
-      }, {
-        date: '2016-05-03',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1516 弄'
-      }],
+      tableData: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -719,8 +711,8 @@ export default {
     },
     //下载导入失败数据
     downloaderr() {
-      // this.download('system/user/importTemplate', {
-      // }, `user_template_${new Date().getTime()}.xlsx`)
+      this.download('system/user/exportFailUsers', {
+      }, `user_exportFailUsers_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -732,9 +724,11 @@ export default {
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
       if(response.code == 200){
-        this.$message.success('导入成功！')
+        this.$message.success('上传成功！')
       }else{
-        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+        this.tableData = response.data
+        // this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+        this.showupload = true
       }
       this.getList();
     },