Merge remote-tracking branch 'remotes/origin/test'
This commit is contained in:
joylink_cuiweidong
commit
72b4fc5f25
59
.eslintrc.js
59
.eslintrc.js
@ -25,31 +25,31 @@ module.exports = {
|
||||
"vue/no-v-html": "off",
|
||||
'accessor-pairs': 2,
|
||||
"arrow-spacing": 0,//=>的前/后括号
|
||||
'block-spacing': [2, 'always'],
|
||||
'brace-style': [2, '1tbs', {
|
||||
'block-spacing': [2, 'always'], // 禁止或强制在代码块中开括号前和闭括号后有空格 { return 11 }
|
||||
'brace-style': [2, '1tbs', { // 强制在代码块中使用一致的大括号风格
|
||||
'allowSingleLine': true
|
||||
}],
|
||||
'camelcase': [0, {
|
||||
'camelcase': [0, { // 强制使用驼峰拼写法命名规定
|
||||
'properties': 'always'
|
||||
}],
|
||||
'comma-dangle': [2, 'never'],
|
||||
'comma-spacing': [2, {
|
||||
'comma-dangle': [2, 'never'], // 要求或禁止末尾逗号
|
||||
'comma-spacing': [2, { // 强制在逗号前后使用一致的空格
|
||||
'before': false,
|
||||
'after': true
|
||||
}],
|
||||
'comma-style': [2, 'last'],
|
||||
'constructor-super': 2,
|
||||
'curly': [2, 'multi-line'],
|
||||
'dot-location': [2, 'property'],
|
||||
'eol-last': 2,
|
||||
'comma-style': [2, 'last'], // 强制在逗号前后使用一致的空格
|
||||
'constructor-super': 2, // 要求在构造函数中有super()调用
|
||||
'curly': [2, 'multi-line'], // 强制所有控制语句使用一致的括号风格
|
||||
'dot-location': [2, 'property'], // 强制在点号之前和之后一致的换行
|
||||
'eol-last': 2, // 禁止文件末尾存在空行禁止文件末尾存在空行
|
||||
'generator-star-spacing': [2, {
|
||||
'before': true,
|
||||
'after': true
|
||||
}],
|
||||
'handle-callback-err': [2, '^(err|error)$'],
|
||||
'indent': ["error", "tab"],
|
||||
'jsx-quotes': [2, 'prefer-single'],
|
||||
'key-spacing': [2, {
|
||||
'indent': [2, 4], // 强制使用一致的缩进
|
||||
'jsx-quotes': [2, 'prefer-single'], // 强制在JSX属性中一致地使用双引号或单引号
|
||||
'key-spacing': [0, { // 强制要求在对象字面量的属性中键和值之间使用一致的间距
|
||||
'beforeColon': false,
|
||||
'afterColon': true
|
||||
}],
|
||||
@ -58,8 +58,8 @@ module.exports = {
|
||||
'after': true
|
||||
}],
|
||||
"new-cap": 2,//函数名首行大写必须使用new方式调用，首行小写必须用不带new方式调用
|
||||
'new-parens': 2,
|
||||
'no-array-constructor': 2,
|
||||
'new-parens': 2, // 要求构造无参构造函数时有圆括号
|
||||
'no-array-constructor': 2, // 禁用Array构造函数
|
||||
'no-caller': 2,
|
||||
'no-console': 'off',
|
||||
'no-class-assign': 2,
|
||||
@ -94,9 +94,10 @@ module.exports = {
|
||||
}],
|
||||
'no-lone-blocks': 2,
|
||||
"no-mixed-spaces-and-tabs": [2, false],//禁止混用tab和空格
|
||||
"no-multi-spaces": 1,//不能用多余的空格
|
||||
"no-multi-spaces": 1,// 不能用多余的空格
|
||||
'no-multi-str': 2,
|
||||
'no-multiple-empty-lines': [2, {
|
||||
'no-multiple-empty-lines': [2, { // 禁止出现多行空行
|
||||
// 最大连续空行数
|
||||
'max': 1
|
||||
}],
|
||||
'no-native-reassign': 2,
|
||||
@ -121,7 +122,7 @@ module.exports = {
|
||||
'no-sparse-arrays': 2,
|
||||
'no-this-before-super': 2,
|
||||
'no-throw-literal': 2,
|
||||
"no-trailing-spaces": 1,//一行结束后面不要有空格
|
||||
"no-trailing-spaces": 1,// 禁止行尾空格
|
||||
'no-undef': 2,
|
||||
'no-undef-init': 2,
|
||||
'no-unexpected-multiline': 2,
|
||||
@ -139,7 +140,7 @@ module.exports = {
|
||||
'no-useless-computed-key': 2,
|
||||
'no-useless-constructor': 2,
|
||||
'no-useless-escape': 0,
|
||||
'no-whitespace-before-property': 2,
|
||||
'no-whitespace-before-property': 2, // 禁止属性前有空白
|
||||
'no-with': 2,
|
||||
'one-var': [2, {
|
||||
'initialized': 'never'
|
||||
@ -150,21 +151,21 @@ module.exports = {
|
||||
':': 'before'
|
||||
}
|
||||
}],
|
||||
"padded-blocks": 0,//块语句内行首行尾是否要空行
|
||||
"padded-blocks": 0, // 块语句内行首行尾是否要空行
|
||||
'quotes': [2, 'single', {
|
||||
'avoidEscape': true,
|
||||
'allowTemplateLiterals': true
|
||||
}],
|
||||
'semi': [2, 'always'], //语句强制分号结尾
|
||||
'semi-spacing': [2, {
|
||||
'semi': [2, 'always'], // 语句强制分号结尾
|
||||
'semi-spacing': [2, { // 强制分号之前和之后使用一致的空格
|
||||
'before': false,
|
||||
'after': true
|
||||
}],
|
||||
"strict": 2,//使用严格模式
|
||||
'space-before-blocks': [2, 'always'], //不以新行开始的块{前面要不要有空格
|
||||
"space-before-function-paren": [0, "always"],//函数定义时括号前面要不要有空格
|
||||
"space-in-parens": [0, "never"],//小括号里面要不要有空格
|
||||
"space-infix-ops": 0,//中缀操作符周围要不要有空格
|
||||
'space-before-blocks': [2, 'always'], // 不以新行开始的块{前面要不要有空格 强制在块之前使用一致的空格
|
||||
"space-before-function-paren": [0, "always"],// 函数定义时括号前面要不要有空格
|
||||
"space-in-parens": [0, "never"],// 小括号里面要不要有空格
|
||||
"space-infix-ops": 2,// 要求操作符周围有空格
|
||||
'space-unary-ops': [2, {
|
||||
'words': true,
|
||||
'nonwords': false
|
||||
@ -172,7 +173,7 @@ module.exports = {
|
||||
'spaced-comment': [2, 'always', {
|
||||
'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
|
||||
}], //注释风格要不要有空格什么的
|
||||
'template-curly-spacing': [2, 'never'],
|
||||
// 'template-curly-spacing': [2, 'never'],
|
||||
'use-isnan': 2, //禁止比较时使用NaN，只能用isNaN()
|
||||
'valid-typeof': 2, //必须使用合法的typeof的值
|
||||
"wrap-iife": [2, "inside"],//立即执行函数表达式的小括号风格
|
||||
@ -180,7 +181,7 @@ module.exports = {
|
||||
'yoda': [2, 'never'], //禁止尤达条件
|
||||
'prefer-const': 2,
|
||||
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
|
||||
"object-curly-spacing": [0, "never"],//大括号内是否允许不必要的空格
|
||||
"array-bracket-spacing": [2, "never"], //是否允许非空数组里面有多余的空格
|
||||
"object-curly-spacing": [0, "never"], // 强制在大括号中使用一致的空格
|
||||
"array-bracket-spacing": [2, "never"], // 禁止或强制在括号内使用空格
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,3 +65,12 @@ export function getCommodityProductLesson(prdCode) {
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
/** 更新发布课程信息*/
|
||||
export function updatePublishLesson(data) {
|
||||
return request({
|
||||
url: `/api/lesson/${data.id}/nameAndRemarks`,
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
@ -115,7 +115,7 @@ export function updatePublishMapName(data) {
|
||||
});
|
||||
}
|
||||
|
||||
/** 修改发布地图名称*/
|
||||
/** 获取发布地图详情*/
|
||||
export function getPublishMapDetailList(params, code) {
|
||||
return request({
|
||||
url: `/api/map/${code}/versions`,
|
||||
@ -132,7 +132,7 @@ export function hasDoorStationList(mapId) {
|
||||
});
|
||||
}
|
||||
|
||||
/** 修改发布地图名称*/
|
||||
/** 修改发布地图城市*/
|
||||
export function updatePublishMapCity(data) {
|
||||
return request({
|
||||
url: `/api/map/${data.mapId}/city`,
|
||||
@ -140,3 +140,20 @@ export function updatePublishMapCity(data) {
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
/** 设置归属项目 */
|
||||
export function setMapProject(data) {
|
||||
return request({
|
||||
url: `/api/map/${data.id}/project`,
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
/** 根据定制项目编号查询地图列表 */
|
||||
export function getMapListByProjectCode(projectCode) {
|
||||
return request({
|
||||
url: `/api/map/project/${projectCode}/list`,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
@ -26,9 +26,9 @@ export function getScriptById(id) {
|
||||
});
|
||||
}
|
||||
/** 通过ID查询未发布剧本的详细信息 */
|
||||
export function getDraftScriptById(id) {
|
||||
export function getDraftScriptByGroup(group) {
|
||||
return request({
|
||||
url: `/api/script/draft/${id}/detail`,
|
||||
url: `/api/simulation/${group}/script/loadedScript`,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
@ -425,3 +425,12 @@ export function handlerIbpEvent(group, data) {
|
||||
data: data
|
||||
});
|
||||
}
|
||||
|
||||
/** 预览脚本仿真*/
|
||||
export function scriptDraftRecordNotify(scriptId) {
|
||||
return request({
|
||||
url: `/api/simulation/scriptDraft/${scriptId}`,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -85,3 +85,11 @@ export function deleteSubSystem(id) {
|
||||
});
|
||||
}
|
||||
|
||||
export function getSubSystemByProjectCode(projectCode) {
|
||||
/** 根据项目编号查询地图子系统 */
|
||||
return request({
|
||||
url: `/api/mapSystem/project/${projectCode}`,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -39,6 +39,7 @@
|
||||
<el-input
|
||||
v-model="formModel[item.prop]"
|
||||
type="textarea"
|
||||
:autosize='item.isAutoSize||false'
|
||||
:placeholder="item.placeholder"
|
||||
:disabled="item.disabled"
|
||||
:style="{width: item.tooltip ? 'calc(100% - 50px)' : '100%'}"
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
style="padding-top: 18px;"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-col :span="leftSpan">
|
||||
<template v-for="(colNum, rIndex) in rowColumnList">
|
||||
<el-row :key="rIndex" :gutter="20">
|
||||
<template v-for="(field, name, index) in queryObject">
|
||||
@ -127,8 +127,8 @@
|
||||
</el-row>
|
||||
</template>
|
||||
</el-col>
|
||||
<el-col :span="5" :offset="1">
|
||||
<el-button type="primary" size="small" :disabled="!canQuery" @click="query">{{ $t('global.query') }}</el-button>
|
||||
<el-col :span="24-leftSpan-1" :offset="1">
|
||||
<el-button style="margin-right: 10px" type="primary" size="small" :disabled="!canQuery" @click="query">{{ $t('global.query') }}</el-button>
|
||||
<el-button v-if="queryForm.reset" type="primary" size="small" :disabled="!canQuery" @click="doClean">{{ $t('global.reset') }}</el-button>
|
||||
<el-button v-if="exportFlag" type="primary" size="small" :disabled="!canQuery" @click="doExport">{{ $t('global.export') }}</el-button>
|
||||
<template v-for="(button, index) in queryList.actions">
|
||||
@ -138,8 +138,8 @@
|
||||
:type="button.type ? button.type: 'primary'"
|
||||
size="small"
|
||||
:style="button.style"
|
||||
@click="button.handler"
|
||||
class="button_style"
|
||||
@click="button.handler"
|
||||
>{{ button.text }}</el-button>
|
||||
</template>
|
||||
</el-col>
|
||||
@ -173,6 +173,12 @@ export default {
|
||||
canQuery: {
|
||||
type: Boolean,
|
||||
required: true
|
||||
},
|
||||
leftSpan: {
|
||||
type: Number,
|
||||
default() {
|
||||
return 18;
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@ -481,7 +487,9 @@ export default {
|
||||
max-width: 240px;
|
||||
min-width: 100px;
|
||||
}
|
||||
.button_style {
|
||||
.el-button+.el-button {
|
||||
margin-right:10px;
|
||||
margin-left: 0;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
<template>
|
||||
<div class="query-list-page" :style="{height: queryList.height ? 'auto' : listPageHeight}">
|
||||
<!-- :style="{height: queryList.height ? 'auto' : listPageHeight}" -->
|
||||
<div class="query-list-page">
|
||||
<query-form
|
||||
v-show="!(queryForm.show === false)"
|
||||
ref="queryForm"
|
||||
:query-form="queryForm"
|
||||
:left-span="queryForm.leftSpan"
|
||||
:query-list="queryList"
|
||||
:before-query="queryForm.beforeQuery"
|
||||
:can-query="canQuery"
|
||||
|
||||
@ -21,6 +21,10 @@ export default {
|
||||
passedScriptFailed: 'Passed script failed',
|
||||
rejectScriptSuccess: 'Reject script success',
|
||||
rejectScriptFailed: 'Reject script failed',
|
||||
passedRunPlanSuccess: 'Passed run plan success',
|
||||
passedRunPlanFailed: 'Passed run plan failed',
|
||||
rejectRunPlanSuccess: 'reject run plan success',
|
||||
rejectRunPlanFailed: 'reject run plan failed',
|
||||
runPlanName: 'Run Plan Name',
|
||||
passedRunPlan: 'Passed Run Plan',
|
||||
rejectRunPlan: 'Reject Run Plan',
|
||||
|
||||
@ -5,6 +5,7 @@ export default {
|
||||
lessonName: 'Lesson Name',
|
||||
updateMapName: 'Update Map Name',
|
||||
updateCityName: 'Update City',
|
||||
updateLesson: 'Modify Lesson',
|
||||
updateTime: 'Update Time',
|
||||
operationSuccess: 'Operate successfully',
|
||||
deleteSuccess: 'Delete successfully',
|
||||
|
||||
@ -232,6 +232,7 @@ export default {
|
||||
enterCourseName: 'Please enter the course name',
|
||||
selectAssociatedProduct: 'Please select the associated product',
|
||||
enterCourseDescription: 'Please enter the course description',
|
||||
pleaseLessonIntroduction: 'Please enter the course description',
|
||||
courseIdIsEmpty: 'Course Id is empty',
|
||||
selectCity: 'Please select city',
|
||||
enterStandardTime: 'Please enter standard time',
|
||||
|
||||
@ -205,5 +205,6 @@ export default {
|
||||
publishTheCourseHint: 'This operation will publish the course. Are you sure?',
|
||||
rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!',
|
||||
rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!',
|
||||
duplicatePlanFailedTips: 'The interval needs to be more than 30 seconds or the times is more than 1'
|
||||
duplicatePlanFailedTips: 'The interval needs to be more than 30 seconds or the times is more than 1',
|
||||
createSwitchPortion: 'The relevant turnout is not formed'
|
||||
};
|
||||
|
||||
@ -21,6 +21,12 @@ export default {
|
||||
passedScriptFailed: '通过剧本失败',
|
||||
rejectScriptSuccess: '驳回剧本成功',
|
||||
rejectScriptFailed: '驳回剧本失败',
|
||||
|
||||
passedRunPlanSuccess: '通过剧本成功',
|
||||
passedRunPlanFailed: '通过剧本失败',
|
||||
rejectRunPlanSuccess: '驳回剧本成功',
|
||||
rejectRunPlanFailed: '驳回剧本失败',
|
||||
|
||||
runPlanName: '运行图名称',
|
||||
passedRunPlan: '通过运行图',
|
||||
rejectRunPlan: '驳回运行图',
|
||||
|
||||
@ -6,6 +6,7 @@ export default {
|
||||
updateMapName: '更新地图名称',
|
||||
updateCityName: '更新城市',
|
||||
updateTime: '更新时间',
|
||||
updateLesson: '修改课程',
|
||||
operationSuccess: '操作成功',
|
||||
deleteSuccess: '删除成功',
|
||||
wellDelType: '此操作将删除该类型, 是否继续?',
|
||||
|
||||
@ -242,6 +242,7 @@ export default {
|
||||
enterCourseName: '请输入课程名称',
|
||||
selectAssociatedProduct: '请选择关联产品',
|
||||
enterCourseDescription: '请输入课程说明',
|
||||
pleaseLessonIntroduction: '请输入课程简介',
|
||||
courseIdIsEmpty: '课程Id为空',
|
||||
selectCity: '请选择城市',
|
||||
enterStandardTime: '请输入标准用时',
|
||||
|
||||
@ -205,5 +205,6 @@ export default {
|
||||
publishTheCourseHint: '此操作将发布课程，是否确定？',
|
||||
rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功！',
|
||||
rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败！',
|
||||
duplicatePlanFailedTips: '间隔时间需要大于30秒或次数大于1'
|
||||
duplicatePlanFailedTips: '间隔时间需要大于30秒或次数大于1',
|
||||
createSwitchPortion: '相关道岔未生成'
|
||||
};
|
||||
|
||||
@ -40,6 +40,7 @@ class Jlmap {
|
||||
initMapInstance(opts) {
|
||||
const width = opts.dom.clientWidth;
|
||||
const height = opts.dom.clientHeight;
|
||||
this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
|
||||
|
||||
this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
|
||||
|
||||
@ -125,6 +126,7 @@ class Jlmap {
|
||||
if (this.$options.disabled == true) {
|
||||
this.$mouseController.disable();
|
||||
} else {
|
||||
opts['zoomOnMouseWheel'] = this.zoomOnMouseWheel;
|
||||
this.$mouseController.enable(opts);
|
||||
}
|
||||
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
<template>
|
||||
<section class="app-main">
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper">
|
||||
<transition name="fade" mode="out-in">
|
||||
<router-view />
|
||||
</transition>
|
||||
</el-scrollbar>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'AppMain',
|
||||
computed: {
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -26,17 +26,18 @@ export default {
|
||||
Qcode
|
||||
},
|
||||
data() {
|
||||
|
||||
return {
|
||||
entryList: [
|
||||
{
|
||||
name: 'global.designPlatformEntrance',
|
||||
handle: this.goToDesign,
|
||||
hidden: getSessionStorage('project') === 'design'
|
||||
hidden: getSessionStorage('project').startsWith('design')
|
||||
},
|
||||
{
|
||||
name: 'global.trainingPlatformEntrance',
|
||||
handle: this.goToTraining,
|
||||
hidden: getSessionStorage('project') !== 'design'
|
||||
hidden: !getSessionStorage('project').startsWith('design')
|
||||
},
|
||||
{
|
||||
name: 'global.scan',
|
||||
@ -46,7 +47,7 @@ export default {
|
||||
{
|
||||
name: 'global.quickEntry',
|
||||
handle: this.quickEntry,
|
||||
hidden: getSessionStorage('project') === 'design'
|
||||
hidden: getSessionStorage('project').startsWith('design')
|
||||
},
|
||||
{
|
||||
name: LangStorage.getLang('zh')==='zh'?'English':'中文',
|
||||
@ -62,6 +63,9 @@ export default {
|
||||
computed: {
|
||||
username() {
|
||||
return this.$store.state.user.nickname;
|
||||
},
|
||||
project() {
|
||||
return getSessionStorage('project');
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
@ -81,19 +85,37 @@ export default {
|
||||
},
|
||||
goToDesign() {
|
||||
const routeData = this.$router.resolve({
|
||||
path: '/design'
|
||||
path: this.getPath()
|
||||
});
|
||||
window.open(routeData.href, '_blank');
|
||||
},
|
||||
goToTraining() {
|
||||
const routeData = this.$router.resolve({
|
||||
path: '/'
|
||||
path: this.getPath()
|
||||
});
|
||||
window.open(routeData.href, '_blank');
|
||||
},
|
||||
switchLanguage() {
|
||||
this.$i18n.locale = this.lang;
|
||||
LangStorage.setLang(this.lang);
|
||||
},
|
||||
getPath() {
|
||||
let path = '/';
|
||||
switch (this.project) {
|
||||
case 'login':
|
||||
path = '/design/login';
|
||||
break;
|
||||
case 'xty':
|
||||
path='/designxty/login';
|
||||
break;
|
||||
case 'design':
|
||||
path = '/login';
|
||||
break;
|
||||
case 'designxty':
|
||||
path= '/xty/login';
|
||||
break;
|
||||
}
|
||||
return path;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
export { default as Navbar } from './Navbar';
|
||||
export { default as Sidebar } from './Sidebar';
|
||||
export { default as AppMain } from './AppMain';
|
||||
// export { default as AppMain } from './AppMain';
|
||||
|
||||
@ -119,7 +119,7 @@
|
||||
<script>
|
||||
import md5 from 'js-md5';
|
||||
import { getInfo } from '@/api/login';
|
||||
import { getDesignToken } from '@/utils/auth'; // 验权
|
||||
import { getDesignToken, getToken } from '@/utils/auth'; // 验权
|
||||
import { getUserinfoName, getUserinfoNickname, getUserinfoMobile, getUserinfoMobileCode, getUserinfoEmailCode, getUserinfoEmail, getUserinfoPassword } from '@/api/management/user';
|
||||
import { setInterval, clearInterval } from 'timers';
|
||||
|
||||
@ -187,7 +187,8 @@ export default {
|
||||
},
|
||||
doShow() {
|
||||
this.visible = true;
|
||||
getInfo(getDesignToken()).then(response => {
|
||||
const token = getToken() || getDesignToken();
|
||||
getInfo(token).then(response => {
|
||||
const user = response.data;
|
||||
this.userInfo = {
|
||||
name: user.name,
|
||||
|
||||
@ -2,22 +2,28 @@
|
||||
<div class="app-wrapper" :class="classObj">
|
||||
<div class="main-container">
|
||||
<navbar />
|
||||
<app-main :style="{width: width+'px', height: height+'px'}" />
|
||||
<el-footer style="height:30px;text-align:right;line-height: 30px;">
|
||||
<span style="font-size:14px;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</span>
|
||||
<section class="app-main" :style="{height: height+'px'}">
|
||||
<!-- <el-scrollbar wrap-class="scrollbar-wrapper app_scrollbar_box"> -->
|
||||
<transition name="fade" mode="out-in">
|
||||
<router-view />
|
||||
</transition>
|
||||
<!-- </el-scrollbar> -->
|
||||
</section>
|
||||
<el-footer class="footers" style="height:30px;">
|
||||
<div style="font-size:14px;float:left;">北京玖琏科技有限公司 联系电话: 13201793090 </div>
|
||||
<div style="font-size:14px;float:right;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</div>
|
||||
</el-footer>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { Navbar, AppMain } from './components'; // Sidebar
|
||||
import { Navbar } from './components'; // Sidebar
|
||||
|
||||
export default {
|
||||
name: 'Layout',
|
||||
components: {
|
||||
Navbar,
|
||||
AppMain
|
||||
Navbar
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -40,7 +46,7 @@ export default {
|
||||
return this.$store.state.app.width;
|
||||
},
|
||||
height() {
|
||||
return this.$store.state.app.height-60-30;
|
||||
return this.$store.state.app.height - 90;
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@ -70,6 +76,10 @@ export default {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.app-main{
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.drawer-bg {
|
||||
background: #000;
|
||||
opacity: 0.3;
|
||||
@ -80,4 +90,64 @@ export default {
|
||||
position: absolute;
|
||||
z-index: 999;
|
||||
}
|
||||
.footers{
|
||||
line-height: 30px;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
bottom: 0;
|
||||
background: #fff;
|
||||
border-top: 1px #ebeef5 solid;
|
||||
}
|
||||
</style>
|
||||
<style rel="stylesheet/scss" lang="scss">
|
||||
.app_scrollbar_box{
|
||||
.el-scrollbar__view{
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
// 定义公共card样式
|
||||
.joylink-card{
|
||||
border: 1px solid #EBEEF5;
|
||||
background-color: #FFF;
|
||||
color: #303133;
|
||||
transition: .3s;
|
||||
box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
|
||||
}
|
||||
|
||||
// 谷歌、safari、qq浏览器、360浏览器滚动条样式
|
||||
// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
|
||||
::-webkit-scrollbar {
|
||||
width: 6px;
|
||||
// height: 110px;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
/*定义滚动条轨道 内阴影+圆角*/
|
||||
::-webkit-scrollbar-track {
|
||||
// box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
|
||||
border-radius: 10px;
|
||||
background-color: #FFFFFF;;
|
||||
}
|
||||
/*定义滑块 内阴影+圆角*/
|
||||
::-webkit-scrollbar-thumb {
|
||||
border-radius: 10px;
|
||||
// box-shadow: inset 0 0 6px rgba(0,0,0,.3);
|
||||
background-color: #eaeaea;
|
||||
}
|
||||
/*滑块效果*/
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
border-radius: 5px;
|
||||
// box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
background: rgba(0,0,0,0.4);
|
||||
}
|
||||
/*IE滚动条颜色*/
|
||||
html {
|
||||
scrollbar-face-color:#bfbfbf;/*滚动条颜色*/
|
||||
scrollbar-highlight-color:#000;
|
||||
scrollbar-3dlight-color:#000;
|
||||
scrollbar-darkshadow-color:#000;
|
||||
scrollbar-Shadow-color:#adadad;/*滑块边色*/
|
||||
scrollbar-arrow-color:rgba(0,0,0,0.4);/*箭头颜色*/
|
||||
scrollbar-track-color:#eeeeee;/*背景颜色*/
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -15,7 +15,7 @@ function hasPermission(roles, permissionRoles) {
|
||||
return roles.some(role => permissionRoles.indexOf(role) >= 0);
|
||||
}
|
||||
|
||||
const whiteList = ['/login', '/design/login', '/xty/login']; // 不重定向白名单
|
||||
const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login']; // 不重定向白名单
|
||||
|
||||
const loginPage = whiteList[0];
|
||||
|
||||
@ -23,23 +23,29 @@ const loginDesignPage = whiteList[1];
|
||||
|
||||
const loginXtyPage = whiteList[2];
|
||||
|
||||
const loginDesignXtyPage = whiteList[3];
|
||||
|
||||
// 获取路径数据
|
||||
function getRouteInfo(to) {
|
||||
let loginPath = '/';
|
||||
let getTokenInfo = () => { };
|
||||
let clientId = '';
|
||||
const toRoutePath = to.redirectedFrom || to.path;
|
||||
if (/^\/design/.test(toRoutePath) || /^\/scriptDisplay/.test(toRoutePath) || /^\/publish/.test(toRoutePath) || /^\/orderauthor/.test(toRoutePath) || /^\/system/.test(toRoutePath)|| /^\/display\/record/.test(toRoutePath) || /^\/display\/manage/.test(toRoutePath) || /^\/apply/.test(toRoutePath)) {
|
||||
loginPath = loginDesignPage;
|
||||
if (/^\/designxty/.test(toRoutePath)) {
|
||||
loginPath = loginDesignXtyPage;
|
||||
getTokenInfo = getDesignToken;
|
||||
clientId = LoginParams.Design.clientId;
|
||||
} else if (/^\/design/.test(toRoutePath) || /^\/scriptDisplay/.test(toRoutePath) || /^\/publish/.test(toRoutePath) || /^\/orderauthor/.test(toRoutePath) || /^\/system/.test(toRoutePath) || /^\/display\/record/.test(toRoutePath) || /^\/display\/manage/.test(toRoutePath) || /^\/apply/.test(toRoutePath)) {
|
||||
loginPath = getSessionStorage('project') === 'designxty' ? loginDesignXtyPage : loginDesignPage;
|
||||
getTokenInfo = getDesignToken;
|
||||
clientId = LoginParams.Design.clientId;
|
||||
} else if (/^\/plan/.test(toRoutePath) || /^\/display\/plan/.test(toRoutePath)) {
|
||||
if (getSessionStorage('project')==='design') {
|
||||
loginPath = loginDesignPage;
|
||||
if (getSessionStorage('project').startsWith('design')) {
|
||||
loginPath = getSessionStorage('project') === 'designxty' ? loginDesignXtyPage : loginDesignPage;
|
||||
getTokenInfo = getDesignToken;
|
||||
clientId = LoginParams.Design.clientId;
|
||||
} else {
|
||||
loginPath = getSessionStorage('project')==='xty'?loginXtyPage:loginPage;
|
||||
loginPath = getSessionStorage('project') === 'xty' ? loginXtyPage : loginPage;
|
||||
getTokenInfo = getToken;
|
||||
clientId = null;
|
||||
}
|
||||
@ -48,7 +54,7 @@ function getRouteInfo(to) {
|
||||
getTokenInfo = getToken;
|
||||
clientId = null;
|
||||
} else {
|
||||
loginPath = getSessionStorage('project')==='xty'?loginXtyPage:loginPage;
|
||||
loginPath = getSessionStorage('project') === 'xty' ? loginXtyPage : loginPage;
|
||||
getTokenInfo = getToken;
|
||||
clientId = null;
|
||||
}
|
||||
@ -62,7 +68,7 @@ function handleRoute(to, from, next, routeInfo) {
|
||||
store.dispatch('GetInfo', routeInfo.getTokenInfo).then(res => {
|
||||
// 根据roles权限生成可访问的路由表
|
||||
const roles = res.roles;
|
||||
if (getSessionStorage('project')==='design') {
|
||||
if (getSessionStorage('project').startsWith('design')) {
|
||||
roles.push(userDesign);
|
||||
}
|
||||
store.dispatch('GenerateRoutes', { roles, clientId: routeInfo.clientId }).then(() => {
|
||||
@ -85,12 +91,8 @@ function handleRoute(to, from, next, routeInfo) {
|
||||
} else {
|
||||
// 除没有动态改变权限的需求可直接next() 删下方权限判断
|
||||
if (hasPermission(store.getters.roles, to.meta.roles)) {
|
||||
if (to.path==='/404' && to.redirectedFrom==='/') {
|
||||
if (getSessionStorage('project') === 'design') {
|
||||
next('/design/home');
|
||||
} else {
|
||||
next(localStore.get('trainingPlatformRoute'+store.getters.id) ||'/trainingPlatform');
|
||||
}
|
||||
if (to.path === '/404' && to.redirectedFrom === '/') {
|
||||
next(localStore.get('trainingPlatformRoute' + store.getters.id) || '/trainingPlatform');
|
||||
} else {
|
||||
next();
|
||||
}
|
||||
|
||||
@ -147,7 +147,7 @@ export const userLesson = '012'; // 教学系统
|
||||
export const userSimulation = '013'; // 仿真系统
|
||||
export const userScreen = '014'; // 大屏系统
|
||||
export const userPlan = '015'; // 计划系统
|
||||
export const userDesign='016'; // 设计系统
|
||||
export const userDesign = '016'; // 设计系统
|
||||
const isDev = process.env.NODE_ENV === 'development';
|
||||
|
||||
export const UrlConfig = {
|
||||
@ -279,12 +279,27 @@ export const constantRoutes = [
|
||||
component: Login,
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/xty',
|
||||
redirect: '/xty/login',
|
||||
hidden: true
|
||||
},
|
||||
// 设计平台登录
|
||||
{
|
||||
path: '/design/login',
|
||||
component: Login,
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/designxty/login',
|
||||
component: Login,
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/designxty',
|
||||
redirect: '/designxty/login',
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: '/design/jlmap3d/edit',
|
||||
component: Jlmap3dedit,
|
||||
@ -557,7 +572,6 @@ export const asyncRouter = [
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
redirect: '/trainingPlatform/permission/14',
|
||||
component: TrainingPlatform,
|
||||
meta: {
|
||||
},
|
||||
@ -1065,7 +1079,7 @@ const router = createRouter();
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
const project = getSessionStorage('project');
|
||||
document.title = loginTitle[project||'login'];
|
||||
document.title = loginTitle[project || 'login'];
|
||||
next();
|
||||
});
|
||||
|
||||
|
||||
@ -2200,5 +2200,11 @@ export const IbpOperation = {
|
||||
export const loginTitle = {
|
||||
xty: '西铁院实训平台',
|
||||
login: '城市轨道交通实训平台',
|
||||
design: '城市轨道交通设计平台'
|
||||
design: '城市轨道交通设计平台',
|
||||
designxty: '西铁院设计平台'
|
||||
};
|
||||
|
||||
export const ProjectCode = {
|
||||
xty: 'XTY',
|
||||
designxty: 'XTY'
|
||||
};
|
||||
|
||||
@ -48,7 +48,7 @@ function hasPermission(roles, route, parentsRoles) {
|
||||
// }
|
||||
// }
|
||||
// return roles.some(role => route.meta.roles.indexOf(role) >= 0);
|
||||
if (getSessionStorage('project')==='design') {
|
||||
if (getSessionStorage('project').startsWith('design')) {
|
||||
roles= roles.filter(function (role) {
|
||||
return route.meta.roles.indexOf(role) >= 0;
|
||||
});
|
||||
|
||||
@ -3,9 +3,9 @@ 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.6:9000'; // 旭强
|
||||
// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
|
||||
} else {
|
||||
BASE_API = process.env.VUE_APP_BASE_API;
|
||||
|
||||
@ -158,22 +158,22 @@
|
||||
handleConfirmPass(data){
|
||||
publishRunPlan(data.id,data).then(resp => {
|
||||
if(resp.data.length<=0){
|
||||
this.$message.success(this.$t('approval.passedScriptSuccess'));
|
||||
this.$message.success(this.$t('approval.passedRunPlanSuccess'));
|
||||
}
|
||||
else{
|
||||
this.$messageBox(`${this.$t('approval.passedScriptFailed')}: ${resp.data[0]}`);
|
||||
this.$messageBox(`${this.$t('approval.passedRunPlanFailed')}: ${resp.data[0]}`);
|
||||
}
|
||||
this.reloadTable();
|
||||
}).catch(error => {
|
||||
this.$messageBox(`${this.$t('approval.passedScriptFailed')}: ${error.message}`);
|
||||
this.$messageBox(`${this.$t('approval.passedRunPlanFailed')}: ${error.message}`);
|
||||
})
|
||||
},
|
||||
handleConfirmReject(data){
|
||||
rejectRunPlan(data.id,data).then(resp => {
|
||||
this.reloadTable();
|
||||
this.$message.success(this.$t('approval.rejectScriptSuccess'));
|
||||
this.$message.success(this.$t('approval.rejectRunPlanSuccess'));
|
||||
}).catch(error => {
|
||||
this.$messageBox(`${this.$t('approval.rejectScriptFailed')}: ${error.message}`);
|
||||
this.$messageBox(`${this.$t('approval.rejectRunPlanFailed')}: ${error.message}`);
|
||||
})
|
||||
},
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
<script>
|
||||
import { launchFullscreen } from '@/utils/screen';
|
||||
import { UrlConfig } from '@/router/index';
|
||||
import { scriptRecordNotify } from '@/api/simulation';
|
||||
import { scriptDraftRecordNotify } from '@/api/simulation';
|
||||
import ScriptOperate from './operate';
|
||||
import { reviewScriptList,publishScript,rejectScript } from '@/api/designPlatform';
|
||||
import { listPublishMap } from '@/api/jmap/map';
|
||||
@ -148,7 +148,7 @@
|
||||
},
|
||||
scriptPreview(index,row){
|
||||
let mapInfo=this.allMapList.find(elem=>{return elem.id==row.mapId});
|
||||
scriptRecordNotify(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};
|
||||
this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
|
||||
launchFullscreen();
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<div slot="header" style="text-align: center;">
|
||||
<span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
|
||||
</div>
|
||||
<div class="simulation-detail" :style="{ height: height-190 +'px' }">
|
||||
<div class="simulation-detail" :style="{ height: height-230 +'px' }">
|
||||
<p class="list-item">
|
||||
<span class="list-label">{{ $t('demonstration.productDescription') }}</span>
|
||||
<span class="list-elem">{{ courseModel.remarks }}</span>
|
||||
|
||||
@ -1,39 +1,30 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card v-loading="loading" class="map-list-main" :header="$t('map.publishedMapList')">
|
||||
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @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"
|
||||
:props="defaultProps"
|
||||
highlight-current
|
||||
:span="22"
|
||||
:filter-node-method="filterNode"
|
||||
@node-click="clickEvent"
|
||||
>
|
||||
<!-- @node-contextmenu="showContextMenu" -->
|
||||
<span slot-scope="{ node:tnode, data }" >
|
||||
<span
|
||||
class="el-icon-tickets"
|
||||
:style="{color: data.valid ? 'green':''}"
|
||||
></span>
|
||||
<div v-loading="loading" class="joylink-card map-list-main">
|
||||
<div class="clearfix">
|
||||
<span>{{ $t('map.publishedMapList') }}</span>
|
||||
</div>
|
||||
<div class="text_item" style="height: calc(100% - 47px);">
|
||||
<filter-city v-if="project==='design'" ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
|
||||
<el-input v-if="project==='design'" v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
|
||||
<div style="height: calc(100% - 76px);">
|
||||
<el-tree ref="tree" class="tree_box" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent">
|
||||
<span slot-scope="{ node:tnode, data }">
|
||||
<span class="el-icon-tickets" :style="{color: data.valid ? 'green':''}" />
|
||||
<span> {{ tnode.label }}</span>
|
||||
</span>
|
||||
</el-tree>
|
||||
</el-scrollbar>
|
||||
</el-card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { listPublishMap } from '@/api/jmap/map';
|
||||
import { listPublishMap, getMapListByProjectCode } from '@/api/jmap/map';
|
||||
import { UrlConfig } from '@/router/index';
|
||||
import { superAdmin, admin } from '@/router';
|
||||
import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
|
||||
import FilterCity from '@/views/components/filterCity';
|
||||
import localStore from 'storejs';
|
||||
import { ProjectCode } from '@/scripts/ConstDic';
|
||||
|
||||
export default {
|
||||
name: 'PublicMapList',
|
||||
@ -41,10 +32,6 @@ export default {
|
||||
FilterCity
|
||||
},
|
||||
props: {
|
||||
height: {
|
||||
type: Number,
|
||||
required: true
|
||||
},
|
||||
width: {
|
||||
type: Number,
|
||||
required: true
|
||||
@ -70,10 +57,14 @@ export default {
|
||||
y: 0
|
||||
},
|
||||
editModel: {},
|
||||
localParamName: 'publish_cityCode',
|
||||
cityCode: ''
|
||||
localParamName: 'publish_cityCode'
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
project() {
|
||||
return getSessionStorage('project');
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
filterText(val) {
|
||||
this.treeList = this.treeData.filter((res) => {
|
||||
@ -84,6 +75,11 @@ export default {
|
||||
beforeDestroy () {
|
||||
removeSessionStorage('demonList');
|
||||
},
|
||||
mounted() {
|
||||
if (this.project === 'designxty') {
|
||||
this.refresh();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
filterNode(value, data) {
|
||||
if (!value) return true;
|
||||
@ -104,7 +100,7 @@ export default {
|
||||
}
|
||||
case 'lessonDesign': {
|
||||
setSessionStorage('designType', 'lessonDesign');
|
||||
this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: this.cityCode} });
|
||||
this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: obj.cityCode} });
|
||||
break;
|
||||
}
|
||||
case 'runPlanDesign': {
|
||||
@ -116,42 +112,43 @@ export default {
|
||||
setSessionStorage('demonList', obj.id);
|
||||
break;
|
||||
}
|
||||
case 'mapPreview':{
|
||||
case 'mapPreview': {
|
||||
this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
|
||||
break;
|
||||
}
|
||||
}
|
||||
// this.$refs.menu.doClose();
|
||||
},
|
||||
// async myrefresh(filterSelect){
|
||||
|
||||
// },
|
||||
async refresh(filterSelect) {
|
||||
this.cityCode=filterSelect;
|
||||
this.loading = true;
|
||||
this.treeData = this.treeList = [];
|
||||
try {
|
||||
const res = await listPublishMap({cityCode: filterSelect});
|
||||
let res = '';
|
||||
if (this.project === 'designxty') {
|
||||
res = await getMapListByProjectCode(ProjectCode[this.project]);
|
||||
} else {
|
||||
res = await listPublishMap({cityCode: filterSelect});
|
||||
}
|
||||
|
||||
res.data.forEach(elem=>{
|
||||
// debugger;
|
||||
res.data && res.data.forEach(elem=>{
|
||||
// elem.children.find(n => { return n.name.includes("行调")})
|
||||
elem.children=[
|
||||
elem.children = [
|
||||
{
|
||||
id:'1',
|
||||
name:this.$t('designPlatform.mapPreview'),
|
||||
type:'mapPreview',
|
||||
mapId: elem.id
|
||||
id: '1',
|
||||
name: this.$t('designPlatform.mapPreview'),
|
||||
type: 'mapPreview',
|
||||
mapId: elem.id,
|
||||
cityCode: elem.cityCode
|
||||
}
|
||||
];
|
||||
this.isAdministrator()?elem.children.push({id: '2',name: this.$t('designPlatform.lessonDesign'),type: 'lessonDesign',mapId: elem.id,skinCode: elem.skinCode}):'';
|
||||
this.isAdministrator() ? elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, skinCode: elem.skinCode, cityCode: elem.cityCode}) : '';
|
||||
elem.children.push(
|
||||
{
|
||||
id: '3',
|
||||
name: this.$t('designPlatform.scriptDesign'),
|
||||
type: 'scriptDesign',
|
||||
mapId: elem.id,
|
||||
skinCode: elem.skinCode
|
||||
skinCode: elem.skinCode,
|
||||
cityCode: elem.cityCode
|
||||
// code:elem.children.find(n => { return n.name.includes("行调")})
|
||||
});
|
||||
elem.children.push(
|
||||
@ -160,7 +157,8 @@ export default {
|
||||
name: this.$t('designPlatform.runPlanDesign'),
|
||||
type: 'runPlanDesign',
|
||||
mapId: elem.id,
|
||||
skinCode: elem.skinCode
|
||||
skinCode: elem.skinCode,
|
||||
cityCode: elem.cityCode
|
||||
}
|
||||
);
|
||||
});
|
||||
@ -186,10 +184,7 @@ export default {
|
||||
},
|
||||
isAdministrator() {
|
||||
return this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin);
|
||||
},
|
||||
// createMap() {
|
||||
// this.$emit("createMap");
|
||||
// },
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -205,6 +200,17 @@ export default {
|
||||
|
||||
.map-list-main{
|
||||
text-align:left;
|
||||
height: 100%;
|
||||
}
|
||||
.clearfix{
|
||||
padding: 0 20px;
|
||||
border-bottom: 1px solid #EBEEF5;
|
||||
box-sizing: border-box;
|
||||
height: 47px;
|
||||
line-height: 47px;
|
||||
}
|
||||
.tree_box{
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<el-card :style="{height: height+'px'}">
|
||||
<el-card>
|
||||
<div class="home-box" :style="{height: height+'px'}">
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper">
|
||||
<div class="content_box">
|
||||
<h1 class="title">
|
||||
城市轨道交通设计平台
|
||||
<!-- <img :src="logo" alt="" class="logo-img"> -->
|
||||
</h1>
|
||||
<div class="card-box">
|
||||
<el-carousel :interval="4000" type="card" height="380px">
|
||||
@ -14,20 +14,21 @@
|
||||
</el-carousel>
|
||||
</div>
|
||||
<div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
</div>
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import logo from '@/assets/logo.png';
|
||||
import home1 from '@/assets/home/home1.png';
|
||||
import home2 from '@/assets/home/home2.png';
|
||||
import home3 from '@/assets/home/demon1.jpg';
|
||||
import home4 from '@/assets/home/tring1.png';
|
||||
import home5 from '@/assets/home/tring4.jpg';
|
||||
import home6 from '@/assets/home/demon2.jpg';
|
||||
export default {
|
||||
import home1 from '@/assets/home/home1.png';
|
||||
import home2 from '@/assets/home/home2.png';
|
||||
import home3 from '@/assets/home/demon1.jpg';
|
||||
import home4 from '@/assets/home/tring1.png';
|
||||
import home5 from '@/assets/home/tring4.jpg';
|
||||
import home6 from '@/assets/home/demon2.jpg';
|
||||
|
||||
export default {
|
||||
name: 'Home',
|
||||
data() {
|
||||
return {
|
||||
@ -38,16 +39,15 @@
|
||||
{ src: home4 },
|
||||
{ src: home5 },
|
||||
{ src: home6 }
|
||||
],
|
||||
logo: logo
|
||||
]
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
height() {
|
||||
return this.$store.state.app.height - 50-30;
|
||||
return this.$store.state.app.height - 93;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
@ -57,11 +57,13 @@
|
||||
}
|
||||
|
||||
.home-box {
|
||||
padding: 15px 100px;
|
||||
float: left;
|
||||
width: 100%;
|
||||
font-family: 'Microsoft YaHei';
|
||||
|
||||
.content_box{
|
||||
padding: 0 100px 15px;
|
||||
}
|
||||
.title {
|
||||
font-size: 35px;
|
||||
width: 100%;
|
||||
|
||||
@ -1,14 +1,12 @@
|
||||
<template>
|
||||
<div class="app-wrapper">
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper">
|
||||
<div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
|
||||
<demon-list ref="demonList" :height="height" :width="widthLeft" />
|
||||
<demon-list ref="demonList" :width="widthLeft" />
|
||||
</div>
|
||||
<drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
|
||||
<transition>
|
||||
<router-view :product-list="productList" :widthLeft="widthLeft"/>
|
||||
<router-view :product-list="productList" :width-left="widthLeft" />
|
||||
</transition>
|
||||
</el-scrollbar>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -39,9 +37,6 @@ export default {
|
||||
...mapGetters([
|
||||
'lessonbar'
|
||||
]),
|
||||
height() {
|
||||
return this.$store.state.app.height - 50-30;
|
||||
},
|
||||
width() {
|
||||
return this.$store.state.app.width;
|
||||
}
|
||||
@ -77,14 +72,14 @@ export default {
|
||||
resize() {
|
||||
this.widthLeft = Number(localStore.get('LeftWidth')) || this.widthLeft;
|
||||
const width = this.$store.state.app.width - 521 - this.widthLeft;
|
||||
const height = this.$store.state.app.height - 90;
|
||||
this.$store.dispatch('config/resize', { width: width, height: height });
|
||||
// const height = this.$store.state.app.height - 90;
|
||||
this.$store.dispatch('config/resize', { width: width });
|
||||
},
|
||||
setMapResize(LeftWidth) {
|
||||
this.currentWidth=this.$store.state.app.width - this.widthLeft;
|
||||
const widths = this.$store.state.app.width - 521 - LeftWidth;
|
||||
const heights = this.$store.state.app.height - 90;
|
||||
this.$store.dispatch('config/resize', { width: widths, height: heights });
|
||||
// const heights = this.$store.state.app.height - 90;
|
||||
this.$store.dispatch('config/resize', { width: widths });
|
||||
}
|
||||
|
||||
}
|
||||
@ -102,8 +97,6 @@ export default {
|
||||
}
|
||||
|
||||
.examList {
|
||||
// position: fixed;
|
||||
// top: 61px;
|
||||
float: left;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@ -1,29 +1,32 @@
|
||||
<template>
|
||||
<div class="map-view">
|
||||
<jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
|
||||
<jlmap-visual ref="jlmapVisual" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import JlmapVisual from '@/views/jlmap/index';
|
||||
import { loadMapData, loadMapDataById } from '@/utils/loaddata';
|
||||
export default {
|
||||
name: 'mapPreview',
|
||||
import JlmapVisual from '@/views/jlmap/index';
|
||||
import { loadMapDataById } from '@/utils/loaddata';
|
||||
import { EventBus } from '@/scripts/event-bus';
|
||||
|
||||
export default {
|
||||
name: 'MapPreview',
|
||||
components: {
|
||||
JlmapVisual
|
||||
},
|
||||
data(){
|
||||
return{
|
||||
size: {
|
||||
width: document.documentElement.clientWidth - 400,
|
||||
height: document.documentElement.clientHeight-80
|
||||
},
|
||||
}
|
||||
},
|
||||
props: {
|
||||
widthLeft: {
|
||||
type: Number,
|
||||
required: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
size: {
|
||||
width: document.documentElement.clientWidth - 400,
|
||||
height: document.documentElement.clientHeight - 80
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
mapId() {
|
||||
return this.$route.params.mapId;
|
||||
@ -32,17 +35,8 @@
|
||||
return this.$store.state.app.height - 50-30;
|
||||
}
|
||||
},
|
||||
async beforeDestroy() {
|
||||
// await this.clearAllTimer();
|
||||
// if (!this.isReplay) {
|
||||
// await this.quit();
|
||||
// }
|
||||
// await this.$store.dispatch('training/reset');
|
||||
await this.$store.dispatch('map/mapClear');
|
||||
// EventBus.$off('clearCheckLogin');
|
||||
},
|
||||
watch: {
|
||||
widthLeft(val){
|
||||
widthLeft(val) {
|
||||
this.setWindowSize();
|
||||
},
|
||||
$route() {
|
||||
@ -57,14 +51,23 @@
|
||||
// },
|
||||
'$store.state.app.windowSizeCount': function() {
|
||||
this.setWindowSize();
|
||||
}
|
||||
},
|
||||
async beforeDestroy() {
|
||||
// await this.clearAllTimer();
|
||||
// if (!this.isReplay) {
|
||||
// await this.quit();
|
||||
// }
|
||||
// await this.$store.dispatch('training/reset');
|
||||
await this.$store.dispatch('map/mapClear');
|
||||
// EventBus.$off('clearCheckLogin');
|
||||
},
|
||||
async mounted() {
|
||||
await this.setWindowSize();
|
||||
await this.initLoadData();
|
||||
},
|
||||
methods:{
|
||||
async initLoadData(){
|
||||
methods: {
|
||||
async initLoadData() {
|
||||
if (parseInt(this.mapId)) {
|
||||
await this.loadMapDataById(this.mapId);
|
||||
} else {
|
||||
@ -94,23 +97,17 @@
|
||||
this.$nextTick(() => {
|
||||
EventBus.$emit('viewLoading', false);
|
||||
});
|
||||
},
|
||||
clickEvent(em){
|
||||
|
||||
},
|
||||
onContextmenu(em){
|
||||
|
||||
},
|
||||
setWindowSize() {
|
||||
this.$nextTick(() => {
|
||||
const width = this.$store.state.app.width-this.widthLeft;
|
||||
const width = this.$store.state.app.width-(this.widthLeft||450);
|
||||
const height = this.height;
|
||||
this.$store.dispatch('config/resize', { width, height });
|
||||
// this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.map-view {
|
||||
|
||||
@ -1,40 +1,26 @@
|
||||
<template>
|
||||
<el-card v-loading="loading" class="map-list-main" :header="$t('map.myMapList')">
|
||||
<div v-loading="loading" class="joylink-card map-list-main">
|
||||
<div class="clearfix">
|
||||
<span>{{ $t('map.myMapList') }}</span>
|
||||
</div>
|
||||
<div class="text_item" style="height: calc(100% - 47px);">
|
||||
<el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-185) +'px' }">
|
||||
<el-tree
|
||||
ref="tree"
|
||||
:data="treeList"
|
||||
node-key="id"
|
||||
:props="defaultProps"
|
||||
highlight-current
|
||||
:span="22"
|
||||
:filter-node-method="filterNode"
|
||||
@node-click="clickEvent"
|
||||
@node-contextmenu="showContextMenu"
|
||||
>
|
||||
<div style="height: calc(100% - 89px); overflow-y: auto;">
|
||||
<el-tree ref="tree" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent" @node-contextmenu="showContextMenu">
|
||||
<span slot-scope="{ node:tnode, data }">
|
||||
<span
|
||||
class="el-icon-tickets"
|
||||
:style="{color: data.valid ? 'green':''}"
|
||||
></span>
|
||||
<span class="el-icon-tickets" :style="{color: data.valid ? 'green':''}" />
|
||||
<span> {{ tnode.label }}</span>
|
||||
</span>
|
||||
</el-tree>
|
||||
</el-scrollbar>
|
||||
</div>
|
||||
<div class="buttonList">
|
||||
<el-button size="small" type="primary" class="eachButton uploadDemo ">
|
||||
<input
|
||||
ref="files"
|
||||
type="file"
|
||||
class="file_box"
|
||||
accept=".json, application/json"
|
||||
@change="importf"
|
||||
>
|
||||
<input ref="files" type="file" class="file_box" accept=".json, application/json" @change="importf">
|
||||
{{ $t('map.importMap') }}
|
||||
</el-button>
|
||||
<el-button size="small" type="primary" class="eachButton" @click="createMap">{{ $t('map.newConstruction') }}</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<map-operate-menu
|
||||
ref="menu"
|
||||
:point="point"
|
||||
@ -43,7 +29,7 @@
|
||||
@refresh="loadInitData"
|
||||
@jlmap3d="jlmap3d"
|
||||
/>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { DeviceMenu } from '@/scripts/ConstDic';
|
||||
@ -59,10 +45,6 @@ export default {
|
||||
MapOperateMenu
|
||||
},
|
||||
props: {
|
||||
height: {
|
||||
type: Number,
|
||||
required: true
|
||||
},
|
||||
width: {
|
||||
type: Number,
|
||||
required: true
|
||||
@ -223,6 +205,16 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.clearfix{
|
||||
padding: 0 20px;
|
||||
border-bottom: 1px solid #EBEEF5;
|
||||
box-sizing: border-box;
|
||||
height: 47px;
|
||||
line-height: 47px;
|
||||
}
|
||||
.tree_box{
|
||||
height: 100%;
|
||||
}
|
||||
.buttonList{
|
||||
padding: 8px 0px 8px 0px;
|
||||
border-top: 1px #ccc solid;
|
||||
@ -249,5 +241,6 @@ export default {
|
||||
}
|
||||
.map-list-main{
|
||||
text-align:left;
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,21 +1,14 @@
|
||||
<template>
|
||||
<div class="app-wrapper">
|
||||
<div class="app-wrapper" style="height: 100%;">
|
||||
<map-create ref="mapCreate" :skin-code="skinCode" @refresh="refresh1" @editmap="handleNodeClick" />
|
||||
<!-- <el-scrollbar wrap-class="scrollbar-wrapper"> -->
|
||||
<div>
|
||||
<div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
|
||||
<demon-list ref="demonList" :height="height" :width="widthLeft" @createMap="createMap" />
|
||||
<demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
|
||||
</div>
|
||||
<drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
|
||||
<transition>
|
||||
<!-- position:'relative', -->
|
||||
<!-- :style="{left:widthLeft+'px', width: (width - widthLeft)+'px'}" -->
|
||||
<router-view :product-list="productList" />
|
||||
</transition>
|
||||
</div>
|
||||
|
||||
<!-- </el-scrollbar> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@ -26,6 +19,7 @@ import { launchFullscreen } from '@/utils/screen';
|
||||
import localStore from 'storejs';
|
||||
import { getSessionStorage, setSessionStorage } from '@/utils/auth';
|
||||
import MapCreate from '@/views/map/mapdraft/mapmanage/create';
|
||||
import { UrlConfig } from '@/router/index';
|
||||
|
||||
export default {
|
||||
name: 'DesignPlatform',
|
||||
@ -46,9 +40,6 @@ export default {
|
||||
...mapGetters([
|
||||
'lessonbar'
|
||||
]),
|
||||
height() {
|
||||
return this.$store.state.app.height - 50;
|
||||
},
|
||||
width() {
|
||||
return this.$store.state.app.width;
|
||||
}
|
||||
@ -139,8 +130,6 @@ export default {
|
||||
}
|
||||
|
||||
.examList {
|
||||
// position: fixed;
|
||||
// top: 61px;
|
||||
float: left;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getScriptPageListOnline, getScriptById,getDraftScriptById } from '@/api/script';
|
||||
import { getScriptPageListOnline, getScriptById,getDraftScriptByGroup } from '@/api/script';
|
||||
|
||||
export default {
|
||||
name: 'AddQuest',
|
||||
@ -154,7 +154,7 @@ export default {
|
||||
},
|
||||
async handleLoad(index, row) {
|
||||
this.row = row;
|
||||
const res = this.$route.fullPath.includes('design/display/demon')?await getDraftScriptById(row.id):await getScriptById(row.id);
|
||||
const res = this.$route.fullPath.includes('design/display/demon')?await getDraftScriptByGroup(row.group):await getScriptById(row.id);
|
||||
let newMemberList = [];
|
||||
if (res.code == 200) {
|
||||
if (res.data.playerVOList && res.data.playerVOList.length > 0) {
|
||||
|
||||
@ -258,6 +258,7 @@ export default {
|
||||
|
||||
await this.setWindowSize();
|
||||
await this.initLoadData();
|
||||
this.switchMode('');
|
||||
},
|
||||
async beforeDestroy() {
|
||||
await this.clearAllTimer();
|
||||
@ -480,7 +481,8 @@ export default {
|
||||
},
|
||||
async runAddRolesLoadShow() {
|
||||
// this.$refs.addQuest.doShow();
|
||||
const row={id: this.$route.query.scriptId};
|
||||
// const row={id: this.$route.query.scriptId};
|
||||
const row={group: this.$route.query.group,id: this.$route.query.scriptId};
|
||||
this.$refs.addQuest.handleLoad(1, row);
|
||||
},
|
||||
// 选择脚本
|
||||
@ -506,7 +508,7 @@ export default {
|
||||
}
|
||||
}
|
||||
this.switchMode(prdType);
|
||||
const res = await loadDraftScript(row.id, id, this.group);
|
||||
const res = await loadDraftScript(row.id,id, this.group);
|
||||
if (res && res.code == 200) {
|
||||
this.questId = parseInt(row.id);
|
||||
if (mapLocation) {
|
||||
|
||||
@ -10,7 +10,8 @@
|
||||
<el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
|
||||
<el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
|
||||
<template v-if="isShowQuest">
|
||||
<el-button type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
|
||||
<!-- && !isDesignPlatform -->
|
||||
<el-button v-if="!isDesignPlatform " type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
|
||||
@ -81,6 +82,9 @@ export default {
|
||||
},
|
||||
isShowScheduling() {
|
||||
return this.$route.query.prdType == '05';
|
||||
},
|
||||
isDesignPlatform(){
|
||||
return this.$route.fullPath.includes('design/display/demon');
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<div slot="header" style="text-align: center;">
|
||||
<b>{{ $t('exam.courseName') + ': '+ courseModel.name }}</b>
|
||||
</div>
|
||||
<div style=" margin:50px" :style="{ height: height - 150 +'px' }">
|
||||
<div style=" margin:50px" :style="{ height: height - 190 +'px' }">
|
||||
<el-tabs v-model="activeName">
|
||||
<el-tab-pane :label="this.$t('exam.itemList')" name="first">
|
||||
<div v-if="courseModel.treeList.length != 0" :style="{ height: height - 230 +'px' }">
|
||||
|
||||
@ -131,6 +131,12 @@ export default {
|
||||
document.getElementById(this.canvasId).oncontextmenu = function (e) {
|
||||
return false;
|
||||
};
|
||||
// 默认个人地图绘制可以滚轮放大缩小 其他地图显示不允许此操作
|
||||
const path = window.location.href;
|
||||
let flag = false;
|
||||
if (path.includes('design/userlist/map/draw')) {
|
||||
flag = true;
|
||||
}
|
||||
|
||||
Vue.prototype.$jlmap = new Jlmap({
|
||||
dom: document.getElementById(this.canvasId),
|
||||
@ -142,7 +148,8 @@ export default {
|
||||
options: {
|
||||
scaleRate: 1,
|
||||
offsetX: 0,
|
||||
offsetY: 0
|
||||
offsetY: 0,
|
||||
zoomOnMouseWheel: flag
|
||||
},
|
||||
methods: {
|
||||
dataLoaded: this.handleDataLoaded,
|
||||
@ -283,7 +290,11 @@ export default {
|
||||
.zoom-view {
|
||||
// position: fixed;
|
||||
position: absolute;
|
||||
height: 28px;
|
||||
bottom: 0;
|
||||
background: #fff;
|
||||
padding-top: 5px;
|
||||
height: 42px;
|
||||
border-bottom: 1px #f3f3f3 solid;
|
||||
}
|
||||
|
||||
/deep/ {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<el-card>
|
||||
<el-card style="height: 100%; overflow-y: auto;">
|
||||
<div slot="header" style="text-align: center;">
|
||||
<b>{{ $t('lesson.courseName') + ': '+ name }}</b>
|
||||
</div>
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
<template>
|
||||
<div class="card-box">
|
||||
<el-steps class="steps" :active="display">
|
||||
<div class="card-box steps">
|
||||
<!-- class="steps" -->
|
||||
<el-steps :active="display">
|
||||
<el-step :title="this.$t('lesson.trainingSequence')" icon="el-icon-edit-outline" />
|
||||
<el-step title="" icon="el-icon-upload" />
|
||||
</el-steps>
|
||||
<el-card class="forms">
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height -60 + 'px'}">
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height -60-30 + 'px'}">
|
||||
<el-tree
|
||||
ref="lessonTree"
|
||||
:data="treeData"
|
||||
@ -82,14 +83,23 @@ export default {
|
||||
},
|
||||
allowDrop(draggingNode, dropNode, type) {
|
||||
if (draggingNode && draggingNode.data.type === 'Chapter') {
|
||||
return dropNode && draggingNode.parent == dropNode.parent && (
|
||||
dropNode.data.type === 'Chapter' && type !== 'Inner');
|
||||
} else if (draggingNode && draggingNode.data.type === 'Training') {
|
||||
return dropNode && draggingNode.parent == dropNode.parent && (
|
||||
dropNode.data.type === 'Training' && type !== 'Inner');
|
||||
// debugger;
|
||||
return dropNode && (dropNode.data.type === 'Chapter');
|
||||
// return dropNode && draggingNode.parent == dropNode.parent && (
|
||||
// dropNode.data.type === 'Chapter' && type !== 'Inner');
|
||||
}
|
||||
else if (draggingNode && draggingNode.data.type === 'Training') {
|
||||
// dropNode.data.type === 'Chapter' ||
|
||||
return dropNode && (dropNode.data.type === 'Training' && type !== 'inner' && draggingNode.parent == dropNode.parent );
|
||||
// return dropNode && draggingNode.parent == dropNode.parent && (
|
||||
// dropNode.data.type === 'Training' && type !== 'Inner');
|
||||
}
|
||||
else{
|
||||
return true;
|
||||
}
|
||||
},
|
||||
allowDrag(draggingNode) {
|
||||
// debugger;
|
||||
return draggingNode && (draggingNode.data.type === 'Chapter' || draggingNode.data.type === 'Training');
|
||||
},
|
||||
getLeesonId(node) {
|
||||
|
||||
@ -148,6 +148,9 @@ export default {
|
||||
}
|
||||
|
||||
.draftContext {
|
||||
// float: left;
|
||||
width:100%;
|
||||
}
|
||||
.mainContext{
|
||||
display: -webkit-box;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
<template>
|
||||
<el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
|
||||
<el-dialog
|
||||
v-dialogDrag
|
||||
:title="title"
|
||||
:visible.sync="dialogVisible"
|
||||
width="25%"
|
||||
:before-close="handleClose"
|
||||
center
|
||||
>
|
||||
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
|
||||
@ -32,7 +39,14 @@ export default {
|
||||
const form = {
|
||||
labelWidth: '120px',
|
||||
items: [
|
||||
{ prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: true }
|
||||
{
|
||||
prop: 'skinCode',
|
||||
label: this.$t('lesson.skinType'),
|
||||
type: 'select',
|
||||
required: true,
|
||||
options: this.skinCodeList,
|
||||
disabled: true
|
||||
}
|
||||
]
|
||||
};
|
||||
return form;
|
||||
@ -40,7 +54,11 @@ export default {
|
||||
rules() {
|
||||
const crules = {
|
||||
skinCode: [
|
||||
{ required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('rules.inputSkinType'),
|
||||
trigger: 'change'
|
||||
}
|
||||
]
|
||||
};
|
||||
return crules;
|
||||
@ -77,13 +95,19 @@ export default {
|
||||
const self = this;
|
||||
this.$refs.dataform.validateForm(() => {
|
||||
if (this.isShow) {
|
||||
this.$confirm(this.$t('lesson.wellClearOperate'), this.$t('global.tips'), {
|
||||
this.$confirm(
|
||||
this.$t('lesson.wellClearOperate'),
|
||||
this.$t('global.tips'),
|
||||
{
|
||||
confirmButtonText: this.$t('global.confirm'),
|
||||
cancelButtonText: this.$t('global.cancel'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
}
|
||||
)
|
||||
.then(() => {
|
||||
self.create();
|
||||
}).catch(() => { });
|
||||
})
|
||||
.catch(() => {});
|
||||
} else {
|
||||
self.create();
|
||||
}
|
||||
@ -92,14 +116,21 @@ export default {
|
||||
create() {
|
||||
const self = this;
|
||||
this.loading = true;
|
||||
addTrainingRulesList(this.formModel.skinCode, OperationList[this.formModel.skinCode].list).then(response => {
|
||||
addTrainingRulesList(
|
||||
this.formModel.skinCode,
|
||||
OperationList[this.formModel.skinCode].list
|
||||
)
|
||||
.then(response => {
|
||||
self.loading = false;
|
||||
self.$message.success(this.$t('lesson.batchCreateSuccess'));
|
||||
self.handleClose();
|
||||
self.$emit('reloadTable'); // 刷新列表
|
||||
}).catch(error => {
|
||||
})
|
||||
.catch(error => {
|
||||
self.loading = false;
|
||||
self.$message.error(`${this.$('error.batchCreateFailed')}:${error.message}`);
|
||||
self.$message.error(
|
||||
`${this.$('error.batchCreateFailed')}:${error.message}`
|
||||
);
|
||||
});
|
||||
},
|
||||
handleClose() {
|
||||
|
||||
@ -197,10 +197,10 @@ export default {
|
||||
maxDuration: data.maxDuration,
|
||||
trainingRemark: this.repliceName(data.trainingRemark, this.placeholderList)
|
||||
};
|
||||
}else {
|
||||
} else {
|
||||
this.formModel = {
|
||||
skinCode: this.$route.query.skinCode
|
||||
}
|
||||
};
|
||||
}
|
||||
},
|
||||
repliceName(fieldValue, enumList) {
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
<template>
|
||||
<div>
|
||||
<div style="height: 100%; overflow-y: auto;">
|
||||
<!-- <div style="height: calc(100% - 80px); overflow-y: auto;"> -->
|
||||
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
|
||||
<!-- </div> -->
|
||||
<training-edit ref="create" type="ADD" @reloadTable="reloadTable" />
|
||||
<training-edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
|
||||
<add-batch ref="addBatch" @reloadTable="reloadTable" />
|
||||
@ -14,7 +16,11 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getTrainingRulesList, deleteTrainingRulesData, getPlaceholderList } from '@/api/management/operation';
|
||||
import {
|
||||
getTrainingRulesList,
|
||||
deleteTrainingRulesData,
|
||||
getPlaceholderList
|
||||
} from '@/api/management/operation';
|
||||
import { getSkinCodeList } from '@/api/management/mapskin';
|
||||
import TrainingEdit from './addEdit';
|
||||
import AddBatch from './addBatch';
|
||||
@ -55,7 +61,6 @@ export default {
|
||||
label: this.$t('lesson.trainingName')
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
queryList: {
|
||||
query: this.getList,
|
||||
@ -66,28 +71,56 @@ export default {
|
||||
title: this.$t('lesson.trainingName'),
|
||||
prop: 'trainingName',
|
||||
type: 'replicText',
|
||||
columnValue: (row) => { return this.repliceName(row.trainingName, this.placeholderMap[row.trainingType]); }
|
||||
columnValue: row => {
|
||||
return this.repliceName(
|
||||
row.trainingName,
|
||||
this.placeholderMap[row.trainingType]
|
||||
);
|
||||
}
|
||||
},
|
||||
{
|
||||
title: this.$t('lesson.skinType'),
|
||||
prop: 'skinCode',
|
||||
type: 'tag',
|
||||
columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
|
||||
tagType: (row) => { return ''; }
|
||||
columnValue: row => {
|
||||
return this.$convertField(row.skinCode, this.skinCodeList, [
|
||||
'code',
|
||||
'name'
|
||||
]);
|
||||
},
|
||||
tagType: row => {
|
||||
return '';
|
||||
}
|
||||
},
|
||||
{
|
||||
title: this.$t('lesson.trainingType'),
|
||||
prop: 'trainingType',
|
||||
type: 'tag',
|
||||
columnValue: (row) => { return this.$convertField(row.trainingType, this.trainingTypeList, ['code', 'name']); },
|
||||
tagType: (row) => { return 'success'; }
|
||||
columnValue: row => {
|
||||
return this.$convertField(
|
||||
row.trainingType,
|
||||
this.trainingTypeList,
|
||||
['code', 'name']
|
||||
);
|
||||
},
|
||||
tagType: row => {
|
||||
return 'success';
|
||||
}
|
||||
},
|
||||
{
|
||||
title: this.$t('lesson.operationType'),
|
||||
prop: 'operateType',
|
||||
type: 'tag',
|
||||
columnValue: (row) => { return this.$convertField(row.operateType, this.trainingOperateTypeMap[row.trainingType], ['code', 'name']); },
|
||||
tagType: (row) => { return 'success'; }
|
||||
columnValue: row => {
|
||||
return this.$convertField(
|
||||
row.operateType,
|
||||
this.trainingOperateTypeMap[row.trainingType],
|
||||
['code', 'name']
|
||||
);
|
||||
},
|
||||
tagType: row => {
|
||||
return 'success';
|
||||
}
|
||||
},
|
||||
{
|
||||
title: this.$t('lesson.minDuration'),
|
||||
@ -102,7 +135,12 @@ export default {
|
||||
title: this.$t('lesson.trainingRemark'),
|
||||
prop: 'trainingRemark',
|
||||
type: 'replicText',
|
||||
columnValue: (row) => { return this.repliceName(row.trainingRemark, this.placeholderMap[row.trainingType]); }
|
||||
columnValue: row => {
|
||||
return this.repliceName(
|
||||
row.trainingRemark,
|
||||
this.placeholderMap[row.trainingType]
|
||||
);
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
@ -185,7 +223,10 @@ export default {
|
||||
this.$Dictionary.trainingType().then(list => {
|
||||
this.trainingTypeList = list;
|
||||
list.forEach(elem => {
|
||||
this.queryForm.queryObject.trainingType.config.data.push({ value: elem.code, label: elem.name });
|
||||
this.queryForm.queryObject.trainingType.config.data.push({
|
||||
value: elem.code,
|
||||
label: elem.name
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@ -195,7 +236,10 @@ export default {
|
||||
if (enumList && enumList.length > 0) {
|
||||
for (let i = 0; i < enumList.length; i++) {
|
||||
if (fieldValue.includes(`{${enumList[i].id}}`)) {
|
||||
fieldValue = fieldValue.replace(`{${enumList[i].id}}`, `{${enumList[i].name}}`);
|
||||
fieldValue = fieldValue.replace(
|
||||
`{${enumList[i].id}}`,
|
||||
`{${enumList[i].name}}`
|
||||
);
|
||||
}
|
||||
}
|
||||
return fieldValue;
|
||||
@ -209,7 +253,10 @@ export default {
|
||||
if (form && form.trainingType) {
|
||||
form.operateType = '';
|
||||
this.trainingOperateTypeMap[form.trainingType].forEach(elem => {
|
||||
this.queryForm.queryObject.operateType.config.data.push({ value: elem.code, label: elem.name });
|
||||
this.queryForm.queryObject.operateType.config.data.push({
|
||||
value: elem.code,
|
||||
label: elem.name
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
@ -220,7 +267,10 @@ export default {
|
||||
return res;
|
||||
},
|
||||
handleViewDetail(index, row) {
|
||||
this.$router.push({ path: `${UrlConfig.design.trainingRuleDetail}`, query: { id: row.id, type: row.trainingType, skinCode: row.skinCode } });
|
||||
this.$router.push({
|
||||
path: `${UrlConfig.design.trainingRuleDetail}`,
|
||||
query: { id: row.id, type: row.trainingType, skinCode: row.skinCode }
|
||||
});
|
||||
},
|
||||
|
||||
handleEdit(index, row) {
|
||||
@ -240,22 +290,28 @@ export default {
|
||||
},
|
||||
|
||||
handleDelete(index, row) {
|
||||
this.$confirm(this.$t('lesson.wellDelTrainingRule'), this.$t('global.tips'), {
|
||||
this.$confirm(
|
||||
this.$t('lesson.wellDelTrainingRule'),
|
||||
this.$t('global.tips'),
|
||||
{
|
||||
confirmButtonText: this.$t('global.confirm'),
|
||||
cancelButtonText: this.$t('global.cancel'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
deleteTrainingRulesData(row.id).then(response => {
|
||||
}
|
||||
).then(() => {
|
||||
deleteTrainingRulesData(row.id)
|
||||
.then(response => {
|
||||
this.$message.success(this.$t('lesson.deleteSuccess'));
|
||||
this.reloadTable();
|
||||
}).catch(() => {
|
||||
})
|
||||
.catch(() => {
|
||||
this.reloadTable();
|
||||
this.$messageBox(this.$t('error.deleteFailed'));
|
||||
});
|
||||
});
|
||||
},
|
||||
turnback() {
|
||||
this.$router.go(-1)
|
||||
this.$router.go(-1);
|
||||
},
|
||||
reloadTable() {
|
||||
this.queryList.reload();
|
||||
@ -264,9 +320,9 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
.draft {
|
||||
.draft {
|
||||
width: 400px;
|
||||
text-align: center;
|
||||
margin: 20px auto;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
<template>
|
||||
<el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
|
||||
<el-dialog
|
||||
v-dialogDrag
|
||||
:title="title"
|
||||
:visible.sync="dialogVisible"
|
||||
width="25%"
|
||||
:before-close="handleClose"
|
||||
center
|
||||
>
|
||||
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
|
||||
@ -31,8 +38,20 @@ export default {
|
||||
const form = {
|
||||
labelWidth: '120px',
|
||||
items: [
|
||||
{ prop: 'skinCodeFrom', label: this.$t('lesson.skinTypeFrom'), type: 'select', required: true, options: this.skinCodeList },
|
||||
{ prop: 'skinCodeTo', label: this.$t('lesson.skinTypeTo'), type: 'select', required: true, options: this.skinCodeList }
|
||||
{
|
||||
prop: 'skinCodeFrom',
|
||||
label: this.$t('lesson.skinTypeFrom'),
|
||||
type: 'select',
|
||||
required: true,
|
||||
options: this.skinCodeList
|
||||
},
|
||||
{
|
||||
prop: 'skinCodeTo',
|
||||
label: this.$t('lesson.skinTypeTo'),
|
||||
type: 'select',
|
||||
required: true,
|
||||
options: this.skinCodeList
|
||||
}
|
||||
]
|
||||
};
|
||||
return form;
|
||||
@ -40,10 +59,18 @@ export default {
|
||||
rules() {
|
||||
const crules = {
|
||||
skinCodeFrom: [
|
||||
{ required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('rules.inputSkinType'),
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
skinCodeTo: [
|
||||
{ required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('rules.inputSkinType'),
|
||||
trigger: 'change'
|
||||
}
|
||||
]
|
||||
};
|
||||
return crules;
|
||||
@ -79,7 +106,7 @@ export default {
|
||||
} else {
|
||||
this.$alert(this.$t('lesson.countSkinCode'), this.$t('global.tips'), {
|
||||
confirmButtonText: this.$t('global.confirm'),
|
||||
callback: () => { }
|
||||
callback: () => {}
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -87,14 +114,18 @@ export default {
|
||||
create() {
|
||||
const self = this;
|
||||
this.loading = true;
|
||||
postOperateSaveAs(this.formModel.skinCodeFrom, this.formModel.skinCodeTo).then(response => {
|
||||
postOperateSaveAs(this.formModel.skinCodeFrom, this.formModel.skinCodeTo)
|
||||
.then(response => {
|
||||
self.loading = false;
|
||||
self.$message.success(this.$t('lesson.batchCreateSuccess'));
|
||||
self.handleClose();
|
||||
self.$emit('reloadTable'); // 刷新列表
|
||||
}).catch(error => {
|
||||
})
|
||||
.catch(error => {
|
||||
self.loading = false;
|
||||
self.$message.error(`${this.$('error.batchCreateFailed')}:${error.message}`);
|
||||
self.$message.error(
|
||||
`${this.$('error.batchCreateFailed')}:${error.message}`
|
||||
);
|
||||
});
|
||||
},
|
||||
handleClose() {
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
<template>
|
||||
<div>
|
||||
<div style="height: 100%; overflow-y: auto;">
|
||||
<!-- <div style="height: calc(100% - 80px); overflow-y: auto;"> -->
|
||||
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
|
||||
<!-- </div> -->
|
||||
<training-draft
|
||||
ref="draftTrain"
|
||||
:skin-code-list="skinCodeList"
|
||||
@ -252,7 +254,7 @@ export default {
|
||||
this.$router.push({ path: `${UrlConfig.display}/manage`, query: query });
|
||||
launchFullscreen();
|
||||
}).catch(error => {
|
||||
this.$messageBox(this.$t('error.createSimulationFailed') +error.message);
|
||||
this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
|
||||
});
|
||||
},
|
||||
reloadTable() {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="login-container" :style="{'background-image': 'url('+bgImg+')'}">
|
||||
<div v-if="project==='xty'" class="text-box">{{ title }}</div>
|
||||
<div v-if="project.endsWith('xty')" class="text-box">{{ title }}</div>
|
||||
<div class="language_box">
|
||||
<el-tooltip effect="dark" :content="this.$t('login.clickSwitchLanguage')" placement="bottom-end">
|
||||
<el-button class="language_btn" type="text" @click="handleLanguage">{{ language }}</el-button>
|
||||
@ -131,7 +131,7 @@ export default {
|
||||
password: ''
|
||||
},
|
||||
loginRules: {
|
||||
username: [{ required: true, trigger: 'blur', validator: validateUsername }, { required: true, trigger: 'change', validator: validateUsername }],
|
||||
username: [{ required: true, trigger: 'blur', validator: validateUsername }],
|
||||
password: [{ required: true, trigger: 'blur', validator: validatePass }]
|
||||
},
|
||||
loading: false,
|
||||
@ -187,7 +187,7 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
computedAttribute() {
|
||||
if (this.project === 'design') {
|
||||
if (this.project.startsWith('design')) {
|
||||
this.cookiesName = 'UserDesignName';
|
||||
this.cookiesToken = 'UserDesignToken';
|
||||
this.modelType = 'design';
|
||||
@ -238,7 +238,7 @@ export default {
|
||||
this.clearTimer(this.checkLogin);
|
||||
this.checkLogin = setTimeout(() => {
|
||||
checkLoginStatus(self.sessionId).then(response => {
|
||||
if (this.project === 'design') {
|
||||
if (this.project.startsWith('design')) {
|
||||
setDesignToken(response.data.token);
|
||||
|
||||
} else {
|
||||
|
||||
@ -245,11 +245,7 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.coordinate {
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -255,11 +255,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.coordinate {
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -104,6 +104,7 @@
|
||||
<div class="point-section">
|
||||
<template v-for="(point, index) in formModel[item.prop]">
|
||||
<div :key="index" style="overflow: hidden;">
|
||||
<span style="display: table; margin-right: 3px; font-size: 14px; float: left; line-height: 28px;">{{ index == 0 ? '(起点)' : index == formModel[item.prop].length - 1 ? '(终点)' : `(中点${index})` }}</span>
|
||||
<el-form-item
|
||||
label=""
|
||||
:prop="'points[' + index + '].x'"
|
||||
@ -120,7 +121,7 @@
|
||||
label=""
|
||||
:prop="'points[' + index + '].y'"
|
||||
style="display: table; float: left; margin-right: 5px;"
|
||||
label-width="10px"
|
||||
label-width="4px"
|
||||
>
|
||||
<el-input-number v-model="point.y" :disabled="item.pointDisabled" />
|
||||
</el-form-item>
|
||||
@ -136,6 +137,7 @@
|
||||
:disabled="index == 0 || index == formModel[item.prop].length - 1"
|
||||
circle
|
||||
class="point-button"
|
||||
style="margin-left: 4px;"
|
||||
@click="item.delPoint(index)"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -107,6 +107,7 @@
|
||||
<div class="point-section" :style="{ width: `calc(100% - 10px - ${item.width})` }">
|
||||
<template v-for="(point, index) in formModel[item.prop]">
|
||||
<div :key="index" style="overflow: hidden;">
|
||||
<span style="display: table; margin-right: 3px; font-size: 14px; float: left; line-height: 28px;" :style="{'margin-right': index == 0 || index == formModel[item.prop].length - 1 ? '9px' : '5px'}">{{ index == 0 ? '起 点' : index == formModel[item.prop].length - 1 ? '终 点' : `中点${index}` }}</span>
|
||||
<el-form-item
|
||||
label=""
|
||||
:prop="'points[' + index + '].x'"
|
||||
@ -123,7 +124,7 @@
|
||||
label=""
|
||||
:prop="'points[' + index + '].y'"
|
||||
style="display: table; float: left; margin-right: 5px;"
|
||||
label-width="10px"
|
||||
label-width="4px"
|
||||
>
|
||||
<el-input-number v-model="point.y" :disabled="item.pointDisabled" />
|
||||
</el-form-item>
|
||||
@ -139,6 +140,7 @@
|
||||
:disabled="index == 0 || index == formModel[item.prop].length - 1"
|
||||
circle
|
||||
class="point-button"
|
||||
style="margin-left: 4px;"
|
||||
@click="item.delPoint(index)"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -247,9 +247,4 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -229,9 +229,4 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -398,6 +398,19 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
/deep/ .button_box{
|
||||
// width: 100%;
|
||||
// background: #f0f0f0;
|
||||
// overflow: hidden;
|
||||
width: 100%;
|
||||
background: #ffffff;
|
||||
overflow: hidden;
|
||||
border-top: 1px #f3f1f1 solid;
|
||||
box-shadow: 4px 7px 10px #565656;
|
||||
border-radius: 0;
|
||||
border-bottom: 1px transparent solid;
|
||||
}
|
||||
|
||||
/deep/ .map-draft-group {
|
||||
float: right;
|
||||
margin: 6px 5px;
|
||||
|
||||
@ -225,11 +225,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.coordinate {
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -216,11 +216,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.coordinate {
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -161,7 +161,7 @@ export default {
|
||||
{ prop: 'code', label: this.$t('map.lineCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.lineList, change: true, deviceChange: this.deviceChange },
|
||||
{ prop: 'type', label: this.$t('map.lineType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.LineTypeList },
|
||||
{ prop: 'width', label: this.$t('map.lineWidth'), type: 'number', min: 1, placeholder: 'px' },
|
||||
{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '120px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
|
||||
{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
|
||||
]
|
||||
},
|
||||
map: {
|
||||
@ -258,11 +258,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.view-control {
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
@ -525,12 +525,6 @@ export default {
|
||||
height: calc(100% - 100px);
|
||||
}
|
||||
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.coordinate {
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -130,7 +130,7 @@
|
||||
<el-tab-pane class="view-control" label="批量删除" name="five" :style="{ height: cardHeight + 30 +'px' }">
|
||||
<div class="link_box_select">
|
||||
<span style="margin-right: 12px;">选择link:</span>
|
||||
<el-select v-model="linkCode" filterable size="mini">
|
||||
<el-select v-model="linkCode" filterable multiple size="mini">
|
||||
<el-option
|
||||
v-for="item in linkList"
|
||||
:key="item.code"
|
||||
@ -225,6 +225,7 @@ export default {
|
||||
},
|
||||
linkCode: '',
|
||||
tableData: [],
|
||||
oldPoint: [], // 区段未修改前 坐标
|
||||
addModel: {
|
||||
code: '',
|
||||
splitNumber: 2,
|
||||
@ -343,7 +344,7 @@ export default {
|
||||
{ prop: 'segmentationPosition.y', firstLevel: 'segmentationPosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
|
||||
] },
|
||||
{ prop: 'isCurve', label: this.$t('map.isCurve'), type: 'checkbox', isHidden: !this.isSectionType },
|
||||
{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '140px', isHidden: !this.isPointsShow, pointDisabled: this.pointDisabledName, addPoint: this.addPoint, delPoint: this.delPoint }
|
||||
{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, pointDisabled: this.pointDisabledName, addPoint: this.addPoint, delPoint: this.delPoint }
|
||||
]
|
||||
},
|
||||
map: {
|
||||
@ -565,6 +566,7 @@ export default {
|
||||
this.editModel.logicSectionNum = selected.type === '01' ? selected.logicSectionNum : [0];
|
||||
this.editModel.isSegmentation = selected.isSegmentation || false;
|
||||
this.editModel.points = JSON.parse(JSON.stringify(selected.points));
|
||||
this.oldPoint = JSON.parse(JSON.stringify(selected.points));
|
||||
|
||||
this.addModel.splitOffsetMax = Math.sqrt(new JTriangle(selected.points[0], selected.points[selected.points.length - 1]).abspowz);
|
||||
this.addModel.splitOffset = this.addModel.splitOffsetMax / 2;
|
||||
@ -836,7 +838,6 @@ export default {
|
||||
}
|
||||
}
|
||||
});
|
||||
console.log(models, remove);
|
||||
|
||||
const _that = this;
|
||||
this.$confirm(this.$t('tip.confirmBatchGeneration'), this.$t('tip.hint'), {
|
||||
@ -865,7 +866,7 @@ export default {
|
||||
this.$refs['dataform'].validate((valid) => {
|
||||
if (valid) {
|
||||
const edits = [];
|
||||
const model = Object.assign({_type: 'Section'}, this.editModel);
|
||||
const model = Object.assign({_type: 'Section'}, this.editModel); // 修改元素model
|
||||
model.leftStopPointOffset = Number(model.leftStopPointOffset);
|
||||
model.rightStopPointOffset = Number(model.rightStopPointOffset);
|
||||
this.sectionList.forEach(section => {
|
||||
@ -874,10 +875,24 @@ export default {
|
||||
section.trainPosType = model.trainPosType;
|
||||
edits.push(section);
|
||||
}
|
||||
if (section.linkCode == model.linkCode && model.code != section.code) {
|
||||
// debugger;
|
||||
const lastIndex = this.oldPoint.length - 1;
|
||||
if (this.oldPoint[0].x == section.points[section.points.length -1].x && this.oldPoint[0].y == section.points[section.points.length -1].y) {
|
||||
section.points[section.points.length -1].x = model.points[0].x;
|
||||
section.points[section.points.length -1].y = model.points[0].y;
|
||||
}
|
||||
if (this.oldPoint[lastIndex].x == section.points[0].x && this.oldPoint[lastIndex].y == section.points[0].y) {
|
||||
section.points[0].x = model.points[model.points.length -1].x;
|
||||
section.points[0].y = model.points[model.points.length -1].y;
|
||||
}
|
||||
edits.push(section);
|
||||
}
|
||||
});
|
||||
edits.push(model);
|
||||
this.fieldS = '';
|
||||
this.$emit('addOrUpdateMapModel', edits);
|
||||
this.oldPoint = JSON.parse(JSON.stringify(model.points));
|
||||
}
|
||||
});
|
||||
},
|
||||
@ -1101,8 +1116,9 @@ export default {
|
||||
delRelevanceSection() {
|
||||
const selected = [];
|
||||
const switchList = [];
|
||||
this.linkCode.forEach(linkCode => {
|
||||
this.sectionList.forEach(section => {
|
||||
if (section.linkCode == this.linkCode) {
|
||||
if (section.linkCode == linkCode) {
|
||||
const selectedSection = this.$store.getters['map/getDeviceByCode'](section.code);
|
||||
selected.push(selectedSection);
|
||||
this.switchList.forEach(switchEle => {
|
||||
@ -1113,6 +1129,7 @@ export default {
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
|
||||
confirmButtonText: this.$t('tip.confirm'),
|
||||
cancelButtonText: this.$t('tip.cancel'),
|
||||
@ -1123,6 +1140,7 @@ export default {
|
||||
});
|
||||
await this.$emit('delMapModel', selected);
|
||||
this.deviceSelect();
|
||||
this.linkCode = '';
|
||||
}).catch(() => {
|
||||
this.$message.info(this.$t('tip.cancelledDelete'));
|
||||
});
|
||||
@ -1153,11 +1171,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.el-transfer {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
@ -420,9 +420,4 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -276,9 +276,4 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -246,9 +246,4 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -300,9 +300,4 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -171,15 +171,15 @@ export default {
|
||||
create() { // 一键生成道岔
|
||||
this.questionList = []; // 有问题区段列表
|
||||
const models = [];
|
||||
// const remove = [];
|
||||
const linkObj = {};
|
||||
this.linkList.forEach(link => {
|
||||
if (link && link.leftFdCode && link.leftSdCode) { // 左侧同时都有关联link
|
||||
linkObj[`${link.code}`] = { name: '', num: 0 };
|
||||
} else if (link && link.rightFdCode && link.rightSdCode) { // 右侧同时都有关联link
|
||||
linkObj[`${link.code}`] = { name: '', num: 0 };
|
||||
} else if (link && link.leftFdCode && !link.leftSdCode && link.rightFdCode && !link.rightSdCode) { // 左右正向link关联，侧向link不关联检测
|
||||
linkObj[`${link.code}`] = { name: '', num: 0 };
|
||||
}
|
||||
|
||||
});
|
||||
this.sectionList.forEach(section => {
|
||||
for (const link in linkObj) {
|
||||
@ -227,7 +227,7 @@ export default {
|
||||
}
|
||||
};
|
||||
const swch = this.findSwitchData(model.sectionACode, model.sectionBCode, model.sectionCCode);
|
||||
!swch && models.push(model);
|
||||
!swch && models.push(model); // 已有的道岔不在创建
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -273,6 +273,16 @@ export default {
|
||||
}
|
||||
}
|
||||
});
|
||||
const createArr = [];
|
||||
models.forEach((item) => {
|
||||
const sectionA = this.$store.getters['map/getDeviceByCode'](item.sectionACode);
|
||||
const sectionB = this.$store.getters['map/getDeviceByCode'](item.sectionBCode);
|
||||
const sectionC = this.$store.getters['map/getDeviceByCode'](item.sectionCCode);
|
||||
if (linkObj[sectionA.linkCode].num != 1 && linkObj[sectionB.linkCode].num != 1 && linkObj[sectionC.linkCode].num != 1 ) {
|
||||
createArr.push(item);
|
||||
}
|
||||
});
|
||||
// console.log(models, createArr, '创建道岔list');
|
||||
this.$confirm(this.$t('tip.confirmBatchGeneration'), this.$t('tip.hint'), {
|
||||
confirmButtonText: this.$t('tip.confirm'),
|
||||
cancelButtonText: this.$t('tip.cancel'),
|
||||
@ -280,14 +290,11 @@ export default {
|
||||
}).then(() => {
|
||||
for (const link in linkObj) {
|
||||
if (linkObj[link].num == 1) {
|
||||
this.questionList.push(`${this.$t('map.section')}${linkObj[link].name}${this.$t('tip.linkNoneSplit')}`);
|
||||
this.questionList.push(`${this.$t('map.section')}${linkObj[link].name}${this.$t('tip.linkNoneSplit')}, ${this.$t('tip.createSwitchPortion')}`);
|
||||
}
|
||||
}
|
||||
if (!this.questionList.length) { // 没有问题list 再去创建
|
||||
// this.$emit('delMapModel', remove);
|
||||
this.$emit('addOrUpdateMapModel', models);
|
||||
this.createSwitchSection(models);
|
||||
}
|
||||
this.$emit('addOrUpdateMapModel', createArr);
|
||||
this.createSwitchSection(createArr);
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
@ -485,11 +492,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.el-transfer {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
@ -236,11 +236,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.coordinate {
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -196,8 +196,15 @@ export default {
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
// width: 100%;
|
||||
// background: #f0f0f0;
|
||||
// overflow: hidden;
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
background: #ffffff;
|
||||
overflow: hidden;
|
||||
border-top: 1px #f3f1f1 solid;
|
||||
box-shadow: 4px 7px 10px #565656;
|
||||
border-radius: 0;
|
||||
border-bottom: 1px transparent solid;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -298,11 +298,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/deep/ {
|
||||
.card .el-transfer-panel__filter{
|
||||
|
||||
@ -223,11 +223,6 @@ export default {
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
@import "src/styles/mixin.scss";
|
||||
.button_box{
|
||||
width: 100%;
|
||||
background: #f0f0f0;
|
||||
overflow: hidden;
|
||||
}
|
||||
.coordinate {
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ export default {
|
||||
queryForm: {
|
||||
labelWidth: '140px',
|
||||
reset: true,
|
||||
leftSpan: 18,
|
||||
queryObject: {
|
||||
'canDistribute': {
|
||||
type: 'select',
|
||||
@ -106,7 +107,7 @@ export default {
|
||||
type: ''
|
||||
},
|
||||
{
|
||||
name: '打包详情',
|
||||
name: this.$t('orderAuthor.packingDetails'),
|
||||
handleClick: this.handleDetail,
|
||||
type: '',
|
||||
showControl: (row) => { return !row.permissionType; }
|
||||
@ -115,19 +116,19 @@ export default {
|
||||
}
|
||||
],
|
||||
actions: [
|
||||
{ text: this.$t('permission.permissionPack'), btnCode: 'employee_insert', handler: this.handlePermissionPack },
|
||||
{ text: this.$t('permission.permissionPack'), btnCode: 'employee_insert', handler: this.handlePermissionPack }
|
||||
]
|
||||
}
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.loadInitData();
|
||||
},
|
||||
watch: {
|
||||
'$route.params.mapId': function (val) {
|
||||
this.$refs.queryListPage.refresh(true);
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.loadInitData();
|
||||
},
|
||||
methods: {
|
||||
handleRoleVest(index, row) {
|
||||
this.$refs.selectRole.doShow(row.id);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<el-card :style="{height: height+'px'}">
|
||||
<el-card :style="{height: height+'px'}" style="overflow-y:scroll;padding-bottom:20px;">
|
||||
<div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
|
||||
<div class="runPlanList">{{$t('planMonitor.openRunPlan.runPlanList')}}</div>
|
||||
<el-button size="small" type="primary" @click="handleCreate" class="createRunPlan" v-if="isCreate">{{$t('planMonitor.createRunningDiagram')}}</el-button>
|
||||
|
||||
80
src/views/publish/publishLesson/draft.vue
Normal file
80
src/views/publish/publishLesson/draft.vue
Normal file
@ -0,0 +1,80 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
|
||||
<data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
|
||||
<el-button @click="doClose">{{$t('global.cancel')}}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: 'PublishLessonDraft',
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
cityList:[],
|
||||
formModel:{
|
||||
id:'',
|
||||
remarks:'',
|
||||
name:'',
|
||||
}
|
||||
}
|
||||
},
|
||||
props: {
|
||||
title: String
|
||||
},
|
||||
computed: {
|
||||
form() {
|
||||
let form={
|
||||
labelWidth: '150px',
|
||||
items: [
|
||||
{ prop: 'name', label: this.$t('publish.lessonName'), type: 'text', required: true},
|
||||
{ prop: 'remarks', label: this.$t('publish.lessonIntroduction'), type: 'textarea', required: true,isAutoSize:{ minRows:1, maxRows:5 }},
|
||||
]
|
||||
}
|
||||
return form
|
||||
},
|
||||
rules() {
|
||||
let crules ={
|
||||
name:[
|
||||
{ required: true, message: this.$t('rules.pleaseInputLessonName'), trigger: 'blur',max:100 },
|
||||
{ required: true, message: this.$t('rules.pleaseInputLessonName'), trigger: 'change',max:100 },
|
||||
],
|
||||
remarks:[
|
||||
{ required: true, message: this.$t('rules.pleaseLessonIntroduction'), trigger: 'blur',max:300 },
|
||||
{ required: true, message: this.$t('rules.pleaseLessonIntroduction'), trigger: 'change',max:300 },
|
||||
]
|
||||
}
|
||||
return crules
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
doShow(row) {
|
||||
this.formModel.id=row.id;
|
||||
this.formModel.remarks=row.remarks;
|
||||
this.formModel.name=row.name;
|
||||
this.dialogVisible = true
|
||||
},
|
||||
doCreate() {
|
||||
let self = this
|
||||
this.$refs.dataform.validateForm(() => {
|
||||
self.$emit('create', Object.assign({}, this.formModel));
|
||||
self.doClose()
|
||||
})
|
||||
},
|
||||
doClose() {
|
||||
// this.$refs.dataform.resetForm();
|
||||
this.isShow = false;
|
||||
this.dialogVisible = false
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
/deep/ .el-dialog--center .el-dialog__body{
|
||||
padding: 15px 65px 10px 10px;
|
||||
}
|
||||
</style>
|
||||
@ -1,16 +1,22 @@
|
||||
<template>
|
||||
<div>
|
||||
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
|
||||
<update-operate ref='updateLesson' @create="handleUpdate" :title="$t('publish.updateLesson')">
|
||||
</update-operate>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { publishLessonList, delPublishLesson, putLessonOnLine, putLessonOffLine } from '@/api/jmap/lesson';
|
||||
import { publishLessonList, delPublishLesson, putLessonOnLine, putLessonOffLine,updatePublishLesson } from '@/api/jmap/lesson';
|
||||
import { getSkinCodeList } from '@/api/management/mapskin';
|
||||
import localStore from 'storejs';
|
||||
import UpdateOperate from './draft.vue';
|
||||
|
||||
export default {
|
||||
name: 'PublishMap',
|
||||
components:{
|
||||
UpdateOperate
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
cityList: [],
|
||||
@ -74,6 +80,12 @@ export default {
|
||||
type: 'warning',
|
||||
showControl: (row) => { return row.status == 1; }
|
||||
},
|
||||
{
|
||||
name: this.$t('global.edit'),
|
||||
handleClick: this.handleEdit,
|
||||
type: 'primary',
|
||||
showControl: () => { return this.isShow != -1; }
|
||||
},
|
||||
{
|
||||
name: this.$t('global.delete'),
|
||||
handleClick: this.handleDelete,
|
||||
@ -115,8 +127,17 @@ export default {
|
||||
},
|
||||
// 编辑
|
||||
handleEdit(index, row) {
|
||||
this.$refs.updateLesson.doShow(row);
|
||||
},
|
||||
// 确认编辑
|
||||
handleUpdate(data){
|
||||
updatePublishLesson(data).then(response => {
|
||||
this.reloadTable();
|
||||
this.$message.success(this.$t('publish.updateSuccess'));
|
||||
}).catch(() => {
|
||||
this.$messageBox(this.$t('error.updateFailed'));
|
||||
});
|
||||
},
|
||||
|
||||
// 删除
|
||||
handleDelete(index, row) {
|
||||
this.$confirm(this.$t('publish.wellDelType'), this.$t('global.tips'), {
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
|
||||
<data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
|
||||
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
|
||||
<el-button @click="doClose">{{$t('global.cancel')}}</el-button>
|
||||
<el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
|
||||
<el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
@ -28,97 +28,96 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
// import { updatePublishMapName } from '@/api/jmap/map';
|
||||
export default {
|
||||
// import { updatePublishMapName } from '@/api/jmap/map';
|
||||
export default {
|
||||
name: 'PublishMapDraft',
|
||||
props: {
|
||||
title: String,
|
||||
type: String
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
cityList:[],
|
||||
formModel:{
|
||||
mapId:'',
|
||||
cityCode:'',
|
||||
name:'',
|
||||
cityList: [],
|
||||
formModel: {
|
||||
mapId: '',
|
||||
cityCode: '',
|
||||
name: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
this.loadInitData();
|
||||
},
|
||||
props: {
|
||||
title: String,
|
||||
type:String,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
form() {
|
||||
let form={};
|
||||
if(this.type=="updateMapName"){
|
||||
if (this.type=='updateMapName') {
|
||||
form={
|
||||
labelWidth: '150px',
|
||||
items: [
|
||||
{ prop: 'name', label: this.$t('publish.mapName'), type: 'text', required: true},
|
||||
{ prop: 'name', label: this.$t('publish.mapName'), type: 'text', required: true}
|
||||
]
|
||||
}
|
||||
}else{
|
||||
};
|
||||
} else {
|
||||
form={
|
||||
labelWidth: '150px',
|
||||
items: [
|
||||
{ prop: 'cityCode', label: this.$t('publish.city'), type: 'select', required: true,options:this.cityList},
|
||||
{ prop: 'cityCode', label: this.$t('publish.city'), type: 'select', required: true, options: this.cityList}
|
||||
]
|
||||
};
|
||||
}
|
||||
}
|
||||
return form
|
||||
return form;
|
||||
},
|
||||
rules() {
|
||||
let crules ={};
|
||||
if(this.type=="updateMapName"){
|
||||
if (this.type=='updateMapName') {
|
||||
crules ={
|
||||
name:[
|
||||
{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'blur',max:100 },
|
||||
{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'change',max:100 },
|
||||
name: [
|
||||
{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'blur', max: 100 },
|
||||
{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'change', max: 100 }
|
||||
]
|
||||
}
|
||||
}else{
|
||||
};
|
||||
} else {
|
||||
crules ={
|
||||
id:[
|
||||
{ required: true, message: this.$t('rules.pleaseSelectCity'), trigger: 'change',max:100 },
|
||||
id: [
|
||||
{ required: true, message: this.$t('rules.pleaseSelectCity'), trigger: 'change', max: 100 }
|
||||
]
|
||||
};
|
||||
}
|
||||
return crules;
|
||||
}
|
||||
return crules
|
||||
},
|
||||
mounted() {
|
||||
this.loadInitData();
|
||||
},
|
||||
methods: {
|
||||
async loadInitData() {
|
||||
this.cityList = [];
|
||||
let res=await this.$Dictionary.cityType();
|
||||
this.cityList = res.map(elem => { return { value: elem.code, label: elem.name } });
|
||||
const res=await this.$Dictionary.cityType();
|
||||
this.cityList = res.map(elem => { return { value: elem.code, label: elem.name }; });
|
||||
},
|
||||
doShow(row) {
|
||||
this.formModel.mapId=row.id;
|
||||
if(this.type=="updateMapName"){
|
||||
if (this.type=='updateMapName') {
|
||||
this.formModel.name=row.name;
|
||||
}else{
|
||||
} else {
|
||||
this.formModel.cityCode=row.cityCode;
|
||||
}
|
||||
|
||||
this.dialogVisible = true
|
||||
this.dialogVisible = true;
|
||||
},
|
||||
doCreate() {
|
||||
let self = this
|
||||
const self = this;
|
||||
this.$refs.dataform.validateForm(() => {
|
||||
self.$emit('create', Object.assign({}, this.formModel));
|
||||
self.doClose()
|
||||
})
|
||||
self.doClose();
|
||||
});
|
||||
},
|
||||
doClose() {
|
||||
this.$refs.dataform.resetForm();
|
||||
this.isShow = false;
|
||||
this.dialogVisible = false
|
||||
this.dialogVisible = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
// export default {
|
||||
// name: 'PublishMapDraft',
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
<template>
|
||||
<div>
|
||||
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
|
||||
<update-operate ref='updateMapName' @reloadTable="reloadTable" @create="handleUpdateMap" :title="$t('publish.updateMapName')" type="updateMapName">
|
||||
</update-operate>
|
||||
<update-operate ref='updateCityName' @reloadTable="reloadTable" @create="handleCityUpdate" :title="$t('publish.updateCityName')" type="updateCityName">
|
||||
</update-operate>
|
||||
<update-operate ref="updateMapName" :title="$t('publish.updateMapName')" type="updateMapName" @create="handleUpdateMap" />
|
||||
<update-operate ref="updateCityName" :title="$t('publish.updateCityName')" type="updateCityName" @create="handleCityUpdate" />
|
||||
<set-project ref="setProject" @refresh="reloadTable" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getPublishMapList, delPublishMap, getPublishMapExport, putMapOnLine, putMapOffLine,updatePublishMapName,updatePublishMapCity } from '@/api/jmap/map';
|
||||
import { getPublishMapList, delPublishMap, getPublishMapExport, putMapOnLine, putMapOffLine, updatePublishMapName, updatePublishMapCity } from '@/api/jmap/map';
|
||||
import { getSkinCodeList } from '@/api/management/mapskin';
|
||||
import { UrlConfig } from '@/router/index';
|
||||
import localStore from 'storejs';
|
||||
import UpdateOperate from './draft.vue';
|
||||
import SetProject from './project';
|
||||
|
||||
export default {
|
||||
name: 'PublishMap',
|
||||
components:{
|
||||
UpdateOperate
|
||||
components: {
|
||||
UpdateOperate,
|
||||
SetProject
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -117,6 +117,10 @@ export default {
|
||||
name: this.$t('global.export'),
|
||||
handleClick: this.handleExportMapSame,
|
||||
showControl: () => { return process.env.NODE_ENV === 'development'; }
|
||||
},
|
||||
{
|
||||
name: '设置所属项目',
|
||||
handleClick: this.handleSetProject
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -156,8 +160,11 @@ export default {
|
||||
// this.$router.push({ path: `${UrlConfig.publish.mapDraft}/edit/${row.id}`, query: { name: row.name } });
|
||||
this.$refs.updateMapName.doShow(row);
|
||||
},
|
||||
handleSetProject(index, row) {
|
||||
this.$refs.setProject.doShow(row);
|
||||
},
|
||||
// 编辑城市
|
||||
handleUpdateCity(index, row){
|
||||
handleUpdateCity(index, row) {
|
||||
this.$refs.updateCityName.doShow(row);
|
||||
},
|
||||
// 删除
|
||||
@ -177,7 +184,7 @@ export default {
|
||||
});
|
||||
}).catch(() => { });
|
||||
},
|
||||
handleUpdateMap(data){
|
||||
handleUpdateMap(data) {
|
||||
delete data.cityCode;
|
||||
updatePublishMapName(data).then(response => {
|
||||
this.reloadTable();
|
||||
@ -186,7 +193,7 @@ export default {
|
||||
this.$messageBox(this.$t('error.updateFailed'));
|
||||
});
|
||||
},
|
||||
handleCityUpdate(data){
|
||||
handleCityUpdate(data) {
|
||||
delete data.name;
|
||||
updatePublishMapCity(data).then(response => {
|
||||
this.reloadTable();
|
||||
|
||||
87
src/views/publish/publishMap/project.vue
Normal file
87
src/views/publish/publishMap/project.vue
Normal file
@ -0,0 +1,87 @@
|
||||
<template>
|
||||
<el-dialog v-dialogDrag title="设置归属项目" :visible.sync="dialogVisible" width="30%" center>
|
||||
<el-form ref="form" :model="formModel" label-width="100px" label-position="left">
|
||||
<el-form-item label="地图名称">
|
||||
<span>{{ formModel.name }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否归属项目" prop="project">
|
||||
<el-radio-group v-model="formModel.project" @change="changeProject">
|
||||
<el-radio :label="booleanValue.t">是</el-radio>
|
||||
<el-radio :label="booleanValue.f">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="formModel.project"
|
||||
label="归属项目"
|
||||
prop="projectCode"
|
||||
:rules="{
|
||||
required: true, message: '归属项目不能为空', trigger: 'change'
|
||||
}"
|
||||
>
|
||||
<el-select v-model="formModel.projectCode" placeholder="请选择归属项目">
|
||||
<el-option label="西铁院" value="XTY" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
|
||||
<el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { setMapProject } from '@/api/jmap/map';
|
||||
export default {
|
||||
name: 'SetMapProject',
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
formModel: {
|
||||
id: '',
|
||||
name: '',
|
||||
cityCode: '',
|
||||
skinCode: '',
|
||||
project: false,
|
||||
projectCode: ''
|
||||
},
|
||||
projectCodeShow: false,
|
||||
booleanValue: {
|
||||
t: true,
|
||||
f: false
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
||||
},
|
||||
methods: {
|
||||
doShow(row) {
|
||||
this.dialogVisible = true;
|
||||
this.formModel.id = row.id;
|
||||
this.formModel.name = row.name;
|
||||
this.formModel.cityCode = row.cityCode;
|
||||
this.formModel.skinCode = row.skinCode;
|
||||
},
|
||||
doSave() {
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
setMapProject(this.formModel).then(resp =>{
|
||||
this.$message.success('设置归属项目成功！');
|
||||
this.dialogVisible = false;
|
||||
this.$emit('refresh');
|
||||
});
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
},
|
||||
changeProject(val) {
|
||||
if (!val) {
|
||||
this.formModel.projectCode = '';
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -22,7 +22,7 @@ import { mapGetters } from 'vuex';
|
||||
import { admin, superAdmin} from '@/router';
|
||||
import { getQuestPageList,createQuest,deleteQuest,updateQuest,publishQuest,retractQuest} from '@/api/quest';
|
||||
import { launchFullscreen } from '@/utils/screen';
|
||||
import { scriptRecordNotify } from '@/api/simulation';
|
||||
import { scriptDraftRecordNotify,scriptRecordNotify } from '@/api/simulation';
|
||||
import CreateScript from './create';
|
||||
import ScriptPublish from './publish';
|
||||
|
||||
@ -124,9 +124,6 @@ export default {
|
||||
this.reloadTable();
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.reloadTable();
|
||||
},
|
||||
methods: {
|
||||
queryFunction(params) {
|
||||
return getQuestPageList(this.$route.params.mapId,params);
|
||||
@ -266,7 +263,7 @@ export default {
|
||||
}).catch(() => { });
|
||||
},
|
||||
previewScript(index,row){
|
||||
scriptRecordNotify(row.id).then(resp => {
|
||||
scriptDraftRecordNotify(row.id).then(resp => {
|
||||
const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:this.$route.query.skinCode,try:0};
|
||||
this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
|
||||
launchFullscreen();
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<div slot="header" style="text-align: center;">
|
||||
<b>{{ $t('teach.courseName') }}: {{ courseModel.name }}</b>
|
||||
</div>
|
||||
<div style="margin:50px" :style="{ height: height - 190 +'px' }">
|
||||
<div style="margin:50px" :style="{ height: height - 230 +'px' }">
|
||||
<el-tabs v-model="activeName">
|
||||
<el-tab-pane :label="$t('teach.courseDetails')" name="first">
|
||||
<div :style="{ height: height - 270 +'px' }">
|
||||
|
||||
@ -61,6 +61,8 @@ export default {
|
||||
getSubSystemDetail(this.$route.params.subSystem).then(resp =>{
|
||||
if (resp.data) {
|
||||
this.tableData = resp.data.lessonList;
|
||||
} else {
|
||||
this.tableData = [];
|
||||
}
|
||||
}).catch(()=>{
|
||||
this.$messageBox(this.$t('error.obtainCourseInformationFailed'));
|
||||
@ -68,7 +70,7 @@ export default {
|
||||
}
|
||||
},
|
||||
goLesson(row) {
|
||||
localStore.set('teachDetail'+this.$route.params.subSystem, `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}?lessonId=${row.id}&mapId=${row.mapId}&prdCode=${row.prdCode}`);
|
||||
localStore.set('teachDetail' + this.$route.params.subSystem, `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}?lessonId=${row.id}&mapId=${row.mapId}&prdCode=${row.prdCode}`);
|
||||
this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}`, query: {lessonId: row.id, mapId: row.mapId, prdCode: row.prdCode}});
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,9 +3,10 @@
|
||||
<div slot="header" class="clearfix">
|
||||
<span>{{ $t('global.mapList') }}</span>
|
||||
</div>
|
||||
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
|
||||
<el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
|
||||
<div style="height: calc(100% - 47px);">
|
||||
<filter-city v-if="project==='login'" ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
|
||||
<el-input v-if="project==='login'" v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
|
||||
<div style="height: 100%;">
|
||||
<el-tree
|
||||
ref="tree"
|
||||
:data="treeList"
|
||||
@ -31,16 +32,19 @@
|
||||
<span v-else> {{ node.data.name }}</span>
|
||||
</span>
|
||||
</el-tree>
|
||||
</el-scrollbar>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</el-card>
|
||||
</template>
|
||||
<script>
|
||||
import { getPublishMapTree } from '@/api/management/mapprd';
|
||||
import { getTrainingSystemList, getSubSystemInfo } from '@/api/trainingPlatform';
|
||||
import { getTrainingSystemList, getSubSystemInfo, getSubSystemByProjectCode } from '@/api/trainingPlatform';
|
||||
import { UrlConfig } from '@/router/index';
|
||||
import FilterCity from '@/views/components/filterCity';
|
||||
import localStore from 'storejs';
|
||||
import { getSessionStorage } from '@/utils/auth';
|
||||
import { ProjectCode } from '@/scripts/ConstDic';
|
||||
|
||||
export default {
|
||||
name: 'DemonList',
|
||||
@ -89,6 +93,9 @@ export default {
|
||||
beforeDestroy () {
|
||||
},
|
||||
mounted() {
|
||||
if (this.project === 'xty') {
|
||||
this.refresh();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
filterNode(value, data) {
|
||||
@ -102,7 +109,7 @@ export default {
|
||||
}
|
||||
},
|
||||
clickEvent(obj, data, ele) {
|
||||
localStore.set('trainingPlatformCheckId'+this.filterSelect+this.userId, obj.id);
|
||||
localStore.set('trainingPlatformCheckId' + this.filterSelect + this.userId, obj.id);
|
||||
while (data) {
|
||||
if (data.data.type === 'Map') {
|
||||
this.mapId = data.data.id;
|
||||
@ -151,19 +158,21 @@ export default {
|
||||
}
|
||||
},
|
||||
setLocalRoute(path) {
|
||||
localStore.set('trainingPlatformRoute'+this.userId, path);
|
||||
localStore.set('trainingPlatformRoute' + this.userId, path);
|
||||
},
|
||||
async refresh(filterSelect) {
|
||||
this.loading = true;
|
||||
this.treeList = [];
|
||||
this.filterSelect = filterSelect;
|
||||
try {
|
||||
let params={};
|
||||
let res = {};
|
||||
if (this.project === 'xty') {
|
||||
params={'customized': 'xty'};
|
||||
res = await getSubSystemByProjectCode(ProjectCode[this.project]);
|
||||
} else {
|
||||
res = await getTrainingSystemList(filterSelect);
|
||||
}
|
||||
const res = await getTrainingSystemList(filterSelect, params);
|
||||
res.data.forEach(item =>{
|
||||
this.$emit('goRoutePath', res.data);
|
||||
res.data && res.data.forEach(item =>{
|
||||
item.key = item.id + item.type;
|
||||
item.children && item.children.forEach(childrenItem => {
|
||||
childrenItem.key = childrenItem.id + item.type;
|
||||
@ -173,7 +182,7 @@ export default {
|
||||
this.getExpandList(filterSelect);
|
||||
// this.changeCityWithPage(this.treeList);
|
||||
this.$nextTick(() => {
|
||||
const checkId = localStore.get('trainingPlatformCheckId'+filterSelect+this.userId) || null;
|
||||
const checkId = localStore.get('trainingPlatformCheckId' + filterSelect + this.userId) || null;
|
||||
this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
|
||||
this.loading = false;
|
||||
});
|
||||
@ -184,18 +193,18 @@ export default {
|
||||
},
|
||||
nodeExpand(obj, node, ele) {
|
||||
const key = obj.id;
|
||||
this.expandList = this.expandList.filter(item => item!==key);
|
||||
this.expandList = this.expandList.filter(item => item !== key);
|
||||
this.expandList.push(key);
|
||||
localStore.set('trainIngPlatformExpandList'+this.filterSelect+this.userId, this.expandList);
|
||||
localStore.set('trainIngPlatformExpandList' + this.filterSelect + this.userId, this.expandList);
|
||||
},
|
||||
nodeCollapse(obj, node, ele) {
|
||||
const key = obj.id;
|
||||
this.expandList = this.expandList.filter(item => item!==key);
|
||||
localStore.set('trainIngPlatformExpandList'+this.filterSelect+this.userId, this.expandList);
|
||||
this.expandList = this.expandList.filter(item => item !== key);
|
||||
localStore.set('trainIngPlatformExpandList' + this.filterSelect + this.userId, this.expandList);
|
||||
},
|
||||
getExpandList(filterSelect) {
|
||||
let expand = localStore.get('trainIngPlatformExpandList'+filterSelect+this.userId);
|
||||
expand = expand?(expand+'').split(','):'';
|
||||
let expand = localStore.get('trainIngPlatformExpandList' + filterSelect + this.userId);
|
||||
expand = expand ? (expand + '').split(',') : '';
|
||||
if (expand instanceof Array) {
|
||||
this.expandList = expand;
|
||||
}
|
||||
@ -223,7 +232,10 @@ export default {
|
||||
.el-tree {
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
.map-list-main{
|
||||
text-align:left;
|
||||
height: 100%;
|
||||
}
|
||||
.el-tree-node.is-current>.el-tree-node__content {
|
||||
background-color: #e4e3e3 !important;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="app-wrapper">
|
||||
<el-scrollbar wrap-class="scrollbar-wrapper">
|
||||
<div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
|
||||
<demon-list ref="demonList" :height="height" />
|
||||
<demon-list ref="demonList" :height="height" @goRoutePath="goRoutePath" />
|
||||
</div>
|
||||
<drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
|
||||
<transition>
|
||||
@ -53,17 +53,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
const againEnter = getSessionStorage('againEnter') || null;
|
||||
if (!againEnter) {
|
||||
launchFullscreen();
|
||||
const path = localStore.get('trainingPlatformRoute'+ this.userId);
|
||||
if (path && path.startsWith('/trainingPlatform')) {
|
||||
this.$router.push(path);
|
||||
}
|
||||
setSessionStorage('againEnter', true);
|
||||
}
|
||||
|
||||
this.widthLeft = Number(localStore.get('LeftWidth'))?Number(localStore.get('LeftWidth')):450;
|
||||
this.widthLeft = Number(localStore.get('LeftWidth')) ? Number(localStore.get('LeftWidth')) : 450;
|
||||
},
|
||||
methods: {
|
||||
refresh() {
|
||||
@ -71,6 +61,19 @@ export default {
|
||||
},
|
||||
drapWidth(width) {
|
||||
this.widthLeft = Number(width);
|
||||
},
|
||||
goRoutePath(data) {
|
||||
const againEnter = getSessionStorage('againEnter') || null;
|
||||
if (!againEnter) {
|
||||
launchFullscreen();
|
||||
const path = localStore.get('trainingPlatformRoute' + this.userId);
|
||||
if (path && path.startsWith('/trainingPlatform')) {
|
||||
this.$router.push(path);
|
||||
} else if (data && data[0]) {
|
||||
this.$router.push(`/trainingPlatform/permission/${data[0].id}`);
|
||||
}
|
||||
setSessionStorage('againEnter', true);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user