Forráskód Böngészése

1,修改扫楼app用户管理接口(增删改查)
2,模型质量报告-待补充的设备传参(Id)

shaun-sheep 4 éve
szülő
commit
3976aaa024

+ 6 - 6
config/dev.env.js

@@ -4,14 +4,14 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
-    BASE_URL: '"http://172.16.44.215"', //测试iframe地址
-    SSO_SERVER: '"http://172.16.44.235:8081"', //测试环境
+    // BASE_URL: '"http://172.16.44.215"', //测试iframe地址
+    // SSO_SERVER: '"http://172.16.44.235:8081"', //测试环境
     // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
     // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
-    MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
-    // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
-    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-    // MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
+    // MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
+    SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })
 
 

+ 181 - 173
config/index.js

@@ -10,181 +10,189 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
 
-    // proxyTable: {//正式环境
-    //   '/admin': {
-    //     target: 'http://mbi.sagacloud.cn:8080',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       "^/admin": "/"
-    //     }
-    //   },
-    //   '/api': {
-    //     target: 'http://mbi.sagacloud.cn:8080',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       "^/api": "/"
-    //     }
-    //   },
-    //   '/data-platform-3': {
-    //     // 目标 API 地址
-    //     target: 'http://api.sagacloud.cn/',
-    //     // 如果要代理 websockets
-    //     ws: true,
-    //     // 将主机标头的原点更改为目标URL
-    //     changeOrigin: false
-    //   },
-    //   '/business-space': {
-    //     // 目标 API 地址
-    //     target: 'http://api.sagacloud.cn',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       "^/business-space": "/dp-auxiliary/business-space/"
-    //     }
-    //   },
-    //   '/pointconfig': {
-    //     // 目标 API 地址
-    //     target: 'http://mbi.sagacloud.cn:8080/',
-    //     // 如果要代理 websockets
-    //     ws: true,
-    //     // 将主机标头的原点更改为目标URL
-    //     changeOrigin: false
-    //   },
-    //   '/venders-dp': {
-    //     // 目标 API 地址
-    //     target: 'http://api.sagacloud.cn',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       "^/venders-dp": "/dp-auxiliary/venders-dp/"
-    //     }
-    //   },
-    //   '/venders': {
-    //     // 目标 API 地址
-    //     target: 'http://api.sagacloud.cn',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       "^/venders": "/dp-auxiliary/venders/"
-    //     }
-    //   },
-    //   '/ScanBuilding': {
-    //     // 目标 API 地址
-    //     target: 'http://mbi.sagacloud.cn:8080/',
-    //     // 如果要代理 websockets
-    //     ws: true,
-    //     // 将主机标头的原点更改为目标URL
-    //     changeOrigin: false
-    //   },
-    //   '/image-service': {
-    //     // 目标 API 地址
-    //     target: 'http://api.sagacloud.cn',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       "^/image-service": "/dp-auxiliary/image-service/"
-    //     }
-    //   },
-    //   '/modelapi': {
-    //     target: 'http://mbi.sagacloud.cn:8080',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       "^/modelapi": "/revit-algorithm/"
-    //     }
-    //   },
-    //   '/schedulerapi': {
-    //     target: 'http://mbi.sagacloud.cn:8080',
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //         "^/schedulerapi": "/scheduler/"
-    //     }
-    //   },
-    // },
-
-    proxyTable: {
-        '/admin': {
-            target: 'http://172.16.44.235:8080',
-            changeOrigin: true,
-            pathRewrite: {
-                "^/admin": "/"
-            }
-        },
-        '/api': {
-            target: 'http://172.16.44.235:8080',
-            changeOrigin: true,
-            pathRewrite: {
-                "^/api": "/"
-            }
-        },
-        '/data-platform-3': {
-            // 目标 API 地址
-            target: 'http://172.16.42.210:8080/',
-            // 如果要代理 websockets
-            ws: true,
-            // 将主机标头的原点更改为目标URL
-            changeOrigin: false
-        },
-        '/business-space': {
-            // 目标 API 地址
-            target: 'http://172.16.42.210:8080/',
-            // 如果要代理 websockets
-            ws: true,
-            // 将主机标头的原点更改为目标URL
-            changeOrigin: false
-        },
-        '/pointconfig': {
-            // 目标 API 地址
-            target: 'http://172.16.44.235:8080/',
-            // 如果要代理 websockets
-            ws: true,
-            // 将主机标头的原点更改为目标URL
-            changeOrigin: false
-        },
-        '/venders-dp': {
-            // 目标 API 地址
-            target: 'http://172.16.42.210:8080/',
-            // 如果要代理 websockets
-            ws: true,
-            // 将主机标头的原点更改为目标URL
-            changeOrigin: false
-        },
-        '/venders': {
-            // 目标 API 地址
-            target: 'http://172.16.42.210:8080/',
-            // 如果要代理 websockets
-            ws: true,
-            // 将主机标头的原点更改为目标URL
-            changeOrigin: false
-        },
-        '/ScanBuilding': {
-            // 目标 API 地址
-            target: 'http://172.16.44.235:8080/',
-            // 如果要代理 websockets
-            ws: true,
-            // 将主机标头的原点更改为目标URL
-            changeOrigin: false
-        },
-        '/image-service': {
-            // 目标 API 地址
-            target: 'http://172.16.42.210:8080/',
-            // 如果要代理 websockets
-            ws: true,
-            // 将主机标头的原点更改为目标URL
-            changeOrigin: false
-        },
-        '/modelapi': {
-            target: 'http://172.16.42.210:8082',
-            // target: 'http://192.168.20.218:8082',//景灏
-            changeOrigin: true,
-            pathRewrite: {
-                "^/modelapi": "/"
-            }
-        },
-        '/schedulerapi': {
-          target: 'http://172.16.42.210:8081',
-          changeOrigin: true,
-          pathRewrite: {
-              "^/schedulerapi": "/"
-          }
-        },
+    proxyTable: {//正式环境
+      '/admin': {
+        target: 'http://mbi.sagacloud.cn:8080',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/admin": "/"
+        }
+      },
+      '/api': {
+        target: 'http://mbi.sagacloud.cn:8080',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/api": "/"
+        }
+      },
+      '/data-platform-3': {
+        // 目标 API 地址
+        target: 'http://api.sagacloud.cn/',
+        // 如果要代理 websockets
+        ws: true,
+        // 将主机标头的原点更改为目标URL
+        changeOrigin: false
+      },
+      '/business-space': {
+        // 目标 API 地址
+        target: 'http://api.sagacloud.cn',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/business-space": "/dp-auxiliary/business-space/"
+        }
+      },
+      '/pointconfig': {
+        // 目标 API 地址
+        target: 'http://mbi.sagacloud.cn:8080/',
+        // 如果要代理 websockets
+        ws: true,
+        // 将主机标头的原点更改为目标URL
+        changeOrigin: false
+      },
+      '/venders-dp': {
+        // 目标 API 地址
+        target: 'http://api.sagacloud.cn',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/venders-dp": "/dp-auxiliary/venders-dp/"
+        }
+      },
+      '/venders': {
+        // 目标 API 地址
+        target: 'http://api.sagacloud.cn',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/venders": "/dp-auxiliary/venders/"
+        }
+      },
+      '/ScanBuilding': {
+        // 目标 API 地址
+        target: 'http://mbi.sagacloud.cn:8080/',
+        // 如果要代理 websockets
+        ws: true,
+        // 将主机标头的原点更改为目标URL
+        changeOrigin: false
+      },
+      '/scanbuilding-2': {
+        // 目标 API 地址
+        target: 'http://mbi.sagacloud.cn:8080/',
+        // 如果要代理 websockets
+        ws: true,
+        // 将主机标头的原点更改为目标URL
+        changeOrigin: false
+      },
+      '/image-service': {
+        // 目标 API 地址
+        target: 'http://api.sagacloud.cn',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/image-service": "/dp-auxiliary/image-service/"
+        }
+      },
+      '/modelapi': {
+        target: 'http://mbi.sagacloud.cn:8080',
+        changeOrigin: true,
+        pathRewrite: {
+          "^/modelapi": "/revit-algorithm/"
+        }
+      },
+      '/schedulerapi': {
+        target: 'http://mbi.sagacloud.cn:8080',
+        changeOrigin: true,
+        pathRewrite: {
+            "^/schedulerapi": "/scheduler/"
+        }
+      },
     },
 
