样式细节修改

App.vue

@@ -29,4 +29,20 @@
 	/deep/.superwei-combox {
 		background-color: #fff;
 	}
+
+	/deep/.uni-pagination__num-tag {
+		width: 30px !important;
+	}
+
+	/deep/uni-button:after {
+		border: none;
+	}
+
+	/deep/.uni-numbox__minus {
+		border-right: 1px solid #ccc;
+	}
+
+	/deep/.uni-numbox__plus {
+		border-left: 1px solid #ccc;
+	}
 </style>

components/head-view/head-view.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="headInfo">
-		<uni-icons class="icon" type="back" size="21" @click="toBack" />
+		<uni-icons class="icon" type="back" size="24" @click="toBack" />
 		{{title}}
-		<uni-icons type="bottom" size="18" />
+		<uni-icons class="bottom" type="bottom" size="18" v-if="type" />
 	</view>
 </template>
 
@@ -13,12 +13,15 @@
 			title: {
 				type: String
 			},
+			type: {
+				type: Boolean,
+				default: () => false
+			}
 		},
 		methods: {
 			toBack() {
 				uni.navigateBack('-1')
 			}
-
 		}
 	}
 </script>
@@ -28,16 +31,21 @@
 		position: relative;
 		background-color: #fff;
 		border-bottom: 1px solid #999999;
-		height: 40px;
+		height: 68px;
-		line-height: 40px;
+		line-height: 68px;
-		font-size: 18px;
+		font-size: 20px;
+		color: #23262E;
 		text-align: center;
+		font-weight: bold;
+		box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.10);
 
 		.icon {
 			position: absolute;
-			top: 3px;
 			left: 10px;
 		}
 
+		.bottom {
+			margin-left: 6px;
+		}
 	}
 </style>

pages.json

@@ -230,8 +230,11 @@
 			"van-uploader": "/wxcomponents/vant/dist/uploader/index",
 			"van-progress": "/wxcomponents/vant/dist/progress/index",
 			"van-stepper": "/wxcomponents/vant/dist/stepper/index"
+		},
+		"navigationStyle": "custom",
+		"app-plus": {
+			"titleNView": false
 		}
-
 	},
 	"uniIdRouter": {},
 	"condition": { //模式配置，仅开发期间生效

pages/login/index.vue

@@ -102,7 +102,7 @@
 
 <style lang="less" scoped>
 	.login {
-		height: calc(100vh - 44px);
+		height: 100vh;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;

pages/quality/details.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="details">
+		<head-view title="船名/航次"></head-view>
 		<view class="container">
 			<view class="userInfo">
 				<p>填报人：张星星</p>

pages/quality/edit.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="edit">
+		<head-view title="船名/航次"></head-view>
 		<view class="container">
 			<uni-steps :options="stepList" :active="active" />
 			<view class="ul">

pages/quality/sign.vue

@@ -1,12 +1,12 @@
 <template>
+	<view class="sign">
+		<head-view title="场位监控签名"></head-view>
 		<view class="container">
-
 			<view class="sign-box">
 				<canvas class="mycanvas" :style="{width:width +'px',height:height +'px'}" canvas-id="mycanvas"
 					@touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"></canvas>
-
+				<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}"
-			<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}" class="canvsborder"></canvas>
+					class="canvsborder"></canvas>
-
 			</view>
 			<view class="sigh-btns">
 				<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
@@ -14,9 +14,10 @@
 				<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
 			</view>
 		</view>
-
+	</view>
 </template>
 <script>
+	import utils from '@/common/util.js';
 	var x = 20;
 	var y = 20;
 	var tempPoint = []; //用来存放当前画纸上的轨迹点
@@ -31,14 +32,12 @@
 				ctx: '', //绘图图像
 				points: [], //路径点集合,
 				width: 0,
-				height: 0
+				height: 0,
 			};
 		},
 		mounted() {},
