diff --git a/src/api/user.js b/src/api/user.js
index fa6a61a..988455c 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -163,3 +163,9 @@ export const resetPwd = (data) => request({
   method: 'post',
   data
 });
+
+// 记录登录日志接口
+export const loginLog = () => request({
+  url: '/api/blade-auth/oauth/token2',
+  method: 'get'
+});
diff --git a/src/assets/json/status.json b/src/assets/json/status.json
index 116a63c..cb0616a 100644
--- a/src/assets/json/status.json
+++ b/src/assets/json/status.json
@@ -153,6 +153,12 @@
             "color": "#67c23a",
             "type": "success"
           },
+          {
+            "name": "待接单",
+            "status": 205,
+            "color": "#67c23a",
+            "type": "success"
+          },
           {
             "name": "待维修",
             "status": 201,
@@ -463,6 +469,12 @@
             "color": "#e6a23",
             "type": "warning"
           },
+          {
+            "name": "维修中",
+            "status": 401,
+            "color": "#e6a23",
+            "type": "warning"
+          },
           {
             "name": "维修完成",
             "status": 405,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2fdebc1..586c64b 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -13,7 +13,8 @@ import {
   logout,
   refreshToken,
   getButtons,
-  registerUser
+  registerUser,
+  loginLog
 } from '@/api/user'
 import {getTopMenu, getRoutes} from '@/api/system/menu'
 import {encrypt} from '@/util/sm2'
@@ -68,6 +69,11 @@ const user = {
               type: 'error'
             })
           } else {
+            // 登录
+            console.log('登陆成功')
+            loginLog().then(res=>{
+              console.log('记录成功')
+            })
             commit('SET_TOKEN', data.access_token);
             commit('SET_REFRESH_TOKEN', data.refresh_token);
             commit('SET_TENANT_ID', data.tenant_id);
diff --git a/src/views/businessManagement/inspection/repair.vue b/src/views/businessManagement/inspection/repair.vue
index be5e4be..124c1af 100644
--- a/src/views/businessManagement/inspection/repair.vue
+++ b/src/views/businessManagement/inspection/repair.vue
@@ -11,7 +11,7 @@
 
       </template>
       <template slot-scope="scope" slot="menuLeft">
-        <el-button size="small" type="primary" @click="handleAdd">确认</el-button>
+        <!-- <el-button size="small" type="primary" @click="handleAdd">确认</el-button> -->
         <!-- <el-button size="small" @click="clickInvoice">开具发票</el-button> -->
       </template>
       <template slot-scope="{ row }" slot="menu">
@@ -524,7 +524,6 @@ export default {
       this.isClear = true
     },
     confirmName() {
-      console.log('name===========>', this.nameImg)
       if (this.isClear) {
         this.nameImg = ''
       } else {
@@ -537,10 +536,8 @@ export default {
       this.assignVisible = true
     },
     setMaterial(row) {
-      console.log('物料配置按钮  row===============>', row)
       this.materialId = row.id
       this.getProductLists()
-      // console.log('materialData=============>',this.materialData)
       this.materialData = row.detailGoodsList
       this.materialVisible = true
     },
@@ -550,7 +547,6 @@ export default {
       this.materialData = arr
     },
     handleCloneSub() {
-      console.log('选中物料列表 materialData=============>', this.materialData, this.materialId, this.errorForm.tableData)
       let data = []
 
       this.materialData.forEach(item => {
@@ -607,8 +603,7 @@ export default {
       }
     },
     changeNumber(val, row) {
-      console.log('val------------->', val)
-      console.log('row------------->', row)
+
       // row.price = row.price * val
       // row.price = row.unifiedQuotation * val
       if (row.unifiedQuotation) {
@@ -619,7 +614,6 @@ export default {
 
     },
     loadmoreProduct() {
-      console.log('this.goodsCurrent0', this.productCurrent, this.productSize, this.productTotals)
       if (this.productCurrent * this.productSize >= this.productTotals) return
       this.productCurrent++
       this.getProductLists('more')
@@ -636,7 +630,6 @@ export default {
       })
     },
     getSpanArr(data) {
-      console.log('data==========>', data)
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
           this.spanArr.push(1);
@@ -652,7 +645,6 @@ export default {
           }
         }
       }
-      console.log('spanArr==========>', this.spanArr)
     },
 
     errorSpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -730,7 +722,7 @@ export default {
               }
             })
           }
-
+          this.errorForm.tableData=[]
           this.errorForm.tableData = data
           this.errorForm.tableData.map(item => {
             item.price = item.price == -1 ? '' : item.price
@@ -770,7 +762,6 @@ export default {
     // 客户选择是否维修完成
     changeResult(val) {
       this.isFinish = val
-      console.log(this.isFinish)
     },
     clickQualityYes() {
       if (this.viewType == 'evaluate') {
@@ -817,7 +808,6 @@ export default {
           this.errorForm = res.data.data
           this.dialogerror = true
           let data = this.checkDeepData(res.data.data.details)
-          console.log('获取详情数据', data)
           this.errorForm.tableData = data
           this.errorForm.tableData.map(item => {
             item.price = item.price == -1 ? '' : item.price
@@ -870,7 +860,6 @@ export default {
     },
     // 评价并签字提交
     handleConfirm() {
-      console.log('this.detailForm.approveResult1', this.errorForm.approveResult1)
       if (this.errorForm.approveResult1 == 0) {//否
         let query = {
           id: this.errorForm.id,
@@ -891,7 +880,6 @@ export default {
           const formData = new FormData();
           formData.append('file', this.base64toFile(this.nameImg));
           addFile(formData).then(res => {
-            console.log('res----------->', res)
             let query = {
               id: this.errorForm.id,
               isOkValidity: this.errorForm.isOkValidity,
@@ -902,7 +890,6 @@ export default {
               signatureTime: this.errorForm.signatureTime,
             }
             customerConfirmFinish(query).then(res => {
-              console.log('res ========>', res)
               if (res.data.code == 200) {
                 this.$message.success('评价成功')
                 this.dialogerror = false
@@ -948,7 +935,6 @@ export default {
       let file = new File([u8arr], `${filename}.${suffix}`, {
         type: mime
       })
-      console.log(file)
       return file
     },
     // 确认付款是否完成
@@ -1038,7 +1024,6 @@ export default {
               },
               detailList: query
             }
-            console.log('params==========>', params)
             solutionSave(params).then(res => {
               if (res.data.code == 200) {
                 solutionSubmit({ id: this.errorForm.id }).then(res => {
@@ -1129,7 +1114,6 @@ export default {
           } else if (this.viewType == 'evaluate') {
             this.handleConfirm()
           }
-          // console.log('errorForm--------------->',this.errorForm)
           // this.$confirm('请确认提交保存当前数据?', '提示', {
           //   confirmButtonText: '确定',
           //   cancelButtonText: '取消',
@@ -1143,8 +1127,7 @@ export default {
       })
     },
     onLoad(page, params = {}) {
-      console.log('query',this.errorForm.deptName,params)
-      getRepairPage({ current: this.page.currentPage, size: this.page.pageSize,deptName:params.deptName }).then(res => {
+      getRepairPage({ current: this.page.currentPage, size: this.page.pageSize,deptName:params.deptName,taskStatus:4 }).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
       })
diff --git a/src/views/businessManagement/inspection/task.vue b/src/views/businessManagement/inspection/task.vue
index 60cc10a..dc0b3a1 100644
--- a/src/views/businessManagement/inspection/task.vue
+++ b/src/views/businessManagement/inspection/task.vue
@@ -1169,7 +1169,7 @@ export default {
         let query = {
           id: this.addForm.id,
           servicemanId: this.addForm.servicemanId,
-          servicemanName: servicemanArr[0].name
+
         }
         console.log('query=========>', query, this.addForm)
         taskSupervisorConfirm(query).then(res => {
@@ -1328,104 +1328,11 @@ export default {
       }
     },
     onLoad(page, params = {}) {
-      // this.data = [
-      //   {
-      //     taskNo:'WX-20240820-01',
-      //     deptName:'济南安池实验室',
-      //     inspectionName:'实验室设备巡检',
-      //     projectAddr:'济南市钢城区',
-      //     inspectionFloor:'三层、四层',
-      //     inspectionDate:'2024-05-21',
-      //     appointTime:'2024-07-21',
-      //     inspectionContent:'巡检主要内容1111',
-      //     status:0,
-      //     inspectionData:[
-      //       {
-      //         floorId:'001',					//楼层id
-      //         roomArr:[
-      //           {
-      //             roomId:'001',		//房间id
-      //             data:[
-      //               {
-      //                 majorName:'001',		//专业名称
-      //                 content:'巡检内容11111',			//巡检内容
-      //                 requirements:'001',	//工艺要求
-      //                 cycle:'001',			//巡检周期
-      //                 startTime:'2024-07-11'		//开始时间
-      //               },
-      //             ]
-      //           },
-      //           {
-      //             roomId:'002',		//房间id
-      //             data:[
-      //               {
-      //                 majorName:'002',		//专业名称
-      //                 content:'巡检内容2222222',			//巡检内容
-      //                 requirements:'002',	//工艺要求
-      //                 cycle:'002',			//巡检周期
-      //                 startTime:'2024-07-12'		//开始时间
-      //               }
-      //             ]
-      //           }
-      //         ]
-      //       },
-      //       {
-      //         floorId:'002',					//楼层id
-      //         roomArr:[
-      //           {
-      //             roomId:'001',		//房间id
-      //             data:[
-      //               {
-      //                 majorName:'001',		//专业名称
-      //                 content:'巡检内容33333',			//巡检内容
-      //                 requirements:'001',	//工艺要求
-      //                 cycle:'001',			//巡检周期
-      //                 startTime:'2024-07-11'		//开始时间
-      //               },
-      //             ]
-      //           },
-      //           {
-      //             roomId:'002',		//房间id
-      //             data:[
-      //               {
-      //                 majorName:'002',		//专业名称
-      //                 content:'巡检内容44444',			//巡检内容
-      //                 requirements:'002',	//工艺要求
-      //                 cycle:'002',			//巡检周期
-      //                 startTime:'2024-07-12'		//开始时间
-      //               }
-      //             ]
-      //           }
-      //         ]
-      //       }
-      //     ]
-      //   },
-      //   {
-      //     taskNo:'WX-20240820-01',
-      //     deptName:'济南安池实验室',
-      //     inspectionName:'实验室设备巡检',
-      //     projectAddr:'济南市钢城区',
-      //     inspectionFloor:'三层、四层',
-      //     inspectionDate:'2024-09-21',
-      //     appointTime:'2024-12-21',
-      //     status:2,
-      //     inspectionContent:'巡检主要内容2222',
-      //     floorId:'001,002',
-      //     tableData:[
-      //       {floorId:'001',floorName:'三楼',roomName:'种子常规检测1',majorName:'水系统',inspectionContent:'巡检内容1111',requirements:'工艺要求1',status:0,imgs:[],userName:'',remark:''},
-      //       {floorId:'001',floorName:'三楼',roomName:'种子常规检测1',majorName:'电气系统',inspectionContent:'巡检内容1111',requirements:'工艺要求1',status:0,imgs:[],userName:'',remark:''},
-      //       {floorId:'001',floorName:'三楼',roomName:'种子常规检测1',majorName:'电气系统',inspectionContent:'巡检内容1111',requirements:'工艺要求1',status:0,imgs:[],userName:'',remark:''},
-      //       {floorId:'002',floorName:'四楼',roomName:'种子常规检测1',majorName:'电气系统',inspectionContent:'巡检内容1111',requirements:'工艺要求1',status:0,imgs:[],userName:'',remark:''},
-      //       {floorId:'002',floorName:'四楼',roomName:'种子常规检测1',majorName:'水系统',inspectionContent:'巡检内容1111',requirements:'工艺要求1',status:0,imgs:[],userName:'',remark:''},
-      //     ]
-      //   },
-      // ];
-      // this.page.total = this.data.length
-      // this.loading = false;
-
+      console.log('deptName',params)
       let query = {
         current: this.page.currentPage,
-        size: this.page.pageSize
+        size: this.page.pageSize,
+        deptName:params.deptName
       }
       getTaskPage(query).then(res => {
         console.log('res=======>', res)
diff --git a/src/views/businessManagement/ordinary.vue b/src/views/businessManagement/ordinary.vue
index e94618d..5affb96 100644
--- a/src/views/businessManagement/ordinary.vue
+++ b/src/views/businessManagement/ordinary.vue
@@ -623,7 +623,7 @@ import {
 import { getGoodsList } from '@/api/goodsManagement/goods'
 import logDialog from '../../components/order/logDialog.vue'
 import workOrderDialog from '../../components/order/workOrderDialog.vue'
-import { exportBlob, exportBlob1 } from "@/api/common";
+import { exportBlob, exportBlob1,zipDownload } from "@/api/common";
 import { downloadXls } from "@/util/util";
 export default {
   components: {
@@ -829,7 +829,8 @@ export default {
       infoDialog: false,//流程查看弹框
       workOrderShow: false,//工单处理弹框
       workOrderId: '',//id
-      dataTypes:''
+      dataTypes:'',
+
 
     }
   },
@@ -1814,7 +1815,6 @@ export default {
       this.selectList = selection
     },
     onLoad(page, params = {}) {
-      console.log(6666,this.dataTypes)
       let query = {
         current: this.page.currentPage,				          //页数
         size: this.page.pageSize,				            //条数
@@ -1822,7 +1822,7 @@ export default {
         endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '',		             //结束时间
         faultType: this.searchForm.faultType ? this.searchForm.faultType : '',				      //故障类型
         reportUnitName: this.searchForm.reportUnitName ? this.searchForm.reportUnitName : '',
-        dataType: this.dataTypes
+        dataType:this.role_id=='1123598816738675201'?'': this.dataTypes
       }
       getList(query).then(res => {
         let data_ = res.data.data.records
diff --git a/src/views/customerFeedback/feedback.vue b/src/views/customerFeedback/feedback.vue
index d6f5adb..83a05f7 100644
--- a/src/views/customerFeedback/feedback.vue
+++ b/src/views/customerFeedback/feedback.vue
@@ -53,10 +53,10 @@
                             <el-option label="已完成" :value="1"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="反馈内容" prop="content"  style="width: 95%;">
+                    <el-form-item label="反馈内容" prop="content"  style="width: 95%;" v-if="(receiveForm.status==0&&viewType !== 'view')||(viewType == 'view'&&receiveForm.status==1)">
                         <el-input  type="textarea" :disabled="viewType == 'view'" v-model="receiveForm.content"  placeholder="请输入反馈内容"></el-input>
                     </el-form-item>
-                    <el-form-item label="反馈附件" prop="file" style="width: 95%;">
+                    <el-form-item label="反馈附件" prop="file" style="width: 95%;" v-if="(receiveForm.status==0&&viewType !== 'view')||(viewType == 'view'&&receiveForm.status==1)">
                         <el-upload
                             action="/api/blade-resource/oss/endpoint/put-file"
                             :limit="3"
@@ -177,7 +177,7 @@ export default {
                         type: 'datetime',
                         format:'yyyy-MM-dd HH:mm:ss',
                         valueFormat:'yyyy-MM-dd HH:mm:ss',
-                        prop: "createTime",  
+                        prop: "createTime",
                         overHidden: true,
                     },
                     {
@@ -194,7 +194,7 @@ export default {
                         type: 'datetime',
                         format:'yyyy-MM-dd HH:mm:ss',
                         valueFormat:'yyyy-MM-dd HH:mm:ss',
-                        prop: "finishTime",  
+                        prop: "finishTime",
                         overHidden: true,
                     },
                 ],
@@ -256,14 +256,12 @@ export default {
             this.selectedList = list
         },
         handleSuccess(res){
-            console.log('res==============>',res)
             this.filesList.push({
                 attachUrl:res.data.link,
                 attachName:res.data.originalName
             })
         },
         handleRemove(file, fileList){
-            console.log('file================>',file)
             if(file.response){
                 this.filesList = this.filesList.filter(item => item.attachUrl != file.response.data.link)
             }
@@ -281,9 +279,9 @@ export default {
                         this.receiveForm = res.data.data
                         this.dialogReceive = true
                     })
-                    
+
                 }
-                
+
             }
         },
         closeDialog(){
@@ -328,7 +326,6 @@ export default {
         },
         // 点击确认按钮
         handleSave() {
-            console.log('table---------->', this.tableData)
             this.dialogVisible = false
         },
         // 点击申领单确认按钮
@@ -349,7 +346,7 @@ export default {
                     })
                 }
             })
-            
+
         },
         // 点击保存
         rejectRceive() {
@@ -388,7 +385,6 @@ export default {
                 size:this.page.pageSize,
             }
             getFeedList(query).then(res =>{
-                console.log('res -------------->',res)
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
             })
@@ -424,4 +420,4 @@ export default {
 .hide-upload-btn .el-upload--picture-card {
   display: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
index 92c3aca..27b638f 100644
--- a/src/views/device/deviceSystem.vue
+++ b/src/views/device/deviceSystem.vue
@@ -116,6 +116,10 @@
               <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入品牌"
                 v-model="addForm.brand"></el-input>
             </el-form-item>
+            <el-form-item label="单位" prop="supplier">
+              <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入单位"
+                v-model="addForm.unit"></el-input>
+            </el-form-item>
             <el-form-item label="生产时间" prop="produceTime">
               <el-date-picker :disabled="viewType == 'view'" style="width:98%;" v-model="addForm.produceTime"
                 format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择生产时间">
@@ -406,6 +410,13 @@ export default {
             overHidden: true,
             search: true,
           },
+          {
+            label: "单位",
+            labelWidth: 120,
+            prop: "unit",
+            overHidden: true,
+            search: true,
+          },
           {
             label: "生产时间",
             labelWidth: 120,
@@ -459,6 +470,7 @@ export default {
       dialogVisible: false,
       addForm: {
         type: '',
+        unit:'',
         position: { node: undefined, data: {} }
       },
       addRules: {
@@ -559,7 +571,6 @@ export default {
     })
     // 维修类型
     getChildList(1, 100, '1869925082102702082').then(res => {
-      console.log(111111,res.data.data)
       this.repairTypeList = res.data.data
       this.repairTypeList.forEach(item=>{
         item.dictKey=Number(item.dictKey)
@@ -581,7 +592,6 @@ export default {
       }
       getWorkOrderList(query).then(res => {
         this.workOrderList = res.data.data
-        console.log('维修工单列表', this.workOrderList)
       })
     },
     // 获取 巡检列表
@@ -591,7 +601,6 @@ export default {
       }
       getMaintenanceList(query).then(res => {
         this.maintenanceList = res.data.data
-        console.log('巡检任务列表', this.maintenanceList)
       })
     },
     // 巡检内容修改
@@ -873,7 +882,6 @@ export default {
           if (this.fileList.length == 0) {
             this.$message.error('请至少上传一个附件')
           } else {
-            console.log('111111111111111', this.addForm)
             let query = {
               name: this.addForm.name,
               model: this.addForm.model,
@@ -883,10 +891,10 @@ export default {
               produceTime: this.addForm.produceTime,
               attachName: this.addForm.attachName,
               runStatus: 1,
-              attaches: this.fileList
+              attaches: this.fileList,
+              unit:this.addForm.unit,
             }
             addDevice(query).then(res => {
-              console.log('res==============>', res)
             })
             // this.dialogVisible = false
           }
@@ -911,16 +919,16 @@ export default {
             supplier: this.addForm.supplier ? this.addForm.supplier : null,
             produceTime: this.addForm.produceTime ? this.addForm.produceTime.length <= 10 ? this.addForm.produceTime + ' 00:00:00' : this.addForm.produceTime : null,
             attachName: this.addForm.attachName ? this.addForm.attachName : null,
-            runStatus: 1,
+            runStatus: this.addForm.runStatus,
             attaches: arr,
             maintenances: this.tableData,
             limsId: this.addForm.lab[0],				//实验室id
             floorId: this.addForm.lab[1],			//楼层id
             roomId: this.addForm.lab[2],				//房间id
             brand: this.addForm.brand,//品牌
-            isWarran: this.addForm.isWarran ? 0 : 1
+            isWarran: this.addForm.isWarran ? 0 : 1,
+            unit:this.addForm.unit,
           }
-          console.log('query----------------->', query)
           if (this.viewType == 'add') {
             addDevice(query).then(res => {
               if (res.data.code == 200) {
@@ -955,7 +963,6 @@ export default {
       })
     },
     onLoad(page, params = {}) {
-      console.log(1111111111, this.searchForm)
       let query = {
         name: this.searchForm.name ? this.searchForm.name : '',
         position: this.searchForm.position ? this.searchForm.position : '',
diff --git a/src/views/feedback/list.vue b/src/views/feedback/list.vue
index 76084ef..88a650c 100644
--- a/src/views/feedback/list.vue
+++ b/src/views/feedback/list.vue
@@ -106,7 +106,7 @@ export default {
                 searchMenuSpan: 6,
                 border: true,
                 index: true,
-                selection: true,
+                selection: false,
                 addBtn: false,
                 viewBtn: false,
                 editBtn: false,
@@ -278,7 +278,6 @@ export default {
         },
         // 点击确认按钮
         handleSave() {
-            console.log('table---------->', this.tableData)
             this.dialogVisible = false
         },
         // 点击确定按钮
@@ -339,7 +338,6 @@ export default {
                 size: this.page.pageSize,
             }
             getFeedList(query).then(res => {
-                console.log('res -------------->', res)
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
             })
@@ -370,4 +368,4 @@ export default {
         justify-content: center;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/goodsManagement/reciviceList.vue b/src/views/goodsManagement/reciviceList.vue
index b0fc999..77fa56d 100644
--- a/src/views/goodsManagement/reciviceList.vue
+++ b/src/views/goodsManagement/reciviceList.vue
@@ -365,7 +365,7 @@ export default {
                         brand: item.brand,					//品牌
                         model: item.model,	                //型号
                         parameter: '',                       //参数
-                        count: 0,                            //申领数量					
+                        count: 0,                            //申领数量
                         goodsNumber: item.goodsNumber,		//库存数量
                         returnTime: ''                       //返还时间
                     })
@@ -399,7 +399,7 @@ export default {
                 this.receiveForm.tableData = res.data.data.details
                 this.dialogReceive = true
             })
-            
+
         },
         //归还按钮
         handleReturn(row){
@@ -511,7 +511,7 @@ export default {
                             })
                         }
                     }
-                    
+
                 }
             })
 
@@ -529,11 +529,11 @@ export default {
             // ]
             console.log('searchForm-------->',this.searchFrom)
             let query= {
-                current:this.page.currentPage,				          
+                current:this.page.currentPage,
                 size:this.page.pageSize,
                 startTime:this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[0] : null,
                 endTime:this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[1] : null,
-                idReturn:this.searchFrom.isReturn ? this.searchFrom.isReturn : null
+                isReturn:this.searchFrom.isReturn ? this.searchFrom.isReturn : null
             }
             getReciviceList(query).then(res =>{
                 this.data = res.data.data.records
@@ -566,4 +566,4 @@ export default {
         justify-content: center;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operation/hand.vue b/src/views/operation/hand.vue
index 75392fd..bac1746 100644
--- a/src/views/operation/hand.vue
+++ b/src/views/operation/hand.vue
@@ -152,7 +152,7 @@
               <el-input type="textarea" v-model="detailForm.closeReason" disabled style="width:98%;"></el-input>
             </el-form-item>
           </div>
-          <div v-show="rowStatus != 101 && rowStatus != 100 && rowStatus != 202 && detailForm.closeReason == ''">
+          <div v-show="(rowStatus != 101 && rowStatus != 100 && rowStatus != 202 &&rowStatus != 205)&& detailForm.closeReason == ''">
             <div style="
                 color: #101010;
                 font-size: 20px;
@@ -171,8 +171,8 @@
             </el-form-item>
           </div>
           <div
-            v-show="rowStatus != 100 && rowStatus != 202 && rowStatus != 101 && rowStatus != 401 && rowStatus != 402 && detailForm.closeReason == ''">
-            <div style="
+            v-show="rowStatus != 205 &&rowStatus != 100 && rowStatus != 202 && rowStatus != 101 && rowStatus != 401 && rowStatus != 402 && detailForm.closeReason == ''">
+            <div style="z
                 color: #101010;
                 font-size: 20px;
                 font-weight: 550;
@@ -1214,7 +1214,7 @@ export default {
         endTime: this.searchForm.timeRange && this.searchForm.timeRange.length != 0 ? this.searchForm.timeRange[1].toString() + ' 23:59:59' : '',		             //结束时间
         faultLocation: this.searchForm.faultLocation ? this.searchForm.faultLocation : '',			    //设备位置
         faultType: this.searchForm.faultType ? this.searchForm.faultType : '',				      //故障类型
-        dataType: 1,
+        dataType: this.role_id=='1123598816738675201'?'':1,
         requirementCode: this.searchForm.requirementCode
       }
       console.log('query--------->', query)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index baab2d7..a6ba212 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -4,163 +4,84 @@
       <div class="box">
         <el-scrollbar>
           <basic-container>
-            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
           </basic-container>
         </el-scrollbar>
       </div>
     </el-col>
     <el-col :span="19">
       <basic-container>
-        <avue-crud :option="option"
-                   :search.sync="search"
-                   :table-loading="loading"
-                   :data="data"
-                   ref="crud"
-                   v-model="form"
-                   :permission="permissionList"
-                   @row-del="rowDel"
-                   @row-update="rowUpdate"
-                   @row-save="rowSave"
-                   :before-open="beforeOpen"
-                   :page.sync="page"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @selection-change="selectionChange"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad">
+        <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+          v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+          :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
+          @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+          @refresh-change="refreshChange" @on-load="onLoad">
           <template slot="menuLeft">
-            <el-button type="primary"
-                       size="small"
-                       v-if="permission.user_add && !auditMode"
-                       icon="el-icon-plus"
-                       @click="$refs.crud.rowAdd()">新 增
+            <el-button type="primary" size="small" v-if="permission.user_add && !auditMode" icon="el-icon-plus"
+              @click="$refs.crud.rowAdd()">新 增
             </el-button>
-            <el-button type="danger"
-                       size="small"
-                       plain
-                       icon="el-icon-delete"
-                       v-if="permission.user_delete && !auditMode"
-                       @click="handleDelete">删 除
+            <el-button type="danger" size="small" plain icon="el-icon-delete"
+              v-if="permission.user_delete && !auditMode" @click="handleDelete">删 除
             </el-button>
-            <el-button type="primary"
-                       size="small"
-                       plain
-                       icon="el-icon-s-operation"
-                       v-if="userInfo.role_name.includes('admin') && !auditMode"
-                       @click="handleAudit">审 核
+            <el-button type="primary" size="small" plain icon="el-icon-s-operation"
+              v-if="userInfo.role_name.includes('admin') && !auditMode" @click="handleAudit">审 核
             </el-button>
-            <el-button type="success"
-                       size="small"
-                       plain
-                       icon="el-icon-check"
-                       v-if="userInfo.role_name.includes('admin') && auditMode"
-                       @click="handleAuditPass">通 过
+            <el-button type="success" size="small" plain icon="el-icon-check"
+              v-if="userInfo.role_name.includes('admin') && auditMode" @click="handleAuditPass">通 过
             </el-button>
-            <el-button type="danger"
-                       size="small"
-                       plain
-                       icon="el-icon-close"
-                       v-if="userInfo.role_name.includes('admin') && auditMode"
-                       @click="handleAuditRefuse">拒 绝
+            <el-button type="danger" size="small" plain icon="el-icon-close"
+              v-if="userInfo.role_name.includes('admin') && auditMode" @click="handleAuditRefuse">拒 绝
             </el-button>
-            <el-button type="primary"
-                       size="small"
-                       plain
-                       icon="el-icon-refresh-left"
-                       v-if="userInfo.role_name.includes('admin') && auditMode"
-                       @click="handleAuditBack">返 回
+            <el-button type="primary" size="small" plain icon="el-icon-refresh-left"
+              v-if="userInfo.role_name.includes('admin') && auditMode" @click="handleAuditBack">返 回
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="permission.user_role && !auditMode"
-                       icon="el-icon-user"
-                       @click="handleGrant">角色配置
+            <el-button type="info" size="small" plain v-if="permission.user_role && !auditMode" icon="el-icon-user"
+              @click="handleGrant">角色配置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="permission.user_reset && !auditMode"
-                       icon="el-icon-refresh"
-                       @click="handleReset">密码重置
+            <el-button type="info" size="small" plain v-if="permission.user_reset && !auditMode" icon="el-icon-refresh"
+              @click="handleReset">密码重置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin') && !auditMode"
-                       icon="el-icon-setting"
-                       @click="handlePlatform">平台配置
+            <el-button type="info" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
+              icon="el-icon-setting" @click="handlePlatform">平台配置
             </el-button>
-            <el-button type="info"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin') && !auditMode"
-                       icon="el-icon-coordinate"
-                       @click="handleLock">账号解封
+            <el-button type="info" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
+              icon="el-icon-coordinate" @click="handleLock">账号解封
             </el-button>
-            <el-button type="success"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin') && !auditMode"
-                       icon="el-icon-upload2"
-                       @click="handleImport">导入
+            <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
+              icon="el-icon-upload2" @click="handleImport">导入
             </el-button>
-            <el-button type="warning"
-                       size="small"
-                       plain
-                       v-if="userInfo.role_name.includes('admin') && !auditMode"
-                       icon="el-icon-download"
-                       @click="handleExport">导出
+            <el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
+              icon="el-icon-download" @click="handleExport">导出
             </el-button>
           </template>
-          <template slot-scope="{row}"
-                    slot="tenantName">
-            <el-tag>{{row.tenantName}}</el-tag>
+          <template slot-scope="{row}" slot="tenantName">
+            <el-tag>{{ row.tenantName }}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="roleName">
-            <el-tag>{{row.roleName}}</el-tag>
+          <template slot-scope="{row}" slot="roleName">
+            <el-tag>{{ row.roleName }}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="deptName">
-            <el-tag>{{row.deptName}}</el-tag>
+          <template slot-scope="{row}" slot="deptName">
+            <el-tag>{{ row.deptName }}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="userTypeName">
-            <el-tag>{{row.userTypeName}}</el-tag>
+          <template slot-scope="{row}" slot="userTypeName">
+            <el-tag>{{ row.userTypeName }}</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="isMaintenanceClient" v-if="row.isMaintenanceClient != -1">
-            <el-tag>{{row.isMaintenanceClient == 0 ? '维修客户' : row.isMaintenanceClient == 1 ? '维保客户' : ''}}</el-tag>
+          <template slot-scope="{row}" slot="isMaintenanceClient" v-if="row.isMaintenanceClient != -1">
+            <el-tag>{{ row.isMaintenanceClient == 0 ? '维修客户' : row.isMaintenanceClient == 1 ? '维保客户' : '' }}</el-tag>
           </template>
         </avue-crud>
-        <el-dialog title="用户角色配置"
-                   append-to-body
-                   :visible.sync="roleBox"
-                   width="345px">
+        <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
 
-          <el-tree :data="roleGrantList"
-                   show-checkbox
-                   check-strictly
-                   default-expand-all
-                   node-key="id"
-                   ref="treeRole"
-                   :default-checked-keys="roleTreeObj"
-                   :props="props">
+          <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+            :default-checked-keys="roleTreeObj" :props="props">
           </el-tree>
 
           <span slot="footer" class="dialog-footer">
             <el-button @click="roleBox = false">取 消</el-button>
-            <el-button type="primary"
-                       @click="submitRole">确 定</el-button>
+            <el-button type="primary" @click="submitRole">确 定</el-button>
           </span>
         </el-dialog>
-        <el-dialog title="用户数据导入"
-                   append-to-body
-                   :visible.sync="excelBox"
-                   width="555px">
+        <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
           <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
             <template slot="excelTemplate">
               <el-button type="primary" @click="handleTemplate">
@@ -169,32 +90,18 @@
             </template>
           </avue-form>
         </el-dialog>
-        <el-dialog title="用户平台配置"
-                   append-to-body
-                   :visible.sync="platformBox">
-          <avue-crud :option="platformOption"
-                     :table-loading="platformLoading"
-                     :data="platformData"
-                     ref="platformCrud"
-                     v-model="platformForm"
-                     :before-open="platformBeforeOpen"
-                     :page.sync="platformPage"
-                     :permission="platformPermissionList"
-                     @row-update="platformRowUpdate"
-                     @search-change="platformSearchChange"
-                     @search-reset="platformSearchReset"
-                     @selection-change="platformSelectionChange"
-                     @current-change="platformCurrentChange"
-                     @size-change="platformSizeChange"
-                     @refresh-change="platformRefreshChange"
-                     @on-load="platformOnLoad">
-            <template slot-scope="{row}"
-                      slot="tenantName">
-              <el-tag>{{row.tenantName}}</el-tag>
+        <el-dialog title="用户平台配置" append-to-body :visible.sync="platformBox">
+          <avue-crud :option="platformOption" :table-loading="platformLoading" :data="platformData" ref="platformCrud"
+            v-model="platformForm" :before-open="platformBeforeOpen" :page.sync="platformPage"
+            :permission="platformPermissionList" @row-update="platformRowUpdate" @search-change="platformSearchChange"
+            @search-reset="platformSearchReset" @selection-change="platformSelectionChange"
+            @current-change="platformCurrentChange" @size-change="platformSizeChange"
+            @refresh-change="platformRefreshChange" @on-load="platformOnLoad">
+            <template slot-scope="{row}" slot="tenantName">
+              <el-tag>{{ row.tenantName }}</el-tag>
             </template>
-            <template slot-scope="{row}"
-                      slot="userTypeName">
-              <el-tag>{{row.userTypeName}}</el-tag>
+            <template slot-scope="{row}" slot="userTypeName">
+              <el-tag>{{ row.userTypeName }}</el-tag>
             </template>
           </avue-crud>
         </el-dialog>
@@ -204,936 +111,944 @@
 </template>
 
 <script>
-  import {
-    getList,
-    getUser,
-    getUserPlatform,
-    remove,
-    update,
-    updatePlatform,
-    add,
-    grant,
-    resetPassword, unlock,
-    auditPass, auditRefuse
-  } from "@/api/system/user";
-  import {exportBlob} from "@/api/common";
-  import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
-  import {getRoleTree} from "@/api/system/role";
-  import {getPostList} from "@/api/system/post";
-  import {mapGetters} from "vuex";
-  import website from '@/config/website';
-  import {getToken} from '@/util/auth';
-  import {downloadXls} from "@/util/util";
-  import {dateNow} from "@/util/date";
-  import NProgress from 'nprogress';
-  import 'nprogress/nprogress.css';
-  import func from "@/util/func";
+import {
+  getList,
+  getUser,
+  getUserPlatform,
+  remove,
+  update,
+  updatePlatform,
+  add,
+  grant,
+  resetPassword, unlock,
+  auditPass, auditRefuse
+} from "@/api/system/user";
+import { exportBlob } from "@/api/common";
+import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
+import { getRoleTree } from "@/api/system/role";
+import { getPostList } from "@/api/system/post";
+import { mapGetters } from "vuex";
+import website from '@/config/website';
+import { getToken } from '@/util/auth';
+import { downloadXls } from "@/util/util";
+import { dateNow } from "@/util/date";
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import func from "@/util/func";
 
-  export default {
-    data() {
-      const validatePass = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入密码'));
-        } else {
-          callback();
-        }
-      };
-      const validatePass2 = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请再次输入密码'));
-        } else if (value !== this.form.password) {
-          callback(new Error('两次输入密码不一致!'));
-        } else {
-          callback();
-        }
-      };
-      return {
-        form: {},
-        search:{},
-        roleBox: false,
-        excelBox: false,
-        platformBox: false,
-        initFlag: true,
-        auditMode: false,
-        selectionList: [],
-        query: {},
-        loading: true,
-        platformLoading: false,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        platformPage: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        init: {
-          roleTree: [],
-          deptTree: [],
+export default {
+  data() {
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'));
+      } else {
+        callback();
+      }
+    };
+    const validatePass2 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'));
+      } else if (value !== this.form.password) {
+        callback(new Error('两次输入密码不一致!'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      form: {},
+      search: {},
+      roleBox: false,
+      excelBox: false,
+      platformBox: false,
+      initFlag: true,
+      auditMode: false,
+      selectionList: [],
+      query: {},
+      loading: true,
+      platformLoading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      platformPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      init: {
+        roleTree: [],
+        deptTree: [],
+      },
+      props: {
+        label: "title",
+        value: "key"
+      },
+      roleGrantList: [],
+      roleTreeObj: [],
+      treeDeptId: '',
+      treeData: [],
+      treeOption: {
+        nodeKey: 'id',
+        lazy: true,
+        treeLoad: function (node, resolve) {
+          const parentId = (node.level === 0) ? 0 : node.data.id;
+          getDeptLazyTree(parentId).then(res => {
+            resolve(res.data.data.map(item => {
+              return {
+                ...item,
+                leaf: !item.hasChildren
+              }
+            }))
+          });
         },
+        addBtn: false,
+        menu: false,
+        size: 'small',
         props: {
-          label: "title",
-          value: "key"
-        },
-        roleGrantList: [],
-        roleTreeObj: [],
-        treeDeptId: '',
-        treeData: [],
-        treeOption: {
-          nodeKey: 'id',
-          lazy: true,
-          treeLoad: function (node, resolve) {
-            const parentId = (node.level === 0) ? 0 : node.data.id;
-            getDeptLazyTree(parentId).then(res => {
-              resolve(res.data.data.map(item => {
-                return {
-                  ...item,
-                  leaf: !item.hasChildren
-                }
-              }))
-            });
+          labelText: '标题',
+          label: 'title',
+          value: 'value',
+          children: 'children'
+        }
+      },
+      option: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        addBtn: false,
+        viewBtn: true,
+        dialogType: 'drawer',
+        dialogClickModal: false,
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false
           },
-          addBtn: false,
-          menu: false,
-          size: 'small',
-          props: {
-            labelText: '标题',
-            label: 'title',
-            value: 'value',
-            children: 'children'
-          }
-        },
-        option: {
-          height: 'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          addBtn: false,
-          viewBtn: true,
-          dialogType: 'drawer',
-          dialogClickModal: false,
-          column: [
-            {
-              label: "登录账号",
-              prop: "account",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属租户",
-              prop: "tenantName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户姓名",
-              prop: "realName",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属角色",
-              prop: "roleName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "所属部门",
-              prop: "deptName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户平台",
-              prop: "userTypeName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户类型",
-              prop: "isMaintenanceClient",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户平台",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              prop: "userType",
-              rules: [{
-                required: true,
-                message: "请选择用户平台",
-                trigger: "blur"
-              }]
+          {
+            label: "所属租户",
+            prop: "tenantName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false
+          },
+          {
+            label: "所属角色",
+            prop: "roleName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "所属部门",
+            prop: "deptName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            prop: "userTypeName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户类型",
+            prop: "isMaintenanceClient",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-          ],
-          group: [
-            {
-              label: '基础信息',
-              prop: 'baseInfo',
-              icon: 'el-icon-user-solid',
-              column: [
-                {
-                  label: "所属租户",
-                  prop: "tenantId",
-                  type: "tree",
-                  dicUrl: "/api/blade-system/tenant/select",
-                  props: {
-                    label: "tenantName",
-                    value: "tenantId"
-                  },
-                  hide: !website.tenantMode,
-                  addDisplay: website.tenantMode,
-                  editDisplay: website.tenantMode,
-                  viewDisplay: website.tenantMode,
-                  rules: [{
-                    required: true,
-                    message: "请输入所属租户",
-                    trigger: "click"
-                  }],
-                  span: 24,
+            dataType: "number",
+            search: true,
+            hide: true,
+            display: false,
+            prop: "userType",
+            rules: [{
+              required: true,
+              message: "请选择用户平台",
+              trigger: "blur"
+            }]
+          },
+        ],
+        group: [
+          {
+            label: '基础信息',
+            prop: 'baseInfo',
+            icon: 'el-icon-user-solid',
+            column: [
+              {
+                label: "所属租户",
+                prop: "tenantId",
+                type: "tree",
+                dicUrl: "/api/blade-system/tenant/select",
+                props: {
+                  label: "tenantName",
+                  value: "tenantId"
                 },
-                {
-                  label: "登录账号",
-                  prop: "account",
-                  rules: [{
-                    required: true,
-                    message: "请输入登录账号",
-                    trigger: "blur"
-                  }],
+                hide: !website.tenantMode,
+                addDisplay: website.tenantMode,
+                editDisplay: website.tenantMode,
+                viewDisplay: website.tenantMode,
+                rules: [{
+                  required: true,
+                  message: "请输入所属租户",
+                  trigger: "click"
+                }],
+                span: 24,
+              },
+              {
+                label: "登录账号",
+                prop: "account",
+                rules: [{
+                  required: true,
+                  message: "请输入登录账号",
+                  trigger: "blur"
+                }],
+              },
+              {
+                label: "用户平台",
+                type: "select",
+                dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+                props: {
+                  label: "dictValue",
+                  value: "dictKey"
                 },
-                {
-                  label: "用户平台",
-                  type: "select",
-                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-                  props: {
-                    label: "dictValue",
-                    value: "dictKey"
+                dataType: "number",
+                slot: true,
+                prop: "userType",
+                rules: [{
+                  required: true,
+                  message: "请选择用户平台",
+                  trigger: "blur"
+                }]
+              },
+              {
+                label: '密码',
+                prop: 'password',
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [{ required: true, validator: validatePass, trigger: 'blur' }]
+              },
+              {
+                label: '确认密码',
+                prop: 'password2',
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [{ required: true, validator: validatePass2, trigger: 'blur' }]
+              },
+            ]
+          },
+          {
+            label: '详细信息',
+            prop: 'detailInfo',
+            icon: 'el-icon-s-order',
+            column: [
+              {
+                label: "用户昵称",
+                prop: "name",
+                hide: true,
+                rules: [{
+                  required: true,
+                  message: "请输入用户昵称",
+                  trigger: "blur"
+                }]
+              },
+              {
+                label: "用户姓名",
+                prop: "realName",
+                rules: [{
+                  required: true,
+                  message: "请输入用户姓名",
+                  trigger: "blur"
+                }, {
+                  min: 2,
+                  max: 10,
+                  message: '姓名长度在2到5个字符'
+                }]
+              },
+              {
+                label: "手机号码",
+                prop: "phone",
+                overHidden: true
+              },
+              {
+                label: "电子邮箱",
+                prop: "email",
+                hide: true,
+                overHidden: true
+              },
+              {
+                label: "用户性别",
+                prop: "sex",
+                type: "select",
+                dicData: [
+                  {
+                    label: "男",
+                    value: 1
                   },
-                  dataType: "number",
-                  slot: true,
-                  prop: "userType",
-                  rules: [{
-                    required: true,
-                    message: "请选择用户平台",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: '密码',
-                  prop: 'password',
-                  hide: true,
-                  editDisplay: false,
-                  viewDisplay: false,
-                  rules: [{required: true, validator: validatePass, trigger: 'blur'}]
-                },
-                {
-                  label: '确认密码',
-                  prop: 'password2',
-                  hide: true,
-                  editDisplay: false,
-                  viewDisplay: false,
-                  rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
-                },
-              ]
-            },
-            {
-              label: '详细信息',
-              prop: 'detailInfo',
-              icon: 'el-icon-s-order',
-              column: [
-                {
-                  label: "用户昵称",
-                  prop: "name",
-                  hide: true,
-                  rules: [{
-                    required: true,
-                    message: "请输入用户昵称",
-                    trigger: "blur"
-                  }]
-                },
-                {
-                  label: "用户姓名",
-                  prop: "realName",
-                  rules: [{
-                    required: true,
-                    message: "请输入用户姓名",
-                    trigger: "blur"
-                  }, {
-                    min: 2,
-                    max: 10,
-                    message: '姓名长度在2到5个字符'
-                  }]
-                },
-                {
-                  label: "手机号码",
-                  prop: "phone",
-                  overHidden: true
-                },
-                {
-                  label: "电子邮箱",
-                  prop: "email",
-                  hide: true,
-                  overHidden: true
-                },
-                {
-                  label: "用户性别",
-                  prop: "sex",
-                  type: "select",
-                  dicData: [
-                    {
-                      label: "男",
-                      value: 1
-                    },
-                    {
-                      label: "女",
-                      value: 2
-                    },
-                    {
-                      label: "未知",
-                      value: 3
-                    }
-                  ],
-                  hide: true
-                },
-                {
-                  label: "用户生日",
-                  type: "date",
-                  prop: "birthday",
-                  format: "yyyy-MM-dd hh:mm:ss",
-                  valueFormat: "yyyy-MM-dd hh:mm:ss",
-                  hide: true
-                },
-                {
-                  label: "账号状态",
-                  prop: "statusName",
-                  hide: true,
-                  display: false
-                }
-              ]
-            },
-            {
-              label: '职责信息',
-              prop: 'dutyInfo',
-              icon: 'el-icon-s-custom',
-              column: [
-                {
-                  label: "用户编号",
-                  prop: "code",
-                },
-                {
-                  label: "所属角色",
-                  prop: "roleId",
-                  multiple: true,
-                  type: "tree",
-                  dicData: [],
-                  props: {
-                    label: "title"
+                  {
+                    label: "女",
+                    value: 2
                   },
-                  checkStrictly: true,
-                  slot: true,
-                  rules: [{
-                    required: true,
-                    message: "请选择所属角色",
-                    trigger: "click"
-                  }]
+                  {
+                    label: "未知",
+                    value: 3
+                  }
+                ],
+                hide: true
+              },
+              {
+                label: "用户生日",
+                type: "date",
+                prop: "birthday",
+                format: "yyyy-MM-dd hh:mm:ss",
+                valueFormat: "yyyy-MM-dd hh:mm:ss",
+                hide: true
+              },
+              {
+                label: "账号状态",
+                prop: "statusName",
+                hide: true,
+                display: false
+              }
+            ]
+          },
+          {
+            label: '职责信息',
+            prop: 'dutyInfo',
+            icon: 'el-icon-s-custom',
+            column: [
+              {
+                label: "用户编号",
+                prop: "code",
+              },
+              {
+                label: "所属角色",
+                prop: "roleId",
+                multiple: true,
+                type: "tree",
+                dicData: [],
+                props: {
+                  label: "title"
                 },
-                {
-                  label: "所属部门",
-                  prop: "deptId",
-                  type: "tree",
-                  multiple: true,
-                  dicData: [],
-                  props: {
-                    label: "title"
-                  },
-                  checkStrictly: true,
-                  slot: true,
-                  rules: [{
-                    required: true,
-                    message: "请选择所属部门",
-                    trigger: "click"
-                  }]
+                checkStrictly: true,
+                slot: true,
+                rules: [{
+                  required: true,
+                  message: "请选择所属角色",
+                  trigger: "click"
+                }]
+              },
+              {
+                label: "所属部门",
+                prop: "deptId",
+                type: "tree",
+                multiple: true,
+                dicData: [],
+                props: {
+                  label: "title"
                 },
-                {
-                  label: "所属岗位",
-                  prop: "postId",
-                  type: "tree",
-                  multiple: true,
-                  dicData: [],
-                  props: {
-                    label: "postName",
-                    value: "id"
-                  },
-                  rules: [{
-                    required: true,
-                    message: "请选择所属岗位",
-                    trigger: "click"
-                  }],
+                checkStrictly: true,
+                slot: true,
+                rules: [{
+                  required: true,
+                  message: "请选择所属部门",
+                  trigger: "click"
+                }]
+              },
+              {
+                label: "所属岗位",
+                prop: "postId",
+                type: "tree",
+                multiple: true,
+                dicData: [],
+                props: {
+                  label: "postName",
+                  value: "id"
                 },
-              ]
-            },
-          ]
-        },
-        data: [],
-        platformQuery: {},
-        platformSelectionList: [],
-        platformData: [],
-        platformForm: {},
-        platformOption: {
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogClickModal: false,
-          menuWidth: 120,
-          editBtnText: '配置',
-          column: [
-            {
-              label: "登录账号",
-              prop: "account",
-              search: true,
-              display: false
-            },
-            {
-              label: "所属租户",
-              prop: "tenantName",
-              slot: true,
-              display: false
-            },
-            {
-              label: "用户姓名",
-              prop: "realName",
-              search: true,
-              display: false
+                rules: [{
+                  required: true,
+                  message: "请选择所属岗位",
+                  trigger: "click"
+                }],
+              },
+            ]
+          },
+        ]
+      },
+      data: [],
+      platformQuery: {},
+      platformSelectionList: [],
+      platformData: [],
+      platformForm: {},
+      platformOption: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogClickModal: false,
+        menuWidth: 120,
+        editBtnText: '配置',
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false
+          },
+          {
+            label: "所属租户",
+            prop: "tenantName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            prop: "userTypeName",
+            slot: true,
+            display: false
+          },
+          {
+            label: "用户平台",
+            type: "select",
+            dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-            {
-              label: "用户平台",
-              prop: "userTypeName",
-              slot: true,
-              display: false
+            dataType: "number",
+            search: true,
+            hide: true,
+            display: false,
+            prop: "userType",
+            rules: [{
+              required: true,
+              message: "请选择用户平台",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "用户拓展",
+            prop: "userExt",
+            type: "textarea",
+            minRows: 8,
+            span: 24,
+            overHidden: true,
+            row: true,
+            hide: true,
+          },
+        ],
+      },
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '模板上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '模板上传中，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data'
             },
-            {
-              label: "用户平台",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: "/api/blade-system/user/import-user"
+          },
+          {
+            label: "数据覆盖",
+            prop: "isCovered",
+            type: "switch",
+            align: "center",
+            width: 80,
+            dicData: [
+              {
+                label: "否",
+                value: 0
               },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              prop: "userType",
-              rules: [{
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            value: 0,
+            slot: true,
+            rules: [
+              {
                 required: true,
-                message: "请选择用户平台",
+                message: "请选择是否覆盖",
                 trigger: "blur"
-              }]
-            },
-            {
-              label: "用户拓展",
-              prop: "userExt",
-              type: "textarea",
-              minRows: 8,
-              span: 24,
-              overHidden: true,
-              row: true,
-              hide: true,
-            },
-          ],
-        },
-        excelForm: {},
-        excelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [
-            {
-              label: '模板上传',
-              prop: 'excelFile',
-              type: 'upload',
-              drag: true,
-              loadText: '模板上传中，请稍等',
-              span: 24,
-              propsHttp: {
-                res: 'data'
-              },
-              tip: '请上传 .xls,.xlsx 标准格式文件',
-              action: "/api/blade-system/user/import-user"
-            },
-            {
-              label: "数据覆盖",
-              prop: "isCovered",
-              type: "switch",
-              align: "center",
-              width: 80,
-              dicData: [
-                {
-                  label: "否",
-                  value: 0
-                },
-                {
-                  label: "是",
-                  value: 1
-                }
-              ],
-              value: 0,
-              slot: true,
-              rules: [
-                {
-                  required: true,
-                  message: "请选择是否覆盖",
-                  trigger: "blur"
-                }
-              ]
-            },
-            {
-              label: '模板下载',
-              prop: 'excelTemplate',
-              formslot: true,
-              span: 24,
-            }
-          ]
-        }
-      };
+              }
+            ]
+          },
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    'form.tenantId'() {
+      if (this.form.tenantId !== '' && this.initFlag) {
+        this.initData(this.form.tenantId);
+      }
     },
-    watch: {
-      'form.tenantId'() {
-        if (this.form.tenantId !== '' && this.initFlag) {
-          this.initData(this.form.tenantId);
-        }
-      },
-      'excelForm.isCovered'() {
-        if (this.excelForm.isCovered !== '') {
-          const column = this.findObject(this.excelOption.column, "excelFile");
-          column.action = `/api/blade-system/user/import-user?isCovered=${this.excelForm.isCovered}`;
-        }
+    'excelForm.isCovered'() {
+      if (this.excelForm.isCovered !== '') {
+        const column = this.findObject(this.excelOption.column, "excelFile");
+        column.action = `/api/blade-system/user/import-user?isCovered=${this.excelForm.isCovered}`;
       }
+    }
+  },
+  computed: {
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.user_add, false),
+        viewBtn: this.vaildData(this.permission.user_view, false),
+        delBtn: this.vaildData(this.permission.user_delete, false),
+        editBtn: this.vaildData(this.permission.user_edit, false)
+      };
     },
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.user_add, false),
-          viewBtn: this.vaildData(this.permission.user_view, false),
-          delBtn: this.vaildData(this.permission.user_delete, false),
-          editBtn: this.vaildData(this.permission.user_edit, false)
-        };
-      },
-      platformPermissionList() {
-        return {
-          addBtn: false,
-          viewBtn: false,
-          delBtn: false,
-          editBtn: this.vaildData(this.permission.user_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      },
+    platformPermissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: this.vaildData(this.permission.user_edit, false)
+      };
     },
-    mounted() {
-      // 非租户模式默认加载管理组数据
-      if (!website.tenantMode) {
-        this.initData(website.tenantId);
-      }
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    },
+  },
+  mounted() {
+    // 非租户模式默认加载管理组数据
+    if (!website.tenantMode) {
+      this.initData(website.tenantId);
+    }
+  },
+  methods: {
+    nodeClick(data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    initData(tenantId) {
+      getRoleTree(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "roleId");
+        column.dicData = res.data.data;
+      });
+      getDeptTree(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "deptId");
+        column.dicData = res.data.data;
+      });
+      getPostList(tenantId).then(res => {
+        const column = this.findObject(this.option.group, "postId");
+        column.dicData = res.data.data;
+      });
     },
-    methods: {
-      nodeClick(data) {
-        this.treeDeptId = data.id;
-        this.page.currentPage = 1;
+    submitRole() {
+      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+      grant(this.ids, roleList).then(() => {
+        this.roleBox = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
         this.onLoad(this.page);
-      },
-      initData(tenantId) {
-        getRoleTree(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "roleId");
-          column.dicData = res.data.data;
+      });
+    },
+    rowSave(row, done, loading) {
+      row.deptId = func.join(row.deptId);
+      row.roleId = func.join(row.roleId);
+      row.postId = func.join(row.postId);
+      add(row).then(() => {
+        this.initFlag = false;
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        getDeptTree(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "deptId");
-          column.dicData = res.data.data;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      row.deptId = func.join(row.deptId);
+      row.roleId = func.join(row.roleId);
+      row.postId = func.join(row.postId);
+      if (row.deptId.split(',').length > 1) {
+        this.$message({
+          type: "error",
+          message: "所属部门只能选择一个！"
         });
-        getPostList(tenantId).then(res => {
-          const column = this.findObject(this.option.group, "postId");
-          column.dicData = res.data.data;
+        loading();
+        return false
+      }
+      update(row).then(() => {
+        this.initFlag = false;
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      submitRole() {
-        const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
-        grant(this.ids, roleList).then(() => {
-          this.roleBox = false;
+        done();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.onLoad(this.page);
         });
-      },
-      rowSave(row, done, loading) {
-        row.deptId = func.join(row.deptId);
-        row.roleId = func.join(row.roleId);
-        row.postId = func.join(row.postId);
-        add(row).then(() => {
-          this.initFlag = false;
+    },
+    searchReset() {
+      this.query = {};
+      this.treeDeptId = '';
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        row.deptId = func.join(row.deptId);
-        row.roleId = func.join(row.roleId);
-        row.postId = func.join(row.postId);
-        update(row).then(() => {
-          this.initFlag = false;
+    },
+    handleAudit() {
+      this.auditMode = true;
+      this.onLoad(this.page, this.query);
+    },
+    handleAuditPass() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据通过审核?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return auditPass(this.ids);
+        })
+        .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
+          this.$refs.crud.toggleSelection();
         });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      searchReset() {
-        this.query = {};
-        this.treeDeptId = '';
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      handleAudit() {
-        this.auditMode = true;
-        this.onLoad(this.page, this.query);
-      },
-      handleAuditPass() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-        this.$confirm('确定将选择数据通过审核?', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            return auditPass(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: 'success',
-              message: '操作成功!',
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      handleAuditRefuse() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-        this.$confirm('确定将选择数据拒绝审核?', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            return auditRefuse(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: 'success',
-              message: '操作成功!',
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      handleAuditBack() {
-        this.auditMode = false;
-        this.onLoad(this.page, this.query);
-      },
-      handleReset() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择账号密码重置为123456?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+    },
+    handleAuditRefuse() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据拒绝审核?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return auditRefuse(this.ids);
         })
-          .then(() => {
-            return resetPassword(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-      },
-      handleGrant() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.roleTreeObj = [];
-        if (this.selectionList.length === 1) {
-          this.roleTreeObj = this.selectionList[0].roleId.split(",");
-        }
-        getRoleTree().then(res => {
-          this.roleGrantList = res.data.data;
-          this.roleBox = true;
+          this.$refs.crud.toggleSelection();
         });
-      },
-      handlePlatform() {
-        this.platformBox = true;
-      },
-      handleLock() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择账号解封？", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+    },
+    handleAuditBack() {
+      this.auditMode = false;
+      this.onLoad(this.page, this.query);
+    },
+    handleReset() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择账号密码重置为123456?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return resetPassword(this.ids);
         })
-          .then(() => {
-            return unlock(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
-      },
-      handleImport() {
-        this.excelBox = true;
-      },
-      uploadAfter(res, done, loading, column) {
-        window.console.log(column);
-        this.excelBox = false;
-        this.refreshChange();
-        done();
-      },
-      handleExport() {
-        const account = func.toStr(this.search.account);
-        const realName = func.toStr(this.search.realName);
-        this.$confirm("是否导出用户数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start();
-          exportBlob(`/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
-            downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
-            NProgress.done();
-          })
+          this.$refs.crud.toggleSelection();
         });
-      },
-      handleTemplate() {
-        exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
-          downloadXls(res.data, "用户数据模板.xlsx");
+    },
+    handleGrant() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.roleTreeObj = [];
+      if (this.selectionList.length === 1) {
+        this.roleTreeObj = this.selectionList[0].roleId.split(",");
+      }
+      getRoleTree().then(res => {
+        this.roleGrantList = res.data.data;
+        this.roleBox = true;
+      });
+    },
+    handlePlatform() {
+      this.platformBox = true;
+    },
+    handleLock() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择账号解封？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return unlock(this.ids);
         })
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getUser(this.form.id).then(res => {
-            this.form = res.data.data;
-            if (this.form.hasOwnProperty('deptId')) {
-              this.form.deptId = func.split(this.form.deptId);
-            }
-            if (this.form.hasOwnProperty('roleId')) {
-              this.form.roleId = func.split(this.form.roleId);
-            }
-            if (this.form.hasOwnProperty('postId')) {
-              this.form.postId = func.split(this.form.postId);
-            }
-          });
-        }
-        this.initFlag = true;
-        done();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(
-          page.currentPage,
-          page.pageSize,
-          Object.assign(params, this.query, { status: this.auditMode ? 0 : 1 }),
-          this.treeDeptId
-        ).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
-      platformRowUpdate(row, index, done, loading) {
-        updatePlatform(row.id, row.userType, row.userExt).then(() => {
-          this.platformOnLoad(this.platformPage);
+        .then(() => {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
         });
-      },
-      platformBeforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getUserPlatform(this.platformForm.id).then(res => {
-            this.platformForm = res.data.data;
-          });
-        }
-        done();
-      },
-      platformSearchReset() {
-        this.platformQuery = {};
+    },
+    handleImport() {
+      this.excelBox = true;
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleExport() {
+      const account = func.toStr(this.search.account);
+      const realName = func.toStr(this.search.realName);
+      this.$confirm("是否导出用户数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        NProgress.start();
+        exportBlob(`/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
+          downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
+          NProgress.done();
+        })
+      });
+    },
+    handleTemplate() {
+      exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+        downloadXls(res.data, "用户数据模板.xlsx");
+      })
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUser(this.form.id).then(res => {
+          this.form = res.data.data;
+          if (this.form.hasOwnProperty('deptId')) {
+            this.form.deptId = func.split(this.form.deptId);
+          }
+          if (this.form.hasOwnProperty('roleId')) {
+            this.form.roleId = func.split(this.form.roleId);
+          }
+          if (this.form.hasOwnProperty('postId')) {
+            this.form.postId = func.split(this.form.postId);
+          }
+        });
+      }
+      this.initFlag = true;
+      done();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query, { status: this.auditMode ? 0 : 1 }),
+        this.treeDeptId
+      ).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    platformRowUpdate(row, index, done, loading) {
+      updatePlatform(row.id, row.userType, row.userExt).then(() => {
         this.platformOnLoad(this.platformPage);
-      },
-      platformSearchChange(params, done) {
-        this.platformQuery = params;
-        this.platformPage.currentPage = 1;
-        this.platformOnLoad(this.platformPage, params);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
         done();
-      },
-      platformSelectionChange(list) {
-        this.platformSelectionList = list;
-      },
-      platformSelectionClear() {
-        this.platformSelectionList = [];
-        this.$refs.platformCrud.toggleSelection();
-      },
-      platformCurrentChange(currentPage) {
-        this.platformPage.currentPage = currentPage;
-      },
-      platformSizeChange(pageSize) {
-        this.platformPage.pageSize = pageSize;
-      },
-      platformRefreshChange() {
-        this.platformOnLoad(this.platformPage, this.platformQuery);
-      },
-      platformOnLoad(page, params = {}) {
-        this.platformLoading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
-          const data = res.data.data;
-          this.platformPage.total = data.total;
-          this.platformData = data.records;
-          this.platformLoading = false;
-          this.selectionClear();
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    platformBeforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUserPlatform(this.platformForm.id).then(res => {
+          this.platformForm = res.data.data;
         });
       }
+      done();
+    },
+    platformSearchReset() {
+      this.platformQuery = {};
+      this.platformOnLoad(this.platformPage);
+    },
+    platformSearchChange(params, done) {
+      this.platformQuery = params;
+      this.platformPage.currentPage = 1;
+      this.platformOnLoad(this.platformPage, params);
+      done();
+    },
+    platformSelectionChange(list) {
+      this.platformSelectionList = list;
+    },
+    platformSelectionClear() {
+      this.platformSelectionList = [];
+      this.$refs.platformCrud.toggleSelection();
+    },
+    platformCurrentChange(currentPage) {
+      this.platformPage.currentPage = currentPage;
+    },
+    platformSizeChange(pageSize) {
+      this.platformPage.pageSize = pageSize;
+    },
+    platformRefreshChange() {
+      this.platformOnLoad(this.platformPage, this.platformQuery);
+    },
+    platformOnLoad(page, params = {}) {
+      this.platformLoading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+        const data = res.data.data;
+        this.platformPage.total = data.total;
+        this.platformData = data.records;
+        this.platformLoading = false;
+        this.selectionClear();
+      });
     }
-  };
+  }
+};
 </script>
 
 <style>
-  .box {
-    height: 800px;
-  }
+.box {
+  height: 800px;
+}
 
-  .el-scrollbar {
-    height: 100%;
-  }
+.el-scrollbar {
+  height: 100%;
+}
 
-  .box .el-scrollbar__wrap {
-    overflow: scroll;
-  }
+.box .el-scrollbar__wrap {
+  overflow: scroll;
+}
 </style>
diff --git a/src/views/systemRecords/editRecords.vue b/src/views/systemRecords/editRecords.vue
index 2e3e7db..4d3c72b 100644
--- a/src/views/systemRecords/editRecords.vue
+++ b/src/views/systemRecords/editRecords.vue
@@ -12,6 +12,7 @@
                             range-separator="至"
                             start-placeholder="开始日期"
                             end-placeholder="结束日期"
+                             value-format="yyyy-MM-dd"
                             :clearable="false">
                         </el-date-picker>
                     </el-form-item>
@@ -25,8 +26,8 @@
                 </el-col> -->
                 <el-col :span="6" v-show="role_id == '1123598816738675201'">
                     <el-form-item label="人员：">
-                        <el-select  style="width: 220px;" size="small" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore">
-                            <el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.id"></el-option>
+                        <el-select  style="width: 220px;" size="small" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore" clearable >
+                            <el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.account"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -75,7 +76,7 @@ export default {
             recordList:[],
             role_id:'',
             userCurrent:1,
-            userSize:10,
+            userSize:10000,
             userTotal:0
         }
     },
@@ -114,6 +115,7 @@ export default {
         },
         onReset(){
             this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+             this.form.person = ''
             this.getList()
         },
         getList(){
@@ -121,7 +123,7 @@ export default {
                 logType:2,		// 日志类型（1登录日志 2 修改日志）
                 startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null,		// 开始时间（yyyy-MM-dd）
                 endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null,	// 结束时间（yyyy-MM-dd）
-                userId:this.role_id != '1123598816738675201' ? this.userInfo.user_id : this.form.person ? this.form.person : ''
+                userName:this.role_id != '1123598816738675201' ? this.userInfo.account : this.form.person ? this.form.person : ''
                 // userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : ''		// 人员id
             }
             console.log('quwey------------>',query)
diff --git a/src/views/systemRecords/loginRecords.vue b/src/views/systemRecords/loginRecords.vue
index 3afda23..d799e9d 100644
--- a/src/views/systemRecords/loginRecords.vue
+++ b/src/views/systemRecords/loginRecords.vue
@@ -12,6 +12,7 @@
                             range-separator="至"
                             start-placeholder="开始日期"
                             end-placeholder="结束日期"
+                            value-format="yyyy-MM-dd"
                             :clearable="false">
                         </el-date-picker>
                     </el-form-item>
@@ -25,8 +26,8 @@
                 </el-col> -->
                 <el-col :span="6" v-show="role_id == '1123598816738675201'">
                     <el-form-item label="人员：">
-                        <el-select  size="small"  style="width: 220px;" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore">
-                            <el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.id"></el-option>
+                        <el-select  size="small"  style="width: 220px;" placeholder="请选择人员" v-model="form.person" v-loadmore="loadmore" clearable >
+                            <el-option v-for="item in personList" :key="item.name" :label="item.name" :value="item.account"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -75,7 +76,7 @@ export default {
             recordList:[],
             role_id:'',
             userCurrent:1,
-            userSize:10,
+            userSize:1000,
             userTotal:0
         }
     },
@@ -85,7 +86,6 @@ export default {
     mounted(){
         this.role_id = this.userInfo.role_id
         this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
-        console.log('this.role_id',this.role_id)
         this.getList()
         if(this.role_id == '1123598816738675201'){
             this.getUserList()
@@ -115,6 +115,7 @@ export default {
         },
         onReset(){
             this.form.timeRange = [moment().subtract(7, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+            this.form.person = ''
             this.getList()
         },
         getList(){
@@ -123,11 +124,9 @@ export default {
                 startTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[0] : null,		// 开始时间（yyyy-MM-dd）
                 endTime:this.form.timeRange && this.form.timeRange.length > 0 ? this.form.timeRange[1] : null,	// 结束时间（yyyy-MM-dd）
                 // userId:this.form.person ? this.form.person : this.role_id == '1846419477876510721' ? this.userInfo.user_id : ''		// 人员id
-                userId:this.role_id != '1123598816738675201' ? this.userInfo.user_id : this.form.person ? this.form.person : ''
+                userName:this.role_id != '1123598816738675201' ? this.userInfo.account : this.form.person ? this.form.person : ''
             }
-            console.log('quwey------------>',query)
             getlogList(query).then(res=>{
-                console.log('res-------------->',res)
                 this.recordList = res.data.data
             })
         }
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index cd6f8dd..036d3e5 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -489,12 +489,10 @@ export default {
   methods: {
     // 报警图片预览
     alarmFn(){
-      console.log(44444444444)
       this.dialogImgVisible = true
     },
     getPeopleNum(){
       maintenancePersonnel({id:this.userInfo.user_id}).then(res =>{
-        console.log('res ==============>',res)
         this.peopleXdata = res.data.data.xData
         this.peopleNum = res.data.data.repairNum
         this.peoplePercent = res.data.data.percent
@@ -504,7 +502,6 @@ export default {
       })
     },
     clickReqiure(item){
-      console.log('item----------->',item)
       this.$router.push({
         path:'/operation/hand',
         query:item
@@ -630,7 +627,6 @@ export default {
         perType: this.role_id == '1839536982874193922' ? 0 : 1				//人员类型 0-客服 1-维修负责人
       }
       faultRatio(query).then(res => {
-        console.log('res ===================>', res)
         this.problemData = res.data.data.fault
         this.rateData = res.data.data.rate
 
@@ -784,12 +780,13 @@ export default {
           right: '5%',
           bottom: '10%'
         },
-        yAxis: {},
+        yAxis: {
+        },
         series: [
           {
             name: '数量',
             type: 'bar',
-            barWidth:this.numData == 1 ? 50 : null,
+            barWidth:this.numData == 1 ? 30 : 30,
             data: this.numData,
             itemStyle: {
               color: '#2478f2'
@@ -812,7 +809,6 @@ export default {
           trigger: 'axis',
           transitionDuration: 0,//防止页面抖动
           formatter: params => {
-            console.log('params',params)
             let rander = params.map(item =>  `<div>${item.marker}${item.seriesName}: ${item.seriesType !== "line" ? item.value : item.value != '' ? item.value + "%" : '-'}</div>` ).join('')
             return `
                 <div>${params[0].axisValue}</div>
diff --git a/vue.config.js b/vue.config.js
index b0bfacf..0a64f2e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,10 +27,13 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://localhost',
-        // target:'http://124.221.142.15:8088/lab',
-        target:'http://192.168.0.111:80',
+        // target:'http://192.168.0.111:80',
+        // target:'http://192.168.1.12:10001',
+        target:'http://192.168.0.108:10001',
+        // target:'http://192.168.0.116:80',
+        // target:'http://192.168.0.108:80',
         //远程演示服务地址,可用于直接启动项目
-        //target: 'https://saber.bladex.cn/api',
+        // target: 'http://124.221.142.15:8088/api',
         ws: true,
         pathRewrite: {
           '^/api': '/'