From 49baa9bc22969d0559ecb9964b81889e9329e4c3 Mon Sep 17 00:00:00 2001 From: Panzihang <819652404@qq.com> Date: Fri, 18 Aug 2023 17:28:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/createDataTable.js | 8 + common/util.js | 2 - components/head-info/head-info.vue | 231 +++++++--- components/sider-bar/slider-bar.vue | 9 +- pages/discharge/index.vue | 17 +- pages/index/index.vue | 18 +- pages/index/instruct.vue | 677 +++++++++++++++++++++++----- pages/login/index.vue | 1 - pages/monitor/index.vue | 43 +- pages/quality/details.vue | 2 +- pages/quality/edit.vue | 408 ++++++++++------- pages/quality/index.vue | 25 +- pages/shipWork/documentList.vue | 134 ++++-- pages/shipWork/index.vue | 241 +++++++--- pages/shipWork/patrolAdd.vue | 46 +- pages/shipWork/shiftAdd.vue | 72 ++- pages/shipWork/sign.vue | 9 +- static/images/ship.png | Bin 0 -> 1432 bytes static/images/shipWork/aqxj.png | Bin 0 -> 3183 bytes static/images/shipWork/cbjh.png | Bin 0 -> 3975 bytes static/images/shipWork/cbzl.png | Bin 0 -> 3450 bytes static/images/shipWork/gj.png | Bin 0 -> 3141 bytes static/images/shipWork/mafiqd.png | Bin 0 -> 3693 bytes static/images/shipWork/qtzy.png | Bin 0 -> 833 bytes static/images/shipWork/tzd.png | Bin 0 -> 2601 bytes static/images/shipWork/yczk.png | Bin 0 -> 3317 bytes static/images/shipWork/zlyj.png | Bin 0 -> 4174 bytes static/images/shipWork/zxzyd.png | Bin 0 -> 3717 bytes static/images/shipWork/zybz.png | Bin 0 -> 3464 bytes static/images/shipWork/zycx.png | Bin 0 -> 4019 bytes static/images/shipWork/zydz.png | Bin 0 -> 908 bytes static/images/theme/cbIcon1-1.png | Bin 0 -> 659 bytes static/images/theme/cbIcon1-2.png | Bin 0 -> 845 bytes static/images/theme/dakaH.png | Bin 1063 -> 0 bytes static/images/theme/dakaH_a.png | Bin 1753 -> 0 bytes static/images/theme/icon_home.png | Bin 1569 -> 0 bytes static/images/theme/icon_home_a.png | Bin 1061 -> 0 bytes static/images/theme/icon_mine.png | Bin 2643 -> 0 bytes static/images/theme/logo.png | Bin 0 -> 26958 bytes static/images/theme/mine.png | Bin 1891 -> 0 bytes static/images/theme/mine_a.png | Bin 1548 -> 0 bytes static/images/theme/tjHui.png | Bin 1706 -> 0 bytes static/images/theme/tongJ.png | Bin 1389 -> 0 bytes static/images/theme/xcIcon1-1.png | Bin 0 -> 911 bytes static/images/theme/xcIcon1-2.png | Bin 0 -> 1194 bytes static/images/theme/xiaoxi.png | Bin 2039 -> 0 bytes static/images/theme/xiaoxi_a.png | Bin 1364 -> 0 bytes static/images/theme/zcIcon1-1.png | Bin 0 -> 783 bytes static/images/theme/zcIcon1-2.png | Bin 0 -> 1237 bytes 49 files changed, 1415 insertions(+), 528 deletions(-) create mode 100644 static/images/ship.png create mode 100644 static/images/shipWork/aqxj.png create mode 100644 static/images/shipWork/cbjh.png create mode 100644 static/images/shipWork/cbzl.png create mode 100644 static/images/shipWork/gj.png create mode 100644 static/images/shipWork/mafiqd.png create mode 100644 static/images/shipWork/qtzy.png create mode 100644 static/images/shipWork/tzd.png create mode 100644 static/images/shipWork/yczk.png create mode 100644 static/images/shipWork/zlyj.png create mode 100644 static/images/shipWork/zxzyd.png create mode 100644 static/images/shipWork/zybz.png create mode 100644 static/images/shipWork/zycx.png create mode 100644 static/images/shipWork/zydz.png create mode 100644 static/images/theme/cbIcon1-1.png create mode 100644 static/images/theme/cbIcon1-2.png delete mode 100644 static/images/theme/dakaH.png delete mode 100644 static/images/theme/dakaH_a.png delete mode 100644 static/images/theme/icon_home.png delete mode 100644 static/images/theme/icon_home_a.png delete mode 100644 static/images/theme/icon_mine.png create mode 100644 static/images/theme/logo.png delete mode 100644 static/images/theme/mine.png delete mode 100644 static/images/theme/mine_a.png delete mode 100644 static/images/theme/tjHui.png delete mode 100644 static/images/theme/tongJ.png create mode 100644 static/images/theme/xcIcon1-1.png create mode 100644 static/images/theme/xcIcon1-2.png delete mode 100644 static/images/theme/xiaoxi.png delete mode 100644 static/images/theme/xiaoxi_a.png create mode 100644 static/images/theme/zcIcon1-1.png create mode 100644 static/images/theme/zcIcon1-2.png diff --git a/common/createDataTable.js b/common/createDataTable.js index 2d180c4..f645944 100644 --- a/common/createDataTable.js +++ b/common/createDataTable.js @@ -32,6 +32,8 @@ module.exports = { this.createMafiListRespList() // 创建安全巡检 this.createSafetyInspectionRespList() + // 创建安全巡检图片上传地址 + this.createSafetyInspectionRespUrlList() // 创建作业查询 this.createShipmentShipLoadPlansRespList() // 创建船舶资料 @@ -123,6 +125,12 @@ module.exports = { 'CREATE TABLE if not exists safetyInspectionRespList ("webId" text NOT NULL,"vvyId" text,"vvyName" text,"type" text,"remark" text,"tradeTypeName" text,"importExportFlagName" text,"spmName" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' this.executeSql(sql) }, + // 创建安全巡检图片上传地址 safetyInspectionRespUrlList + createSafetyInspectionRespUrlList() { + let sql = + 'CREATE TABLE if not exists safetyInspectionRespUrlList ("webId" text NOT NULL,"contactId" text,"url" text,"webStatus" text,"webDate" text, PRIMARY KEY("webId"));' + this.executeSql(sql) + }, // 创建作业查询 shipmentShipLoadPlansRespList createShipmentShipLoadPlansRespList() { let sql = diff --git a/common/util.js b/common/util.js index 278228f..73aa701 100644 --- a/common/util.js +++ b/common/util.js @@ -23,7 +23,6 @@ module.exports = { }, compress(base64String, w, quality) { - console.log(base64String.length); var getMimeType = (urlData) => { var arr = urlData.split(","); var mime = arr[0].match(/:(.*?);/)[1]; @@ -55,7 +54,6 @@ module.exports = { ctx.clearRect(0, 0, canvas.width, canvas.height); ctx.drawImage(newImage, 0, 0, canvas.width, canvas.height); var base64 = canvas.toDataURL(getMimeType(base64String), quality); - console.log(base64); return base64; }); diff --git a/components/head-info/head-info.vue b/components/head-info/head-info.vue index b83fbf5..4d356e7 100644 --- a/components/head-info/head-info.vue +++ b/components/head-info/head-info.vue @@ -1,42 +1,58 @@ @@ -63,12 +79,53 @@ portId: "", portName: "", activeIndex: 0, + navList: [{ + url: "/pages/index/index", + name: "装船指令", + type: false, + imageUrl: "../../static/images/theme/zcIcon1-1.png", + imageUrl2: "../../static/images/theme/zcIcon1-2.png" + }, + { + url: "/pages/discharge/index", + name: "卸船指令", + type: false, + imageUrl: "../../static/images/theme/xcIcon1-1.png", + imageUrl2: "../../static/images/theme/xcIcon1-2.png" + }, { + url: "/pages/shipWork/index", + name: "船舶作业", + type: false, + imageUrl: "../../static/images/theme/cbIcon1-1.png", + imageUrl2: "../../static/images/theme/cbIcon1-2.png" + }, { + url: "/pages/quality/index", + name: "货物质量", + type: false, + imageUrl: "../../static/images/theme/cbIcon1-1.png", + imageUrl2: "../../static/images/theme/cbIcon1-2.png" + }, { + url: "/pages/monitor/index", + name: "场位监控", + type: false, + imageUrl: "../../static/images/theme/cbIcon1-1.png", + imageUrl2: "../../static/images/theme/cbIcon1-2.png" + } + ], } }, + props: { + navIndex: { + type: Number, + default: 0, + required: true + }, + }, mounted() { this.activeIndex = uni.getStorageSync("selectPortIndex") this.portId = this.portList[this.activeIndex].value this.portName = this.portList[this.activeIndex].title + this.navList[this.navIndex].type = true }, methods: { showInfo() { @@ -127,50 +184,102 @@ + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 3b370f9..9e47faa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,8 +1,7 @@ @@ -487,15 +549,25 @@ .container { padding: 20px 30px; - input::placeholder { - color: #6a6a6a !important; + /deep/.uni-steps { + height: 80px; + justify-content: center; } - .formTitle { - padding-left: 10px; - border-left: 5px solid #2979ff; + /deep/.uni-steps__row-title { font-size: 20px; - font-weight: bold; + } + + /deep/.uni-icons { + font-size: 32px !important; + } + + /deep/.uni-steps__row-container { + margin-top: 14px; + } + + input::placeholder { + color: #6a6a6a !important; } .ul { @@ -527,14 +599,6 @@ } } - .zisun { - display: flex; - - .liTitle { - margin-top: 10px; - } - } - .picture { margin-top: 20px; diff --git a/pages/quality/index.vue b/pages/quality/index.vue index fb59447..fef1001 100644 --- a/pages/quality/index.vue +++ b/pages/quality/index.vue @@ -1,8 +1,7 @@