diff --git a/src/api/management/author.js b/src/api/management/author.js index 10835ee59..f1ab5456f 100644 --- a/src/api/management/author.js +++ b/src/api/management/author.js @@ -27,18 +27,10 @@ export function getPermissonDetail(id) { }); } -/** 获取权限list*/ -export function getPermissonList() { - return request({ - url: `/api/permission/list`, - method: 'get' - }); -} - /** 获取用户某课程某段时间内可用的权限数量*/ export function getTotalRemains(params) { return request({ - url: '/api/permission/totalRemains', + url: '/api/userPermission/totalRemains', method: 'get', params: params }); @@ -46,7 +38,7 @@ export function getTotalRemains(params) { /** 设置权限失效或有效*/ export function setLessonPermisson(data) { return request({ - url: `/api/permission/${data.id}/status`, + url: `/api/userPermission/${data.id}/status`, method: 'put', data: data }); @@ -57,7 +49,7 @@ export function setLessonPermisson(data) { */ export function queryPermissionSimulation(data) { return request({ - url: `/api/permission/${data.mapId}/${data.prdCode}/simulation`, + url: `/api/userPermission/${data.mapId}/${data.prdCode}/simulation`, method: 'get' }); } @@ -65,38 +57,28 @@ export function queryPermissionSimulation(data) { /** 获取大屏权限列表*/ export function queryPermissionScreen() { return request({ - url: `/api/permission/bigScreen`, + url: `/api/userPermission/bigScreen`, method: 'get' }); } -/** 更新课程权限*/ -/* -export function updateLessonPermisson(data) { - return request({ - url: '/api/permission', - method: 'put', - data: data - }); -} -*/ - -/** 删除课程权限*/ -/* -export function deleteLessonPermisson(id) { - return request({ - url: '/api/permission/' + id, - method: 'delete' - }); -} -*/ - /** * 用户权限列表 */ +export function listPermision(params) { + return request({ + url: `/api/userPermission`, + method: 'get', + params: params + }); +} + +/** + * 个人权限列表 + */ export function listUserPermision(params) { return request({ - url: `/api/permission/my`, + url: `/api/userPermission/my`, method: 'get', params: params }); @@ -110,10 +92,10 @@ export function getDistribute(id) { }); } -/** 用户权限列表 */ +/** 设置权限所有者 */ export function putPermissionOwner(data) { return request({ - url: `/api/permission/${data.id}/owner`, + url: `/api/userPermission/${data.id}/owner`, method: 'put', data: data.owner }); diff --git a/src/api/management/distribute.js b/src/api/management/distribute.js index f7424bbbc..5d68f8bbc 100644 --- a/src/api/management/distribute.js +++ b/src/api/management/distribute.js @@ -1,6 +1,6 @@ import request from '@/utils/request'; -/** 上课权限获取*/ +/** 权限转增*/ export function getLessons(data) { return request({ url: '/api/distribute/getLessons', @@ -9,15 +9,41 @@ export function getLessons(data) { }); } -/** 上课权限分发*/ +/** 权限分发*/ export function giveLessons(data) { return request({ - url: '/api/distribute/givePermission', + url: '/api/distribute/distribute', method: 'post', data: data }); } +/** 权限转增*/ +export function permissionTurnAdd(data) { + return request({ + url: '/api/distribute/transfer', + method: 'post', + data: data + }); +} + +/** 从订单分发权限(获取二维码)*/ +export function postDistribute(data) { + return request({ + url: `/api/distribute/${data.code}/distribute`, + method: 'post', + data: data + }); +} + +/** 权限获取*/ +export function getPermission(state) { + return request({ + url: `/api/distribute/getPermission?state=${state}`, + method: 'get' + }); +} + /** 接收课程权限*/ export function receiveLessons(data) { return request({ diff --git a/src/api/scheduling.js b/src/api/scheduling.js index 79d4312e1..253dd304c 100644 --- a/src/api/scheduling.js +++ b/src/api/scheduling.js @@ -15,3 +15,32 @@ export function generateScheduling(group, params) { params }); } + +export function getSchedulingAllTrains(group) { + return request({ + url: `/api/scheduling/${group}/train/all`, + method: 'get' + }); +} + +export function checkScheduling(group) { + return request({ + url: `/api/scheduling/${group}/check`, + method: 'post' + }); +} + +export function saveScheduling(group, data) { + return request({ + url: `/api/scheduling/${group}/save`, + method: 'post', + data + }); +} + +export function generateSchedulingAgain(group) { + return request({ + url: `/api/scheduling/${group}/rebuild`, + method: 'delete' + }); +} diff --git a/src/assets/ibp_images/appendage_box.png b/src/assets/ibp_images/appendage_box.png index 687e88e4e..5d26ada38 100644 Binary files a/src/assets/ibp_images/appendage_box.png and b/src/assets/ibp_images/appendage_box.png differ diff --git a/src/assets/ibp_images/ibp_bg.png b/src/assets/ibp_images/ibp_bg.png index e8bffd28e..47bb6eb6a 100644 Binary files a/src/assets/ibp_images/ibp_bg.png and b/src/assets/ibp_images/ibp_bg.png differ diff --git a/src/assets/ibp_images/key.png b/src/assets/ibp_images/key.png new file mode 100644 index 000000000..ce2edd5ca Binary files /dev/null and b/src/assets/ibp_images/key.png differ diff --git a/src/assets/ibp_images/key_on.png b/src/assets/ibp_images/key_on.png new file mode 100644 index 000000000..7ab133914 Binary files /dev/null and b/src/assets/ibp_images/key_on.png differ diff --git a/src/assets/ibp_images/keyhole.png b/src/assets/ibp_images/keyhole.png index d976b1d4c..b31e041f2 100644 Binary files a/src/assets/ibp_images/keyhole.png and b/src/assets/ibp_images/keyhole.png differ diff --git a/src/assets/ibp_images/telephone_terminal.png b/src/assets/ibp_images/telephone_terminal.png index 0f9462ca8..2916add46 100644 Binary files a/src/assets/ibp_images/telephone_terminal.png and b/src/assets/ibp_images/telephone_terminal.png differ diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index ea6077051..05f0fbf74 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -63,8 +63,7 @@ :sortable="column.sortable" > { - ibpDevice[elem.code] = createModel(deviceType.WarnButton, elem, propConvert); + zrUtil.each(data.alarmList || [], elem => { + ibpDevice[elem.code] = createModel(deviceType.Alarm, elem, propConvert); }, this); zrUtil.each(data.arrowList || [], elem => { @@ -70,14 +70,30 @@ export function parser(data, config) { ibpDevice[elem.code] = createModel(deviceType.RotatingButton, elem, propConvert); }, this); - zrUtil.each(data.tipList || [], elem => { - ibpDevice[elem.code] = createModel(deviceType.Tip, elem, propConvert); + zrUtil.each(data.tipBoxList || [], elem => { + ibpDevice[elem.code] = createModel(deviceType.TipBox, elem, propConvert); + }, this); + + zrUtil.each(data.ibpLineList || [], elem => { + ibpDevice[elem.code] = createModel(deviceType.IbpLine, elem, propConvert); + }, this); + + zrUtil.each(data.appendageBoxList || [], elem => { + ibpDevice[elem.code] = createModel(deviceType.AppendageBox, elem, propConvert); }, this); zrUtil.each(data.elevatorList || [], elem => { ibpDevice[elem.code] = createModel(deviceType.Elevator, elem, propConvert); }, this); + zrUtil.each(data.keyList || [], elem => { + ibpDevice[elem.code] = createModel(deviceType.Key, elem, propConvert); + }, this); + + zrUtil.each(data.teleTerminalList || [], elem => { + ibpDevice[elem.code] = createModel(deviceType.TeleTerminal, elem, propConvert); + }, this); + } return ibpDevice; @@ -259,6 +275,40 @@ export function updateIbpData(device) { } break; } + case deviceType.Key : { + if (ibpData.keyList && ibpData.keyList.length > 0) { + let newDevice = true; + for (let i=0; i 0) { + let newDevice = true; + for (let i=0; i - -
- - - 加在最前 - - - 车次号： - - - - - - - - - 开始时间： - - - - - - - - - - - 加在最后 - - - 车次号： - - - - - - - - - 开始时间： - - - - - - - + +
+ + + 加在最前 + + + 车次号： + + + + + + + + 开始时间： + + + + + + + + + + 加在最后 + + + 车次号： + + + + + + + + 开始时间： + + + + + + - - - 交路： - - - - - - - - - - - - - - - 详情： - - - - - - - - - - - - - - - - 显示默认停站时间和运行等级 - - -
- - 确 定 - 取 消 - - + + + 交路： + + + + + + + + + + + 详情： + + + + + + + + + + + + 显示默认停站时间和运行等级 + + +
+ + 确 定 + 取 消 + + \ No newline at end of file + diff --git a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue index b96af17c9..2eabc8044 100644 --- a/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue +++ b/src/jmap/theme/beijing_01/menusPlan/createWeekPlan.vue @@ -111,7 +111,6 @@ export default { if (valid) { createRunPlanLoad(this.buildModel()).then(response => { this.$message.success('创建运行图计划成功'); - this.$emit('reloadTable', { name: 'managePlanList' }); this.doClose(); }).catch(() => { this.doClose(); diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue index b661ed20e..cd79c305f 100644 --- a/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue +++ b/src/jmap/theme/beijing_01/menusPlan/deleteTask.vue @@ -1,57 +1,66 @@ \ No newline at end of file + diff --git a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue index 284028f97..2e22a7c64 100644 --- a/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue +++ b/src/jmap/theme/beijing_01/menusPlan/deleteTodayPlan.vue @@ -1,46 +1,55 @@ \ No newline at end of file + diff --git a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue b/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue index fbf13a94c..288ad3381 100644 --- a/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue +++ b/src/jmap/theme/beijing_01/menusPlan/managePlanList.vue @@ -15,7 +15,8 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue index 747a38d6b..591ed34cc 100644 --- a/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue +++ b/src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue @@ -1,10 +1,10 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue index 5f197a1ff..4679c003e 100644 --- a/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue +++ b/src/jmap/theme/chengdu_03/menusPlan/modifyingTask.vue @@ -1,298 +1,309 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue index 10a8fd228..009c19f02 100644 --- a/src/jmap/theme/chengdu_04/menusPlan/addTask.vue +++ b/src/jmap/theme/chengdu_04/menusPlan/addTask.vue @@ -1,150 +1,162 @@ \ No newline at end of file + diff --git a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue index 5f95a8e18..591ed34cc 100644 --- a/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue +++ b/src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue @@ -1,13 +1,13 @@ \ No newline at end of file + diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue index 2b153891a..691db5458 100644 --- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue +++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue @@ -1,298 +1,309 @@ \ No newline at end of file + diff --git a/src/router/index.js b/src/router/index.js index 1a76ff274..23aae305f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -388,13 +388,13 @@ export const asyncRouter = [ } ] }, - { - path: 'ibp/edit', - component: IbpEdit, - meta: { - i18n: 'router.ibpDraw' - } - }, + // { + // path: 'ibp/edit', + // component: IbpEdit, + // meta: { + // i18n: 'router.ibpDraw' + // } + // }, { path: 'runPlan', redirect: '/map/runPlan/view/draft', @@ -742,7 +742,7 @@ export const asyncRouter = [ path: 'manage', component: Package, meta: { - i18n: 'router.permissionManage' + i18n: 'router.selfPermission' } }, { diff --git a/src/views/components/editTable/index.vue b/src/views/components/editTable/index.vue new file mode 100644 index 000000000..42b591914 --- /dev/null +++ b/src/views/components/editTable/index.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/views/components/limits/distribute.vue b/src/views/components/limits/distribute.vue index 57679145c..3b67cf123 100644 --- a/src/views/components/limits/distribute.vue +++ b/src/views/components/limits/distribute.vue @@ -10,7 +10,7 @@ \ No newline at end of file + this.$emit('ConfirmSelectBeginTime', model); + this.doClose(); + } + }); + } + } +}; + diff --git a/src/views/display/index.vue b/src/views/display/index.vue index 8fb2a2173..c6a066d24 100644 --- a/src/views/display/index.vue +++ b/src/views/display/index.vue @@ -18,6 +18,8 @@ @tryTime="tryTime" @hidepanel="hidepanel" @quitQuest="quitQuest" + @showIbp="showIbp" + @showScheduling="showScheduling" /> @@ -38,7 +40,6 @@ @faultChooseShow="faultChooseShow" @runQuestLoadShow="runQuestLoadShow" @switchMode="switchMode" - @schedulingShow="schedulingShow" /> @@ -565,6 +566,9 @@ export default { this.ibpShow = true; this.$refs.ibpPlate.show(); }, + showScheduling() { + this.$refs.scheduling.doShow(); + }, showpanel() { this.panelShow = true; this.simulationShow = false; @@ -585,9 +589,6 @@ export default { }, faultChooseShow() { this.$refs.faultChoose.doShow(); - }, - schedulingShow() { - this.$refs.scheduling.doShow(); } } }; diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue index 2d414d4e1..c29cf3c54 100644 --- a/src/views/display/menuDemon.vue +++ b/src/views/display/menuDemon.vue @@ -8,6 +8,7 @@
IBP盘 + 排班计划 {{ jl3dname }}