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

Merge branch 'dev_pack' into test

Browse Source 
# Conflicts:
#	package.json
#	vue.config.js
This commit is contained in:
fan 2020-04-01 10:33:26 +08:00
commit b778621329
10 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -17,11 +17,14 @@
}, },
"dependencies": { "dependencies": {
"axios": "0.18.0", "axios": "0.18.0",
"echarts": "^4.7.0",
"element-ui": "^2.7.2",
"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",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"normalize.css": "7.0.0", "normalize.css": "7.0.0",
"nprogress": "^0.2.0",
"path-to-regexp": "2.4.0", "path-to-regexp": "2.4.0",
"qrcode.vue": "^1.6.2", "qrcode.vue": "^1.6.2",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
@ -30,8 +33,11 @@
"stompjs": "^2.3.3", "stompjs": "^2.3.3",
"storejs": "^1.0.25", "storejs": "^1.0.25",
"three": "^0.107.0", "three": "^0.107.0",
"vue": "^2.6.10",
"vue-i18n": "^8.12.0", "vue-i18n": "^8.12.0",
"vue-router": "^3.0.6",
"vuedraggable": "^2.23.2", "vuedraggable": "^2.23.2",
"vuex": "^3.1.0",
"xlsx": "^0.14.2", "xlsx": "^0.14.2",
"zrender": "^4.0.4" "zrender": "^4.0.4"
}, },

28
public/index.html
View File

@ -6,22 +6,24 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.png"> <link rel="icon" href="<%= BASE_URL %>favicon.png">
<!-- cdn.bootcss.com替换成cdnjs.cloudflare.com/ajax/libs --> <!-- cdn.bootcss.com替换成cdnjs.cloudflare.com/ajax/libs -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/theme-chalk/index.css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
<script src="/static/inflate.min.js"></script> <script src="/static/inflate.min.js"></script>
<script src="/static/three.min.js"></script> <script src="/static/three.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/4.4.0-rc.1/echarts-en.common.js"></script> <% if (process.env.NODE_ENV !== 'development') { %>
<p>今天是周末</p>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.10/vue.min.js"></script> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/theme-chalk/index.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/vuex/3.1.0/vuex.min.js"></script> <link href="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">
<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/echarts/4.4.0-rc.1/echarts-en.common.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/vue/2.6.10/vue.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/element-ui/2.7.2/index.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/element-ui/2.7.2/locale/en.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/locale/zh-CN.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/sockjs-client/1.4.0/sockjs.min.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.7.2/locale/zh-CN.min.js"></script>
<% } %>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.4.0/sockjs.min.js"></script>-->
</head> </head>
<body> <body>
<noscript> <noscript>

7
src/i18n/langs/en/index.js
View File

