From adbca2df763731388b9ca7c0e6b0f17f926a7887 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 20 三月 2024 15:00:40 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 337 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 271 insertions(+), 66 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 0799f07..53011ea 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -4,13 +4,20 @@
<uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
<view class="home-view">
<view class="head">
- <image src="../../static/head.png" mode="" class="head-image"></image>
- <text style="z-index: 999;">鍏ュ簱灞�</text>
+ <view class="head-left" @click="ejected()">
+ <view class="logo"></view>
+ </view>
+ <view class="head-mid">
+ <text style="z-index: 999;">琛ヨ揣鍗曞垪琛�</text>
+ </view>
+ <view class="head-right">
+ <view class="time-tools">{{calendar}}</view>
+ </view>
</view>
<!-- 鏃ュ巻 -->
- <view class="time-tools">{{calendar}}</view>
- <view class="button-left" @click="ejected()"></view>
- <view class="button-right" @click="ejected()"></view>
+ <!-- <view class="time-tools">{{calendar}}</view> -->
+ <!-- <view class="button-left" @click="ejected()"></view> -->
+ <!-- <view class="button-right" @click="ejected()"></view> -->
<!-- 涓讳綋 -->
<view class="info-main">
<view class="info-box">
@@ -19,13 +26,14 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view style="width: 10%;">搴忓彿</view>
- <view style="width: 25%;">鍝佺暘</view>
- <view style="width: 15%;">寰呰ˉ璐ф暟閲�</view>
- <view style="width: 15%;">宸茶ˉ璐ф暟閲�</view>
- <view style="width: 15%;">琛ヨ揣鐘舵��</view>
- <view style="width: 10%;">宸ュ崟鍒涘缓鏃堕棿</view>
- <view style="width: 10%;">棰勮瀹屾垚鏃堕棿</view>
+ <view class="item-box1" style="width: 10%;">宸ュ崟缂栧彿</view>
+ <view class="item-box1" style="width: 15%;">鍝佺暘</view>
+ <view class="item-box1" style="width: 15%;">寰呰ˉ璐ф暟閲�</view>
+ <view class="item-box1" style="width: 15%;">宸茶ˉ璐ф暟閲�</view>
+ <view class="item-box1" style="width: 15%;">琛ヨ揣鐘舵��</view>
+ <view class="item-box1" style="width: 10%;">鍒涘缓鏃堕棿</view>
+ <view class="item-box1" style="width: 10%;">棰勮瀹屾垚鏃堕棿</view>
+ <view class="item-box1" style="width: 9.5%;">鎿嶄綔</view>
</view>
<!-- body -->
<view class="swiper-body">
@@ -34,24 +42,36 @@
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
<swiper class="swiper-body-main" vertical="true"
- display-multiple-items="8"
- circular="true" :autoplay="true" :interval="3000" :duration="1000">
+ display-multiple-items="10"
+ circular="true" :autoplay="false" :interval="3000" :duration="1000" disable-touch='true'>
<swiper-item :class="item.inspectSts" class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 10%;">{{i+1}}</view>
- <view style="width: 25%;">{{item.maktx}}</view>
- <view style="width: 15%;">{{item.storeReplenishment}}</view>
- <view style="width: 15%;color: chartreuse;">{{item.storeAdd}}</view>
- <view style="width: 15%;">
- <text class="beBatch1" v-if="item.beBatch == 2">
- {{item.beBatch$}}
- </text>
- <text class="beBatch2" v-if="item.beBatch != 2">
- {{item.beBatch$}}
- </text>
+ <view class="item-box" style="width: 10%;" >{{item.suppCode ? item.suppCode : '--'}}</view>
+ <view class="item-box" style="width: 15%;">{{item.maktx}}</view>
+ <view class="item-box" style="width: 15%;">{{item.storeReplenishment}}</view>
+ <view class="item-box" style="width: 15%;">
+
+ <text style="color: #25E51E ;" v-if="item.inspectSts == 'inspectWhite'">{{item.storeAdd}}</text>
+ <text v-if="item.inspectSts == 'inspectRed'">{{item.storeAdd}}</text>
</view>
- <view style="width: 10%;">{{item.appeTime$}}</view>
- <view style="width: 10%;">{{item.overTime$ ? item.overTime$ : '--'}}</view>
+ <view class="item-box" style="width: 15%;">
+ <text class="beBatch1" v-if="item.beBatch == 2 ">
+ {{item.beBatch$}}
+ </text>
+ <text class="beBatch2" v-if="item.beBatch != 2 ">
+ {{item.beBatch$}}
+ </text>
+ <!-- <text class="beBatch3" v-if="item.inspectSts != 'inspectWhite'">
+ {{item.beBatch$}}
+ </text> -->
+ </view>
+ <view class="item-box" style="width: 10%;">{{item.appeTime$}}</view>
+ <view class="item-box" style="width: 10%;">{{item.overTime$}}</view>
+ <view class="item-box" style="width: 9.5%;">
+ <button class="start-btn" size="mini" v-if="item.beBatch == 1" @click="complete(item.matnr)">寮�濮�</button>
+ <button class="end-btn" size="mini" v-if="item.beBatch == 2" @click="cancel(item.matnr)">瀹屾垚</button>
+ </view>
</swiper-item>
+ <view style="height: 1px;"></view>
</swiper>
</view>
</view>
@@ -128,7 +148,28 @@
</view>
</view>
</view>
- </view>
+ <!-- 纭鏄惁鎿嶄綔 -->
+ <view>
+ <uni-popup ref="inputDialog" type="dialog">
+ <uni-popup-dialog :type="msgType" :title="dialogTitle" :content="dialogContent" @confirm="dialogConfirm"
+ @close="dialogClose"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <!-- 鎿嶄綔鎴愬姛澶辫触寮圭獥 -->
+ <view>
+ <!-- 鎻愮ず淇℃伅寮圭獥 -->
+ <uni-popup ref="message" type="message">
+ <uni-popup-message :type="messageType" :message="messageText" :duration="3000"></uni-popup-message>
+ </uni-popup>
+ </view>
+ <view class="board">
+ <uni-transition ref="ani" custom-class="transition" :mode-class="newModeClass" :show="errorBoardShow">
+ <view class="error-board">
+ <text v-for="item in carInfo">{{item}}</text>
+ </view>
+ </uni-transition>
+ </view>
+ </view>
</template>
<script>
@@ -137,6 +178,18 @@
export default {
data() {
return {
+ newModeClass: 'slide-top',
+ errorBoardShow: false,
+ carInfo: [],
+ type: 'center',
+ msgType: 'success',
+ messageType: 'success',
+ messageText: '杩欐槸涓�鏉℃垚鍔熸彁绀�',
+ dialogTitle: '',
+ value: '',
+ dialogContent: '纭寮�濮嬭绗旇ˉ璐х墿鏂欙紵',
+ matnr: '',
+ dialogType: 0,
series: [],
homeViewShow: false,
infoViewShow: true ,
@@ -194,14 +247,7 @@
error: ""
},
swiperList: [
- {
- maktx: 1,
- storeReplenishment: '123123',
- storeAdd: '123123',
- beBatch$: '123',
- appeTime$: '2024骞�3鏈�1鏃� 21鐐�14鍒�',
- overTime$: '2024骞�3鏈�1鏃� 21鐐�14鍒�'
- }
+
],
inspect: 'inspectRed'
}
@@ -229,13 +275,15 @@
onLoad() {
setInterval(()=>{
// this.getServerData()
- // this.getDate2()
// this.getUrl()
// this.getInfo()
// this.getError()
// this.getInfo2()
// this.getError2()
- // this.getInfo3()
+ this.getDate2()
+ this.getInfo3()
+ this.getCarInfo()
+ // this.getInfo4()
// this.controller()
},1000)
@@ -251,6 +299,39 @@
// },600000)
},
methods: {
+ // 寮傚父淇℃伅
+ getCarInfoTest() {
+ let that = this
+ var result = ycqdata.carError
+ var res = result.data
+ that.carInfoModel(res)
+ },
+ getCarInfo() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/mobile/error/list1",
+ method: "GET",
+ success(result) {
+ var res = result.data
+ that.carInfoModel(res)
+ }
+ })
+ },
+ carInfoModel(res) {
+ let infoList = []
+
+ if (res.code == 200 && res.data != '') {
+ let str = ''
+ for (let k of res.data) {
+ str = `${k.tsakNo1}-${k.errName}`
+ infoList.push(str)
+ }
+ this.carInfo = infoList
+ this.errorBoardShow = true
+ } else {
+ this.errorBoardShow = false
+ }
+ },
// 鏃ュ巻 鏈嶅姟鍣�
getDate2() {
let that = this
@@ -258,17 +339,59 @@
return
}
uni.request({
- url: that.commonUrl + "/monitor/date",
+ url: that.commonUrl + "/mobile/date",
method:"GET",
success(result) {
// console.log(result);
var res = result.data.data
- that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+ that.calendar = res.hour + ":" + res.minute + ":" + res.second + " " + res.year + "-" + res.month + "-" + res.day
that.currDate = res.year + "/" + res.month + "/" + res.day
},
fail(res) {
}
+ })
+ },
+ // 寮�濮嬫寜閽�
+ complete(matnr) {
+ this.matnr = matnr
+ this.dialogTitle = `鍝佺暘锛�${matnr}`
+ this.dialogType = 1
+ this.dialogContent = '纭寮�濮嬭绗旇ˉ璐х墿鏂欙紵'
+ this.$refs.inputDialog.open()
+ },
+ // 缁撴潫鎸夐挳
+ cancel(matnr) {
+ this.matnr = matnr
+ this.dialogTitle = `鍝佺暘锛�${matnr}`
+ this.dialogType = 2
+ this.dialogContent = '纭瀹屾垚璇ョ瑪琛ヨ揣鐗╂枡锛�'
+ this.$refs.inputDialog.open()
+ },
+ // 寮圭獥鍙栨秷
+ dialogClose() {
+ this.$refs.inputDialog.close()
+ },
+ // 寮圭獥纭
+ dialogConfirm() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/LocDetlReplenishmentController/hand/control/re",
+ method:"GET",
+ data: {matnr:that.matnr,type: that.dialogType},
+ success(result) {
+ console.log(result);
+ var res = result.data
+ if (res.code === 200) {
+ that.messageType = 'success'
+ that.messageText = `鎿嶄綔鎴愬姛`
+ that.$refs.message.open()
+ } else {
+ that.messageType = 'error'
+ that.messageText = res.msg
+ that.$refs.message.open()
+ }
+ }
})
},
getUrl() {
@@ -314,6 +437,7 @@
method:"GET",
data: {ledId:that.baseLedId},
success(result) {
+ // console.log(result);
var res = result.data
for (let k of res.data) {
if (k.inspect == 1) {
@@ -325,6 +449,19 @@
that.swiperList = res.data
}
})
+ },
+ getInfo4() {
+ let result = ycqdata.dataError3
+ var res = result.data
+ for (let k of res.data) {
+ if (k.inspect == 1) {
+ k['inspectSts'] = 'inspectWhite'
+ } else {
+ k['inspectSts'] = 'inspectRed'
+
+ }
+ }
+ this.swiperList = res.data
},
getError2 () {
let that = this
@@ -641,7 +778,7 @@
.container{
width: 100vw;
min-height: 100vh;
- background-color: #00163E;
+ background-color: #083870;
color: #fff;
text-align: center;
@@ -666,23 +803,44 @@
.head {
width: 100vw;
height: 11vh;
- font-size:4vw;
+ font-size:3vw;
font-weight: 700;
- display: flex;
- align-items: center;
- justify-content: center;
- transform: scale(0.7);
+ display: grid;
+ grid-template-columns: 1fr 1fr 1fr;
}
- .head-image {
- width: 80%;
+ .head-mid {
+ height: 10vh;
+ background-image: url(../../static/head.png);
+ background-size: 100% 100%;
+ }
+ .head-left {
+ height: 6vh;
+ background-image: url(../../static/headleft.png);
+ background-size: 110% 100%;
+ transform: scaleX(-1);
+ }
+ .head-right {
+ height: 6vh;
+ background-image: url(../../static/headleft.png);
+ background-size: 110% 100%;
+ }
+ .logo {
position: absolute;
- z-index: 1;
+ left: 30%;
+ top: 90%;
+ width: 60%;
+ height: 110%;
+ background-image: url(../../static/DENSO_logo.png);
+ background-size: 60% 60%;
+ /* background-color: #55ff7f; */
+ background-repeat: no-repeat;
+ transform: scaleX(-1);
}
.time-tools {
position: absolute;
- right: 2%;
- top: 2%;
- font-size:1vw;
+ right: 4%;
+ top: 6%;
+ font-size:1.2vw;
transform: scale(0.8);
}
.button-left {
@@ -823,6 +981,7 @@
.info-box {
width: 98%;
height: 98%;
+ background-color: #032246;
}
/* 寮傚父淇℃伅 */
.error-info-view {
@@ -928,25 +1087,71 @@
justify-content: center;
}
.beBatch1 {
- padding: 18rpx;
- background-color: #fec652;
- height: 60rpx;
- text-align: center;
- line-height: 60rpx;
- border-radius: 10rpx;
+ color: #ffba02;
+ padding: 4rpx 10rpx;
+ background-color: #fff8e6;
+ font-weight: bold;
+ border-radius: 2rpx;
}
.beBatch2 {
- padding: 18rpx;
- background-color: #60b86b;
- height: 60rpx;
- text-align: center;
- line-height: 60rpx;
- border-radius: 10rpx;
+ color: #ff5454;
+ padding: 4rpx 10rpx;
+ background-color: #ffeded;
+ font-weight: bold;
+ border-radius: 2rpx;
}
.inspectRed {
- background-color: rgba(235, 104, 84, .6);
+ color: #F10F0F;
}
.inspectWhite {
- background-color: rgba(255, 255, 255, .4);
+ color: #FFF;
}
+ .item-box1 {
+ height: 98%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-left: 1px solid #7db2f7;
+ }
+ .item-box {
+ height: 98%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid #074a9a;
+ }
+ .start-btn {
+ color: #FFF;
+ background-color: #13ce66;
+ transform: scale(0.7);
+ }
+ .end-btn {
+ color: #FFF;
+ background-color: #1890ff;
+ transform: scale(0.7);
+ }
+ .popup {
+
+ }
+ .board {
+ position: absolute;
+ top: 0;
+ right: 0;
+ /* background-color: #aa00ff; */
+ /* height: 13vh; */
+ width: 100%;
+ /* box-shadow: rgba(0,0,0,.35) 0px 5px 15px; */
+ }
+
+ .error-board {
+ margin: .2rem;
+ height: 11vh;
+ background-color: #F56C6C;
+ box-shadow: rgba(0, 0, 0, .35) 0px 5px 15px;
+ border-radius: .2rem;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ font-size: 2rem;
+ }
</style>
--
Gitblit v1.9.1