Merge branch 'xiaoqin' into mergeBranch

src/SManagement/archives_upload/components/upload.vue

@@ -76,6 +76,8 @@ export default {
   methods: {
     handleChange (file, filelist) {
       this.filelist = filelist
+      console.log(file,filelist);
+      
       var index = file.raw.name.lastIndexOf(".");
       var ext = file.name.substr(index + 1);
       this.params.content.filename = file.raw.name

src/SManagement/user/role-manage/RoleManage.vue

@@ -7,7 +7,7 @@
         新建角色
       </el-button>
     </div>
-    <role-item :roleData="roleData">
+    <role-item :roleData="roleData" v-if="tool.checkAuth($route.name,'read') && roleData.length != 0">
       <template v-slot:icon="scope">
         <img src="@/assets/edit.png" alt="" @click="roleEdit(scope.data)" v-if="tool.checkAuth($route.name,'update')">
       </template>
@@ -15,6 +15,7 @@
         <remove-role :roleData="scope.data" v-if="tool.checkAuth($route.name,'delete')"></remove-role>
       </template>
     </role-item>
+    <el-empty description="暂无数据" v-else></el-empty>
   </div>
 </template>
 
@@ -104,4 +105,10 @@ export default {
   font-weight: bold;
   color: #333333;
 }
+.el-empty {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
+}
 </style>

src/SManagement/user/team-manage/TeamManage.vue

@@ -7,7 +7,7 @@
         新建账号
         </el-button>
     </div>
-    <team-item :teamData="teamData" v-if="tool.checkAuth($route.name,'read')">
+    <team-item :teamData="teamData" v-if="tool.checkAuth($route.name,'read') && teamData.length != 0">
       <template v-slot:icon="scope">
         <img src="@/assets/edit.png" alt="" @click.stop="editTargetFun(scope.data)" slot="icon" v-if="tool.checkAuth($route.name,'update')">
       </template>
@@ -15,6 +15,7 @@
         <remove-team :teamData="scope.data" v-if="tool.checkAuth($route.name,'delete')"></remove-team>
       </template>
     </team-item>
+    <el-empty description="暂无数据" v-else></el-empty>
     <add-user ref="addUser" :editTarget="editTarget"></add-user>
   </div>
 </template>
@@ -99,5 +100,10 @@ export default {
     font-weight: bold;
     color: #333333;
   }
-  
+  .el-empty {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
+  }
 </style>