@ -1,5 +1,5 @@
// import enLocale from 'element-ui/lib/locale/lang/en'; import enLocale from 'element-ui/lib/locale/lang/en';
import ELEMENT from 'element-ui'; // import ELEMENT from 'element-ui';
import map from './map'; import map from './map';
import global from './global'; import global from './global';
import router from './router'; import router from './router';
@ -31,7 +31,8 @@ import login from './login';
import designPlatform from './designPlatform'; import designPlatform from './designPlatform';
export default { export default {
...ELEMENT.lang.en, // ...ELEMENT.lang.en,
enLocale,
map, map,
global, global,
router, router,

7
src/i18n/langs/zh/index.js
View File

@ -1,5 +1,5 @@
// import cnLocale from 'element-ui/lib/locale/lang/zh-CN'; import cnLocale from 'element-ui/lib/locale/lang/zh-CN';
import ELEMENT from 'element-ui'; // import ELEMENT from 'element-ui';
import map from './map'; import map from './map';
import global from './global'; import global from './global';
import router from './router'; import router from './router';
@ -31,7 +31,8 @@ import login from './login';
import designPlatform from './designPlatform'; import designPlatform from './designPlatform';
export default { export default {
...ELEMENT.lang.zhCN, // ...ELEMENT.lang.zhCN,
cnLocale,
map, map,
global, global,
router, router,

3
src/layout/components/Entry.vue
View File

@ -57,7 +57,7 @@ export default {
}, },
{ {
name: 'global.caseShow', name: 'global.caseShow',
// handle: this.goToCaseShow, handle: this.goEmpty,
isHelp:true, isHelp:true,
style:'padding-right:0px;', style:'padding-right:0px;',
hidden:getSessionStorage('project').endsWith('hyd') hidden:getSessionStorage('project').endsWith('hyd')
@ -134,6 +134,7 @@ export default {
const href = 'https://joylink.club/helps/help1.pdf'; const href = 'https://joylink.club/helps/help1.pdf';
window.open(href, '_blank'); window.open(href, '_blank');
}, },
goEmpty() {},
goToCaseShow() { goToCaseShow() {
const href = 'https://joylink.club/helps/西安铁路职业技术学院.pdf'; const href = 'https://joylink.club/helps/西安铁路职业技术学院.pdf';
window.open(href, '_blank'); window.open(href, '_blank');

10
src/main.js
View File

@ -1,8 +1,10 @@
import Vue from 'vue'; import Vue from 'vue';
import 'normalize.css/normalize.css'; // A modern alternative to CSS resets import 'normalize.css/normalize.css'; // A modern alternative to CSS resets
import ELEMENT from 'element-ui'; // import ELEMENT from 'element-ui';
import ElementUI from 'element-ui';
import ElementLocale from 'element-ui/lib/locale';
import 'element-ui/lib/theme-chalk/index.css';
import '@/styles/index.scss'; // global css import '@/styles/index.scss'; // global css
import LangStorage from '@/utils/lang'; import LangStorage from '@/utils/lang';
@ -27,7 +29,7 @@ import '@/directive/quickMenuDrag/index.js';
import '@/directive/waves/index.js'; import '@/directive/waves/index.js';
import messages from '@/i18n/index'; import messages from '@/i18n/index';
Vue.use(ELEMENT); Vue.use(ElementUI);
Vue.use(VueI18n); Vue.use(VueI18n);
Vue.config.devtools = true; // 开发环境显示vue控制台 Vue.config.devtools = true; // 开发环境显示vue控制台
Vue.config.productionTip = false; Vue.config.productionTip = false;
@ -37,7 +39,7 @@ export const i18n = new VueI18n({
messages messages
}); });
ELEMENT.i18n((key, value) => i18n.t(key, value)); ElementLocale.i18n((key, value) => i18n.t(key, value));
new Vue({ new Vue({
el: '#app', el: '#app',

16
src/router/index_HYD.js
View File

@ -1,8 +1,8 @@
// import Vue from 'vue'; import Vue from 'vue';
import Router from 'vue-router'; import VueRouter from 'vue-router';
// import VueRouter from 'vue-router'; // import VueRouter from 'vue-router';
// Vue.use(Router); Vue.use(VueRouter);
/* Layout */ /* Layout */
const Layout = () => import('@/layout'); const Layout = () => import('@/layout');
@ -756,7 +756,7 @@ export const asyncRouter = [
} }
]; ];
const createRouter = () => new Router({ const createRouter = () => new VueRouter({
mode: 'history', // require service support mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes routes: constantRoutes
@ -771,9 +771,9 @@ router.beforeEach((to, from, next) => {
}); });
// 兼容 vue-router在3.1.0版本以上的路由跳转使用的是 promise 的方式 // 兼容 vue-router在3.1.0版本以上的路由跳转使用的是 promise 的方式
const originalPush = Router.prototype.push; // const originalPush = VueRouter.prototype.push;
Router.prototype.push = function push(location) { // VueRouter.prototype.push = function push(location) {
return originalPush.call(this, location).catch(err => err); // return originalPush.call(this, location).catch(err => err);
}; // };
export default router; export default router;

4
src/store/index.js
View File

@ -1,4 +1,4 @@
// import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import app from './modules/app'; import app from './modules/app';
import settings from './modules/settings'; import settings from './modules/settings';
@ -19,7 +19,7 @@ import iscs from './modules/iscs';
import getters from './getters'; import getters from './getters';
// Vue.use(Vuex); Vue.use(Vuex);
const store = new Vuex.Store({ const store = new Vuex.Store({
modules: { modules: {

2
src/views/newMap/displayNew/menuSchema.vue
View File

@ -64,7 +64,7 @@ export default {
} }
}, },
stationList: { stationList: {
type: Object, type: Array,
default() { default() {
return []; return [];
} }

2
src/views/newMap/jlmapNew/pendant/switchStation.vue
View File

@ -10,7 +10,7 @@ export default {
name: 'SwitchStation', name: 'SwitchStation',
props: { props: {
concentrationStationList: { concentrationStationList: {
type: String, type: Array,
default() { default() {
return []; return [];
} }