-
 		onLoad(option) {
 			that = this;
-			console.log(option);
 			id = option.id;
 			type = option.type;
 			this.ctx = uni.createCanvasContext('mycanvas', this); //创建绘图对象
@@ -55,7 +54,6 @@
 				}
 			});
 		},
-
 		methods: {
 			//触摸开始，获取到起点
 			touchstart: function(e) {
@@ -140,22 +138,23 @@
 					canvasId: 'mycanvas',
 					success: function(res) {
 						let tempPath = res.tempFilePath;
-						console.log(tempPath)
+						console.log(tempPath, '压缩前')
-
+						// 示例用法
+						utils.compress(tempPath, 500, 0.3).then(res => {
+							console.log(res, '压缩后');
+						}); //conpress封装的压缩方法; //conpress封装的压缩方法
 						const ctx = uni.createCanvasContext('camCacnvs', that);
 						ctx.translate(0, that.width);
 						ctx.rotate((-90 * Math.PI) / 180);
 						ctx.drawImage(tempPath, 0, 0, that.width, that.height);
 						ctx.draw();
 						setTimeout(() => {
-
 							//保存签名图片到本地
 							uni.canvasToTempFilePath({
 									canvasId: 'camCacnvs',
 									success: function(res) {
 										//这是签名图片文件的本地临时地址
 										let path = res.tempFilePath;
-
 									},
 									fail: err => {
 										console.log('fail', err);
@@ -166,22 +165,22 @@
 						}, 200);
 					}
 				});
-			}
+			},
 		}
 	};
 </script>
 
 <style lang="scss" scoped>
 	.container {
-		height: calc(100vh - 44px);
+		height: calc(100vh - 68px);
 		padding-bottom: 30px;
 		background-color: #fff;
 	}
 
 	.sign-box {
-		width: 80%;
+		width: 100%;
 		height: 90%;
-		margin: auto;
+		margin-left: 10%;
 		display: flex;
 		flex-direction: column;
 		text-align: center;
@@ -197,7 +196,7 @@
 	}
 
 	.btn {
-		margin: 30px 10px 0;
+		margin: 10px 10px 0;
 	}
 
 	/deep/.van-button {

pages/shipWork/abnormal.vue

@@ -49,6 +49,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addAbnormalArr')
 			this.executeSql1('abnormalConditionRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -56,7 +57,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 异常状况`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -86,12 +92,6 @@
 					url: `/pages/shipWork/abnormalAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/abnormalAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="abnormalAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -61,6 +62,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				abnormalRow: {},
@@ -90,6 +92,13 @@
 			if (this.obj.state == 'edit' || this.obj.state == 'look') {
 				this.getRow();
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑异常状况"
+			} else if (this.obj.state == "look") {
+				this.title = "查看异常状况"
+			} else {
+				this.title = "新增异常状况"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -208,12 +217,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/abnormal'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -250,25 +253,6 @@
 						min-width: 85px;
 						text-align: right;
 					}
-
-					/deep/.uni-numbox {
-						border: 1px solid #ccc;
-						box-sizing: border-box;
-					}
-
-					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
-						padding: 0 14px;
-						box-sizing: border-box;
-					}
-
-					/deep/.uni-numbox__value {
-						width: 100px;
-						height: 35px;
-						line-height: 35px;
-						background-color: #fff !important;
-					}
 				}
 			}
 

pages/shipWork/brandDetails.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="brandDetails">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="topBox">
 				<view class="searchBox">
@@ -43,6 +44,7 @@
 	export default {
 		data() {
 			return {
+				title: "船名 - 品牌明细",
 				searchValue: "",
 				color: '#4D7BFE',
 				hasChoose: false,
@@ -59,6 +61,7 @@
 		},
 		mounted() {
 			this.executeSql1('shipmentShipLoadPlansRespList')
+			this.executeSql1('shipInfoTable')
 			setTimeout(() => {
 				this.menuList = [{
 					'title': '按港口',
@@ -185,10 +188,15 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == "shipInfoTable") {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 品牌明细`
+					} else {
 						this.allList = value
 						this.total = value.length
 						let newArr = this.getMapping(value, this.pageSize)
 						this.listInfo = newArr[this.current - 1];
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -246,12 +254,6 @@
 					url: `/pages/shipWork/carDetails`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/carDetails.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="carDetails">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">船名：{{testInfo.vslCnname}}</view>
@@ -52,9 +53,11 @@
 </template>
 
 <script>
+	import sqlite from "../../common/sqlite.js"
 	export default {
 		data() {
 			return {
+				title: "船名 - 车型明细",
 				testInfo: {
 					vslCnname: "运程10",
 					vvyName: "HC97759809",
@@ -95,10 +98,23 @@
 			}
 		},
 		mounted() {
-			this.barndRow = uni.getStorageSync('barndRow')
+			// this.barndRow = uni.getStorageSync('barndRow')
 			this.initData()
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
+			// 查
+			executeSql1(tableName) {
+				let sql = `select * from ${tableName}`
+				sqlite.executeSqlCeshi(sql).then((value) => {
+					// 在resolve时执行的回调函数
+					this.shipInfo = value[0]
+					this.title = `${this.shipInfo.vslCnname} - 车型明细`
+				}).catch((error) => {
+					// 在reject时执行的回调函数
+					console.error(error);
+				});
+			},
 			initData() {
 				this.testInfo.vinCodeDetails = [{
 					godId: "01",
@@ -142,12 +158,6 @@
 				}
 				return newList
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/brandDetails'
-				})
-				return true;
-			},
 		},
 	}
 </script>

pages/shipWork/documentList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="documentList">
-		<head-view :title="title"></head-view>
+		<head-view :title="title" :type="true"></head-view>
 		<uni-notice-bar show-icon single :text="noticeText" />
 		<view class="container">
 			<view class="workBox">
@@ -176,12 +176,6 @@
 					url: `/pages/shipWork/${url}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/index'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -190,6 +184,7 @@
 	.documentList {
 		.container {
 			padding: 30px 20px;
+			min-height: calc(100vh - 119px);
 
 			.workBox {
 				background-color: #fff;

pages/shipWork/index.vue

@@ -9,16 +9,17 @@
 							v-model="shipName" @input="input_json" @select="select_json"></superwei-combox>
 					</view>
 					<button class="searchBtn" type="default" @click="search">搜索</button>
-					<button class="searchBtn" type="default" @click="open">打开</button>
+					<button class="searchBtn" type="default" @click="open">打开数据库</button>
 					<!-- <button class="searchBtn" type="default" @click="isOpen">判断</button> -->
-					<button class="searchBtn" type="default" @click="createTable">创建</button>
+					<!-- <button class="searchBtn" type="default" @click="createTable">创建</button>
-					<button class="searchBtn" type="default" @click="dropTable">删除表</button>
+					<button class="searchBtn" type="default" @click="dropTable">删除表</button> -->
 					<!-- <button class="searchBtn" type="default" @click="dropData">删除数据</button> -->
 					<!-- <button class="searchBtn" type="default" @click="executeSql1('shipOption')">查询</button> -->
 				</view>
 				<view class="itemList">
 					<template v-if="itemList.length > 0">
-						<view v-for="(item, index) in itemList" :key="index" class="item" @click="toGo(item)">
+						<view v-for="(item, index) in itemList" :key="index" class="item">
+							<view @click="toGo(item)">
 								<view class="title">
 									<image src="../../static/images/ship.png" mode=""></image>
 									<view class="name">
@@ -49,12 +50,6 @@
 										实际泊位: <text>{{item.actualBerthageName}}</text>
 									</view>
 								</view>
-							<view class="footer">
-								<view class="fitem">
-									<button class="fitem1" type="default" @click.stop="download(item)">下载</button>
-									<button class="fitem2" type="default" @click.stop="upload(item)">上传</button>
-								</view>
-							</view>
 								<view class="statusBox statusBox1">
 									<view class="statusInfo" v-if="item.uploadTime != ''">
 										<text>已上传</text>
@@ -74,6 +69,18 @@
 									</view>
 								</view>
 							</view>
+							<view class="footer">
+								<view class="fitem">
+									<button :class="{fitem1:item.uploadTime != ''}" type="default"
+										:disabled="item.uploadTime == ''" @click.stop="download(item)">下载</button>
+									<button class="fitem2" type="default" @click.stop="upload(item)">上传</button>
+								</view>
+							</view>
+						</view>
+						<uni-popup ref="popup" type="message">
+							<uni-popup-message :type="msgType" :message="popupText"
+								:duration="2000"></uni-popup-message>
+						</uni-popup>
 					</template>
 					<o-empty v-else height="70vh" bg="#f5f6fa" />
 				</view>
@@ -98,6 +105,13 @@
 	export default {
 		data() {
 			return {
+				// 下载成功提示
+				popupText: "",
+				// 下载失败提示
+				errorText: "",
+				// 提示类型
+				msgType: "",
+
 				// 港口
 				pamValue: "",
 				// pamList: [],
@@ -549,11 +563,20 @@
 			// 下载
 			download(item) {
 				// 下载创建单证内的表
-				tableList.createAllTable()
+				// tableList.createAllTable()
-				this.zycxData()
+				// this.zycxData()
-				this.cbzlData()
+				// this.cbzlData()
-				this.xlData()
+				// this.xlData()
-				this.shipDataInfo()
+				// this.shipDataInfo()
+				if (item.uploadTime != '') {
+					this.popupText = "下载成功"
+					this.msgType = "success"
+					this.$refs.popup.open()
+				} else {
+					this.popupText = "下载失败"
+					this.msgType = "error"
+					this.$refs.popup.open()
+				}
 				// let ids = []
 				// if (item.inVvyId != null && item.outVvyId == null) {
 				// 	ids.push(item.inVvyId)
@@ -785,12 +808,12 @@
 	.container {
 		background-color: #f5f6fa;
 		display: flex;
-		min-height: calc(100vh - 44px - 40px);
+		min-height: calc(100vh - 68px - 40px);
 	}
 
 	.content {
 		padding: 20px;
-		min-height: calc(100vh - 44px - 40px);
+		min-height: calc(100vh - 68px - 40px);
 
 		.form {
 			display: flex;
@@ -880,8 +903,6 @@
 					padding-top: 10px;
 
 					.fitem {
-
-
 						display: flex;
 					}
 
@@ -892,11 +913,17 @@
 						border-radius: 4px;
 						margin-right: 16px;
 						font-size: 14px;
+						border: 1px solid rgba(0, 0, 0, .2);
 					}
 
 					.fitem1 {
-						background: #EEEEEE;
+						border: 1px solid #FC8300;
-						color: #999999;
+						color: #FC8300;
+						background: #fff;
+
+						/deep/:after {
+							border: none;
+						}
 					}
 
 					.fitem2 {

pages/shipWork/mafi.vue

@@ -50,6 +50,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addMafiArr')
 			this.executeSql1('mafiListRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -57,7 +58,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - MAFI清单`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -87,12 +93,6 @@
 					url: `/pages/shipWork/mafiAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/mafiAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="mafiAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -72,6 +73,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				mafiRow: {},
@@ -117,6 +119,13 @@
 			if (this.obj.state == 'edit' || this.obj.state == 'look') {
 				this.getRow();
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑MAFI清单"
+			} else if (this.obj.state == "look") {
+				this.title = "查看MAFI清单"
+			} else {
+				this.title = "新增MAFI清单"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -271,12 +280,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/mafi'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -316,8 +319,6 @@
 					}
 
 					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
 						padding: 0 14px;
 						box-sizing: border-box;
 					}

pages/shipWork/mixWork.vue

@@ -78,8 +78,8 @@
 	export default {
 		data() {
 			return {
-				title: "船名-杂项作业",
+				title: "船只 - 杂项作业单",
-				shipInfo: [],
+				shipInfo: {},
 				tabsList: ["人员信息", "工班信息"],
 				tabsType: 0, // 0是人员信息  1是工班信息
 				tabsIndex: 0,
@@ -113,7 +113,8 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					if (tableName == 'shipInfoTable') {
-						this.shipInfo = value
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 杂项作业单`
 					}
 					if (this.tabsType == 0) {
 						this.peopleInfo = value
@@ -181,13 +182,6 @@
 					url: `/pages/shipWork/shiftDetails`
 				})
 			},
