Merge remote-tracking branch 'remotes/origin/dev' into test
This commit is contained in:
joylink_cuiweidong
commit
e4dffd17af
@ -3,123 +3,123 @@ import request from '@/utils/request';
|
|||||||
|
|
||||||
/** 分页获取订单数据*/
|
/** 分页获取订单数据*/
|
||||||
export function getOrderPageList(params) {
|
export function getOrderPageList(params) {
|
||||||
return request({
|
return request({
|
||||||
url: '/api/order',
|
url: '/api/order',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: params
|
params: params
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 根据ID获取订单数据*/
|
/** 根据ID获取订单数据*/
|
||||||
export function getOrderDetail(id, params) {
|
export function getOrderDetail(id, params) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/order/${id}`,
|
url: `/api/order/${id}`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: params
|
params: params
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 创建一个订单*/
|
/** 创建一个订单*/
|
||||||
export function createOrder(data) {
|
export function createOrder(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/api/order',
|
url: '/api/order',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 更新订单*/
|
/** 更新订单*/
|
||||||
export function updateOrder(data) {
|
export function updateOrder(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/api/order',
|
url: '/api/order',
|
||||||
method: 'put',
|
method: 'put',
|
||||||
data: data
|
data: data
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function deleteOrder(id) {
|
export function deleteOrder(id) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/order/${id}`,
|
url: `/api/order/${id}`,
|
||||||
method: 'delete'
|
method: 'delete'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 订单权限领取*/
|
/** 订单权限领取*/
|
||||||
export function getOrder(params) {
|
export function getOrder(params) {
|
||||||
return request({
|
return request({
|
||||||
url: '/api/order/getOrder',
|
url: '/api/order/getOrder',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: params
|
params: params
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 订单权限分发*/
|
/** 订单权限分发*/
|
||||||
export function giveOrder(data) {
|
export function giveOrder(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/api/order/giveOrder',
|
url: '/api/order/giveOrder',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 订单续费*/
|
/** 订单续费*/
|
||||||
export function getOrderCharge(id) {
|
export function getOrderCharge(id) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/order/${id}/charge`,
|
url: `/api/order/${id}/charge`,
|
||||||
method: 'get'
|
method: 'get'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 计算总价*/
|
/** 计算总价*/
|
||||||
export function calcuteOrderSumPrice(args) {
|
export function calcuteOrderSumPrice(args) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/order/price`,
|
url: `/api/order/price`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: args
|
params: args
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 提交订单*/
|
/** 提交订单*/
|
||||||
export function commitOrder(data) {
|
export function commitOrder(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/api/order/submit',
|
url: '/api/order/submit',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 确认订单*/
|
/** 确认订单*/
|
||||||
export function confirmOrder(data) {
|
export function confirmOrder(data) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/order/${data.orderId}/${data.type}/pay`,
|
url: `/api/order/${data.orderId}/${data.type}/pay`,
|
||||||
method: 'get'
|
method: 'get'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 取消订单*/
|
/** 取消订单*/
|
||||||
export function cancalOrder(orderId) {
|
export function cancalOrder(orderId) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/order/${orderId}/cancelPay`,
|
url: `/api/order/${orderId}/cancelPay`,
|
||||||
method: 'put'
|
method: 'put'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// 快速创建权限
|
// 快速创建权限
|
||||||
export function createPermission(data) {
|
export function createPermission(data) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/order/quicklyGenerateOrder`,
|
url: `/api/order/quicklyGenerateOrder`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// 校验是否存在所选择权限对应的权限包
|
// 校验是否存在所选择权限对应的权限包
|
||||||
export function postFindPermission(ids) {
|
export function postFindPermission(ids) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/permission/findPermission`,
|
url: `/api/permission/findPermission`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: {
|
data: {
|
||||||
relPermissions: ids
|
relPermissions: ids
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -198,5 +198,6 @@ export default {
|
|||||||
companyTel:'Tel: +86 13289398171',
|
companyTel:'Tel: +86 13289398171',
|
||||||
companyICP:'Copyright ©2018 Beijing Jiulian Technology Co., Ltd ICP: 18028522',
|
companyICP:'Copyright ©2018 Beijing Jiulian Technology Co., Ltd ICP: 18028522',
|
||||||
enterPermissionNum:'please input number',
|
enterPermissionNum:'please input number',
|
||||||
enterPermissionNumInt:'number must interger'
|
enterPermissionNumInt:'number must interger',
|
||||||
|
perpetual: 'perpetual'
|
||||||
};
|
};
|
||||||
|
|||||||
@ -198,5 +198,6 @@ export default {
|
|||||||
companyTel:'联系电话: 13289398171',
|
companyTel:'联系电话: 13289398171',
|
||||||
companyICP:'Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号',
|
companyICP:'Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号',
|
||||||
enterPermissionNum:'请输入权限数量',
|
enterPermissionNum:'请输入权限数量',
|
||||||
enterPermissionNumInt:'权限数量需为整数'
|
enterPermissionNumInt:'权限数量需为整数',
|
||||||
|
perpetual: '永久'
|
||||||
};
|
};
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
import { runPlanTemplateList } from '@/api/runplan';
|
import { runPlanTemplateList } from '@/api/runplan';
|
||||||
import { getStationList } from '@/api/runplan';
|
import { getStationList } from '@/api/runplan';
|
||||||
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
||||||
import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
|
import { getPublishMapInfo } from '@/api/jmap/map';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ReloadTodayPlan',
|
name: 'ReloadTodayPlan',
|
||||||
@ -29,7 +29,6 @@ export default {
|
|||||||
return {
|
return {
|
||||||
dialogShow: false,
|
dialogShow: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
mapList: [],
|
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
pageSize: 'pageSize',
|
pageSize: 'pageSize',
|
||||||
pageIndex: 'pageNum'
|
pageIndex: 'pageNum'
|
||||||
@ -52,15 +51,6 @@ export default {
|
|||||||
{
|
{
|
||||||
title: '运行图名称',
|
title: '运行图名称',
|
||||||
prop: 'name'
|
prop: 'name'
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '地图名称',
|
|
||||||
prop: 'mapId',
|
|
||||||
type: 'tag',
|
|
||||||
columnValue: (row) => {
|
|
||||||
return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
|
|
||||||
},
|
|
||||||
tagType: (row) => { return 'success'; }
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -74,16 +64,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
loadInitData() {
|
|
||||||
this.mapList = [];
|
|
||||||
listPublishMap().then(response => {
|
|
||||||
this.mapList = response.data;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
doShow() {
|
doShow() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.loadInitData();
|
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
import { runPlanTemplateList } from '@/api/runplan';
|
import { runPlanTemplateList } from '@/api/runplan';
|
||||||
import { getStationList } from '@/api/runplan';
|
import { getStationList } from '@/api/runplan';
|
||||||
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
||||||
import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
|
import { getPublishMapInfo } from '@/api/jmap/map';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ReloadTodayPlan',
|
name: 'ReloadTodayPlan',
|
||||||
@ -29,7 +29,6 @@ export default {
|
|||||||
return {
|
return {
|
||||||
dialogShow: false,
|
dialogShow: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
mapList: [],
|
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
pageSize: 'pageSize',
|
pageSize: 'pageSize',
|
||||||
pageIndex: 'pageNum'
|
pageIndex: 'pageNum'
|
||||||
@ -52,15 +51,6 @@ export default {
|
|||||||
{
|
{
|
||||||
title: '运行图名称',
|
title: '运行图名称',
|
||||||
prop: 'name'
|
prop: 'name'
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '地图名称',
|
|
||||||
prop: 'mapId',
|
|
||||||
type: 'tag',
|
|
||||||
columnValue: (row) => {
|
|
||||||
return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
|
|
||||||
},
|
|
||||||
tagType: (row) => { return 'success'; }
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -74,16 +64,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
loadInitData() {
|
|
||||||
this.mapList = [];
|
|
||||||
listPublishMap().then(response => {
|
|
||||||
this.mapList = response.data;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
doShow() {
|
doShow() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.loadInitData();
|
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
import { runPlanTemplateList } from '@/api/runplan';
|
import { runPlanTemplateList } from '@/api/runplan';
|
||||||
import { getStationList } from '@/api/runplan';
|
import { getStationList } from '@/api/runplan';
|
||||||
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
||||||
import { listPublishMap, getPublishMapInfo} from '@/api/jmap/map';
|
import {getPublishMapInfo} from '@/api/jmap/map';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ReloadTodayPlan',
|
name: 'ReloadTodayPlan',
|
||||||
@ -29,7 +29,6 @@ export default {
|
|||||||
return {
|
return {
|
||||||
dialogShow: false,
|
dialogShow: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
mapList: [],
|
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
pageSize: 'pageSize',
|
pageSize: 'pageSize',
|
||||||
pageIndex: 'pageNum'
|
pageIndex: 'pageNum'
|
||||||
@ -52,15 +51,6 @@ export default {
|
|||||||
{
|
{
|
||||||
title: '运行图名称',
|
title: '运行图名称',
|
||||||
prop: 'name'
|
prop: 'name'
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '地图名称',
|
|
||||||
prop: 'mapId',
|
|
||||||
type: 'tag',
|
|
||||||
columnValue: (row) => {
|
|
||||||
return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
|
|
||||||
},
|
|
||||||
tagType: (row) => { return 'success'; }
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -74,16 +64,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
loadInitData() {
|
|
||||||
this.mapList = [];
|
|
||||||
listPublishMap().then(response => {
|
|
||||||
this.mapList = response.data;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
doShow() {
|
doShow() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.loadInitData();
|
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
|
|||||||
@ -29,451 +29,451 @@ import { runDiagramGetTime } from '@/api/simulation';
|
|||||||
import DataTable from '../menusPlan/components/dataTable';
|
import DataTable from '../menusPlan/components/dataTable';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'PlanSchedule',
|
name: 'PlanSchedule',
|
||||||
components: {
|
components: {
|
||||||
DataTable
|
DataTable
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
group: {
|
group: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
skinCode: {
|
skinCode: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
maxWidth: {
|
maxWidth: {
|
||||||
type: Number,
|
type: Number,
|
||||||
require: true
|
require: true
|
||||||
},
|
},
|
||||||
maxHeight: {
|
maxHeight: {
|
||||||
type: Number,
|
type: Number,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
top: 0,
|
top: 0,
|
||||||
height: 0,
|
height: 0,
|
||||||
heights: [100, 100],
|
heights: [100, 100],
|
||||||
runPlanId: 'plan-schedule-id',
|
runPlanId: 'plan-schedule-id',
|
||||||
myChart: null,
|
myChart: null,
|
||||||
PlanConvert: {},
|
PlanConvert: {},
|
||||||
serviceNumberConfig: {
|
serviceNumberConfig: {
|
||||||
data: [],
|
data: [],
|
||||||
highlightCurrentRow: true,
|
highlightCurrentRow: true,
|
||||||
handleChange: this.serviceNumberChange,
|
handleChange: this.serviceNumberChange,
|
||||||
showClose: false,
|
showClose: false,
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
prop: 'serviceNumber',
|
prop: 'serviceNumber',
|
||||||
label: '表号'
|
label: '表号'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
width: 40
|
width: 40
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
tripNumberConfig: {
|
tripNumberConfig: {
|
||||||
data: [],
|
data: [],
|
||||||
highlightCurrentRow: true,
|
highlightCurrentRow: true,
|
||||||
handleChange: this.tripNumberChange,
|
handleChange: this.tripNumberChange,
|
||||||
showClose: false,
|
showClose: false,
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
prop: 'tripNumber',
|
prop: 'tripNumber',
|
||||||
label: '车次号'
|
label: '车次号'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
width: 40
|
width: 40
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
realData: {},
|
realData: {},
|
||||||
kmRangeCoordMap: {},
|
kmRangeCoordMap: {},
|
||||||
option: {
|
option: {
|
||||||
title: {
|
title: {
|
||||||
text: '',
|
text: '',
|
||||||
left: 'center'
|
left: 'center'
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
top: '30px',
|
top: '30px',
|
||||||
left: '120px',
|
left: '120px',
|
||||||
right: '40px',
|
right: '40px',
|
||||||
bottom: '65px',
|
bottom: '65px',
|
||||||
containLabel: true,
|
containLabel: true,
|
||||||
backgroundColor: 'floralwhite'
|
backgroundColor: 'floralwhite'
|
||||||
},
|
},
|
||||||
toolbox: {
|
toolbox: {
|
||||||
right: '30px',
|
right: '30px',
|
||||||
feature: {
|
feature: {
|
||||||
dataZoom: {
|
dataZoom: {
|
||||||
yAxisIndex: 'none'
|
yAxisIndex: 'none'
|
||||||
},
|
},
|
||||||
restore: {},
|
restore: {},
|
||||||
saveAsImage: {}
|
saveAsImage: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
tooltip: {
|
tooltip: {
|
||||||
axisPointer: {
|
axisPointer: {
|
||||||
trigger: 'item',
|
trigger: 'item',
|
||||||
type: 'cross'
|
type: 'cross'
|
||||||
},
|
},
|
||||||
formatter: this.axisTooltip,
|
formatter: this.axisTooltip,
|
||||||
borderWidth: 1
|
borderWidth: 1
|
||||||
},
|
},
|
||||||
xAxis: [
|
xAxis: [
|
||||||
{
|
{
|
||||||
type: 'category',
|
type: 'category',
|
||||||
boundaryGap: false,
|
boundaryGap: false,
|
||||||
data: [],
|
data: [],
|
||||||
axisLine: {
|
axisLine: {
|
||||||
onZero: false,
|
onZero: false,
|
||||||
lineStyle: {
|
lineStyle: {
|
||||||
width: 2,
|
width: 2,
|
||||||
color: '#d14a61'
|
color: '#d14a61'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
axisLabel: {
|
axisLabel: {
|
||||||
formatter: this.xAxisLableFormat,
|
formatter: this.xAxisLableFormat,
|
||||||
textStyle: {
|
textStyle: {
|
||||||
color: '#333'
|
color: '#333'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
axisPointer: {
|
axisPointer: {
|
||||||
snap: true,
|
snap: true,
|
||||||
label: {
|
label: {
|
||||||
formatter: this.xAxisPointFormat,
|
formatter: this.xAxisPointFormat,
|
||||||
backgroundColor: 'rgb(255,0,0,0.5)',
|
backgroundColor: 'rgb(255,0,0,0.5)',
|
||||||
color: 'white'
|
color: 'white'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
yAxis: {
|
yAxis: {
|
||||||
type: 'value',
|
type: 'value',
|
||||||
splitLine: {
|
splitLine: {
|
||||||
show: false
|
show: false
|
||||||
},
|
},
|
||||||
axisTick: {
|
axisTick: {
|
||||||
show: false
|
show: false
|
||||||
},
|
},
|
||||||
axisLine: {
|
axisLine: {
|
||||||
onZero: false,
|
onZero: false,
|
||||||
lineStyle: {
|
lineStyle: {
|
||||||
width: 2,
|
width: 2,
|
||||||
color: '#d14a61'
|
color: '#d14a61'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
axisLabel: {
|
axisLabel: {
|
||||||
interval: 'auto',
|
interval: 'auto',
|
||||||
formatter: this.yAxisLableFormat
|
formatter: this.yAxisLableFormat
|
||||||
},
|
},
|
||||||
axisPointer: {
|
axisPointer: {
|
||||||
xAxisIndex: 'all',
|
xAxisIndex: 'all',
|
||||||
label: {
|
label: {
|
||||||
formatter: this.yAxisPointFormat,
|
formatter: this.yAxisPointFormat,
|
||||||
backgroundColor: 'rgb(0,100,0,0.5)',
|
backgroundColor: 'rgb(0,100,0,0.5)',
|
||||||
color: 'white'
|
color: 'white'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
min: 0,
|
min: 0,
|
||||||
max: 0
|
max: 0
|
||||||
},
|
},
|
||||||
series: [],
|
series: [],
|
||||||
dataZoom: [
|
dataZoom: [
|
||||||
{
|
{
|
||||||
type: 'inside'
|
type: 'inside'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
fiterMode: 'filter',
|
fiterMode: 'filter',
|
||||||
handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
|
handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
|
||||||
handleSize: '80%',
|
handleSize: '80%',
|
||||||
handleStyle: {
|
handleStyle: {
|
||||||
color: '#fff',
|
color: '#fff',
|
||||||
shadowBlur: 3,
|
shadowBlur: 3,
|
||||||
shadowColor: 'rgba(0, 0, 0, 0.6)',
|
shadowColor: 'rgba(0, 0, 0, 0.6)',
|
||||||
shadowOffsetX: 2,
|
shadowOffsetX: 2,
|
||||||
shadowOffsetY: 2
|
shadowOffsetY: 2
|
||||||
},
|
},
|
||||||
bottom: '20px'
|
bottom: '20px'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
absoluteTime: 2 * 3600,
|
absoluteTime: 2 * 3600,
|
||||||
indexKmRangeMap: {}
|
indexKmRangeMap: {}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters('runPlan', [
|
...mapGetters('runPlan', [
|
||||||
'stations'
|
'stations'
|
||||||
])
|
])
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
maxWidth() {
|
maxWidth() {
|
||||||
this.setPosition();
|
this.setPosition();
|
||||||
},
|
},
|
||||||
maxHeight() {
|
maxHeight() {
|
||||||
this.setPosition();
|
this.setPosition();
|
||||||
},
|
},
|
||||||
'$store.state.runPlan.planLoadedCount': async function () {
|
'$store.state.runPlan.planLoadedCount': async function () {
|
||||||
await this.loadChartPage();
|
await this.loadChartPage();
|
||||||
},
|
},
|
||||||
'$store.state.runPlan.planSizeCount': function () {
|
'$store.state.runPlan.planSizeCount': function () {
|
||||||
this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
|
this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
|
||||||
},
|
},
|
||||||
'$store.state.runPlan.selected.serviceNumber': function (val) {
|
'$store.state.runPlan.selected.serviceNumber': function (val) {
|
||||||
const index = this.serviceNumberConfig.data.findIndex(elem => {
|
const index = this.serviceNumberConfig.data.findIndex(elem => {
|
||||||
return elem.serviceNumber == val;
|
return elem.serviceNumber == val;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
|
this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
|
||||||
},
|
},
|
||||||
'$store.state.runPlan.selected.tripNumber': function (val) {
|
'$store.state.runPlan.selected.tripNumber': function (val) {
|
||||||
const index = this.tripNumberConfig.data.findIndex(elem => {
|
const index = this.tripNumberConfig.data.findIndex(elem => {
|
||||||
return elem.tripNumber == val;
|
return elem.tripNumber == val;
|
||||||
});
|
});
|
||||||
this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
|
this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.PlanConvert = this.$theme.loadPlanConvert(this.skinCode);
|
this.PlanConvert = this.$theme.loadPlanConvert(this.skinCode);
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
this.destroy();
|
this.destroy();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
serviceNumberChange(row) {
|
serviceNumberChange(row) {
|
||||||
if (row) {
|
if (row) {
|
||||||
this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
|
this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
|
||||||
const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
|
const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
|
||||||
if (serviceObj) {
|
if (serviceObj) {
|
||||||
this.analyticalTripNumber(serviceObj.trainMap);
|
this.analyticalTripNumber(serviceObj.trainMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
tripNumberChange(row) {
|
tripNumberChange(row) {
|
||||||
if (row) {
|
if (row) {
|
||||||
this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
|
this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async analyticalServiceNumber(data) {
|
async analyticalServiceNumber(data) {
|
||||||
this.serviceNumberConfig.data = Object.keys(data || {})
|
this.serviceNumberConfig.data = Object.keys(data || {})
|
||||||
.sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
|
.sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
|
||||||
.map(serviceNumber => { return { serviceNumber }; });
|
.map(serviceNumber => { return { serviceNumber }; });
|
||||||
},
|
},
|
||||||
async analyticalTripNumber(data) {
|
async analyticalTripNumber(data) {
|
||||||
this.tripNumberConfig.data = Object.keys(data || {})
|
this.tripNumberConfig.data = Object.keys(data || {})
|
||||||
.sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
|
.sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
|
||||||
.map(tripNumber => { return { tripNumber }; });
|
.map(tripNumber => { return { tripNumber }; });
|
||||||
},
|
},
|
||||||
async setPosition() {
|
async setPosition() {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
let top = 3;
|
let top = 3;
|
||||||
const width = this.maxWidth * 0.85;
|
const width = this.maxWidth * 0.85;
|
||||||
let height = this.maxHeight;
|
let height = this.maxHeight;
|
||||||
|
|
||||||
const titleBar = document.getElementById('PlanTitleBar');
|
const titleBar = document.getElementById('PlanTitleBar');
|
||||||
const menuBar = document.getElementById('PlanMenuBar');
|
const menuBar = document.getElementById('PlanMenuBar');
|
||||||
const menuTool = document.getElementById('PlanMenuTool');
|
const menuTool = document.getElementById('PlanMenuTool');
|
||||||
const statusBar = document.getElementById('PlanStatusBar');
|
const statusBar = document.getElementById('PlanStatusBar');
|
||||||
|
|
||||||
if (titleBar) {
|
if (titleBar) {
|
||||||
top += (titleBar.offsetHeight || 0);
|
top += (titleBar.offsetHeight || 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (menuBar) {
|
if (menuBar) {
|
||||||
top += (menuBar.offsetHeight || 0);
|
top += (menuBar.offsetHeight || 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (menuTool) {
|
if (menuTool) {
|
||||||
top += (menuTool.offsetHeight || 0);
|
top += (menuTool.offsetHeight || 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (statusBar) {
|
if (statusBar) {
|
||||||
height -= (statusBar.offsetHeight || 0);
|
height -= (statusBar.offsetHeight || 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
height = height - top;
|
height = height - top;
|
||||||
this.$store.dispatch('runPlan/resize', { width, height });
|
this.$store.dispatch('runPlan/resize', { width, height });
|
||||||
|
|
||||||
if (this.top != top) {
|
if (this.top != top) {
|
||||||
this.top = top;
|
this.top = top;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.height != height) {
|
if (this.height != height) {
|
||||||
this.height = height - 20 * 2;
|
this.height = height - 20 * 2;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
async loadChartPage() {
|
async loadChartPage() {
|
||||||
try {
|
try {
|
||||||
let series = [];
|
let series = [];
|
||||||
const stations = this.$store.state.runPlan.stations;
|
const stations = this.$store.state.runPlan.stations;
|
||||||
const planData = this.$store.state.runPlan.planData;
|
const planData = this.$store.state.runPlan.planData;
|
||||||
|
|
||||||
this.viewDisabled = true;
|
this.viewDisabled = true;
|
||||||
this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
|
this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
|
||||||
series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
|
series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
|
||||||
series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
|
series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
|
||||||
await this.loadInitData(series);
|
await this.loadInitData(series);
|
||||||
await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
|
await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
|
||||||
this.viewDisabled = false;
|
this.viewDisabled = false;
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.viewDisabled = false;
|
this.viewDisabled = false;
|
||||||
this.$messageBox(`加载运行图数据失败`);
|
this.$messageBox(`加载运行图数据失败`);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async loadInitData(series) {
|
async loadInitData(series) {
|
||||||
this.myChart && this.myChart.showLoading();
|
this.myChart && this.myChart.showLoading();
|
||||||
await this.xAxisInit();
|
await this.xAxisInit();
|
||||||
await this.yAxisInit();
|
await this.yAxisInit();
|
||||||
await this.loadInitChart(series);
|
await this.loadInitChart(series);
|
||||||
this.myChart && this.myChart.hideLoading();
|
this.myChart && this.myChart.hideLoading();
|
||||||
},
|
},
|
||||||
pushModels(series, models) {
|
pushModels(series, models) {
|
||||||
if (models && models.length) {
|
if (models && models.length) {
|
||||||
models.forEach(elem => {
|
models.forEach(elem => {
|
||||||
if (elem) {
|
if (elem) {
|
||||||
series.push(elem);
|
series.push(elem);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return series;
|
return series;
|
||||||
},
|
},
|
||||||
popModels(series, models) {
|
popModels(series, models) {
|
||||||
if (models && models.length) {
|
if (models && models.length) {
|
||||||
models.forEach(elem => {
|
models.forEach(elem => {
|
||||||
const index = series.indexOf(elem);
|
const index = series.indexOf(elem);
|
||||||
if (index >= 0) {
|
if (index >= 0) {
|
||||||
series.split(index, 1);
|
series.split(index, 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return series;
|
return series;
|
||||||
},
|
},
|
||||||
loadInitChart(series) {
|
loadInitChart(series) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
try {
|
try {
|
||||||
const that = this;
|
const that = this;
|
||||||
// 加载echart配置
|
// 加载echart配置
|
||||||
require.config(
|
require.config(
|
||||||
{
|
{
|
||||||
paths: {
|
paths: {
|
||||||
echarts: './js/dist'
|
echarts: './js/dist'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
// 按需加载所需图表，如需动态类型切换功能，别忘了同时加载相应图表
|
// 按需加载所需图表，如需动态类型切换功能，别忘了同时加载相应图表
|
||||||
require(
|
require(
|
||||||
[
|
[
|
||||||
'echarts',
|
'echarts',
|
||||||
'echarts/lib/chart/line'
|
'echarts/lib/chart/line'
|
||||||
],
|
],
|
||||||
function (ec) {
|
function (ec) {
|
||||||
that.destroy();
|
that.destroy();
|
||||||
|
|
||||||
let startValue = 3600 + that.PlanConvert.TranslationTime;
|
let startValue = 3600 + that.PlanConvert.TranslationTime;
|
||||||
const offsetTime = 3600;
|
const offsetTime = 3600;
|
||||||
|
|
||||||
runDiagramGetTime(that.group).then(resp => {
|
runDiagramGetTime(that.group).then(resp => {
|
||||||
startValue = resp.data - that.PlanConvert.TranslationTime;
|
startValue = resp.data - that.PlanConvert.TranslationTime;
|
||||||
that.option.dataZoom[0].startValue = that.option.dataZoom[1].startValue = startValue - offsetTime;
|
that.option.dataZoom[0].startValue = that.option.dataZoom[1].startValue = startValue - offsetTime;
|
||||||
that.option.dataZoom[0].endValue = that.option.dataZoom[1].endValue = startValue + offsetTime;
|
that.option.dataZoom[0].endValue = that.option.dataZoom[1].endValue = startValue + offsetTime;
|
||||||
that.option.series = series;
|
that.option.series = series;
|
||||||
that.myChart = ec.init(document.getElementById(that.runPlanId));
|
that.myChart = ec.init(document.getElementById(that.runPlanId));
|
||||||
if (that.myChart) {
|
if (that.myChart) {
|
||||||
that.myChart.setOption(that.option);
|
that.myChart.setOption(that.option);
|
||||||
that.reSize({ width: that.$store.state.runPlan.width, height: that.$store.state.runPlan.height });
|
that.reSize({ width: that.$store.state.runPlan.width, height: that.$store.state.runPlan.height });
|
||||||
that.myChart.on('click', that.mouseClick);
|
that.myChart.on('click', that.mouseClick);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
resolve(true);
|
resolve(true);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
reject(error);
|
reject(error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
xAxisPointFormat(params) {
|
xAxisPointFormat(params) {
|
||||||
return timeFormat(params.value);
|
return timeFormat(params.value);
|
||||||
},
|
},
|
||||||
yAxisPointFormat(params) {
|
yAxisPointFormat(params) {
|
||||||
return this.PlanConvert.computedFormatYAxis(this.stations, params);
|
return this.PlanConvert.computedFormatYAxis(this.stations, params);
|
||||||
},
|
},
|
||||||
xAxisLableFormat(value, index) {
|
xAxisLableFormat(value, index) {
|
||||||
if (value % 60 === 0) {
|
if (value % 60 === 0) {
|
||||||
return timeFormat(value);
|
return timeFormat(value);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
yAxisLableFormat(value, index) {
|
yAxisLableFormat(value, index) {
|
||||||
return '';
|
return '';
|
||||||
},
|
},
|
||||||
xAxisInit() {
|
xAxisInit() {
|
||||||
const list = [];
|
const list = [];
|
||||||
for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
|
for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
|
||||||
list.push(time);
|
list.push(time);
|
||||||
}
|
}
|
||||||
|
|
||||||
const startValue = 3600 * 6;
|
const startValue = 3600 * 6;
|
||||||
const offsetTime = 3600 * 1;
|
const offsetTime = 3600 * 1;
|
||||||
|
|
||||||
this.option.xAxis[0].data = list;
|
this.option.xAxis[0].data = list;
|
||||||
if (!this.option.dataZoom[0].startValue) {
|
if (!this.option.dataZoom[0].startValue) {
|
||||||
this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
|
this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.option.dataZoom[0].endValue) {
|
if (!this.option.dataZoom[0].endValue) {
|
||||||
this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
|
this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
yAxisInit() {
|
yAxisInit() {
|
||||||
if (Object.keys(this.PlanConvert).length) {
|
if (Object.keys(this.PlanConvert).length) {
|
||||||
this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
|
this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
|
||||||
this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
|
this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
axisTooltip(param) {
|
axisTooltip(param) {
|
||||||
const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
|
const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
|
||||||
return [
|
return [
|
||||||
`Point Data <hr size=1 style=" margin: 3px 0">`,
|
`Point Data <hr size=1 style=" margin: 3px 0">`,
|
||||||
`车站名称: ${station.name}<br>`,
|
`车站名称: ${station.name}<br>`,
|
||||||
`车站公里标: ${station.kmRange} km <br>`,
|
`车站公里标: ${station.kmRange} km <br>`,
|
||||||
`到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
|
`到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
|
||||||
].join('');
|
].join('');
|
||||||
},
|
},
|
||||||
mouseClick(params) {
|
mouseClick(params) {
|
||||||
const model = {
|
const model = {
|
||||||
serviceNumber: params.seriesName
|
serviceNumber: params.seriesName
|
||||||
};
|
};
|
||||||
this.$store.dispatch('runPlan/setSelected', model);
|
this.$store.dispatch('runPlan/setSelected', model);
|
||||||
},
|
},
|
||||||
reSize(opt) {
|
reSize(opt) {
|
||||||
if (this.myChart) {
|
if (this.myChart) {
|
||||||
this.myChart.resize({
|
this.myChart.resize({
|
||||||
width: opt.width,
|
width: opt.width,
|
||||||
height: opt.height,
|
height: opt.height,
|
||||||
silent: false
|
silent: false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
destroy() {
|
destroy() {
|
||||||
if (this.myChart && this.myChart.isDisposed) {
|
if (this.myChart && this.myChart.isDisposed) {
|
||||||
this.myChart.dispose();
|
this.myChart.dispose();
|
||||||
this.myChart = null;
|
this.myChart = null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
scheduleTouch() {
|
scheduleTouch() {
|
||||||
|
|
||||||
},
|
},
|
||||||
trainNumTouch() {
|
trainNumTouch() {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style scoped rel="stylesheet/scss" lang="scss" scoped>
|
<style scoped rel="stylesheet/scss" lang="scss" scoped>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
import { runPlanTemplateList } from '@/api/runplan';
|
import { runPlanTemplateList } from '@/api/runplan';
|
||||||
import { getStationList } from '@/api/runplan';
|
import { getStationList } from '@/api/runplan';
|
||||||
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
|
||||||
import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
|
import { getPublishMapInfo } from '@/api/jmap/map';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ReloadTodayPlan',
|
name: 'ReloadTodayPlan',
|
||||||
@ -29,7 +29,6 @@ export default {
|
|||||||
return {
|
return {
|
||||||
dialogShow: false,
|
dialogShow: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
mapList: [],
|
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
pageSize: 'pageSize',
|
pageSize: 'pageSize',
|
||||||
pageIndex: 'pageNum'
|
pageIndex: 'pageNum'
|
||||||
@ -52,15 +51,6 @@ export default {
|
|||||||
{
|
{
|
||||||
title: this.$t('menu.runGraphName'),
|
title: this.$t('menu.runGraphName'),
|
||||||
prop: 'name'
|
prop: 'name'
|
||||||
},
|
|
||||||
{
|
|
||||||
title: this.$t('menu.mapName'),
|
|
||||||
prop: 'mapId',
|
|
||||||
type: 'tag',
|
|
||||||
columnValue: (row) => {
|
|
||||||
return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
|
|
||||||
},
|
|
||||||
tagType: (row) => { return 'success'; }
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -74,16 +64,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
loadInitData() {
|
|
||||||
this.mapList = [];
|
|
||||||
listPublishMap().then(response => {
|
|
||||||
this.mapList = response.data;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
doShow() {
|
doShow() {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.loadInitData();
|
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
|
|||||||
@ -29,65 +29,65 @@ import DeleteTask from '../menusPlan/deleteTask';
|
|||||||
import ModifyingTask from '../menusPlan/modifyingTask';
|
import ModifyingTask from '../menusPlan/modifyingTask';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Menus',
|
name: 'Menus',
|
||||||
components: {
|
components: {
|
||||||
TitleBar,
|
TitleBar,
|
||||||
MenuBar,
|
MenuBar,
|
||||||
StatusBar,
|
StatusBar,
|
||||||
Schedule,
|
Schedule,
|
||||||
ManagePlanList,
|
ManagePlanList,
|
||||||
CreateWeekPlan,
|
CreateWeekPlan,
|
||||||
CreateTodayPlan,
|
CreateTodayPlan,
|
||||||
ModifyingPlan,
|
ModifyingPlan,
|
||||||
AddTask,
|
AddTask,
|
||||||
DeleteTask,
|
DeleteTask,
|
||||||
ModifyingTask
|
ModifyingTask
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
group: {
|
group: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
skinCode() {
|
skinCode() {
|
||||||
return this.$route.query.skinCode || '02';
|
return this.$route.query.skinCode || '02';
|
||||||
},
|
},
|
||||||
width() {
|
width() {
|
||||||
return this.$store.state.app.width;
|
return this.$store.state.app.width;
|
||||||
},
|
},
|
||||||
height() {
|
height() {
|
||||||
return this.$store.state.app.height;
|
return this.$store.state.app.height;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
setPosition() {
|
setPosition() {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.schedule.setPosition();
|
this.$refs.schedule.setPosition();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
dispatchDialog(dialogObj) {
|
dispatchDialog(dialogObj) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
if (this.$refs[dialogObj.name]) {
|
if (this.$refs[dialogObj.name]) {
|
||||||
this.$refs[dialogObj.name].doShow(dialogObj.params);
|
this.$refs[dialogObj.name].doShow(dialogObj.params);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
reloadTable(dialogObj) {
|
reloadTable(dialogObj) {
|
||||||
if (this.$refs[dialogObj.name]) {
|
if (this.$refs[dialogObj.name]) {
|
||||||
this.$refs[dialogObj.name].reloadTable();
|
this.$refs[dialogObj.name].reloadTable();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
confirm(params) {
|
confirm(params) {
|
||||||
},
|
},
|
||||||
back() {
|
back() {
|
||||||
this.$emit('back');
|
this.$emit('back');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@ -136,7 +136,7 @@ export default {
|
|||||||
runPlanPreview(index, row) {
|
runPlanPreview(index, row) {
|
||||||
previewRunPlan(row.id).then(resp => {
|
previewRunPlan(row.id).then(resp => {
|
||||||
const query = {
|
const query = {
|
||||||
skinCode: row.skinCode, prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id, from:''
|
prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id, from:''
|
||||||
};
|
};
|
||||||
this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
|
this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
|
||||||
launchFullscreen();
|
launchFullscreen();
|
||||||
|
|||||||
@ -135,9 +135,9 @@ export default {
|
|||||||
this.$refs.applyReject.doShow(row);
|
this.$refs.applyReject.doShow(row);
|
||||||
},
|
},
|
||||||
scriptPreview(index, row) {
|
scriptPreview(index, row) {
|
||||||
const mapInfo = this.allMapList.find(elem=>{ return elem.id == row.mapId; });
|
// const mapInfo = this.allMapList.find(elem=>{ return elem.id == row.mapId; });
|
||||||
scriptDraftRecordNotify(row.id).then(resp => {
|
scriptDraftRecordNotify(row.id).then(resp => {
|
||||||
const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, skinCode:mapInfo.skinCode, try:0};
|
const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0};
|
||||||
this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
|
this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
|
||||||
launchFullscreen();
|
launchFullscreen();
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
<el-table-column prop="startTime" :label="`${$t('permission.startTime')}`" />
|
<el-table-column prop="startTime" :label="`${$t('permission.startTime')}`" />
|
||||||
<el-table-column prop="endTime" :label="`${$t('permission.endTime')}`">
|
<el-table-column prop="endTime" :label="`${$t('permission.endTime')}`">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.endTime? scope.row.endTime: '永久' }}</span>
|
<span>{{ scope.row.endTime? scope.row.endTime: $t('global.perpetual') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="amount" :label="$t('global.total')" />
|
<el-table-column prop="amount" :label="$t('global.total')" />
|
||||||
|
|||||||
@ -55,144 +55,144 @@ import { commitOrder } from '@/api/management/order';
|
|||||||
import { PermissionType } from '@/scripts/ConstDic';
|
import { PermissionType } from '@/scripts/ConstDic';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'CommitDraft',
|
name: 'CommitDraft',
|
||||||
props: {
|
props: {
|
||||||
orderData: {
|
orderData: {
|
||||||
type: Object,
|
type: Object,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
systemName: {
|
systemName: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
disabled: true,
|
disabled: true,
|
||||||
choose: this.$t('global.january'),
|
choose: this.$t('global.january'),
|
||||||
chooseList: [
|
chooseList: [
|
||||||
{ label: this.$t('global.january'), value: 1 },
|
{ label: this.$t('global.january'), value: 1 },
|
||||||
{ label: this.$t('global.march'), value: 3 },
|
{ label: this.$t('global.march'), value: 3 },
|
||||||
{ label: this.$t('global.year'), value: 12 },
|
{ label: this.$t('global.year'), value: 12 },
|
||||||
{ label: this.$t('global.twoYears'), value: 24 },
|
{ label: this.$t('global.twoYears'), value: 24 },
|
||||||
{ label: this.$t('global.fiveYears'), value: 60 },
|
{ label: this.$t('global.fiveYears'), value: 60 },
|
||||||
{ label: this.$t('global.tenYears'), value: 120 }
|
{ label: this.$t('global.tenYears'), value: 120 }
|
||||||
],
|
],
|
||||||
saleModel: {
|
saleModel: {
|
||||||
goodsId: '',
|
goodsId: '',
|
||||||
name: '',
|
name: '',
|
||||||
price: 0,
|
price: 0,
|
||||||
months: 1,
|
months: 1,
|
||||||
total: 1
|
total: 1
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
sumPrice() {
|
sumPrice() {
|
||||||
return this.saleModel.price * this.saleModel.months * this.saleModel.total || 0;
|
return this.saleModel.price * this.saleModel.months * this.saleModel.total || 0;
|
||||||
},
|
},
|
||||||
nameTitle() {
|
nameTitle() {
|
||||||
if (this.$route.query.permissionType == PermissionType.EXAM ||
|
if (this.$route.query.permissionType == PermissionType.EXAM ||
|
||||||
this.$route.query.permissionType == PermissionType.LESSON) {
|
this.$route.query.permissionType == PermissionType.LESSON) {
|
||||||
return this.$t('global.courseName');
|
return this.$t('global.courseName');
|
||||||
} else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
} else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
||||||
return this.$t('global.screenName');
|
return this.$t('global.screenName');
|
||||||
} else {
|
} else {
|
||||||
return this.$t('global.productName');
|
return this.$t('global.productName');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
priceTitle() {
|
priceTitle() {
|
||||||
switch (this.$route.query.permissionType) {
|
switch (this.$route.query.permissionType) {
|
||||||
case PermissionType.LESSON: return this.$t('global.coursePrice');
|
case PermissionType.LESSON: return this.$t('global.coursePrice');
|
||||||
case PermissionType.EXAM: return this.$t('global.testPrice');
|
case PermissionType.EXAM: return this.$t('global.testPrice');
|
||||||
case PermissionType.SIMULATION: return this.$t('global.simulationPrice');
|
case PermissionType.SIMULATION: return this.$t('global.simulationPrice');
|
||||||
case PermissionType.SCREEN: return this.$t('global.timeUnitPrice');
|
case PermissionType.SCREEN: return this.$t('global.timeUnitPrice');
|
||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
},
|
},
|
||||||
rules() {
|
rules() {
|
||||||
return {
|
return {
|
||||||
'name': [
|
'name': [
|
||||||
{ required: true, message: this.$t('rules.courseNameEmpty'), trigger: 'blur' }
|
{ required: true, message: this.$t('rules.courseNameEmpty'), trigger: 'blur' }
|
||||||
],
|
],
|
||||||
'months': [
|
'months': [
|
||||||
{ required: true, message: this.$t('rules.purchaseMonth'), trigger: 'blur' },
|
{ required: true, message: this.$t('rules.purchaseMonth'), trigger: 'blur' },
|
||||||
{
|
{
|
||||||
validator(rule, value, callback) {
|
validator(rule, value, callback) {
|
||||||
if (Number.isInteger(Number(value)) && Number(value) >= 0) {
|
if (Number.isInteger(Number(value)) && Number(value) >= 0) {
|
||||||
callback();
|
callback();
|
||||||
} else {
|
} else {
|
||||||
callback(new Error(this.$t('tip.purchaseMonth')));
|
callback(new Error(this.$t('tip.purchaseMonth')));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
'total': [
|
'total': [
|
||||||
{ required: true, message: this.$t('rules.accessNumber'), trigger: 'blur' },
|
{ required: true, message: this.$t('rules.accessNumber'), trigger: 'blur' },
|
||||||
{
|
{
|
||||||
validator(rule, value, callback) {
|
validator(rule, value, callback) {
|
||||||
if (Number.isInteger(Number(value)) && Number(value) >= 0) {
|
if (Number.isInteger(Number(value)) && Number(value) >= 0) {
|
||||||
callback();
|
callback();
|
||||||
} else {
|
} else {
|
||||||
callback(new Error(this.$t('tip.permissionsNumber')));
|
callback(new Error(this.$t('tip.permissionsNumber')));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
orderData: function (val) {
|
orderData: function (val) {
|
||||||
if (val) {
|
if (val) {
|
||||||
this.saleModel.price = val.price;
|
this.saleModel.price = val.price;
|
||||||
this.saleModel.goodsId = val.id;
|
this.saleModel.goodsId = val.id;
|
||||||
this.saleModel.name = val.name;
|
this.saleModel.name = val.name;
|
||||||
// if (this.$route.query.permissionType == PermissionType.LESSON ||
|
// if (this.$route.query.permissionType == PermissionType.LESSON ||
|
||||||
// this.$route.query.permissionType == PermissionType.EXAM) {
|
// this.$route.query.permissionType == PermissionType.EXAM) {
|
||||||
// this.saleModel.name = val.name;
|
// this.saleModel.name = val.name;
|
||||||
// } else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
// } else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
||||||
// this.saleModel.name = val.name;
|
// this.saleModel.name = val.name;
|
||||||
// } else {
|
// } else {
|
||||||
// this.saleModel.name = val.prdName;
|
// this.saleModel.name = val.prdName;
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 选择自定义时长，修改页面控件状态
|
// 选择自定义时长，修改页面控件状态
|
||||||
chooseEvent(label) {
|
chooseEvent(label) {
|
||||||
this.disabled = label !== this.$t('global.custom');
|
this.disabled = label !== this.$t('global.custom');
|
||||||
this.chooseList.forEach(elem => {
|
this.chooseList.forEach(elem => {
|
||||||
if (label === elem.label) {
|
if (label === elem.label) {
|
||||||
this.saleModel.months = elem.value;
|
this.saleModel.months = elem.value;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 提交订单
|
// 提交订单
|
||||||
commit() {
|
commit() {
|
||||||
this.$refs.make.validate((valid) => {
|
this.$refs.make.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
const model = {
|
const model = {
|
||||||
goodsId: this.saleModel.goodsId,
|
goodsId: this.saleModel.goodsId,
|
||||||
price: this.saleModel.price,
|
price: this.saleModel.price,
|
||||||
monthAmount: this.saleModel.months,
|
monthAmount: this.saleModel.months,
|
||||||
amount: this.saleModel.total,
|
amount: this.saleModel.total,
|
||||||
permissionType: this.$route.query.permissionType
|
permissionType: this.$route.query.permissionType
|
||||||
};
|
};
|
||||||
commitOrder(model).then(response => {
|
commitOrder(model).then(response => {
|
||||||
this.$emit('commit', response.data);
|
this.$emit('commit', response.data);
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.$messageBox(this.$t('tip.failedSubmitOrder'));
|
this.$messageBox(this.$t('tip.failedSubmitOrder'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
back() {
|
back() {
|
||||||
history.go(-1);
|
history.go(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -117,184 +117,184 @@ import img_alipay_logo from '@/assets/pay_images/AliPayLogo.png';
|
|||||||
import img_alipay_logo_info from '@/assets/pay_images/AliPayLogoInfo.png';
|
import img_alipay_logo_info from '@/assets/pay_images/AliPayLogoInfo.png';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ConfirmDraft',
|
name: 'ConfirmDraft',
|
||||||
components: {
|
components: {
|
||||||
QrcodeVue
|
QrcodeVue
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
order: {
|
order: {
|
||||||
type: Object,
|
type: Object,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
orderData: {
|
orderData: {
|
||||||
type: Object,
|
type: Object,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
systemName: {
|
systemName: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
active: '02',
|
active: '02',
|
||||||
stomp: null,
|
stomp: null,
|
||||||
loadings: [true, true],
|
loadings: [true, true],
|
||||||
WePayUrl: '',
|
WePayUrl: '',
|
||||||
AlipayForm: '',
|
AlipayForm: '',
|
||||||
cancalOk: false,
|
cancalOk: false,
|
||||||
rotateIndex: 0,
|
rotateIndex: 0,
|
||||||
payTypeEnum: {
|
payTypeEnum: {
|
||||||
WePay: '02',
|
WePay: '02',
|
||||||
Alipay: '03'
|
Alipay: '03'
|
||||||
},
|
},
|
||||||
images: {
|
images: {
|
||||||
img_wepay_logo,
|
img_wepay_logo,
|
||||||
img_wepay_logo_info,
|
img_wepay_logo_info,
|
||||||
img_alipay_logo,
|
img_alipay_logo,
|
||||||
img_alipay_logo_info
|
img_alipay_logo_info
|
||||||
},
|
},
|
||||||
saleModel: {
|
saleModel: {
|
||||||
name: '',
|
name: '',
|
||||||
price: 0,
|
price: 0,
|
||||||
monthAmount: 0,
|
monthAmount: 0,
|
||||||
amount: 0,
|
amount: 0,
|
||||||
orderCode: '',
|
orderCode: '',
|
||||||
createTime: '',
|
createTime: '',
|
||||||
sumPrice: 0
|
sumPrice: 0
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
nameTitle() {
|
nameTitle() {
|
||||||
if (this.$route.query.permissionType == PermissionType.EXAM ||
|
if (this.$route.query.permissionType == PermissionType.EXAM ||
|
||||||
this.$route.query.permissionType == PermissionType.LESSON) {
|
this.$route.query.permissionType == PermissionType.LESSON) {
|
||||||
return this.$t('global.courseName');
|
return this.$t('global.courseName');
|
||||||
} else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
} else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
||||||
return this.$t('global.screenName');
|
return this.$t('global.screenName');
|
||||||
} else {
|
} else {
|
||||||
return this.$t('global.productName');
|
return this.$t('global.productName');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
priceTitle() {
|
priceTitle() {
|
||||||
switch (this.$route.query.permissionType) {
|
switch (this.$route.query.permissionType) {
|
||||||
case PermissionType.LESSON: return this.$t('global.coursePrice');
|
case PermissionType.LESSON: return this.$t('global.coursePrice');
|
||||||
case PermissionType.EXAM: return this.$t('global.testPrice');
|
case PermissionType.EXAM: return this.$t('global.testPrice');
|
||||||
case PermissionType.SIMULATION: return this.$t('global.simulationPrice');
|
case PermissionType.SIMULATION: return this.$t('global.simulationPrice');
|
||||||
case PermissionType.SCREEN: return this.$t('global.timeUnitPrice');
|
case PermissionType.SCREEN: return this.$t('global.timeUnitPrice');
|
||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
order: function (val) {
|
order: function (val) {
|
||||||
if (val) {
|
if (val) {
|
||||||
this.saleModel.goodsId = val.goodsId;
|
this.saleModel.goodsId = val.goodsId;
|
||||||
this.saleModel.amount = val.amount;
|
this.saleModel.amount = val.amount;
|
||||||
this.saleModel.monthAmount = val.monthAmount;
|
this.saleModel.monthAmount = val.monthAmount;
|
||||||
this.saleModel.orderCode = val.code;
|
this.saleModel.orderCode = val.code;
|
||||||
this.saleModel.createTime = val.createTime;
|
this.saleModel.createTime = val.createTime;
|
||||||
const model = {
|
const model = {
|
||||||
goodsId: this.saleModel.goodsId,
|
goodsId: this.saleModel.goodsId,
|
||||||
monthAmount: this.saleModel.monthAmount,
|
monthAmount: this.saleModel.monthAmount,
|
||||||
amount: this.saleModel.amount,
|
amount: this.saleModel.amount,
|
||||||
permissionType: this.$route.query.permissionType
|
permissionType: this.$route.query.permissionType
|
||||||
};
|
};
|
||||||
calcuteOrderSumPrice(model).then(response => {
|
calcuteOrderSumPrice(model).then(response => {
|
||||||
this.saleModel.sumPrice = response.data;
|
this.saleModel.sumPrice = response.data;
|
||||||
this.loadPayQtCode();
|
this.loadPayQtCode();
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.$messageBox(this.$t('tip.totalAmount'));
|
this.$messageBox(this.$t('tip.totalAmount'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
orderData: function (val) {
|
orderData: function (val) {
|
||||||
this.saleModel.price = val.price;
|
this.saleModel.price = val.price;
|
||||||
this.saleModel.name = val.name;
|
this.saleModel.name = val.name;
|
||||||
// if (this.$route.query.permissionType == PermissionType.LESSON ||
|
// if (this.$route.query.permissionType == PermissionType.LESSON ||
|
||||||
// this.$route.query.permissionType == PermissionType.EXAM) {
|
// this.$route.query.permissionType == PermissionType.EXAM) {
|
||||||
// this.saleModel.name = val.lessonName;
|
// this.saleModel.name = val.lessonName;
|
||||||
// } else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
// } else if (this.$route.query.permissionType == PermissionType.SCREEN) {
|
||||||
// this.saleModel.name = val.name;
|
// this.saleModel.name = val.name;
|
||||||
// } else {
|
// } else {
|
||||||
// this.saleModel.name = val.prdName;
|
// this.saleModel.name = val.prdName;
|
||||||
// }
|
// }
|
||||||
},
|
},
|
||||||
'$store.state.socket.payStatus': function (val) { // 仿真聊天
|
'$store.state.socket.payStatus': function (val) { // 仿真聊天
|
||||||
if (val) {
|
if (val) {
|
||||||
this.handlePayStatus(val);
|
this.handlePayStatus(val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 加载二维码
|
// 加载二维码
|
||||||
loadPayQtCode() {
|
loadPayQtCode() {
|
||||||
if (this.order && this.order.id) {
|
if (this.order && this.order.id) {
|
||||||
// 加载微信支付二维码
|
// 加载微信支付二维码
|
||||||
this.loadWePayQtCode();
|
this.loadWePayQtCode();
|
||||||
// 加载支付宝支付二维码
|
// 加载支付宝支付二维码
|
||||||
this.loadAliPayQtCode();
|
this.loadAliPayQtCode();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
rotateRefresh() {
|
rotateRefresh() {
|
||||||
this.$refs.rotateA.style[`transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateA.style[`transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateA.style[`-webkit-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateA.style[`-webkit-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateA.style[`-moz-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateA.style[`-moz-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateA.style[`-o-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateA.style[`-o-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateA.style[`-ms-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateA.style[`-ms-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateB.style[`transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateB.style[`transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateB.style[`-webkit-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateB.style[`-webkit-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateB.style[`-moz-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateB.style[`-moz-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateB.style[`-o-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateB.style[`-o-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.$refs.rotateB.style[`-ms-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
this.$refs.rotateB.style[`-ms-transform`] = `rotate(${this.rotateIndex * 180}deg)`;
|
||||||
this.rotateIndex = this.rotateIndex + 1;
|
this.rotateIndex = this.rotateIndex + 1;
|
||||||
},
|
},
|
||||||
// 加载微信支付二维码
|
// 加载微信支付二维码
|
||||||
loadWePayQtCode() {
|
loadWePayQtCode() {
|
||||||
// 刷新二维码
|
// 刷新二维码
|
||||||
this.rotateRefresh();
|
this.rotateRefresh();
|
||||||
|
|
||||||
// 获取微信支付二维码
|
// 获取微信支付二维码
|
||||||
this.loadings[0] = true;
|
this.loadings[0] = true;
|
||||||
confirmOrder({ type: this.payTypeEnum.WePay, orderId: this.order.id }).then(response => {
|
confirmOrder({ type: this.payTypeEnum.WePay, orderId: this.order.id }).then(response => {
|
||||||
this.WePayUrl = response.data;
|
this.WePayUrl = response.data;
|
||||||
this.loadings[0] = false;
|
this.loadings[0] = false;
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.$messageBox(this.$t('tip.wxCodePayFailde'));
|
this.$messageBox(this.$t('tip.wxCodePayFailde'));
|
||||||
this.loadings[0] = false;
|
this.loadings[0] = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 加载支付宝支付二维码
|
// 加载支付宝支付二维码
|
||||||
loadAliPayQtCode() {
|
loadAliPayQtCode() {
|
||||||
// 刷新二维码
|
// 刷新二维码
|
||||||
this.rotateRefresh();
|
this.rotateRefresh();
|
||||||
|
|
||||||
// 获取支付宝支付二维码
|
// 获取支付宝支付二维码
|
||||||
this.loadings[1] = true;
|
this.loadings[1] = true;
|
||||||
confirmOrder({ type: this.payTypeEnum.Alipay, orderId: this.order.id }).then(response => {
|
confirmOrder({ type: this.payTypeEnum.Alipay, orderId: this.order.id }).then(response => {
|
||||||
this.AlipayForm = response.data;
|
this.AlipayForm = response.data;
|
||||||
this.loadings[1] = false;
|
this.loadings[1] = false;
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.$messageBox(this.$t('tip.aliCodePayFailde'));
|
this.$messageBox(this.$t('tip.aliCodePayFailde'));
|
||||||
this.loadings[1] = false;
|
this.loadings[1] = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 确认支付
|
// 确认支付
|
||||||
handlePayStatus(order) {
|
handlePayStatus(order) {
|
||||||
// 如果结果不是待支付状态，则认为时已支付或者取消，此时需要跳转到支付结束页面，并给出最终的支付状态结果
|
// 如果结果不是待支付状态，则认为时已支付或者取消，此时需要跳转到支付结束页面，并给出最终的支付状态结果
|
||||||
order.code === this.order.code && this.$emit('confirm', order.status);
|
order.code === this.order.code && this.$emit('confirm', order.status);
|
||||||
},
|
},
|
||||||
// 取消支付
|
// 取消支付
|
||||||
cancal() {
|
cancal() {
|
||||||
cancalOrder(this.order.id).then(response => {
|
cancalOrder(this.order.id).then(response => {
|
||||||
this.cancalOk = true;
|
this.cancalOk = true;
|
||||||
this.$emit('confirm', '03');
|
this.$emit('confirm', '03');
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.cancalOk = false;
|
this.cancalOk = false;
|
||||||
this.$messageBox(this.$t('tip.cancelOrderFailed'));
|
this.$messageBox(this.$t('tip.cancelOrderFailed'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||||
|
|||||||
@ -105,7 +105,7 @@ export default {
|
|||||||
launchFullscreen();
|
launchFullscreen();
|
||||||
await putJointTrainingSimulationEntrance(this.group);
|
await putJointTrainingSimulationEntrance(this.group);
|
||||||
const rest = await getPublishMapInfo(this.mapId);
|
const rest = await getPublishMapInfo(this.mapId);
|
||||||
const query = { skinCode: rest.data.lineCode, mapId: this.mapId, group: this.group, subSystem: this.$route.query.subSystem };
|
const query = { lineCode: rest.data.lineCode, mapId: this.mapId, group: this.group, subSystem: this.$route.query.subSystem };
|
||||||
this.$router.push({ path: `/jointTraining`, query: query });
|
this.$router.push({ path: `/jointTraining`, query: query });
|
||||||
} else if (this.state == '01') {
|
} else if (this.state == '01') {
|
||||||
const query = { group: this.group };
|
const query = { group: this.group };
|
||||||
|
|||||||
@ -59,7 +59,7 @@ export default {
|
|||||||
launchFullscreen();
|
launchFullscreen();
|
||||||
await putJointTrainingSimulationEntrance(this.group);
|
await putJointTrainingSimulationEntrance(this.group);
|
||||||
const rest = await getPublishMapInfo(this.mapId);
|
const rest = await getPublishMapInfo(this.mapId);
|
||||||
const query = { skinCode: rest.data.lineCode, mapId: this.mapId, group: this.group };
|
const query = { lineCode: rest.data.lineCode, mapId: this.mapId, group: this.group };
|
||||||
this.$router.push({ path: `/jointTraining`, query: query });
|
this.$router.push({ path: `/jointTraining`, query: query });
|
||||||
} else if (this.state == '01') {
|
} else if (this.state == '01') {
|
||||||
const query = { group: this.group };
|
const query = { group: this.group };
|
||||||
|
|||||||
@ -54,7 +54,7 @@ export default {
|
|||||||
id: '',
|
id: '',
|
||||||
name: '',
|
name: '',
|
||||||
mapId: '',
|
mapId: '',
|
||||||
skinCode: '',
|
lineCode: '',
|
||||||
remarks: '',
|
remarks: '',
|
||||||
prdType: '',
|
prdType: '',
|
||||||
prdId: '',
|
prdId: '',
|
||||||
@ -105,7 +105,7 @@ export default {
|
|||||||
id: resp.data.mapPrd.id,
|
id: resp.data.mapPrd.id,
|
||||||
name: resp.data.mapPrd.name,
|
name: resp.data.mapPrd.name,
|
||||||
mapId: this.mapId,
|
mapId: this.mapId,
|
||||||
skinCode: resp.data.mapPrd.skinCode,
|
lineCode: resp.data.mapPrd.lineCode,
|
||||||
remarks: resp.data.mapPrd.remarks,
|
remarks: resp.data.mapPrd.remarks,
|
||||||
prdType: resp.data.mapPrd.prdType,
|
prdType: resp.data.mapPrd.prdType,
|
||||||
prdId: resp.data.mapPrd.id,
|
prdId: resp.data.mapPrd.id,
|
||||||
@ -158,7 +158,7 @@ export default {
|
|||||||
},
|
},
|
||||||
async joinRoom() {
|
async joinRoom() {
|
||||||
await getjointTraining(this.jointGroup);
|
await getjointTraining(this.jointGroup);
|
||||||
const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup, subSystem: this.$route.params.subSystem};
|
const query = { lineCode: this.courseModel.lineCode, group: this.jointGroup, subSystem: this.$route.params.subSystem};
|
||||||
this.$router.push({ path: `/trainroom`, query: query });
|
this.$router.push({ path: `/trainroom`, query: query });
|
||||||
},
|
},
|
||||||
async createRoom() {
|
async createRoom() {
|
||||||
@ -170,7 +170,7 @@ export default {
|
|||||||
};
|
};
|
||||||
const res = await postCreateRoom(param);
|
const res = await postCreateRoom(param);
|
||||||
if (res && res.code == 200) {
|
if (res && res.code == 200) {
|
||||||
const query = { skinCode: this.courseModel.skinCode, group: res.data, subSystem: this.$route.params.subSystem };
|
const query = { lineCode: this.courseModel.lineCode, group: res.data, subSystem: this.$route.params.subSystem };
|
||||||
this.$router.push({ path: `/trainroom`, query: query });
|
this.$router.push({ path: `/trainroom`, query: query });
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@ -214,7 +214,7 @@ export default {
|
|||||||
this.buttonLoading = true;
|
this.buttonLoading = true;
|
||||||
const data = { mapId: this.courseModel.mapId, prdId: this.currentPrdId };
|
const data = { mapId: this.courseModel.mapId, prdId: this.currentPrdId };
|
||||||
schedulingNotify(data).then(resp => {
|
schedulingNotify(data).then(resp => {
|
||||||
const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
|
const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
|
||||||
this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
|
this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
|
||||||
launchFullscreen();
|
launchFullscreen();
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
@ -226,7 +226,7 @@ export default {
|
|||||||
const data = { mapId: this.courseModel.mapId, mapPrdId: this.currentPrdId };
|
const data = { mapId: this.courseModel.mapId, mapPrdId: this.currentPrdId };
|
||||||
this.buttonLoading = true;
|
this.buttonLoading = true;
|
||||||
simulationNotify(data).then(resp => {
|
simulationNotify(data).then(resp => {
|
||||||
const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
|
const query = { lineCode: this.courseModel.lineCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdId, goodsId: this.goodsId, try: this.tryUser };
|
||||||
this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
|
this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
|
||||||
launchFullscreen();
|
launchFullscreen();
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-wrapper">
|
<div class="app-wrapper">
|
||||||
<map-create ref="mapCreate" :skin-code="skinCode" @refresh="refresh1" />
|
<map-create ref="mapCreate" :line-code="lineCode" @refresh="refresh1" />
|
||||||
<div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
|
<div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
|
||||||
<demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
|
<demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
|
||||||
</div>
|
</div>
|
||||||
@ -32,7 +32,7 @@ export default {
|
|||||||
listShow: true,
|
listShow: true,
|
||||||
widthLeft: Number(localStore.get('LeftWidth')) || 450,
|
widthLeft: Number(localStore.get('LeftWidth')) || 450,
|
||||||
productList: [],
|
productList: [],
|
||||||
skinCode: ''
|
lineCode: ''
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
@ -22,134 +22,134 @@ import { FaultStatusEnum } from '@/scripts/FaultDic';
|
|||||||
import ModelType from '@/jmap/constant/deviceType';
|
import ModelType from '@/jmap/constant/deviceType';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'FaultChoose',
|
name: 'FaultChoose',
|
||||||
props: {
|
props: {
|
||||||
group: {
|
group: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
dialogShow: false,
|
dialogShow: false,
|
||||||
loading: false,
|
loading: false,
|
||||||
deviceMap: {},
|
deviceMap: {},
|
||||||
auto: false,
|
auto: false,
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
pageSize: 'pageSize',
|
pageSize: 'pageSize',
|
||||||
pageIndex: 'pageNum'
|
pageIndex: 'pageNum'
|
||||||
},
|
},
|
||||||
queryForm: {
|
queryForm: {
|
||||||
reset: true,
|
reset: true,
|
||||||
labelWidth: '80px',
|
labelWidth: '80px',
|
||||||
queryObject: {
|
queryObject: {
|
||||||
condition: {
|
condition: {
|
||||||
type: 'text',
|
type: 'text',
|
||||||
label: this.$t('display.faultChoose.settingCondition')
|
label: this.$t('display.faultChoose.settingCondition')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
queryList: {
|
queryList: {
|
||||||
query: null,
|
query: null,
|
||||||
selectCheckShow: false,
|
selectCheckShow: false,
|
||||||
radioShow: true,
|
radioShow: true,
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
title: this.$t('display.faultChoose.settingCondition'),
|
title: this.$t('display.faultChoose.settingCondition'),
|
||||||
prop: 'condition'
|
prop: 'condition'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('display.faultChoose.triggerTarget'),
|
title: this.$t('display.faultChoose.triggerTarget'),
|
||||||
prop: 'target'
|
prop: 'target'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
title() {
|
title() {
|
||||||
return this.$t('display.faultChoose.selectFault');
|
return this.$t('display.faultChoose.selectFault');
|
||||||
},
|
},
|
||||||
skinCode() {
|
skinCode() {
|
||||||
return this.$route.query.skinCode;
|
return this.$route.query.skinCode;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.$Dictionary.physicalViewType().then(list => {
|
this.$Dictionary.physicalViewType().then(list => {
|
||||||
this.deviceMap = [];
|
this.deviceMap = [];
|
||||||
list.forEach(elem => {
|
list.forEach(elem => {
|
||||||
this.deviceMap[elem.code] = elem.name;
|
this.deviceMap[elem.code] = elem.name;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
formatNameByCode(code) {
|
formatNameByCode(code) {
|
||||||
let name = '';
|
let name = '';
|
||||||
const device = this.$store.getters['map/getDeviceByCode'](code);
|
const device = this.$store.getters['map/getDeviceByCode'](code);
|
||||||
if (device) {
|
if (device) {
|
||||||
switch (device._type) {
|
switch (device._type) {
|
||||||
case ModelType.Signal:
|
case ModelType.Signal:
|
||||||
case ModelType.Switch:
|
case ModelType.Switch:
|
||||||
case ModelType.Station:
|
case ModelType.Station:
|
||||||
case ModelType.Section: {
|
case ModelType.Section: {
|
||||||
name += device.name;
|
name += device.name;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (device.stationCode) {
|
if (device.stationCode) {
|
||||||
const station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
|
const station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
|
||||||
if (station) {
|
if (station) {
|
||||||
name += '【' + station.name + '】';
|
name += '【' + station.name + '】';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return name;
|
return name;
|
||||||
},
|
},
|
||||||
doShow() {
|
doShow() {
|
||||||
this.dialogShow = true;
|
this.dialogShow = true;
|
||||||
this.queryList.data = [];
|
this.queryList.data = [];
|
||||||
getFailureGenerateRules({ skin: this.skinCode, group: this.group }).then(response => {
|
getFailureGenerateRules({ skin: this.skinCode, group: this.group }).then(response => {
|
||||||
const data = response.data;
|
const data = response.data;
|
||||||
data.forEach(elem => {
|
data.forEach(elem => {
|
||||||
this.queryList.data.push({
|
this.queryList.data.push({
|
||||||
id: elem.id,
|
id: elem.id,
|
||||||
condition: `${this.deviceMap[elem.condition.triggerDeviceType]}${this.formatNameByCode(elem.condition.triggerDeviceCode)} 状态：${FaultStatusEnum[elem.condition.triggerDeviceType][elem.condition.triggerDeviceStatus]}`,
|
condition: `${this.deviceMap[elem.condition.triggerDeviceType]}${this.formatNameByCode(elem.condition.triggerDeviceCode)} 状态：${FaultStatusEnum[elem.condition.triggerDeviceType][elem.condition.triggerDeviceStatus]}`,
|
||||||
target: `${this.deviceMap[elem.targetDeviceType]}${this.formatNameByCode(elem.targetDeviceCode)}`
|
target: `${this.deviceMap[elem.targetDeviceType]}${this.formatNameByCode(elem.targetDeviceCode)}`
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.dialogShow = false;
|
this.dialogShow = false;
|
||||||
},
|
},
|
||||||
getFailureModel(auto) {
|
getFailureModel(auto) {
|
||||||
const model = { auto };
|
const model = { auto };
|
||||||
if (auto) {
|
if (auto) {
|
||||||
const choose = this.$refs.pageRules.currentChoose();
|
const choose = this.$refs.pageRules.currentChoose();
|
||||||
if (choose) {
|
if (choose) {
|
||||||
choose.id ? Object.assign(model, { ruleId: choose.id }) : this.$messageBox(this.$t('display.faultChoose.selectRules'));
|
choose.id ? Object.assign(model, { ruleId: choose.id }) : this.$messageBox(this.$t('display.faultChoose.selectRules'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return model;
|
return model;
|
||||||
},
|
},
|
||||||
handleConfirm() {
|
handleConfirm() {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
const faultModel = this.getFailureModel(this.auto);
|
const faultModel = this.getFailureModel(this.auto);
|
||||||
setFailureMode(faultModel, this.group).then(() => {
|
setFailureMode(faultModel, this.group).then(() => {
|
||||||
this.$message.success(this.$t('display.faultChoose.setFaultSuccess'));
|
this.$message.success(this.$t('display.faultChoose.setFaultSuccess'));
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
this.$messageBox(this.$t('display.faultChoose.setFaultFail'));
|
this.$messageBox(this.$t('display.faultChoose.setFaultFail'));
|
||||||
});
|
});
|
||||||
|
|
||||||
this.doClose();
|
this.doClose();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
reloadTable() {
|
reloadTable() {
|
||||||
this.queryList.reload();
|
this.queryList.reload();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style scoped rel="stylesheet/scss" lang="scss">
|
<style scoped rel="stylesheet/scss" lang="scss">
|
||||||
|
|||||||
@ -7,43 +7,43 @@
|
|||||||
<script>
|
<script>
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'RunPlanLoad',
|
name: 'RunPlanLoad',
|
||||||
props: {
|
props: {
|
||||||
group: {
|
group: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
menus: null,
|
menus: null,
|
||||||
show: false
|
show: false
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
title() {
|
title() {
|
||||||
return this.$t('display.runPlan.runDiagramPlanTool');
|
return this.$t('display.runPlan.runDiagramPlanTool');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'$route.query.skinCode': function (code) {
|
'$route.query.skinCode': function (code) {
|
||||||
if (code) {
|
if (code) {
|
||||||
this.menus = this.$theme.loadPlanComponent(code);
|
this.menus = this.$theme.loadPlanComponent(code);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.menus = this.$theme.loadPlanComponent(this.$route.query.skinCode);
|
this.menus = this.$theme.loadPlanComponent(this.$route.query.skinCode);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
doShow() {
|
doShow() {
|
||||||
this.show = true;
|
this.show = true;
|
||||||
this.$refs.schedule.setPosition();
|
this.$refs.schedule.setPosition();
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.show = false;
|
this.show = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div style="height: 100%; overflow-y: auto;">
|
<div style="height: 100%; overflow-y: auto;">
|
||||||
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;" />
|
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;" />
|
||||||
<create-task ref="CreateTask" @reloadTable="reloadTable" />
|
<create-task ref="CreateTask" @reloadTable="reloadTable" />
|
||||||
<div class="draft">
|
<div class="draft">
|
||||||
<el-button-group>
|
<el-button-group>
|
||||||
|
|||||||
@ -18,7 +18,6 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
cityList: [],
|
|
||||||
pagerConfig: {
|
pagerConfig: {
|
||||||
pageSize: 'pageSize',
|
pageSize: 'pageSize',
|
||||||
pageIndex: 'pageNum'
|
pageIndex: 'pageNum'
|
||||||
@ -65,13 +64,6 @@ export default {
|
|||||||
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
|
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
|
||||||
tagType: (row) => { return 'success'; }
|
tagType: (row) => { return 'success'; }
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: this.$t('publish.city'),
|
|
||||||
prop: 'cityCode',
|
|
||||||
type: 'tag',
|
|
||||||
columnValue: (row) => { return this.$convertField(row.cityCode, this.cityList, ['code', 'name']); },
|
|
||||||
tagType: (row) => { return 'success'; }
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: this.$t('publish.lessonIntroduction'),
|
title: this.$t('publish.lessonIntroduction'),
|
||||||
prop: 'remarks'
|
prop: 'remarks'
|
||||||
@ -123,7 +115,6 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
loadInitData() {
|
loadInitData() {
|
||||||
this.cityList = [];
|
|
||||||
this.mapList = [];
|
this.mapList = [];
|
||||||
getPublishMapListOnline().then(resp => {
|
getPublishMapListOnline().then(resp => {
|
||||||
this.mapList = resp.data;
|
this.mapList = resp.data;
|
||||||
@ -131,14 +122,6 @@ export default {
|
|||||||
this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name});
|
this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
this.$Dictionary.cityType().then(list => {
|
|
||||||
this.cityList = list;
|
|
||||||
this.cityList.forEach(elem => {
|
|
||||||
this.queryForm.queryObject.cityCode.config.data.push({ value: elem.code, label: elem.name });
|
|
||||||
});
|
|
||||||
}).catch(() => {
|
|
||||||
this.$messageBox(this.$t('error.loadingCityListFailed'));
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
// 编辑
|
// 编辑
|
||||||
handleEdit(index, row) {
|
handleEdit(index, row) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user