root/hht-tongbo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

样式

Browse Source
This commit is contained in:
caill
2022-10-11 17:03:44 +08:00
parent 2eab2ecf68
commit f28e95ea2d
13 changed files with 262 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@@ -3,7 +3,7 @@
onLaunch: function() { onLaunch: function() {
// #ifdef APP-PLUS // #ifdef APP-PLUS
// plus.screen.lockOrientation('landscape-primary'); // plus.screen.lockOrientation('landscape-primary');
// plus.navigator.setFullscreen(true); plus.navigator.setFullscreen(true);
// #endif // #endif
}, },
onHide: function() { onHide: function() {

124
common/style/layout.css
View File

@@ -1,10 +1,10 @@
page { page {
background-color: #F5F5F5 !important; background-color: #f6f6f6 !important;
min-height: 100% !important; min-height: 100% !important;
height: 100% !important; height: 100% !important;
} }
uni-page-body { uni-page-body {
background-color: #F5F5F5 !important; background-color: #f6f6f6 !important;
min-height: 100% !important; min-height: 100% !important;
height: 100% !important; height: 100% !important;
} }
@@ -42,27 +42,83 @@ uni-page-body {
color: #ff6a00; color: #ff6a00;
border: 1rpx solid #ff6a00; border: 1rpx solid #ff6a00;
} }
.icon_back {
font-size: 52rpx;
/* .open_icon::before { line-height: 52rpx;
content: '\ec0c' color: #fff;
} */ }
.icon_home {
font-size: 52rpx;
line-height: 52rpx;
color: #fff;
}
/** 内容 */ /** 内容 */
.container {
width: 100%;
height: 100%;
}
.content { .content {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 0 24rpx; padding: 92rpx 15rpx 82rpx 14rpx;
} }
.container { .wrapper {
width: 100%; width: 100%;
height: calc(100% - 110rpx); height: auto;
background-color: #fff;
border-radius: 24rpx;
padding: 14rpx;
margin-bottom: 20rpx;
}
.filter_item {
display: flex;
width: 100%;
margin-bottom: 10rpx;
}
.filter_item:last-child {
margin-bottom: 0;
}
.filter_label_wraper {
flex: none;
width: 140rpx;
text-align:justify;
text-align-last: justify;
text-justify: inter-ideograph;/*兼容ie*/
}
.filter_label {
display: block;
width: 140rpx;
line-height: 80rpx;
font-size: 28rpx;
color: #323232;
text-align:justify;
text-align-last: justify;
text-justify: inter-ideograph;/*兼容ie*/
}
.filter_input_wraper {
flex: 1;
height: 80rpx;
padding: 5rpx 0;
margin-left: 30rpx;
}
.filter_input {
width: 100%;
height: 70rpx;
line-height: 70rpx;
border-bottom: 1px solid #dcdfe6;
padding: 0 15rpx;
font-size: 28rpx;
color: #606266;
border-radius: 4rpx;
} }
.grid-wraper { .grid-wraper {
width: 100%; width: 100%;
}
.slide_new {
width: 100%;
height: 100%; height: 100%;
padding-top: 15rpx; overflow-y: auto;
overflow-y: scroll;
} }
.slide_new table { .slide_new table {
table-layout: fixed; table-layout: fixed;
@@ -104,43 +160,37 @@ uni-page-body {
background: #fff; background: #fff;
} }
/** 按钮 **/
.btn {
font-size: 28rpx;
line-height: 60rpx;
color: #fff;
text-align: center;
padding: 0 2rpx;
background-color: #e74f1a;
border-radius: 5px;
cursor: pointer;
}
.btn&:disabled {
background-color: #c9c9c9 !important
}
.btn-disabled {
background-color: #c9c9c9 !important
}
/** 提交栏 **/ /** 提交栏 **/
.submit-bar { .submit-bar {
display: flex; display: flex;
justify-content: space-between; flex-wrap: wrap;
justify-content: flex-end;
align-items: center; align-items: center;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
z-index: 100;
background-color: #fff; background-color: #fff;
box-shadow: 0 0 20px 0 rgba(160,160,160,0.9); padding-top: 15rpx;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
} }
.submit-button { .submit-button {
flex: 1; font-size: 30rpx;
font-size: 28rpx; line-height: 52rpx;
line-height: 80rpx; color: #ff6a00;
color: #fff;
text-align: center; text-align: center;
margin: 15rpx; letter-spacing: 1rpx;
background-color: $red; padding: 0 22rpx;
background-color: #fff;
border: 1px solid #ff6a00;
margin: 0 20rpx 15rpx 0;
border-radius: 30rpx;
}
.btn-disabled {
background-color: #c9c9c9;
border: 1px solid #c9c9c9;
color: #fff;
} }
/** 弹窗 */ /** 弹窗 */

3
common/style/reset.css
View File

@@ -24,6 +24,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
.hide { .hide {
display: none; display: none;
} }
.vhide {
visibility:hidden;
}
.show { .show {
display: block; display: block;
} }

45
components/NavBar.vue
View File

@@ -1,8 +1,8 @@
<template> <template>
<view class="header"> <view class="header">
<text class="icon-back"></text> <span @tap="goBack" class="iconfont icon_back">&#xe6db;</span>
<text></text> <span class="page_name">{{title}}</span>
<text class="icon-home"></text> <span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show1 === false}">&#xe69b;</span>
</view> </view>
</template> </template>
@@ -10,8 +10,40 @@
export default { export default {
data() { data() {
return { return {
}; };
},
props: {
title: String,
inner: {
type: Boolean,
default: false
},
inner2: {
type: Boolean,
default: false
},
show1: {
type: Boolean,
default: true
}
},
methods: {
goBack () {
if (this.inner) {
uni.navigateBack()
} else if (this.inner2) {
this.$emit('goIn')
} else {
uni.redirectTo({
url: '/pages/home/home'
})
}
},
backHome () {
uni.redirectTo({
url: '/pages/home/home'
})
}
} }
} }
</script> </script>
@@ -21,7 +53,10 @@
.header .header
_fj() _fj()
position fixed position fixed
_wh(100%, 86rpx) _wh(100%, 72rpx)
background-color $red background-color $red
z-index 100 z-index 100
padding 0 20rpx
.page_name
_font(32rpx, 32rpx, #fff,700,center)
</style> </style>

48
pages.json
View File

@@ -14,10 +14,8 @@
} }
,{ ,{
"path" : "pages/login/setup", "path" : "pages/login/setup",
"style" : { "style": {
"navigationBarTitleText": "设置", "navigationStyle": "custom"
"navigationStyle": "default",
"enablePullDownRefresh": false
} }
} }
,{ ,{
@@ -60,50 +58,20 @@
} }
,{ ,{
"path" : "pages/ProductManage/ZjCasing", "path" : "pages/ProductManage/ZjCasing",
"style" : { "style": {
"navigationBarTitleText": "子卷套管", "navigationStyle": "custom"
"app-plus": {
"titleNView": {
"buttons":[
{
"type":"home"
}
]
}
},
"enablePullDownRefresh": false
} }
} }
,{ ,{
"path" : "pages/ProductManage/ZjDelivery", "path" : "pages/ProductManage/ZjDelivery",
"style" : { "style": {
"navigationBarTitleText": "子卷配送", "navigationStyle": "custom"
"app-plus": {
"titleNView": {
"buttons":[
{
"type":"home"
}
]
}
},
"enablePullDownRefresh": false
} }
} }
,{ ,{
"path" : "pages/ProductManage/ZjOutStore", "path" : "pages/ProductManage/ZjOutStore",
"style" : { "style": {
"navigationBarTitleText": "子卷出站", "navigationStyle": "custom"
"app-plus": {
"titleNView": {
"buttons":[
{
"type":"home"
}
]
}
},
"enablePullDownRefresh": false
} }
} }
,{ ,{

66
pages/ProductManage/EmptyPipeInStore.vue
View File

@@ -1,32 +1,80 @@
<template> <template>
<view> <view class="container">
<nav-bar title="空管入库"></nav-bar> <nav-bar title="空管入库"></nav-bar>
<view class="content"> <view class="content">
<view class="container"></view> <view class="wrapper">
<view class="filter_item">
<view class="filter_label_wraper">
<span class="filter_label">物料</span>
</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input">
</view>
</view>
<view class="filter_item">
<view class="filter_label">物料</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input">
</view>
</view>
</view>
<view class="wrapper grid-wraper">
<view class="slide_new">
<table>
<thead>
<tr>
<th>任务号</th>
<th>指令号</th>
<th>起点</th>
<th>终点</th>
<th>状态</th>
<th>agv车号</th>
<th>物料类型</th>
<th>优先级</th>
<th>时间</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in dataList" :key="i">
<td>{{e.task_no}}</td>
<td>{{e.inst_no}}</td>
<td>{{e.start_devicecode}}</td>
<td>{{e.next_devicecode}}</td>
<td>{{e.inst_status_name}}</td>
<td>{{e.carno}}</td>
<td>{{e.material_type_name}}</td>
<td>{{e.priority}}</td>
<td>{{e.create_time}}</td>
</tr>
</tbody>
</table>
</view>
</view>
</view>
<view class="submit-bar"> <view class="submit-bar">
<button class="submit-button btn-disabled">入库确认</button> <button class="submit-button btn-disabled">入库确认</button>
<button class="submit-button">查询</button> <button class="submit-button">查询</button>
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
import NavBar from '@/components/NavBar.vue' import NavBar from '@/components/NavBar.vue'
export default { export default {
data() {
return {
};
},
components: { components: {
NavBar NavBar
}, },
data() {
return {
dataList: [{task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}, {task_no: '1'}]
};
},
methods: { methods: {
} }
} }
</script> </script>
<style lang="stylus"> <style lang="stylus">
.grid-wraper
height calc(100% - 238rpx)
</style> </style>

6
pages/ProductManage/ZjCasing.vue
View File

@@ -1,11 +1,15 @@
<template> <template>
<view> <view>
<nav-bar title="子卷套管"></nav-bar>
</view> </view>
</template> </template>
<script> <script>
import NavBar from '@/components/NavBar.vue'
export default { export default {
components: {
NavBar
},
data() { data() {
return { return {

6
pages/ProductManage/ZjDelivery.vue
View File

@@ -1,11 +1,15 @@
<template> <template>
<view> <view>
<nav-bar title="子卷配送"></nav-bar>
</view> </view>
</template> </template>
<script> <script>
import NavBar from '@/components/NavBar.vue'
export default { export default {
components: {
NavBar
},
data() { data() {
return { return {

6
pages/ProductManage/ZjOutStore.vue
View File

@@ -1,11 +1,15 @@
<template> <template>
<view> <view>
<nav-bar title="子卷出站"></nav-bar>
</view> </view>
</template> </template>
<script> <script>
import NavBar from '@/components/NavBar.vue'
export default { export default {
components: {
NavBar
},
data() { data() {
return { return {

12
pages/home/home.vue
View File

@@ -11,10 +11,12 @@
<view class="exit-text">退出</view> <view class="exit-text">退出</view>
</view> </view>
</view> </view>
<view class="wrapper">
<view class="menu-wrap"> <view class="menu-wrap">
<view class="menu-item" v-for="(e, i) in menu" :key="i" @tap="toPage(e.url)">{{e.name}}</view> <view class="menu-item" v-for="(e, i) in menu" :key="i" @tap="toPage(e.url)">{{e.name}}</view>
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
@@ -26,7 +28,7 @@
}; };
}, },
mounted () { mounted () {
this._handRequest() // this._handRequest()
}, },
methods: { methods: {
async _handRequest () { async _handRequest () {
@@ -53,6 +55,8 @@
<style lang="stylus"> <style lang="stylus">
@import '../../common/style/mixin.styl'; @import '../../common/style/mixin.styl';
.content
padding-top 0
.header .header
height 86rpx height 86rpx
_font(36rpx,86rpx,#333,,center) _font(36rpx,86rpx,#333,,center)
@@ -62,7 +66,8 @@
padding 0 30rpx padding 0 30rpx
background-color $red background-color $red
_bis('../../static/image/info_bg.png',auto,100%,right,bottom) _bis('../../static/image/info_bg.png',auto,100%,right,bottom)
border-radius: 4px border-radius 12rpx
margin-bottom 20rpx
.userInfo .userInfo
_fj(,flex-start,column) _fj(,flex-start,column)
.p1 .p1
@@ -83,9 +88,6 @@
_font(24rpx,47rpx,#fff,,right) _font(24rpx,47rpx,#fff,,right)
padding-left 10rpx padding-left 10rpx
.menu-wrap .menu-wrap
_wh(100%, calc(100% - 246rpx))
overflow-y scroll
padding-top 60rpx
_fj(flex-start,flex-start,,wrap) _fj(flex-start,flex-start,,wrap)
align-content: flex-start align-content: flex-start
.menu-item .menu-item

9
pages/login/login.vue
View File

@@ -7,16 +7,16 @@
</view> </view>
<div class="input-box"> <div class="input-box">
<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password"> <input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password">
<span class="iconfont icon_eye_close" :class="[showPassword ? 'icon_eye_active' : '']" @click="changePassword">&#xe6a0;</span> <span class="iconfont icon_eye_close" :class="[showPassword ? 'icon_eye_active' : '']" @tap="changePassword">&#xe6a0;</span>
</div> </div>
<view class="radio-box"> <view class="radio-box">
<view class="radio-wrap"> <view class="radio-wrap">
<span class="iconfont icon_unchecked" :class="{'icon_checked': saveUser}" @click="toSaveUser">&#xe66b;</span> <span class="iconfont icon_unchecked" :class="{'icon_checked': saveUser}" @tap="toSaveUser">&#xe66b;</span>
<text class="radio-label">记住用户名</text> <text class="radio-label">记住用户名</text>
</view> </view>
<text class="setup-text" @click="setup">设置</text> <text class="setup-text" @tap="setup">设置</text>
</view> </view>
<button class="login-btn" :disabled="disabled" @click="toLogin">确认登录</button> <button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
</view> </view>
</template> </template>
@@ -117,6 +117,7 @@
.setup-text .setup-text
_font(28rpx, 28rpx,$red,,right) _font(28rpx, 28rpx,$red,,right)
.bg .bg
background-color: #fff;
_bis('../../static/image/login_bg.png', 100%,,bottom) _bis('../../static/image/login_bg.png', 100%,,bottom)
.login-btn .login-btn
width 100% width 100%

37
pages/login/setup.vue
View File

@@ -1,12 +1,19 @@
<template> <template>
<view class="container">
<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
<view class="content"> <view class="content">
<view class="wrapper">
<view class="input-wrap"> <view class="input-wrap">
<view class="input-label">服务器地址：</view> <view class="input-label">服务器地址</view>
<input type="text" class="setup-input" v-model="addrip"> <input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
</view> </view>
</view>
<view class="wrapper">
<view class="input-wrap"> <view class="input-wrap">
<view class="input-label">刷新时间(s)：</view> <view class="input-label">刷新时间(s)</view>
<input type="text" class="setup-input" v-model="setTime"> <input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
</view>
</view>
</view> </view>
<view class="submit-bar"> <view class="submit-bar">
<button class="submit-button" @click="_submit">确认</button> <button class="submit-button" @click="_submit">确认</button>
@@ -15,7 +22,11 @@
</template> </template>
<script> <script>
import NavBar from '@/components/NavBar.vue'
export default { export default {
components: {
NavBar
},
data() { data() {
return { return {
addrip: this.$store.getters.baseUrl, addrip: this.$store.getters.baseUrl,
@@ -23,6 +34,11 @@
}; };
}, },
methods: { methods: {
goIn () {
uni.redirectTo({
url: '/pages/login/login'
})
},
_submit () { _submit () {
if (this.addrip === '') { if (this.addrip === '') {
uni.showToast({ uni.showToast({
@@ -51,15 +67,14 @@
<style lang="stylus"> <style lang="stylus">
@import '../../common/style/mixin.styl'; @import '../../common/style/mixin.styl';
.input-wrap .input-wrap
_wh(100%, 126rpx) width 100%
padding-top 40rpx
_fj() _fj()
.input-label .input-label
wh(200rpx, 86rpx) wh(200rpx, 58rpx)
_font(28rpx,86rpx,#464646) _font(28rpx,58rpx,#464646)
.setup-input .setup-input
_wh(calc(100% - 200rpx), 86rpx) _wh(calc(100% - 200rpx), 58rpx)
background #fff background #fff
_font(28rpx,86rpx,#323232) _font(28rpx,58rpx,#323232)
text-indent: 16rpx; padding 0 10rpx
</style> </style>

4
vuex/modules/user.js
View File

@@ -34,8 +34,8 @@ const actions = {
commit(types.SAVE_USER_INFO, res) commit(types.SAVE_USER_INFO, res)
}, },
delUserInfo({commit}, res) { delUserInfo({commit}, res) {
uni.clearStorageSync('userInfo') uni.removeStorageSync('userInfo')
uni.clearStorageSync('saveToken') uni.removeStorageSync('saveToken')
commit(types.DEL_USER_INFO, res) commit(types.DEL_USER_INFO, res)
}, },
saveToken({commit}, res) { saveToken({commit}, res) {