From 95abe8ec2aee5caa9cca6937c6677ee55ba89020 Mon Sep 17 00:00:00 2001
From: Panzihang <819652404@qq.com>
Date: Fri, 24 Nov 2023 15:55:58 +0800
Subject: [PATCH] 11.24

---
 components/head-view/head-view.vue  |   4 +
 pages/discharge/instruct.vue        |  50 ++-
 pages/index/index.vue               |   1 +
 pages/index/instruct.vue            | 131 ++++---
 pages/login/index.vue               |  17 +-
 pages/quality/details.vue           |   8 +-
 pages/quality/edit.vue              |  12 +-
 pages/quality/index.vue             |  11 +-
 pages/shipWork/documentList.vue     |   3 +-
 pages/shipWork/index.vue            |  42 ++-
 pages/shipWork/mafiAdd.vue          |   4 +-
 pages/shipWork/mafiSign.vue         |   2 +-
 pages/shipWork/mixSign.vue          | 552 +++++++++++++++++-----------
 pages/shipWork/shiftAdd.vue         |  12 +-
 pages/shipWork/sign.vue             |  23 +-
 pages/shipWork/supplySign.vue       | 337 ++++++++++++-----
 pages/shipWork/untieSign.vue        | 371 +++++++++++++------
 static/images/ship-shplit-right.svg |  25 ++
 18 files changed, 1064 insertions(+), 541 deletions(-)
 create mode 100644 static/images/ship-shplit-right.svg

diff --git a/components/head-view/head-view.vue b/components/head-view/head-view.vue
index 0daad60..e681efd 100644
--- a/components/head-view/head-view.vue
+++ b/components/head-view/head-view.vue
@@ -95,6 +95,10 @@
 			executeSql(sql) {
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					value.forEach(v => {
+						this.inVvyId = ""
+						this.inVvyName = ""
+						this.outVvyId = ""
+						this.outVvyName = ""
 						if (v.importExportFlagName == '出口') {
 							this.inVvyId = v.vvyId
 							this.inVvyName = v.vvyName
diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue
index f3bdef4..eff0840 100644
--- a/pages/discharge/instruct.vue
+++ b/pages/discharge/instruct.vue
@@ -820,12 +820,16 @@
 			// 点击tabs
 			changeTabs(e) {
 				this.mnfBl = ''
+				this.brdId = ''
 				this.brdName = ''
+				this.bvmId = ''
 				this.bvmName = ''
+				this.sendValue = ''
 				this.itemList = []
 				this.tabsValue = e.value
 				this.current = 1
 				this.zTjActive = -1
+				this.zTjType = true
 				if (e.value == 1 || e.value == 2) {
 					this.loadOtherOrder()
 				} else if (e.value == 0) {
@@ -835,11 +839,6 @@
 				this.getRoleId()
 			},
 			// 点击分指令tabs
-			changeTabs2(e) {
-				this.tabsValue2 = e.value
-				this.itemList = []
-				this.loadOtherOrder()
-			},
 			// 点击搜索
 			search() {
 				if (this.tabsValue == 1) {
@@ -847,21 +846,20 @@
 				} else if (this.tabsValue == 0) {
 					this.loadSumOrder()
 				}
-			},
-			// 点击分页
-			changePage(e) {
-				console.log(e)
-				this.current = e.current;
-				if (this.tabsValue == 1) {
-					this.loadOtherOrder()
-				} else if (this.tabsValue == 0) {
-					this.loadSumOrder()
-				}
+				this.getStatistics()
 			},
 			// 点击总指令统计列表总标题
 			clickTjHead(type) {
 				this.zTjActive = -1
-				this.brdId = ""
+				this.mnfBl = ''
+				this.brdId = ''
+				this.brdName = ''
+				this.bvmId = ''
+				this.bvmName = ''
+				this.sendValue = ''
+				this.itemList = []
+				this.current = 1
+				this.zTjType = true
 				if (type == 'zzl') {
 					this.loadSumOrder()
 				} else if (type == 'fzl') {
@@ -871,6 +869,9 @@
 			// 点击总指令统计列表
 			clickTjList(item, index, type) {
 				this.zTjActive = index
+				this.itemList = []
+				this.current = 1
+				this.zTjType = false
 				if (type == 'zzl') {
 					this.loadSumOrder(item.brdId)
 				} else if (type == 'fzl') {
@@ -899,7 +900,6 @@
 							let fsum = v.branchSentCount + v.branchNotSentCount
 							this.$set(v, "fsum", fsum)
 						})
-						console.log(this.zTjList)
 					}
 				})
 			},
@@ -1284,7 +1284,13 @@
 				this.brandItem = e
 				this.brdId = e.brdId
 				this.brdName = e.brdName
-				this.loadSumOrder()
+				this.itemList = []
+				this.current = 1
+				if (this.tabsValue == 0) {
+					this.loadSumOrder()
+				} else if (this.tabsValue == 1 || this.tabsValue == 2) {
+					this.loadOtherOrder()
+				}
 			},
 			// 获取车型
 			getBvm() {
@@ -1307,7 +1313,13 @@
 				this.bvmItem = e
 				this.bvmId = e.id
 				this.bvmName = e.name
-				this.loadSumOrder()
+				this.itemList = []
+				this.current = 1
+				if (this.tabsValue == 0) {
+					this.loadSumOrder()
+				} else if (this.tabsValue == 1 || this.tabsValue == 2) {
+					this.loadOtherOrder()
+				}
 			},
 			toDetails(item, item2) {
 				console.log(item, item2)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d6a5afc..797c1eb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -147,6 +147,7 @@
 				this.shipName = e.vslCnname
 				this.vvyId = e.vvyId
 				this.vvyShip = e.vvyShip
+				this.getShip()
 			},
 			// 选择船输入框
 			shipInput(e) {
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 377ef55..8215ab4 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -8,6 +8,7 @@
 					<button class="button" type="default" @click="distribute('center','all')">指令下发</button>
 				</template>
 				<template v-if="tabsValue == 1">
+					<!-- <button class="button" type="default" @click="ask">装船要求</button> -->
 					<button class="button" type="default" @click="distribute('center','solo')">指令下发</button>
 				</template>
 				<template v-if="tabsValue == 2">
@@ -517,11 +518,7 @@
 				</custom-tab-pane>
 				<custom-tab-pane label="配载图" name="c1_3">
 					<view></view>
-					<view class="main">
-						<!-- <view class="buttonlist buttonlist2">
-								<button class="button" type="default">刷新</button>
-								<button class="button" type="default">显示</button>
-							</view> -->
+					<view class="main main2">
 						<view class="pzPot">
 							<view class="title">
 								PORT OF DESTINATION
@@ -547,10 +544,8 @@
 									<text class="text">是否有跳板: {{item.whetherJumpName}}</text>
 								</view>
 								<view class="imgLi">
-									<!-- <image class="shipImg" src="@/static/images/ship-split.svg" mode="widthFix"></image> -->
 									<view class="maskBox">
 										<view class="line">
-											<!-- {{item.maxHeight}} -->
 											<view class="testLine" v-for="item2 in item.shipSpace" :key="item2"
 												:style="{height:item.maxHeight+'px'}">
 											</view>
@@ -580,11 +575,12 @@
 									</view>
 								</view>
 
-								<view class="tableHead">
+								<view class="tableHead" @click="clickShow(item)">
 									<text>货物明细</text>
-									<uni-icons class="jt" type="bottom" size="24"></uni-icons>
+									<uni-icons class="jt" type="bottom" size="24" v-if="item.isShow"></uni-icons>
+									<uni-icons class="jt" type="top" size="24" v-if="!item.isShow"></uni-icons>
 								</view>
-								<uni-table border stripe emptyText="暂无更多数据">
+								<uni-table border stripe emptyText="暂无更多数据" v-if="item.isShow">
 									<!-- 表头行 -->
 									<uni-tr class="gray">
 										<uni-th align="center" width="20">积载编号</uni-th>
@@ -805,7 +801,8 @@
 					<view class="popupTitle">
 						装船要求
 					</view>
-					<uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."></uni-easyinput>
+					<uni-easyinput type="textarea" v-model="askValue" placeholder="请输入内容..."
+						:disabled="askDisabled"></uni-easyinput>
 					<view class="popupBtn">
 						<view class="btnList">
 							<button class="button" type="default" @click="zcCancel">取 消</button>
@@ -868,6 +865,7 @@
 
 				// 装船要求
 				askValue: "",
+				askDisabled: false,
 				itemList: [],
 				current: 0,
 				active: 1,
@@ -942,6 +940,7 @@
 			this.loginObj = uni.getStorageSync('loginObj')
 			if (this.tabsValue == 0) {
 				this.loadSumOrder() // 总指令：分页查询
+				this.askDisabled = false
 			}
 			this.getPot() // 获取港口
 			this.getBrand() // 获取品牌
@@ -949,21 +948,24 @@
 			this.getRoleId() // 获取角色ID
 			this.initAsk() // 获取装船要求
 			this.getStatistics() // 获取统计数据
+			this.getPotList()
+			this.getImgInfo()
+			this.getGoodsInfo()
 		},
 		components: {
 			HeadView,
 			HeadInfo,
 			place,
 		},
-		onReachBottom() {
-			console.log(this.itemList)
-		},
 		methods: {
 			// 点击tabs
 			changeTabs(e) {
 				this.mnfBl = ''
+				this.brdId = ''
 				this.brdName = ''
+				this.bvmId = ''
 				this.bvmName = ''
+				this.potId = ''
 				this.potName = ''
 				this.itemList = []
 				this.sendValue = ''
@@ -971,10 +973,13 @@
 				this.zTjActive = -1
 				this.shipDeck = ""
 				this.current = 1
+				this.zTjType = true
 				if (e.value == 1 || e.value == 2) {
 					this.loadOtherOrder()
+					// this.askDisabled = true
 				} else if (e.value == 0) {
 					this.loadSumOrder()
+					// this.askDisabled = false
 				} else if (e.value == 3) {
 					this.getPotList()
 					this.getImgInfo()
@@ -992,20 +997,21 @@
 				}
 				this.getStatistics()
 			},
-			// 点击分页
-			changePage(e) {
-				console.log(e)
-				this.current = e.current;
-				if (this.tabsValue == 1 || this.tabsValue == 2) {
-					this.loadOtherOrder()
-				} else if (this.tabsValue == 0) {
-					this.loadSumOrder()
-				}
-			},
 			// 点击总指令统计列表总标题
 			clickTjHead(type) {
 				this.zTjActive = -1
 				this.shipDeck = ""
+				this.mnfBl = ''
+				this.brdId = ''
+				this.brdName = ''
+				this.bvmId = ''
+				this.bvmName = ''
+				this.potId = ''
+				this.potName = ''
+				this.sendValue = ''
+				this.itemList = []
+				this.current = 1
+				this.zTjType = true
 				if (type == 'zzl') {
 					this.loadSumOrder()
 				} else if (type == 'fzl') {
@@ -1016,6 +1022,9 @@
 			clickTjList(item, index, type) {
 				this.zTjActive = index
 				this.shipDeck = item.shipDeck
+				this.itemList = []
+				this.current = 1
+				this.zTjType = false
 				if (type == 'zzl') {
 					this.loadSumOrder()
 				} else if (type == 'fzl') {
@@ -1074,6 +1083,7 @@
 							// }
 							this.getBottomInfo(v.lwpId, index)
 						})
+						console.log(this.itemList)
 					}
 				})
 			},
@@ -1423,6 +1433,8 @@
 			sendSelect(e) {
 				this.sendText = e.text
 				this.sendValue = e.vale
+				this.itemList = []
+				this.current = 1
 				this.loadOtherOrder()
 			},
 			// 获取品牌
@@ -1446,7 +1458,13 @@
 				this.brandItem = e
 				this.brdId = e.brdId
 				this.brdName = e.brdName
-				this.loadSumOrder()
+				this.itemList = []
+				this.current = 1
+				if (this.tabsValue == 0) {
+					this.loadSumOrder()
+				} else if (this.tabsValue == 1 || this.tabsValue == 2) {
+					this.loadOtherOrder()
+				}
 			},
 			// 获取港口
 			getPot() {
@@ -1469,7 +1487,13 @@
 				this.potItem = e
 				this.potName = e.potCnname
 				this.potId = e.potId
-				this.loadSumOrder()
+				this.itemList = []
+				this.current = 1
+				if (this.tabsValue == 0) {
+					this.loadSumOrder()
+				} else if (this.tabsValue == 1 || this.tabsValue == 2) {
+					this.loadOtherOrder()
+				}
 			},
 			// 获取车型
 			getBvm() {
@@ -1492,7 +1516,13 @@
 				this.bvmItem = e
 				this.bvmId = e.id
 				this.bvmName = e.name
-				this.loadSumOrder()
+				this.itemList = []
+				this.current = 1
+				if (this.tabsValue == 0) {
+					this.loadSumOrder()
+				} else if (this.tabsValue == 1 || this.tabsValue == 2) {
+					this.loadOtherOrder()
+				}
 			},
 			toDetails(id) {
 				let obj = {
@@ -1525,7 +1555,6 @@
 							this.pzPotList.forEach(v => {
 								this.$set(v, 'background', `background:${v.potColor}`)
 							})
-							// console.log(this.pzPotList, '配载图顶部数据, 颜色色块')
 						}
 					}
 				})
@@ -1545,13 +1574,17 @@
 							this.imgInfo = res.data.data
 							// 默认船舱画布高度最小为162 暂定10000  防止不画
 							this.imgInfo.cabinInfoList.forEach(item => {
-								// 
+								this.$set(item, "isShow", true)
 								item.maxHeight = 10000
 							})
 						}
 					}
 				})
 			},
