-
目的车次窗
+
{{$t('menu.targetTrainWindow')}}
- 车 站:
-
+ {{$t('menu.station') + $t('global.colon')}}
+
-
+
@@ -46,10 +46,10 @@
- 确定
+ {{$t('global.confirm')}}
- 取 消
+ {{$t('global.cancel')}}
@@ -76,19 +76,19 @@
rules: {
tripNumber: [
- { required: true, message: '请输入车组号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
],
trainSource: [
- { required: true, message: '请输入车次号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
],
stationStandSource: [
- { required: true, message: '请选择车站', trigger: 'change' }
+ { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
],
trainGoal: [
- { required: true, message: '请输入车次号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
],
stationStandGoal: [
- { required: true, message: '请选择车站', trigger: 'change' }
+ { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
],
},
dialogShow: false,
@@ -109,7 +109,7 @@
return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
},
title() {
- return '移动列车识别号'
+ return this.$t('menu.menuTrain.moveTrainId');
}
},
mounted() {
@@ -183,4 +183,4 @@
padding: 0 5px;
background-color: #F0F0F0;
}
-
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
index 542eaf34b..a4536bd07 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
@@ -5,40 +5,40 @@
-
源车次窗
+
{{$t('menu.sourceTrainWindow')}}
-
+
- 车 站:
-
+ {{$t('menu.station') + $t('global.colon')}}
+
-
+
-
目的车次窗
+
{{$t('menu.targetTrainWindow')}}
-
+
- 车 站:
-
+ {{$t('menu.station') + $t('global.colon')}}
+
-
+
@@ -47,10 +47,10 @@
- 确定
+ {{$t('global.confirm')}}
- 取 消
+ {{$t('global.cancel')}}
@@ -78,22 +78,22 @@
rules: {
trainNumberSource: [
- { required: true, message: '请输入车组号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
],
trainSource: [
- { required: true, message: '请输入车次号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
],
stationStandSource: [
- { required: true, message: '请选择车站', trigger: 'change' }
+ { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
],
trainNumberGoal: [
- { required: true, message: '请输入车组号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
],
trainGoal: [
- { required: true, message: '请输入车次号', trigger: 'blur' }
+ { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
],
stationStandGoal: [
- { required: true, message: '请选择车站', trigger: 'change' }
+ { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
],
},
dialogShow: false,
@@ -114,7 +114,7 @@
return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
},
title() {
- return '移动列车识别号'
+ return this.$t('menu.menuTrain.moveTrainId');
}
},
mounted() {
@@ -188,4 +188,4 @@
padding: 0 5px;
background-color: #F0F0F0;
}
-
\ No newline at end of file
+
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
deleted file mode 100644
index 4bfc09bb9..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
- {{message}}
-
-
-
-
- 确认
-
-
- 关闭
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
index 5c6b913a2..aa2f8c525 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
@@ -3,16 +3,16 @@
:before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-
+
-
+
-
+
-
+
@@ -20,10 +20,10 @@
- 确定
+ {{$t('menu.menuChildDialog.determine')}}
- 取 消
+ {{$t('menu.menuChildDialog.cancel')}}
@@ -52,16 +52,16 @@
},
rules: {
jobNumber: [
- { required: true, message: '请输入工号', trigger: 'blur' }
+ { required: true, message: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' }
],
userName: [
- { required: true, message: '请输入用户名', trigger: 'blur' }
+ { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' }
],
password: [
- { required: true, message: '请输入密码', trigger: 'change' }
+ { required: true, message: this.$t('menu.menuChildDialog.inputPassword'), trigger: 'change' }
],
confirm: [
- { required: true, message: '请再次输入密码', trigger: 'change' }
+ { required: true, message: this.$t('menu.menuChildDialog.inputPasswordAgain'), trigger: 'change' }
],
},
}
@@ -80,7 +80,7 @@
return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
},
title() {
- return '增加用户'
+ return this.$t('menu.menuChildDialog.addUser')
}
},
mounted() {
@@ -126,7 +126,7 @@
this.doClose();
this.$emit('operateUser', this.model);
} else {
- this.$messageBox('二次输入密码不一致');
+ this.$messageBox(this.$t('menu.menuChildDialog.passwordInconsistent'));
}
}
})
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
deleted file mode 100644
index 1072742eb..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
- {{message}}
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
deleted file mode 100644
index fe69bab58..000000000
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue b/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
index a2f848882..a38a1cf00 100644
--- a/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmap/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
@@ -6,28 +6,27 @@
- ControlMonitor 1.3.5.0
+ {{$t('menu.menuDialog.versionName')}}
确定
+ :loading="loading" @click="commit">{{$t('menu.menuDialog.confirm')}}
- 版权所有（C）2010-2011 北京玖琏科技有限公司
+ {{$t('menu.menuDialog.copyright')}}
-
+
-
+
-
+
-
+
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
index 7e122f11c..04b760bae 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
+++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/control.vue
@@ -1,39 +1,39 @@
-
- {{`${requestInfo}请求如下区域的控制模式`}}
+ {{`${requestInfo}${$t('menu.passiveDialog.requestAreaControlMode')}`}}
-
+
{{scope.row.operate}}
-
+
{{scope.row.control.name}}
-
+
{{scope.row.target.name}}
-
+
- 距离对话还有{{count}}秒，请应答。
+ {{$t('menu.passiveDialog.messageOne')}} {{count}} {{$t('menu.passiveDialog.messageTwo')}}
- 同意
+ {{$t('menu.passiveDialog.agree')}}
- 拒绝
+ {{$t('menu.passiveDialog.refuse')}}
@@ -55,10 +55,10 @@
dialogShow: false,
disabledAgree: false,
disabledRefuse: false,
- requestInfo: '调度员1工作站',
+ requestInfo: this.$t('menu.passiveDialog.dispatcherWorkstation'),
controlProps: {
- '01': '中控',
- '02': '站控'
+ '01': this.$t('menu.passiveDialog.inTheControl'),
+ '02': this.$t('menu.passiveDialog.stationControl')
},
selection: [],
tableData: [],
@@ -233,7 +233,8 @@
}
})
} else if (!selection) {
- this.$messageBox('请选择一条数据');
+ this.$messageBox(this.$t('menu.passiveDialog.selectData'));
+
}
},
agree() {
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
index f6c7007c5..68635274a 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
+++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/timeout.vue
@@ -1,9 +1,9 @@
-
{{name}}，{{msg}}!
- 确认
+ {{$t('menu.passiveDialog.operationConfirm')}}
@@ -41,10 +41,10 @@
}
if (elem.timeout) {
- newOperate['msg'] = '请求超时';
+ newOperate['msg'] = this.$t('menu.passiveDialog.requestTimedOut');
this.doShow(newOperate);
} else if (!elem.agree) {
- newOperate['msg'] = '请求拒绝';
+ newOperate['msg'] = this.$t('menu.passiveDialog.requestRejection');
this.doShow(newOperate);
}
}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
index da41834cd..71be68ee9 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/addTask.vue
@@ -44,7 +44,7 @@
- {{$t('global.addToTheEnd')}}
+ {{$t('menu.addToTheEnd')}}
{{$t('menu.tripNumber') + $t('global.colon')}}
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
index e8c6f2db8..a24c58412 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/modifyingTask.vue
@@ -32,7 +32,7 @@
- {{this.$t('global.manual')}}
+ {{this.$t('menu.manual')}}
@@ -102,7 +102,7 @@
- {{this.$t('global.manual')}}
+ {{this.$t('menu.manual')}}
diff --git a/src/router/index.js b/src/router/index.js
index 396a978d6..7a59299de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -97,6 +97,7 @@ import AuthorDraft from '@/views/orderauthor/author/draft/ruleForm';
import Permission from '@/views/orderauthor/permission/index';
import PermissionDetail from '@/views/orderauthor/permission/detail';
import PermissionDraft from '@/views/orderauthor/permission/draft/ruleForm';
+import PermissionCreate from '@/views/orderauthor/permission/create/index';
import UserRules from '@/views/orderauthor/rules/index';
import UserRulesDetail from '@/views/orderauthor/rules/detail';
@@ -220,7 +221,8 @@ export const UrlConfig = {
authorDetail: '/orderauthor/author/detail',
authorDraft: '/orderauthor/author/draft',
transferDetail: '/orderauthor/transfer/detail',
- trainferPackage: '/orderauthor/transfer/package'
+ trainferPackage: '/orderauthor/transfer/package',
+ createPackage: '/orderauthor/transfer/create'
},
script: {
prefix: '/script',
@@ -934,6 +936,11 @@ export const asyncRouter = [
path: 'transfer/package',
component: PermissionDraft,
hidden: true
+ },
+ {
+ path: 'transfer/create',
+ component: PermissionCreate,
+ hidden: true
}
]
},
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 2e575c51e..09e20008f 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,10 +3,10 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
- BASE_API = 'https://test.joylink.club/jlcloud';
+ // BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
- // BASE_API = 'http://192.168.3.4:9000' // 琰培
+ BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
} else {
BASE_API = process.env.VUE_APP_BASE_API;
}
diff --git a/src/utils/runPlan.js b/src/utils/runPlan.js
index 8671e0041..e9b9fbfe6 100644
--- a/src/utils/runPlan.js
+++ b/src/utils/runPlan.js
@@ -86,6 +86,9 @@ export const hexColor = {
'#00FFFF', '#008B8B', '#B8860B', '#BDB76B', '#8B008B', '#FF8C00', '#9932CC', '#8FBC8F', '#FF1493', '#00BFFF',
'#FF00FF', '#FFD700', '#FF69B4', '#FF4500', '#DB7093', '#4169E1', '#6A5ACD', '#00FF7F', '#EE82EE', '#40E0D0'
],
+ colors: [
+ '#B9C671', '#6C9040', '#79C671', '#71A5C6', '#C6A071', '#71C689', '#'
+ ],
randomHsl: function () {
const h = Math.random();
const s = Math.random();
diff --git a/src/views/components/progressBar/index.vue b/src/views/components/progressBar/index.vue
index fd8ed3e2a..f03c80bd7 100644
--- a/src/views/components/progressBar/index.vue
+++ b/src/views/components/progressBar/index.vue
@@ -14,7 +14,7 @@
+
+
diff --git a/src/views/orderauthor/permission/create/goods.vue b/src/views/orderauthor/permission/create/goods.vue
new file mode 100644
index 000000000..5b4a5dfbb
--- /dev/null
+++ b/src/views/orderauthor/permission/create/goods.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
diff --git a/src/views/orderauthor/permission/create/index.vue b/src/views/orderauthor/permission/create/index.vue
new file mode 100644
index 000000000..bc341d131
--- /dev/null
+++ b/src/views/orderauthor/permission/create/index.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下一步
+ 上一步
+
+
+
+
+
+
+
+
+ 创建
+ 上一步
+
+
+
+
+
+
+
+
diff --git a/src/views/orderauthor/permission/create/order.vue b/src/views/orderauthor/permission/create/order.vue
new file mode 100644
index 000000000..058833f85
--- /dev/null
+++ b/src/views/orderauthor/permission/create/order.vue
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
diff --git a/src/views/orderauthor/permission/create/permission.vue b/src/views/orderauthor/permission/create/permission.vue
new file mode 100644
index 000000000..a3ef6b6d0
--- /dev/null
+++ b/src/views/orderauthor/permission/create/permission.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('orderAuthor.addPermissions') }}
+
+
+
+
+ {{ computedName(PermissionTypeList, scope.row.type) }}
+
+
+
+
+ {{ $t('global.delete') }}
+ 创建商品
+
+
+
+
+
+
+
+
+
+ 下一步
+ {{ $t('global.back') }}
+
+
+
+
+
+
diff --git a/src/views/orderauthor/permission/index.vue b/src/views/orderauthor/permission/index.vue
index 4b43efcd1..6f4ed0e36 100644
--- a/src/views/orderauthor/permission/index.vue
+++ b/src/views/orderauthor/permission/index.vue
@@ -8,7 +8,7 @@
diff --git a/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue b/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
index 4397c38d1..74072be62 100644
--- a/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
@@ -90,7 +90,7 @@
- 保存
+ 保存
取消&退出
diff --git a/src/views/planMonitor/editTool/menus/modifyingTask.vue b/src/views/planMonitor/editTool/menus/modifyingTask.vue
index 47be0c2c0..bedae8e38 100644
--- a/src/views/planMonitor/editTool/menus/modifyingTask.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingTask.vue
@@ -10,212 +10,213 @@
:modal="false"
:close-on-click-modal="false"
>
-
-
-
-
-
- 车次号：
-
-
-
-
-
-
-
-
-
-
-
- 手工
-
-
-
-
-
-
- 缺省停站时间：
-
-
-
-
-
-
-
-
-
-
-
- 表号：
-
-
-
-
-
-
-
-
-
-
-
- 清客
-
-
- 延续计划
-
-
- 首班车
-
-
-
-
-
-
-
-
-
-
- 序列号：
-
-
-
-
-
-
-
-
-
-
-
- 手工
-
-
-
-
-
-
- 缺省运行等级：
-
-
-
-
-
-
-
-
-
-
-
- 开始时间：
-
-
-
+
+
+
+ 车次号：
+
+
+
+
-
-
-
-
-
-
-
-
- 入库
-
-
- 出库
-
-
- 末班车
-
-
-
-
-
-
-
- 交路：
-
-
-
-
-
- {{ formatName(scope.row.startStationCode) }}
-
-
-
-
-
- {{ formatName(scope.row.endStationCode) }}
-
-
-
-
-
-
-
-
- 详情：
-
-
-
-
-
- {{ formatName(scope.row.stationCode) }}
-
-
-
-
- {{ formatName(scope.row.sectionCode) }}
-
-
-
-
-
-
-
-
-
-
- 显示默认停站时间和运行等级
-
-
-
-
- 确 定
- 取 消
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省停站时间：
+
+
+
+
+
+
+
+
+
+
+
+ 表号：
+
+
+
+
+
+
+
+
+
+
+
+ 清客
+
+
+ 延续计划
+
+
+ 首班车
+
+
+
+
+
+
+
+
+
+ 序列号：
+
+
+
+
+
+
+
+
+
+
+
+ 手工
+
+
+
+
+
+
+ 缺省运行等级：
+
+
+
+
+
+
+
+
+
+
+
+ 开始时间：
+
+
+
+
+
+
+
+
+
+
+
+ 入库
+
+
+ 出库
+
+
+ 末班车
+
+
+
+
+
+
+
+ 交路：
+
+
+
+
+
+ {{ formatName(scope.row.startStationCode) }}
+
+
+
+
+
+ {{ formatName(scope.row.endStationCode) }}
+
+
+
+
+
+
+
+
+ 详情：
+
+
+
+
+
+ {{ formatName(scope.row.stationCode) }}
+
+
+
+
+ {{ formatName(scope.row.sectionCode) }}
+
+
+
+
+
+
+
+
+
+
+ 显示默认停站时间和运行等级
+
+
+
@@ -417,28 +418,27 @@ export default {
diff --git a/src/views/planMonitor/editTool/menus/offLine.vue b/src/views/planMonitor/editTool/menus/offLine.vue
index a67347c3e..bada16608 100644
--- a/src/views/planMonitor/editTool/menus/offLine.vue
+++ b/src/views/planMonitor/editTool/menus/offLine.vue
@@ -17,10 +17,10 @@
{{ params.message }}
-
- 确 定
- 取 消
-
+
@@ -39,7 +39,7 @@ export default {
},
computed: {
title() {
- return 'offline';
+ return '删除计划车';
},
width() {
if (this.params.width) {
@@ -75,4 +75,15 @@ export default {
width: 40px;
}
}
+ .add-planning-train{
+ /deep/ {
+ .el-dialog__body{
+ padding: 10px 20px;
+ }
+ .dialog-footer{
+ display: flex;
+ justify-content: center;
+ }
+ }
+ }
diff --git a/src/views/planMonitor/editTool/menus/systermOut.vue b/src/views/planMonitor/editTool/menus/systermOut.vue
index 580d55b5b..ed03c96fb 100644
--- a/src/views/planMonitor/editTool/menus/systermOut.vue
+++ b/src/views/planMonitor/editTool/menus/systermOut.vue
@@ -11,10 +11,10 @@
:close-on-click-modal="false"
>
-
- 确 定
- 取 消
-
+
@@ -68,4 +68,15 @@ export default {
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index 315d2af48..ca4ccadb4 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -120,7 +120,8 @@ export default {
tooltip: {
axisPointer: {
trigger: 'item',
- type: 'cross'
+ type: 'cross',
+ snap: true
},
formatter: this.axisTooltip,
borderWidth: 1
@@ -282,17 +283,19 @@ export default {
}
});
}
- });
- this.myChart && this.myChart.setOption({ series:
- {
- name: 'trainLabel',
- lineStyle: {
- color: 'green'
- },
- type: 'line',
- data: data
+ if (item.name == 'trainLabel') {
+ item.data = [];
}
});
+ op.series.push({
+ name: 'trainLabel',
+ lineStyle: {
+ color: 'green'
+ },
+ type: 'line',
+ data: data
+ });
+ this.myChart && this.myChart.setOption(op);
}
this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber });
@@ -461,7 +464,7 @@ export default {
that.myChart = ec.init(document.getElementById(that.runPlanId));
that.myChart.setOption(that.option);
that.reSize({ width: that.$store.state.runPlan.width, height: that.$store.state.runPlan.height });
- that.myChart.on('click', that.mouseClick);
+ // that.myChart.on('click', that.mouseClick);
resolve(true);
}
);
@@ -526,25 +529,24 @@ export default {
`到站时间: ${timeFormat(param.data[0] + this.planConvert.TranslationTime)} (${param.data[0]})
`
].join('');
},
- mouseClick(params) {
- const model = {
- serviceNumber: params.seriesName
- };
+ // mouseClick(params) {
+ // const model = {
+ // serviceNumber: params.seriesName
+ // };
- const op = this.myChart.getOption();
- op.series.forEach(item => {
- item.lineStyle.color = '#000';
- if (item.name == params.seriesName) {
- item.lineStyle.color = 'red';
- }
- if (item.name == 'trainLabel') {
- item.data = [];
- }
- });
- this.myChart.setOption(op);
- this.$store.dispatch('runPlan/setSelected', model);
-
- },
+ // const op = this.myChart.getOption();
+ // op.series.forEach(item => {
+ // item.lineStyle.color = '#000';
+ // if (item.name == params.seriesName) {
+ // item.lineStyle.color = 'red';
+ // }
+ // if (item.name == 'trainLabel') {
+ // item.data = [];
+ // }
+ // });
+ // this.myChart.setOption(op);
+ // this.$store.dispatch('runPlan/setSelected', model);
+ // },
reSize(opt) {
if (this.myChart) {
this.myChart.resize({
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index dfbb73e9f..fd4e7fdbe 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -8,6 +8,7 @@
import { getPublishMapList, delPublishMap, getPublishMapExport, putMapOnLine, putMapOffLine } from '@/api/jmap/map';
import { getSkinCodeList } from '@/api/management/mapskin';
import { UrlConfig } from '@/router/index';
+import deviceType from '@/jmap/constant/deviceType';
import localStore from 'storejs';
export default {
@@ -61,6 +62,10 @@ export default {
columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
tagType: (row) => { return ''; }
},
+ // {
+ // title: this.$t('publish.updateTime'),
+ // prop: 'updateTime'
+ // },
{
type: 'button',
title: this.$t('global.operate'),
@@ -96,6 +101,11 @@ export default {
{
name: this.$t('global.exportMap'),
handleClick: this.handleExportMap
+ },
+ {
+ name: this.$t('global.export'),
+ handleClick: this.handleExportMapSame,
+ showControl: () => { return process.env.NODE_ENV === 'development'; }
}
]
}
@@ -196,24 +206,196 @@ export default {
// 导出地图
async handleExportMap(index, row) {
- try {
- const res = await getPublishMapExport(row.id);
- const resultData = res.data;
- if (resultData === false) {
- return;
- }
- const content = new Blob([JSON.stringify(resultData)]);
- const urlObject = window.URL || window.webkitURL || window;
- const url = urlObject.createObjectURL(content);
- const el = document.createElement('a');
- el.href = url;
- el.download =`${resultData.name}.json`;
- el.click();
- urlObject.revokeObjectURL(url);
- } catch (error) {
- console.error(error);
+ const res = await getPublishMapExport(row.id);
+ const resultData = res.data;
+ if (resultData === false) {
+ return;
}
+ // const self = this;
+ // import('@/utils/Export2Excel').then(excel => {
+ // self.queryExportData(resultData).then(data => {
+ // excel.export_json_excel(data, resultData.name);
+ // }).catch(error => {
+ // self.$message.error(`${this.$t('error.exportException')}:${error.message}`);
+ // });
+ // });
+
+ const content = new Blob([JSON.stringify(resultData)]);
+ const urlObject = window.URL || window.webkitURL || window;
+ const url = urlObject.createObjectURL(content);
+ const el = document.createElement('a');
+ el.href = url;
+ el.download =`${resultData.name}.json`;
+ el.click();
+ urlObject.revokeObjectURL(url);
+ },
+
+ // 部分导出
+ async handleExportMapSame(index, row) {
+ const res = await getPublishMapExport(row.id);
+ const resultData = res.data;
+ if (resultData === false) {
+ return;
+ }
+
+ const self = this;
+ import('@/utils/Export2Excel').then(excel => {
+ self.queryExportDataSame(resultData).then(data => {
+ excel.export_json_excel(data, resultData.name);
+ }).catch(error => {
+ self.$message.error(`${this.$t('error.exportException')}:${error.message}`);
+ });
+ });
+ },
+
+ formatJson(filterVal, jsonData) {
+ return jsonData.map(v => filterVal.map(j => v[j]));
+ },
+ // 格式化数据列表
+ queryExportData(data) {
+ return new Promise((resolve, reject) => {
+ const result = {
+ base: []
+ };
+ const obj = {};
+ const list = ['graphData', 'logicData'];
+ for (const i in data) {
+ if (list.includes(i)) {
+ for (const v in data[i]) {
+ if (data[i][v].length) {
+ result[v] = [...data[i][v]];
+ } else if (v == 'skinVO') {
+ result[v] = [data[i][v]];
+ }
+ }
+ } else if (data[i] instanceof Object || typeof data[i] != 'object') {
+ obj[i] = data[i];
+ } else if (data[i] instanceof Array) {
+ if (data[i].length) {
+ obj[i] = [...data[i]];
+ }
+ }
+ }
+
+ result.base.push(obj);
+ resolve(result);
+ });
+ },
+ // 格式化数据列表
+ queryExportDataSame(data) {
+ const mapProps = {};
+
+ mapProps['stationStandList'] = {
+ filter: item => { return true; },
+ propList: {
+ 'direction': item => {
+ return item.direction;
+ },
+ 'name': (item, devices) =>{
+ let name = '';
+ if (item.stationCode) {
+ const stationList = devices['stationList'];
+ const station = stationList.find(elem => { return item.stationCode == elem.code; });
+ if (station) {
+ name = station.name;
+ }
+ }
+ return name;
+ },
+ 'code': item => {
+ return item.code;
+ }
+ }
+ };
+ mapProps['switchList'] = {
+ filter: item => { return true; },
+ propList: {
+ 'name': item =>{
+ return item.name;
+ },
+ 'code': item => {
+ return item.code;
+ }
+ }
+ };
+ mapProps['signalList'] = {
+ filter: item => { return true; },
+ propList: {
+ 'name': item =>{
+ return item.name;
+ },
+ 'code': item => {
+ return item.code;
+ }
+ }
+ };
+ mapProps['sectionList'] = {
+ filter: item => { return item.type == '01'; },
+ propList: {
+ 'name': (item, devices) =>{
+ let name = item.name;
+ if (item.isSwitchSection) {
+ const swchList = devices['switchList'];
+ const swch = swchList.find(elem => { return item.relSwitchCode == elem.code; });
+ if (swch) {
+ if (item.code == swch.sectionACode) {
+ name = `${name} (${swch.name}-A)`;
+ } else if (item.code == swch.sectionBCode) {
+ name = `${name} (${swch.name}-B)`;
+ } else if (item.code == swch.sectionCCode) {
+ name = `${name} (${swch.name}-C)`;
+ }
+ }
+ }
+
+ return name;
+ },
+ 'code': item => {
+ return item.code;
+ }
+ }
+ };
+
+ return new Promise((resolve, reject) => {
+ const result = {
+ base: []
+ };
+ const obj = {};
+ const list = ['graphData', 'logicData'];
+ for (const i in data) {
+ if (list.includes(i)) {
+ for (const v in data[i]) {
+ if (data[i][v].length) {
+ if (mapProps[v]) {
+ const list = [];
+ data[i][v].forEach(device => {
+ if (mapProps[v].filter(device)) {
+ const obj = {};
+ Object.keys(mapProps[v].propList || []).forEach(key => {
+ obj[key] = mapProps[v].propList[key](device, data[i]);
+ });
+ list.push(obj);
+ }
+ });
+ result[v] = list;
+ }
+ } else if (v == 'skinVO') {
+ result[v] = [data[i][v]];
+ }
+ }
+ } else if (data[i] instanceof Object || typeof data[i] != 'object') {
+ obj[i] = data[i];
+ } else if (data[i] instanceof Array) {
+ if (data[i].length) {
+ obj[i] = [...data[i]];
+ }
+ }
+ }
+
+ result.base.push(obj);
+ resolve(result);
+ });
}
}
};
From 2c7f48fb28dcf0b7f175eb203a48c30828191cbe Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 17 Sep 2019 13:19:43 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/global.js | 1 +
src/i18n/langs/en/lesson.js | 3 ++-
src/i18n/langs/en/rules.js | 8 +++++++-
src/i18n/langs/zh/global.js | 1 +
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js
index f72e68c09..55569da98 100644
--- a/src/i18n/langs/en/global.js
+++ b/src/i18n/langs/en/global.js
@@ -118,6 +118,7 @@ export default {
paymentSuccessful: 'Payment successful,click to return',
cancelSuccessfully: 'Cancel success,click to return',
paymentFailed: 'Payment failed,click to return',
+ previousStep: 'Previous step',
putaway: 'Putaway',
soldOut: 'Sold out',
diff --git a/src/i18n/langs/en/lesson.js b/src/i18n/langs/en/lesson.js
index 816b6408e..aed51eb70 100644
--- a/src/i18n/langs/en/lesson.js
+++ b/src/i18n/langs/en/lesson.js
@@ -96,5 +96,6 @@ export default {
platform: 'Platform',
train: 'Train',
station: 'Station',
- trainWindow: 'Train window'
+ trainWindow: 'Train window',
+ editStepInfo: 'Edit step information'
};
diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js
index e6f0cc639..68b4fafea 100644
--- a/src/i18n/langs/en/rules.js
+++ b/src/i18n/langs/en/rules.js
@@ -266,5 +266,11 @@ export default {
enterTheServiceNumber: 'Please enter the service number',
enterTheTripNumber: 'Please enter the trip number',
enterTheTargetCode: 'Please enter the target code',
- selectStation: 'Please select station'
+ selectStation: 'Please select station',
+ inputTrainingName: 'Please input training name',
+ inputTrainingRemark: 'Please input training remark',
+ inputTrainingType: 'Please input training type',
+ inputOperationType: 'Please input operation type',
+ inputMinDuration: 'Please input best duration',
+ inputMaxDuration: 'Please input max duration'
};
diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js
index 77f6d2df8..610762da0 100644
--- a/src/i18n/langs/zh/global.js
+++ b/src/i18n/langs/zh/global.js
@@ -84,6 +84,7 @@ export default {
inputRoomNumber: '请输入房间号',
chooseRoom: '选择房间',
month: '月',
+ previousStep: '上一步',
permissions: '权限',
yuanMonth: '元/月',
From a116539d80e43c880605646e6465fcdcc07433a2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 17 Sep 2019 13:54:10 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/global.js | 3 +++
src/i18n/langs/en/menu.js | 2 ++
src/i18n/langs/en/rules.js | 5 ++++-
src/i18n/langs/zh/menu.js | 2 ++
src/views/teach/category/tree.vue | 1 +
5 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js
index 55569da98..e187fb3ea 100644
--- a/src/i18n/langs/en/global.js
+++ b/src/i18n/langs/en/global.js
@@ -111,7 +111,10 @@ export default {
creationTime: 'Create Time: ',
amountPayable: 'Amounts Payable: ',
screenName: 'Screen Name',
+ courseName: 'Course Name',
timeUnitPrice: 'Screen Unit Price',
+ coursePrice: 'Course Unit Price',
+ testPrice: 'Test Unit Price',
buyProject: 'The products you will purchase are virtual content services. After purchase, you will not be able to return, transfer or exchange. Please confirm.',
relatedServices: 'You can view and use the related services in the “Permissions Details” area after purchase.',
diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js
index 00f6502fb..d324c9984 100644
--- a/src/i18n/langs/en/menu.js
+++ b/src/i18n/langs/en/menu.js
@@ -311,6 +311,8 @@ export default {
range: ' (Range：16-99) '
},
+ confirm: 'Confirm',
+ cancel: 'Cancel',
platform: 'Platform',
arrivalTime: 'Arrival time',
stopTime: 'Stop time',
diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js
index 68b4fafea..3905116f5 100644
--- a/src/i18n/langs/en/rules.js
+++ b/src/i18n/langs/en/rules.js
@@ -272,5 +272,8 @@ export default {
inputTrainingType: 'Please input training type',
inputOperationType: 'Please input operation type',
inputMinDuration: 'Please input best duration',
- inputMaxDuration: 'Please input max duration'
+ inputMaxDuration: 'Please input max duration',
+ accessNumber: 'Please input the number of permissions',
+ courseNameEmpty: 'Course name cannot be empty',
+ purchaseMonth: 'Please input the number of months to buy'
};
diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js
index 24f5979de..df380e35c 100644
--- a/src/i18n/langs/zh/menu.js
+++ b/src/i18n/langs/zh/menu.js
@@ -307,6 +307,8 @@ export default {
fontSize: '字体大小',
range: '（范围：16-99）'
},
+ confirm: '确定',
+ cancel: '取消',
platform: '站台',
arrivalTime: '到点',
stopTime: '停站时间',
diff --git a/src/views/teach/category/tree.vue b/src/views/teach/category/tree.vue
index d13465253..6b2f69215 100644
--- a/src/views/teach/category/tree.vue
+++ b/src/views/teach/category/tree.vue
@@ -23,6 +23,7 @@
:span="22"
@node-contextmenu="showContextMenu"
@node-click="clickEvent"
+ style="padding-bottom: 30px;"
>
Date: Tue, 17 Sep 2019 14:14:29 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/orderAuthor.js | 3 ++-
src/i18n/langs/en/permission.js | 4 +++-
src/i18n/langs/zh/orderAuthor.js | 3 ++-
src/i18n/langs/zh/permission.js | 4 +++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js
index 7b593f3d0..6cf6edb7d 100644
--- a/src/i18n/langs/en/orderAuthor.js
+++ b/src/i18n/langs/en/orderAuthor.js
@@ -102,5 +102,6 @@ export default {
orderDetails: 'Order details',
statusType: 'Status type',
private: 'Private',
- public: 'Public'
+ public: 'Public',
+ pleaseEnterContent: 'Please enter content'
};
diff --git a/src/i18n/langs/en/permission.js b/src/i18n/langs/en/permission.js
index 841100aa8..8fb09ec02 100644
--- a/src/i18n/langs/en/permission.js
+++ b/src/i18n/langs/en/permission.js
@@ -29,5 +29,7 @@ export default {
pleaseSelectTransferPermission: 'Select transfer permissions',
permissionName: 'Permission Name',
private: 'Private',
- public: 'Public'
+ public: 'Public',
+ userName: 'User Name',
+ statusType: 'Status Type'
};
diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js
index b3b8c4467..5a2c3af97 100644
--- a/src/i18n/langs/zh/orderAuthor.js
+++ b/src/i18n/langs/zh/orderAuthor.js
@@ -101,5 +101,6 @@ export default {
orderSelectionItem: '订单选择商品',
orderDetails: '订单详情',
statusType: '状态类型',
- createPackage: '创建权限'
+ createPackage: '创建权限',
+ pleaseEnterContent: '请输入内容'
};
diff --git a/src/i18n/langs/zh/permission.js b/src/i18n/langs/zh/permission.js
index 1706eac16..b85dc1092 100644
--- a/src/i18n/langs/zh/permission.js
+++ b/src/i18n/langs/zh/permission.js
@@ -29,5 +29,7 @@ export default {
pleaseSelectTransferPermission: '选择转赠权限',
permissionName: '权限名称',
private: '专用',
- public: '公用'
+ public: '公用',
+ userName: '用户名称',
+ statusType: '状态类型'
};
From ffdba3dc220d6907c6ea67bccf0b45e286a85df0 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 17 Sep 2019 16:08:11 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en/display.js | 5 ++
src/i18n/langs/en/menu.js | 59 +++++++++----------
src/i18n/langs/zh/display.js | 5 ++
src/i18n/langs/zh/menu.js | 57 +++++++++---------
.../fuzhou_01/menus/passiveDialog/alarm.vue | 50 ++++++++--------
src/views/display/demon/chatBox.vue | 8 +--
6 files changed, 96 insertions(+), 88 deletions(-)
diff --git a/src/i18n/langs/en/display.js b/src/i18n/langs/en/display.js
index d570919b5..05f482613 100644
--- a/src/i18n/langs/en/display.js
+++ b/src/i18n/langs/en/display.js
@@ -167,5 +167,10 @@ export default {
stationName: 'Station Name',
stationMark: 'Station kilometer Mark',
arrivalTime: 'ArrivalTime'
+ },
+ chatBox: {
+ chatWindow: 'Chat Window',
+ autoplay: 'Autoplay',
+ holdAndTalk: 'Hold And Talk'
}
};
diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js
index d324c9984..a0358069e 100644
--- a/src/i18n/langs/en/menu.js
+++ b/src/i18n/langs/en/menu.js
@@ -129,35 +129,34 @@ export default {
confirmRunToFrontStation: 'Confirm Run To Front Station'
},
passiveDialog: {
- // 级告警详细信息
- // 线路名称
- // 单位名称
- // 模块名称
- // 报警时间
- // 选择日期时间
- // 等 级
- // 确认状态
- // 类 型
- // 子类型
- // 时间摘要
- // 推荐操作
- // 报警详细描述
- // 请输入内容
- // 确 定
- // 未确认
- // 级报警数目：1
- // 中控
- // 站控
- // CMM控制模式转换模式
- // 0级告警
- // 确认状态
- // 系统事件
- // 依据信号设备操作命令设置控制模式
- // 控制模式摘要
- // 控制模式转换：
- // 由
- // 站控转为中控模式
- // 中控转为站控模式
+ alarmDetailInformation: 'level alarm details',
+ lineName: 'Line Name',
+ unitName: 'Unit Name',
+ moduleName: 'Module Name',
+ alarmDate: 'Alarm Date',
+ level: 'level',
+ selectDate: 'Please select date',
+ confirmStatus: 'Confirm',
+ type: 'Type',
+ childType: 'Child Type',
+ timeSummary: 'Time Summary',
+ recommendedOperation: 'Recommend Operation',
+ alarmDetailedDescription: 'Alarm Detail Description',
+ inputContent: 'Please input content',
+ confirm: 'Confirm',
+ unconfirmedMessageOne: 'number of level',
+ unconfirmedMessageTwo: ' alarm is not confirmed:1',
+ centralControl: 'Central Control',
+ // stationControl: 'Station Control',
+ cmmControlModeConversionMode: 'CMM Control Mode Transfer Mode',
+ zeroLevelAlarm: 'Level 0 alarm',
+ systemEvent: 'System Event',
+ childTypeTips: 'Set the control mode according to the signal device operation command',
+ controlModeSummary: 'Control Mode Summary',
+ controlModeTransfer: 'Control Mode Transfer: ',
+ alarmDetailOne: 'changed ',
+ stationToCentral: 'from station control to central control mode',
+ centralToStation: 'from central control to station control mode',
controlModeRequest: 'Control Mode Request',
requestAreaControlMode: 'Request Area Control Mode',
@@ -170,7 +169,7 @@ export default {
agree: 'Agree',
refuse: 'Refuse',
dispatcherWorkstation: 'Dispatcher One Workstation',
- inTheControl: 'In The Control',
+ inTheControl: 'Central Control',
stationControl: 'Station Control',
selectData: 'Please select a piece of data',
diff --git a/src/i18n/langs/zh/display.js b/src/i18n/langs/zh/display.js
index c39531524..d60dc39e6 100644
--- a/src/i18n/langs/zh/display.js
+++ b/src/i18n/langs/zh/display.js
@@ -167,6 +167,11 @@ export default {
stationName: '车站名称',
stationMark: '车站公里标',
arrivalTime: '到站时间'
+ },
+ chatBox: {
+ chatWindow: '聊天窗口',
+ autoplay: '自动播放',
+ holdAndTalk: '按住说话'
}
};
diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js
index df380e35c..26c71b34c 100644
--- a/src/i18n/langs/zh/menu.js
+++ b/src/i18n/langs/zh/menu.js
@@ -126,35 +126,34 @@ export default {
confirmRunToFrontStation: '确认运行至前方站'
},
passiveDialog: {
- // 级告警详细信息
- // 线路名称
- // 单位名称
- // 模块名称
- // 报警时间
- // 选择日期时间
- // 等 级
- // 确认状态
- // 类 型
- // 子类型
- // 时间摘要
- // 推荐操作
- // 报警详细描述
- // 请输入内容
- // 确 定
- // 未确认
- // 级报警数目：1
- // 中控
- // 站控
- // CMM控制模式转换模式
- // 0级告警
- // 确认状态
- // 系统事件
- // 依据信号设备操作命令设置控制模式
- // 控制模式摘要
- // 控制模式转换：
- // 由
- // 站控转为中控模式
- // 中控转为站控模式
+ alarmDetailInformation: '级告警详细信息',
+ lineName: '线路名称',
+ unitName: '单位名称',
+ moduleName: '模块名称',
+ alarmDate: '报警时间',
+ level: '等 级',
+ selectDate: '选择日期时间',
+ confirmStatus: '确认状态',
+ type: '类 型',
+ childType: '子类型',
+ timeSummary: '时间摘要',
+ recommendedOperation: '推荐操作',
+ alarmDetailedDescription: '报警详细描述',
+ inputContent: '请输入内容',
+ confirm: '确 定',
+ unconfirmedMessageOne: '未确认',
+ unconfirmedMessageTwo: '级报警数目：1',
+ centralControl: '中控',
+ // stationControl: '站控',
+ cmmControlModeConversionMode: 'CMM控制模式转换模式',
+ zeroLevelAlarm: '0级告警',
+ systemEvent: '系统事件',
+ childTypeTips: '依据信号设备操作命令设置控制模式',
+ controlModeSummary: '控制模式摘要',
+ controlModeTransfer: '控制模式转换：',
+ alarmDetailOne: '由',
+ stationToCentral: '站控转为中控模式',
+ centralToStation: '中控转为站控模式',
controlModeRequest: '控制模式请求',
requestAreaControlMode: '请求如下区域的控制模式',
diff --git a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
index 292f16bd0..57f11dab4 100644
--- a/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
+++ b/src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
@@ -1,39 +1,39 @@
-
-
+
-
+
-
+
-
-
+
+
- 等 级
+ {{$t('menu.passiveDialog.level')}}
-
+
@@ -41,34 +41,34 @@
- 类 型
+ {{$t('menu.passiveDialog.type')}}
-
+
-
+
-
+
- 报警详细描述
-
+ {{$t('menu.passiveDialog.alarmDetailedDescription')}}
+
- 确 定
+ {{$t('menu.passiveDialog.confirm')}}
- 未确认{{level}}级报警数目：1
+ {{$t('menu.passiveDialog.unconfirmedMessageOne')}}{{level}}{{$t('menu.passiveDialog.unconfirmedMessageTwo')}}
@@ -88,8 +88,8 @@
level: 0,
operate: null,
controlProps: {
- '01': '中控',
- '02': '站控'
+ '01': this.$t('menu.passiveDialog.centralControl'),
+ '02': this.$t('menu.passiveDialog.stationControl')
},
model: {
lineName: '',
@@ -146,15 +146,15 @@
this.model = {
lineName: this.name,
unitName: this.operate.name,
- moduleName: 'CMM控制模式转换模式',
- level: '0级告警',
- confirm: '确认状态',
+ moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
+ level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
+ confirm: this.$t('menu.passiveDialog.confirmStatus'),
alarmDate: new Date(),
- type: '系统事件',
- childType: '依据信号设备操作命令设置控制模式',
- timeSummary: '控制模式摘要',
+ type: this.$t('menu.passiveDialog.systemEvent'),
+ childType: this.$t('menu.passiveDialog.childTypeTips'),
+ timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
recommendedOperation: '',
- alarmDetail: `控制模式转换：${this.operate.name}由${operate.currentMode == '01' ? '站控转为中控模式' : '中控转为站控模式'}！`
+ alarmDetail: `${$t('menu.passiveDialog.controlModeTransfer')} ${this.operate.name}${$t('menu.passiveDialog.alarmDetailOne')}${operate.currentMode == '01' ? this.$t('menu.passiveDialog.stationToCentral') : this.$t('menu.passiveDialog.centralToStation') }！`
}
this.dialogShow = true;
this.$nextTick(function () {
diff --git a/src/views/display/demon/chatBox.vue b/src/views/display/demon/chatBox.vue
index ae3616d67..1a4fbe0a1 100644
--- a/src/views/display/demon/chatBox.vue
+++ b/src/views/display/demon/chatBox.vue
@@ -2,7 +2,7 @@
-
聊天窗口
+
{{$t('display.chatBox.chatWindow')}}
@@ -52,12 +52,12 @@
- 自动播放
+ {{$t('display.chatBox.autoplay')}}
-
聊天窗口
+
{{$t('display.chatBox.chatWindow')}}
@@ -100,7 +100,7 @@ export default {
label: '',
message: {},
sending: false,
- speak: '按住说话',
+ speak: this.$t('display.chatBox.holdAndTalk'),
conversationId: '',
defaultProps: {
children: 'children'
From 0b7b0e39c16b0f69a59c7db30fee381e49a1a000 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 17 Sep 2019 16:53:29 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E8=AE=A2=E9=98=85=E7=9A=84=E5=9C=B0=E5=9B=BE=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?name=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/baseUrl.js | 4 ++--
src/views/dashboard/echarts/permission.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 2e575c51e..4050e7e22 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -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.4:9000' // 琰培
} else {
BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/dashboard/echarts/permission.vue b/src/views/dashboard/echarts/permission.vue
index ad1e0f60f..7b4446bc2 100644
--- a/src/views/dashboard/echarts/permission.vue
+++ b/src/views/dashboard/echarts/permission.vue
@@ -132,7 +132,7 @@ export default {
initChart() {
listUserPermision({pageSize: 9000, pageNum: 1}).then(resp => {
this.permissionList = resp.data.list.filter(elem => { return parseInt(elem.status) > 0; });
- this.mapNameList = [...new Set(this.permissionList.map(elem => { return elem.mapName; }))];
+ this.mapNameList = [...new Set(this.permissionList.filter(elem => { return elem.mapName; }).map(elem => { return elem.mapName; }))];
this.$nextTick(() => { this.mapName = this.mapNameList[0] || ''; });
});
this.chart = echarts.init(document.getElementById(this.id));