-
+
+
\ No newline at end of file
+ if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+ this.$refs.popMenu.resetShowPosition(point);
+ }
+ },
+ doClose() {
+ if (this.$refs && this.$refs.popMenu) {
+ this.$refs.popMenu.close();
+ // this.$store.dispatch('map/setTrainWindowShow', false);
+ }
+ },
+ // 设置故障
+ setStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.stoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 取消故障
+ cancelStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.cancelStoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 限速行驶
+ limitSpeed() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.limitSpeed.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 添加列车识别号
+ addTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.addTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 删除列车识别号
+ delTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.delTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainDelete.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 修改列车识别号
+ editTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.editTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 修改车组号
+ editTrainNo() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.editTrainNo.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainEditNumber.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 移动列车识别号
+ moveTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.moveTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainMove.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 交换列车识别号
+ switchTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.switchTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainSwitch.doShow(operate, this.selected);
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue b/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
index 70225067f..155e29ee3 100644
--- a/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
+++ b/src/jmap/theme/beijing_01/menus/dialog/trainDelete.vue
@@ -1,160 +1,169 @@
-
-
-
- 加在最前
-
-
- 车次号：
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
-
-
-
-
- 加在最后
-
-
- 车次号：
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
-
+
+
- 确 定
- 取 消
-
-
+
+
+ 交路：
+
+
+
+
+
+
+ 详情：
+
+
+
+
+
+
+
+ 显示默认停站时间和运行等级
+
+
+
+
+
+
+ 加在最前
+
+
+ 车次号：
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+
+
+ 加在最后
+
+
+ 车次号：
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
-
-
- 交路：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 显示默认停站时间和运行等级
-
-
-
-
-
+
+
diff --git a/src/jmap/theme/chengdu_03/menusPlan/addTask.vue b/src/jmap/theme/chengdu_03/menusPlan/addTask.vue
index 10a8fd228..009c19f02 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/addTask.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/addTask.vue
@@ -1,150 +1,162 @@
-
-
-
- 加在最前
-
-
- 车次号：
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
-
-
-
-
- 加在最后
-
-
- 车次号：
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
-
+
+
- 确 定
- 取 消
-
-
+
+
+ 交路：
+
+
+
+
+
+
+ 详情：
+
+
+
+
+
+
+
+ 显示默认停站时间和运行等级
+
+
+
+
+
+
+ 加在最前
+
+
+ 车次号：
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+
+
+ 加在最后
+
+
+ 车次号：
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
-
-
- 交路：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 显示默认停站时间和运行等级
-
-
-
-
-
-
- 进库
- 出库
-
-
-
-
+
+
+ 进库
+ 出库
+
+
+
+
+
-
-
-
-
- 车次号：
-
-
-
-
-
-
-
-
-
-
-
-
- 手工
-
-
-
-
-
-
- 缺省停站时间：
-
-
-
-
-
-
-
-
-
-
-
-
- 表号：
-
-
-
-
+
+
- 确 定
- 取 消
-
-
+
+
+
+
+
+
+ 交路：
+
+
+
+
+
+ {{ formatName(scope.row.beginStationCode) }}
+
+
+
+
+ {{ formatName(scope.row.endStationCode) }}
+
+
+
+
+
+ 详情：
+
+
+
+
+
+ {{ formatName(scope.row.stationCode) }}
+
+
+
+
+ {{ formatTime(scope.row.startTime) }}
+
+
+
+
+ {{ formatTime(scope.row.stopTime) }}
+
+
+
+
+ {{ formatTime(scope.row.endTime) }}
+
+
+
+
+
+
+ 显示默认停站时间和运行等级
+
+
+
+
+
+
+
+
+ 车次号：
+
+
+
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省停站时间：
+
+
+
+
+
+
+
+
+
+
+ 表号：
+
+
+
+
+
+
+
+
+
+
+ 清客
-
-
-
-
- 清客
-
-
- 延续计划
-
-
- 首班车
-
-
-
-
+ 延续计划
-
-
-
-
-
- 序列号：
-
-
-
-
-
-
-
-
+
+ 首班车
-
-
-
- 手工
-
-
-
-
-
-
- 缺省运行等级：
-
-
-
-
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 序列号：
+
+
+
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省运行等级：
+
+
+
+
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+
+
+
+
+ 入库
-
-
-
-
- 入库
-
-
- 出库
-
-
- 末班车
-
-
-
-
+ 出库
-
-
- 交路：
-
-
-
-
-
- {{ formatName(scope.row.beginStationCode) }}
-
-
-
-
-
-
- {{ formatName(scope.row.endStationCode) }}
-
-
-
-
-
-
-
-
-
-
-
- 详情：
-
-
-
-
-
- {{ formatName(scope.row.stationCode) }}
-
-
-
-
- {{ formatTime(scope.row.startTime) }}
-
-
-
-
- {{ formatTime(scope.row.stopTime) }}
-
-
-
-
- {{ formatTime(scope.row.endTime) }}
-
-
-
-
-
-
-
-
-
-
- 显示默认停站时间和运行等级
+
+ 末班车
-
-
-
-
-
- 进库
- 出库
-
-
-
-
+
+
+ 进库
+ 出库
+
+
+
+
+
-
-
-
-
- 车次号：
-
-
-
-
-
-
-
-
-
-
-
-
- 手工
-
-
-
-
-
-
- 缺省停站时间：
-
-
-
-
-
-
-
-
-
-
-
-
- 表号：
-
-
-
-
+
+
- 确 定
- 取 消
-
-
+
+
+
+
+
+
+ 交路：
+
+
+
+
+
+ {{ formatName(scope.row.beginStationCode) }}
+
+
+
+
+ {{ formatName(scope.row.endStationCode) }}
+
+
+
+
+
+ 详情：
+
+
+
+
+
+ {{ formatName(scope.row.stationCode) }}
+
+
+
+
+ {{ formatTime(scope.row.startTime) }}
+
+
+
+
+ {{ formatTime(scope.row.stopTime) }}
+
+
+
+
+ {{ formatTime(scope.row.endTime) }}
+
+
+
+
+
+
+ 显示默认停站时间和运行等级
+
+
+
+
+
+
+
+
+ 车次号：
+
+
+
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省停站时间：
+
+
+
+
+
+
+
+
+
+
+ 表号：
+
+
+
+
+
+
+
+
+
+
+ 清客
-
-
-
-
- 清客
-
-
- 延续计划
-
-
- 首班车
-
-
-
-
+ 延续计划
-
-
-
-
-
- 序列号：
-
-
-
-
-
-
-
-
+
+ 首班车
-
-
-
- 手工
-
-
-
-
-
-
- 缺省运行等级：
-
-
-
-
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 序列号：
+
+
+
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省运行等级：
+
+
+
+
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+
+
+
+
+ 入库
-
-
-
-
- 入库
-
-
- 出库
-
-
- 末班车
-
-
-
-
+ 出库
-
-
- 交路：
-
-
-
-
-
- {{ formatName(scope.row.beginStationCode) }}
-
-
-
-
-
-
- {{ formatName(scope.row.endStationCode) }}
-
-
-
-
-
-
-
-
-
-
-
- 详情：
-
-
-
-
-
- {{ formatName(scope.row.stationCode) }}
-
-
-
-
- {{ formatTime(scope.row.startTime) }}
-
-
-
-
- {{ formatTime(scope.row.stopTime) }}
-
-
-
-
- {{ formatTime(scope.row.endTime) }}
-
-
-
-
-
-
-
-
-
-
- 显示默认停站时间和运行等级
+
+ 末班车
-
-
-
-
+
+
\ No newline at end of file
+ if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+ this.$refs.popMenu.resetShowPosition(point);
+ }
+ },
+ doClose() {
+ if (this.$refs && this.$refs.popMenu) {
+ this.$refs.popMenu.close();
+ // this.$store.dispatch('map/setTrainWindowShow', false);
+ }
+ },
+ // 设置故障
+ setStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.stoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 取消故障
+ cancelStoppage() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.cancelStoppage.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 限速行驶
+ limitSpeed() {
+ const operate = {
+ start: true,
+ send: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.limitSpeed.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ } else {
+ this.$refs.noticeInfo.doShow(operate);
+ }
+ }).catch(() => {
+ this.$refs.noticeInfo.doShow(operate);
+ });
+ },
+ // 添加列车识别号
+ addTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.addTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 删除列车识别号
+ delTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.delTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainDelete.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 修改列车识别号
+ editTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.editTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainControl.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 修改车组号
+ editTrainNo() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.editTrainNo.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainEditNumber.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 移动列车识别号
+ moveTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.moveTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainMove.doShow(operate, this.selected);
+ }
+ });
+ },
+ // 交换列车识别号
+ switchTrainId() {
+ const operate = {
+ start: true,
+ code: this.selected.code,
+ type: MapDeviceType.Train.type,
+ label: MapDeviceType.Train.label,
+ operation: OperationEvent.Train.switchTrainId.menu.operation
+ };
+ this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ this.$refs.trainSwitch.doShow(operate, this.selected);
+ }
+ });
+ }
+ }
+};
+
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
index 64c594845..0e720a0c5 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
@@ -1,150 +1,162 @@
-
-
-
- 加在最前
-
-
- 车次号：
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
-
-
-
-
- 加在最后
-
-
- 车次号：
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
-
+
+
- 确 定
- 取 消
-
-
+
+
+ 交路：
+
+
+
+
+
+
+ 详情：
+
+
+
+
+
+
+
+ 显示默认停站时间和运行等级
+
+
+
+
+
+
+ 加在最前
+
+
+ 车次号：
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+
+
+ 加在最后
+
+
+ 车次号：
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
-
-
- 交路：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 显示默认停站时间和运行等级
-
-
-
-
-
-
- 进库
- 出库
-
-
-
-
+
+
+ 进库
+ 出库
+
+
+
+
+
-
-
-
-
- 车次号：
-
-
-
-
-
-
-
-
-
-
-
-
- 手工
-
-
-
-
-
-
- 缺省停站时间：
-
-
-
-
-
-
-
-
-
-
-
-
- 表号：
-
-
-
-
+
+
- 确 定
- 取 消
-
-
+
+
+
+
+
+
+ 交路：
+
+
+
+
+
+ {{ formatName(scope.row.beginStationCode) }}
+
+
+
+
+ {{ formatName(scope.row.endStationCode) }}
+
+
+
+
+
+ 详情：
+
+
+
+
+
+ {{ formatName(scope.row.stationCode) }}
+
+
+
+
+ {{ formatTime(scope.row.startTime) }}
+
+
+
+
+ {{ formatTime(scope.row.stopTime) }}
+
+
+
+
+ {{ formatTime(scope.row.endTime) }}
+
+
+
+
+
+
+ 显示默认停站时间和运行等级
+
+
+
+
+
+
+
+
+ 车次号：
+
+
+
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省停站时间：
+
+
+
+
+
+
+
+
+
+
+ 表号：
+
+
+
+
+
+
+
+
+
+
+ 清客
-
-
-
-
- 清客
-
-
- 延续计划
-
-
- 首班车
-
-
-
-
+ 延续计划
-
-
-
-
-
- 序列号：
-
-
-
-
-
-
-
-
+
+ 首班车
-
-
-
- 手工
-
-
-
-
-
-
- 缺省运行等级：
-
-
-
-
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 序列号：
+
+
+
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省运行等级：
+
+
+
+
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+
+
+
+
+ 入库
-
-
-
-
- 入库
-
-
- 出库
-
-
- 末班车
-
-
-
-
+ 出库
-
-
- 交路：
-
-
-
-
-
- {{ formatName(scope.row.beginStationCode) }}
-
-
-
-
-
-
- {{ formatName(scope.row.endStationCode) }}
-
-
-
-
-
-
-
-
-
-
-
- 详情：
-
-
-
-
-
- {{ formatName(scope.row.stationCode) }}
-
-
-
-
- {{ formatTime(scope.row.startTime) }}
-
-
-
-
- {{ formatTime(scope.row.stopTime) }}
-
-
-
-
- {{ formatTime(scope.row.endTime) }}
-
-
-
-
-
-
-
-
-
-
- 显示默认停站时间和运行等级
+
+ 末班车
-
-
-
- {{ $t('global.buy') }}
- {{ $t('global.distributePermission') }}
- {{ $t('global.transferQRCode') }}
+ {{ $t('global.buy') }}
+ {{ $t('global.distributePermission') }}
+ {{ $t('global.transferQRCode') }}
{{ $t('demonstration.startSimulation') }}
{{ $t('demonstration.createRoom') }}
{{ $t('demonstration.enterRoom') }}
@@ -49,22 +49,17 @@ import { launchFullscreen } from '@/utils/screen';
import { queryPermissionSimulation } from '@/api/management/author';
import { postCreateRoom, getjointTraining, checkRoomExist } from '@/api/chat';
import { UrlConfig } from '@/router/index';
-import { simulationNotify } from '@/api/simulation';
+import { simulationNotify, schedulingNotify } from '@/api/simulation';
import localStore from 'storejs';
import LimitList from '@/views/components/limits/index';
-import WindowResizeHandler from '@/mixin/WindowResizeHandler';
export default {
name: 'ExamDetailList',
components: {
LimitList
},
- mixins: [
- WindowResizeHandler
- ],
data() {
return {
- height: '',
tryTime: 0,
goodsId: '',
tryUser: 0,
@@ -94,7 +89,7 @@ export default {
},
hasPermssion() {
let isShow = false;
- if (this.courseModel.pmsList.length) {
+ if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
isShow = true;
}
return isShow;
@@ -110,6 +105,9 @@ export default {
},
mapId() {
return this.$route.params.mapId;
+ },
+ height() {
+ return this.$store.state.app.height - 50;
}
},
watch: {
@@ -151,9 +149,6 @@ export default {
this.$messageBox(this.$t('error.getProductListFailed'));
}
},
- resizeHandler: function () {
- this.height = this._clientHeight - 50;
- },
async getJointTrainingList() {
try {
if (this.mapId) {
@@ -190,15 +185,14 @@ export default {
pmsList: resp.data.pmsList || [],
PermissionType: PermissionType.SIMULATION
};
-
const rest = await queryPermissionSimulation({ mapId: this.courseModel.mapId, prdCode: this.courseModel.prdCode });
this.courseModel.pmsList = rest.data;
- if (!this.courseModel.pmsList.length) {
+ if (!this.courseModel.pmsList) {
this.tryUser = 1;
const paras = {
mapId: data.id,
- mapProductCode: data.code,
- productType: PermissionType.SIMULATION
+ prdCode: data.code,
+ permissionType: PermissionType.SIMULATION
};
try {
@@ -226,34 +220,39 @@ export default {
const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup };
this.$router.push({ path: `/trainroom`, query: query });
},
- async start() {
- if (this.courseModel.prdType == '03') {
- try {
- this.buttonLoading = true;
- const param = {
- mapId: Number(this.mapId),
- prdCode: this.courseModel.prdCode
- };
- const res = await postCreateRoom(param);
- if (res && res.code == 200) {
- const query = { skinCode: this.courseModel.skinCode, group: res.data };
- this.$router.push({ path: `/trainroom`, query: query });
- }
- } catch (error) {
- this.buttonLoading = false;
- if (error.code == 20001) {
- this.$confirm(this.$t('tip.createRoomFailedHint'), this.$t('global.tips'), {
- confirmButtonText: this.$t('global.confirm'),
- cancelButtonText: this.$t('global.cancel'),
- type: 'warning'
- }).then(() => {}).catch(() => {});
- }
- if (error.code == 500009) {
- this.$messageBox(error.message);
- }
+ async createRoom() {
+ try {
+ this.buttonLoading = true;
+ const param = {
+ mapId: Number(this.mapId),
+ prdCode: this.courseModel.prdCode
+ };
+ const res = await postCreateRoom(param);
+ if (res && res.code == 200) {
+ const query = { skinCode: this.courseModel.skinCode, group: res.data };
+ this.$router.push({ path: `/trainroom`, query: query });
}
+ } catch (error) {
+ this.buttonLoading = false;
+ if (error.code == 20001) {
+ this.$confirm(this.$t('tip.createRoomFailedHint'), this.$t('global.tips'), {
+ confirmButtonText: this.$t('global.confirm'),
+ cancelButtonText: this.$t('global.cancel'),
+ type: 'warning'
+ }).then(() => {}).catch(() => {});
+ }
+ if (error.code == 500009) {
+ this.$messageBox(error.message);
+ }
+ }
+ },
+ async start() {
+ if (this.courseModel.prdType == '05') {
+ this.jumpScheduling();
+ } else if (this.courseModel.prdType == '03') {
+ this.createRoom();
} else {
- if (this.courseModel.pmsList.length) {
+ if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
this.jump();
} else {
if (this.tryTime <= 1) {
@@ -270,6 +269,18 @@ export default {
}
}
},
+ jumpScheduling() {
+ this.buttonLoading = true;
+ const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
+ schedulingNotify(data).then(resp => {
+ const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdCode, goodsId: this.goodsId, try: this.tryUser };
+ this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
+ launchFullscreen();
+ }).catch(error => {
+ this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+ this.buttonLoading = false;
+ });
+ },
jump() {
const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
this.buttonLoading = true;
diff --git a/src/views/demonstration/home.vue b/src/views/demonstration/home.vue
index 2c8cd4793..0b346aee1 100644
--- a/src/views/demonstration/home.vue
+++ b/src/views/demonstration/home.vue
@@ -3,7 +3,7 @@
- {{$t('demonstration.simulationSystem')}}
+ {{ $t('demonstration.simulationSystem') }}
diff --git a/src/views/display/demon/runPlanView.vue b/src/views/display/demon/runPlanView.vue
index 86241e2ed..3ac98a114 100644
--- a/src/views/display/demon/runPlanView.vue
+++ b/src/views/display/demon/runPlanView.vue
@@ -16,11 +16,9 @@
import { mapGetters } from 'vuex';
import { runDiagramGetTime } from '@/api/simulation';
import { timeFormat } from '@/utils/date';
-import WindowResizeHandler from '@/mixin/WindowResizeHandler';
export default {
name: 'RunPlanView',
- mixins: [WindowResizeHandler],
props: {
group: {
type: String,
@@ -166,6 +164,9 @@ export default {
},
'$store.state.runPlan.planUpdateCount': function () {
this.updateRunPlanData(this.$store.state.runPlan.updateData);
+ },
+ '$store.state.app.windowSizeCount': function() {
+ this.reSize({ width: this.$store.state.app.width, height: this.$store.state.app.height - 55 });
}
},
mounted() {
@@ -186,9 +187,6 @@ export default {
doClose() {
this.dialogShow = false;
},
- resizeHandler() {
- this.reSize({ width: this._clientWidth, height: this._clientHeight - 55 });
- },
loadChartPage() {
const stations = this.$store.state.runPlan.stations;
const planData = this.$store.state.runPlan.planData;
diff --git a/src/views/display/demon/scheduling.vue b/src/views/display/demon/scheduling.vue
new file mode 100644
index 000000000..abebcbc44
--- /dev/null
+++ b/src/views/display/demon/scheduling.vue
@@ -0,0 +1,328 @@
+
+
-
-
-
-
-
-
-
-
- {{`（可加载的最大车辆个数：${maxNumber}）`}}
-
-
-
-
+
+
+
+
+
+
+
+
+
\ 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 bb02ae19a..4d1a99754 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -18,7 +18,7 @@
@tryTime="tryTime"
@hidepanel="hidepanel"
@quitQuest="quitQuest"
- @showIbp="showIbp"
+ @showScheduling="showScheduling"
/>
@@ -69,8 +69,8 @@ import MenuSchema from '@/views/display/menuSchema';
import MenuSystemTime from '@/views/display/menuSystemTime';
import MenuPlan from '@/views/display/menuPlan';
import MenuScript from '@/views/display/menuScript';
-import WindowResizeHandler from '@/mixin/WindowResizeHandler';
import AddQuest from './demon/addQuest';
+import Scheduling from './demon/scheduling';
import { mapGetters } from 'vuex';
import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training';
import { setGoodsTryUse } from '@/api/management/goods';
@@ -78,16 +78,13 @@ import { getProductDetail } from '@/api/management/mapprd';
import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation';
import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
import { checkLoginLine } from '@/api/login';
-// import { isFullscreen } from '@/utils/screen';
import { loadMapData, loadMapDataById } from '@/utils/loaddata';
-// import { handleToken } from '@/utils/auth';
import { EventBus } from '@/scripts/event-bus';
import Vue from 'vue';
// 三维
import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
-import IbpPlate from '@/views/ibp/index'
export default {
name: 'DisplayDraft',
@@ -108,9 +105,8 @@ export default {
MenuSystemTime,
Jl3dSimulation,
Jl3dDrive,
- IbpPlate
+ Scheduling
},
- mixins: [WindowResizeHandler],
props: {
size: {
type: Object,
@@ -126,7 +122,6 @@ export default {
timeDemonNum: 0,
checkLine: null,
offset: 15,
- right: 0,
mouseNum: 1,
ierval: null,
mouseNumTime: 0,
@@ -135,14 +130,14 @@ export default {
panelShow: true,
simulationShow: false,
drivingShow: false,
- questId: 0, // 加载任务的Id
+ questId: 0, // 加载任务的Id
group: '',
prdTypeMap: {
- '01': '01', // 现地 => 现地
- '02': '02', // 行调 => 行调
- '04': '02' // 司机加实 => 行调
- },
- ibpShow: false
+ '01': '01', // 现地 => 现地
+ '02': '02', // 行调 => 行调
+ '04': '02', // 司机 => 行调
+ '05': '' // 派班 => null
+ }
};
},
computed: {
@@ -160,6 +155,15 @@ export default {
...mapGetters('config', [
'canvasId'
]),
+ width() {
+ return this.$store.state.app.width;
+ },
+ height() {
+ return this.$store.state.app.height;
+ },
+ right() {
+ return this.$store.state.config.width / 2 - 55;
+ },
trainingId() {
return this.$route.query.trainingId;
},
@@ -195,6 +199,9 @@ export default {
},
isDrive() {
return this.prdType == '04';
+ },
+ isShowScheduling() {
+ return this.$route.query.prdType == '05';
}
},
watch: {
@@ -221,6 +228,9 @@ export default {
}
});
},
+ '$store.state.app.windowSizeCount': function() {
+ this.setWindowSize();
+ },
$route() {
this.$nextTick(() => {
this.initLoadData();
@@ -228,14 +238,15 @@ export default {
}
},
async created() {
+ this.mode = this.$route.params.mode;
this.group = this.$route.query.group || '';
},
async mounted() {
- this.mode = this.$route.params.mode;
EventBus.$on('clearCheckLogin', () => {
this.clearCheckLogin();
});
+ await this.setWindowSize();
await this.initLoadData();
},
async beforeDestroy() {
@@ -248,17 +259,6 @@ export default {
EventBus.$off('clearCheckLogin');
},
methods: {
- resizeHandler() {
- const width = this.size ? this.size.width : this._clientWidth;
- const height = this.size ? this.size.height : this._clientHeight;
-
- this.right = width /2 - 55;
- this.$store.dispatch('config/resize', { width, height });
-
- this.$nextTick(() => {
- this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
- });
- },
// 清除检查在线定时器
clearAllTimer() {
if (this.ierval) {
@@ -558,11 +558,9 @@ export default {
this.$refs.Jl3dSimulation.show(this.skinCode);
}
},
- showIbp() {
- this.panelShow = false;
- this.ibpShow = true;
- this.$refs.ibpPlate.show();
- },
+ showScheduling() {
+ this.$refs.scheduling.doShow();
+ },
showpanel() {
this.panelShow = true;
this.simulationShow = false;
@@ -571,10 +569,6 @@ export default {
this.panelShow = true;
this.drivingShow = false;
},
- hideIbp() {
- this.panelShow = true;
- this.ibpShow = false;
- },
runPlanViewShow() {
this.$refs.runPlanView.doShow();
},
@@ -583,6 +577,16 @@ export default {
},
faultChooseShow() {
this.$refs.faultChoose.doShow();
+ },
+ setWindowSize() {
+ this.$nextTick(() => {
+ const width = this.size ? this.size.width : this.width;
+ const height = this.size ? this.size.height : this.height;
+
+ this.$store.dispatch('config/resize', { width, height });
+
+ this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
+ });
}
}
};
diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue
index 5c1e3d1d6..456031baf 100644
--- a/src/views/display/menuDemon.vue
+++ b/src/views/display/menuDemon.vue
@@ -7,9 +7,9 @@
- {{$t('demonstration.simulationSystem')}}
+ {{ $t('demonstration.simulationSystem') }}
![]()
@@ -13,14 +13,13 @@
- {{$t('demonstration.simulationSystemDescription')}}
+ {{ $t('demonstration.simulationSystemDescription') }}
+
+
+
+
+
+
+
diff --git a/src/views/display/demon/setTime.vue b/src/views/display/demon/setTime.vue
index 334a938ac..08753052f 100644
--- a/src/views/display/demon/setTime.vue
+++ b/src/views/display/demon/setTime.vue
@@ -1,113 +1,117 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检查
+ 保存
+
+
+
+
+
+
+
+ {{ formModel.mode }}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 立即创建
- 取消
-
-
-
-
-
-
-
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpCLamp.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpCLamp.vue
deleted file mode 100644
index 81032a2c0..000000000
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpCLamp.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 立即创建
- 取消
-
-
-
-
-
-
-
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpClock.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpClock.vue
new file mode 100644
index 000000000..34d8d2d24
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpClock.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
new file mode 100644
index 000000000..09b4bf591
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpElevator.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
new file mode 100644
index 000000000..6046d19ab
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpKey.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
new file mode 100644
index 000000000..ec2bc94eb
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLamp.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
new file mode 100644
index 000000000..9a830eedf
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpLine.vue
@@ -0,0 +1,157 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotateTip.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotateTip.vue
new file mode 100644
index 000000000..40db13743
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotateTip.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
index d0d5643e4..40dbdca3d 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpRotatingButton.vue
@@ -1,15 +1,24 @@
-
-
+
+
+
+ 生成编号
+
+
+
-
-
+
+
+
- 立即创建
- 取消
+ {{ buttonText }}
+ 删除
+ 取消
@@ -22,16 +31,21 @@
},
data() {
return {
+ isUpdate: false,
+ buttonText: '立即创建',
+ showDeleteButton: false,
form: {
+ code: '',
rotatingButtonWidth: '',
- rotatingButtonHeight: ''
+ x: 10,
+ y: 10
},
rules: {
- rotatingButtonWidth: [
- { required: true, message: '请输入旋转按钮宽度', trigger: 'blur' },
+ code: [
+ { required: true, message: '请输入钥匙孔编号', trigger: 'blur' },
],
- rotatingButtonHeight: [
- { required: true, message: '请输入旋转按钮高度', trigger: 'blur' },
+ rotatingButtonWidth: [
+ { required: true, message: '请输入钥匙孔宽度', trigger: 'blur' },
]
}
};
@@ -40,22 +54,71 @@
},
watch: {
-
+ '$store.state.ibp.rightClickCount': function (val) {
+ const model = this.$store.getters['ibp/updateDeviceData'];
+ if (model._type === 'RotatingButton' ){
+ this.buttonText = '修改';
+ this.showDeleteButton = true;
+ this.isUpdate = true;
+ this.form.code = model.code;
+ this.form.rotatingButtonWidth = model.width;
+ this.form.x = model.point.x;
+ this.form.y = model.point.y;
+ }
+ }
},
mounted() {
},
methods: {
- onSubmit() {
+ onSubmit(form) {
+ this.$refs[form].validate((valid) => {
+ if (valid) {
+ const rotatingButtonModel = {
+ point: {
+ x: this.form.x,
+ y: this.form.y
+ },
+ draggable: true,
+ _type: 'RotatingButton',
+ code: this.form.code,
+ width: this.form .rotatingButtonWidth,
+ };
+ this.$emit('createRotatingButton', rotatingButtonModel);
+ this.initPage();
+ } else {
+ return false;
+ }
+ });
+
+ },
+ deleteDevice() {
const rotatingButtonModel = {
- zlevel: 1,
- z: 1,
- x: 10,
- y: 10,
+ point: {
+ x: this.form.x,
+ y: this.form.y
+ },
+ draggable: true,
_type: 'RotatingButton',
+ code: this.form.code,
width: this.form .rotatingButtonWidth,
- height: this.form.rotatingButtonHeight
};
- this.$emit('createAppendageBox', rotatingButtonModel)
+ this.$emit('deleteDataModel',rotatingButtonModel );
+ this.initPage();
+ },
+ initPage() {
+ this.isUpdate = false;
+ this.buttonText = '立即创建';
+ this.showDeleteButton = false;
+ this.form = {
+ code: '',
+ rotatingButtonWidth: '',
+ x: 10,
+ y: 10
+ };
+ },
+ generateCode() {
+ const mydate = new Date();
+ this.form.code = "rButton_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
}
}
};
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTelephoneTerminal.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTelephoneTerminal.vue
new file mode 100644
index 000000000..fcf723240
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTelephoneTerminal.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
index c40b605a3..081902013 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpText.vue
@@ -1,24 +1,33 @@
-
-
-
+
+
+ 生成编号
+
-
+
-
+
-
+
-
-
+
+
+
+
+
- 立即创建
- 取消
+ {{ buttonText }}
+ 删除
+ 取消
@@ -31,12 +40,17 @@
},
data() {
return {
+ isUpdate: false,
+ buttonText: '立即创建',
+ showDeleteButton: false,
form: {
code: '',
context: '',
textFill: '',
fontSize: '',
- fontWeight: false
+ fontWeight: '',
+ x: 10,
+ y: 10
},
rules: {
code: [
@@ -51,6 +65,9 @@
fontSize: [
{ required: true, message: '请输入文字大小', trigger: 'blur' },
],
+ fontWeight: [
+ { required: true, message: '请输入文字粗细', trigger: 'blur' },
+ ],
}
};
},
@@ -58,26 +75,99 @@
},
watch: {
-
+ '$store.state.ibp.rightClickCount': function (val) {
+ const model = this.$store.getters['ibp/updateDeviceData'];
+ if (model._type === 'IbpText' ){
+ this.buttonText = '修改';
+ this.showDeleteButton = true;
+ this.isUpdate = true;
+ this.form.code = model.code;
+ this.form.context = model.context;
+ this.form.textFill = model.textFill;
+ this.form.fontSize = model.fontSize;
+ this.form.fontWeight = model.fontWeight;
+ this.form.x = model.point.x;
+ this.form.y = model.point.y;
+ }
+ }
},
mounted() {
},
methods: {
- onSubmit() {
+ onSubmit(form) {
+ this.$refs[form].validate((valid) => {
+ if (valid) {
+ const textModel = {
+ point: {
+ x: this.form.x,
+ y: this.form.y
+ },
+ code: this.form.code,
+ _type: 'IbpText',
+ context: this.form.context,
+ textFill: this.form.textFill,
+ fontSize: this.form.fontSize ,
+ fontWeight: this.form.fontWeight,
+ fontFamily: 'consolas'
+ };
+ this.$emit('createText', textModel);
+ this.initPage();
+ } else {
+ return false;
+ }
+ });
const textModel = {
- zlevel: 1,
- z: 1,
- x: 10,
- y: 10,
+ point: {
+ x: this.form.x,
+ y: this.form.y
+ },
code: this.form.code,
_type: 'IbpText',
- context: this.form .context,
+ context: this.form.context,
textFill: this.form.textFill,
fontSize: this.form.fontSize ,
fontWeight: this.form.fontWeight,
fontFamily: 'consolas'
};
- this.$emit('createText', textModel)
+ this.$emit('createText', textModel);
+ this.initPage();
+ },
+ deleteDevice() {
+ const textModel = {
+ zlevel: 2,
+ z: 1,
+ point: {
+ x: this.form.x,
+ y: this.form.y
+ },
+ code: this.form.code,
+ _type: 'IbpText',
+ context: this.form.context,
+ textFill: this.form.textFill,
+ fontSize: this.form.fontSize ,
+ fontWeight: this.form.fontWeight,
+ fontFamily: 'consolas'
+ };
+ this.$emit('deleteDataModel',textModel);
+ this.initPage();
+ },
+ initPage() {
+ this.isUpdate = false;
+ this.buttonText = '立即创建';
+ this.showDeleteButton = false;
+ this.form = {
+ code: '',
+ context: '',
+ textFill: '',
+ fontSize: '',
+ fontWeight: '',
+ x: 10,
+ y: 10
+ };
+ },
+ generateCode() {
+ const mydate = new Date();
+ this.form.code = "text_"+mydate.getDay()+ mydate.getHours()+ mydate.getMinutes()+mydate.getSeconds()+mydate.getMilliseconds()+ Math.round(Math.random() * 10000);
}
}
};
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTip.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTip.vue
deleted file mode 100644
index 4a08b39d0..000000000
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTip.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 立即创建
- 取消
-
-
-
-
-
-
-
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
new file mode 100644
index 000000000..3b5472729
--- /dev/null
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/ibpTipBox.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+ 生成编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ 删除
+ 取消
+
+
+
+
+
+
+
diff --git a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
index 9a2e70cd1..69626a2ac 100644
--- a/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
+++ b/src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
@@ -13,43 +13,94 @@
@click="handleSave"
>保存
-
-
-
-
-
diff --git a/src/views/mapsystem/common/index.vue b/src/views/mapsystem/common/index.vue
index 928c90a46..a57fcb724 100644
--- a/src/views/mapsystem/common/index.vue
+++ b/src/views/mapsystem/common/index.vue
@@ -109,7 +109,7 @@ export default {
this.point = { x: em.clientX, y: em.clientY };
if (em.subType === 'TrainWindow') {
- device = { _type: deviceType.Train, _code: em.deviceCode };
+ device = { _type: deviceType.Train, code: em.deviceCode };
this.$store.dispatch('map/setTrainWindowShow', true);
} else if (em.deviceCode && !this.isScreen) {
device = this.getDeviceByEm(em);
diff --git a/src/views/orderauthor/author/create.vue b/src/views/orderauthor/author/create.vue
new file mode 100644
index 000000000..504bc9b2d
--- /dev/null
+++ b/src/views/orderauthor/author/create.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
diff --git a/src/views/orderauthor/author/draft.vue b/src/views/orderauthor/author/draft.vue
deleted file mode 100644
index ad45eb187..000000000
--- a/src/views/orderauthor/author/draft.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
+
+
+
+
diff --git a/src/views/orderauthor/author/draft/edit.vue b/src/views/orderauthor/author/draft/edit.vue
new file mode 100644
index 000000000..91065a223
--- /dev/null
+++ b/src/views/orderauthor/author/draft/edit.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
diff --git a/src/views/orderauthor/author/draft/ruleForm.vue b/src/views/orderauthor/author/draft/ruleForm.vue
new file mode 100644
index 000000000..96e599c11
--- /dev/null
+++ b/src/views/orderauthor/author/draft/ruleForm.vue
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+
diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue
index 625ae7341..4928cf3d0 100644
--- a/src/views/orderauthor/author/index.vue
+++ b/src/views/orderauthor/author/index.vue
@@ -1,41 +1,46 @@
+
+
+
+
+
+
diff --git a/src/views/orderauthor/permission/draft/choosePermission.vue b/src/views/orderauthor/permission/draft/choosePermission.vue
index 2604d1793..c6756fae3 100644
--- a/src/views/orderauthor/permission/draft/choosePermission.vue
+++ b/src/views/orderauthor/permission/draft/choosePermission.vue
@@ -73,6 +73,10 @@ export default {
title: this.$t('orderAuthor.organizationOrEnterprise'),
prop: 'organizationName'
},
+ {
+ title: '权限名称',
+ prop: 'permissionName'
+ },
{
title: this.$t('orderAuthor.userName'),
prop: 'userName'
@@ -81,25 +85,25 @@ export default {
title: this.$t('orderAuthor.userMobile'),
prop: 'userMobile'
},
- {
- title: this.$t('orderAuthor.mapName'),
- prop: 'mapName'
- },
- {
- title: this.$t('orderAuthor.mapProductName'),
- prop: 'mapProductName'
- },
- {
- title: this.$t('orderAuthor.courseName'),
- prop: 'lessonName'
- },
- {
- title: this.$t('orderAuthor.permissionType'),
- prop: 'permissionType',
- type: 'tag',
- columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
- tagType: (row) => { return ''; }
- },
+ // {
+ // title: this.$t('orderAuthor.mapName'),
+ // prop: 'mapName'
+ // },
+ // {
+ // title: this.$t('orderAuthor.mapProductName'),
+ // prop: 'mapProductName'
+ // },
+ // {
+ // title: this.$t('orderAuthor.courseName'),
+ // prop: 'lessonName'
+ // },
+ // {
+ // title: this.$t('orderAuthor.permissionType'),
+ // prop: 'permissionType',
+ // type: 'tag',
+ // columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
+ // tagType: (row) => { return ''; }
+ // },
{
title: this.$t('orderAuthor.publicOrPrivate'),
prop: 'canDistribute',
@@ -154,13 +158,13 @@ export default {
name: this.$t('global.add'),
handleClick: this.handlePut,
type: '',
- showControl: (row) => { return !row.isPut && row.permissionType; }
+ showControl: (row) => { return !row.isPut; }
},
{
name: this.$t('global.delete'),
handleClick: this.handlePop,
type: 'warning',
- showControl: (row) => { return row.isPut && row.permissionType; }
+ showControl: (row) => { return row.isPut; }
}
]
}
@@ -211,10 +215,14 @@ export default {
this.show = false;
},
handlePut(index, row) {
+ row.isPut = true;
this.$emit('addRuleForm', index, row);
+ this.$refs.queryListPage.refresh();
},
handlePop(index, row) {
+ row.isPut = false;
this.$emit('deleteForm', index, row);
+ this.$refs.queryListPage.refresh();
}
}
};
diff --git a/src/views/orderauthor/permission/draft/ruleForm.vue b/src/views/orderauthor/permission/draft/ruleForm.vue
index b0f4c6bb4..c51dd806b 100644
--- a/src/views/orderauthor/permission/draft/ruleForm.vue
+++ b/src/views/orderauthor/permission/draft/ruleForm.vue
@@ -16,16 +16,16 @@
style="width: 100%"
:height="height-300"
>
-
{{ $t('global.delete') }}
@@ -37,7 +37,7 @@
{{ $t('orderAuthor.packaging') }}
- {{ $t('orderAuthor.obtainQrCode') }}
+ {{ $t('orderAuthor.obtainQrCode') }}
{{ $t('global.back') }}
@@ -56,9 +56,7 @@
+
diff --git a/src/views/orderauthor/rules/index.vue b/src/views/orderauthor/rules/index.vue
new file mode 100644
index 000000000..13a0e91cf
--- /dev/null
+++ b/src/views/orderauthor/rules/index.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+
diff --git a/src/views/package/detail.vue b/src/views/package/detail.vue
new file mode 100644
index 000000000..f18c26b67
--- /dev/null
+++ b/src/views/package/detail.vue
@@ -0,0 +1,94 @@
+
+
-
+
+
+
\ No newline at end of file
+
diff --git a/src/views/screenMonitor/list/demonList.vue b/src/views/screenMonitor/list/demonList.vue
index 3fa674aae..1ecad8ff7 100644
--- a/src/views/screenMonitor/list/demonList.vue
+++ b/src/views/screenMonitor/list/demonList.vue
@@ -1,124 +1,139 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index ceac09430..1050d4959 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -174,6 +174,8 @@
},
methods:{
initData(){
+ this.buttonName="添加对话";
+ this.operateType="add";
getScriptPlayMember(this.group).then(resp => {
let roleTypeList=ConstConfig.ConstSelect.roleType;
this.orginMemberList=resp.data;
@@ -224,6 +226,7 @@
this.adding=false;
this.$message.success('添加指令成功');
this.$emit('create');
+ // this.$emit('create',[this.commandData.action.memberId]);
// this.$parent.$parent.$refs['addRole'].resetData([this.commandData.action.memberId]);
// this.initCommandActionData();
}).catch(error => {
@@ -251,6 +254,7 @@
this.modifying=false;
this.$message.success('添加对话成功');
this.$emit('create');
+ // [this.modalData.actionVO.memberId]
// this.initActionData();
// this.$parent.$parent.$refs['addRole'].resetData([this.modalData.actionVO.memberId,this.modalData.actionVO.targetId]);
}).catch(error => {
diff --git a/src/views/scriptManage/scriptRecord/addRole.vue b/src/views/scriptManage/scriptRecord/addRole.vue
index 4348ed133..802ad109b 100644
--- a/src/views/scriptManage/scriptRecord/addRole.vue
+++ b/src/views/scriptManage/scriptRecord/addRole.vue
@@ -49,6 +49,9 @@
this.allRoleData=this.coverData(lastData);
getScriptPlayMember(group).then(response=>{
let last=response.data;
+ // let userdata=JSON.stringify(response.data)
+ // let reg=new RegExp('\"id\":\"(.*?)\\\"','g');
+ // let datalist=userdata.match(reg);
let data=[];
last.forEach(function(element){data.push(element.id)});
this.selectRoleData=data;
@@ -95,18 +98,20 @@
}
}
},
- resetData(data){
- // let allRoleData=this.allRoleData;
- // debugger;
- // data.forEach(function(element){
- // allRoleData.forEach(function(select){
- // if(select.key==element)
- // {
- // select.disabled=true;
- // }
- // });
- // });
- },
+ // resetData(data){
+ // debugger;
+ // let allRoleData=this.allRoleData;
+ // // debugger;
+ // data.forEach(function(element){
+ // allRoleData.forEach(function(select){
+ // if(select.key==element)
+ // {
+ // debugger;
+ // select.disabled="disabled";
+ // }
+ // });
+ // });
+ // },
changeSex(event,id)
{
let group=this.$props.group;
diff --git a/src/views/scriptManage/scriptRecord/getAction.vue b/src/views/scriptManage/scriptRecord/getAction.vue
index da79a2ee7..98cf19448 100644
--- a/src/views/scriptManage/scriptRecord/getAction.vue
+++ b/src/views/scriptManage/scriptRecord/getAction.vue
@@ -81,6 +81,7 @@
this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet);
this.actionInfoList=[];
let roleTypeList=ConstConfig.ConstSelect.roleType;
+
let memberVOList=JSON.stringify(response.data.memberVOList);
roleTypeList.forEach(function(element){
let rolename=element.value;
@@ -88,15 +89,20 @@
});
memberVOList=JSON.parse(memberVOList);
let actionList=response.data.actionVOList;
+
+
+
actionList.forEach(element => {
+
let member=memberVOList.find(elem=>{return elem.id==element.memberId});
- let memberName=member.name==undefined?"":" - "+member.name;
+
+ let memberName=member.name?" - "+member.name:"";
switch(element.type)
{
case "Conversation":
{
let target=memberVOList.find(elem=>{return elem.id==element.targetId});
- let targetName=target.name==undefined?"":" - "+target.name;
+ let targetName=target.name?" - "+target.name:"";
this.actionInfoList.push({id:element.id,isCoversition:true,memberName:member.role+memberName,targetName:target.role+targetName,reply:element.reply,row:element,visible:true});
break;
}
@@ -143,9 +149,6 @@
reloadTable(){
this.loadInitData();
},
- // create(data){
- // this.reloadTable();
- // },
modifyAction(row){
this.$emit("setAction",row);
}
diff --git a/src/views/teach/category/tree.vue b/src/views/teach/category/tree.vue
index ce3e8379e..d13465253 100644
--- a/src/views/teach/category/tree.vue
+++ b/src/views/teach/category/tree.vue
@@ -143,7 +143,7 @@ export default {
buy(data) {
this.$router.push({
path: `${UrlConfig.teach.pay}/${data.lessonId}`, query:
- { permissionType: PermissionType.LESSON, prdCode: data.prdCode, mapId: data.mapId }
+ { permissionType: PermissionType.LESSON, lessonId: data.lessonId, prdCode: data.prdCode, mapId: data.mapId }
});
},
clickEvent(obj, node, data) {
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index b268b8999..9776c4cb1 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -42,8 +42,8 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/orderauthor/author/draft/choosePermission.vue b/src/views/orderauthor/author/draft/choosePermission.vue
new file mode 100644
index 000000000..a350e4b1c
--- /dev/null
+++ b/src/views/orderauthor/author/draft/choosePermission.vue
@@ -0,0 +1,193 @@
+
+
-
- {{ $t('global.create') }}
- {{ $t('global.back') }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加权限
+
+
+
+
+ {{ computedName(PermissionTypeList, scope.row.type) }}
+
+
+
+
+ {{ $t('global.delete') }}
+
+
+
+
+
+
+
+
+
+ {{ $t('orderAuthor.packaging') }}
+ {{ $t('global.back') }}
+
+
+
+
-
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index d6be9ea6b..b0b1a1851 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -33,7 +33,6 @@ import { createOrder, updateOrder, getOrderCharge } from '@/api/management/order
import { addOrganization, getOrganizationList } from '@/api/management/organization';
import { getGoodsList } from '@/api/management/goods';
import { getSellerList } from '@/api/management/user';
-import WindowResizeHandler from '@/mixin/WindowResizeHandler';
import addGoods from './addGoods';
export default {
@@ -41,13 +40,9 @@ export default {
components: {
addGoods
},
- mixins: [
- WindowResizeHandler
- ],
data() {
return {
type: '',
- height: '',
display: 1,
loading: false,
foreverInitData: false,
@@ -103,9 +98,6 @@ export default {
};
},
computed: {
- // turnbackBarTitle() {
- // return '';
- // },
isAdd() {
return this.type === 'ADD';
},
@@ -269,21 +261,22 @@ export default {
});
return baseRules;
+ },
+ height() {
+ return this.$store.state.app.height - 170;
}
},
mounted() {
this.initLoadPage();
},
methods: {
- resizeHandler: function () {
- this.height = this._clientHeight - 170;
- },
buttonClick() {
this.$refs.addGoods.doShow();
},
selectGoods(data) {
this.formModel.goodsId = data.id;
this.formModel.goodsName = data.name;
+ this.formModel.price = data.price;
},
initLoadPage() {
// 加载字典数据
@@ -418,13 +411,6 @@ export default {
this.$message.info(this.$t('error.cancelled'));
});
},
- selectCommodity(data) {
- this.goodsList.forEach(v => {
- if (v.value == data) {
- this.formModel.price = v.price;
- }
- });
- },
buildModel() {
// 如果新增的条目不存在字典当中,则需要在临时字典中取对应的值
let orgzId = this.formModel.organizationId;
diff --git a/src/views/orderauthor/order/list.vue b/src/views/orderauthor/order/list.vue
index 2ca09548b..af8d5fc07 100644
--- a/src/views/orderauthor/order/list.vue
+++ b/src/views/orderauthor/order/list.vue
@@ -3,6 +3,7 @@
@@ -10,17 +11,19 @@
import { getOrderPageList } from '@/api/management/order';
import { getSellerList } from '@/api/management/user';
import { getOrganizationList } from '@/api/management/organization';
-import { giveLessons } from '@/api/management/distribute';
-import { OperatorModel } from '@/scripts/ConstDic';
+import { postDistribute } from '@/api/management/distribute';
+// import { OperatorModel } from '@/scripts/ConstDic';
import { UrlConfig } from '@/router/index';
import QrCode from '@/components/QrCode';
import CanDistribute from './canDistribute';
+import detail from './detail';
export default {
name: 'List',
components: {
QrCode,
- CanDistribute
+ CanDistribute,
+ detail
},
data() {
return {
@@ -29,10 +32,9 @@ export default {
OrderTypeList: [],
PayTypeList: [],
PayStatusList: [],
- // OrganizationList: [],
WhetherTypeList: [],
EffectiveTypeList: [],
- PermissionTypeList: [],
+ // PermissionTypeList: [],
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
@@ -51,13 +53,6 @@ export default {
'userName': {
type: 'text',
label: this.$t('orderAuthor.userName')
- },
- 'permissionType': {
- type: 'select',
- label: this.$t('orderAuthor.permissionType'),
- config: {
- data: []
- }
}
}
},
@@ -77,17 +72,21 @@ export default {
title: this.$t('orderAuthor.userName'),
prop: 'userName'
},
+ {
+ title: '用户手机号',
+ prop: 'userMobile'
+ },
{
title: this.$t('orderAuthor.commodityName'),
prop: 'goodsName'
},
- {
- title: this.$t('orderAuthor.permissionType'),
- prop: 'permissionType',
- type: 'tag',
- columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
- tagType: (row) => { return ''; }
- },
+ // {
+ // title: this.$t('orderAuthor.permissionType'),
+ // prop: 'permissionType',
+ // type: 'tag',
+ // columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
+ // tagType: (row) => { return ''; }
+ // },
{
title: this.$t('orderAuthor.permissionNumber'),
prop: 'amount'
@@ -98,7 +97,7 @@ export default {
type: 'tag',
columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
tagType: (row) => {
- return row.forever ? 'success' : 'danger';
+ return row.forever ? 'success' : 'warning';
}
},
{
@@ -111,39 +110,41 @@ export default {
title: this.$t('orderAuthor.purchaseMonths'),
prop: 'monthAmount'
},
- {
- title: this.$t('orderAuthor.totalPrice'),
- prop: 'totalPrice'
- },
- {
- title: this.$t('orderAuthor.paymentMethod'),
- prop: 'payWays',
- type: 'tag',
- columnValue: (row) => { return this.$convertField(row.payWays, this.PayTypeList, ['value', 'label']); },
- tagType: (row) => { return 'success'; }
- },
+ // {
+ // title: this.$t('orderAuthor.totalPrice'),
+ // prop: 'totalPrice'
+ // },
+ // {
+ // title: this.$t('orderAuthor.paymentMethod'),
+ // prop: 'payWays',
+ // width: '130',
+ // type: 'tag',
+ // columnValue: (row) => { return this.$convertField(row.payWays, this.PayTypeList, ['value', 'label']); },
+ // tagType: (row) => { return 'success'; }
+ // },
{
title: this.$t('orderAuthor.creationDate'),
- prop: 'createTime'
- },
- {
- title: this.$t('orderAuthor.orderType'),
- prop: 'orderType',
- type: 'tag',
- columnValue: (row) => { return this.$convertField(row.orderType, this.OrderTypeList, ['value', 'label']); },
- tagType: (row) => { return 'success'; }
- },
- {
- title: this.$t('orderAuthor.contractNumber'),
- prop: 'contractNo'
- },
- {
- title: this.$t('orderAuthor.businessType'),
- prop: 'bizType',
- type: 'tag',
- columnValue: (row) => { return this.$convertField(row.bizType, this.BizTypeList, ['value', 'label']); },
- tagType: (row) => { return 'success'; }
+ prop: 'createTime',
+ width: '160'
},
+ // {
+ // title: this.$t('orderAuthor.orderType'),
+ // prop: 'orderType',
+ // type: 'tag',
+ // columnValue: (row) => { return this.$convertField(row.orderType, this.OrderTypeList, ['value', 'label']); },
+ // tagType: (row) => { return 'success'; }
+ // },
+ // {
+ // title: this.$t('orderAuthor.contractNumber'),
+ // prop: 'contractNo'
+ // },
+ // {
+ // title: this.$t('orderAuthor.businessType'),
+ // prop: 'bizType',
+ // type: 'tag',
+ // columnValue: (row) => { return this.$convertField(row.bizType, this.BizTypeList, ['value', 'label']); },
+ // tagType: (row) => { return 'success'; }
+ // },
{
title: this.$t('orderAuthor.paymentStatus'),
prop: 'payStatus',
@@ -157,21 +158,21 @@ export default {
}
}
},
- {
- title: this.$t('orderAuthor.salesman'),
- prop: 'sellerName',
- type: 'tag',
- columnValue: (row) => { return row.sellerName; },
- tagType: (row) => { return 'success'; }
- },
+ // {
+ // title: this.$t('orderAuthor.salesman'),
+ // prop: 'sellerName',
+ // type: 'tag',
+ // columnValue: (row) => { return row.sellerName; },
+ // tagType: (row) => { return 'success'; }
+ // },
{
type: 'button',
title: this.$t('global.operate'),
width: '260',
buttons: [
{
- name: this.$t('global.edit'),
- handleClick: this.handleEdit
+ name: '详情',
+ handleClick: this.handleDetail
},
{
name: this.$t('orderAuthor.obtainQrCode'),
@@ -201,7 +202,6 @@ export default {
loadInitData() {
this.queryForm.queryObject.organizationId.config.data.length = 0;
getOrganizationList().then(response => {
- // this.OrganizationList = response.data;
response.data.forEach(elem => {
this.queryForm.queryObject.organizationId.config.data.push({ value: elem.id, label: elem.name });
});
@@ -241,14 +241,14 @@ export default {
});
});
- this.$Dictionary.permissionType().then(list => {
- list.forEach(elem => {
- this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
- });
- this.$convertList(list, this.PermissionTypeList, elem => {
- return true;
- });
- });
+ // this.$Dictionary.permissionType().then(list => {
+ // list.forEach(elem => {
+ // this.queryForm.queryObject.permissionType.config.data.push({ value: elem.code, label: elem.name });
+ // });
+ // this.$convertList(list, this.PermissionTypeList, elem => {
+ // return true;
+ // });
+ // });
},
queryFunction(params) {
return getOrderPageList(params);
@@ -256,12 +256,12 @@ export default {
handleNormalAdd() {
this.$router.push({ path: `${UrlConfig.orderauthor.orderDraft}/add/0` });
},
- handleEdit(index, data) {
- this.$alert('功能待开发', this.$t('tip.hint'), {
- confirmButtonText: this.$t('tip.confirm'),
- callback: action => {
- }
- });
+ handleDetail(index, data) {
+ data.payWays = this.$convertField(data.payWays, this.PayTypeList, ['value', 'label']);
+ data.orderType = this.$convertField(data.orderType, this.OrderTypeList, ['value', 'label']);
+ data.bizType = this.$convertField(data.bizType, this.BizTypeList, ['value', 'label']);
+ data.payStatusZh = this.$convertField(data.payStatus, this.PayStatusList, ['value', 'label']);
+ this.$refs.detail.doShow(data);
},
handleCanDistribute(index, data) {
if (data.qrCodeGenerated) {
@@ -273,21 +273,11 @@ export default {
},
distribute(data) {
const model = {
- amount: data.amount,
- forever: data.forever,
- orderCode: data.code,
- startTime: data.startTime + ' 00:00:00',
- monthAmount: data.monthAmount,
- canDistribute: data.canDistribute,
- operator: OperatorModel.TRANSFER,
- mapId: data.mapId,
- lessonId: data.lessonId || '',
- mapProductCode: data.mapProductCode || '',
- permissionType: data.permissionType,
- organizationId: data.organizationId
+ code: data.code,
+ canDistribute: data.canDistribute ? data.canDistribute : false
};
- giveLessons(model).then(response => {
+ postDistribute(model).then(response => {
this.reloadTable();
if (data.qrCodeGenerated) {
this.$refs.qrCode.doShow({
diff --git a/src/views/orderauthor/permission/Qcode.vue b/src/views/orderauthor/permission/Qcode.vue
new file mode 100644
index 000000000..59ef645d9
--- /dev/null
+++ b/src/views/orderauthor/permission/Qcode.vue
@@ -0,0 +1,89 @@
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
- {{ $t('global.create') }}
- {{ $t('global.update') }}
- {{ $t('global.back') }}
-
-
+
+
+
+ {{ $t('global.create') }}
+ {{ $t('global.update') }}
+ {{ $t('global.back') }}
+
+
+
+
+
+
+
diff --git a/src/views/orderauthor/rules/selectRole/list.vue b/src/views/orderauthor/rules/selectRole/list.vue
new file mode 100644
index 000000000..412745500
--- /dev/null
+++ b/src/views/orderauthor/rules/selectRole/list.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
diff --git a/src/views/package/draft/editRule.vue b/src/views/package/draft/editRule.vue
index 3b00b835e..36fc599d1 100644
--- a/src/views/package/draft/editRule.vue
+++ b/src/views/package/draft/editRule.vue
@@ -2,7 +2,7 @@
+
+ {{ $t('global.return') }}
+
+
+
- {{$t('global.line') + courseModel.name }}
-
-
-
- - {{ $t('global.updateTime') }} - {{ courseModel.updateTime }} -
-- {{ $t('screenMonitor.productTrialDuration') }} - {{ showTryTime }} -
-- {{ $t('global.permissionList') }} -
-
-
-
+ {{ $t('global.line') + courseModel.name }}
+
+
+
+ + {{ $t('global.updateTime') }} + {{ courseModel.updateTime }} +
++ {{ $t('screenMonitor.productTrialDuration') }} + {{ showTryTime }} +
++ {{ $t('global.permissionList') }} +
+
+
+
- {{$t('global.mapList')}}
-
-
+ {{ $t('global.mapList') }}
+
+