+    // proxyTable: {
+    //     '/admin': {
+    //         target: 'http://172.16.44.235:8080',
+    //         changeOrigin: true,
+    //         pathRewrite: {
+    //             "^/admin": "/"
+    //         }
+    //     },
+    //     '/api': {
+    //         target: 'http://172.16.44.235:8080',
+    //         changeOrigin: true,
+    //         pathRewrite: {
+    //             "^/api": "/"
+    //         }
+    //     },
+    //     '/data-platform-3': {
+    //         // 目标 API 地址
+    //         target: 'http://172.16.42.210:8080/',
+    //         // 如果要代理 websockets
+    //         ws: true,
+    //         // 将主机标头的原点更改为目标URL
+    //         changeOrigin: false
+    //     },
+    //     '/business-space': {
+    //         // 目标 API 地址
+    //         target: 'http://172.16.42.210:8080/',
+    //         // 如果要代理 websockets
+    //         ws: true,
+    //         // 将主机标头的原点更改为目标URL
+    //         changeOrigin: false
+    //     },
+    //     '/pointconfig': {
+    //         // 目标 API 地址
+    //         target: 'http://172.16.44.235:8080/',
+    //         // 如果要代理 websockets
+    //         ws: true,
+    //         // 将主机标头的原点更改为目标URL
+    //         changeOrigin: false
+    //     },
+    //     '/venders-dp': {
+    //         // 目标 API 地址
+    //         target: 'http://172.16.42.210:8080/',
+    //         // 如果要代理 websockets
+    //         ws: true,
+    //         // 将主机标头的原点更改为目标URL
+    //         changeOrigin: false
+    //     },
+    //     '/venders': {
+    //         // 目标 API 地址
+    //         target: 'http://172.16.42.210:8080/',
+    //         // 如果要代理 websockets
+    //         ws: true,
+    //         // 将主机标头的原点更改为目标URL
+    //         changeOrigin: false
+    //     },
+    //     '/ScanBuilding': {
+    //         // 目标 API 地址
+    //         target: 'http://172.16.44.235:8080/',
+    //         // 如果要代理 websockets
+    //         ws: true,
+    //         // 将主机标头的原点更改为目标URL
+    //         changeOrigin: false
+    //     },
+    //     '/image-service': {
+    //         // 目标 API 地址
+    //         target: 'http://172.16.42.210:8080/',
+    //         // 如果要代理 websockets
+    //         ws: true,
+    //         // 将主机标头的原点更改为目标URL
+    //         changeOrigin: false
+    //     },
+    //     '/modelapi': {
+    //         target: 'http://172.16.42.210:8082',
+    //         // target: 'http://192.168.20.218:8082',//景灏
+    //         changeOrigin: true,
+    //         pathRewrite: {
+    //             "^/modelapi": "/"
+    //         }
+    //     },
+    //     '/schedulerapi': {
+    //       target: 'http://172.16.42.210:8081',
+    //       changeOrigin: true,
+    //       pathRewrite: {
+    //           "^/schedulerapi": "/"
+    //       }
+    //     },
+    // },
+
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 28080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

