From f28e95ea2d909b26f5d8d679d9586690e888b821 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 11 Oct 2022 17:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                  |   2 +-
 common/style/layout.css                  | 124 ++++++++++++++++-------
 common/style/reset.css                   |   3 +
 components/NavBar.vue                    |  45 +++++++-
 pages.json                               |  54 ++--------
 pages/ProductManage/EmptyPipeInStore.vue |  70 +++++++++++--
 pages/ProductManage/ZjCasing.vue         |   6 +-
 pages/ProductManage/ZjDelivery.vue       |   6 +-
 pages/ProductManage/ZjOutStore.vue       |   6 +-
 pages/home/home.vue                      |  16 +--
 pages/login/login.vue                    |   9 +-
 pages/login/setup.vue                    |  45 +++++---
 vuex/modules/user.js                     |   4 +-
 13 files changed, 262 insertions(+), 128 deletions(-)

diff --git a/App.vue b/App.vue
index a307597..8c2d7c0 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
 		onLaunch: function() {
 			// #ifdef APP-PLUS
 			// plus.screen.lockOrientation('landscape-primary');
-			// plus.navigator.setFullscreen(true);
+			plus.navigator.setFullscreen(true);
 			// #endif
 		},
 		onHide: function() {
diff --git a/common/style/layout.css b/common/style/layout.css
index f2bc634..0ae7c97 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -1,10 +1,10 @@
 page {
-    background-color: #F5F5F5 !important;
+    background-color: #f6f6f6 !important;
     min-height: 100% !important;
     height: 100% !important;
 }
 uni-page-body {
-	background-color: #F5F5F5 !important;
+	background-color: #f6f6f6 !important;
 	min-height: 100% !important;
 	height: 100% !important;
 }
@@ -42,27 +42,83 @@ uni-page-body {
 	color: #ff6a00;
 	border: 1rpx solid #ff6a00;
 }
-
-
-/* .open_icon::before {
-	content: '\ec0c'
-} */
+.icon_back {
+	font-size: 52rpx;
+	line-height: 52rpx;
+	color: #fff;
+}
+.icon_home {
+	font-size: 52rpx;
+	line-height: 52rpx;
+	color: #fff;
+}
 
 /** 内容 */
+.container {
+	width: 100%;
+	height: 100%;
+}
 .content {
 	width: 100%;
 	height: 100%;
-	padding: 0 24rpx;
+	padding: 92rpx 15rpx 82rpx 14rpx;
 }
-.container {
+.wrapper {
 	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 {
 	width: 100%;
+}
+.slide_new {
+	width: 100%;
 	height: 100%;
-	padding-top: 15rpx;
-	overflow-y: scroll;
+	overflow-y: auto;
 }
 .slide_new table {
 	table-layout: fixed;
@@ -104,43 +160,37 @@ uni-page-body {
 	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 {
 	display: flex;
-	justify-content: space-between;
+	flex-wrap: wrap;
+	justify-content: flex-end;
 	align-items: center;
 	position: fixed;
 	bottom: 0;
 	left: 0;
 	width: 100%;
+	z-index: 100;
 	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 {
-	flex: 1;
-	font-size: 28rpx;
-	line-height: 80rpx;
-	color: #fff;
+	font-size: 30rpx;
+	line-height: 52rpx;
+	color: #ff6a00;
 	text-align: center;
-	margin: 15rpx;
-	background-color: $red;
+	letter-spacing: 1rpx;
+	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;
 }
   
 /** 弹窗 */
diff --git a/common/style/reset.css b/common/style/reset.css
index 3b9c682..bbb9eb5 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -24,6 +24,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .hide {
 	display: none;
 }
+.vhide {
+	visibility:hidden;
+}
 .show {
 	display: block;
 }
diff --git a/components/NavBar.vue b/components/NavBar.vue
index 9a5f5cf..b3c6174 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="header">
-		<text class="icon-back"></text>
-		<text></text>
-		<text class="icon-home"></text>
+		<span @tap="goBack" class="iconfont icon_back">&#xe6db;</span>
+		<span class="page_name">{{title}}</span>
+		<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show1 === false}">&#xe69b;</span>
 	</view>
 </template>
 
@@ -10,8 +10,40 @@
 	export default {
 		data() {
 			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>
@@ -21,7 +53,10 @@
 .header
 	_fj()
 	position fixed
-	_wh(100%, 86rpx)
+	_wh(100%, 72rpx)
 	background-color $red
 	z-index 100
+	padding 0 20rpx
+.page_name
+	_font(32rpx, 32rpx, #fff,700,center)
 </style>
diff --git a/pages.json b/pages.json
index 60bc8c6..6b8a10b 100644
--- a/pages.json
+++ b/pages.json
@@ -14,11 +14,9 @@
 		}
         ,{
 		    "path" : "pages/login/setup",
-		    "style" : {
-		        "navigationBarTitleText": "设置",
-		    	"navigationStyle": "default",
-		        "enablePullDownRefresh": false
-		    }   
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
 		}
 		,{
 		    "path" : "pages/ProductManage/SboProdProgress",
@@ -60,50 +58,20 @@
 		}
 		,{
 		    "path" : "pages/ProductManage/ZjCasing",
-		    "style" : {
-		        "navigationBarTitleText": "子卷套管",
-		    	"app-plus": {
-		    		"titleNView": {
-		    			"buttons":[
-		    			  {
-		    				"type":"home"
-		    			  }
-		    			]
-		    		}
-		    	},
-		    	"enablePullDownRefresh": false
-		    }   
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
 		}
 		,{
 		    "path" : "pages/ProductManage/ZjDelivery",
-		    "style" : {
-		        "navigationBarTitleText": "子卷配送",
-		    	"app-plus": {
-		    		"titleNView": {
-		    			"buttons":[
-		    			  {
-		    				"type":"home"
-		    			  }
-		    			]
-		    		}
-		    	},
-		    	"enablePullDownRefresh": false
-		    }   
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
 		}
 		,{
 		    "path" : "pages/ProductManage/ZjOutStore",
-		    "style" : {
-		        "navigationBarTitleText": "子卷出站",
-		    	"app-plus": {
-		    		"titleNView": {
-		    			"buttons":[
-		    			  {
-		    				"type":"home"
-		    			  }
-		    			]
-		    		}
-		    	},
-		    	"enablePullDownRefresh": false
+		    "style": {
+		    	"navigationStyle": "custom"
 		    }   
 		}
 		,{
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index d9c079f..20d2053 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -1,32 +1,80 @@
 <template>
-<view>
-	<nav-bar title="空管入库"></nav-bar>
-	<view class="content">
-		<view class="container"></view>
+	<view class="container">
+		<nav-bar title="空管入库"></nav-bar>
+		<view class="content">
+			<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">
 			<button class="submit-button btn-disabled">入库确认</button>
 			<button class="submit-button">查询</button>
 		</view>
 	</view>
-</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	export default {
-		data() {
-			return {
-				
-			};
-		},
 		components: {
 			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: {
 		}
 	}
 </script>
 
 <style lang="stylus">
-
+.grid-wraper
+	height calc(100% - 238rpx)
 </style>
diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index 239d03a..349e738 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -1,11 +1,15 @@
 <template>
 	<view>
-		
+		<nav-bar title="子卷套管"></nav-bar>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
 	export default {
+		components: {
+			NavBar
+		},
 		data() {
 			return {
 				
diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index 239d03a..315c6ad 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -1,11 +1,15 @@
 <template>
 	<view>
-		
+		<nav-bar title="子卷配送"></nav-bar>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
 	export default {
+		components: {
+			NavBar
+		},
 		data() {
 			return {
 				
diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue
index 239d03a..afd6a24 100644
--- a/pages/ProductManage/ZjOutStore.vue
+++ b/pages/ProductManage/ZjOutStore.vue
@@ -1,11 +1,15 @@
 <template>
 	<view>
-		
+		<nav-bar title="子卷出站"></nav-bar>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
 	export default {
+		components: {
+			NavBar
+		},
 		data() {
 			return {
 				
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 83e01a7..862b171 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -11,8 +11,10 @@
 				<view class="exit-text">退出</view>
 			</view>
 		</view>
-		<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="wrapper">
+			<view class="menu-wrap">
+				<view class="menu-item" v-for="(e, i) in menu" :key="i" @tap="toPage(e.url)">{{e.name}}</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -26,7 +28,7 @@
 			};
 		},
 		mounted () {
-			this._handRequest()
+			// this._handRequest()
 		},
 		methods: {
 			async _handRequest () {
@@ -53,6 +55,8 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
+.content
+	padding-top 0
 .header
 	height 86rpx
 	_font(36rpx,86rpx,#333,,center)
@@ -62,7 +66,8 @@
 	padding 0 30rpx
 	background-color $red
 	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
-	border-radius: 4px
+	border-radius 12rpx
+	margin-bottom 20rpx
 .userInfo
 	_fj(,flex-start,column)
 .p1
@@ -83,9 +88,6 @@
 	_font(24rpx,47rpx,#fff,,right)
 	padding-left 10rpx
 .menu-wrap
-	_wh(100%, calc(100% - 246rpx))
-	overflow-y scroll
-	padding-top 60rpx
 	_fj(flex-start,flex-start,,wrap)
 	align-content: flex-start
 .menu-item
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0eea730..304de80 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -7,16 +7,16 @@
 		</view>
 		<div class="input-box">
 			<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>
 		<view class="radio-box">
 			<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>
 			</view>
-			<text class="setup-text" @click="setup">设置</text>
+			<text class="setup-text" @tap="setup">设置</text>
 		</view>
-		<button class="login-btn" :disabled="disabled" @click="toLogin">确认登录</button>
+		<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
 	</view>
 </template>
 
@@ -117,6 +117,7 @@
 .setup-text
 	_font(28rpx, 28rpx,$red,,right)
 .bg
+	background-color: #fff;
 	_bis('../../static/image/login_bg.png', 100%,,bottom)
 .login-btn
   width 100%
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 78e6074..eb3d428 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -1,12 +1,19 @@
 <template>
-	<view class="content">
-		<view class="input-wrap">
-			<view class="input-label">服务器地址：</view>
-			<input type="text" class="setup-input" v-model="addrip">
-		</view>
-		<view class="input-wrap">
-			<view class="input-label">刷新时间(s)：</view>
-			<input type="text" class="setup-input" v-model="setTime">
+	<view class="container">
+		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
+		<view class="content">
+			<view class="wrapper">
+				<view class="input-wrap">
+					<view class="input-label">服务器地址</view>
+					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
+				</view>
+			</view>
+			<view class="wrapper">
+				<view class="input-wrap">
+					<view class="input-label">刷新时间(s)</view>
+					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				</view>
+			</view>
 		</view>
 		<view class="submit-bar">
 		  <button class="submit-button" @click="_submit">确认</button>
@@ -15,7 +22,11 @@
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
 	export default {
+		components: {
+			NavBar
+		},
 		data() {
 			return {
 				addrip: this.$store.getters.baseUrl,
@@ -23,6 +34,11 @@
 			};
 		},
 		methods: {
+			goIn () {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			},
 			_submit () {
 				if (this.addrip === '') {
 					uni.showToast({
@@ -51,15 +67,14 @@
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
 .input-wrap
-	_wh(100%, 126rpx)
-	padding-top 40rpx
+	width 100%
 	_fj()
 .input-label
-	wh(200rpx, 86rpx)
-	_font(28rpx,86rpx,#464646)
+	wh(200rpx, 58rpx)
+	_font(28rpx,58rpx,#464646)
 .setup-input
-	_wh(calc(100% - 200rpx), 86rpx)
+	_wh(calc(100% - 200rpx), 58rpx)
 	background #fff
-	_font(28rpx,86rpx,#323232)
-	text-indent: 16rpx;
+	_font(28rpx,58rpx,#323232)
+	padding 0 10rpx
 </style>
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index f80c916..4f9826b 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -34,8 +34,8 @@ const actions = {
 		commit(types.SAVE_USER_INFO, res)
 	},
 	delUserInfo({commit}, res) {
-		uni.clearStorageSync('userInfo')
-		uni.clearStorageSync('saveToken')
+		uni.removeStorageSync('userInfo')
+		uni.removeStorageSync('saveToken')
 		commit(types.DEL_USER_INFO, res)
 	},
 	saveToken({commit}, res) {