wsnet
/
pad-app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11.13x

dev4
Panzihang 2023-11-13 18:02:20 +08:00
parent 62c351d1f1
commit fd15de8d51
13 changed files with 586 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -2,7 +2,7 @@
export default { export default {
onLaunch: function() { onLaunch: function() {
plus.screen.lockOrientation('landscape-primary'); //锁定横屏 plus.screen.lockOrientation('landscape-primary'); //锁定横屏
plus.navigator.setFullscreen(true); //隐藏状态栏(应用全屏:只能隐藏状态栏，标题栏和虚拟返回键都还可以显示) // plus.navigator.setFullscreen(true); //隐藏状态栏(应用全屏:只能隐藏状态栏，标题栏和虚拟返回键都还可以显示)
}, },
} }
</script> </script>

38
components/head-info/head-info.vue
View File

@ -25,8 +25,8 @@
</view> </view>
<view class="infoList" v-if="infoType"> <view class="infoList" v-if="infoType">
<view class="userInfo"> <view class="userInfo">
<p>张星星 - 堆场计划员</p> <p>{{userInfo.name}}</p>
<p>12341234567</p> <p>{{userInfo.phone}}</p>
</view> </view>
<!-- <view class="borTop" @click="messageSql('center')"> <!-- <view class="borTop" @click="messageSql('center')">
<uni-icons type="vip" size="16" /> <uni-icons type="vip" size="16" />
@ -157,8 +157,33 @@
this.loginObj = uni.getStorageSync('loginObj') this.loginObj = uni.getStorageSync('loginObj')
this.activeIndex = uni.getStorageSync("selectPortIndex") this.activeIndex = uni.getStorageSync("selectPortIndex")
this.navList[this.navIndex].type = true this.navList[this.navIndex].type = true
this.getUser()
}, },
methods: { methods: {
// 获取用户信息
getUser() {
uni.request({
url: `${this.$local}/api/miniapp/user/info`,
header: {
'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${this.loginObj.access_token}`
},
method: 'GET', //请求方式，必须为大写
success: (res) => {
this.userInfo = res.data.data
console.log(this.userInfo)
uni.setStorageSync('userInfo', this.userInfo)
},
fail: function(err) {
that.lotusLoadingData.isShow = false
uni.showModal({
title: '提示',
showCancel: false,
content: '请求超时，请退出重新进入！'
})
}
})
},
maskClick() { maskClick() {
this.infoType = false this.infoType = false
}, },
@ -400,7 +425,7 @@
.headInfo { .headInfo {
width: 100%; width: 100%;
height: 66px; height: 66px;
line-height: 66px; line-height: 50px;
background-color: #fff; background-color: #fff;
box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.10); box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.10);
border-radius: 1px; border-radius: 1px;
@ -483,15 +508,15 @@
.infoList { .infoList {
width: 200px; width: 200px;
padding: 10px 20px; padding: 10px 20px;
border-radius: 8px;
background-color: #fff; background-color: #fff;
z-index: 999; z-index: 999;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
position: absolute; position: absolute;
right: 0; right: 2px;
top: 60px; top: 60px;
box-shadow: 1px 1px 6px 0 rgba(52, 52, 52, 0.20);
.borTop { .borTop {
border-top: 1px #ccc solid; border-top: 1px #ccc solid;
@ -506,7 +531,6 @@
.popupBox { .popupBox {
width: 280px; width: 280px;
height: 320px; height: 320px;
overflow: scroll;
.popupTitle { .popupTitle {
width: 100%; width: 100%;
@ -521,6 +545,8 @@
.ul { .ul {
padding: 30px; padding: 30px;
height: 213px;
overflow: scroll;
.li { .li {
height: 40px; height: 40px;

1
components/head-view/head-view.vue
View File

@ -143,7 +143,6 @@
top: 0; top: 0;
left: 0; left: 0;
background-color: #fff; background-color: #fff;
border-bottom: 1px solid #999999;
width: 100%; width: 100%;
height: 68px; height: 68px;
line-height: 68px; line-height: 68px;

5
manifest.json
View File

@ -17,6 +17,11 @@
"autoclose" : true, "autoclose" : true,
"delay" : 0 "delay" : 0
}, },
"statusbar" : {
"immersed" : false,
"style" : "light",
"background" : "transparent"
},
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules" : {
"SQLite" : {}, "SQLite" : {},

16
pages/discharge/index.vue
View File

@ -58,6 +58,7 @@
@change="changePage" /> @change="changePage" />
</view> --> </view> -->
</view> </view>
<LotusLoading :lotusLoadingData="lotusLoadingData"></LotusLoading>
</view> </view>
</view> </view>
</template> </template>
@ -65,6 +66,7 @@
<script> <script>
import HeadInfo from '@/components/head-info/head-info'; import HeadInfo from '@/components/head-info/head-info';
import api from "../../common/api.js" import api from "../../common/api.js"
import LotusLoading from "../../components/Winglau14-lotusLoading/Winglau14-LotusLoading.vue";
let timers = null; let timers = null;
export default { export default {
data() { data() {
@ -96,7 +98,11 @@
current: 1, current: 1,
// 港区信息 // 港区信息
portObj: {} portObj: {},
lotusLoadingData: {
isShow: false //设置显示加载中组件true显示false隐藏
}
} }
}, },
onLoad() { onLoad() {
@ -107,6 +113,7 @@
onReachBottom() { onReachBottom() {
this.current++ this.current++
this.initData() this.initData()
this.lotusLoadingData.isShow = true
}, },
onBackPress(options) { onBackPress(options) {
// 触发返回就会调用此方法，这里实现的是禁用物理返回，顶部导航栏的自定义返回 uni.navigateBack 仍可使用 // 触发返回就会调用此方法，这里实现的是禁用物理返回，顶部导航栏的自定义返回 uni.navigateBack 仍可使用
@ -117,7 +124,8 @@
} }
}, },
components: { components: {
HeadInfo HeadInfo,
LotusLoading
}, },
mounted() { mounted() {
this.initData() this.initData()
@ -176,6 +184,7 @@
}, },
// 点击搜索 // 点击搜索
onSearch() { onSearch() {
this.itemList = []
this.initData() this.initData()
}, },
initData() { initData() {
@ -192,6 +201,7 @@
}, },
method: 'GET', //请求方式，必须为大写 method: 'GET', //请求方式，必须为大写
success: (res) => { success: (res) => {
this.lotusLoadingData.isShow = false
this.total = res.data.data.total this.total = res.data.data.total
this.itemList.push(...res.data.data.records) this.itemList.push(...res.data.data.records)
} }
@ -232,7 +242,7 @@
position: fixed; position: fixed;
top: 66px; top: 66px;
right: 0; right: 0;
z-index: 999; z-index: 995;
.end { .end {
display: flex; display: flex;

62
pages/discharge/instruct.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="app"> <view class="app">
<head-view title="卸船指令"></head-view> <head-view :title="title"></head-view>
<view class="content contentFixed"> <view class="content contentFixed">
<view class="buttonlist"> <view class="buttonlist">
<template v-if="tabsValue == 0"> <template v-if="tabsValue == 0">
@ -22,7 +22,7 @@
<view class="inputBox"> <view class="inputBox">
<view class="leftInput"> <view class="leftInput">
<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl" <uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
placeholder="船名/航次/提单号" @iconClick="search"></uni-easyinput> placeholder="提单号" @iconClick="search"></uni-easyinput>
</view> </view>
<view class="rightInput"> <view class="rightInput">
<superwei-combox class="input" :candidates="brandList" :isJSON="true" <superwei-combox class="input" :candidates="brandList" :isJSON="true"
@ -73,6 +73,7 @@
</template> </template>
</view> </view>
<template v-if="itemList.length > 0"> <template v-if="itemList.length > 0">
<view class="itemBox">
<view class="itemList"> <view class="itemList">
<view class="exp" v-for="(item,index) in itemList" :key="item.index"> <view class="exp" v-for="(item,index) in itemList" :key="item.index">
<view class="item"> <view class="item">
@ -88,8 +89,8 @@
<view class="schedule"> <view class="schedule">
<text class="text">卸船进度</text> <text class="text">卸船进度</text>
<view class="progressBox"> <view class="progressBox">
<van-progress color="#0067CF" stroke-width="6px" :show-pivot="false" <van-progress color="#0067CF" stroke-width="6px"
track-color="#DEE9F5" :show-pivot="false" track-color="#DEE9F5"
:percentage="itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)" /> :percentage="itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)" />
</view> </view>
<text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text> <text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text>
@ -97,10 +98,12 @@
<view class="planStatus planStatus0" v-if="item.totalPlanStatus == 0"> <view class="planStatus planStatus0" v-if="item.totalPlanStatus == 0">
<text class="text">{{item.totalPlanStatusDesc}}</text> <text class="text">{{item.totalPlanStatusDesc}}</text>
</view> </view>
<view class="planStatus planStatus3" v-else-if="item.totalPlanStatus == 3"> <view class="planStatus planStatus3"
v-else-if="item.totalPlanStatus == 3">
<text class="text">{{item.totalPlanStatusDesc}}</text> <text class="text">{{item.totalPlanStatusDesc}}</text>
</view> </view>
<view class="planStatus planStatus5" v-else-if="item.totalPlanStatus == 5"> <view class="planStatus planStatus5"
v-else-if="item.totalPlanStatus == 5">
<text class="text">{{item.totalPlanStatusDesc}}</text> <text class="text">{{item.totalPlanStatusDesc}}</text>
</view> </view>
<view class="planStatus planStatus1" v-else> <view class="planStatus planStatus1" v-else>
@ -172,12 +175,13 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</template> </template>
<o-empty v-else height="70vh" bg="#f5f6fa" /> <o-empty v-else height="70vh" bg="#f5f6fa" />
<view class="pageBox" v-if="itemList.length > 0"> <!-- <view class="pageBox" v-if="itemList.length > 0">
<uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current" <uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current"
@change="changePage" /> @change="changePage" />
</view> </view> -->
</view> </view>
</custom-tab-pane> </custom-tab-pane>
<custom-tab-pane label="分指令" name="c1_2"> <custom-tab-pane label="分指令" name="c1_2">
@ -187,7 +191,7 @@
<view class="inputBox"> <view class="inputBox">
<view class="leftInput"> <view class="leftInput">
<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl" <uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
placeholder="船名/航次/提单号" @iconClick="search"></uni-easyinput> placeholder="提单号" @iconClick="search"></uni-easyinput>
</view> </view>
<view class="rightInput"> <view class="rightInput">
<superwei-combox class="input" :candidates="sendList" :isJSON="true" keyName="text" <superwei-combox class="input" :candidates="sendList" :isJSON="true" keyName="text"
@ -204,7 +208,7 @@
<view class="tjHead" @click="clickTjHead('fzl')"> <view class="tjHead" @click="clickTjHead('fzl')">
<view class="title"> <view class="title">
<p>分指令进度</p> <p>分指令进度</p>
<text>{{zTjList.totalSentCount}}/{{zTjList.branchSum}}</text> <text>{{zTjList.branchSentCount}}/{{zTjList.branchSum}}</text>
</view> </view>
<lx-progress-bar title="" :total="zTjList.branchSum" <lx-progress-bar title="" :total="zTjList.branchSum"
:firstValue="zTjList.branchSentCount" :secondValue="zTjList.branchPausedSentCount" :firstValue="zTjList.branchSentCount" :secondValue="zTjList.branchPausedSentCount"
@ -241,6 +245,7 @@
</view> </view>
<template v-if="itemList.length > 0"> <template v-if="itemList.length > 0">
<checkbox-group @change="checkChange"> <checkbox-group @change="checkChange">
<view class="itemBox">
<view class="itemList"> <view class="itemList">
<view class="exp" v-for="(item,index) in itemList" :key="item.ndex"> <view class="exp" v-for="(item,index) in itemList" :key="item.ndex">
<view class="item"> <view class="item">
@ -265,7 +270,8 @@
</view> </view>
<text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text> <text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text>
</view> </view>
<view class="planStatus planStatus0" v-if="item.branchPlanStatus == 0"> <view class="planStatus planStatus0"
v-if="item.branchPlanStatus == 0">
<text class="text">{{item.branchPlanStatusDesc}}</text> <text class="text">{{item.branchPlanStatusDesc}}</text>
</view> </view>
<view class="planStatus planStatus3" <view class="planStatus planStatus3"
@ -310,7 +316,8 @@
<view class="btn" @click="distribute('center','solo',item)">指令下发 <view class="btn" @click="distribute('center','solo',item)">指令下发
</view> </view>
</view> </view>
<view class="expand" v-if="itemActive != index" @click="isActive(index)"> <view class="expand" v-if="itemActive != index"
@click="isActive(index)">
展开 展开
</view> </view>
<view class="expand" v-else @click="itemActive = '-1'"> <view class="expand" v-else @click="itemActive = '-1'">
@ -349,13 +356,14 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</checkbox-group> </checkbox-group>
</template> </template>
<o-empty v-else height="70vh" bg="#f5f6fa" /> <o-empty v-else height="70vh" bg="#f5f6fa" />
<view class="pageBox" v-if="itemList.length > 0"> <!-- <view class="pageBox" v-if="itemList.length > 0">
<uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current" <uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current"
@change="changePage" /> @change="changePage" />
</view> </view> -->
</view> </view>
</custom-tab-pane> </custom-tab-pane>
<custom-tab-pane label="分指令-班组长" name="c1_4"> <custom-tab-pane label="分指令-班组长" name="c1_4">
@ -363,14 +371,19 @@
<view class="main"> <view class="main">
<view class="form"> <view class="form">
<view class="inputBox"> <view class="inputBox">
<view class="leftInput">
<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl" <uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
placeholder="船名/航次/提单号" @iconClick="search"></uni-easyinput> placeholder="提单号" @iconClick="search"></uni-easyinput>
<superwei-combox class="input" :candidates="brandList" :isJSON="true" keyName="brdName" </view>
placeholder="品牌" v-model="brdName" @select="brandSelect"></superwei-combox> <view class="rightInput">
<superwei-combox class="input" :candidates="bvmList" :isJSON="true" keyName="bvmName" <superwei-combox class="input" :candidates="brandList" :isJSON="true"
keyName="brdName" placeholder="品牌" v-model="brdName"
@select="brandSelect"></superwei-combox>
<superwei-combox class="input" :candidates="bvmList" :isJSON="true" keyName="name"
placeholder="车型" v-model="bvmName" @select="bvmSelect"></superwei-combox> placeholder="车型" v-model="bvmName" @select="bvmSelect"></superwei-combox>
</view> </view>
</view> </view>
</view>
<template v-if="itemList.length > 0"> <template v-if="itemList.length > 0">
<view class="itemList"> <view class="itemList">
<view class="exp" v-for="(item,index) in itemList" :key="item.ndex"> <view class="exp" v-for="(item,index) in itemList" :key="item.ndex">
@ -475,10 +488,10 @@
</view> </view>
</template> </template>
<o-empty v-else height="70vh" bg="#f5f6fa" /> <o-empty v-else height="70vh" bg="#f5f6fa" />
<view class="pageBox" v-if="itemList.length > 0"> <!-- <view class="pageBox" v-if="itemList.length > 0">
<uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current" <uni-pagination :show-icon="true" :total="total" :pageSize="pageSize" :current="current"
@change="changePage" /> @change="changePage" />
</view> </view> -->
</view> </view>
</custom-tab-pane> </custom-tab-pane>
<custom-tab-pane label="场位图" name="c1_3"> <custom-tab-pane label="场位图" name="c1_3">
@ -668,10 +681,10 @@
<script> <script>
import HeadView from '@/components/head-view/head-view.vue'; import HeadView from '@/components/head-view/head-view.vue';
import place from './place.vue'; import place from './place.vue';
let timers = null;
export default { export default {
data() { data() {
return { return {
title: "",
loginObj: {}, loginObj: {},
tabsValue: 0, // 0(总指令) 1(分指令) tabsValue: 0, // 0(总指令) 1(分指令)
shipInfo: {}, // 船只数据 shipInfo: {}, // 船只数据
@ -777,6 +790,7 @@
this.shipInfo = JSON.parse(decodeURIComponent(options.params)).shipInfo this.shipInfo = JSON.parse(decodeURIComponent(options.params)).shipInfo
this.tradeType = JSON.parse(decodeURIComponent(options.params)).tradeType this.tradeType = JSON.parse(decodeURIComponent(options.params)).tradeType
this.loginObj = uni.getStorageSync('loginObj') this.loginObj = uni.getStorageSync('loginObj')
this.title = `${this.shipInfo.spmIdDesc} / ${this.shipInfo.vvyName}`
if (this.tabsValue == 0) { if (this.tabsValue == 0) {
this.loadSumOrder() // 总指令：分页查询 this.loadSumOrder() // 总指令：分页查询
console.log(this.shipInfo) console.log(this.shipInfo)
@ -1584,6 +1598,11 @@
} }
} }
.itemBox {
height: 465px;
overflow: scroll;
}
.itemList { .itemList {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -1722,7 +1741,6 @@
justify-content: flex-end; justify-content: flex-end;
padding: 10px 0; padding: 10px 0;
border-top: 1px solid rgba(0, 0, 0, .1); border-top: 1px solid rgba(0, 0, 0, .1);
border-bottom: 1px solid rgba(0, 0, 0, .1);
margin-top: 10px; margin-top: 10px;
.btn { .btn {

21
pages/index/index.vue
View File

@ -58,6 +58,7 @@
@change="changePage" /> @change="changePage" />
</view> --> </view> -->
</view> </view>
<LotusLoading :lotusLoadingData="lotusLoadingData"></LotusLoading>
</view> </view>
</view> </view>
</template> </template>
@ -65,6 +66,7 @@
<script> <script>
import HeadInfo from '@/components/head-info/head-info'; import HeadInfo from '@/components/head-info/head-info';
import api from "../../common/api.js" import api from "../../common/api.js"
import LotusLoading from "../../components/Winglau14-lotusLoading/Winglau14-LotusLoading.vue";
let timers = null; let timers = null;
export default { export default {
data() { data() {
@ -96,12 +98,21 @@
current: 1, current: 1,
// 港区信息 // 港区信息
portObj: {} portObj: {},
lotusLoadingData: {
isShow: false //设置显示加载中组件true显示false隐藏
} }
}
},
components: {
HeadInfo,
LotusLoading
}, },
onReachBottom() { onReachBottom() {
this.current++ this.current++
this.initData() this.initData()
this.lotusLoadingData.isShow = true
}, },
onLoad() { onLoad() {
this.portObj = uni.getStorageSync('portObj') this.portObj = uni.getStorageSync('portObj')
@ -116,9 +127,6 @@
return false; return false;
} }
}, },
components: {
HeadInfo
},
mounted() { mounted() {
this.initData() this.initData()
}, },
@ -176,6 +184,7 @@
}, },
// 点击搜索 // 点击搜索
onSearch() { onSearch() {
this.itemList = []
this.initData() this.initData()
}, },
initData() { initData() {
@ -195,7 +204,7 @@
}, },
method: 'GET', //请求方式，必须为大写 method: 'GET', //请求方式，必须为大写
success: (res) => { success: (res) => {
console.log(res) this.lotusLoadingData.isShow = false
this.total = res.data.data.total this.total = res.data.data.total
this.itemList.push(...res.data.data.records) this.itemList.push(...res.data.data.records)
} }
@ -241,7 +250,7 @@
position: fixed; position: fixed;
top: 66px; top: 66px;
right: 0; right: 0;
z-index: 999; z-index: 995;
.end { .end {
display: flex; display: flex;

78
pages/index/instruct.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="app"> <view class="app">
<head-view title="装船指令"></head-view> <head-view :title="title"></head-view>
<view class="content2 contentFixed"> <view class="content2 contentFixed">
<view class="buttonlist"> <view class="buttonlist">
<template v-if="tabsValue == 0"> <template v-if="tabsValue == 0">
@ -22,7 +22,7 @@
<view class="inputBox"> <view class="inputBox">
<view class="leftInput"> <view class="leftInput">
<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl" <uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
placeholder="船名/航次/提单号" @iconClick="search"></uni-easyinput> placeholder="提单号" @iconClick="search"></uni-easyinput>
</view> </view>
<view class="rightInput"> <view class="rightInput">
<superwei-combox class="input" :candidates="brandList" :isJSON="true" <superwei-combox class="input" :candidates="brandList" :isJSON="true"
@ -195,7 +195,7 @@
<view class="inputBox"> <view class="inputBox">
<view class="leftInput"> <view class="leftInput">
<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl" <uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
placeholder="船名/航次/提单号" @iconClick="search"></uni-easyinput> placeholder="提单号" @iconClick="search"></uni-easyinput>
</view> </view>
<view class="rightInput"> <view class="rightInput">
<superwei-combox class="input" :candidates="sendList" :isJSON="true" keyName="text" <superwei-combox class="input" :candidates="sendList" :isJSON="true" keyName="text"
@ -215,7 +215,7 @@
<view class="tjHead" @click="clickTjHead('fzl')"> <view class="tjHead" @click="clickTjHead('fzl')">
<view class="title"> <view class="title">
<p>分指令进度</p> <p>分指令进度</p>
<text>{{zTjList.totalSentCount}}/{{zTjList.branchSum}}</text> <text>{{zTjList.branchSentCount}}/{{zTjList.branchSum}}</text>
</view> </view>
<lx-progress-bar title="" :total="zTjList.branchSum" <lx-progress-bar title="" :total="zTjList.branchSum"
:firstValue="zTjList.branchSentCount" :secondValue="zTjList.branchPausedSentCount" :firstValue="zTjList.branchSentCount" :secondValue="zTjList.branchPausedSentCount"
@ -234,7 +234,7 @@
@click="clickTjList(item,index,'fzl')"> @click="clickTjList(item,index,'fzl')">
<view class="title"> <view class="title">
<p>{{item.titleBar}}</p> <p>{{item.titleBar}}</p>
<text>{{item.totalSentCount}}/{{item.fsum}}</text> <text>{{item.branchSentCount}}/{{item.fsum}}</text>
</view> </view>
<lx-progress-bar title="" :total="item.fsum" :firstValue="item.branchSentCount" <lx-progress-bar title="" :total="item.fsum" :firstValue="item.branchSentCount"
:secondValue="item.branchPausedSentCount" contentColor="#0067CF" :secondValue="item.branchPausedSentCount" contentColor="#0067CF"
@ -252,6 +252,7 @@
</view> </view>
<template v-if="itemList.length > 0"> <template v-if="itemList.length > 0">
<checkbox-group @change="checkChange"> <checkbox-group @change="checkChange">
<view class="itemBox">
<view class="itemList"> <view class="itemList">
<view class="exp" v-for="(item,index) in itemList" :key="index"> <view class="exp" v-for="(item,index) in itemList" :key="index">
<view class="item"> <view class="item">
@ -276,7 +277,8 @@
</view> </view>
<text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text> <text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text>
</view> </view>
<view class="planStatus planStatus0" v-if="item.branchPlanStatus == 0"> <view class="planStatus planStatus0"
v-if="item.branchPlanStatus == 0">
<text class="text">{{item.branchPlanStatusDesc}}</text> <text class="text">{{item.branchPlanStatusDesc}}</text>
</view> </view>
<view class="planStatus planStatus3" <view class="planStatus planStatus3"
@ -301,6 +303,10 @@
<text>港口：</text> <text>港口：</text>
<text>{{item.potName}}</text> <text>{{item.potName}}</text>
</view> </view>
<view class="col">
<text>分指令发送人：</text>
<text>{{item.branchSendUser}}</text>
</view>
</view> </view>
<view class="rowInfo"> <view class="rowInfo">
<view class="col"> <view class="col">
@ -312,18 +318,13 @@
<text>{{item.totalSendTime}}</text> <text>{{item.totalSendTime}}</text>
</view> </view>
</view> </view>
<view class="rowInfo">
<view class="col">
<text>分指令发送人：</text>
<text>{{item.branchSendUser}}</text>
</view>
</view>
</view> </view>
<view class="xfBtn"> <view class="xfBtn">
<view class="btn" @click="distribute('center','solo',item)">指令下发 <view class="btn" @click="distribute('center','solo',item)">指令下发
</view> </view>
</view> </view>
<view class="expand" v-if="itemActive != index" @click="isActive(index)"> <view class="expand" v-if="itemActive != index"
@click="isActive(index)">
展开 展开
</view> </view>
<view class="expand" v-else @click="itemActive = '-1'"> <view class="expand" v-else @click="itemActive = '-1'">
@ -362,6 +363,7 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</checkbox-group> </checkbox-group>
</template> </template>
<o-empty v-else height="70vh" bg="#f5f6fa" /> <o-empty v-else height="70vh" bg="#f5f6fa" />
@ -378,7 +380,7 @@
<view class="inputBox"> <view class="inputBox">
<view class="leftInput"> <view class="leftInput">
<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl" <uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
placeholder="船名/航次/提单号" @iconClick="search"></uni-easyinput> placeholder="提单号" @iconClick="search"></uni-easyinput>
</view> </view>
<view class="rightInput"> <view class="rightInput">
<superwei-combox class="input" :candidates="brandList" :isJSON="true" <superwei-combox class="input" :candidates="brandList" :isJSON="true"
@ -736,7 +738,19 @@
</view> </view>
</view> </view>
</custom-tab-pane> </custom-tab-pane>
<custom-tab-pane label="装船要求信息" name="c1_5"></custom-tab-pane> <custom-tab-pane label="装船要求信息" name="c1_5">
<view></view>
<view class="main">
<view class="askBox">
<view class="title">
装船要求信息
</view>
<view class="askContent">
{{askValue}}
</view>
</view>
</view>
</custom-tab-pane>
</custom-tabs> </custom-tabs>
<uni-popup ref="popup" type="dialog"> <uni-popup ref="popup" type="dialog">
<view class="popupBox"> <view class="popupBox">
@ -790,10 +804,10 @@
import HeadView from '@/components/head-view/head-view.vue'; import HeadView from '@/components/head-view/head-view.vue';
import HeadInfo from '@/components/head-info/head-info'; import HeadInfo from '@/components/head-info/head-info';
import place from './place.vue'; import place from './place.vue';
let timers = null;
export default { export default {
data() { data() {
return { return {
title: "",
loginObj: {}, loginObj: {},
tabsValue: 0, // 0(总指令) 1(分指令) tabsValue: 0, // 0(总指令) 1(分指令)
shipInfo: {}, // 船只数据 shipInfo: {}, // 船只数据
@ -822,7 +836,7 @@
text: "已发送" text: "已发送"
}, { }, {
vale: "0", vale: "0",
text: "未发送" text: "待发送"
}], }],
sendValue: "", sendValue: "",
sendText: "", sendText: "",
@ -907,6 +921,7 @@
onLoad(options) { onLoad(options) {
this.shipInfo = JSON.parse(decodeURIComponent(options.params)).shipInfo this.shipInfo = JSON.parse(decodeURIComponent(options.params)).shipInfo
console.log(this.shipInfo) console.log(this.shipInfo)
this.title = `${this.shipInfo.spmIdDesc} / ${this.shipInfo.vvyName}`
this.loginObj = uni.getStorageSync('loginObj') this.loginObj = uni.getStorageSync('loginObj')
if (this.tabsValue == 0) { if (this.tabsValue == 0) {
this.loadSumOrder() // 总指令：分页查询 this.loadSumOrder() // 总指令：分页查询
@ -954,6 +969,7 @@
} else if (this.tabsValue == 0) { } else if (this.tabsValue == 0) {
this.loadSumOrder() this.loadSumOrder()
} }
this.getStatistics()
}, },
// 点击分页 // 点击分页
changePage(e) { changePage(e) {
@ -968,6 +984,7 @@
// 点击总指令统计列表总标题 // 点击总指令统计列表总标题
clickTjHead(type) { clickTjHead(type) {
this.zTjActive = -1 this.zTjActive = -1
this.shipDeck = ""
if (type == 'zzl') { if (type == 'zzl') {
this.loadSumOrder() this.loadSumOrder()
} else if (type == 'fzl') { } else if (type == 'fzl') {
@ -1000,7 +1017,6 @@
}, },
method: 'GET', //请求方式，必须为大写 method: 'GET', //请求方式，必须为大写
success: (res) => { success: (res) => {
console.log(res)
this.zTjList = res.data.data[0] this.zTjList = res.data.data[0]
this.zTjList["totalSum"] = this.zTjList.totalSentCount + this.zTjList.totalNotSentCount this.zTjList["totalSum"] = this.zTjList.totalSentCount + this.zTjList.totalNotSentCount
this.zTjList["branchSum"] = this.zTjList.branchSentCount + this.zTjList this.zTjList["branchSum"] = this.zTjList.branchSentCount + this.zTjList
@ -1084,8 +1100,10 @@
this.$refs.popup.open(type) this.$refs.popup.open(type)
if (a == 'again' || a == 'solo') { if (a == 'again' || a == 'solo') {
this.fzzRow = item this.fzzRow = item
this.loadOtherOrder()
} else if (a == 'all') { } else if (a == 'all') {
this.fzzRow = "" this.fzzRow = ""
this.loadSumOrder()
} }
}, },
// 获取角色ID // 获取角色ID
@ -1236,6 +1254,7 @@
this.$refs.popup.close() this.$refs.popup.close()
if (res.status == 200) { if (res.status == 200) {
this.loadSumOrder() this.loadSumOrder()
this.getStatistics()
uni.showToast({ uni.showToast({
title: `总指令下发成功`, title: `总指令下发成功`,
icon: 'success', icon: 'success',
@ -1262,6 +1281,7 @@
success: (res) => { success: (res) => {
if (res.data.status == 200) { if (res.data.status == 200) {
this.loadSumOrder() this.loadSumOrder()
this.getStatistics()
uni.showToast({ uni.showToast({
title: `分指令下发成功`, title: `分指令下发成功`,
icon: 'success', icon: 'success',
@ -1298,6 +1318,7 @@
console.log(res) console.log(res)
if (res.data.status == 200) { if (res.data.status == 200) {
this.loadOtherOrder() this.loadOtherOrder()
this.getStatistics()
uni.showToast({ uni.showToast({
title: `重新发送指令成功`, title: `重新发送指令成功`,
icon: 'success', icon: 'success',
@ -1571,6 +1592,26 @@
height: calc(100vh - 134px); height: calc(100vh - 134px);
} }
.askBox {
width: 97%;
padding: 20px;
margin: 20px;
background: #fff;
height: 300px;
overflow: scroll;
.title {
font-size: 20px;
font-weight: bold;
text-align: center;
}
.askContent {
font-size: 16px;
margin-top: 20px;
}
}
.pageBox { .pageBox {
margin-top: 20px; margin-top: 20px;
} }
@ -1953,7 +1994,6 @@
justify-content: flex-end; justify-content: flex-end;
padding: 10px 0; padding: 10px 0;
border-top: 1px solid rgba(0, 0, 0, .1); border-top: 1px solid rgba(0, 0, 0, .1);
border-bottom: 1px solid rgba(0, 0, 0, .1);
margin-top: 10px; margin-top: 10px;
.btn { .btn {

11
pages/login/index.vue
View File

@ -16,9 +16,8 @@
<p>账号密码登录</p> <p>账号密码登录</p>
</view> </view>
<view class="loginInput"> <view class="loginInput">
<uni-easyinput prefixIcon="person-filled" v-model="account" placeholder="请输入账号"></uni-easyinput> <uni-easyinput prefixIcon="locked-filled" v-model="account" placeholder="请输入账号"></uni-easyinput>
<uni-easyinput type="password" prefixIcon="locked-filled" suffixIcon="search" v-model="password" <uni-easyinput type="password" prefixIcon="person-filled" v-model="password" placeholder="请输入密码">
placeholder="请输入密码">
</uni-easyinput> </uni-easyinput>
<button class="button" @click="loginGo('center')">立即登录</button> <button class="button" @click="loginGo('center')">立即登录</button>
</view> </view>
@ -61,7 +60,7 @@
export default { export default {
data() { data() {
return { return {
// rtoswuhan1 // rtoswuhan1 wuhan_ceshi1
account: '', account: '',
// q123456 // q123456
password: '', password: '',
@ -288,7 +287,6 @@
.popupBox { .popupBox {
width: 280px; width: 280px;
height: 320px; height: 320px;
overflow: scroll;
.popupTitle { .popupTitle {
width: 100%; width: 100%;
@ -299,10 +297,13 @@
color: #23262E; color: #23262E;
font-weight: bold; font-weight: bold;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
box-shadow: 0 -3px 7px 0 rgba(0, 0, 0, 0.10);
} }
.ul { .ul {
padding: 30px; padding: 30px;
height: 213px;
overflow: scroll;
.li { .li {
height: 40px; height: 40px;

124
pages/quality/index.vue
View File

@ -3,14 +3,19 @@
<head-info :navIndex="3"></head-info> <head-info :navIndex="3"></head-info>
<view class="container"> <view class="container">
<view class="content"> <view class="content">
<view class="addBtn" @click="modify('add')">+ 新增</view>
<view class="form"> <view class="form">
<!-- <button type="primary" class="button" @click="modify('add','')"> <view class="left">
<uni-icons type="plusempty" color="#fff" size="20"></uni-icons>新增 <uni-easyinput suffixIcon="search" v-model="carValue" placeholder="请输入车架号"
</button> --> @iconClick="iconClick">
</uni-easyinput>
</view>
<view class="right"> <view class="right">
<superwei-combox class="select" :candidates="shipList" :isJSON="true" keyName="shipVvy" <superwei-combox class="select" :candidates="shipList" :isJSON="true" keyName="shipVvy"
placeholder="船名/航次" v-model="shipValue" @select="shipChange" placeholder="船名/航次" v-model="shipValue" @select="shipChange"
@input="shipInput"></superwei-combox> @input="shipInput"></superwei-combox>
<superwei-combox class="select" :candidates="zshjList" :isJSON="true" keyName="name"
placeholder="质损环节" v-model="zshjName" @select="zshjChange"></superwei-combox>
<superwei-combox class="select" :candidates="brandList" :isJSON="true" keyName="brdName" <superwei-combox class="select" :candidates="brandList" :isJSON="true" keyName="brdName"
placeholder="品牌" v-model="brandValue" @select="brandChange"></superwei-combox> placeholder="品牌" v-model="brandValue" @select="brandChange"></superwei-combox>
</view> </view>
@ -23,11 +28,17 @@
<image src="../../static/images/zlIcon.png" mode=""></image> <image src="../../static/images/zlIcon.png" mode=""></image>
<text>{{item.vinCode}}</text> <text>{{item.vinCode}}</text>
</view> </view>
<view class="rightHead" @click.stop="modify('edit',item)"> <view class="rightHead">
<view class="delBtn" @click.stop="del(item)">
<image src="../../static/images/delBtn.png"></image>
<text>删除</text>
</view>
<view class="editBtn" @click.stop="modify('edit',item)">
<image src="../../static/images/editBtn.png"></image> <image src="../../static/images/editBtn.png"></image>
<text>编辑</text> <text>编辑</text>
</view> </view>
</view> </view>
</view>
<view class="row"> <view class="row">
<view class="col"> <view class="col">
航次/船名：{{item.spmIdDesc}} 航次/船名：{{item.spmIdDesc}}
@ -69,14 +80,6 @@
处置情况：{{item.disposalSituationName}} 处置情况：{{item.disposalSituationName}}
</view> </view>
</view> </view>
<!-- <view class="rowFoot">
<view class="col">
编辑
</view>
<view class="col" @click.stop="del(item)">
删除
</view>
</view> -->
</view> </view>
</template> </template>
<o-empty v-else height="70vh" bg="#f5f6fa" /> <o-empty v-else height="70vh" bg="#f5f6fa" />
@ -100,8 +103,8 @@
data() { data() {
return { return {
loginObj: {}, loginObj: {},
// 查询值 // 查询值(车架号)
queryValue: '', carValue: '',
// 品牌下拉 // 品牌下拉
brandId: "", brandId: "",
brandValue: "", brandValue: "",
@ -124,6 +127,11 @@
shipValue: "", shipValue: "",
shipSr: "", shipSr: "",
vvyId: "", vvyId: "",
// 质损发生环节下拉
zshjList: [],
zshjId: "",
zshjName: "",
} }
}, },
onLoad() { onLoad() {
@ -133,6 +141,7 @@
this.initData() this.initData()
this.getBrand() this.getBrand()
this.getShip() this.getShip()
this.getRadio()
}, },
onBackPress(options) { onBackPress(options) {
// 触发返回就会调用此方法，这里实现的是禁用物理返回，顶部导航栏的自定义返回 uni.navigateBack 仍可使用 // 触发返回就会调用此方法，这里实现的是禁用物理返回，顶部导航栏的自定义返回 uni.navigateBack 仍可使用
@ -146,10 +155,14 @@
HeadInfo HeadInfo
}, },
methods: { methods: {
// 点击图标搜索
iconClick() {
this.initData()
},
// 获取列表数据 // 获取列表数据
initData() { initData() {
uni.request({ uni.request({
url: `${this.$local}/api/goodsQuality/page?current=${this.current}&page=${this.pageSize}&brdId=${this.brandId}&vvyId=${this.vvyId}`, url: `${this.$local}/api/goodsQuality/page?current=${this.current}&page=${this.pageSize}&brdId=${this.brandId}&vvyId=${this.vvyId}&qdLink=${this.zshjId}&vinCode=${this.carValue}`,
header: { header: {
'Content-Type': 'application/json', //自定义请求头信息 'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${this.loginObj.access_token}` 'Authorization': `Bearer ${this.loginObj.access_token}`
@ -184,7 +197,6 @@
this.shipList.forEach(v => { this.shipList.forEach(v => {
this.$set(v, "shipVvy", `${v.vslCnname} / ${v.vvyName} `) this.$set(v, "shipVvy", `${v.vslCnname} / ${v.vvyName} `)
}) })
console.log(this.shipList)
} }
} }
}) })
@ -197,6 +209,36 @@
this.current = 1 this.current = 1
this.initData() this.initData()
}, },
// 质损环节下拉
zshjChange(e) {
this.zshjId = e.value
this.zshjName = e.name
this.initData()
this.current = 1
},
// 获取枚举(质损发生环节)
getRadio() {
uni.request({
url: this.$local + '/api/miniapp/typeRef/domain/QUALITY_DAMAGE_LINK',
header: {
'Content-Type': 'application/json', //自定义请求头信息
'Authorization': `Bearer ${this.loginObj.access_token}`
},
method: 'GET', //请求方式，必须为大写
success: (res) => {
if (res.data.status == 200) {
console.log(res)
res.data.data.forEach(v => {
this.zshjList.push({
value: v.ptrCode,
name: v.ptrDesc
})
})
console.log(this.zshjList)
}
}
})
},
// 选择船输入框 // 选择船输入框
shipInput(e) { shipInput(e) {
this.shipSr = e this.shipSr = e
@ -227,6 +269,7 @@
}, },
// 点击新增/编辑 // 点击新增/编辑
modify(type, item) { modify(type, item) {
if (type == 'edit') {
let obj = { let obj = {
type: type, type: type,
ygqId: item.ygqId ygqId: item.ygqId
@ -235,6 +278,11 @@
uni.navigateTo({ uni.navigateTo({
url: `/pages/quality/edit?params=${params}` url: `/pages/quality/edit?params=${params}`
}) })
} else {
uni.navigateTo({
url: `/pages/quality/edit`
})
}
}, },
// 点击详情 // 点击详情
details(item) { details(item) {
@ -295,17 +343,33 @@
padding-bottom: 20px; padding-bottom: 20px;
margin-top: 115px; margin-top: 115px;
.addBtn {
position: fixed;
right: 50px;
bottom: 50px;
width: 100px;
height: 100px;
border-radius: 50%;
background-color: #2979ff;
color: #fff;
font-size: 24px;
text-align: center;
line-height: 100px;
font-weight: bold;
z-index: 999;
}
.form { .form {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: flex-end; justify-content: space-between;
background: #FAFAFA; background: #FAFAFA;
border-top: 1px solid #EEEEEE; border-top: 1px solid #EEEEEE;
border-bottom: 1px solid #EEEEEE; border-bottom: 1px solid #EEEEEE;
padding: 6px 10px; padding: 6px 10px;
position: fixed; position: fixed;
top: 66px; top: 66px;
z-index: 999; z-index: 995;
.button { .button {
width: 90px; width: 90px;
@ -315,6 +379,21 @@
margin: 0; margin: 0;
} }
.left {
/deep/.is-input-border {
border-radius: 20px;
width: 300px;
}
/deep/.uni-easyinput__placeholder-class {
padding-left: 10px;
}
/deep/.uni-input-input {
padding-left: 10px;
}
}
.right { .right {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -387,6 +466,15 @@
color: #1677FF; color: #1677FF;
display: flex; display: flex;
.delBtn {
display: flex;
margin-right: 10px;
}
.editBtn {
display: flex;
}
image { image {
width: 16px; width: 16px;
height: 16px; height: 16px;

32
pages/quality/zsEdit.vue
View File

@ -3,10 +3,10 @@
<head-view title="绘制质损图"></head-view> <head-view title="绘制质损图"></head-view>
<view class="containe contentFixedr"> <view class="containe contentFixedr">
<view class="sign-box"> <view class="sign-box">
<canvas class="mycanvas" :style="{width:width +'px',height:height +'px'}" canvas-id="mycanvas" <canvas class="mycanvas" canvas-id="mycanvas"
@touchstart="touchstart" @touchmove="touchmove" @touchend="touchend" disable-scroll="true"></canvas> @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend" disable-scroll="true"></canvas>
<view class="canvasBg"> <view class="canvasBg">
<image src="../../static/images/zs2.jpg" mode=""></image> <image src="../../static/images/zs5.jpg" mode=""></image>
</view> </view>
</view> </view>
<view class="sigh-btns"> <view class="sigh-btns">
@ -22,9 +22,6 @@
pathToBase64, pathToBase64,
base64ToPath base64ToPath
} from '../../js_sdk/mmmm-image-tools/index.js' } from '../../js_sdk/mmmm-image-tools/index.js'
import {
compressImgBySize
} from '@/common/compressImg'
import utils from '@/common/util.js'; import utils from '@/common/util.js';
var x = 20; var x = 20;
var y = 20; var y = 20;
@ -32,8 +29,6 @@
var id = 0; var id = 0;
var type = ''; var type = '';
let that; let that;
let canvasw;
let canvash;
export default { export default {
data() { data() {
return { return {
@ -51,25 +46,27 @@
id = option.id; id = option.id;
type = option.type; type = option.type;
this.init() this.init()
this.loginObj = uni.getStorageSync('loginObj') this.loginObj = uni.getStorageSync('loginObj')
}, },
methods: { methods: {
init() { init() {
this.ctx = uni.createCanvasContext('mycanvas', this); //创建绘图对象 this.ctx = uni.createCanvasContext('mycanvas', this); //创建绘图对象
this.ctx.drawImage('../../static/images/zs2.jpg', 0, 0, 1000, 400) console.log(this.ctx);
//设置画笔样式 //设置画笔样式
this.ctx.lineWidth = 4; this.ctx.lineWidth = 4;
this.ctx.lineCap = 'round'; this.ctx.lineCap = 'round';
this.ctx.lineJoin = 'round'; this.ctx.lineJoin = 'round';
var that = this
uni.getSystemInfo({ uni.getSystemInfo({
success: function(res) { success: function(res) {
console.log(res); console.log(res);
that.width = res.windowWidth * 0.8; that.ctx.drawImage("../../static/images/zs5.jpg", 0, 0, 1000, 222)
that.height = res.windowHeight * 0.5; that.width = res.windowWidth;
} that.height = res.windowHeight;
},
}); });
}, },
//触摸开始，获取到起点 //触摸开始，获取到起点
touchstart: function(e) { touchstart: function(e) {
@ -134,7 +131,8 @@
//清空画布 //清空画布
handleReset: function() { handleReset: function() {
that.ctx.clearRect(0, 0, that.width, that.height); var that = this
that.ctx.clearRect(0, 0, 1000, 222);
that.ctx.draw(true); that.ctx.draw(true);
tempPoint = []; tempPoint = [];
that.init() that.init()
@ -243,14 +241,14 @@
margin: auto 0rpx; margin: auto 0rpx;
background-color: transparent; background-color: transparent;
margin-top: 80px; margin-top: 80px;
width: 1000px !important; width: 1000px;
height: 400px !important; height: 222px;
z-index: 999; z-index: 999;
} }
.canvasBg { .canvasBg {
width: 1000px; width: 1000px;
height: 400px; height: 222px;
position: absolute; position: absolute;
top: 80px; top: 80px;
} }

BIN
static/images/delBtn.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/images/zs5.jpg 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB