diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/assets/global_images/search.png b/src/assets/global_images/search.png new file mode 100644 index 0000000..005a20d --- /dev/null +++ b/src/assets/global_images/search.png Binary files differ diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/assets/global_images/search.png b/src/assets/global_images/search.png new file mode 100644 index 0000000..005a20d --- /dev/null +++ b/src/assets/global_images/search.png Binary files differ diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index f36bdd5..d7a6cec 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -20,11 +20,13 @@ highlight-current accordion @node-click="onClickNode" + :show-checkbox="multiple" /> { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/assets/global_images/search.png b/src/assets/global_images/search.png new file mode 100644 index 0000000..005a20d --- /dev/null +++ b/src/assets/global_images/search.png Binary files differ diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index f36bdd5..d7a6cec 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -20,11 +20,13 @@ highlight-current accordion @node-click="onClickNode" + :show-checkbox="multiple" /> { NProgress.start() // 加载进度条 diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/assets/global_images/search.png b/src/assets/global_images/search.png new file mode 100644 index 0000000..005a20d --- /dev/null +++ b/src/assets/global_images/search.png Binary files differ diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index f36bdd5..d7a6cec 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -20,11 +20,13 @@ highlight-current accordion @node-click="onClickNode" + :show-checkbox="multiple" /> { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index d164acf..6c81d9b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,7 +44,7 @@ { path: '/right', component: () => import('@/views/popup/right'), hidden: true }, { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, - + { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, @@ -53,6 +53,7 @@ // 登录页面 { path: '/login', component: () => import('@/views/login/index_2'), hidden: true }, + // 404错误页面 { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true }, // 401 错误页面 @@ -84,5 +85,5 @@ export const asyncRouterMap = [ ...menuRouters, ...systemRouters, - { path: '*', redirect: '/404', hidden: true } + { path: '*', redirect: '/404', hidden: true }, ] diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/assets/global_images/search.png b/src/assets/global_images/search.png new file mode 100644 index 0000000..005a20d --- /dev/null +++ b/src/assets/global_images/search.png Binary files differ diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index f36bdd5..d7a6cec 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -20,11 +20,13 @@ highlight-current accordion @node-click="onClickNode" + :show-checkbox="multiple" /> { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index d164acf..6c81d9b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,7 +44,7 @@ { path: '/right', component: () => import('@/views/popup/right'), hidden: true }, { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, - + { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, @@ -53,6 +53,7 @@ // 登录页面 { path: '/login', component: () => import('@/views/login/index_2'), hidden: true }, + // 404错误页面 { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true }, // 401 错误页面 @@ -84,5 +85,5 @@ export const asyncRouterMap = [ ...menuRouters, ...systemRouters, - { path: '*', redirect: '/404', hidden: true } + { path: '*', redirect: '/404', hidden: true }, ] diff --git a/src/views/common/listItem.vue b/src/views/common/listItem.vue new file mode 100644 index 0000000..150ad6a --- /dev/null +++ b/src/views/common/listItem.vue @@ -0,0 +1,202 @@ + + + + diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/assets/global_images/search.png b/src/assets/global_images/search.png new file mode 100644 index 0000000..005a20d --- /dev/null +++ b/src/assets/global_images/search.png Binary files differ diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index f36bdd5..d7a6cec 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -20,11 +20,13 @@ highlight-current accordion @node-click="onClickNode" + :show-checkbox="multiple" /> { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index d164acf..6c81d9b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,7 +44,7 @@ { path: '/right', component: () => import('@/views/popup/right'), hidden: true }, { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, - + { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, @@ -53,6 +53,7 @@ // 登录页面 { path: '/login', component: () => import('@/views/login/index_2'), hidden: true }, + // 404错误页面 { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true }, // 401 错误页面 @@ -84,5 +85,5 @@ export const asyncRouterMap = [ ...menuRouters, ...systemRouters, - { path: '*', redirect: '/404', hidden: true } + { path: '*', redirect: '/404', hidden: true }, ] diff --git a/src/views/common/listItem.vue b/src/views/common/listItem.vue new file mode 100644 index 0000000..150ad6a --- /dev/null +++ b/src/views/common/listItem.vue @@ -0,0 +1,202 @@ + + + + diff --git a/src/views/popup/board.vue b/src/views/popup/board.vue new file mode 100644 index 0000000..85554f4 --- /dev/null +++ b/src/views/popup/board.vue @@ -0,0 +1,564 @@ + + + + + diff --git a/src/api/person.js b/src/api/person.js index 9a40c3d..8a79c27 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -2,7 +2,9 @@ * 员工管理接口 */ import request from '@/utils/request' - +import axios from 'axios' +const { CancelToken } = axios +let cancel = null export function getAttendanceListPage(params) { return request({ url: 'attendanceInfo/listPage', @@ -132,3 +134,16 @@ data }) } + +// 人员下拉列表 +export function userList(data, that) { + return request({ + url: `propertyManage/person/list`, + method: 'post', + data, + cancelToken: new CancelToken(cancelFn => { + cancel && cancel() + cancel = cancelFn + }) + }) +} diff --git a/src/assets/global_images/date.png b/src/assets/global_images/date.png new file mode 100644 index 0000000..6623230 --- /dev/null +++ b/src/assets/global_images/date.png Binary files differ diff --git a/src/assets/global_images/monitor.png b/src/assets/global_images/monitor.png new file mode 100644 index 0000000..b164841 --- /dev/null +++ b/src/assets/global_images/monitor.png Binary files differ diff --git a/src/assets/global_images/right.png b/src/assets/global_images/right.png new file mode 100644 index 0000000..7f164cd --- /dev/null +++ b/src/assets/global_images/right.png Binary files differ diff --git a/src/assets/global_images/search.png b/src/assets/global_images/search.png new file mode 100644 index 0000000..005a20d --- /dev/null +++ b/src/assets/global_images/search.png Binary files differ diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index f36bdd5..d7a6cec 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -20,11 +20,13 @@ highlight-current accordion @node-click="onClickNode" + :show-checkbox="multiple" /> { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index d164acf..6c81d9b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,7 +44,7 @@ { path: '/right', component: () => import('@/views/popup/right'), hidden: true }, { path: '/bottom', component: () => import('@/views/popup/bottom'), hidden: true }, { path: '/floor', component: () => import('@/views/popup/floor'), hidden: true }, - + { path: '/board', component: () => import('@/views/popup/board'), hidden: true }, { path: '/device/pop', component: () => import('@/views/popup/device'), hidden: true }, { path: '/case/pop', component: () => import('@/views/popup/case'), hidden: true }, @@ -53,6 +53,7 @@ // 登录页面 { path: '/login', component: () => import('@/views/login/index_2'), hidden: true }, + // 404错误页面 { path: '/404', component: () => import('@/views/errorPage/404'), hidden: true }, // 401 错误页面 @@ -84,5 +85,5 @@ export const asyncRouterMap = [ ...menuRouters, ...systemRouters, - { path: '*', redirect: '/404', hidden: true } + { path: '*', redirect: '/404', hidden: true }, ] diff --git a/src/views/common/listItem.vue b/src/views/common/listItem.vue new file mode 100644 index 0000000..150ad6a --- /dev/null +++ b/src/views/common/listItem.vue @@ -0,0 +1,202 @@ + + + + diff --git a/src/views/popup/board.vue b/src/views/popup/board.vue new file mode 100644 index 0000000..85554f4 --- /dev/null +++ b/src/views/popup/board.vue @@ -0,0 +1,564 @@ + + + + + diff --git a/src/views/popup/components/selectTree.vue b/src/views/popup/components/selectTree.vue new file mode 100644 index 0000000..5211eca --- /dev/null +++ b/src/views/popup/components/selectTree.vue @@ -0,0 +1,226 @@ + + + +