joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整查询地图列表接口

Browse Source
This commit is contained in:
fan 2019-11-08 16:22:05 +08:00
parent 713f411ffc
commit e677b24f6d
39 changed files with 697 additions and 843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/jmap/map.js
View File

@ -40,7 +40,7 @@ export function getPublishMapDetailById(id) {
});
}
/** 获取发布地图列表*/
/** 获取发布地图列表(不包含项目线路)*/
export function listPublishMap(params) {
return request({
url: `/api/map/list`,

230
src/jmap/theme/beijing_01/menusPlan/managePlanList.vue
View File

@ -16,126 +16,126 @@
<script>
import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('publish.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('publish.runPlanName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: '加载日期',
prop: 'loadTime'
},
{
type: 'button',
title: '操作',
width: '100',
buttons: [
{
name: '删除',
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('publish.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('publish.runPlanName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: '加载日期',
prop: 'loadTime'
},
{
type: 'button',
title: '操作',
width: '100',
buttons: [
{
name: '删除',
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
currentModel: {}
};
},
computed: {
title() {
return '运行图计划表';
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
listPublishMap().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
currentModel: {}
};
},
computed: {
title() {
return '运行图计划表';
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
getPublishMapListOnline().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success('删除成功');
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox('删除失败');
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success('删除成功');
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox('删除失败');
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>

230
src/jmap/theme/chengdu_03/menusPlan/managePlanList.vue
View File

@ -16,126 +16,126 @@
<script>
import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('publish.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('publish.runPlanName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: '加载日期',
prop: 'loadTime'
},
{
type: 'button',
title: '操作',
width: '100',
buttons: [
{
name: '删除',
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('publish.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('publish.runPlanName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: '加载日期',
prop: 'loadTime'
},
{
type: 'button',
title: '操作',
width: '100',
buttons: [
{
name: '删除',
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
currentModel: {}
};
},
computed: {
title() {
return '运行图计划表';
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
listPublishMap().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
currentModel: {}
};
},
computed: {
title() {
return '运行图计划表';
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
getPublishMapListOnline().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success('删除成功');
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox('删除失败');
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success('删除成功');
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox('删除失败');
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>

230
src/jmap/theme/chengdu_04/menusPlan/managePlanList.vue
View File

@ -16,126 +16,126 @@
<script>
import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('publish.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('publish.runPlanName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: '加载日期',
prop: 'loadTime'
},
{
type: 'button',
title: '操作',
width: '100',
buttons: [
{
name: '删除',
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('publish.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('publish.runPlanName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: '加载日期',
prop: 'loadTime'
},
{
type: 'button',
title: '操作',
width: '100',
buttons: [
{
name: '删除',
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
currentModel: {}
};
},
computed: {
title() {
return '运行图计划表';
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
listPublishMap().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
currentModel: {}
};
},
computed: {
title() {
return '运行图计划表';
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
getPublishMapListOnline().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success('删除成功');
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox('删除失败');
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success('删除成功');
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox('删除失败');
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>

230
src/jmap/theme/fuzhou_01/menusPlan/managePlanList.vue
View File

@ -16,126 +16,126 @@
<script>
import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('menu.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('menu.runGraphName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: this.$t('menu.loadDate'),
prop: 'loadTime'
},
{
type: 'button',
title: this.$t('global.operate'),
width: '100',
buttons: [
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
name: 'ManagePlanList',
data() {
return {
dialogShow: false,
loading: false,
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '140px',
reset: true
},
queryList: {
query: this.queryFunction,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('menu.mapName'),
prop: 'mapId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
tagType: (row) => { return ''; }
},
{
title: this.$t('menu.runGraphName'),
prop: 'templatePlanId',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: this.$t('menu.loadDate'),
prop: 'loadTime'
},
{
type: 'button',
title: this.$t('global.operate'),
width: '100',
buttons: [
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
}
]
}
],
actions: [
{ text: this.$t('global.create'), btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
]
},
currentModel: {}
};
},
computed: {
title() {
return this.$t('menu.operationChartSchedule');
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
listPublishMap().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
currentModel: {}
};
},
computed: {
title() {
return this.$t('menu.operationChartSchedule');
}
},
mounted() {
this.loadPageData();
},
methods: {
loadPageData() {
this.mapList = [];
getPublishMapListOnline().then(resp => {
this.mapList = resp.data;
});
this.templatePlanList = [];
listAllTempLateRunPlan().then(resp => {
this.templatePlanList = resp.data;
});
},
queryFunction(params) {
if (this.$route.query.mapId) {
params['mapId'] = this.$route.query.mapId;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
if (this.$store.state.user.id) {
params['userId'] = this.$store.state.user.id;
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm(this.$t('tip.deleteTheRunningGraphLoadedTheNextDay'), this.$t('tip.hint'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success(this.$t('global.successfullyDelete'));
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox(this.$t('global.failDelete'));
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
return getRunPlanLoadList(params);
},
handleDelete(index, row) {
this.$confirm(this.$t('tip.deleteTheRunningGraphLoadedTheNextDay'), this.$t('tip.hint'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
deleteRunPlanLoad(row.id).then(response => {
this.$message.success(this.$t('global.successfullyDelete'));
this.reloadTable();
}).catch(() => {
this.reloadTable();
this.$messageBox(this.$t('global.failDelete'));
});
}).catch(() => { });
},
handleCreateRunPlan() {
this.$emit('dispatchDialog', { name: 'createWeekPlan' });
},
doShow() {
this.dialogShow = true;
this.$nextTick(()=> { this.reloadTable(); });
},
doClose() {
this.loading = false;
this.dialogShow = false;
},
reloadTable() {
this.queryList.reload();
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>

4
src/utils/baseUrl.js
View File

@ -3,10 +3,10 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 杜闪
BASE_API = 'http://192.168.3.41:9000'; // 杜闪
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
} else {
BASE_API = process.env.VUE_APP_BASE_API;

14
src/utils/mapList.js Normal file
View File

@ -0,0 +1,14 @@
import { getSessionStorage } from '@/utils/auth';
import { listPublishMap, getMapListByProjectCode } from '@/api/jmap/map';
import { ProjectCode } from '@/scripts/ConstDic';
export async function getMapListByProject() {
const project = getSessionStorage('project');
let mapList = [];
if (project.endsWith('xty')) {
mapList = await getMapListByProjectCode(ProjectCode[project]);
} else {
mapList = await listPublishMap();
}
return mapList;
}

4
src/views/approval/lesson/index.vue
View File

@ -14,7 +14,7 @@
<script>
import {adminPublishLesson, rejectedLessonRelease, reviewLessonList} from '@/api/designPlatform';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import LessonDetail from './detail';
export default {
@ -124,7 +124,7 @@ export default {
};
},
created() {
listPublishMap().then(response=>{
getPublishMapListOnline().then(response=>{
this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name }; });
this.queryForm.queryObject.mapId.config.data = this.mapList;
});

4
src/views/approval/runPlan/index.vue
View File

@ -8,7 +8,7 @@
<script>
import RunPlanOperate from './operate';
import { reviewRunPlanList, publishRunPlan, rejectRunPlan, previewRunPlan } from '@/api/designPlatform';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { launchFullscreen } from '@/utils/screen';
import { UrlConfig } from '@/router/index';
@ -117,7 +117,7 @@ export default {
try {
// 获取地图
this.mapList = [];
const res = await listPublishMap();
const res = await getPublishMapListOnline();
this.mapList = res.data.map(elem => { return { value: elem.id, label: elem.name }; });
this.queryForm.queryObject.mapId.config.data = this.mapList;
} catch (error) {

4
src/views/approval/script/index.vue
View File

@ -10,7 +10,7 @@ import { UrlConfig } from '@/router/index';
import { scriptDraftRecordNotify } from '@/api/simulation';
import ScriptOperate from './operate';
import { reviewScriptList, publishScript, rejectScript } from '@/api/designPlatform';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'ScriptApproval',
components: {
@ -117,7 +117,7 @@ export default {
try {
// 获取地图
this.mapList = [];
const res = await listPublishMap();
const res = await getPublishMapListOnline();
this.allMapList = res.data;
this.mapList = res.data.map(elem => { return { value: elem.id, label: elem.name }; });
this.queryForm.queryObject.mapId.config.data = this.mapList;

1
src/views/designPlatform/demonList.vue
View File

@ -124,7 +124,6 @@ export default {
} else {
res = await listPublishMap({cityCode: filterSelect});
}
res.data && res.data.forEach(elem=>{
// elem.children.find(n => { return n.name.includes("行调")})
elem.children = [

4
src/views/designUser/mapmanage/create.vue
View File

@ -47,11 +47,11 @@
<script>
import { newMap, newUsePublishMap } from '@/api/jmap/mapdraft';
import { listPublishMap } from '@/api/jmap/map';
// import XLSX from 'xlsx';
// import { translate, translateSheetTitle } from '@/scripts/translate';
// import { sheet_to_json } from '@/utils/Export2Excel';
import { getLineCodeList } from '@/api/management/mapline';
import { getMapListByProject } from '@/utils/mapList';
export default {
name: 'MapCreate',
@ -132,7 +132,7 @@ export default {
this.$Dictionary.cityType().then(list => {
this.cityList = list;
});
listPublishMap().then(response => {
getMapListByProject().then(response => {
this.publishMapList = response.data;
}).catch(() => {
this.$messageBox(this.$t('map.failedLoadListPublishedMaps'));

4
src/views/lesson/lessoncategory/edit/chapter/list.vue
View File

@ -15,7 +15,7 @@
<script>
import { getProductList } from '@/api/management/mapprd';
import { pageQueryTraining } from '@/api/jmap/training';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import localStore from 'storejs';
import { EventBus } from '@/scripts/event-bus';
@ -168,7 +168,7 @@ export default {
});
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
});

4
src/views/lesson/lessoncategory/edit/lesson/index.vue
View File

@ -59,7 +59,7 @@
<script>
import { createLesson, updateLesson, getLessonDetail } from '@/api/jmap/lessondraft';
import { getCommodityMapProduct } from '@/api/management/mapprd';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { UrlConfig } from '@/router/index';
export default {
@ -106,7 +106,7 @@ export default {
},
mounted() {
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
});
},

4
src/views/lesson/taskmanage/createTask.vue
View File

@ -10,7 +10,7 @@
<script>
import { addAutoGenerateTask } from '@/api/management/task';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'CreateTask',
@ -55,7 +55,7 @@ export default {
methods: {
loadInitData() {
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data.map(elem => { return { value: elem.id, label: elem.name }; });
});
this.taskStatusList = [];

4
src/views/lesson/taskmanage/list.vue
View File

@ -12,7 +12,7 @@
<script>
import { getTaskList, postTask, postTaskCancel } from '@/api/management/task';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import CreateTask from './createTask';
export default {
@ -117,7 +117,7 @@ export default {
methods: {
loadInitData() {
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
});
this.taskStatusList = [];

4
src/views/lesson/trainingRule/addEdit.vue
View File

@ -10,7 +10,7 @@
<script>
import { postTrainingRulesData, putTrainingRulesData, getPlaceholderList } from '@/api/management/operation';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'TrainingEdit',
@ -111,7 +111,7 @@ export default {
// this.$refs.dataform.resetForm();
this.mapIdList = [];
this.productTypesList = [{ value:'01', label:'现地'}, {value:'02', label:'行调'}];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data.map(item => {
const params = {};
params.label = item.name;

4
src/views/lesson/trainingRule/saveAs.vue
View File

@ -17,7 +17,7 @@
<script>
import { postOperateSaveAs } from '@/api/management/operation';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'AddBatch',
@ -86,7 +86,7 @@ export default {
init() {
// 获取已发布地图列表
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data.map(item => {
const params = {};
params.label = item.name;

4
src/views/lesson/trainingmanage/index.vue
View File

@ -21,7 +21,7 @@ import { pageQueryTraining } from '@/api/jmap/training';
import { trainingNotify } from '@/api/simulation';
import { getCommodityMapProduct, getProductList } from '@/api/management/mapprd';
import { launchFullscreen } from '@/utils/screen';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { UrlConfig } from '@/router/index';
import TrainingDraft from './draft';
import localStore from 'storejs';
@ -162,7 +162,7 @@ export default {
async loadInitData() {
this.mapIdList = [];
this.queryForm.queryObject.prdId.config.data = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
});
getCommodityMapProduct(this.$route.query.mapId).then((response) => {

4
src/views/orderauthor/author/draft/ruleForm.vue
View File

@ -77,7 +77,7 @@
<script>
import { UrlConfig } from '@/router/index';
import { createLessonPermisson, getPermissionList, putPermissonDetail } from '@/api/management/author';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import ChoosePermission from './choosePermission';
import { EventBus } from '@/scripts/event-bus';
import { setTimeout } from 'timers';
@ -143,7 +143,7 @@ export default {
try {
// 获取地图
this.mapList = [];
const res = await listPublishMap();
const res = await getPublishMapListOnline();
res.data.forEach(elem => {
this.mapList.push({ value: elem.id, label: elem.name });
});

4
src/views/orderauthor/author/index.vue
View File

@ -9,7 +9,7 @@
<script>
import { getLessonPermissonPageList } from '@/api/management/author';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { UrlConfig } from '@/router/index';
import Edit from './draft/edit';
import Create from './create';
@ -154,7 +154,7 @@ export default {
});
// 获取地图
this.mapList = [];
listPublishMap().then(res => {
getPublishMapListOnline().then(res => {
res.data.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
this.mapList.push({ value: elem.id, label: elem.name });

4
src/views/orderauthor/order/addGoods.vue
View File

@ -14,7 +14,7 @@
<script>
import { getCommodityList } from '@/api/management/goods';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'AddGoods',
@ -153,7 +153,7 @@ export default {
try {
// 获取地图
this.mapList = [];
const res = await listPublishMap();
const res = await getPublishMapListOnline();
res.data.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
this.mapList.push({ value: elem.id, label: elem.name });

4
src/views/orderauthor/permission/create/permission.vue
View File

@ -108,7 +108,7 @@
<script>
import ChoosePermission from '../../author/draft/choosePermission';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { getPermissionGoods, postsPermissionGoods } from '@/api/management/goods';
import { postFindPermission } from '@/api/management/order';
@ -237,7 +237,7 @@ export default {
try {
// 获取地图
this.mapList = [];
const res = await listPublishMap();
const res = await getPublishMapListOnline();
res.data.forEach(elem => {
this.mapList.push({ value: elem.id, label: elem.name });
});

4
src/views/package/draft/ruleForm.vue
View File

@ -67,13 +67,13 @@
</template>
<script>
import { listPublishMap } from '@/api/jmap/map';
import { getPublishLessonList } from '@/api/jmap/lesson';
import { getCommodityMapProduct } from '@/api/management/mapprd';
import { packagePermissionDistribute } from '@/api/management/distribute';
import QrCode from '@/components/QrCode';
import EditRule from './editRule';
import CanTransfer from './canDistribute';
import { getMapListByProject } from '@/utils/mapList';
export default {
name: 'PackRule',
@ -160,7 +160,7 @@ export default {
});
this.PublishMapList = [];
listPublishMap().then(response => {
getMapListByProject().then(response => {
const list = response.data || [];
this.PublishMapList = list.map(elem => {
return { value: elem.id, label: elem.name };

139
src/views/planMonitor/planmanage/planList.vue
View File

@ -1,139 +0,0 @@
<template>
<el-card v-loading="loading" class="map-list-main">
<div slot="header" class="clearfix">
<span>{{ $t('global.mapList') }}</span>
</div>
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" />
<el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
<el-tree
ref="tree"
:data="treeList"
node-key="id"
highlight-current
:default-expanded-keys="defaultShowKeys"
:props="defaultProps"
:span="22"
@node-click="clickEvent"
@node-contextmenu="showContextMenu"
>
<span slot-scope="{ node: nd, data }">
<span
class="el-icon-tickets"
:style="{color: data.valid ? 'green':''}"
></span>
<span :style="{color: data.valid ? 'green':''}">&nbsp;{{ nd.label }}</span>
</span>
</el-tree>
</el-scrollbar>
</el-card>
</template>
<script>
import FilterCity from '@/views/components/filterCity';
import { listPublishMap } from '@/api/jmap/map';
// import { queryPermissionScreen } from '@/api/management/author';
import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
import { UrlConfig } from '@/router/index';
export default {
name: 'ExamDetailList',
components: {
FilterCity
},
props: {
height: {
type: Number,
required: true
}
},
data() {
return {
loading: true,
queryFunction: listPublishMap,
defaultShowKeys: [],
filterText: '',
treeData: [],
treeList: [],
selected: {},
defaultProps: {
children: 'children',
label: 'name'
},
node: {
},
screenList: []
};
},
watch: {
filterText(val) {
this.treeList = this.treeData.filter((res) => {
return res.name.includes(val);
});
}
},
created() {
},
beforeDestroy () {
removeSessionStorage('planMonitorList');
},
methods: {
filterNode(value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
showContextMenu(e, obj, node, vueElem) {
if (obj) {
this.node = node;
this.selected = obj;
}
},
clickEvent(obj) {
setSessionStorage('planMonitorList', obj.id);
this.$router.push({ path: `${UrlConfig.plan.detail}/${obj.id}` });
},
refresh(filterSelect) {
this.loading = true;
this.treeData = this.treeList = [];
listPublishMap().then(res => {
(res.data || []).forEach(ele => {
if (ele.cityCode == filterSelect) {
ele.valid = true;
this.treeData.push(ele);
}
});
this.treeList = this.filterText
? this.treeData.filter((res) => {
return res.name.includes(this.filterText);
})
: this.treeData;
if (this.treeList.length == 0) {
this.$router.push({ path: `${UrlConfig.plan.prefix}/home` });
} else {
this.$nextTick(() => {
const mapId = getSessionStorage('planMonitorList') || (this.treeList[0] || { id: 0 }).id;
this.$router.push({ path: `${UrlConfig.plan.detail}/${mapId}` });
this.$refs.tree.setCurrentKey(mapId); // value 绑定的node-key
});
}
this.$nextTick(() => { this.loading = false; });
}).catch(() => {
this.loading = false;
this.$messageBox(this.$t('error.refreshFailed'));
});
}
}
};
</script>
<style>
.el-tree {
overflow-x: hidden;
}
.el-tree-node.is-current>.el-tree-node__content {
background-color: #e4e3e3 !important;
}
</style>

4
src/views/publish/productStatus/index.vue
View File

@ -6,7 +6,7 @@
<script>
import { getProductList, putMapProductOnLine, putMapProductOffLine } from '@/api/management/mapprd';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'PublishExam',
@ -95,7 +95,7 @@ export default {
});
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
});
},

4
src/views/publish/runPlanCommon/chooseTemplatePlan.vue
View File

@ -10,7 +10,7 @@
<script>
import { runPlanTemplateList } from '@/api/runplan';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'ChooseTemplatePlan',
@ -67,7 +67,7 @@ export default {
loadInitData() {
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
});
},

4
src/views/publish/runPlanCommon/draft.vue
View File

@ -36,7 +36,7 @@
</template>
<script>
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { createRunPlanCommon } from '@/api/runplan';
import ChooseTemplatePlan from './chooseTemplatePlan';
@ -82,7 +82,7 @@ export default {
},
methods: {
initLoadPage() {
listPublishMap().then(resp => {
getPublishMapListOnline().then(resp => {
this.mapList = resp.data;
});
},

4
src/views/publish/runPlanCommon/index.vue
View File

@ -8,7 +8,7 @@
import { superAdmin } from '@/router';
import { getRunPlanLoadList, listAllTempLateRunPlan, deleteDailyRunPlanLoad, postDailyRunPlanLoadGenerate, postSchedulingCommonGenerate } from '@/api/runplan';
import { UrlConfig } from '@/router/index';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
name: 'RunPlanCommon',
@ -95,7 +95,7 @@ export default {
methods: {
loadPageData() {
this.mapList = [];
listPublishMap().then(resp => {
getPublishMapListOnline().then(resp => {
this.mapList = resp.data;
this.mapList.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });

4
src/views/publish/runPlanEveryDay/index.vue
View File

@ -6,7 +6,7 @@
<script>
import { superAdmin } from '@/router';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { runPlanEveryDayList, deleteRunPlanEveryDay } from '@/api/runplan';
import { UrlConfig } from '@/router/index';
@ -93,7 +93,7 @@ export default {
methods: {
loadInitData() {
this.mapList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapList = response.data;
response.data.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });

4
src/views/publish/runPlanTemplate/copyPlan.vue
View File

@ -24,7 +24,7 @@
</template>
<script>
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
data() {
@ -59,7 +59,7 @@ export default {
this.formMdoel.name = row.name;
this.formMdoel.mapId = '';
this.show = true;
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
if (this.mapIdList.length) {
this.mapIdList.forEach(item => {

4
src/views/publish/runPlanTemplate/index.vue
View File

@ -7,7 +7,7 @@
<script>
import { superAdmin } from '@/router';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { runPlanTemplateList, deleteRunPlanTemplate, generateCommonRunPlanEveryDay, postRunPlanTemplate } from '@/api/runplan';
import { UrlConfig } from '@/router/index';
import CopyPlan from './copyPlan.vue';
@ -102,7 +102,7 @@ export default {
methods: {
loadInitData() {
this.mapIdList = [];
listPublishMap().then(response => {
getPublishMapListOnline().then(response => {
this.mapIdList = response.data;
response.data.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });

1
src/views/scriptManage/create.vue
View File

@ -9,7 +9,6 @@
</template>
<script>
import { listPublishMap } from '@/api/jmap/map';
import { getQuestById} from '@/api/quest';
export default {

14
src/views/system/existingSimulation/index.vue
View File

@ -34,13 +34,6 @@ export default {
type: 'text',
label: this.$t('global.mobile')
},
skinCode: {
type: 'select',
label: this.$t('system.skinCode'),
config: {
data: this.$ConstSelect.skinCode
}
},
prdType: {
type: 'select',
label: this.$t('system.prdType'),
@ -115,13 +108,6 @@ export default {
}
}
},
{
title: this.$t('system.skinCode'),
prop: 'skinCode',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.skinCode, this.$ConstSelect.skinCode, ['value', 'label']); },
tagType: (row) => { return 'success'; }
},
{
title: this.$t('system.simulationType'),
prop: 'type',

1
src/views/system/systemGenerate/create.vue
View File

@ -12,7 +12,6 @@
<script>
import ConstConfig from '@/scripts/ConstConfig';
import Cookies from 'js-cookie';
// import { listPublishMap } from '@/api/jmap/map';
import { getCommodityMapProduct } from '@/api/management/mapprd';
export default {
name: 'CreateSubSystem',

4
src/views/system/systemGenerate/index.vue
View File

@ -9,7 +9,7 @@
<script>
import Cookies from 'js-cookie';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { generateMapSystem, getMapSystemPageList, createMapSubSystem, getSubSystemInfo, updateSubSystem, deleteSubSystem} from '@/api/trainingPlatform';
import ConstConfig from '@/scripts/ConstConfig';
import OnceGenerate from './generate';
@ -168,7 +168,7 @@ export default {
try {
// 获取地图
this.mapList = [];
const res = await listPublishMap();
const res = await getPublishMapListOnline();
this.allMapList = res.data;
res.data.forEach(elem => {
this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });

126
src/views/system/userControl/correlationMap.vue
View File

@ -8,77 +8,77 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleCorrelation">{{$t('global.confirm')}}</el-button>
<el-button @click="dialogVisible = false">{{$t('global.cancel')}}</el-button>
<el-button type="primary" @click="handleCorrelation">{{ $t('global.confirm') }}</el-button>
<el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
</span>
</el-dialog>
</template>
<script>
import { listPublishMap } from '@/api/jmap/map';
import { getPublishMapListOnline } from '@/api/jmap/map';
import { getUserSubscribe, saveUserSubscribe } from '@/api/management/user';
export default {
name: 'MapCorrelation',
data() {
return {
dialogVisible: false,
mapDict: {},
mapList: [],
formModel: {
wxId: '',
userId: '',
mapIdList: []
}
};
},
mounted() {
this.mapDict = {};
listPublishMap().then(response => {
this.mapList = response.data;
this.mapList.forEach(elem => {
this.mapDict[elem.id] = elem.name;
});
});
},
methods: {
doClose(done) {
this.dialogVisible = false;
},
doShow(data) {
this.dialogVisible = true;
this.formModel.userId = data.id;
this.formModel.wxId = data.wxId;
this.formModel.mapIdList = [];
if (this.formModel.userId) {
getUserSubscribe(this.formModel.userId).then(response => {
const list = response.data;
list.forEach(elem => {
this.formModel.mapIdList.push(elem.id);
});
});
}
},
handleCorrelation() {
const model = {
userId: this.formModel.userId,
wxId: this.formModel.wxId,
mapList: []
};
name: 'MapCorrelation',
data() {
return {
dialogVisible: false,
mapDict: {},
mapList: [],
formModel: {
wxId: '',
userId: '',
mapIdList: []
}
};
},
mounted() {
this.mapDict = {};
getPublishMapListOnline().then(response => {
this.mapList = response.data;
this.mapList.forEach(elem => {
this.mapDict[elem.id] = elem.name;
});
});
},
methods: {
doClose(done) {
this.dialogVisible = false;
},
doShow(data) {
this.dialogVisible = true;
this.formModel.userId = data.id;
this.formModel.wxId = data.wxId;
this.formModel.mapIdList = [];
if (this.formModel.userId) {
getUserSubscribe(this.formModel.userId).then(response => {
const list = response.data;
list.forEach(elem => {
this.formModel.mapIdList.push(elem.id);
});
});
}
},
handleCorrelation() {
const model = {
userId: this.formModel.userId,
wxId: this.formModel.wxId,
mapList: []
};
if (this.formModel.mapIdList && this.formModel.mapIdList.length) {
this.formModel.mapIdList.forEach(mapId => {
model.mapList.push({ id: mapId, name: this.mapDict[mapId] });
});
}
saveUserSubscribe(model).then(response => {
this.$message.success(this.$t('tip.setUpASubscriptionMapSuccessfully'));
this.doClose();
}).catch(() => {
this.$message.success(this.$t('tip.setUpASubscriptionMapFailed'));
this.doClose();
});
}
}
if (this.formModel.mapIdList && this.formModel.mapIdList.length) {
this.formModel.mapIdList.forEach(mapId => {
model.mapList.push({ id: mapId, name: this.mapDict[mapId] });
});
}
saveUserSubscribe(model).then(response => {
this.$message.success(this.$t('tip.setUpASubscriptionMapSuccessfully'));
this.doClose();
}).catch(() => {
this.$message.success(this.$t('tip.setUpASubscriptionMapFailed'));
this.doClose();
});
}
}
};
</script>

218
src/views/system/userControl/index.vue
View File

@ -12,118 +12,118 @@ import DictionaryEdit from './edit';
import CorrelationMap from './correlationMap';
export default {
name: 'UserControl',
components: {
DictionaryEdit,
CorrelationMap
},
data() {
return {
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '80px',
reset: true,
queryObject: {
name: {
type: 'text',
label: this.$t('system.name')
},
roles: {
type: 'select',
label: this.$t('system.roles'),
config: {
data: this.$ConstSelect.roleList
}
}
}
name: 'UserControl',
components: {
DictionaryEdit,
CorrelationMap
},
data() {
return {
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
},
queryForm: {
labelWidth: '80px',
reset: true,
queryObject: {
name: {
type: 'text',
label: this.$t('system.name')
},
roles: {
type: 'select',
label: this.$t('system.roles'),
config: {
data: this.$ConstSelect.roleList
}
}
}
},
queryList: {
query: getUserList,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('system.name'),
prop: 'name'
},
{
title: this.$t('system.nickname'),
prop: 'nickname'
},
{
title: this.$t('global.mobile'),
prop: 'mobile'
},
{
title: this.$t('global.email'),
prop: 'email'
},
{
title: this.$t('system.roles'),
prop: 'roles',
type: 'tagMore',
columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); },
tagType: (row) => { return 'success'; }
},
{
type: 'button',
title: this.$t('global.operate'),
width: '250',
buttons: [
{
name: this.$t('global.edit'),
handleClick: this.handleUserEdit
},
{
name: this.$t('system.subscribeMap'),
handleClick: this.handleMapCorrelation,
type: 'danger'
}
]
}
]
},
currentModel: {}
};
},
created() {
},
methods: {
// 编辑
handleUserEdit(index, row) {
this.$refs.edit.doShow(row);
},
},
queryList: {
query: getUserList,
selectCheckShow: false,
indexShow: true,
columns: [
{
title: this.$t('system.name'),
prop: 'name'
},
{
title: this.$t('system.nickname'),
prop: 'nickname'
},
{
title: this.$t('global.mobile'),
prop: 'mobile'
},
{
title: this.$t('global.email'),
prop: 'email'
},
{
title: this.$t('system.roles'),
prop: 'roles',
type: 'tagMore',
columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); },
tagType: (row) => { return 'success'; }
},
{
type: 'button',
title: this.$t('global.operate'),
width: '250',
buttons: [
{
name: this.$t('global.edit'),
handleClick: this.handleUserEdit
},
{
name: this.$t('system.subscribeMap'),
handleClick: this.handleMapCorrelation,
type: 'danger'
}
]
}
]
},
currentModel: {}
};
},
created() {
},
methods: {
// 编辑
handleUserEdit(index, row) {
this.$refs.edit.doShow(row);
},
// 删除
handleUserDelete(index, row) {
this.$confirm(this.$t('system.wellDelType'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
// delPublishMap(row.id).then(response => {
// this.$message.success('删除成功')
// this.reloadTable()
// localStore.remove('mapId')
// }).catch(error => {
// this.reloadTable()
// this.$messageBox('删除失败')
// })
});
},
// 删除
handleUserDelete(index, row) {
this.$confirm(this.$t('system.wellDelType'), this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancel'),
type: 'warning'
}).then(() => {
// delPublishMap(row.id).then(response => {
// this.$message.success('删除成功')
// this.reloadTable()
// localStore.remove('mapId')
// }).catch(error => {
// this.reloadTable()
// this.$messageBox('删除失败')
// })
});
},
// 关联地图
handleMapCorrelation(index, row) {
this.$refs.correlationMap.doShow(row);
},
// 关联地图
handleMapCorrelation(index, row) {
this.$refs.correlationMap.doShow(row);
},
reloadTable() {
this.queryList.reload();
}
}
reloadTable() {
this.queryList.reload();
}
}
};
</script>

4
src/views/system/userSimulation/index.vue
View File

@ -8,7 +8,6 @@
<script>
import { getSimulationList, deleteSimulationStats } from '@/api/simulation';
import { listPublishMap } from '@/api/jmap/map';
import { getPublishLessonList } from '@/api/jmap/lesson';
import UsersTrainingEdit from './edit';
@ -23,7 +22,6 @@ export default {
return {
examResultList: [],
LessonList: [],
mapList: [],
pagerConfig: {
pageSize: 'pageSize',
pageIndex: 'pageNum'
@ -103,8 +101,6 @@ export default {
},
methods: {
async loadInitData() {
const res = await listPublishMap();
this.mapList = res.data;
const response = await getPublishLessonList();
const data = response.data;
if (data && data.length) {