diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 31c168b..9dd6546 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -169,7 +169,7 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 alarmTypeList: [], // 告警类型列表 alarmContentTypeList: [], // 告警内容类型列表 showAlarmType: true, // 是否显示告警类型下拉 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 31c168b..9dd6546 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -169,7 +169,7 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 alarmTypeList: [], // 告警类型列表 alarmContentTypeList: [], // 告警内容类型列表 showAlarmType: true, // 是否显示告警类型下拉 diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue index 56193f1..72a748e 100644 --- a/src/views/nbDevice/listNbDevice.vue +++ b/src/views/nbDevice/listNbDevice.vue @@ -140,9 +140,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 31c168b..9dd6546 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -169,7 +169,7 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 alarmTypeList: [], // 告警类型列表 alarmContentTypeList: [], // 告警内容类型列表 showAlarmType: true, // 是否显示告警类型下拉 diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue index 56193f1..72a748e 100644 --- a/src/views/nbDevice/listNbDevice.vue +++ b/src/views/nbDevice/listNbDevice.vue @@ -140,9 +140,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index ccb17ae..ebfaed6 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -17,7 +17,7 @@ - + 搜索 @@ -99,7 +99,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
井深:{{ wellInfo.deep }}(m)
-
权属单位:{{ wellInfo.deptName }}
+
产权单位:{{ wellInfo.deptName }}
详细地址:{{ wellInfo.position }}
@@ -115,7 +115,7 @@
井深:{{ alarmInfo.deep }}(m)
-
权属单位:{{ alarmInfo.deptName }}
+
产权单位:{{ alarmInfo.deptName }}
详细地址:{{ alarmInfo.position }}
@@ -178,9 +178,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 icons: { '1': 'well-rain', '2': 'well-sewage', diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@
- + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 31c168b..9dd6546 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -169,7 +169,7 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 alarmTypeList: [], // 告警类型列表 alarmContentTypeList: [], // 告警内容类型列表 showAlarmType: true, // 是否显示告警类型下拉 diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue index 56193f1..72a748e 100644 --- a/src/views/nbDevice/listNbDevice.vue +++ b/src/views/nbDevice/listNbDevice.vue @@ -140,9 +140,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index ccb17ae..ebfaed6 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -17,7 +17,7 @@ - + 搜索 @@ -99,7 +99,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
井深:{{ wellInfo.deep }}(m)
-
权属单位:{{ wellInfo.deptName }}
+
产权单位:{{ wellInfo.deptName }}
详细地址:{{ wellInfo.position }}
@@ -115,7 +115,7 @@
井深:{{ alarmInfo.deep }}(m)
-
权属单位:{{ alarmInfo.deptName }}
+
产权单位:{{ alarmInfo.deptName }}
详细地址:{{ alarmInfo.position }}
@@ -178,9 +178,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 icons: { '1': 'well-rain', '2': 'well-sewage', diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 0f7075c..972e9fb 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -114,7 +114,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
所属派出所:{{ wellInfo.deptName }}
-
权属单位:{{ wellInfo.owner }}
+
产权单位:{{ wellInfo.owner }}
详细地址:{{ wellInfo.position }}
@@ -132,7 +132,7 @@
所属分局:{{ alarmInfo.pidName }}
所属派出所:{{ alarmInfo.deptName }}
-
权属单位:{{ alarmInfo.owner }}
+
产权单位:{{ alarmInfo.owner }}
详细地址:{{ alarmInfo.position }}
@@ -241,10 +241,10 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: [], // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 - showDeptSelect: true, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 + showDeptSelect: true, // 是否显示产权单位下拉 icons: { '1': 'static/BMap/images/well-rain.svg', '2': 'static/BMap/images/well-sewage.svg', diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@
- + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 31c168b..9dd6546 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -169,7 +169,7 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 alarmTypeList: [], // 告警类型列表 alarmContentTypeList: [], // 告警内容类型列表 showAlarmType: true, // 是否显示告警类型下拉 diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue index 56193f1..72a748e 100644 --- a/src/views/nbDevice/listNbDevice.vue +++ b/src/views/nbDevice/listNbDevice.vue @@ -140,9 +140,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index ccb17ae..ebfaed6 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -17,7 +17,7 @@ - + 搜索 @@ -99,7 +99,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
井深:{{ wellInfo.deep }}(m)
-
权属单位:{{ wellInfo.deptName }}
+
产权单位:{{ wellInfo.deptName }}
详细地址:{{ wellInfo.position }}
@@ -115,7 +115,7 @@
井深:{{ alarmInfo.deep }}(m)
-
权属单位:{{ alarmInfo.deptName }}
+
产权单位:{{ alarmInfo.deptName }}
详细地址:{{ alarmInfo.position }}
@@ -178,9 +178,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 icons: { '1': 'well-rain', '2': 'well-sewage', diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 0f7075c..972e9fb 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -114,7 +114,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
所属派出所:{{ wellInfo.deptName }}
-
权属单位:{{ wellInfo.owner }}
+
产权单位:{{ wellInfo.owner }}
详细地址:{{ wellInfo.position }}
@@ -132,7 +132,7 @@
所属分局:{{ alarmInfo.pidName }}
所属派出所:{{ alarmInfo.deptName }}
-
权属单位:{{ alarmInfo.owner }}
+
产权单位:{{ alarmInfo.owner }}
详细地址:{{ alarmInfo.position }}
@@ -241,10 +241,10 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: [], // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 - showDeptSelect: true, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 + showDeptSelect: true, // 是否显示产权单位下拉 icons: { '1': 'static/BMap/images/well-rain.svg', '2': 'static/BMap/images/well-sewage.svg', diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue index 9512c06..48a13f3 100644 --- a/src/views/wellManage/infoWell.vue +++ b/src/views/wellManage/infoWell.vue @@ -21,7 +21,7 @@ - + @@ -94,8 +94,8 @@ wellName: '', // 闸井名称 wellType: '', // 闸井类型 wellTypeName: '', // 闸井类型名称 - deptid: '', // 权属单位 - deptName: '', // 权属单位名称 + deptid: '', // 产权单位 + deptName: '', // 产权单位名称 bfztName: '', // 布防状态 deep: '', // 井深, position: '', // 位置描述 @@ -149,8 +149,8 @@ wellName: row.wellName, // 闸井名称 wellType: row.wellType, // 闸井类型 wellTypeName: row.wellTypeName, // 闸井类型 - deptid: row.deptid, // 权属单位 - deptName: row.deptName, // 权属单位 + deptid: row.deptid, // 产权单位 + deptName: row.deptName, // 产权单位 deep: row.deep, // 井深, bfztName: row.bfztName, // 布防状态 position: row.position, // 位置描述 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@
- + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 31c168b..9dd6546 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -169,7 +169,7 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 alarmTypeList: [], // 告警类型列表 alarmContentTypeList: [], // 告警内容类型列表 showAlarmType: true, // 是否显示告警类型下拉 diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue index 56193f1..72a748e 100644 --- a/src/views/nbDevice/listNbDevice.vue +++ b/src/views/nbDevice/listNbDevice.vue @@ -140,9 +140,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index ccb17ae..ebfaed6 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -17,7 +17,7 @@ - + 搜索 @@ -99,7 +99,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
井深:{{ wellInfo.deep }}(m)
-
权属单位:{{ wellInfo.deptName }}
+
产权单位:{{ wellInfo.deptName }}
详细地址:{{ wellInfo.position }}
@@ -115,7 +115,7 @@
井深:{{ alarmInfo.deep }}(m)
-
权属单位:{{ alarmInfo.deptName }}
+
产权单位:{{ alarmInfo.deptName }}
详细地址:{{ alarmInfo.position }}
@@ -178,9 +178,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 icons: { '1': 'well-rain', '2': 'well-sewage', diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 0f7075c..972e9fb 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -114,7 +114,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
所属派出所:{{ wellInfo.deptName }}
-
权属单位:{{ wellInfo.owner }}
+
产权单位:{{ wellInfo.owner }}
详细地址:{{ wellInfo.position }}
@@ -132,7 +132,7 @@
所属分局:{{ alarmInfo.pidName }}
所属派出所:{{ alarmInfo.deptName }}
-
权属单位:{{ alarmInfo.owner }}
+
产权单位:{{ alarmInfo.owner }}
详细地址:{{ alarmInfo.position }}
@@ -241,10 +241,10 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: [], // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 - showDeptSelect: true, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 + showDeptSelect: true, // 是否显示产权单位下拉 icons: { '1': 'static/BMap/images/well-rain.svg', '2': 'static/BMap/images/well-sewage.svg', diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue index 9512c06..48a13f3 100644 --- a/src/views/wellManage/infoWell.vue +++ b/src/views/wellManage/infoWell.vue @@ -21,7 +21,7 @@ - + @@ -94,8 +94,8 @@ wellName: '', // 闸井名称 wellType: '', // 闸井类型 wellTypeName: '', // 闸井类型名称 - deptid: '', // 权属单位 - deptName: '', // 权属单位名称 + deptid: '', // 产权单位 + deptName: '', // 产权单位名称 bfztName: '', // 布防状态 deep: '', // 井深, position: '', // 位置描述 @@ -149,8 +149,8 @@ wellName: row.wellName, // 闸井名称 wellType: row.wellType, // 闸井类型 wellTypeName: row.wellTypeName, // 闸井类型 - deptid: row.deptid, // 权属单位 - deptName: row.deptName, // 权属单位 + deptid: row.deptid, // 产权单位 + deptName: row.deptName, // 产权单位 deep: row.deep, // 井深, bfztName: row.bfztName, // 布防状态 position: row.position, // 位置描述 diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue index 396bfbe..c6ae3dc 100644 --- a/src/views/wellManage/listWell.vue +++ b/src/views/wellManage/listWell.vue @@ -11,7 +11,7 @@
- + @@ -124,7 +124,7 @@ listQuery: { keywords: '', // 关键字:闸井编号 position: '', // 位置 - owner: '', // 权属单位 + owner: '', // 产权单位 wellType: '', // 井类型 deptid: '', // deptid notes: '', // 备注类型 @@ -190,9 +190,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 editShow: false, // 是否显示编辑框 diff --git a/src/api/dataStatics.js b/src/api/dataStatics.js index 26fe939..19f21fe 100644 --- a/src/api/dataStatics.js +++ b/src/api/dataStatics.js @@ -2,7 +2,7 @@ * 数据统计管理接口 */ import request from '@/utils/request' -// 根据权属单位进行报警统计查询 +// 根据产权单位进行报警统计查询 export function alarmStaticByDept(params) { return request({ url: 'statics/alarmsByDept', diff --git a/src/store/getters.js b/src/store/getters.js index 4c0843f..ca072a9 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -10,8 +10,8 @@ roleList: state => state.user.roleList, // 角色列表 roleNames: state => state.user.roleNames, // 角色名称列表 roleTips: state => state.user.roleTips, // 角色名称列表 - deptId: state => state.user.deptId, // 权属单位 - deptName: state => state.user.deptName, // 权属单位名称 + deptId: state => state.user.deptId, // 产权单位 + deptName: state => state.user.deptName, // 产权单位名称 menus: state => state.permission.menus, // 菜单 permission_routers: state => state.permission.routers, // 用户有权限的路由 addRouters: state => state.permission.addRouters, // 添加的路由 diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue index dd02bfc..f0dd07e 100644 --- a/src/views/alarmGroup/components/addWell.vue +++ b/src/views/alarmGroup/components/addWell.vue @@ -95,7 +95,7 @@ value: 'wellTypeName' }, { - text: '权属单位', + text: '产权单位', value: 'deptName' } ], diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 952a7aa..7b0042d 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -123,9 +123,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 46301ff..0bd8552 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -54,7 +54,7 @@ return { chartSettings: { labelMap: { - 'deptName': '权属单位', + 'deptName': '产权单位', 'alarmDevices': '报警设备数', 'alarmTimes': '报警次数' }, diff --git a/src/views/concentrator/editConcentrator.vue b/src/views/concentrator/editConcentrator.vue index 687f4ee..cd7aa7b 100644 --- a/src/views/concentrator/editConcentrator.vue +++ b/src/views/concentrator/editConcentrator.vue @@ -45,8 +45,8 @@ - - + + @@ -103,7 +103,7 @@ return { dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型:create,update, - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 isEditMode: false, today: getToday('yyyy-MM-dd'), concentratorForm: { diff --git a/src/views/concentrator/listConcentrator.vue b/src/views/concentrator/listConcentrator.vue index 2d036b7..66d2869 100644 --- a/src/views/concentrator/listConcentrator.vue +++ b/src/views/concentrator/listConcentrator.vue @@ -108,7 +108,7 @@ align: 'center' }, { - text: '权属单位', + text: '产权单位', value: 'deptName', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..34cc891 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -8,7 +8,7 @@ - + - + @@ -172,7 +172,7 @@ } }, computed: { - watchDeviceId() { // 监控权属单位变化 + watchDeviceId() { // 监控产权单位变化 return this.configForm.deviceId }, showIp() { // 是否显示ip配置 diff --git a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue index bf744db..6d6f0ae 100644 --- a/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue +++ b/src/views/deviceConfig/liquidConfig/listLiquidConfig.vue @@ -8,7 +8,7 @@ - + 搜索 @@ -160,9 +160,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue index 70b2b7d..61733db 100644 --- a/src/views/deviceManage/detailDevice.vue +++ b/src/views/deviceManage/detailDevice.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 295f33f..51aa3ec 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -169,9 +169,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 fileList: [], listLoading: true, // 加载动画 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 31c168b..9dd6546 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -169,7 +169,7 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 alarmTypeList: [], // 告警类型列表 alarmContentTypeList: [], // 告警内容类型列表 showAlarmType: true, // 是否显示告警类型下拉 diff --git a/src/views/nbDevice/listNbDevice.vue b/src/views/nbDevice/listNbDevice.vue index 56193f1..72a748e 100644 --- a/src/views/nbDevice/listNbDevice.vue +++ b/src/views/nbDevice/listNbDevice.vue @@ -140,9 +140,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉 showDeviceType: true, // 是否显示设备类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index ccb17ae..ebfaed6 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -17,7 +17,7 @@ - + 搜索 @@ -99,7 +99,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
井深:{{ wellInfo.deep }}(m)
-
权属单位:{{ wellInfo.deptName }}
+
产权单位:{{ wellInfo.deptName }}
详细地址:{{ wellInfo.position }}
@@ -115,7 +115,7 @@
井深:{{ alarmInfo.deep }}(m)
-
权属单位:{{ alarmInfo.deptName }}
+
产权单位:{{ alarmInfo.deptName }}
详细地址:{{ alarmInfo.position }}
@@ -178,9 +178,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 icons: { '1': 'well-rain', '2': 'well-sewage', diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 0f7075c..972e9fb 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -114,7 +114,7 @@
闸井类型:{{ wellInfo.wellTypeName }}
所属派出所:{{ wellInfo.deptName }}
-
权属单位:{{ wellInfo.owner }}
+
产权单位:{{ wellInfo.owner }}
详细地址:{{ wellInfo.position }}
@@ -132,7 +132,7 @@
所属分局:{{ alarmInfo.pidName }}
所属派出所:{{ alarmInfo.deptName }}
-
权属单位:{{ alarmInfo.owner }}
+
产权单位:{{ alarmInfo.owner }}
详细地址:{{ alarmInfo.position }}
@@ -241,10 +241,10 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: [], // 组织树列表数据 - showDeptTree: 0, // 是否显示权属单位下拉,0不显示,1显示树,2显示平面 - showDeptSelect: true, // 是否显示权属单位下拉 + showDeptTree: 0, // 是否显示产权单位下拉,0不显示,1显示树,2显示平面 + showDeptSelect: true, // 是否显示产权单位下拉 icons: { '1': 'static/BMap/images/well-rain.svg', '2': 'static/BMap/images/well-sewage.svg', diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue index 9512c06..48a13f3 100644 --- a/src/views/wellManage/infoWell.vue +++ b/src/views/wellManage/infoWell.vue @@ -21,7 +21,7 @@ - + @@ -94,8 +94,8 @@ wellName: '', // 闸井名称 wellType: '', // 闸井类型 wellTypeName: '', // 闸井类型名称 - deptid: '', // 权属单位 - deptName: '', // 权属单位名称 + deptid: '', // 产权单位 + deptName: '', // 产权单位名称 bfztName: '', // 布防状态 deep: '', // 井深, position: '', // 位置描述 @@ -149,8 +149,8 @@ wellName: row.wellName, // 闸井名称 wellType: row.wellType, // 闸井类型 wellTypeName: row.wellTypeName, // 闸井类型 - deptid: row.deptid, // 权属单位 - deptName: row.deptName, // 权属单位 + deptid: row.deptid, // 产权单位 + deptName: row.deptName, // 产权单位 deep: row.deep, // 井深, bfztName: row.bfztName, // 布防状态 position: row.position, // 位置描述 diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue index 396bfbe..c6ae3dc 100644 --- a/src/views/wellManage/listWell.vue +++ b/src/views/wellManage/listWell.vue @@ -11,7 +11,7 @@
- + @@ -124,7 +124,7 @@ listQuery: { keywords: '', // 关键字:闸井编号 position: '', // 位置 - owner: '', // 权属单位 + owner: '', // 产权单位 wellType: '', // 井类型 deptid: '', // deptid notes: '', // 备注类型 @@ -190,9 +190,9 @@ value: 'id', label: 'name', children: 'children' - }, // 权属单位树形下拉菜单 + }, // 产权单位树形下拉菜单 deptTreeList: null, // 组织树列表数据 - deptShowTop: false, // 权属单位下拉是否显示顶级 + deptShowTop: false, // 产权单位下拉是否显示顶级 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 editShow: false, // 是否显示编辑框 diff --git a/src/views/wellManage/responseAssign.vue b/src/views/wellManage/responseAssign.vue index c41b25d..817fb84 100644 --- a/src/views/wellManage/responseAssign.vue +++ b/src/views/wellManage/responseAssign.vue @@ -120,7 +120,7 @@ } ] } - ], // 权属单位树列表数据 + ], // 产权单位树列表数据 defaultExpanded: [], // 默认展开的项 defaultChecked: [], // 默认选中的树 loading: false // 加载动态效果 @@ -142,7 +142,7 @@ this.loading = false // this.fetchDeptTree() }, - // 获取权属单位列表 + // 获取产权单位列表 fetchDeptTree: function(deptid) { getDeptTreeList(deptid).then(response => { if (response.data.list) { @@ -150,7 +150,7 @@ this.userTreeList = toTreeList(response.data.list) this.loading = false } else { - this.$message.warning('请先选择井权属单位') + this.$message.warning('请先选择井产权单位') } } })