diff --git a/App.vue b/App.vue
index 58b029a..65cdd0b 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
onLaunch: function() {
// #ifdef APP-PLUS
plus.screen.lockOrientation('portrait-primary');
- // plus.navigator.setFullscreen(true);
+ plus.navigator.setFullscreen(true);
// #endif
},
onHide: function() {
diff --git a/common/style/font/SourceHanSansCN-Bold.otf b/common/style/font/SourceHanSansCN-Bold.otf
new file mode 100644
index 0000000..4b3429a
Binary files /dev/null and b/common/style/font/SourceHanSansCN-Bold.otf differ
diff --git a/common/style/font/SourceHanSansCN-Medium.otf b/common/style/font/SourceHanSansCN-Medium.otf
new file mode 100644
index 0000000..53e03e0
Binary files /dev/null and b/common/style/font/SourceHanSansCN-Medium.otf differ
diff --git a/common/style/font/SourceHanSansCN-Regular.otf b/common/style/font/SourceHanSansCN-Regular.otf
new file mode 100644
index 0000000..886f82f
Binary files /dev/null and b/common/style/font/SourceHanSansCN-Regular.otf differ
diff --git a/common/style/font/YouSheBiaoTiHei.ttf b/common/style/font/YouSheBiaoTiHei.ttf
new file mode 100644
index 0000000..3729151
Binary files /dev/null and b/common/style/font/YouSheBiaoTiHei.ttf differ
diff --git a/common/style/iconfont/iconfont.ttf b/common/style/iconfont/iconfont.ttf
new file mode 100644
index 0000000..239c64c
Binary files /dev/null and b/common/style/iconfont/iconfont.ttf differ
diff --git a/common/style/iconfont/iconfont.woff b/common/style/iconfont/iconfont.woff
new file mode 100644
index 0000000..82a494e
Binary files /dev/null and b/common/style/iconfont/iconfont.woff differ
diff --git a/common/style/iconfont/iconfont.woff2 b/common/style/iconfont/iconfont.woff2
new file mode 100644
index 0000000..5929552
Binary files /dev/null and b/common/style/iconfont/iconfont.woff2 differ
diff --git a/common/style/layout.styl b/common/style/layout.styl
index de49991..01662da 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -1,6 +1,7 @@
@import './mixin.styl';
page {
background-color: #f2f5fa !important;
+ background: center / 100% 100% url('./static/image/bg.jpg') no-repeat;
min-height: 100% !important;
height: 100% !important;
}
@@ -12,465 +13,39 @@ uni-button:after {
border: none;
}
+@font-face {
+ font-family: "YouSheBiaoTiHei";
+ src: url('./common/style/font/YouSheBiaoTiHei.ttf') format('truetype');
+}
+@font-face {
+ font-family: "SourceHanSansCN-Bold";
+ src: url('./common/style/font/SourceHanSansCN-Bold.otf') format('truetype');
+}
+@font-face {
+ font-family: "SourceHanSansCN-Regular";
+ src: url('./common/style/font/SourceHanSansCN-Regular.otf') format('truetype');
+}
+@font-face {
+ font-family: "SourceHanSansCN-Medium";
+ src: url('./common/style/font/SourceHanSansCN-Medium.otf') format('truetype');
+}
+@font-face {
+ font-family: "iconfont";
+ src: url('./common/style/iconfont/iconfont.woff2') format('woff2'),
+ url('./common/style/iconfont/iconfont.woff') format('woff'),
+ url('./common/style/iconfont/iconfont.ttf') format('truetype');
+}
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
/** 内容 */
-.zd_container {
+.container {
width: 100%;
height: 100%;
-}
-.zd_content {
- position: relative;
- top: calc(var(--status-bar-height) + 72rpx);
- width: 100%;
- height: auto;
- padding: 20rpx 14rpx 140rpx 14rpx;
-}
-.zd_wrapper {
- width: 100%;
- height: auto;
- background-color: #fff;
- border-radius: 24rpx;
- padding: 22rpx;
- margin-bottom: 20rpx;
- box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
-}
-.filter_wrapper {
- position relative
- left -14rpx
- width: calc(100% + 28rpx);
- height: auto;
- background-color: #fff;
- padding: 22rpx 22rpx 0 22rpx;
- margin-bottom: 20rpx;
-}
-.filter_label {
- display: block;
- line-height: 80rpx;
- font-size: 28rpx;
- color: #323232;
- font-weight: bold;
- letter-spacing: 4rpx;
- padding-left: 10rpx;
- /* text-align:justify;
- text-align-last: justify;
- text-justify: inter-ideograph; */
-}
-/** 筛选选择器样式 */
-.filter_picker .uni-input {
- width: 100%;
- line-height: 80rpx;
- height: 80rpx;
- font-size: 28rpx;
- color: #606266;
-}
-/** 筛选下拉框带搜索过滤功能样式 */
-.filter_select .uni-select {
- line-height: 80rpx !important;
- height: 80rpx !important;
- font-size: 28rpx !important;
- color: #606266;
- padding: 0 !important;
- border: 0 !important;
-}
-.filter_input {
- width: 100%;
- height: 80rpx;
- line-height: 80rpx;
- border: 0;
- background-color: transparent;
- font-size: 28rpx;
- color: #606266;
-}
-.filter_input_disabled {
- background-color: #eee;
-}
-.filter_input_wraper {
- /* flex: 1; */
- width: calc(100% - 170rpx);
- height: 80rpx;
- padding: 5rpx 0;
- margin-left: 30rpx;
- display: flex;
- justify-content: flex-start;
- align-items: center;
-}
-.tab-line {
- _wh(32rpx, 10rpx)
- background-color #fff
- border-radius 10rpx
- margin 20rpx auto 0
-}
-.tab-line_active {
- background-color #4e6ef2
-}
-.font-style-1 {
- _font(32rpx, 32rpx, #c1c1c3,,center)
-}
-.font-style-2 {
- _font(32rpx, 32rpx, #000,bold,center)
-}
-.grid-wraper {
- width: 100%;
-}
-.slide_new {
- width: 100%;
- height: 100%;
- overflow-y: auto;
-}
-.slide_h {
- overflow-y: hidden;
-}
-.slide_new table {
- table-layout: fixed;
- min-width: 100%;
- border-collapse: separate;
- border-spacing: 0;
- border: 0;
-}
-.slide_new table td, .slide_new table th {
- box-sizing: border-box;
overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- padding: 0 20rpx;
- border-bottom: 10rpx solid #f5f5f5;
- text-align: center;
-}
-.slide_h table td, .slide_h table th {
- white-space: wrap;
- padding: 0 20rpx;
- border-bottom: 10rpx solid #f5f5f5;
- text-align: center;
-}
-.slide_new table td:first-child{
- position: sticky;
- left: 0;
- z-index: 101;
-}
-.slide_new table th:first-child{
- position: sticky;
- left: 0;
- z-index: 102;
-}
-.slide_new table thead tr th {
- position: sticky;
- top: 0;
- background: #d7d7d7;
- font-size: 26rpx;
- line-height: 28rpx;
- padding: 35rpx 10rpx;
- color: #7d7d7d;
- background-color: #dcdfea;
- font-weight: bold;
- z-index: 100;
-}
-.slide_new table tbody tr td {
- font-size: 28rpx;
- line-height: 58rpx;
- padding: 14rpx 20rpx;
- color: #7d7d7d;
- background: #fff;
-}
-.slide_h table tbody tr td {
- font-size: 28rpx;
- line-height: 28rpx;
- padding: 14rpx 20rpx;
- color: #7d7d7d;
- background: #fff;
-}
-.slide_new table tbody tr td .td_input {
- width: 150rpx;
- font-size: 28rpx;
- color: #305fbf;
- line-height: 30rpx;
- height: 58rpx;
- padding: 14rpx;
- border: 1px solid #889dc7;
- box-shadow: 0 0 0 2px rgba(136, 157, 199,.2);
- border-radius: 10rpx;
-}
-.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
- color: #4e6ef2;
- font-weight: bold;
-}
-.slide_new table tbody tr td.fontcol2 {
- color: #000;
-}
-.slide_new table tbody tr td .fontbg{
- font-size: 26rpx;
- line-height: 30rpx;
- padding: 8rpx 20rpx;
- border-radius: 8rpx;
- background-color: #F60;
- color: #fff;
-}
-.slide_new table tbody tr td .fontbg1 {
- background-color: #cfd2d4;
- color: #5e5d5d;
-}
-.slide_new table tbody tr td .fontbg2 {
- background-color: #96f3b8;
- color: #36744c;
-}
-.slide_new table tbody tr td .fontbg3 {
- background-color: #f3ccb5;
- color: #ff5e00;
-}
-.slide_new table tbody tr.checked
- td
- background-color: #4e6ef2
- color #fff
- td.fontcol1, td.fontcol2
- color #fff
-.item-wrapper {
- width: 100%;
- height: auto;
-}
-.item-wrap {
- background-color: #fff;
- border-radius: 24rpx;
- padding: 22rpx 14rpx;
- margin-bottom: 20rpx;
- box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
-}
-.item-font-1
- _font(30rpx,28rpx,#000,,)
-.item-font-2
- _font(24rpx,40rpx,$red,,)
-.item-font-3
- width 110rpx
- _font(24rpx,26rpx,#333,,)
- text-align:justify;
- text-align-last: justify;
- text-justify: inter-ideograph;
-.item-font-4
- width calc(100% - 110rpx)
- _font(26rpx,26rpx,#999,,)
-.item-font-5
- _font(44rpx,60rpx,$green,,center)
- background-color #f6f6f6
-.item-font-6
- width calc(50% - 110rpx)
- _font(24rpx,52rpx,#666,,center)
- background-color #e5e5e5
- border-radius 26rpx
-.item-font-7
- width 110rpx
- _font(24rpx,52rpx,#666,,center)
-.item-font-8
- _font(24rpx,52rpx,#666,,center)
-.isChecked
- box-shadow inset 2px 2px 4px 0px rgba(120, 141, 250, 0.7), inset -2px -2px 4px 0px rgba(120, 141, 250, 0.7)
-/** 提交栏 **/
-.submit-bar {
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- z-index: 200;
- background-color: #fff;
- padding: 14rpx;
- box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
-}
-.button-default {
- font-size: 34rpx;
- line-height: 88rpx;
- color: #ff6a00;
- text-align: center;
- letter-spacing: 4rpx;
- padding: 0;
- background-color: #fff;
- border: 2rpx solid #ff6a00;
- border-radius: 10rpx;
-}
-.button-primary {
- font-size: 34rpx;
- line-height: 88rpx;
- color: #fff;
- text-align: center;
- letter-spacing: 4rpx;
- padding: 0;
- background-color: #ff6a00;
- border: 2rpx solid #ff6a00;
- border-radius: 10rpx;
-}
-.button-info, .submit-button[disabled] {
- background-color: #c9c9c9;
- border: 2rpx solid #c9c9c9;
- color: #fff;
-}
-uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
- border: 2rpx solid #c9c9c9;
-}
-.submit-more {
- width: 20%;
- font-size: 34rpx;
- line-height: 34rpx;
- padding: 27rpx 10rpx;
- color: #000;
- text-align: center;
- background-color: #fff
-}
-.more_btns_wraper {
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- z-index: 201;
- padding: 0 20rpx 20rpx;
- transition: all .3s;
-}
-.more-button {
- font-size: 34rpx;
- line-height: 88rpx;
- color: #ff6a00;
- text-align: center;
- border-radius: 0;
- background-color: transparent;
-}
-.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] {
- color: #c9c9c9;
- border: none;
-}
-.more-button:last-child {
- border-bottom: none;
-}
-.more_btns_cancle {
- margin-top: 20rpx;
- width: 100%;
- font-size: 34rpx;
- line-height: 88rpx;
- color: #000;
- text-align: center;
- background-color: #fff;
- border-radius: 20rpx;
-}
-.more_btns_items{
- width: 100%;
- border-radius: 20rpx;
- background-color: #fff;
-}
-
-/** 下拉框 */
-.uni-select__selector {
- z-index: 300 !important;
-}
-
-/** 弹窗 */
-.popshow {
- transform: translateY(0);
-}
-.pophide {
- transform: translateY(100%);
-}
-.msg_wrapper {
- position: fixed;
- top: auto;
- bottom: 0;
- left: 0;
- width: 100%;
- height: calc(100% - var(--status-bar-height) - 72rpx);
- background-color: #f6f6f6;
- box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
- border-top-left-radius: 20rpx;
- border-top-right-radius: 20rpx;
- z-index: 301;
- transition: all .3s;
-}
-.msg_content {
- width: 100%;
- height: 100%;
- overflow-y: scroll;
-}
-.msg_box {
- width: 100%;
-}
-.msg_mask {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- opacity: .7;
- background: #000;
- z-index: 300;
-}
-.msg_btns {
- width: 100%;
- margin: 40rpx auto 0;
-}
-.msg_btn {
- font-size: 34rpx;
- line-height: 78rpx;
- color: #fff;
- background-color: #ff6a00;
- border: 1rpx solid #ff6a00;
- border-radius: 44rpx;
- box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
-}
-.msg_btn_cancle {
- background-color: #fff;
- border: 1rpx solid #ff6a00;
- font-size: 34rpx;
- line-height: 78rpx;
- border-radius: 44rpx;
- color: #000;
- box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
-}
-.msg_btn:disabled {
- background-color: #c9c9c9;
-}
-.uni-select__input-placeholder,.uni-select__selector-empty, .uni-select__selector-item {
- font-size: 28rpx !important
-}
-.sin_input {
- width: 150rpx;
- font-size: 28rpx;
- line-height: 150rpx;
- height: 68rpx;
- color: #323232;
- padding: 0 .1rem;
- border: 1px solid #a1a1a1;
- border-radius: 3px;
-}
-.layout-t tr.checked td .sin_input {
- color: #8a8a8a;
- border: 1px solid #ffffff;
-}
-
-.flow_wrapper {
- width: 100%;
- background-color: #fff;
- border-radius: 24rpx;
- padding: 22rpx 20rpx;
- margin-bottom: 20rpx;
- box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
-}
-.font-size-1 {
- font-size: 30rpx;
- line-height: 54rpx;
- color: #ff6a00;
-}
-.font-size-2 {
- font-size: 30rpx;
- line-height: 54rpx;
- color: #000;
-}
-.flow_start_item {
- position: relative;
- background-color: #f3f3f3;
- border: 1rpx solid #f3f3f3;
- border-radius: 10rpx;
-}
-.flow_start_item_checked {
- position: relative;
- background-color: #fff;
- border: 1rpx solid #ff6a00;
-}
-.flow_icon_item_1 {
- width: 46rpx;
- height: 56rpx;
-}
-.flow_icon_item_2 {
- width: 46rpx;
- height: 26rpx;
}
\ No newline at end of file
diff --git a/common/style/reset.css b/common/style/reset.css
index 8e5b014..eb043ea 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -138,8 +138,8 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
.border-bottom {
border-bottom: 1rpx solid #e5e5e5;
}
-.mgb10 {
- margin-bottom: 10rpx;
+.mgb20 {
+ margin-bottom: 20rpx;
}
.pdl20 {
padding-left: 20rpx;
diff --git a/components/MyHeader.vue b/components/MyHeader.vue
new file mode 100644
index 0000000..8336edc
--- /dev/null
+++ b/components/MyHeader.vue
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ed72dbb..1cbd1dc 100644
--- a/pages.json
+++ b/pages.json
@@ -6,6 +6,14 @@
"navigationStyle": "custom"
}
}
+ ,{
+ "path" : "pages/home",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/home.vue b/pages/home.vue
new file mode 100644
index 0000000..8090e70
--- /dev/null
+++ b/pages/home.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/setup.vue b/pages/setup.vue
index 239d03a..ffd73e4 100644
--- a/pages/setup.vue
+++ b/pages/setup.vue
@@ -1,6 +1,18 @@
-
-
+
+ 车间物流监控
+
+ 系统配置
+
+ 域名地址
+
+
+
+ 刷新时间（秒）
+
+
+
+
@@ -8,12 +20,68 @@
export default {
data() {
return {
-
+ baseUrl: this.$store.getters.baseUrl,
+ setTime: this.$store.getters.setTime / 1000
};
+ },
+ methods: {
+ toConfig () {
+ if (this.setTime > 10800) {
+ uni.showToast({
+ title: '刷新时间设置过长',
+ icon: 'none'
+ })
+ return
+ }
+ let obj = {
+ baseUrl: this.baseUrl,
+ setTime: this.setTime * 1000
+ }
+ this.$store.dispatch('setConfig', obj)
+ uni.redirectTo({
+ url: '/pages/home'
+ })
+ }
}
}
-
diff --git a/static/image/bg.jpg b/static/image/bg.jpg
new file mode 100644
index 0000000..c1680fa
Binary files /dev/null and b/static/image/bg.jpg differ
diff --git a/static/image/exit.png b/static/image/exit.png
deleted file mode 100644
index fefa052..0000000
Binary files a/static/image/exit.png and /dev/null differ
diff --git a/static/image/header_bg.png b/static/image/header_bg.png
new file mode 100644
index 0000000..a48bdb4
Binary files /dev/null and b/static/image/header_bg.png differ
diff --git a/static/image/info_bg.png b/static/image/info_bg.png
deleted file mode 100644
index 8f7e000..0000000
Binary files a/static/image/info_bg.png and /dev/null differ
diff --git a/static/image/login_bg.png b/static/image/login_bg.png
deleted file mode 100644
index 680a940..0000000
Binary files a/static/image/login_bg.png and /dev/null differ
diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png
deleted file mode 100644
index 450da60..0000000
Binary files a/static/image/menu/RF01.png and /dev/null differ
diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png
deleted file mode 100644
index 4b8ce5c..0000000
Binary files a/static/image/menu/RF02.png and /dev/null differ
diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png
deleted file mode 100644
index 6417a79..0000000
Binary files a/static/image/menu/RF03.png and /dev/null differ
diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
deleted file mode 100644
index 7e9ddd2..0000000
Binary files a/static/image/menu/RF04.png and /dev/null differ
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
deleted file mode 100644
index 30c871f..0000000
Binary files a/static/image/menu/RF05.png and /dev/null differ
diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png
deleted file mode 100644
index e18e35a..0000000
Binary files a/static/image/menu/RF06.png and /dev/null differ
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
deleted file mode 100644
index 44fa467..0000000
Binary files a/static/image/menu/RF07.png and /dev/null differ
diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
deleted file mode 100644
index ab42ca3..0000000
Binary files a/static/image/menu/RF08.png and /dev/null differ
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
deleted file mode 100644
index ee6ef08..0000000
Binary files a/static/image/menu/RF09.png and /dev/null differ
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index a7b5a62..62e3d89 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,12 +1,8 @@
import * as types from '../types'
const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8011' : 'http://192.168.81.162:8011'
-const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010'
-const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010'
const state = {
baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
- acsUrl: uni.getStorageSync('acsUrl') || acsUrl,
- printUrl: uni.getStorageSync('printUrl') || printUrl,
setTime: uni.getStorageSync('setTime') || 5000,
loginName: uni.getStorageSync('loginName') ? uni.getStorageSync('loginName') : '',
userInfo: uni.getStorageSync('userInfo') ? uni.getStorageSync('userInfo') : '',
@@ -14,9 +10,7 @@ const state = {
}
const getters = {
baseUrl: state => state.baseUrl,
- acsUrl: state => state.acsUrl,
- printUrl: state => state.printUrl,
- setTime: state => state.setTime,
+ setTime: state => state.setTime,
loginName: state => state.loginName,
userInfo: state => state.userInfo,
saveToken: state => state.saveToken
@@ -24,8 +18,6 @@ const getters = {
const actions = {
setConfig ({commit}, res) {
uni.setStorageSync('baseUrl', res.baseUrl)
- uni.setStorageSync('acsUrl', res.acsUrl)
- uni.setStorageSync('printUrl', res.printUrl)
uni.setStorageSync('setTime', res.setTime)
commit(types.COM_CONFIG, res)
},
@@ -54,8 +46,6 @@ const actions = {
const mutations = {
[types.COM_CONFIG] (state, res) {
state.baseUrl = res.baseUrl
- state.acsUrl = res.acsUrl
- state.printUrl = res.printUrl
state.setTime = res.setTime
},
[types.SAVE_LOGIN_NAME] (state, res) {