-			onBackPress(event) {
-				uni.setStorageSync('tabsType', 0);
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		},
 	}
 </script>
@@ -202,6 +196,7 @@
 
 		.container {
 			padding: 30px 10px;
+			min-height: calc(100vh - 68px);
 
 			.signBox {
 				display: flex;

pages/shipWork/notice.vue

@@ -49,6 +49,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addNoticeArr')
 			this.executeSql1('shipmentLoadUnloadNoticeRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -56,7 +57,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 船舶装卸通知书`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -86,12 +92,6 @@
 					url: `/pages/shipWork/noticeAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/noticeAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="noticeAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -50,6 +51,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				noticeRow: {},
@@ -75,6 +77,13 @@
 			if (this.obj.state == 'edit' || this.obj.state == 'look') {
 				this.getRow();
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑船舶装卸通知书"
+			} else if (this.obj.state == "look") {
+				this.title = "查看船舶装卸通知书"
+			} else {
+				this.title = "新增船舶装卸通知书"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -189,12 +198,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/notice'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -227,25 +230,6 @@
 						min-width: 85px;
 						text-align: right;
 					}
-
-					/deep/.uni-numbox {
-						border: 1px solid #ccc;
-						box-sizing: border-box;
-					}
-
-					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
-						padding: 0 14px;
-						box-sizing: border-box;
-					}
-
-					/deep/.uni-numbox__value {
-						width: 100px;
-						height: 35px;
-						line-height: 35px;
-						background-color: #fff !important;
-					}
 				}
 			}
 

pages/shipWork/opinion.vue

@@ -51,6 +51,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addOpinionArr')
 			this.executeSql1('shipmentQualityConsultationRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -58,7 +59,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 质量意见征询`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -88,12 +94,6 @@
 					url: `/pages/shipWork/opinionAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/opinionAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="opinionAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -72,6 +73,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				opinionRow: {},
@@ -109,6 +111,13 @@
 			if (this.obj.state == 'edit' || this.obj.state == 'look') {
 				this.getRow();
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑船舶装卸通知书"
+			} else if (this.obj.state == "look") {
+				this.title = "查看船舶装卸通知书"
+			} else {
+				this.title = "新增船舶装卸通知书"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -278,12 +287,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/opinion'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -323,8 +326,6 @@
 					}
 
 					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
 						padding: 0 14px;
 						box-sizing: border-box;
 					}

pages/shipWork/patrol.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="patrol">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<template v-if="infoList.length > 0">
 				<view class="ul">
@@ -36,6 +37,7 @@
 	export default {
 		data() {
 			return {
+				title: "船只 - 安全巡检",
 				shipInfo: {},
 				infoList: []
 			}
@@ -44,6 +46,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addPatrolArr')
 			this.executeSql1('safetyInspectionRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -51,7 +54,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 安全巡检`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -70,12 +78,6 @@
 					url: `/pages/shipWork/patrolAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/patrolAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="patrolAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -70,6 +71,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				patrolRow: {},
@@ -100,7 +102,13 @@
 			if (this.obj.state == 'edit' || this.obj.state == 'look') {
 				this.getRow();
 			}
-
+			if (this.obj.state == "edit") {
+				this.title = "编辑安全巡检"
+			} else if (this.obj.state == "look") {
+				this.title = "查看安全巡检"
+			} else {
+				this.title = "新增安全巡检"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 			this.executeSql2('safetyInspectionRespUrlList')
@@ -257,12 +265,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/patrol'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -309,25 +311,6 @@
 						text-align: right;
 					}
 
-					/deep/.uni-numbox {
-						border: 1px solid #ccc;
-						box-sizing: border-box;
-					}
-
-					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
-						padding: 0 14px;
-						box-sizing: border-box;
-					}
-
-					/deep/.uni-numbox__value {
-						width: 100px;
-						height: 35px;
-						line-height: 35px;
-						background-color: #fff !important;
-					}
-
 					.picture {
 						/deep/.file-picker__box {
 							width: 120px !important;

pages/shipWork/peopleAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="peopleAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -74,6 +75,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				peopleRow: {},
 				peopleRowIndex: 0,
@@ -124,6 +126,13 @@
 			if (this.obj.state == "edit" || this.obj.state == "look") {
 				this.getRow()
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑人员信息"
+			} else if (this.obj.state == "look") {
+				this.title = "查看人员信息"
+			} else {
+				this.title = "新增人员信息"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -294,13 +303,6 @@
 					console.error(error);
 				});
 			},
-				onBackPress(event) {
-					uni.setStorageSync('tabsType', 0);
-					uni.navigateTo({
-						url: '/pages/shipWork/mixWork'
-					})
-					return true;
-				},
 		}
 	}
 </script>
@@ -341,8 +343,6 @@
 					}
 
 					/deep/.uni-numbox-btns {
-							border-right: 1px solid #ccc;
-							border-left: 1px solid #ccc;
 						padding: 0 14px;
 						box-sizing: border-box;
 					}

pages/shipWork/shiftAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="shiftAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<uni-steps :options="stepList" :active="active" />
 			<view class="line"></view>
@@ -203,6 +204,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				dataInfo: {},
@@ -300,12 +302,14 @@
 			this.executeSql2('shipOption')
 			this.executeSql2('shipInfoTable')
 			if (this.obj.state == 'edit') {
+				this.title = "编辑工班信息"
 				this.dataInfo = uni.getStorageSync('shiftRow')
 				this.contactId = this.dataInfo[0].contactId
 				this.aId = this.dataInfo[0].aId
 				this.ulList1 = []
 				this.editData();
 			} else if (this.obj.state == 'add') {
+				this.title = "新增工班信息"
 				this.ulList1 = [{
 					gbValue: "",
 					gbTextValue: "",
@@ -899,13 +903,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.setStorageSync('tabsType', 1);
-				uni.navigateTo({
-					url: '/pages/shipWork/mixWork'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -1000,8 +997,6 @@
 					}
 
 					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
 						padding: 0 14px;
 						box-sizing: border-box;
 					}

pages/shipWork/shiftDetails.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="shiftDetails">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<custom-tabs type="c1" :value="tabsValue" @change="changeIndex">
 				<custom-tab-pane label="工班信息" name="c1_1">
@@ -169,6 +170,7 @@
 	export default {
 		data() {
 			return {
+				title: "查看工班信息",
 				tabsValue: 0,
 				dataInfo: [{
 					spmName: "",
@@ -302,13 +304,6 @@
 					url: `/pages/shipWork/shiftAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.setStorageSync('tabsType', 1);
-				uni.navigateTo({
-					url: '/pages/shipWork/mixWork'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/shipInfo.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="shipInfo">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">船名：{{shipInfo.vslCnname}}</view>
@@ -28,6 +29,7 @@
 	export default {
 		data() {
 			return {
+				title: "船名 - 船舶资料",
 				shipInfo: {},
 			}
 		},
@@ -42,18 +44,12 @@
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					this.shipInfo = value[0]
-					console.log(this.shipInfo)
+					this.title = `${this.shipInfo.vslCnname} - 船舶资料`
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/shipPlan.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="shipPlan">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<p class="title">基本信息</p>
 			<view class="ul">
@@ -40,22 +41,30 @@
 </template>
 
 <script>
+	import sqlite from "../../common/sqlite.js"
 	export default {
 		data() {
 			return {
+				title: "船名 - 船舶计划",
 				shipInfo: {},
 			}
 		},
 		mounted() {
-			this.shipInfo = uni.getStorageSync('shipInfo')
+			// this.shipInfo = uni.getStorageSync('shipInfo')
-			console.log(this.shipInfo)
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
-			onBackPress(event) {
+			// 查
-				uni.navigateTo({
+			executeSql1(tableName) {
-					url: '/pages/shipWork/documentList'
+				let sql = `select * from ${tableName}`
-				})
+				sqlite.executeSqlCeshi(sql).then((value) => {
-				return true;
+					// 在resolve时执行的回调函数
+					this.shipInfo = value[0]
+					this.title = `${this.shipInfo.vslCnname} - 船舶计划`
+				}).catch((error) => {
+					// 在reject时执行的回调函数
+					console.error(error);
+				});
 			},
 		}
 	}

pages/shipWork/sign.vue

@@ -1,12 +1,12 @@
 <template>
+	<view class="sign">
+		<head-view title="单证签名"></head-view>
 		<view class="container">
-
 			<view class="sign-box">
 				<canvas class="mycanvas" :style="{width:width +'px',height:height +'px'}" canvas-id="mycanvas"
 					@touchstart="touchstart" @touchmove="touchmove" @touchend="touchend"></canvas>
-
+				<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}"
-			<canvas canvas-id="camCacnvs" :style="{width:height +'px',height:width +'px'}" class="canvsborder"></canvas>
+					class="canvsborder"></canvas>
-
 			</view>
 			<view class="sigh-btns">
 				<van-button class="btn" type="default" @tap="handleCancel">取消</van-button>
@@ -14,7 +14,7 @@
 				<van-button class="btn" type="default" @tap="handleConfirm">确认</van-button>
 			</view>
 		</view>
-
+	</view>
 </template>
 <script>
 	import utils from '@/common/util.js';
@@ -39,7 +39,6 @@
 		mounted() {},
 		onLoad(option) {
 			this.sginType = JSON.parse(decodeURIComponent(option.dataType)).signType
-			console.log(this.sginType)
 			that = this;
 			id = option.id;
 			type = option.type;
@@ -57,7 +56,6 @@
 				}
 			});
 		},
-
 		methods: {
 			//触摸开始，获取到起点
 			touchstart: function(e) {
@@ -176,15 +174,15 @@
 
 <style lang="scss" scoped>
 	.container {
-		height: calc(100vh - 44px);
+		height: calc(100vh - 68px);
 		padding-bottom: 30px;
 		background-color: #fff;
 	}
 
 	.sign-box {
-		width: 80%;
+		width: 100%;
 		height: 90%;
-		margin: auto;
+		margin-left: 10%;
 		display: flex;
 		flex-direction: column;
 		text-align: center;
@@ -200,7 +198,7 @@
 	}
 
 	.btn {
-		margin: 30px 10px 0;
+		margin: 10px 10px 0;
 	}
 
 	/deep/.van-button {

pages/shipWork/supply.vue

@@ -41,7 +41,7 @@
 	export default {
 		data() {
 			return {
-				title: "船名-供给",
+				title: "船只 - 供给",
 				shipInfo: {},
 				infoList: []
 			}
@@ -50,6 +50,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addSupplyArr')
 			this.executeSql1('shipmentShipSupplyRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -57,7 +58,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 供给`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -87,12 +93,6 @@
 					url: `/pages/shipWork/supplyAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/supplyAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="supplyAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -67,6 +68,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				supplyRow: {},
@@ -101,6 +103,13 @@
 			if (this.obj.state == "edit" || this.obj.state == "look") {
 				this.getRow()
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑供给"
+			} else if (this.obj.state == "look") {
+				this.title = "查看供给"
+			} else {
+				this.title = "新增供给"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -270,12 +279,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/supply'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -315,8 +318,6 @@
 					}
 
 					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
 						padding: 0 14px;
 						box-sizing: border-box;
 					}

pages/shipWork/untieAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="untieAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -75,6 +76,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				untieRow: {},
@@ -112,6 +114,13 @@
 			if (this.obj.state == "edit" || this.obj.state == "look") {
 				this.getRow()
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑系解缆"
+			} else if (this.obj.state == "look") {
+				this.title = "查看系解缆"
+			} else {
+				this.title = "新增系解缆"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -270,12 +279,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/untieCord'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -315,8 +318,6 @@
 					}
 
 					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
 						padding: 0 14px;
 						box-sizing: border-box;
 					}

pages/shipWork/untieCord.vue

@@ -42,7 +42,7 @@
 	export default {
 		data() {
 			return {
-				title: "船名-系解缆",
+				title: "船只 - 系解缆",
 				shipInfo: {},
 				infoList: []
 			}
@@ -51,6 +51,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addUntieArr')
 			this.executeSql1('attachUnmoorRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -58,7 +59,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 系解缆`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -88,12 +94,6 @@
 					url: `/pages/shipWork/untieAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/workAssign.vue

@@ -40,7 +40,7 @@
 	export default {
 		data() {
 			return {
-				title: "船名-指导员作业布置",
+				title: "船只 - 指导员作业布置",
 				shipInfo: {},
 				infoList: []
 			}
@@ -49,6 +49,7 @@
 			// this.shipInfo = uni.getStorageSync('shipInfo')
 			// this.infoList = uni.getStorageSync('addAssignArr')
 			this.executeSql1('shipmentAdviserLayoutRespList')
+			this.executeSql1('shipInfoTable')
 		},
 		methods: {
 			// 查
@@ -56,7 +57,12 @@
 				let sql = `select * from ${tableName}`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
+					if (tableName == 'shipInfoTable') {
+						this.shipInfo = value[0]
+						this.title = `${this.shipInfo.vslCnname} - 指导员作业布置`
+					} else {
 						this.infoList = value
+					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
 					console.error(error);
@@ -86,12 +92,6 @@
 					url: `/pages/shipWork/workAssignAdd?params=${params}`
 				})
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/documentList'
-				})
-				return true;
-			},
 		}
 	}
 </script>

pages/shipWork/workAssignAdd.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="workAssignAdd">
+		<head-view :title="title"></head-view>
 		<view class="container">
 			<view class="ul">
 				<view class="li">
@@ -83,6 +84,7 @@
 	export default {
 		data() {
 			return {
+				title: "",
 				shipInfo: {},
 				obj: {},
 				assignRow: {},
@@ -128,6 +130,13 @@
 			if (this.obj.state == 'edit' || this.obj.state == 'look') {
 				this.getRow();
 			}
+			if (this.obj.state == "edit") {
+				this.title = "编辑指导员作业布置"
+			} else if (this.obj.state == "look") {
+				this.title = "查看指导员作业布置"
+			} else {
+				this.title = "新增指导员作业布置"
+			}
 			this.executeSql1('shipOption')
 			this.executeSql1("shipInfoTable")
 		},
@@ -328,12 +337,6 @@
 					console.error(error);
 				});
 			},
-			onBackPress(event) {
-				uni.navigateTo({
-					url: '/pages/shipWork/workAssign'
-				})
-				return true;
-			},
 		}
 	}
 </script>
@@ -373,8 +376,6 @@
 					}
 
 					/deep/.uni-numbox-btns {
-						border-right: 1px solid #ccc;
-						border-left: 1px solid #ccc;
 						padding: 0 14px;
 						box-sizing: border-box;
 					}

style/css/layout.css

@@ -1,5 +1,5 @@
 .container {
-	min-height: calc(100vh - 44px);
+	min-height: calc(100vh - 68px);
 	background-color: #f5f6fa;
 }