diff --git a/index.html b/index.html index 1a52ad6..d9f4286 100644 --- a/index.html +++ b/index.html @@ -2,8 +2,8 @@ - - + + 车间物料监控 diff --git a/src/images/agv_s.png b/src/images/agv_s.png new file mode 100644 index 0000000..e66b594 Binary files /dev/null and b/src/images/agv_s.png differ diff --git a/src/images/bg-title_1_s.png b/src/images/bg-title_1_s.png new file mode 100644 index 0000000..985b774 Binary files /dev/null and b/src/images/bg-title_1_s.png differ diff --git a/src/images/bg-title_2_s.png b/src/images/bg-title_2_s.png new file mode 100644 index 0000000..5a93656 Binary files /dev/null and b/src/images/bg-title_2_s.png differ diff --git a/src/images/header_bg_s.png b/src/images/header_bg_s.png new file mode 100644 index 0000000..01596e6 Binary files /dev/null and b/src/images/header_bg_s.png differ diff --git a/src/images/pie-bg_2_s.png b/src/images/pie-bg_2_s.png new file mode 100644 index 0000000..4c6a208 Binary files /dev/null and b/src/images/pie-bg_2_s.png differ diff --git a/src/images/rgv_s.png b/src/images/rgv_s.png new file mode 100644 index 0000000..e96fb40 Binary files /dev/null and b/src/images/rgv_s.png differ diff --git a/src/main.js b/src/main.js index 0262528..c2c7398 100644 --- a/src/main.js +++ b/src/main.js @@ -4,17 +4,15 @@ import App from './App' import router from './router' import store from './vuex/store' import './style/reset.css' -import './style/layout.styl' +import './style/iconfont.styl' import * as echarts from 'echarts' import 'default-passive-events' import scroll from 'vue-seamless-scroll' -import {Message, Select, Option} from 'element-ui' +import {Message} from 'element-ui' Vue.prototype.$echarts = echarts Vue.use(scroll) Vue.prototype.$message = Message -Vue.use(Select) -Vue.use(Option) Vue.config.productionTip = false /* eslint-disable no-new */ new Vue({ diff --git a/src/pages/Setup.vue b/src/pages_1920/Setup.vue similarity index 100% rename from src/pages/Setup.vue rename to src/pages_1920/Setup.vue diff --git a/src/pages/modules/home/index.vue b/src/pages_1920/modules/home/index.vue similarity index 100% rename from src/pages/modules/home/index.vue rename to src/pages_1920/modules/home/index.vue diff --git a/src/pages_960/Setup.vue b/src/pages_960/Setup.vue new file mode 100644 index 0000000..930872a --- /dev/null +++ b/src/pages_960/Setup.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/pages_960/modules/home/index.vue b/src/pages_960/modules/home/index.vue new file mode 100644 index 0000000..2bdc7a3 --- /dev/null +++ b/src/pages_960/modules/home/index.vue @@ -0,0 +1,1283 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 4be96f3..7c6668c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,8 +1,8 @@ import Vue from 'vue' import Router from 'vue-router' -const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') -const home = r => require.ensure([], () => r(require('@page/modules/home/index')), 'home') +const Setup = r => require.ensure([], () => r(require('../pages_960/Setup')), 'Setup') +const home = r => require.ensure([], () => r(require('../pages_960/modules/home/index')), 'home') Vue.use(Router) diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl index e9d5e14..6798f00 100644 --- a/src/style/iconfont.styl +++ b/src/style/iconfont.styl @@ -4,22 +4,22 @@ url('iconfont/iconfont.woff') format('woff'), url('iconfont/iconfont.ttf') format('truetype'); } -@font-face { - font-family: "YouSheBiaoTiHei"; - src: url('font/YouSheBiaoTiHei.ttf') format('truetype'); -} -@font-face { - font-family: "SourceHanSansCN-Bold"; - src: url('font/SourceHanSansCN-Bold.otf') format('truetype'); -} -@font-face { - font-family: "SourceHanSansCN-Regular"; - src: url('font/SourceHanSansCN-Regular.otf') format('truetype'); -} -@font-face { - font-family: "SourceHanSansCN-Medium"; - src: url('font/SourceHanSansCN-Medium.otf') format('truetype'); -} +// @font-face { +// font-family: "YouSheBiaoTiHei"; +// src: url('font/YouSheBiaoTiHei.ttf') format('truetype'); +// } +// @font-face { +// font-family: "SourceHanSansCN-Bold"; +// src: url('font/SourceHanSansCN-Bold.otf') format('truetype'); +// } +// @font-face { +// font-family: "SourceHanSansCN-Regular"; +// src: url('font/SourceHanSansCN-Regular.otf') format('truetype'); +// } +// @font-face { +// font-family: "SourceHanSansCN-Medium"; +// src: url('font/SourceHanSansCN-Medium.otf') format('truetype'); +// } .iconfont { font-family: "iconfont" !important; font-size: 16px; diff --git a/src/style/reset.css b/src/style/reset.css index 7df373c..432359e 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -84,7 +84,7 @@ body { -ms-user-select:none;/*IE10*/ -khtml-user-select:none;/*早期浏览器*/ user-select:none; - background: center / 100% 100% url('../images/bg.jpg') no-repeat; + background-color: #133471; } div, p { diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js index 5f65b31..5539a36 100644 --- a/src/vuex/modules/com.js +++ b/src/vuex/modules/com.js @@ -1,42 +1,32 @@ import * as types from '../types' import { getStore, setStore } from '@js/mUtils.js' -const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.8.162:8010' : 'http://192.168.8.162:8010' -const lcUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.8.160:8010' : 'http://192.168.8.160:8010' - +const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.8.221:8011' : 'http://192.168.8.221:8011' /** * App通用配置 */ const state = { baseUrl: getStore('baseUrl') || baseUrl, - lcUrl: getStore('lcUrl') || lcUrl, - setTime: getStore('setTime') || 50000, - equipId: getStore('equipId') || '1' + setTime: getStore('setTime') || 180000 } const actions = { setConfig ({commit}, res) { setStore('baseUrl', res.baseUrl) - setStore('lcUrl', res.lcUrl) setStore('setTime', res.setTime) - setStore('equipId', res.equipId) commit(types.COM_CONFIG, res) } } const getters = { baseUrl: state => state.baseUrl, - lcUrl: state => state.lcUrl, - setTime: state => state.setTime, - equipId: state => state.equipId + setTime: state => state.setTime } const mutations = { [types.COM_CONFIG] (state, res) { state.baseUrl = res.baseUrl - state.lcUrl = res.lcUrl state.setTime = res.setTime - state.equipId = res.equipId } }