+ 2 - 1
src/api/scan/config.js

@@ -1,5 +1,6 @@
 export const baseUrl = '/api';
 export const api = '/ScanBuilding';
+export const api1 = '/scanbuilding-2';
 export const sass = 'sass';
 export const physics = '/data-platform-3';
 export const business = '/business-space'
@@ -18,4 +19,4 @@ export const zone = {
   FireZone:'zone-fire', //防火分区
   SecurityZone:'zone-security', //安防分区
   Ispace:'ispace', //元空间
-}
+}

+ 15 - 46
src/api/scan/request.js

@@ -1,5 +1,5 @@
 import fetch from './fetch'
-import {api, baseUrl, business, physics, venders, zone} from './config.js'
+import {api, api1, baseUrl, business, physics, venders, zone} from './config.js'
 import http from './httpUtil'
 
 let arithmetic = '/arithmetic'
@@ -41,61 +41,30 @@ export function dowmloadLog(
     "ProjId": param.ProjId,
     "UserId": param.UserId
   }
-  return fetch({ method: 'POST', url: `${api}/service/user_log/export`, data })
+  return fetch({method: 'POST', url: `${api}/service/user_log/export`, data})
 }
 
 //获取扫楼用户表格
-export function getUser(
-  param
-) {
-  let data = {
-    "Comming": Comming,
-    "Filter": param.filter,
-    "PageNum": param.pageNum,
-    "PageSize": param.pageSize,
-    "ProjId": param.ProjId,
-    "UserId": param.UserId
-  }
-  return fetch({ method: 'POST', url: `${api}/service/user/query`, data })
+export function getUser(param, success) {
+  let url = `${api1}/service/user/query`
+  http.postJson(url, param, success)
 }
 
 //修改扫楼用户
-export function loadUser(
-  param
-) {
-  let data = {
-    "Comming": Comming,
-    "ProjId": param.ProjId,
-    "UserId": param.UserId,
-    "UserList": param.UserList
-  }
-  return fetch({ method: 'POST', url: `${api}/service/user/update`, data })
+export function loadUser(param,success) {
+  let url = `${api1}/service/user/update`;
+  http.postJson(url, param, success)
 }
 
 //删除扫楼用户
-export function delUser(
-  param
-) {
-  let data = {
-    "Comming": Comming,
-    "ProjId": param.ProjId,
-    "UserId": param.UserId,
-    "UserList": param.UserList
-  }
-  return fetch({ method: 'POST', url: `${api}/service/user/delete`, data })
+export function delUser(param,success) {
+  let url = `${api1}/service/user/delete`;
+  http.postJson(url, param, success)
 }
-
 //添加扫楼用户
-export function addUser(
-  param
-) {
-  let data = {
-    "Comming": Comming,
-    "ProjId": param.ProjId,
-    "UserId": param.UserId,
-    "User": param.User
-  }
-  return fetch({ method: 'POST', url: `${api}/service/user/create`, data })
+export function addUser(param, success) {
+  let url = `${api1}/service/user/create`;
+  http.postJson(url, param, success)
 }
 
 //根据项目ID获得建筑列表
@@ -105,7 +74,7 @@ export function getBuildSelect(param) {
     "ProjId": param.ProjId,
     "UserId": param.UserId,
   }
-  return fetch({ method: 'POST', url: `${api}/service/building/query`, data })
+  return fetch({method: 'POST', url: `${api}/service/building/query`, data})
 }
 
 //根据建筑ID获取楼层系信息

+ 13 - 4
src/views/model/report/index.vue

@@ -311,22 +311,31 @@
         })
       },
       getToBeCount() {// 根据模型ID获取待删除数量和待补充数量
-        let equipComDelList = [];
-        this.equipComDelList = [];
+        let equipComDelList = [],
+          toBeAdded = []
+        // this.equipComDelList = [];
         this.LostFloorName.forEach(item => {
           if (item.CurrentModelId) {
             equipComDelList.push({
               ModelId: item.CurrentModelId
             });
-            this.equipComDelList.push(item.CurrentModelId)
+            // this.equipComDelList.push(item.CurrentModelId)
           } else {
             item.flag = 'lost';
             item.FloorName = `${item.Note + item.FloorName}`
           }
+          if (item.Id) {
+            toBeAdded.push({
+              ModelId: item.Id
+            })
+          }
         })
         let params = {
           ProjectId: this.projectId,
           data: equipComDelList
+        }, paramsToBe = {
+          ProjectId: this.projectId,
+          data: toBeAdded
         }
         let promise1 = new Promise(resolve => {
           getToBeDelEquip(params, res => {
@@ -334,7 +343,7 @@
           })
         })
         let promise2 = new Promise(resolve => {
-          getSupplement(params, res => {
+          getSupplement(paramsToBe, res => {
             resolve(res);
           })
         })

+ 61 - 71
src/views/ready/appuser/Edit.vue

@@ -21,37 +21,35 @@
 </template>
 
 <script>
-import {
-    loadUser, //修改
-    addUser //添加
-} from '@/api/scan/request'
-import { mapGetters, mapActions } from 'vuex'
-export default {
+  import {addUser, loadUser} from '@/api/scan/request'
+  import {mapGetters} from 'vuex'
+
+  export default {
     data() {
-        var validatePhone = (rule, value, callback) => {
-            let reg = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
-            if (reg.test(value)) {
-                callback()
-            } else {
-                callback(new Error('手机格式不正确'))
-            }
+      var validatePhone = (rule, value, callback) => {
+        let reg = /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
+        if (reg.test(value)) {
+          callback()
+        } else {
+          callback(new Error('手机格式不正确'))
         }
-        return {
-            dialogVisible: false,
-            isEdit: false,
-            form: {
-                UserName: '',
-                Phone: '',
-                Note: ''
-            },
-            rules: {
-                UserName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-                Phone: [
-                    { required: true, message: '请输入联系电话', trigger: 'blur' },
-                    { validator: validatePhone, trigger: 'blur' }
-                ]
-            }
+      }
+      return {
+        dialogVisible: false,
+        isEdit: false,
+        form: {
+          UserName: '',
+          Phone: '',
+          Note: ''
+        },
+        rules: {
+          UserName: [{required: true, message: '请输入姓名', trigger: 'blur'}],
+          Phone: [
+            {required: true, message: '请输入联系电话', trigger: 'blur'},
+            {validator: validatePhone, trigger: 'blur'}
+          ]
         }
+      }
     },
     computed: {
         ...mapGetters('layout', ['projectId', 'userId'])
@@ -71,61 +69,53 @@ export default {
                     ProjId: row.ProjId
                 }
             }
+          console.log(this.form)
         },
         save() {
             this.$refs['form'].validate(valid => {
                 if (valid) {
                     if (this.isEdit) {
-                        this.editSave()
+                      this.addSave('edit')
                     } else {
-                        this.addSave()
+                      this.addSave('add')
                     }
                 } else {
-                    console.log('error submit!!')
-                    return false
-                }
-            })
-        },
-        addSave() {
-            let param = {}
-            param.ProjId = this.projectId
-            param.UserId = this.userId
-            param.User = this.form
-            addUser(param).then(result => {
-                if (result.data.Result == 'success') {
-                    this.$message({
-                        message: '保存成功',
-                        type: 'success'
-                    })
-                    this.dialogVisible = false
-                    this.$emit('refresh')
-                }
-            })
-        },
-        editSave() {
-            let param = {
-                ProjId: this.projectId,
-                UserId: this.userId,
-                UserList: [this.form]
-            }
-            loadUser(param).then(result => {
-                if (result.data.Result == 'success') {
-                    this.$message({
-                        message: '保存成功',
-                        type: 'success'
-                    })
-                    this.dialogVisible = false
-                    this.$emit('refresh')
+                  console.log('error submit!!')
+                  return false
                 }
             })
         },
-        restForm() {
-            this.form = {
-                UserName: '',
-                Phone: '',
-                Note: ''
-            }
+      addSave(val) {
+        let param = {
+          ProjId: this.projectId,
+          UserId: this.form.UserId || this.userId,
+          Phone: this.form.Phone,
+          UserName: this.form.UserName,
+          Note: this.form.Note || undefined
+        }
+        let Content = {Content: [param]}
+        if (val == 'add') {
+          addUser(Content, res => {
+            this.$message.success('保存成功')
+            this.$emit('refresh')
+
+          })
+        } else {
+          loadUser(Content, res => {
+            this.$message.success('修改成功')
+            this.$emit('refresh')
+
+          })
+        }
+        this.dialogVisible = false
+      },
+      restForm() {
+        this.form = {
+          UserName: '',
+          Phone: '',
+          Note: ''
         }
+      }
     }
 }
 </script>

+ 124 - 133
src/views/ready/appuser/index.vue

@@ -4,72 +4,72 @@
             <div slot='form' class='condition'>
                 <p>
                     <el-input
-                        v-model.trim='searchValue'
-                        class='margin-right'
-                        style='width: 300px; margin-right: 10px;'
-                        placeholder='姓名、联系电话、登录名、备注'
-                        @change='searchChange'
+                      v-model.trim='searchValue'
+                      class='margin-right'
+                      style='width: 300px; margin-right: 10px;'
+                      placeholder='姓名、联系电话、登录名、备注'
+                      @change='searchChange'
                     ></el-input>
                 </p>
-                
-                <!-- <el-button @click='refresh' style="margin-left: 10px;">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button> -->
-                        
-                <!-- <el-button type='danger' @click='someDel'>批量删除</el-button> -->
+
+              <!-- <el-button @click='refresh' style="margin-left: 10px;">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button> -->
+
+              <!-- <el-button type='danger' @click='someDel'>批量删除</el-button> -->
             </div>
-              
-                <div slot='table' style="border: 1px solid #dfe6ec">
-                    <p style="overflow: hidden;">
-                        <el-button style="margin: 10px;float: right;"  @click='addUser'>添加</el-button>         
-                    </p> 
-                    <el-table
-                height="710"
-                
-                :data='tableData'
-                border
-                tooltip-effect='dark'
-                style='width: 100%;'
-                v-loading='loading'
-                @selection-change='handleSelectionChange'
+
+          <div slot='table' style="border: 1px solid #dfe6ec">
+            <p style="overflow: hidden;">
+              <el-button style="margin: 10px;float: right;" @click='addUser'>添加</el-button>
+            </p>
+            <el-table
+              height="710"
+              :data='tableData'
+              border
+              tooltip-effect='dark'
+              style='width: 100%;'
+              v-loading='loading'
+              @selection-change='handleSelectionChange'
             >
-                <!-- <el-table-column type='selection' width='55' align='center'></el-table-column> -->
-                <el-table-column prop='UserName' label='姓名' width='100' header-align='center' align='center'></el-table-column>
-                <el-table-column prop='Phone' label='联系电话/登录名' width='120' header-align='center' align='center'></el-table-column>
-                <el-table-column prop='Note' label='备注' header-align='center'></el-table-column>
-                <el-table-column label='操作' width='150' header-align='center' class="btn">
-                    <template slot-scope='scope'>
-                        <el-button type='primary' plain size='mini' @click='editUser(scope.row)'>编辑</el-button>
-                        <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
-                    </template>
-                </el-table-column>
+              <!-- <el-table-column type='selection' width='55' align='center'></el-table-column> -->
+              <el-table-column prop='UserName' label='姓名' width='100' header-align='center'
+                               align='center'></el-table-column>
+              <el-table-column prop='Phone' label='联系电话/登录名' width='120' header-align='center'
+                               align='center'></el-table-column>
+              <el-table-column prop='Note' label='备注' header-align='center'></el-table-column>
+              <el-table-column label='操作' width='150' header-align='center' class="btn">
+                <template slot-scope='scope'>
+                  <el-button type='primary' plain size='mini' @click='editUser(scope.row)'>编辑</el-button>
+                  <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
+                </template>
+              </el-table-column>
             </el-table>
-                </div>
-            
-            <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged' slot='pagination'></base-pagination>
+          </div>
+
+          <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged'
+                           slot='pagination'></base-pagination>
         </table-page-template>
         <saga-edit ref='edit' @refresh='refresh'></saga-edit>
     </div>
 </template>
 
 <script>
-import { mapGetters, mapActions } from 'vuex'
-import {
-    getUser, //获取扫楼用户
-    delUser //删除用户
-} from '@/api/scan/request'
-//component
-import SagaEdit from './Edit'
-export default {
+  import {mapGetters} from 'vuex'
+  import {delUser, getUser} from '@/api/scan/request'
+  //component
+  import SagaEdit from './Edit'
+
+  export default {
     name: 'floor-user',
     data() {
-        return {
-            searchValue: '',
-            loading: false,
-            tableData: [],
-            checkedArr: [],
-            pageNum: 1,
-            pageSize: 10,
-            total: 0
-        }
+      return {
+        searchValue: '',
+        loading: false,
+        tableData: [],
+        checkedArr: [],
+        pageNum: 1,
+        pageSize: 10,
+        total: 0
+      }
     },
     components: {
         SagaEdit
@@ -78,89 +78,80 @@ export default {
         ...mapGetters('layout', ['projectId', 'userId'])
     },
     methods: {
-        pageChanged(page, size) {
-            this.pageNum = page
-            this.pageSize = size
-            this.getUserList()
-        },
-        refresh() {
-            this.getUserList()
-        },
-        searchChange() {
-            this.pageNum = 1
-            this.getUserList()
-        },
-        addUser() {
-            this.$refs['edit'].show()
-        },
-        editUser(row) {
-            this.$refs['edit'].show(row)
-        },
-        del(row) {
-            var UserList = [row.UserId]
-            this.delUser(UserList)
-        },
-        handleSelectionChange(arr) {
-            this.checkedArr = arr.map(ele => ele.UserId)
-        },
-        someDel() {
-            if (this.checkedArr.length < 1) {
-                this.$message({
-                    message: '请至少选择一条用户',
-                    type: 'warning'
-                })
-            } else {
-                this.delUser(this.checkedArr)
-            }
-        },
-        delUser(UserList) {
-            this.$confirm('此操作将永久删除用户, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
+      pageChanged(page, size) {
+        this.pageNum = page
+        this.pageSize = size
+        this.getUserList()
+      },
+      refresh() {
+        this.getUserList()
+      },
+      searchChange() {
+        this.pageNum = 1
+        this.getUserList()
+      },
+      addUser() {
+        this.$refs['edit'].show()
+      },
+      editUser(row) {
+        console.log(row,'===============')
+        this.$refs['edit'].show(row)
+      },
+      del(row) {
+        console.log(row, 'row')
+        this.delUser(row)
+      },
+      handleSelectionChange(arr) {
+        this.checkedArr = arr.map(ele => ele.UserId)
+      },
+      // someDel() {
+      //     if (this.checkedArr.length < 1) {
+      //         this.$message({
+      //             message: '请至少选择一条用户',
+      //             type: 'warning'
+      //         })
+      //     } else {
+      //         this.delUser(this.checkedArr)
+      //     }
+      // },
+      delUser(row) {
+        this.$confirm('此操作将永久删除用户, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let {CreateTime, LastUpdate, Statistics, ...param} = row
+            delUser([param], res => {
+              this.$message.success('删除成功')
+              this.refresh()
             })
-                .then(() => {
-                    let param = {
-                        ProjId: this.projectId,
-                        UserId: this.userId,
-                        UserList: UserList
-                    }
-                    delUser(param).then(result => {
-                        if (result.data.Result == 'success') {
-                            this.$message({
-                                message: '删除成功',
-                                type: 'success'
-                            })
-                            this.refresh()
-                        }
-                    })
-                })
-                .catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消'
-                    })
-                })
-        },
-
-        getUserList() {
-            this.loading = true
-            let param = {
-                filter: this.searchValue,
-                pageNum: this.pageNum,
-                pageSize: this.pageSize,
-                ProjId: this.projectId,
-                UserId: this.userId
-            }
-            getUser(param).then(result => {
-                this.loading = false
-                this.tableData = result.data.UserList
-                this.total = result.data.Count
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消'
             })
-        },
-        init() {
-            this.getUserList()
+          })
+      },
+
+      getUserList() {
+        this.loading = true
+        let param = {
+          projectId: this.projectId,
+          PageNumber: this.pageNum,
+          PageSize: this.pageSize,
         }
+        getUser(param, res => {
+          this.loading = false
+          this.tableData = res.Content
+          this.total = res.Count
+        })
+
+      },
+      init() {
+        this.getUserList()
+      }
     },
     created() {
         this.init()