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

单位调整&哈尔滨区段限速调整

Browse Source
This commit is contained in:
fan 2020-12-02 14:22:26 +08:00
parent 422ed21415
commit d8f8acfe02
10 changed files with 183 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jmapNew/config/skinCode/chengdu_01.js
View File

@ -108,6 +108,11 @@ class SkinCode extends defaultStyle {
},
speedLimitName: {
z: 10,
leftName: true, // 左侧限速值是否展示
rightName: true, // 右侧限速值是否展示
nameBackgroundIsRect: false, // 限速值背景是否为矩形
nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度
nameBackgroundBorderColor: '#000', // 限速值背景边框颜色
limitValueDistance: -15,
kilometerFontSize: 8, // 公里标大小
kilometerColor: '#fff', // 公里标颜色

5
src/jmapNew/config/skinCode/chengdu_03.js
View File

@ -108,6 +108,11 @@ class SkinCode extends defaultStyle {
},
speedLimitName: {
z: 10,
leftName: true, // 左侧限速值是否展示
rightName: true, // 右侧限速值是否展示
nameBackgroundIsRect: false, // 限速值背景是否为矩形
nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度
nameBackgroundBorderColor: '#000', // 限速值背景边框颜色
limitValueDistance: -15,
kilometerFontSize: 8, // 公里标大小
kilometerColor: '#fff', // 公里标颜色

17
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -6,7 +6,7 @@ class SkinCode extends defaultStyle {
super();
this.fontFamily = '宋体';
this[deviceType.Section] = {
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'speedLimit'],
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'speedLimitName'],
active: {
routeColor: false // 进路触发颜色
},
@ -113,6 +113,21 @@ class SkinCode extends defaultStyle {
lineColor: '#FFFF00', // 限速线颜色
nameShow: false // 名称显示
},
speedLimitName: {
z: 10,
leftName: true, // 左侧限速值是否展示
rightName: false, // 右侧限速值是否展示
nameBackgroundIsRect: true, // 限速值背景是否为矩形
nameBackgroundBorderWidth: 1, // 限速值背景是否边框宽度
nameBackgroundBorderColor: '#C00808', // 限速值背景边框颜色
limitValueDistance: 18,
kilometerFontSize: 0, // 公里标大小
nameNumberFontSize: 11, // 限速值大小
nameNumberColor: '#C00808', // 限速值颜色
nameBackground: '#000', // 限速名称背景颜色
drogueWidth: 15, // 浮标宽度
drogueHeight: 12 // 浮标高度
},
separator: {
z: 3, // 分割符层级
width: 1.2, // 分隔符宽度

5
src/jmapNew/config/skinCode/race_01.js
View File

@ -68,6 +68,11 @@ class SkinCode extends defaultStyle {
},
speedLimitName: {
z: 10,
leftName: true, // 左侧限速值是否展示
rightName: true, // 右侧限速值是否展示
nameBackgroundIsRect: false, // 限速值背景是否为矩形
nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度
nameBackgroundBorderColor: '#C00808', // 限速值背景边框颜色
limitValueDistance: 15, // 限速值距离
kilometerFontSize: 0, // 公里标大小
kilometerColor: '#000', // 公里标颜色

220
src/jmapNew/shape/Section/ELimitName.js
View File

@ -22,110 +22,122 @@ export default class ELimitName extends Group {
const y1 = model.points[0].y + style.Section.speedLimitName.limitValueDistance;
const x2 = model.points[model.points.length - 1].x;
const y2 = model.points[model.points.length - 1].y + style.Section.speedLimitName.limitValueDistance;
this.leftPolygon = new Polygon({
zlevel: this.zlevel,
z: this.z + 9,
shape: {
points: [
[x1, y1],
[x1 + rectW, y1],
[x1 + (rectW + rectH / 2), y1 - rectH / 2],
[x1 + rectW, y1 - rectH],
[x1, y1 - rectH]
]
},
style: {
lineWidth: 0,
fill: style.Section.speedLimitName.nameBackground
}
});
this.rightPolygon = new Polygon({
zlevel: this.zlevel,
z: this.z + 9,
shape: {
points: [
[x2, y2],
[x2 - rectW, y2],
[x2 - (rectW + rectH / 2), y2 - rectH / 2],
[x2 - rectW, y2 - rectH],
[x2, y2 - rectH]
]
},
style: {
lineWidth: 0,
fill: style.Section.speedLimitName.nameBackground
}
});
this.leftLimitValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x1 + 2,
y: y1,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily,
text: '',
textFill: style.Section.speedLimitName.nameNumberColor,
textAlign: 'left',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.rightLimitValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x2 - 2,
y: y2,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily,
text: '',
textFill: style.Section.speedLimitName.nameNumberColor,
textAlign: 'right',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.leftKilometerValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x1,
y: y1 + 12,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.kilometerFontSize,
fontFamily: style.fontFamily,
text: '17.981km',
textFill: style.Section.speedLimitName.kilometerColor,
textAlign: 'left',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.rightKilometerValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x2,
y: y2 + 12,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.kilometerFontSize,
fontFamily: style.fontFamily,
text: '17.981km',
textFill: style.Section.speedLimitName.kilometerColor,
textAlign: 'right',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.add(this.leftPolygon);
this.add(this.rightPolygon);
this.add(this.leftLimitValue);
this.add(this.rightLimitValue);
this.add(this.leftKilometerValue);
this.add(this.rightKilometerValue);
if (style.Section.speedLimitName.leftName) {
const leftPoints = style.Section.speedLimitName.nameBackgroundIsRect ? [[x1, y1],
[x1 + rectW, y1],
[x1 + rectW, y1 - rectH],
[x1, y1 - rectH]] : [[x1, y1],
[x1 + rectW, y1],
[x1 + (rectW + rectH / 2), y1 - rectH / 2],
[x1 + rectW, y1 - rectH],
[x1, y1 - rectH]];
this.leftPolygon = new Polygon({
zlevel: this.zlevel,
z: this.z + 9,
shape: {
points: leftPoints
},
style: {
lineWidth: style.Section.speedLimitName.nameBackgroundBorderWidth,
fill: style.Section.speedLimitName.nameBackground,
stroke: style.Section.speedLimitName.nameBackgroundBorderColor
}
});
this.leftLimitValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x1 + 2,
y: y1,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily,
text: '',
textFill: style.Section.speedLimitName.nameNumberColor,
textAlign: 'left',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.leftKilometerValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x1,
y: y1 + 12,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.kilometerFontSize,
fontFamily: style.fontFamily,
text: '17.981km',
textFill: style.Section.speedLimitName.kilometerColor,
textAlign: 'left',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.add(this.leftPolygon);
this.add(this.leftLimitValue);
this.add(this.leftKilometerValue);
}
if (style.Section.speedLimitName.rightName) {
const rightPoints = style.Section.speedLimitName.nameBackgroundIsRect ? [[x2, y2],
[x2 - rectW, y2],
[x2 - rectW, y2 - rectH],
[x2, y2 - rectH]] : [[x2, y2],
[x2 - rectW, y2],
[x2 - (rectW + rectH / 2), y2 - rectH / 2],
[x2 - rectW, y2 - rectH],
[x2, y2 - rectH]];
this.rightPolygon = new Polygon({
zlevel: this.zlevel,
z: this.z + 9,
shape: {
points: rightPoints
},
style: {
lineWidth: style.Section.speedLimitName.nameBackgroundBorderWidth,
fill: style.Section.speedLimitName.nameBackground,
stroke: style.Section.speedLimitName.nameBackgroundBorderColor
}
});
this.rightLimitValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x2 - 2,
y: y2,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.nameNumberFontSize,
fontFamily: style.fontFamily,
text: '',
textFill: style.Section.speedLimitName.nameNumberColor,
textAlign: 'right',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.rightKilometerValue = new Text({
zlevel: this.zlevel,
z: this.z + 10,
style: {
x: x2,
y: y2 + 12,
fontWeight: 'normal',
fontSize: style.Section.speedLimitName.kilometerFontSize,
fontFamily: style.fontFamily,
text: '17.981km',
textFill: style.Section.speedLimitName.kilometerColor,
textAlign: 'right',
textPosition: style.Section.name.textPosition || 'inside',
textVerticalAlign: 'bottom'
}
});
this.add(this.rightPolygon);
this.add(this.rightLimitValue);
this.add(this.rightKilometerValue);
}
}
hide() {

1
src/jmapNew/theme/chengdu_03/menus/index.vue
View File

@ -33,7 +33,6 @@ export default {
components: {
MenuBar,
MenuButton,
MenuCancel,
MenuSignal,
MenuSwitch,
MenuSection,

35
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -53,7 +53,7 @@
:data="tempData"
border
:cell-style="tableStyle"
style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 56px"
style="width: 100%;background: #E0E0E0;border: none;outline: none; height: 28px"
size="mini"
class="haerbin_table"
highlight-current-row
@ -61,6 +61,14 @@
>
<el-table-column prop="name" style="margin-left:10px" class-name="abc" />
</el-table>
<el-select v-if="speedShow" v-model="speedLimitValue" size="small" style="float: left;width: 100px;margin-left: 20px;" placeholder="请选择">
<el-option
v-for="item in speedList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
</div>
</el-col>
@ -147,6 +155,8 @@ export default {
data() {
return {
tempData: [],
speedList: [{label: '15km/h', value: 15}, {label: '25km/h', value:25}, {label: '45km/h', value:45}, {label: '60km/h', value: 60}],
speedLimitValue: 15,
oldDevice: null, // 上一次点击元素
canCommand: true,
cr1Confrim: false,
@ -204,6 +214,9 @@ export default {
},
cr2ConfirmId() {
return OperationEvent.Command.commandHaerbin.confrimCr2.domId;
},
speedShow() {
return this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED;
}
},
watch: {
@ -373,8 +386,7 @@ export default {
this.tempData.push(this.selectedObj);
this.param = {
switchCode: this.selectedObj.code,
sectionCode: section.code,
speedLimitValue: '5' // 默认区段临时限速
sectionCode: section.code
};
},
handleSingalMenu() {
@ -468,8 +480,7 @@ export default {
this.tempData = [];
this.tempData.push(this.selectedObj);
this.param = {
sectionCode: this.selectedObj.code,
speedLimitValue: '5'
sectionCode: this.selectedObj.code
};
},
handleDirectionRodMenu() {
@ -577,6 +588,9 @@ export default {
});
}
}
if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
this.param.speedLimitValue = this.speedLimitValue;
}
},
command() {
this.handleParam();
@ -652,6 +666,7 @@ export default {
this.operate = ''; // 清空指令
this.cmdType = '';
this.securityCommand = '';
this.speedLimitValue = 15;
this.secondConfirm = false;
this.cr1Confrim = false;
if (this.oldClickObj) {
@ -804,6 +819,16 @@ export default {
height: 20px;
line-height: 20px;
}
/deep/.el-input--small .el-input__inner{
height: 28px;
line-height: 28px;
}
/deep/.el-table__empty-text{
line-height: 28px;
}
/deep/.el-table__empty-block{
min-height: 28px;
}
</style>
<style lang="scss">
#menuButton{

2
src/router/index_Common.js
View File

@ -766,7 +766,7 @@ export const asyncRouter = [
{
// 单位管理
path: 'companyManage',
hidden: true,
// hidden: true,
component: CompanyManage,
meta: {
i18n: 'router.companyManage'

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ 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.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.8.129:9000'; // 旭强
// BASE_API = 'http://192.168.8.119:9000'; // 张赛
BASE_API = 'http://192.168.8.110:9000'; // 杜康
// BASE_API = 'http://192.168.8.110:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛

3
src/views/system/companyManage/manager.vue
View File

@ -98,6 +98,9 @@ export default {
doShow(companyId) {
this.dialogVisible = true;
this.companyId = companyId;
this.$nextTick(() => {
this.reloadTable();
});
},
handleClose() {
this.dialogVisible = false;