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

本地项目调整&elementUI升版本至2.12.0

Browse Source
This commit is contained in:
fan 2020-04-01 15:32:06 +08:00
parent c1abbaed49
commit ebd90d2485
6 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -18,7 +18,7 @@
"dependencies": { "dependencies": {
"axios": "0.18.0", "axios": "0.18.0",
"echarts": "^4.7.0", "echarts": "^4.7.0",
"element-ui": "^2.7.2", "element-ui": "^2.12.0",
"file-saver": "^1.3.3", "file-saver": "^1.3.3",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",

6
public/index.html
View File

@ -18,9 +18,9 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/vuex/3.1.0/vuex.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/vuex/3.1.0/vuex.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.1.2/vue-router.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.1.2/vue-router.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/index.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/index.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/locale/en.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/en.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/locale/zh-CN.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/zh-CN.min.js"></script>
<% } %> <% } %>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.4.0/sockjs.min.js"></script>--> <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.4.0/sockjs.min.js"></script>-->
</head> </head>

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

@ -240,8 +240,8 @@ class SkinCode extends defaultStyle {
fontWeight: 'normal' fontWeight: 'normal'
}, },
stopTime: { // 停站时间 stopTime: { // 停站时间
offset: {x: -8, y: -4}, // 运行时间偏移量 offset: {x: -50, y: 10}, // 运行时间偏移量
textColor: '#C0C0C0', // 停站时间字体颜色 textColor: '#FFFFFF', // 停站时间字体颜色
textFontSize: 10 textFontSize: 10
}, },
jump: { jump: {

35
src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
View File

@ -32,32 +32,32 @@
:height="140" :height="140"
> >
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px"> <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px"> <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleDirection(scope.row.startSignalCode) }} {{ handleDirection(scope.row.startSignalCode) }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px"> <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.turnBack ? '折返': '直通' }} {{ scope.row.turnBack ? '折返': '直通' }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px"> <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.atsControl == '0' ? '人工' : '自动' }} {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -93,7 +93,8 @@ export default {
selected: null, selected: null,
tempData: [], tempData: [],
stationName: '', stationName: '',
signalName: '' signalName: '',
domIdChoose: ''
}; };
}, },
computed: { computed: {

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

@ -51,6 +51,7 @@ export default {
}, },
data() { data() {
return { return {
lineCode: ''
}; };
}, },
computed: { computed: {

7
src/views/newMap/displayNew/menuTrainList.vue
View File

@ -12,11 +12,10 @@
/> />
</div> </div>
</div> </div>
<el-drawer <div
v-show="drawer" v-show="drawer"
direction="rtl"
:show-close="false" :show-close="false"
size="50%" style="height: 100%;"
> >
<div class="menuTrainList"> <div class="menuTrainList">
<el-table :data="trainList" height="100%" :highlight-current-row="true" @row-click="selectTrain"> <el-table :data="trainList" height="100%" :highlight-current-row="true" @row-click="selectTrain">
@ -26,7 +25,7 @@
<!-- <el-table-column property="right" label="是否上行" width="90" /> --> <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
</el-table> </el-table>
</div> </div>
</el-drawer> </div>
</div> </div>
</template> </template>
<script> <script>