+			// 折叠货物明细
+			clickShow(item) {
+				item.isShow = !item.isShow
+			},
 			// 获取货物明细
 			getGoodsInfo() {
 				uni.request({
@@ -1589,7 +1622,7 @@
 				let sum = item.cabinNo
 				item.stowageList.forEach(ele => {
 					// 宽为850 每个仓位为20  850/20
-					let widthDw = (42 / sum).toFixed(2)
+					let widthDw = (42.5 / sum).toFixed(5)
 					let vertexPositionArr = ele.vertexPosition.split(',')
 					let x = vertexPositionArr[0] * widthDw
 					let y = vertexPositionArr[1] * 35
@@ -1601,7 +1634,6 @@
 					// 		maxHeight: bigNum
 					// 	})
 					// }
-					console.log(this.imgInfo.cabinInfoList[index].maxHeight);
 					ctx.setFillStyle(ele.potColor);
 					// 每层加一个
 					ctx.fillRect(x, y, widthDw * ele.blockWidth - 3, ele.blockLength * 35 - 3);
@@ -1679,6 +1711,10 @@
 			overflow: hidden;
 		}
 
+		.main2 {
+			overflow: auto;
+		}
+
 		.askBox {
 			width: 97%;
 			padding: 20px;
@@ -2241,7 +2277,7 @@
 
 		.imgTable {
 			margin-top: 20px;
-			padding: 0 20px;
+			padding: 0 20px 20px;
 
 			.title {
 				font-size: 20px;
@@ -2257,10 +2293,10 @@
 				display: flex;
 
 				.maskBox {
-					width: 1060px;
-					height: 191px;
+					width: 1054px;
+					height: 171px;
 					margin: 0 auto;
-					background: url('@/static/images/ship-split.svg');
+					background: url('@/static/images/ship-shplit-right.svg');
 					background-repeat: no-repeat;
 					background-size: contain;
 					position: relative;
@@ -2268,9 +2304,9 @@
 					.line {
 						position: absolute;
 						width: 850px;
-						height: 85%;
-						top: 15px;
-						left: 60px;
+						height: 95%;
+						top: 5px;
+						left: 168px;
 						display: flex;
 						overflow-y: auto;
 
@@ -2307,9 +2343,9 @@
 				}
 
 				.leftTopImg {
-					transform: rotate(90deg);
-					top: 5px;
-					left: -5px;
+					transform: rotate(180deg);
+					top: -15px;
+					right: -10px;
 				}
 
 				.imgSize2 {
@@ -2318,19 +2354,20 @@
 				}
 
 				.leftBotImg {
-					bottom: 2px;
-					left: -1px;
+					transform: rotate(-90deg);
+					bottom: -10px;
+					right: -15px;
 				}
 
 				.topImg {
-					top: 0;
-					left: 40%;
+					top: -10px;
+					left: 50%;
 				}
 
 				.botImg {
 					transform: rotate(180deg);
-					bottom: 0;
-					left: 40%;
+					bottom: -10px;
+					left: 50%;
 				}
 			}
 
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 6db6d07..23ec57d 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -17,7 +17,11 @@
 				</view>
 				<view class="loginInput">
 					<uni-easyinput prefixIcon="person-filled" v-model="account" placeholder="请输入账号"></uni-easyinput>
-					<uni-easyinput type="password" prefixIcon="locked-filled" v-model="password" placeholder="请输入密码">
+					<uni-easyinput type="password" prefixIcon="locked-filled" suffixIcon="eye-slash-filled"
+						:passwordIcon="false" v-model="password" placeholder="请输入密码" v-if="!pwdShow" @iconClick="iconC">
+					</uni-easyinput>
+					<uni-easyinput prefixIcon="locked-filled" suffixIcon="eye-filled" v-model="password"
+						placeholder="请输入密码" v-if="pwdShow" @iconClick="iconC">
 					</uni-easyinput>
 					<button class="button" @click="loginGo('center')">立即登录</button>
 				</view>
@@ -61,9 +65,9 @@
 		data() {
 			return {
 				// rtoswuhan1   wuhan_ceshi1
-				account: '',
+				account: 'rtoswuhan1',
 				// q123456
-				password: '',
+				password: 'q123456',
 				// 登录类型 pad
 				mediaType: "pad",
 				// 登录失败提示
@@ -78,13 +82,18 @@
 				loginObj: {},
 				lotusLoadingData: {
 					isShow: false //设置显示加载中组件true显示false隐藏
-				}
+				},
+				pwdShow: false
 			}
 		},
 		components: {
 			LotusLoading
 		},
 		methods: {
+			// 点击图标
+			iconC() {
+				this.pwdShow = !this.pwdShow
+			},
 			// 登录
 			loginGo(type) {
 				this.lotusLoadingData.isShow = true
diff --git a/pages/quality/details.vue b/pages/quality/details.vue
index c580ea1..8ab1735 100644
--- a/pages/quality/details.vue
+++ b/pages/quality/details.vue
@@ -79,7 +79,7 @@
 						<p>质损货物品类：</p>
 						<view class="rightInfo">
 							<p>{{infoData.qdGodsCategory}}</p>
-							<p v-if="infoData.qdGcOther != null">
+							<p v-if="infoData.qdGcOther != null && infoData.qdGcOther != ''">
 								备注：{{infoData.qdGcOther}}
 							</p>
 						</view>
@@ -91,7 +91,7 @@
 						<p>质损概况：</p>
 						<view class="rightInfo">
 							<p>{{infoData.qualityDamageSituationName}}</p>
-							<p v-if="infoData.qdsOther != null">
+							<p v-if="infoData.qdsOther != null && infoData.qdsOther != ''">
 								备注：{{infoData.qdsOther}}
 							</p>
 						</view>
@@ -100,7 +100,7 @@
 						<p>损伤情况：</p>
 						<view class="rightInfo">
 							<p>{{infoData.damageSituationName}}</p>
-							<p v-if="infoData.dsOther != null">
+							<p v-if="infoData.dsOther != null && infoData.dsOther != ''">
 								备注：{{infoData.dsOther}}
 							</p>
 						</view>
@@ -109,7 +109,7 @@
 						<p>处置情况：</p>
 						<view class="rightInfo">
 							<p>{{infoData.disposalSituationName}}</p>
-							<p v-if="infoData.dpsOther != null">
+							<p v-if="infoData.dpsOther != null && infoData.dpsOther != ''">
 								备注：{{infoData.dpsOther}}
 							</p>
 						</view>
diff --git a/pages/quality/edit.vue b/pages/quality/edit.vue
index 6765e08..075518b 100644
--- a/pages/quality/edit.vue
+++ b/pages/quality/edit.vue
@@ -1347,11 +1347,11 @@
 				if (this.current2 != '其他') {
 					this.other = ""
 				}
-				let editComplete = ""
+				let removableFlag = ""
 				if (this.type == 'add') {
-					editComplete = "1"
+					removableFlag = "1"
 				} else if (this.type == "edit") {
-					editComplete = "0"
+					removableFlag = "0"
 				}
 				let editReqDTO = {
 					"boardCarLicensePlates": this.bcLicense, // 板车车牌照
@@ -1362,7 +1362,7 @@
 					"dsOther": this.other2, // 损伤情况其他备注
 					"dispList": this.checkData3, // 处置情况
 					"dpsOther": this.other3, // 处置情况其他备注
-					"editComplete": editComplete, // pad提交传 1 编辑完毕 扫描提交的数据不全不给后台展示
+					"editComplete": "1", // pad提交传 1 编辑完毕 扫描提交的数据不全不给后台展示
 					"godId": this.godId, // 货物id
 					"goodsType": this.carId, // 车型id
 					"linkFeedback": this.feed, // 客户反馈
@@ -1376,7 +1376,7 @@
 					"qualityDamagePhotos": this.zsPhoto, // 质损照片
 					"qualityDamageTime": this.zsDate, // 质损时间
 					"refImageUrl": this.zsBase, // 质损参考图地址
-					"removableFlag": "1", // 	可删除标识 pad提交传 1
+					"removableFlag": removableFlag, // 	可删除标识 pad提交传 1
 					"signUrl": this.signBase, // 签名地址
 					"spmId": this.shipId, // 船舶id
 					"storeArea": this.storeArea, // 区域
@@ -1606,7 +1606,7 @@
 
 					/deep/.uni-stat-box {
 						flex: none;
-						width: 45%;
+						width: 60%;
 					}
 
 					/deep/.uni-select {
diff --git a/pages/quality/index.vue b/pages/quality/index.vue
index 4f65ced..75f1250 100644
--- a/pages/quality/index.vue
+++ b/pages/quality/index.vue
@@ -177,7 +177,6 @@
 					},
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
-						console.log('接口返回------', res);
 						if (res.statusCode == 200) {
 							this.itemList = res.data.data.records
 							this.total = res.data.data.total
@@ -233,7 +232,6 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						if (res.data.status == 200) {
-							console.log(res)
 							res.data.data.forEach(v => {
 								this.zshjList.push({
 									value: v.ptrCode,
@@ -281,7 +279,7 @@
 			modify(type, item) {
 				if (type == 'edit') {
 					let obj = {
-						type: type,
+						type: "edit",
 						ygqId: item.ygqId
 					}
 					const params = encodeURIComponent(JSON.stringify(obj));
@@ -289,8 +287,13 @@
 						url: `/pages/quality/edit?params=${params}`
 					})
 				} else {
+					let obj = {
+						type: "add",
+						ygqId: ""
+					}
+					const params = encodeURIComponent(JSON.stringify(obj));
 					uni.navigateTo({
-						url: `/pages/quality/edit`
+						url: `/pages/quality/edit?params=${params}`
 					})
 				}
 			},
diff --git a/pages/shipWork/documentList.vue b/pages/shipWork/documentList.vue
index fafa854..e267d44 100644
--- a/pages/shipWork/documentList.vue
+++ b/pages/shipWork/documentList.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="documentList">
 		<head-view :title="title" :type="true" url="/pages/shipWork/index"></head-view>
-		<uni-notice-bar show-icon single :text="noticeText" style="margin-top: 68px;" />
+		<!-- <uni-notice-bar show-icon single :text="noticeText" style="margin-top: 68px;" /> -->
 		<view class="container">
 			<view class="workBox">
 				<view class="title">
@@ -207,6 +207,7 @@
 		.container {
 			padding: 30px 20px;
 			min-height: calc(100vh - 119px);
+			margin-top: 68px;
 
 			.workBox {
 				background-color: #fff;
diff --git a/pages/shipWork/index.vue b/pages/shipWork/index.vue
index 401d8f2..3c0925d 100644
--- a/pages/shipWork/index.vue
+++ b/pages/shipWork/index.vue
@@ -12,8 +12,8 @@
 					<button class="searchBtn" type="default" @click="search">搜索</button>
 
 					<!-- <button class="searchBtn" type="default" @click="dropTable">删除表</button> -->
-					<!-- <button class="searchBtn" type="default" @click="dropData">删除数据</button>
-					<button class="searchBtn" type="default" @click="createTable">创建</button> -->
+					<button class="searchBtn" type="default" @click="dropData">删除数据</button>
+					<!-- <button class="searchBtn" type="default" @click="createTable">创建</button> -->
 					<!-- <button class="searchBtn" type="default" @click="delAll">批量删除表</button>
 					<button class="searchBtn" type="default" @click="delAllData">批量删除数据</button> -->
 				</view>
@@ -159,6 +159,8 @@
 				shipmentLoadUnloadNoticeRespList: [],
 				// 质量意见征询
 				shipmentQualityConsultationRespList: [],
+				// 质量意见征询评价表
+				evaluateTable: [],
 				// 异常情况
 				abnormalConditionRespList: [],
 				// mafi清单
@@ -181,7 +183,7 @@
 					"retallyMessageRespList", "infoRespList", "attachUnmoorRespList", "shipmentShipSupplyRespList",
 					"shipmentAdviserLayoutRespList", "shipmentLoadUnloadNoticeRespList",
 					"shipmentQualityConsultationRespList", "abnormalConditionRespList", "mafiListRespList",
-					"workSignTable"
+					"workSignTable", "evaluateTable"
 				],
 				//  基础数据表
 				jcList: ["shipInfoTable", "voyageScheduleDataPadRespDTO", "voyageScheduleDataDetailRespDTOList",
@@ -245,7 +247,7 @@
 			},
 			dropData() {
 				console.log('删除数据');
-				let sql = "delete from shipInfoTable"
+				let sql = "delete from evaluateTable"
 				this.executeSql(sql)
 			},
 			// 获取船的数据
@@ -341,7 +343,6 @@
 			},
 			// 船舶基本信息
 			shipDataInfo(info, vtpId) {
-				console.log(info)
 				let date = new Date().getTime()
 				let webId = uuidv4()
 				let webDate = api.getDate(date)
@@ -403,7 +404,6 @@
 							vvyIds.push(item.inVvyId)
 							vvyIds.push(item.outVvyId)
 						}
-						console.log(vvyIds)
 						uni.request({
 							url: `${this.$local}/api/shipOperate/download?vvyIds=${vvyIds}`,
 							header: {
@@ -626,11 +626,16 @@
 									// 质量意见征询
 									if (this.downloadData.shipmentQualityConsultationRespList.length > 0) {
 										this.downloadData.shipmentQualityConsultationRespList.forEach(v => {
+											let webId = uuidv4()
 											let sql =
 												`insert into shipmentQualityConsultationRespList values('${v.vqcId}','${this.vtpId}','${v.vvyId}','${v.vvyName}','${v.importExportFlagName}',
 														'${v.bthId}','${v.berth}','${v.handlingType}','${v.handlingName}','${v.vehiclesNumber}','${v.spareNumber}',
 														'${v.operationDate}','${webStatus}','${v.createTime}')`
 											this.executeSql(sql)
+											let sql2 =
+												`insert into evaluateTable values('${webId}','${this.vtpId}','${v.vqcId	}','${v.evaluateOperate}','${v.evaluateSpeedSpecs}',
+														'${v.evaluateNoRude}','${v.evaluateAttitude}','${v.otherComents}','${webStatus}','${v.createTime}')`
+											this.executeSql(sql2)
 										})
 									}
 									// 异常情况
@@ -655,7 +660,7 @@
 									// 船舶计划
 									this.shipPlanInfo(this.downloadData.voyageScheduleDataPadRespDTO)
 									// 作业查询
-									if (this.downloadData.shipmentShipLoadPlansRespList.length > 0) {
+									if (this.downloadData.shipmentShipLoadPlansRespList != null) {
 										this.downloadData.shipmentShipLoadPlansRespList.forEach(v => {
 											let sql =
 												`insert into shipmentShipLoadPlansRespList values('${v.splId}','${this.vtpId}','${v.agentId}','${v.agentName}',
@@ -685,7 +690,7 @@
 										this.downloadData.signAppendixRespList.forEach(v => {
 											let sql =
 												`insert into workSignTable values('${v.swsId}','${this.vtpId}','${v.bizId}','${v.signFile}','${v.bizType}','${v.sort}',
-														'${v.vvyId}','${v.webDate}')`
+														'${v.vvyId}','${webDate}')`
 											this.executeSql(sql)
 										})
 									}
@@ -738,7 +743,6 @@
 			},
 			// 上传
 			upload(item) {
-				console.log(item)
 				if (item.padLockStatus == 0) {
 					this.lotusLoadingData.isShow = true
 					this.allArr.forEach(v => {
@@ -754,6 +758,17 @@
 								}
 							})
 						})
+						that.shipmentQualityConsultationRespList.forEach(v => {
+							that.evaluateTable.forEach(v2 => {
+								if (v.vqcId == v2.signId) {
+									that.$set(v, "evaluateOperate", v2.evaluate)
+									that.$set(v, "evaluateSpeedSpecs", v2.evaluate2)
+									that.$set(v, "evaluateNoRude", v2.evaluate3)
+									that.$set(v, "evaluateAttitude", v2.evaluate4)
+									that.$set(v, "otherComents", v2.remake)
+								}
+							})
+						})
 						let delPmIds = uni.getStorageSync("delPmIds")
 						if (delPmIds == null || delPmIds == "") {
 							delPmIds = []
@@ -923,6 +938,12 @@
 						that.retallyMessageRespList = value
 						that.retallyMessageRespList.forEach(v => {
 							that.$set(v, "reyId", v.webId)
+							if (v.retallyStartTime == "null") {
+								that.$set(v, "retallyStartTime", null)
+							}
+							if (v.retallyEndTime == "null") {
+								that.$set(v, "retallyEndTime", null)
+							}
 						})
 					} else if (tableName == "infoRespList") {
 						value.forEach(v => {
@@ -949,7 +970,8 @@
 						that.mafiListRespList = value
 					} else if (tableName == "workSignTable") {
 						that.workSignTable = value
-						console.log(that.workSignTable)
+					} else if (tableName == 'evaluateTable') {
+						that.evaluateTable = value
 					}
 				}).catch((error) => {
 					// 在reject时执行的回调函数
diff --git a/pages/shipWork/mafiAdd.vue b/pages/shipWork/mafiAdd.vue
index 38a73a9..100baf2 100644
--- a/pages/shipWork/mafiAdd.vue
+++ b/pages/shipWork/mafiAdd.vue
@@ -100,11 +100,11 @@
 				type: "",
 				lxList: [{
 						value: "FULL",
-						text: "空板"
+						text: "重板"
 					},
 					{
 						value: "EMPTY",
-						text: "重板"
+						text: "空板"
 					},
 				],
 				// 装卸类型下拉框
diff --git a/pages/shipWork/mafiSign.vue b/pages/shipWork/mafiSign.vue
index 555a9b2..f727d2c 100644
--- a/pages/shipWork/mafiSign.vue
+++ b/pages/shipWork/mafiSign.vue
@@ -156,7 +156,7 @@
 			},
 			// 查单证签字表
 			executeSql2(vvyId) {
-				let sql = `select * from workSignTable WHERE bizId = '${vvyId}' and bizType = '9';`
+				let sql = `select * from workSignTable WHERE vtpId = '${this.vtpId}' and bizType = '9';`
 				sqlite.executeSqlCeshi(sql).then((value) => {
 					// 在resolve时执行的回调函数
 					let zdyList = []
diff --git a/pages/shipWork/mixSign.vue b/pages/shipWork/mixSign.vue
index f66b4ef..e27265a 100644
--- a/pages/shipWork/mixSign.vue
+++ b/pages/shipWork/mixSign.vue
@@ -5,178 +5,172 @@
 			<custom-tabs type="c1" :value="tabsValue" @change="tabsChange">
 				<custom-tab-pane :label="item.name" v-for="(item,index) in tabsList" :name="'c1_'+index" :key="index">
 					<view></view>
-					<view class="container">
-						<table>
-							<tbody>
-								<tr>
-									<td class="h-l1r1">
-										<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
-										</image>
-									</td>
-									<td class="h-l1r2">&nbsp;</td>
-									<td class="h-l1r3">
-										<p>上海海通国际汽车码头有限公司</p>
-										<p>Shanghai HaiTong International Automotive Terminal Co.,Ltd.</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="3">
-										<p class="bh-dz">QR-7.5.1-01-11-M</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="3" class="h-l2r1">
-										<p class="name-dz">海通码头装卸和杂项作业单</p>
-										<p class="ename-dz">SHANGHAI HARBOUR BUREAU STEVEDORE WORKING RECORD</p>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-						<table>
-							<tbody>
-								<tr class="top">
-									<td class="topTitle">Name of ship:<p>{{shipInfo.vslCnname}}</p>
-									</td>
-									<td class="topTitle">Voy No:<p>{{vvyName}}</p>
-									</td>
-								</tr>
-								<tr class="top">
-									<td class="topTitle">Date:<p>{{dateId}}</p>
-									</td>
-									<!-- <td>Weather:</td>
-									<td></td> -->
-									<!-- <td>Gangs:</td>
-									<td></td>
-									<td>Foreman:</td>
-									<td></td> -->
-								</tr>
-								<!-- <tr>
-									<td>Foreman Working time:</td>
-									<td class="td-b-b0"></td>
-									<td>Berthed at Haitong:</td>
-									<td></td>
-								</tr> -->
-							</tbody>
-						</table>
-						<table class="t-zx">
-							<tbody>
-								<tr>
-									<td rowspan="2" style="width: 50px;"></td>
-									<td colspan="6">Working time</td>
-									<td colspan="4">Kind Of Works</td>
-									<td rowspan="2">B/L</td>
-									<td colspan="3">Handling method</td>
-								</tr>
-								<tr>
-									<td colspan="3" style="width: 120px;">From</td>
-									<td colspan="3" style="width: 120px;">To</td>
-									<td colspan="4">Loading□/UnLoading□</td>
-									<td>Ro/Ro</td>
-									<td>PortDevices</td>
-									<td>Others</td>
-								</tr>
-							</tbody>
-						</table>
-						<view v-for="(item2,index2) in shiftInfo" :key="index2 + 'shift'" class="rowBox">
-							<view class="name">{{item2.pwcTypeName}}</view>
-							<view class="time">{{item2.workStartTime}}</view>
-							<view class="time">{{item2.workEndTime}}</view>
-							<view class="infoBox">
-								<view class="iBox" v-for="(item3,index3) in item2.infoArr">
-									<view colspan="4" class="carCss">
-										车型:{{item3.carTypeName}},数量:{{item3.goodsNumber}}
-									</view>
-									<view class="remark">{{item3.remark}}</view>
-									<view class="ro gx"><text v-if="item3.loadingType == 'RO'">√</text></view>
-									<view class="pr gx"><text v-if="item3.loadingType == 'PR'">√</text></view>
-									<view class="ot gx"><text v-if="item3.loadingType == 'OT'">√</text></view>
+					<view style="padding: 16px;">
+						<view class="container">
+							<view class="head">
+								<view class="leftHead">
+									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+								</view>
+								<view class="rightHead">
+									<p>上海海通国际汽车码头有限公司</p>
+									<text>SHANGHAI HAITONG INTERNATIONAL AUTOMOTIVE TERMINAL CO. LTD.</text>
 								</view>
 							</view>
-						</view>
-						<table class="t-zx">
-							<tbody>
-								<tr>
-									<td :rowspan="fcList.length + 2">翻仓信息</td>
-									<td colspan="2" rowspan="2">Kind of Rehangdling</td>
-									<td colspan="2">DK/H</td>
-									<td colspan="6">Working time</td>
-									<td colspan="4">Weight/Measure</td>
-								</tr>
-								<tr>
-									<td>From</td>
-									<td>To</td>
-									<td colspan="3">From</td>
-									<td colspan="3">To</td>
-									<td colspan="2">Vehicle type/Quantity</td>
-									<td colspan="2">Total W/M</td>
-								</tr>
-								<tr v-for="(item,index) in fcArr" :key="index + 'fc'">
-									<td colspan="2">{{item.retallyTypeName}}</td>
-									<td>{{item.retallyOrigin}}</td>
-									<td>{{item.retallyTerminus}}</td>
-									<td colspan="3">{{item.retallyStartTime}}</td>
-									<td colspan="3">{{item.retallyEndTime}}</td>
-									<td colspan="2">车型:{{item.carTypeName}},数量:{{item.goodsNumber}}</td>
-									<td colspan="2">重量:{{item.goodsWeight}},体积:{{item.goodsVolume}}</td>
-								</tr>
-
-							</tbody>
-						</table>
-						<table class="t-zx" v-for="(v,indexv) in qtArr" :key="indexv">
-							<tbody>
-								<tr>
-									<td>&nbsp;</td>
-									<!-- <td colspan="2">Reason</td> -->
-									<td colspan="3">技术工人</td>
-									<td>From</td>
-									<td>To</td>
-									<td>Weight/Measure</td>
-									<td colspan="3">普通工人</td>
-									<td>From</td>
-									<td>To</td>
-									<td>Weight/Measure</td>
-								</tr>
-								<tr>
-									<td>&nbsp;</td>
-									<td colspan="3">{{v.tecNum}}</td>
-									<td>{{v.startTm}}</td>
-									<td>{{v.endTm}}</td>
-									<td>重量:{{v.weight}},体积:{{v.volume}}</td>
-									<td colspan="3">{{v.genNum}}</td>
-									<td>{{v.startTmPt}}</td>
-									<td>{{v.endTmPt}}</td>
-									<td>重量:{{v.weightPt}},体积:{{v.volumePt}}</td>
-								</tr>
-								<tr>
-									<td>Extra Labour（辅助作业）</td>
-									<td colspan="15">{{v.auxRemark}}</td>
-								</tr>
-								<tr>
-									<td>Stand by（待工）</td>
-									<td colspan="15">{{v.waitRemark}}</td>
-								</tr>
-								<tr>
-									<td>Remark（备注）</td>
-									<td colspan="15">{{v.workRemark}}</td>
-								</tr>
-							</tbody>
-						</table>
-						<view class="sginBox">
-							<view class="box">
-								<p>Foreman(指导员):</p>
-								<p class="sign" @click="togoSign('0')" v-if="zdySign.url == ''">点击签名</p>
-								<template v-else>
-									<image :src="zdySign.url" mode="widthFix"></image>
-									<!-- <text class="del" @click="delSign(zdySign.id)">删除</text> -->
-								</template>
+							<view class="headTItle">
+								<view class="titleLeft"></view>
+								<view class="title">
+									<p>海通码头装卸和杂项作业单</p>
+									<text>SHANGHAI HARBOUR BUREAU STEVEDORE WORKING RECORD</text>
+								</view>
+								<view class="titleRight">
+									<view>
+										<text>编号/N0:</text>
+										<text>QR-7.5.1-01-05-M</text>
+									</view>
+								</view>
 							</view>
-							<view class="box">
-								<p>Capt/Chief Mate(船长/大副):</p>
-								<p class="sign" @click="togoSign('1')" v-if="czSign.url == ''">点击签名</p>
-								<template v-else>
-									<image :src="czSign.url" mode="widthFix"></image>
-									<!-- <text class="del" @click="delSign(czSign.id)">删除</text> -->
-								</template>
+							<view class="ul">
+								<view class="li">
+									<p>Name of ship:</p><text>{{shipInfo.vslCnname}}</text>
+								</view>
+								<view class="li">
+									<p>Voy No:</p><text>{{vvyName}}</text>
+								</view>
+								<view class="li">
+									<p>Date:</p><text>{{dateId}}</text>
+								</view>
+							</view>
+							<table class="t-zx headZx">
+								<tbody>
+									<tr>
+										<td rowspan="2" style="width: 50px;"></td>
+										<td colspan="6">Working time</td>
+										<td colspan="4">Kind Of Works</td>
+										<td rowspan="2">B/L</td>
+										<td colspan="3">Handling method</td>
+									</tr>
+									<tr>
+										<td colspan="3" style="width: 120px;">From</td>
+										<td colspan="3" style="width: 120px;">To</td>
+										<td colspan="4">Loading/UnLoading</td>
+										<td>Ro/Ro</td>
+										<td>PortDevices</td>
+										<td>Others</td>
+									</tr>
+								</tbody>
+							</table>
+							<view v-for="(item2,index2) in shiftInfo" :key="index2 + 'shift'" class="rowBox">
+								<view class="name">{{item2.pwcTypeName}}</view>
+								<view class="time">{{item2.workStartTime}}</view>
+								<view class="time">{{item2.workEndTime}}</view>
+								<view class="infoBox">
+									<view class="iBox" v-for="(item3,index3) in item2.infoArr">
+										<view colspan="4" class="carCss">
+											车型:{{item3.carTypeName}},数量:{{item3.goodsNumber}}
+										</view>
+										<view class="remark">{{item3.remark}}</view>
+										<view class="ro gx"><text v-if="item3.loadingType == 'RO'">√</text></view>
+										<view class="pr gx"><text v-if="item3.loadingType == 'PR'">√</text></view>
+										<view class="ot gx"><text v-if="item3.loadingType == 'OT'">√</text></view>
+									</view>
+								</view>
+							</view>
+							<table class="t-zx">
+								<tbody>
+									<tr>
+										<td :rowspan="fcList.length + 2">翻仓信息</td>
+										<td colspan="2" rowspan="2">Kind of Rehangdling</td>
+										<td colspan="2">DK/H</td>
+										<td colspan="6">Working time</td>
+										<td colspan="4">Weight/Measure</td>
+									</tr>
+									<tr>
+										<td>From</td>
+										<td>To</td>
+										<td colspan="3">From</td>
+										<td colspan="3">To</td>
+										<td colspan="2">Vehicle type/Quantity</td>
+										<td colspan="2">Total W/M</td>
+									</tr>
+									<tr v-for="(item,index) in fcArr" :key="index + 'fc'">
+										<td colspan="2">{{item.retallyTypeName}}</td>
+										<td>{{item.retallyOrigin}}</td>
+										<td>{{item.retallyTerminus}}</td>
+										<td colspan="3">{{item.retallyStartTime}}</td>
+										<td colspan="3">{{item.retallyEndTime}}</td>
+										<td colspan="2">车型:{{item.carTypeName}},数量:{{item.goodsNumber}}</td>
+										<td colspan="2">重量:{{item.goodsWeight}},体积:{{item.goodsVolume}}</td>
+									</tr>
+
+								</tbody>
+							</table>
+							<table class="t-zx" v-for="(v,indexv) in qtArr" :key="indexv">
+								<tbody>
+									<tr>
+										<td>&nbsp;</td>
+										<!-- <td colspan="2">Reason</td> -->
+										<td colspan="3">技术工人</td>
+										<td>From</td>
+										<td>To</td>
+										<td>Weight/Measure</td>
+										<td colspan="3">普通工人</td>
+										<td>From</td>
+										<td>To</td>
+										<td>Weight/Measure</td>
+									</tr>
+									<tr>
+										<td>&nbsp;</td>
+										<td colspan="3">{{v.tecNum}}</td>
+										<td>{{v.startTm}}</td>
+										<td>{{v.endTm}}</td>
+										<td>重量:{{v.weight}},体积:{{v.volume}}</td>
+										<td colspan="3">{{v.genNum}}</td>
+										<td>{{v.startTmPt}}</td>
+										<td>{{v.endTmPt}}</td>
+										<td>重量:{{v.weightPt}},体积:{{v.volumePt}}</td>
+									</tr>
+									<tr>
+										<td>Extra Labour（辅助作业）</td>
+										<td colspan="15">{{v.auxRemark}}</td>
+									</tr>
+									<tr>
+										<td>Stand by（待工）</td>
+										<td colspan="15">{{v.waitRemark}}</td>
+									</tr>
+									<tr>
+										<td>Remark（备注）</td>
+										<td colspan="15">{{v.workRemark}}</td>
+									</tr>
+								</tbody>
+							</table>
+						</view>
+					</view>
+					<view class="signBox">
+						<view class="signContent">
+							<view class="signTitle">
+								<p>指导员:</p>
+								<p>Foreman:</p>
+							</view>
+							<view class="signInfo" v-if="zdySign.url == ''" @click="togoSign('0')">
+								去签名
+							</view>
+							<view class="signImg" v-else>
+								<image :src="zdySign.url"></image>
+								<!-- <text class="del" @click="delSign(zdySign.id)">删除</text> -->
+							</view>
+						</view>
+						<view class="row"></view>
+						<view class="signContent">
+							<view class="signTitle">
+								<p>船长/大副:</p>
+								<p>Capt/Chief Mate:</p>
+							</view>
+							<view class="signInfo" v-if="czSign.url == ''" @click="togoSign('1')">
+								去签名
+							</view>
+							<view class="signImg" v-else>
+								<image :src="czSign.url"></image>
+								<!-- <text class="del" @click="delSign(czSign.id)">删除</text> -->
 							</view>
 						</view>
 					</view>
@@ -532,18 +526,147 @@
 
 	.contentFixedr {
 		margin-top: 68px !important;
+
+		/deep/.tab .tab-bar {
+			height: 66px;
+			line-height: 66px;
+			position: relative;
+		}
+
+		/deep/.tab .tab-bar-item {
+			height: 66px;
+			line-height: 66px;
+			font-size: 18px;
+			color: #23262E;
+			font-weight: bold;
+			font-family: PingFangSC-Semibold;
+			padding: 0 24px !important;
+		}
+
+		/deep/.tab .tab-bar-item.active {
+			color: #0067CF
+		}
+
+		/deep/.tab .tab-bar-item .active-line {
+			color: #0067CF;
+			width: 54px;
+			height: 4px;
+		}
+
+		/deep/.tab-pane {
+			width: 100%;
+		}
+
+		/deep/.tab .tab-cont {
+			padding-bottom: 0;
+		}
 	}
 
 	.container {
-		padding: 0px 20px;
+		padding: 0px 16px;
+		background: #FFFFFF;
+		border-radius: 8px;
+
+		.head {
+			height: 85px;
+			padding: 16px 0;
+			margin: 0 8px;
+			border-bottom: 1px solid #999;
+			display: flex;
+			justify-content: space-between;
+
+			.rightHead {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				text-align: right;
+
+				p {
+					font-size: 22px;
+					color: #0052A4;
+					font-weight: bold;
+				}
+
+				text {
+					font-size: 14px;
+					color: #666666;
+				}
+			}
+		}
+
+		.headTItle {
+			display: flex;
+			justify-content: space-around;
+			padding: 24px 0;
+			margin: 0 8px;
+			border-bottom: 1px solid #EEEEEE;
+
+			.title {
+				flex: 3;
+				text-align: center;
+
+				p {
+					font-size: 24px;
+					color: #23262E;
+					font-weight: bold;
+				}
+
+				text {
+					font-size: 18px;
+					color: #23262E;
+				}
+			}
+
+			.titleLeft {
+				flex: 1;
+			}
+
+			.titleRight {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: flex-end;
+
+				text:first-child {
+					font-size: 14px;
+					color: #666666;
+				}
+
+				text:last-child {
+					font-size: 18px;
+					color: #0052A4;
+					font-weight: bold;
+				}
+			}
+		}
+
+		.ul {
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			padding: 15px 0;
+
+			.li {
+				width: 33%;
+				display: flex;
+				justify-content: center;
+
+				text {
+					color: #23262E;
+					font-weight: bold;
+					font-size: 14px;
+					margin-left: 8px;
+				}
+			}
+		}
 
 		table {
 			margin-bottom: 0 !important;
 		}
 	}
 
-	.td-b-b1 {
-		border-bottom: #000000 solid 1px;
+	.headZx {
+		background: #E9E9E9;
 	}
 
 	.t-zx td {
@@ -554,28 +677,8 @@
 		display: flex;
 	}
 
-	.top {
-		display: flex;
-		margin-bottom: 16px;
-	}
-
-	.topTitle {
-		width: calc(50% - 20px);
-		display: flex;
-		margin-left: 20px;
-
-		p {
-			width: 80%;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			text-align: center;
-			border-bottom: 1px solid #000000;
-		}
-	}
-
 	.rowBox {
-		width: 100%;
+		width: calc(100% - 1px);
 		display: flex;
 		border: 1px solid #000;
 		box-sizing: border-box;
@@ -592,7 +695,7 @@
 
 		.time {
 			border-right: 1px solid #000;
-			width: 200px;
+			width: 203px;
 			text-align: center;
 			display: flex;
 			flex-direction: column;
@@ -600,6 +703,7 @@
 		}
 
 		.infoBox {
+			width: calc(100% - 476px);
 			display: flex;
 			flex-direction: column;
 			justify-items: center;
@@ -612,7 +716,7 @@
 
 				.carCss {
 					border-right: 1px solid #000;
-					width: 245px;
+					width: 209px;
 					text-align: center;
 					display: flex;
 					flex-direction: column;
@@ -621,7 +725,7 @@
 
 				.remark {
 					border-right: 1px solid #000;
-					width: 61px;
+					width: 63px;
 					text-align: center;
 					display: flex;
 					flex-direction: column;
@@ -638,11 +742,11 @@
 				}
 
 				.ro {
-					width: 86px;
+					width: 87.5px;
 				}
 
 				.pr {
-					width: 137px;
+					width: 139px;
 				}
 
 				.ot {
@@ -661,27 +765,53 @@
 		}
 	}
 
-	.sginBox {
+	.signBox {
+		width: 100%;
+		height: 66px;
+		background: #FFFFFF;
+		border: 1px solid #E1E5ED;
+		box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.05);
 		display: flex;
-		margin-top: 20px;
+		justify-content: flex-end;
+		padding: 0 70px;
 
-		.box {
-			flex: 1;
+		.row {
+			width: 1px;
+			height: 30px;
+			background-color: #ccc;
+			margin-top: 18px;
+		}
+
+		.signContent {
 			display: flex;
+			margin: 0 54px;
 
-			image {
-				width: 200px;
-				height: 50px;
+			.signTitle {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				text-align: right;
 			}
 
-			.del {
-				color: red;
+			.signInfo {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				font-size: 18px;
+				color: #0052A4;
+				margin-left: 16px;
+			}
+
+			.signImg {
+				width: 100px;
+				height: 54px;
+				margin-top: 5px;
+				margin-left: 10px;
 			}
 		}
-	}
 
-	.sign {
-		color: #2979ff;
-		margin-left: 10px;
+		.signContent:last-child {
+			margin-right: 0;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shipWork/shiftAdd.vue b/pages/shipWork/shiftAdd.vue
index 650d2d6..c310016 100644
--- a/pages/shipWork/shiftAdd.vue
+++ b/pages/shipWork/shiftAdd.vue
@@ -1435,13 +1435,13 @@
 					}
 				}
 
-				.masonryLi:nth-of-type(2n + 1) {
-					grid-row: auto / span 1;
-				}
+				// .masonryLi:nth-of-type(2n + 1) {
+				// 	grid-row: auto / span 1;
+				// }
 
-				.masonryLi:nth-of-type(2n + 2) {
-					grid-row: auto / span 2;
-				}
+				// .masonryLi:nth-of-type(2n + 2) {
+				// 	grid-row: auto / span 2;
+				// }
 			}
 
 			.delBox {
diff --git a/pages/shipWork/sign.vue b/pages/shipWork/sign.vue
index b755d2c..acb7076 100644
--- a/pages/shipWork/sign.vue
+++ b/pages/shipWork/sign.vue
@@ -46,7 +46,6 @@
 				height: 0,
 				sginId: "",
 				signImgUrl: "",
-				shipInfo: {},
 				nextUrl: "",
 				signType: "",
 				signTable: "",
@@ -55,9 +54,6 @@
 				vvyId: "",
 			};
 		},
-		mounted() {
-			this.executeSql1('shipInfoTable')
-		},
 		onLoad(option) {
 			this.sginId = JSON.parse(decodeURIComponent(option.params)).id
 			this.nextUrl = JSON.parse(decodeURIComponent(option.params)).url
@@ -65,8 +61,8 @@
 			this.signTable = JSON.parse(decodeURIComponent(option.params)).signTable
 			this.tabsValue = JSON.parse(decodeURIComponent(option.params)).tabsValue
 			this.vvyId = JSON.parse(decodeURIComponent(option.params)).vvyId
-			console.log(this.vvyId)
 			this.backUrl = `/pages/shipWork/${this.nextUrl}`
+			this.vtpId = uni.getStorageSync('vtpId')
 			that = this;
 			id = option.id;
 			type = option.type;
@@ -177,8 +173,7 @@
 											let webId = uuidv4()
 											let webDate = api.getDate(date)
 											let sql =
-												`insert into workSignTable values('${webId}','${that.shipInfo.vtpId}','${signId}','${that.signImgUrl}','${that.signTable}','${that.signType}','${that.vvyId}','${webDate}')`
-											console.log(sql)
+												`insert into workSignTable values('${webId}','${that.vtpId}','${signId}','${that.signImgUrl}','${that.signTable}','${that.signType}','${that.vvyId}','${webDate}')`
 											sqlite.executeSqlCeshi(sql).then((
 												value) => {
 												// 在resolve时执行的回调函数
@@ -206,20 +201,6 @@
 					});
 				}
 			},
-			// 查船舶信息
-			executeSql1(tableName) {
-				let sql = `select * from ${tableName}`
-				sqlite.executeSqlCeshi(sql).then((value) => {
-					// 在resolve时执行的回调函数
-					if (tableName == 'shipInfoTable') {
-						this.shipInfo = value[0]
-						console.log(this.shipInfo)
-					}
-				}).catch((error) => {
-					// 在reject时执行的回调函数
-					console.error(error);
-				});
-			},
 		}
 	};
 </script>
diff --git a/pages/shipWork/supplySign.vue b/pages/shipWork/supplySign.vue
index a215394..401550c 100644
--- a/pages/shipWork/supplySign.vue
+++ b/pages/shipWork/supplySign.vue
@@ -5,81 +5,67 @@
 			<custom-tabs type="c1" :value="tabsValue" @change="tabsChange">
 				<custom-tab-pane :label="item.name" v-for="(item,index) in tabsList" :name="'c1_'+index" :key="index">
 					<view></view>
-					<view class="container">
-						<table>
-							<tbody>
-								<tr>
-									<td class="h-l1r1">
-										<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
-										</image>
-									</td>
-									<td class="h-l1r2">&nbsp;</td>
-									<td class="h-l1r3">
-										<p>上海海通国际汽车码头有限公司</p>
-										<p>Shanghai HaiTong International Automotive Terminal Co.,Ltd.</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="3">
-										<p class="bh-dz">QR-7.5.1-01-11-M</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="3" class="h-l2r1">
-										<p class="name-dz">供给作业单</p>
-										<p class="ename-dz">FRESH WTAER SUPPLIED EX WHARF</p>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-						<table id="t-main2">
-							<tbody>
-								<tr>
-									<td class="td1">
-										<p>船名：</p>
-										<p>Name of Ship&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{shipInfo.vslCnname}}</td>
-									<td class="td1">
-										<p>{{tableInfo.supplyType}}</p>
-										<p>Fresh Supply</p>
-									</td>
-									<td class="td2">{{tableInfo.supplyAmount}}</td>
-									<td class="td3">
-										<p>吨</p>
-										<p>Tons</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="6" class="tr0">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="td1">
-										<p>航次：</p>
-										<p>voy No&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.vvyName}}</td>
-									<td class="td1">
-										<p>泊位：</p>
-										<p>Berth&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.stopBerthageName}}</td>
-									<td class="td1">
-										<p>日期：</p>
-										<p>Date&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.supplyDate}}</td>
-								</tr>
-							</tbody>
-						</table>
-						<view class="sginBox">
-							<view class="box">
-								<p>Capt/Chief Mate(船长/大副):</p>
-								<p class="sign" @click="togoSign('1')" v-if="czSign.signFile == ''">点击签名</p>
-								<template v-else>
-									<image :src="czSign.signFile" mode="widthFix"></image>
-									<!-- <text class="del" @click="delSign(czSign.webId)">删除</text> -->
-								</template>
+					<view style="padding: 16px; padding-bottom: 0; height: calc(100% - 66px);">
+						<view class="container">
+							<view class="head">
+								<view class="leftHead">
+									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+								</view>
+								<view class="rightHead">
+									<p>上海海通国际汽车码头有限公司</p>
+									<text>SHANGHAI HAITONG INTERNATIONAL AUTOMOTIVE TERMINAL CO. LTD.</text>
+								</view>
+							</view>
+							<view class="headTItle">
+								<view class="titleLeft"></view>
+								<view class="title">
+									<p>供给作业单</p>
+									<text>FRESH WTAER SUPPLIED EX WHARF</text>
+								</view>
+								<view class="titleRight">
+									<view>
+										<text>编号/N0:</text>
+										<text>QR-7.5.1-01-05-M</text>
+									</view>
+								</view>
+							</view>
+							<view class="ul">
+								<view class="li">
+									<p>船名/Name of Ship:</p>
+									<p>{{shipInfo.vslCnname}}</p>
+								</view>
+								<view class="li">
+									<p>{{tableInfo.supplyType}}/Fresh Supply:</p>
+									<p>{{tableInfo.supplyAmount}}吨</p>
+								</view>
+								<view class="li">
+									<p>航次/voy No:</p>
+									<p>{{tableInfo.vvyName}}</p>
+								</view>
+								<view class="li">
+									<p>泊位/Berth:</p>
+									<p>{{tableInfo.bthIdName}}</p>
+								</view>
+								<view class="li">
+									<p>日期/Date:</p>
+									<p>{{tableInfo.supplyDate}}</p>
+								</view>
+							</view>
+
+						</view>
+					</view>
+					<view class="signBox">
+						<view class="signContent">
+							<view class="signTitle">
+								<p>船长/大副:</p>
+								<p>Capt/Chief Mate:</p>
+							</view>
+							<view class="signInfo" v-if="czSign.signFile == ''" @click="togoSign('1')">
+								去签名
+							</view>
+							<view class="signImg" v-else>
+								<image :src="czSign.signFile"></image>
+								<!-- <text class="del" @click="delSign(czSign.id)">删除</text> -->
 							</view>
 						</view>
 					</view>
@@ -212,32 +198,199 @@
 <style lang="less" scoped>
 	@import "../../style/css/main-dz.css";
 
-	.container {
-		padding: 0px 20px;
+	.contentFixed {
+		margin-top: 68px !important;
+
+		/deep/.tab .tab-bar {
+			height: 66px;
+			line-height: 66px;
+			position: relative;
+		}
+
+		/deep/.tab .tab-bar-item {
+			height: 66px;
+			line-height: 66px;
+			font-size: 18px;
+			color: #23262E;
+			font-weight: bold;
+			font-family: PingFangSC-Semibold;
+			padding: 0 24px !important;
+		}
+
+		/deep/.tab .tab-bar-item.active {
+			color: #0067CF
+		}
+
+		/deep/.tab .tab-bar-item .active-line {
+			color: #0067CF;
+			width: 54px;
+			height: 4px;
+		}
+
+		/deep/.tab-pane {
+			width: 100%;
+			height: calc(100vh - 66px - 68px);
+			overflow: hidden;
+		}
+
+		/deep/.tab .tab-cont {
+			padding-bottom: 0;
+		}
 	}
 
-	.sginBox {
-		width: 100%;
-		display: flex;
-		justify-content: flex-end;
+	.container {
+		padding: 0px 16px;
+		background: #FFFFFF;
+		border-radius: 8px;
 
-		.box {
+		.head {
+			height: 85px;
+			padding: 16px 0;
+			margin: 0 8px;
+			border-bottom: 1px solid #999;
 			display: flex;
-			margin-right: 80px;
+			justify-content: space-between;
 
-			image {
-				width: 200px;
-				height: 50px;
-			}
+			.rightHead {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				text-align: right;
 
-			.del {
-				color: red;
+				p {
+					font-size: 22px;
+					color: #0052A4;
+					font-weight: bold;
+				}
+
+				text {
+					font-size: 14px;
+					color: #666666;
+				}
 			}
 		}
 
-		.sign {
-			color: #2979ff;
-			margin-left: 10px;
+		.headTItle {
+			display: flex;
+			justify-content: space-around;
+			padding: 24px 0;
+			margin: 0 8px;
+			border-bottom: 1px solid #EEEEEE;
+
+			.title {
+				flex: 3;
+				text-align: center;
+
+				p {
+					font-size: 24px;
+					color: #23262E;
+					font-weight: bold;
+				}
+
+				text {
+					font-size: 18px;
+					color: #23262E;
+				}
+			}
+
+			.titleLeft {
+				flex: 1;
+			}
+
+			.titleRight {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: flex-end;
+
+				text:first-child {
+					font-size: 14px;
+					color: #666666;
+				}
+
+				text:last-child {
+					font-size: 18px;
+					color: #0052A4;
+					font-weight: bold;
+				}
+			}
+		}
+
+		.ul {
+			display: flex;
+			flex-wrap: wrap;
+			padding: 15px 0;
+
+			.li {
+				min-width: 33%;
+				display: flex;
+				justify-content: center;
+				margin-bottom: 24px;
+
+				p {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+				}
+
+				p:last-child {
+					color: #23262E;
+					font-weight: bold;
+					font-size: 14px;
+					margin-left: 8px;
+				}
+			}
+		}
+
+	}
+
+	.signBox {
+		width: 100%;
+		height: 66px;
+		background: #FFFFFF;
+		border: 1px solid #E1E5ED;
+		box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.05);
+		display: flex;
+		justify-content: flex-end;
+		padding: 0 70px;
+
+		.row {
+			width: 1px;
+			height: 30px;
+			background-color: #ccc;
+			margin-top: 18px;
+		}
+
+		.signContent {
+			display: flex;
+			margin: 0 54px;
+
+			.signTitle {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				text-align: right;
+			}
+
+			.signInfo {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				font-size: 18px;
+				color: #0052A4;
+				margin-left: 16px;
+			}
+
+			.signImg {
+				width: 100px;
+				height: 54px;
+				margin-top: 5px;
+				margin-left: 10px;
+			}
+		}
+
+		.signContent:last-child {
+			margin-right: 0;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shipWork/untieSign.vue b/pages/shipWork/untieSign.vue
index 0ce4a29..759379c 100644
--- a/pages/shipWork/untieSign.vue
+++ b/pages/shipWork/untieSign.vue
@@ -5,103 +5,81 @@
 			<custom-tabs type="c1" :value="tabsValue" @change="tabsChange">
 				<custom-tab-pane :label="item.name" v-for="(item,index) in tabsList" :name="'c1_'+index" :key="index">
 					<view></view>
-					<view class="container">
-						<table>
-							<tbody>
-								<tr>
-									<td class="h-l1r1">
-										<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
-										</image>
-									</td>
-									<td class="h-l1r2">&nbsp;</td>
-									<td class="h-l1r3">
-										<p>上海海通国际汽车码头有限公司</p>
-										<p>Shanghai HaiTong International Automotive Terminal Co.,Ltd.</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="3">
-										<p class="bh-dz">QR-7.5.1-01-11-M</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="3" class="h-l2r1">
-										<p class="name-dz">海通码头系解缆签证单</p>
-										<p class="ename-dz">MOONRING AND UNMOONRING RECORD</p>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-						<table id="t-main2">
-							<tbody>
-								<tr>
-									<td class="td1">
-										<p>船名：</p>
-										<p>Name of Ship&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{shipInfo.vslCnname}}</td>
-									<td class="td1">
-										<p>船舶净吨：</p>
-										<p>Net tonnage&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.shipDeadWeight}}</td>
-									<td class="td3">
-										<p>吨</p>
-										<p>Tons</p>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="6" class="tr0">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="td1">
-										<p>航次：</p>
-										<p>voy No&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.vvyName}}</td>
-									<td class="td1">
-										<p>泊位：</p>
-										<p>Berth&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.bthIdName}}</td>
-									<td class="td1">
-										<p>系缆时间：</p>
-										<p>Time of Moonring&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.attachTime}}</td>
-								</tr>
-								<tr>
-									<td colspan="6" class="tr0">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="td1">
-										<p>解缆时间：</p>
-										<p>Time of Unmoonring&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.unmoorTime}}</td>
-									<td class="td1">
-										<p>移泊时间：</p>
-										<p>Time of Shifting&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.shiftingBerthTime}}</td>
-									<td class="td1">
-										<p>停泊时间：</p>
-										<p>Time of Shifting&nbsp;&nbsp;</p>
-									</td>
-									<td class="td2">{{tableInfo.noProductBerthStTime}} -
+					<view style="padding: 16px; padding-bottom: 0; height: calc(100% - 66px);">
+						<view class="container">
+							<view class="head">
+								<view class="leftHead">
+									<image id="HT-logo" src="../../static/images/theme/logo.png" mode="widthFix">
+								</view>
+								<view class="rightHead">
+									<p>上海海通国际汽车码头有限公司</p>
+									<text>SHANGHAI HAITONG INTERNATIONAL AUTOMOTIVE TERMINAL CO. LTD.</text>
+								</view>
+							</view>
+							<view class="headTItle">
+								<view class="titleLeft"></view>
+								<view class="title">
+									<p>海通码头系解缆签证单</p>
+									<text>MOONRING AND UNMOONRING RECORD</text>
+								</view>
+								<view class="titleRight">
+									<view>
+										<text>编号/N0:</text>
+										<text>QR-7.5.1-01-05-M</text>
+									</view>
+								</view>
+							</view>
+							<view class="ul">
+								<view class="li">
+									<p>船名/Name of Ship:</p>
+									<p>{{shipInfo.vslCnname}}</p>
+								</view>
+								<view class="li">
+									<p>船舶净吨/Net tonnage:</p>
+									<p>{{tableInfo.shipDeadWeight}}吨</p>
+								</view>
+								<view class="li">
+									<p>航次/voy No:</p>
+									<p>{{tableInfo.vvyName}}</p>
+								</view>
+								<view class="li">
+									<p>泊位/Berth:</p>
+									<p>{{tableInfo.bthIdName}}</p>
+								</view>
+								<view class="li">
+									<p>系缆时间/Time of Moonring:</p>
+									<p>{{tableInfo.attachTime}}</p>
+								</view>
+								<view class="li">
+									<p>解缆时间/Time of Unmoonring:</p>
+									<p>{{tableInfo.unmoorTime}}</p>
+								</view>
+								<view class="li">
+									<p>移泊时间/Time of Shifting:</p>
+									<p>{{tableInfo.shiftingBerthTime}}</p>
+								</view>
+								<view class="li">
+									<p>停泊时间/Time of Shifting:</p>
+									<p>{{tableInfo.noProductBerthStTime}} -
 										{{tableInfo.noProductBerthEdTime}}
-									</td>
-								</tr>
-							</tbody>
-						</table>
-						<view class="sginBox">
-							<view class="box">
-								<p>Capt/Chief Mate(船长/大副):</p>
-								<p class="sign" @click="togoSign('1')" v-if="czSign.signFile == ''">点击签名</p>
-								<template v-else>
-									<image :src="czSign.signFile" mode="widthFix"></image>
-									<!-- <text class="del" @click="delSign(czSign.webId)">删除</text> -->
-								</template>
+									</p>
+								</view>
+							</view>
+
+						</view>
+					</view>
+					<view class="signBox">
+						<view class="signContent">
+							<view class="signTitle">
+								<p>船长/大副:</p>
+								<p>Capt/Chief Mate:</p>
+							</view>
+							<view class="signInfo" v-if="czSign.signFile == ''" @click="togoSign('1')">
+								去签名
+							</view>
+							<view class="signImg" v-else>
+								<image :src="czSign.signFile"></image>
+								<!-- <text class="del" @click="delSign(czSign.id)">删除</text> -->
 							</view>
 						</view>
 					</view>
@@ -235,32 +213,199 @@
 <style lang="less" scoped>
 	@import "../../style/css/main-dz.css";
 
-	.container {
-		padding: 0px 20px;
+	.contentFixed {
+		margin-top: 68px !important;
+
+		/deep/.tab .tab-bar {
+			height: 66px;
+			line-height: 66px;
+			position: relative;
+		}
+
+		/deep/.tab .tab-bar-item {
+			height: 66px;
+			line-height: 66px;
+			font-size: 18px;
+			color: #23262E;
+			font-weight: bold;
+			font-family: PingFangSC-Semibold;
+			padding: 0 24px !important;
+		}
+
+		/deep/.tab .tab-bar-item.active {
+			color: #0067CF
+		}
+
+		/deep/.tab .tab-bar-item .active-line {
+			color: #0067CF;
+			width: 54px;
+			height: 4px;
+		}
+
+		/deep/.tab-pane {
+			width: 100%;
+			height: calc(100vh - 66px - 68px);
+			overflow: hidden;
+		}
+
+		/deep/.tab .tab-cont {
+			padding-bottom: 0;
+		}
 	}
 
-	.sginBox {
-		width: 100%;
-		display: flex;
-		justify-content: flex-end;
+	.container {
+		padding: 0px 16px;
+		background: #FFFFFF;
+		border-radius: 8px;
 
-		.box {
+		.head {
+			height: 85px;
+			padding: 16px 0;
+			margin: 0 8px;
+			border-bottom: 1px solid #999;
 			display: flex;
-			margin-right: 80px;
+			justify-content: space-between;
 
-			image {
-				width: 200px;
-				height: 50px;
-			}
+			.rightHead {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				text-align: right;
 
-			.del {
-				color: red;
+				p {
+					font-size: 22px;
+					color: #0052A4;
+					font-weight: bold;
+				}
+
+				text {
+					font-size: 14px;
+					color: #666666;
+				}
 			}
 		}
 
-		.sign {
-			color: #2979ff;
-			margin-left: 10px;
+		.headTItle {
+			display: flex;
+			justify-content: space-around;
+			padding: 24px 0;
+			margin: 0 8px;
+			border-bottom: 1px solid #EEEEEE;
+
+			.title {
+				flex: 3;
+				text-align: center;
+
+				p {
+					font-size: 24px;
+					color: #23262E;
+					font-weight: bold;
+				}
+
+				text {
+					font-size: 18px;
+					color: #23262E;
+				}
+			}
+
+			.titleLeft {
+				flex: 1;
+			}
+
+			.titleRight {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: flex-end;
+
+				text:first-child {
+					font-size: 14px;
+					color: #666666;
+				}
+
+				text:last-child {
+					font-size: 18px;
+					color: #0052A4;
+					font-weight: bold;
+				}
+			}
+		}
+
+		.ul {
+			display: flex;
+			flex-wrap: wrap;
+			padding: 15px 0;
+
+			.li {
+				min-width: 33%;
+				display: flex;
+				justify-content: center;
+				margin-bottom: 24px;
+
+				p {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+				}
+
+				p:last-child {
+					color: #23262E;
+					font-weight: bold;
+					font-size: 14px;
+					margin-left: 8px;
+				}
+			}
+		}
+
+	}
+
+	.signBox {
+		width: 100%;
+		height: 66px;
+		background: #FFFFFF;
+		border: 1px solid #E1E5ED;
+		box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.05);
+		display: flex;
+		justify-content: flex-end;
+		padding: 0 70px;
+
+		.row {
+			width: 1px;
+			height: 30px;
+			background-color: #ccc;
+			margin-top: 18px;
+		}
+
+		.signContent {
+			display: flex;
+			margin: 0 54px;
+
+			.signTitle {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				text-align: right;
+			}
+
+			.signInfo {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				font-size: 18px;
+				color: #0052A4;
+				margin-left: 16px;
+			}
+
+			.signImg {
+				width: 100px;
+				height: 54px;
+				margin-top: 5px;
+				margin-left: 10px;
+			}
+		}
+
+		.signContent:last-child {
+			margin-right: 0;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/static/images/ship-shplit-right.svg b/static/images/ship-shplit-right.svg
new file mode 100644
index 0000000..fa07a3e
--- /dev/null
+++ b/static/images/ship-shplit-right.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="660px" height="107px" viewBox="0 0 660 107" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 57备份 6</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-57备份-13" transform="translate(0.542848, 0.871262)">
+            <g id="编组-57备份-6" transform="translate(329.603365, 52.869091) rotate(-180.000000) translate(-329.603365, -52.869091) translate(0.000000, 0.000000)">
+                <g id="Fill-1">
+                    <g id="path-1-link" fill="#000000" fill-rule="nonzero">
+                        <path d="M544.206439,0 L23.6338245,0 C10.5813268,0 0,7.9295741 0,17.711046 L0,88.0271348 C0,97.8087522 10.5813268,105.738181 23.6338245,105.738181 L544.206439,105.738181 C544.206439,105.738181 612.030504,102.003389 656.813611,81.2339326 C656.813611,81.2339326 659.035659,79.5499659 659.206731,78.4272729 L659.206731,70.849277 L657.66839,70.849277 L657.66839,35.0639652 L659.206731,35.0639652 L659.206731,27.3456873 C659.206731,27.3456873 658.522878,25.2405834 654.762489,23.4163346 C654.762489,23.4163346 605.023669,3.91319993 544.206439,0" id="path-1"></path>
+                    </g>
+                    <g id="path-1-link" fill="#999999">
+                        <path d="M544.206439,0 L23.6338245,0 C10.5813268,0 0,7.9295741 0,17.711046 L0,88.0271348 C0,97.8087522 10.5813268,105.738181 23.6338245,105.738181 L544.206439,105.738181 C544.206439,105.738181 612.030504,102.003389 656.813611,81.2339326 C656.813611,81.2339326 659.035659,79.5499659 659.206731,78.4272729 L659.206731,70.849277 L657.66839,70.849277 L657.66839,35.0639652 L659.206731,35.0639652 L659.206731,27.3456873 C659.206731,27.3456873 658.522878,25.2405834 654.762489,23.4163346 C654.762489,23.4163346 605.023669,3.91319993 544.206439,0" id="path-1"></path>
+                    </g>
+                </g>
+                <path d="M25.2916015,2.53110154 C12.8764455,2.53110154 2.81211408,10.4600936 2.81211408,20.2408378 L2.81211408,85.4025798 C2.48072543,97.0181958 12.8764455,103.112316 25.2916015,103.112316 L542.290306,103.112316 C542.290306,103.112316 609.525139,99.5597167 653.919154,79.8032303 C653.919154,79.8032303 656.121871,78.2013373 656.29149,77.1333601 L656.29149,69.9249871 L654.766375,69.9249871 L654.766375,35.8850518 L656.29149,35.8850518 L656.29149,28.5430907 C656.29149,28.5430907 655.613596,26.5407244 651.88591,24.8053889 C651.88591,24.8053889 602.579204,6.2535237 542.290306,2.53110154 L25.2916015,2.53110154 Z" id="Fill-3" fill="#FFFFFF" fill-rule="nonzero"></path>
+                <path d="M9.27302882,77.5797015 C12.6123508,78.2485151 14.8300386,79.8838779 15.6865619,82.3086911 C15.687434,82.3086911 16.1210008,83.1837077 16.6789837,83.1904016 C17.0103724,83.1906927 17.3285346,82.8948489 17.6365225,82.300833 C17.6699521,82.2123563 17.9740157,81.4726741 18.8995784,81.1104728 C19.9748473,80.6894811 21.41726,80.947926 23.1868464,81.878095 C27.1982478,83.9866915 27.2148173,87.4307323 27.1745564,88.1235569 L33.5694853,88.1235569 L33.5694853,103.328007 L33.3514664,103.328007 L33.351103,98.3159731 L26.9473808,98.3166343 L26.947103,88.3409731 L26.9322648,88.3418381 L26.9483982,88.2184364 C26.9497063,88.2088321 27.069326,87.2389359 26.6537821,86.0027367 C26.270941,84.8635998 25.3410179,83.2569046 23.0855403,82.0713466 C21.3774353,81.1734833 19.9975213,80.9178032 18.9841697,81.3117281 C18.1118036,81.650646 17.8417509,82.374612 17.8389894,82.381888 C17.4857988,83.0675821 17.0996148,83.4086828 16.6852336,83.4086828 L16.6759315,83.4085373 L16.6759315,83.4085373 C15.9829222,83.4000971 15.5057517,82.433839 15.4858393,82.3928021 C13.4717811,76.6930433 4.56629258,77.5053404 4.47646882,77.5143627 L4.45510297,77.2972456 C4.46499134,77.2962367 4.89993668,77.2547586 5.59383089,77.2489731 L5.93187181,77.2489731 C6.81991708,77.257191 8.01869372,77.3283871 9.27302882,77.5797015 Z M33.351103,97.1269731 L27.165103,97.1269731 L27.1653996,98.0983531 L33.351103,98.0979731 L33.351103,97.1269731 Z M33.351103,96.1079731 L27.165103,96.1079731 L27.165103,96.9089731 L33.351103,96.9089731 L33.351103,96.1079731 Z M33.351103,94.7289731 L27.165103,94.7289731 L27.165103,95.8899731 L33.351103,95.8899731 L33.351103,94.7289731 Z M33.351103,93.4309731 L27.165103,93.4309731 L27.165103,94.5109731 L33.351103,94.5109731 L33.351103,93.4309731 Z M33.351103,92.2329731 L27.165103,92.2329731 L27.165103,93.2129731 L33.351103,93.2129731 L33.351103,92.2329731 Z M14.1768396,89.5376989 L14.1768396,92.609061 L9.81777072,92.609061 L9.81777072,89.5376989 L14.1768396,89.5376989 Z M10.910103,89.7559731 L10.0357896,89.7559731 L10.0357896,92.3907798 L10.910103,92.3899731 L10.910103,89.7559731 Z M12.818103,89.7559731 L11.128103,89.7559731 L11.128103,92.3899731 L12.818103,92.3899731 L12.818103,89.7559731 Z M13.9588207,89.7559731 L13.036103,89.7559731 L13.036103,92.3899731 L13.9588207,92.3907798 L13.9588207,89.7559731 Z M33.351103,91.0139731 L27.165103,91.0139731 L27.165103,92.0139731 L33.351103,92.0139731 L33.351103,91.0139731 Z M21.3003874,90.4169356 L21.3003874,91.7985101 L17.629386,91.7985101 L17.629386,90.4169356 L21.3003874,90.4169356 Z M21.0823686,90.6352168 L17.8474049,90.6352168 L17.8474049,91.5802289 L21.0823686,91.5802289 L21.0823686,90.6352168 Z M33.351103,89.7559731 L27.165103,89.7559731 L27.165103,90.7959731 L33.351103,90.7959731 L33.351103,89.7559731 Z M33.3514664,88.3418381 L27.165103,88.3409731 L27.165103,89.5369731 L33.351103,89.5369731 L33.3514664,88.3418381 Z M19.5119061,84.3578859 L19.5119061,86.0013979 L18.511103,86.0009731 L18.5120717,87.2322128 L17.0647172,87.2322128 L17.064103,86.0009731 L15.9645941,86.0013979 L15.9645941,84.3578859 L19.5119061,84.3578859 Z M18.2939075,86.0013979 L17.2825907,86.0013979 L17.2825907,87.0139316 L18.2939075,87.0139316 L18.2939075,86.0013979 Z M19.2940326,84.5761671 L16.1827583,84.5761671 L16.1827583,85.7831167 L19.2940326,85.7831167 L19.2940326,84.5761671 Z" id="形状结合" fill="#2D2D2D" fill-rule="nonzero"></path>
+                <path d="M22.4236932,90.9115899 C22.4236932,92.5818777 21.0712496,93.9359488 19.4029694,93.9359488 C17.7346891,93.9359488 16.3822456,92.5818777 16.3822456,90.9115899 C16.3822456,89.2413022 17.7346891,87.8872311 19.4029694,87.8872311 C21.0712496,87.8872311 22.4236932,89.2413022 22.4236932,90.9115899" id="Fill-17" fill="#C3C3C3" fill-rule="nonzero"></path>
+                <path d="M33.1297413,2.54287418 L33.1297413,17.7474698 L26.7348124,17.7474698 C26.7749279,18.4401488 26.7583585,21.8841897 22.7471023,23.9927861 C20.977516,24.9229551 19.5351033,25.1812545 18.4598344,24.7604084 C17.5342717,24.3983526 17.2302081,23.6586704 17.1967785,23.5700482 C16.8887905,22.9760323 16.5671401,22.6835355 16.2392397,22.6804795 C15.6805301,22.6871735 15.2463819,23.5648095 15.2420215,23.5736862 C14.3902946,25.9871487 12.1726068,27.622366 8.83328481,28.2913252 C7.49348631,28.5596655 6.21705863,28.622676 5.31489664,28.622676 C4.52784859,28.622676 4.02596921,28.5747997 4.01535895,28.5736355 L4.03687015,28.3565185 C4.12669391,28.3653952 13.0320371,29.1779834 15.0412988,23.4895752 C15.0660076,23.4370422 15.5431782,22.4709296 16.2361875,22.4623438 L16.2456349,22.4621983 L16.2456349,22.4621983 C16.6598708,22.4621983 17.0459095,22.8031536 17.3934315,23.4757507 C17.4018616,23.4962692 17.6720596,24.2202352 18.5444257,24.5591531 C19.5579226,24.9526414 20.9376912,24.6971068 22.6456509,23.799389 C24.9012739,22.6139765 25.8310516,21.0071358 26.2140381,19.8681445 C26.6294366,18.6319453 26.509817,17.6621946 26.5085089,17.6524447 L26.4925208,17.5293341 L26.507359,17.5288742 L26.5076513,7.55411588 L32.911359,7.55387418 L32.9117224,2.54287418 L33.1297413,2.54287418 Z M18.072255,18.6387993 L18.071359,19.8688742 L19.0720894,19.8694687 L19.0720894,21.5129807 L15.5249228,21.5129807 L15.5249228,19.8694687 L16.624359,19.8688742 L16.6249005,18.6387993 L18.072255,18.6387993 Z M16.624359,20.0868742 L15.7429416,20.0877499 L15.7429416,21.2946995 L18.8540706,21.2946995 L18.8540706,20.0877499 L18.071359,20.0868742 L18.072255,20.0878954 L16.6249005,20.0878954 L16.624359,20.0868742 Z M17.8542361,18.8570805 L16.8429194,18.8570805 L16.8429194,19.8696142 L17.8542361,19.8696142 L17.8542361,18.8570805 Z M32.911359,16.3328742 L26.725359,16.3328742 L26.725359,17.5288742 L32.9117224,17.5291886 L32.911359,16.3328742 Z M13.7370229,13.2618056 L13.7370229,16.3333132 L9.37795403,16.3333132 L9.37795403,13.2618056 L13.7370229,13.2618056 Z M32.911359,15.0738742 L26.725359,15.0738742 L26.725359,16.1148742 L32.911359,16.1148742 L32.911359,15.0738742 Z M10.470359,13.4798742 L9.59611822,13.4800868 L9.59611822,16.115032 L10.470359,16.1148742 L10.470359,13.4798742 Z M12.378359,13.4798742 L10.688359,13.4798742 L10.688359,16.1148742 L12.378359,16.1148742 L12.378359,13.4798742 Z M13.5191494,13.4800868 L12.596359,13.4798742 L12.596359,16.1148742 L13.5191494,16.115032 L13.5191494,13.4800868 Z M20.8605707,14.0723565 L20.8605707,15.4540765 L17.1895694,15.4540765 L17.1895694,14.0723565 L20.8605707,14.0723565 Z M20.6425519,14.2906377 L17.4075882,14.2906377 L17.4075882,15.2357953 L20.6425519,15.2357953 L20.6425519,14.2906377 Z M32.911359,13.8558742 L26.725359,13.8558742 L26.725359,14.8558742 L32.911359,14.8558742 L32.911359,13.8558742 Z M32.911359,12.6568742 L26.725359,12.6568742 L26.725359,13.6368742 L32.911359,13.6368742 L32.911359,12.6568742 Z M32.911359,11.3588742 L26.725359,11.3588742 L26.725359,12.4388742 L32.911359,12.4388742 L32.911359,11.3588742 Z M32.911359,9.97987418 L26.725359,9.97987418 L26.725359,11.1408742 L32.911359,11.1408742 L32.911359,9.97987418 Z M32.911359,8.96087418 L26.725359,8.96087418 L26.725359,9.76187418 L32.911359,9.76187418 L32.911359,8.96087418 Z M32.911359,7.77187418 L26.7256702,7.77239708 L26.725359,8.74287418 L32.911359,8.74287418 L32.911359,7.77187418 Z" id="形状结合" fill="#2D2D2D" fill-rule="nonzero"></path>
+                <path d="M21.9839201,14.9592476 C21.9839201,13.2889598 20.6314765,11.9348887 18.9631963,11.9348887 C17.2949161,11.9348887 15.9424725,13.2889598 15.9424725,14.9592476 C15.9424725,16.6295353 17.2949161,17.9836064 18.9631963,17.9836064 C20.6314765,17.9836064 21.9839201,16.6295353 21.9839201,14.9592476" id="Fill-33" fill="#C3C3C3" fill-rule="nonzero"></path>
+                <path d="M609.197804,12.0230598 L609.186516,18.2957687 L612.785516,18.2957687 L611.429227,17.6143474 L613.428169,13.0075953 L613.62802,13.0946167 L612.710516,15.2077687 L614.010516,15.8417687 L615.219499,13.4299112 L615.414553,13.5277012 L614.207516,15.9367687 L615.662516,16.6457687 L617.171262,13.9013841 L617.362392,14.0064501 L615.858516,16.7407687 L617.688516,17.6327687 L619.416406,14.4603877 L619.607681,14.5647261 L617.885516,17.7287687 L619.555516,18.5427687 L621.484096,14.9860088 L621.675808,15.0900562 L619.751516,18.6387687 L621.303516,19.3947687 L623.831898,15.585962 L624.01358,15.7067443 L621.501516,19.4907687 L623.137516,20.2877687 L626.512541,16.20655 L626.680561,16.3458134 L623.208516,20.5447687 L623.208516,22.7357687 L628.079516,19.9767687 L628.07998,16.7892299 L628.297999,16.7892299 L628.298032,33.3477269 C628.792388,33.4575794 629.295307,33.5641253 629.806686,33.6673388 L629.807722,31.1901869 L629.900598,31.1762169 C629.921091,31.1731609 631.984567,30.8941976 632.693274,33.404868 L632.697343,33.4345542 L632.696131,34.1999407 C633.023486,34.2548688 633.353859,34.3085641 633.687228,34.361021 L633.687585,27.0317989 L641.678557,27.0317989 L641.679148,35.3267759 C647.022063,35.79775 651.693248,35.8935647 654.378239,35.9010125 L655.103868,35.9009424 C656.159769,35.8976982 656.764782,35.8815538 656.789429,35.8807589 L656.795679,36.0990401 C656.77144,36.0996821 656.187746,36.115279 655.167206,36.11894 L654.735982,36.1197041 C651.151171,36.1197041 643.369352,35.965452 635.248295,34.8149646 C628.763542,33.8962917 623.333274,32.5311611 619.108796,30.7575535 C613.845826,28.548023 610.444986,25.6925698 608.999349,22.2692507 L608.96278,22.2695433 L608.962516,19.8597687 L594.697516,19.8604464 L594.697516,13.1811871 L608.977516,13.1807687 L608.979785,12.0227687 L609.197804,12.0230598 Z M641.460538,27.2500801 L633.905604,27.2500801 L633.905199,34.3950768 C634.356725,34.4651223 634.813696,34.5329112 635.276056,34.5984296 C637.383262,34.8970339 639.46764,35.1284454 641.461557,35.3074203 L641.460538,27.2500801 Z M630.025741,31.3834385 L630.024673,33.711032 C630.822443,33.8698298 631.640577,34.0205842 632.478694,34.1631992 L632.479325,33.4496884 C631.89736,31.4126882 630.415994,31.3616104 630.025741,31.3834385 Z M628.079516,26.0497687 L625.730516,26.0497687 L625.730624,32.7273328 C626.49008,32.9265874 627.273021,33.1170848 628.078998,33.2987118 L628.079516,26.0497687 Z M625.512516,29.0347687 L625.61987,29.0353876 C622.774843,28.9730281 621.891876,31.0362851 621.724241,31.5203271 C622.910604,31.9300254 624.174235,32.313481 625.511715,32.6694833 L625.512516,29.0347687 Z M613.038516,18.4227687 L613.038715,22.2695433 L609.237516,22.2687687 L609.310414,22.4360859 C609.768525,23.4433129 610.402617,24.400136 611.210172,25.3044546 L612.867614,23.1756577 C613.23374,22.9214329 613.630098,22.7340021 614.045206,22.6186041 C615.934267,22.0934195 617.644697,23.1992321 618.124339,23.5506648 C618.561103,23.9568134 618.912259,24.4163681 619.177806,24.9249633 C619.530996,25.6022171 619.725905,26.3676565 619.741166,27.1387713 L619.741748,27.1738418 L617.829481,29.9496235 C618.2686,30.1567728 618.722774,30.3588709 619.191933,30.5558617 C619.930826,30.8660722 620.706885,31.1637579 621.519292,31.448713 C621.705812,30.9348415 622.649718,28.8062631 625.511574,28.8156308 L625.512516,26.0497687 L621.326411,26.0503339 L621.326411,22.5873753 L613.038516,18.4227687 Z M637.792139,28.5685568 L637.792139,30.1315958 L635.341607,30.1315958 L635.341607,28.5685568 L637.792139,28.5685568 Z M637.573975,28.786838 L635.55948,28.786838 L635.55948,29.9133146 L637.573975,29.9133146 L637.573975,28.786838 Z M612.900516,23.4787687 L611.359023,25.4684178 C612.874562,27.1108099 614.969906,28.5771237 617.629647,29.8545065 L619.451516,27.2097687 L617.655516,26.7837687 L613.742334,26.7840352 L613.741516,25.4947687 L612.900516,23.4787687 Z M621.697261,28.3312124 L621.697261,29.6512121 L619.523031,29.6512121 L619.523031,28.3312124 L621.697261,28.3312124 Z M621.479242,28.5733253 L619.74105,28.5733253 L619.74105,29.4090992 L621.479242,29.4090992 L621.479242,28.5733253 Z M618.57726,24.3779735 L617.777516,25.5097687 L617.777516,26.5887687 L619.515516,27.0007687 L619.507174,26.8364265 C619.453956,26.2039888 619.275478,25.5836814 618.984496,25.0261003 C618.866198,24.7995194 618.73016,24.5830658 618.57726,24.3779735 Z M617.559699,25.5843617 L613.960353,25.5843617 L613.960353,26.565754 L617.559699,26.565754 L617.559699,25.5843617 Z M628.079516,23.4077687 L625.730516,24.0537687 L625.730516,25.8317687 L628.079516,25.8317687 L628.079516,23.4077687 Z M622.990516,24.8067687 L621.543516,25.2047687 L621.544429,25.8320527 L622.990516,25.8317687 L622.990516,24.8067687 Z M625.512516,24.1137687 L623.208516,24.7467687 L623.208516,25.8317687 L625.512516,25.8317687 L625.512516,24.1137687 Z M614.103635,22.8290272 C613.73935,22.9302553 613.390174,23.0904398 613.064627,23.3055588 L613.923516,25.3657687 L617.611516,25.3657687 L618.436932,24.1986927 C618.298317,24.0299065 618.147669,23.8696204 617.985533,23.7185958 C617.535978,23.3901554 615.896913,22.3303274 614.103635,22.8290272 Z M622.990516,23.1097687 L621.543516,23.9297687 L621.543516,24.9787687 L622.990516,24.5807687 L622.990516,23.1097687 Z M628.079516,20.2277687 L623.208516,22.9867687 L623.208516,24.5207687 L625.512516,23.8877687 L625.513317,23.8659065 L625.591516,23.8657687 L628.079516,23.1817687 L628.079516,20.2277687 Z M622.990516,20.8087687 L621.543516,22.5587687 L621.543516,23.6787687 L622.990516,22.8587687 L622.990516,20.8087687 Z M621.379516,19.6737687 L620.037516,21.6957687 L621.405516,22.3827687 L622.990516,20.4657687 L622.991377,20.4592791 L621.379516,19.6737687 Z M612.820696,18.5149611 L609.186516,18.5147687 L609.180799,22.0512621 L612.820696,22.0512621 L612.820696,18.5149611 Z M619.647516,18.8297687 L618.510516,20.9277687 L619.841516,21.5967687 L621.182516,19.5777687 L619.647516,18.8297687 Z M617.780516,17.9207687 L616.652516,19.9947687 L618.315516,20.8297687 L619.451516,18.7347687 L617.780516,17.9207687 Z M615.752516,16.9327687 L614.628516,18.9777687 L616.456516,19.8957687 L617.584516,17.8247687 L615.752516,16.9327687 Z M607.366516,16.6297687 L606.062516,16.6297687 L606.062516,19.6417687 L607.366516,19.6417687 L607.366516,16.6297687 Z M605.844516,16.6297687 L604.801516,16.6297687 L604.801516,19.6417687 L605.844516,19.6417687 L605.844516,16.6297687 Z M608.962516,16.6297687 L607.584516,16.6297687 L607.584516,19.6417687 L608.96278,19.6421652 L608.962516,16.6297687 Z M595.854516,16.6297687 L594.915516,16.6297687 L594.915535,19.6421652 L595.854516,19.6417687 L595.854516,16.6297687 Z M597.139516,16.6297687 L596.072516,16.6297687 L596.072516,19.6417687 L597.139516,19.6417687 L597.139516,16.6297687 Z M598.375516,16.6297687 L597.357516,16.6297687 L597.357516,19.6417687 L598.375516,19.6417687 L598.375516,16.6297687 Z M599.755516,16.6297687 L598.594516,16.6297687 L598.594516,19.6417687 L599.755516,19.6417687 L599.755516,16.6297687 Z M601.135516,16.6297687 L599.973516,16.6297687 L599.973516,19.6417687 L601.135516,19.6417687 L601.135516,16.6297687 Z M602.229516,16.6297687 L601.353516,16.6297687 L601.353516,19.6417687 L602.229516,19.6417687 L602.229516,16.6297687 Z M603.323516,16.6297687 L602.447516,16.6297687 L602.447516,19.6417687 L603.323516,19.6417687 L603.323516,16.6297687 Z M604.583516,16.6297687 L603.541516,16.6297687 L603.541516,19.6417687 L604.583516,19.6417687 L604.583516,16.6297687 Z M614.109516,16.1317687 L613.075516,18.1977687 L614.433516,18.8797687 L615.556516,16.8367687 L614.109516,16.1317687 Z M612.623516,15.4077687 L611.711489,17.5120463 L612.880516,18.0997687 L613.913516,16.0357687 L612.623516,15.4077687 Z M595.854516,13.3987687 L594.915535,13.3994683 L594.915516,16.4107687 L595.854516,16.4107687 L595.854516,13.3987687 Z M597.139516,13.3987687 L596.072516,13.3987687 L596.072516,16.4107687 L597.139516,16.4107687 L597.139516,13.3987687 Z M598.375516,13.3987687 L597.357516,13.3987687 L597.357516,16.4107687 L598.375516,16.4107687 L598.375516,13.3987687 Z M599.755516,13.3987687 L598.594516,13.3987687 L598.594516,16.4107687 L599.755516,16.4107687 L599.755516,13.3987687 Z M601.135516,13.3987687 L599.973516,13.3987687 L599.973516,16.4107687 L601.135516,16.4107687 L601.135516,13.3987687 Z M602.229516,13.3987687 L601.353516,13.3987687 L601.353516,16.4107687 L602.229516,16.4107687 L602.229516,13.3987687 Z M603.323516,13.3987687 L602.447516,13.3987687 L602.447516,16.4107687 L603.323516,16.4107687 L603.323516,13.3987687 Z M604.583516,13.3987687 L603.541516,13.3987687 L603.541516,16.4107687 L604.583516,16.4107687 L604.583516,13.3987687 Z M605.844516,13.3987687 L604.801516,13.3987687 L604.801516,16.4107687 L605.844516,16.4107687 L605.844516,13.3987687 Z M607.366516,13.3987687 L606.062516,13.3987687 L606.062516,16.4107687 L607.366516,16.4107687 L607.366516,13.3987687 Z M608.96278,13.3994683 L607.584516,13.3987687 L607.584516,16.4107687 L608.962516,16.4107687 L608.96278,13.3994683 Z" id="形状结合" fill="#2D2D2D" fill-rule="nonzero"></path>
+                <path d="M656.795679,69.7096891 L656.789429,69.9279703 C656.706108,69.9254035 650.009032,69.7478155 641.679049,70.4821101 L641.678557,78.7770467 L633.687585,78.7770467 L633.687228,71.447851 C633.35352,71.5003601 633.022814,71.5541099 632.695132,71.6090948 L632.693201,72.4041814 C632.324313,73.7109582 631.587264,74.2480755 631.033787,74.4685395 C630.663736,74.6159521 630.328714,74.6452018 630.120288,74.6452018 C629.989622,74.6452018 629.90881,74.6337056 629.900525,74.6325415 L629.807794,74.6185715 L629.806686,72.141509 C629.295307,72.2447182 628.792388,72.3512598 628.298032,72.4611082 L628.297999,89.6091496 L628.07998,89.6091496 L628.079516,85.830325 L623.208516,83.072325 L623.208516,85.238325 L627.043839,89.8228324 L626.876691,89.9629689 L623.153516,85.512325 L623.14806,85.5161006 L621.512516,86.312325 L624.356684,90.5583964 L624.175583,90.6800518 L621.314516,86.408325 L619.772516,87.159325 L621.996601,91.1812109 L621.805907,91.2870045 L619.576516,87.255325 L617.892516,88.076325 L619.887108,91.7130021 L619.696124,91.8182136 L617.696516,88.171325 L615.895516,89.049325 L617.715815,92.2421449 L617.526429,92.3504123 L615.699516,89.144325 L614.234516,89.858325 L615.710463,92.7229601 L615.516572,92.8229329 L614.038516,89.953325 L612.748516,90.582325 L613.90893,93.145116 L613.710533,93.2351934 L611.427875,88.1950803 L612.784516,87.512325 L609.183516,87.512325 L609.188211,94.2363474 L608.970192,94.2366384 L608.968516,92.627325 L594.697516,92.6278332 L594.697516,85.9484283 L608.962516,85.948325 L608.96278,83.5393314 L608.999516,83.539325 L609.102467,83.3035913 C610.602811,79.9849571 613.96718,77.2097585 619.108796,75.0511757 C623.333274,73.2777137 628.763542,71.912583 635.248295,70.9937647 C643.110491,69.879892 650.655039,69.7000892 654.380831,69.6897185 L655.107581,69.6897185 C656.165109,69.6929887 656.771032,69.709067 656.795679,69.7096891 Z M595.854516,89.396325 L594.915516,89.396325 L594.915535,92.409552 L595.854516,92.409325 L595.854516,89.396325 Z M597.139516,89.396325 L596.072516,89.396325 L596.072516,92.409325 L597.139516,92.409325 L597.139516,89.396325 Z M598.375516,89.396325 L597.357516,89.396325 L597.357516,92.409325 L598.375516,92.409325 L598.375516,89.396325 Z M599.755516,89.396325 L598.594516,89.396325 L598.594516,92.409325 L599.755516,92.409325 L599.755516,89.396325 Z M601.135516,89.396325 L599.973516,89.396325 L599.973516,92.409325 L601.135516,92.409325 L601.135516,89.396325 Z M602.229516,89.396325 L601.353516,89.396325 L601.353516,92.409325 L602.229516,92.409325 L602.229516,89.396325 Z M603.323516,89.396325 L602.447516,89.396325 L602.447516,92.409325 L603.323516,92.409325 L603.323516,89.396325 Z M604.583516,89.396325 L603.541516,89.396325 L603.541516,92.409325 L604.583516,92.409325 L604.583516,89.396325 Z M608.962516,89.396325 L607.584516,89.396325 L607.584516,92.409325 L608.96278,92.409552 L608.962516,89.396325 Z M607.366516,89.396325 L606.062516,89.396325 L606.062516,92.409325 L607.366516,92.409325 L607.366516,89.396325 Z M605.844516,89.396325 L604.801516,89.396325 L604.801516,92.409325 L605.844516,92.409325 L605.844516,89.396325 Z M612.881516,87.708325 L611.712899,88.2960718 L612.657516,90.382325 L613.938516,89.758325 L612.881516,87.708325 Z M614.435516,86.927325 L613.076516,87.610325 L614.134516,89.663325 L615.590516,88.954325 L614.435516,86.927325 Z M595.854516,86.166325 L594.915535,86.1667095 L594.915516,89.178325 L595.854516,89.178325 L595.854516,86.166325 Z M597.139516,86.166325 L596.072516,86.166325 L596.072516,89.178325 L597.139516,89.178325 L597.139516,86.166325 Z M598.375516,86.166325 L597.357516,86.166325 L597.357516,89.178325 L598.375516,89.178325 L598.375516,86.166325 Z M599.755516,86.166325 L598.594516,86.166325 L598.594516,89.178325 L599.755516,89.178325 L599.755516,86.166325 Z M601.135516,86.166325 L599.973516,86.166325 L599.973516,89.178325 L601.135516,89.178325 L601.135516,86.166325 Z M602.229516,86.166325 L601.353516,86.166325 L601.353516,89.178325 L602.229516,89.178325 L602.229516,86.166325 Z M603.323516,86.166325 L602.447516,86.166325 L602.447516,89.178325 L603.323516,89.178325 L603.323516,86.166325 Z M604.583516,86.166325 L603.541516,86.166325 L603.541516,89.178325 L604.583516,89.178325 L604.583516,86.166325 Z M605.844516,86.166325 L604.801516,86.166325 L604.801516,89.178325 L605.844516,89.178325 L605.844516,86.166325 Z M607.366516,86.166325 L606.062516,86.166325 L606.062516,89.178325 L607.366516,89.178325 L607.366516,86.166325 Z M608.96278,86.1667095 L607.584516,86.166325 L607.584516,89.178325 L608.962516,89.178325 L608.96278,86.1667095 Z M616.457516,85.911325 L614.630516,86.829325 L615.787516,88.858325 L617.591516,87.979325 L616.457516,85.911325 Z M618.316516,84.977325 L616.651516,85.813325 L617.787516,87.884325 L619.470516,87.064325 L618.316516,84.977325 Z M621.520118,74.3600808 L621.218572,74.4667691 C620.514877,74.7191429 619.839147,74.9812697 619.191933,75.2530131 C618.722774,75.4500039 618.2686,75.652102 617.829481,75.8592512 L619.741762,78.6349165 L619.741181,78.669987 C619.72592,79.4411018 619.531011,80.2065412 619.17782,80.883795 C618.911983,81.3928268 618.560972,81.852527 618.134091,82.2499443 C617.735844,82.5425867 616.528165,83.3291266 615.075142,83.3291266 C614.742445,83.3291266 614.397103,83.2880897 614.045221,83.1901542 C613.630403,83.0747562 613.234045,82.887471 612.867628,82.6333916 L612.843501,82.6106904 L611.210172,80.5044202 C610.358265,81.458405 609.699398,82.4708198 609.236527,83.5391987 L613.038715,83.5393314 L613.038516,87.385325 L621.326367,83.2214703 L621.326367,79.7585118 L625.512516,79.758325 L625.513162,76.9932311 C625.505502,76.9932646 625.497856,76.9932818 625.490222,76.9932818 C622.649666,76.9932818 621.706351,74.8728912 621.520118,74.3600808 Z M612.820696,83.7576126 L609.180799,83.7576126 L609.182516,87.293325 L612.820696,87.2940592 L612.820696,83.7576126 Z M619.842516,84.210325 L618.511516,84.879325 L619.666516,86.968325 L621.191516,86.225325 L619.842516,84.210325 Z M621.406516,83.424325 L620.038516,84.112325 L621.389516,86.129325 L622.991377,85.3496248 L622.990516,85.317325 L621.406516,83.424325 Z M623.208516,81.287325 L623.208516,82.821325 L628.079516,85.579325 L628.079516,82.626325 L625.591516,81.942325 L625.513317,81.9428227 L625.512516,81.920325 L623.208516,81.287325 Z M621.543516,82.129325 L621.543516,83.248325 L622.990516,84.978325 L622.990516,82.948325 L621.543516,82.129325 Z M617.611516,80.442325 L613.923516,80.442325 L613.064516,82.501325 L613.21404,82.5971686 C613.496313,82.7655304 613.794586,82.8938448 614.10365,82.9798767 C615.897073,83.4788675 617.535993,82.4186029 617.995431,82.0820133 C618.152831,81.935049 618.300451,81.777568 618.437112,81.6108227 L617.611516,80.442325 Z M621.543516,80.829325 L621.543516,81.878325 L622.990516,82.697325 L622.990516,81.227325 L621.543516,80.829325 Z M628.079516,79.976325 L625.730516,79.976325 L625.730516,81.754325 L628.079516,82.400325 L628.079516,79.976325 Z M611.359023,80.3404569 L612.900516,82.329325 L613.741516,80.313325 L613.742334,79.0248395 L617.655516,79.024325 L619.451516,78.598325 L617.630646,75.9538885 C614.970431,77.2313839 612.874752,78.6978592 611.359023,80.3404569 Z M625.512516,79.976325 L623.208516,79.976325 L623.208516,81.061325 L625.512516,81.694325 L625.512516,79.976325 Z M619.518243,78.806691 L617.777516,79.219325 L617.777516,80.298325 L618.57736,81.4312717 C618.72956,81.2266996 618.865877,81.0098063 618.984365,80.7826581 C619.300855,80.1764643 619.484236,79.4962615 619.518243,78.806691 Z M622.990516,79.976325 L621.544386,79.976793 L621.543516,80.603325 L622.990516,81.001325 L622.990516,79.976325 Z M617.559699,79.2431207 L613.960353,79.2431207 L613.960353,80.224513 L617.559699,80.224513 L617.559699,79.2431207 Z M625.730624,73.0814833 L625.730516,79.758325 L628.079516,79.758325 L628.078998,72.5101214 C627.273021,72.6917417 626.49008,72.8822329 625.730624,73.0814833 Z M635.276056,71.2104451 C634.813696,71.2759636 634.356725,71.3437517 633.905199,71.4137959 L633.905604,78.5587655 L641.460538,78.5587655 L641.460899,70.5015162 C639.467192,70.6804835 637.383043,70.9118757 635.276056,71.2104451 Z M621.697261,76.2875932 L621.697261,77.6075929 L619.523031,77.6075929 L619.523031,76.2875932 L621.697261,76.2875932 Z M621.479242,76.5297061 L619.74105,76.5297061 L619.74105,77.36548 L621.479242,77.36548 L621.479242,76.5297061 Z M637.792139,75.6774245 L637.792139,77.2403179 L635.341607,77.2403179 L635.341607,75.6774245 L637.792139,75.6774245 Z M637.573975,75.8957057 L635.55948,75.8957057 L635.55948,77.0220367 L637.573975,77.0220367 L637.573975,75.8957057 Z M621.751579,74.2793197 L621.724072,74.2874664 C621.889565,74.763373 622.754954,76.7820735 625.511547,76.7747386 L625.511715,73.1393316 C624.184841,73.4925039 622.93065,73.872702 621.751579,74.2793197 Z M630.024673,72.0978176 L630.025813,74.4253198 C630.415631,74.4465659 631.897432,74.3959246 632.479252,72.3592155 L632.478694,71.6456674 C631.640577,71.7882778 630.822443,71.9390262 630.024673,72.0978176 Z" id="形状结合" fill="#2D2D2D" fill-rule="nonzero"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file