diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/src/assets/login_images/name.png b/src/assets/login_images/name.png new file mode 100644 index 0000000..f76118f --- /dev/null +++ b/src/assets/login_images/name.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/src/assets/login_images/name.png b/src/assets/login_images/name.png new file mode 100644 index 0000000..f76118f --- /dev/null +++ b/src/assets/login_images/name.png Binary files differ diff --git a/src/assets/login_images/password.png b/src/assets/login_images/password.png new file mode 100644 index 0000000..437d945 --- /dev/null +++ b/src/assets/login_images/password.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/src/assets/login_images/name.png b/src/assets/login_images/name.png new file mode 100644 index 0000000..f76118f --- /dev/null +++ b/src/assets/login_images/name.png Binary files differ diff --git a/src/assets/login_images/password.png b/src/assets/login_images/password.png new file mode 100644 index 0000000..437d945 --- /dev/null +++ b/src/assets/login_images/password.png Binary files differ diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index b7013d1..de07fd1 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,9 +9,9 @@ - - - + + {{item.name}} + @@ -19,14 +19,17 @@ - {{ dataForm.deptName }} - + + + + + - + - {{ dataForm.ownerName }} - + + @@ -36,7 +39,7 @@ - + @@ -61,7 +64,7 @@ import { getStaffByDept } from '@/api/staff' import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' - +import { getDeptTreeList } from '@/api/dept' export default { name: 'CarAdd', components: { DeptSelect }, @@ -87,10 +90,12 @@ }, // 表头显示标题 rules: { phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }], - plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }] + plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }], + owner: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }] }, // 前端校验规则 carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 + deptList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,7 +114,9 @@ // 从父组件取字典值列表 this.carProperties = this.$parent.carProperties - + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) if (dialogStatus === 'create') { // 如果是新增，清除验证 this.resetForm() this.isEditMode = false @@ -118,6 +125,7 @@ this.$refs['dataForm'].clearValidate() }) } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中 + this.isDetailMode = false this.isEditMode = true @@ -163,6 +171,14 @@ this.btnLoading = false }, fetchStaffList() { + getDeptTreeList().then(response => { + const list = response.data.list + for(var i=0;i { this.staffList = response.data }) diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/src/assets/login_images/name.png b/src/assets/login_images/name.png new file mode 100644 index 0000000..f76118f --- /dev/null +++ b/src/assets/login_images/name.png Binary files differ diff --git a/src/assets/login_images/password.png b/src/assets/login_images/password.png new file mode 100644 index 0000000..437d945 --- /dev/null +++ b/src/assets/login_images/password.png Binary files differ diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index b7013d1..de07fd1 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,9 +9,9 @@ - - - + + {{item.name}} + @@ -19,14 +19,17 @@ - {{ dataForm.deptName }} - + + + + + - + - {{ dataForm.ownerName }} - + + @@ -36,7 +39,7 @@ - + @@ -61,7 +64,7 @@ import { getStaffByDept } from '@/api/staff' import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' - +import { getDeptTreeList } from '@/api/dept' export default { name: 'CarAdd', components: { DeptSelect }, @@ -87,10 +90,12 @@ }, // 表头显示标题 rules: { phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }], - plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }] + plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }], + owner: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }] }, // 前端校验规则 carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 + deptList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,7 +114,9 @@ // 从父组件取字典值列表 this.carProperties = this.$parent.carProperties - + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) if (dialogStatus === 'create') { // 如果是新增，清除验证 this.resetForm() this.isEditMode = false @@ -118,6 +125,7 @@ this.$refs['dataForm'].clearValidate() }) } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中 + this.isDetailMode = false this.isEditMode = true @@ -163,6 +171,14 @@ this.btnLoading = false }, fetchStaffList() { + getDeptTreeList().then(response => { + const list = response.data.list + for(var i=0;i { this.staffList = response.data }) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index f30e322..54a8c57 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -106,11 +106,11 @@ value: 'propertyStr', align: 'center' }, - { - text: '车主姓名', - value: 'ownerName', - align: 'center' - }, + // { + // text: '车主姓名', + // value: 'ownerName', + // align: 'center' + // }, { text: '车主联系电话', value: 'phone', diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/src/assets/login_images/name.png b/src/assets/login_images/name.png new file mode 100644 index 0000000..f76118f --- /dev/null +++ b/src/assets/login_images/name.png Binary files differ diff --git a/src/assets/login_images/password.png b/src/assets/login_images/password.png new file mode 100644 index 0000000..437d945 --- /dev/null +++ b/src/assets/login_images/password.png Binary files differ diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index b7013d1..de07fd1 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,9 +9,9 @@ - - - + + {{item.name}} + @@ -19,14 +19,17 @@ - {{ dataForm.deptName }} - + + + + + - + - {{ dataForm.ownerName }} - + + @@ -36,7 +39,7 @@ - + @@ -61,7 +64,7 @@ import { getStaffByDept } from '@/api/staff' import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' - +import { getDeptTreeList } from '@/api/dept' export default { name: 'CarAdd', components: { DeptSelect }, @@ -87,10 +90,12 @@ }, // 表头显示标题 rules: { phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }], - plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }] + plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }], + owner: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }] }, // 前端校验规则 carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 + deptList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,7 +114,9 @@ // 从父组件取字典值列表 this.carProperties = this.$parent.carProperties - + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) if (dialogStatus === 'create') { // 如果是新增，清除验证 this.resetForm() this.isEditMode = false @@ -118,6 +125,7 @@ this.$refs['dataForm'].clearValidate() }) } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中 + this.isDetailMode = false this.isEditMode = true @@ -163,6 +171,14 @@ this.btnLoading = false }, fetchStaffList() { + getDeptTreeList().then(response => { + const list = response.data.list + for(var i=0;i { this.staffList = response.data }) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index f30e322..54a8c57 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -106,11 +106,11 @@ value: 'propertyStr', align: 'center' }, - { - text: '车主姓名', - value: 'ownerName', - align: 'center' - }, + // { + // text: '车主姓名', + // value: 'ownerName', + // align: 'center' + // }, { text: '车主联系电话', value: 'phone', diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue index 077ac87..7c60794 100644 --- a/src/views/dashboard/portal.vue +++ b/src/views/dashboard/portal.vue @@ -37,7 +37,7 @@
- 天津滨海园区 + 天津海图营区
综合安防集成管理平台 diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/src/assets/login_images/name.png b/src/assets/login_images/name.png new file mode 100644 index 0000000..f76118f --- /dev/null +++ b/src/assets/login_images/name.png Binary files differ diff --git a/src/assets/login_images/password.png b/src/assets/login_images/password.png new file mode 100644 index 0000000..437d945 --- /dev/null +++ b/src/assets/login_images/password.png Binary files differ diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index b7013d1..de07fd1 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,9 +9,9 @@ - - - + + {{item.name}} + @@ -19,14 +19,17 @@ - {{ dataForm.deptName }} - + + + + + - + - {{ dataForm.ownerName }} - + + @@ -36,7 +39,7 @@ - + @@ -61,7 +64,7 @@ import { getStaffByDept } from '@/api/staff' import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' - +import { getDeptTreeList } from '@/api/dept' export default { name: 'CarAdd', components: { DeptSelect }, @@ -87,10 +90,12 @@ }, // 表头显示标题 rules: { phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }], - plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }] + plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }], + owner: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }] }, // 前端校验规则 carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 + deptList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,7 +114,9 @@ // 从父组件取字典值列表 this.carProperties = this.$parent.carProperties - + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) if (dialogStatus === 'create') { // 如果是新增，清除验证 this.resetForm() this.isEditMode = false @@ -118,6 +125,7 @@ this.$refs['dataForm'].clearValidate() }) } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中 + this.isDetailMode = false this.isEditMode = true @@ -163,6 +171,14 @@ this.btnLoading = false }, fetchStaffList() { + getDeptTreeList().then(response => { + const list = response.data.list + for(var i=0;i { this.staffList = response.data }) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index f30e322..54a8c57 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -106,11 +106,11 @@ value: 'propertyStr', align: 'center' }, - { - text: '车主姓名', - value: 'ownerName', - align: 'center' - }, + // { + // text: '车主姓名', + // value: 'ownerName', + // align: 'center' + // }, { text: '车主联系电话', value: 'phone', diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue index 077ac87..7c60794 100644 --- a/src/views/dashboard/portal.vue +++ b/src/views/dashboard/portal.vue @@ -37,7 +37,7 @@
- 天津滨海园区 + 天津海图营区
综合安防集成管理平台 diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue index baaa6f9..6bb09ac 100644 --- a/src/views/deviceManage/deviceDetail.vue +++ b/src/views/deviceManage/deviceDetail.vue @@ -4,12 +4,14 @@ - {{ dataForm.name }} + + - {{ dataForm.devcode }} + + @@ -17,12 +19,14 @@ - {{ dataForm.typeName }} + + - {{ dataForm.model }} + + @@ -30,12 +34,14 @@ - {{ dataForm.onlineStatusName }} + + - {{ dataForm.deviceStatusName }} + + @@ -43,12 +49,14 @@ - {{ dataForm.installDate }} + + - {{ dataForm.position }} + + @@ -56,7 +64,8 @@ - {{ dataForm.inOutName }} + + diff --git a/config/dev.env.js b/config/dev.env.js index 3495d13..51c5a47 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://192.168.0.212:20220"' - // BASE_API: '"http://192.168.0.102:20220"' + // BASE_API: '"http://192.168.0.212:20220"' + BASE_API: '"http://111.198.10.15:11631"' }) diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index c518e9d..d7f558c 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/assets/login_images/bg0.png b/src/assets/login_images/bg0.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/bg0.png Binary files differ diff --git a/src/assets/login_images/name.png b/src/assets/login_images/name.png new file mode 100644 index 0000000..f76118f --- /dev/null +++ b/src/assets/login_images/name.png Binary files differ diff --git a/src/assets/login_images/password.png b/src/assets/login_images/password.png new file mode 100644 index 0000000..437d945 --- /dev/null +++ b/src/assets/login_images/password.png Binary files differ diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index b7013d1..de07fd1 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,9 +9,9 @@ - - - + + {{item.name}} + @@ -19,14 +19,17 @@ - {{ dataForm.deptName }} - + + + + + - + - {{ dataForm.ownerName }} - + + @@ -36,7 +39,7 @@ - + @@ -61,7 +64,7 @@ import { getStaffByDept } from '@/api/staff' import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' - +import { getDeptTreeList } from '@/api/dept' export default { name: 'CarAdd', components: { DeptSelect }, @@ -87,10 +90,12 @@ }, // 表头显示标题 rules: { phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }], - plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }] + plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }], + owner: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }] }, // 前端校验规则 carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 + deptList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,7 +114,9 @@ // 从父组件取字典值列表 this.carProperties = this.$parent.carProperties - + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() + }) if (dialogStatus === 'create') { // 如果是新增，清除验证 this.resetForm() this.isEditMode = false @@ -118,6 +125,7 @@ this.$refs['dataForm'].clearValidate() }) } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中 + this.isDetailMode = false this.isEditMode = true @@ -163,6 +171,14 @@ this.btnLoading = false }, fetchStaffList() { + getDeptTreeList().then(response => { + const list = response.data.list + for(var i=0;i { this.staffList = response.data }) diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index f30e322..54a8c57 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -106,11 +106,11 @@ value: 'propertyStr', align: 'center' }, - { - text: '车主姓名', - value: 'ownerName', - align: 'center' - }, + // { + // text: '车主姓名', + // value: 'ownerName', + // align: 'center' + // }, { text: '车主联系电话', value: 'phone', diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue index 077ac87..7c60794 100644 --- a/src/views/dashboard/portal.vue +++ b/src/views/dashboard/portal.vue @@ -37,7 +37,7 @@
- 天津滨海园区 + 天津海图营区
综合安防集成管理平台 diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue index baaa6f9..6bb09ac 100644 --- a/src/views/deviceManage/deviceDetail.vue +++ b/src/views/deviceManage/deviceDetail.vue @@ -4,12 +4,14 @@ - {{ dataForm.name }} + + - {{ dataForm.devcode }} + + @@ -17,12 +19,14 @@ - {{ dataForm.typeName }} + + - {{ dataForm.model }} + + @@ -30,12 +34,14 @@ - {{ dataForm.onlineStatusName }} + + - {{ dataForm.deviceStatusName }} + + @@ -43,12 +49,14 @@ - {{ dataForm.installDate }} + + - {{ dataForm.position }} + + @@ -56,7 +64,8 @@ - {{ dataForm.inOutName }} + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index f7feec0..4487602 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -2,17 +2,17 @@