From 40bdcff0cd425f25c3549771e92ec465bf4d7231 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 13:35:26 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 1241 +++-------------------------------------------------------
1 files changed, 75 insertions(+), 1,166 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 0b307aa..7e6d383 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -1,211 +1,10 @@
<template>
-<<<<<<< HEAD
<view class="container">
- <!-- 瀹佹尝鎹蜂赴椤圭洰 -->
- <uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
- <view class="home-view">
- <view class="head">
- <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
- </view>
- <!-- 鏃ュ巻 -->
- <view class="time-tools">{{calendar}}</view>
- <view class="button-left" @click="ejected()"></view>
- <view class="button-right" @click="ejected()"></view>
- <!-- 涓昏鍥� -->
- <view class="main">
- <view class="mian-item">
- <view class="mian-item-box">
- <y-box>
- <view class="box-item">
- <text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
- <text class="item-subTitle">Automatic Storageand Retrieval System</text>
- <text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</text>
- </view>
- <view class="box-item">
- <text class="item-title">浠撳簱鏁版嵁</text>
- <text class="item-subTitle">warehouse data</text>
- <view class="img-box">
-
- <view class="item-img">
- <image src="../../static/a1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/b1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">m</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/c1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
- </view>
- </view>
-
- <view class="item-img">
- <image src="../../static/d1.png" mode="aspectFit"></image>
- <view class="flex-col" style="width: calc(100% - 5vw);">
- <view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 10vw;">s</view>
- </view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
- </view>
- </view>
-
- </view>
- </view>
- <view class="box-item">
- <view class="flex-row" style="width: 100%;">
- <!-- 宸︿晶 -->
- <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
- <text class="item-title">搴撲綅浣跨敤鐜�</text>
- <text class="item-subTitle">EQUIPMENT USAGE THIS MONTH</text>
- </view>
- <!-- 鍙充晶 -->
- <view style="margin-left: auto;">
- <!-- 鐧惧垎姣� -->
- <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
- <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
- <text class="item-title">{{baseInfo.usedPr}}%</text>
- <text class="item-subTitle">鍚屾瘮涓婃湀 + 5%</text>
- </view>
- </view>
- </view>
-
- <view class="flex-col" style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
- <!-- 杩涘害鏉� -->
- <view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
- <view class="progressBar" style="width: 80%;height: 2vw;">
- <view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
- </view>
- <view style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
- </view>
- </view>
- </view>
- </y-box>
- </view>
- </view>
- <view class="mian-item">
- <view class="mian-item-box">
- <view style="width: 100%;height: 100%;">
- <view style="height: 35%;">
- <!-- 鎶樼嚎鍥� -->
- <y-box>
- <view class="box-item">
- <view class="flex-row" style="width: 100%;">
- <!-- 宸︿晶 -->
- <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
- <text class="item-title">鍏ュ嚭搴撶粺璁�</text>
- <text class="item-subTitle">ORDER STATISTICS</text>
- </view>
- <!-- 鍙充晶 -->
- <view style="margin-left: auto;">
- <!-- 鐧惧垎姣� -->
- <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
- <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
- <text class="item-title">31</text>
- <text class="item-subTitle">浠婃棩璁㈠崟鏁�</text>
- </view>
- </view>
- </view>
- <view class="charts-box">
- <qiun-data-charts type="line" :chartData="chartsDataLine1" :echartsH5="true" :echartsApp="true"/>
- </view>
- </view>
- </y-box>
- </view>
-
-
- <!-- null -->
- <view style="height: 2%;"></view>
-
-
- <view style="height: 43%;">
- <y-box>
- <view class="box-item">
- <view class="flex-row" style="width: 100%;">
- <!-- 宸︿晶 -->
- <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
- <text class="item-title">搴撳瓨绫诲瀷</text>
- <text class="item-subTitle">INCOME DATE</text>
- </view>
- <!-- 鍙充晶 -->
- <view style="margin-left: auto;">
- <!-- 鐧惧垎姣� -->
- <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
- <text class="item-title">浠婂ぉ</text>
- <text class="item-subTitle">Today</text>
- </view>
- </view>
- </view>
- <view class="flex-row" style="width: 100%;">
- <!-- 宸� -->
- <view class="charts-box-ring">
- <qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
- </view>
- <!-- 鍙� -->
- <view>
- <view class="flex-row sub-info">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.stockCount}}</view>
- </view>
- <view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/f1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.emptyCount}}</view>
- </view>
- <view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/e1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
- </view>
- </view>
- </view>
- </view>
-
- </y-box>
- </view>
- <view style="height: 2%;"></view>
- <view style="height: 18%;">
- <y-box>
- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
- <!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
- 鑷姩浠撳簱WCS鐩戞帶骞冲彴
- <!-- <image src="../../static/ruiyun.jpg" mode="" style="width: 100%;"></image> -->
- </view>
- </y-box>
- </view>
- </view>
- </view>
- </view>
- </view>
-
- </view>
- </uni-transition>
<!-- 鍏ㄦ澘/鎷ｆ枡淇℃伅 -->
<uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
<view class="home-view">
<view class="head">
- <text>{{infoText.title}}</text>
+ <text>鍏ュ簱灞�</text>
</view>
<!-- 鏃ュ巻 -->
<view class="time-tools">{{calendar}}</view>
@@ -219,11 +18,13 @@
<view class="text-content">
<!-- head -->
<view class="swiper-head">
- <view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
- <view style="width: 30%;">鍟嗗搧缂栧彿</view>
- <view style="width: 20%;">鍟嗗搧鍚嶇О</view>
- <view style="width: 20%;">瑙勬牸</view>
- <view style="width: 10%;">鏁伴噺</view>
+ <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>
<!-- body -->
<view class="swiper-body">
@@ -234,12 +35,21 @@
<swiper class="swiper-body-main" vertical="true"
display-multiple-items="8"
circular="true" :autoplay="true" :interval="3000" :duration="1000">
- <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 20%;">No:{{i+1}}</view>
- <view style="width: 30%;">{{item.matNo}}</view>
- <view style="width: 20%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.specs}}</view>
- <view style="width: 10%;">{{item.count}}</view>
+ <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>
+ <view style="width: 10%;">{{item.appeTime$}}</view>
+ <view style="width: 10%;">{{item.overTime$ ? item.overTime$ : '--'}}</view>
</swiper-item>
</swiper>
</view>
@@ -318,302 +128,17 @@
</view>
</view>
</view>
-=======
- <view class="container">
- <!-- 瀹佹尝鎹蜂赴椤圭洰 -->
- <uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
- <view class="home-view">
- <view class="head">
- <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
- </view>
- <!-- 鏃ュ巻 -->
- <view class="time-tools">{{calendar}}</view>
- <view class="button-left" @click="ejected()"></view>
- <view class="button-right" @click="ejected()"></view>
- <!-- 涓昏鍥� -->
- <view class="main">
- <view class="mian-item">
- <view class="mian-item-box">
- <y-box>
- <view class="box-item">
- <text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
- <text class="item-subTitle">Automatic Storageand Retrieval System</text>
- <text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</text>
- </view>
- <view class="box-item">
- <text class="item-title">浠撳簱鏁版嵁</text>
- <text class="item-subTitle">warehouse data</text>
- <view style="width: 100%;">
- <table style="width: 100%;font-size:1vw;">
- <tr><th>鎺掑悕</th><th>鏂欏彿</th><th>鍚嶇О</th><th>鏁伴噺</th></tr>
- <tr v-for="(item,i) in tableList" :key="i">
- <td>top {{i+1}}</td>
- <td>{{item.matnr}}</td>
- <td>{{item.maktx}}</td>
- <td>{{item.anfme}}</td>
- </tr>
- </table>
- </view>
- </view>
- <view class="box-item">
- <view class="flex-row" style="width: 100%;">
- <!-- 宸︿晶 -->
- <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
- <text class="item-title">搴撲綅浣跨敤鐜�</text>
- <text class="item-subTitle">EQUIPMENT USAGE THIS MONTH</text>
- </view>
- <!-- 鍙充晶 -->
- <view style="margin-left: auto;">
- <!-- 鐧惧垎姣� -->
- <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
- <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
- <text class="item-title">{{baseInfo.usedPr}}%</text>
- <text class="item-subTitle">鍚屾瘮涓婃湀 + 5%</text>
- </view>
- </view>
- </view>
-
- <view class="flex-col" style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
- <!-- 杩涘害鏉� -->
- <view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
- <view class="progressBar" style="width: 80%;height: 2vw;">
- <view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
- </view>
- <view style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
- </view>
- </view>
- </view>
- </y-box>
- </view>
- </view>
- <view class="mian-item">
- <view class="mian-item-box">
- <view style="width: 100%;height: 100%;">
- <view style="height: 35%;">
- <!-- 鎶樼嚎鍥� -->
- <y-box>
- <view class="box-item">
- <view class="flex-row" style="width: 100%;">
- <!-- 宸︿晶 -->
- <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
- <text class="item-title">鍏ュ嚭搴撶粺璁�</text>
- <text class="item-subTitle">ORDER STATISTICS</text>
- </view>
- <!-- 鍙充晶 -->
- <view style="margin-left: auto;">
- <!-- 鐧惧垎姣� -->
- <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
- <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
- <text class="item-title">{{pakin}} / {{pikout}}</text>
- <text class="item-subTitle">浠婃棩鍏�/鍑烘暟</text>
- </view>
- </view>
- </view>
- <view class="charts-box">
- <qiun-data-charts type="line" :chartData="chartsDataLine1" :echartsH5="true" :echartsApp="true"/>
- </view>
- </view>
- </y-box>
- </view>
-
-
- <!-- null -->
- <view style="height: 2%;"></view>
-
-
- <view style="height: 43%;">
- <y-box>
- <view class="box-item">
- <view class="flex-row" style="width: 100%;">
- <!-- 宸︿晶 -->
- <view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
- <text class="item-title">搴撳瓨绫诲瀷</text>
- <text class="item-subTitle">INCOME DATE</text>
- </view>
- <!-- 鍙充晶 -->
- <view style="margin-left: auto;">
- <!-- 鐧惧垎姣� -->
- <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
- <text class="item-title">浠婂ぉ</text>
- <text class="item-subTitle">Today</text>
- </view>
- </view>
- </view>
- <view class="flex-row" style="width: 100%;">
- <!-- 宸� -->
- <view class="charts-box-ring">
- <qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
- </view>
- <!-- 鍙� -->
- <view>
- <view class="flex-row sub-info">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;font-family: DS-DIGI-1;">{{baseInfo.stockCount}}</view>
- </view>
- <view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/f1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;font-family: DS-DIGI-1;">{{baseInfo.emptyCount}}</view>
- </view>
- <view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/e1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;font-family: DS-DIGI-1;">{{baseInfo.noneCount}}</view>
- </view>
- </view>
- </view>
- </view>
-
- </y-box>
- </view>
- <view style="height: 2%;"></view>
- <view style="height: 18%;">
- <y-box>
- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
- <!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
- 鑷姩浠撳簱WCS鐩戞帶骞冲彴
- <!-- <image src="../../static/ruiyun.jpg" mode="" style="width: 100%;"></image> -->
- </view>
- </y-box>
- </view>
- </view>
- </view>
- </view>
- </view>
-
- </view>
- </uni-transition>
- <!-- 鍏ㄦ澘/鎷ｆ枡淇℃伅 -->
- <uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
- <view class="home-view">
- <view class="head">
- <text>{{infoText.title}}</text>
- </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">
- <y-box>
- <!-- 鏂囨湰瀹瑰櫒 -->
- <view class="text-content">
- <!-- head -->
- <view class="swiper-head">
- <view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
- <view style="width: 30%;">鍟嗗搧缂栧彿</view>
- <view style="width: 20%;">鍟嗗搧鍚嶇О</view>
- <view style="width: 20%;">鎵规</view>
- <view style="width: 10%;">鏁伴噺</view>
- </view>
- <!-- body -->
- <view class="swiper-body">
- <!-- swiper 涓�浜涜鏄�
- circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
- vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
- display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
- <swiper class="swiper-body-main" vertical="true"
- display-multiple-items="8"
- circular="true" :autoplay="true" :interval="3000" :duration="1000">
- <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 20%;">No:{{i+1}}</view>
- <view style="width: 30%;">{{item.matnr}}</view>
- <view style="width: 20%;">{{item.maknx}}</view>
- <view style="width: 20%;">{{item.batch}}</view>
- <view style="width: 10%;">{{item.count}}</view>
- </swiper-item>
- </swiper>
- </view>
- </view>
- </y-box>
- </view>
- </view>
- </view>
- </uni-transition>
- <!-- 寮傚父淇℃伅 -->
- <uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
- <view class="error-info-view">
- <view class="head">
- <text>{{infoText.title}}</text>
- </view>
- <!-- 鏃ュ巻 -->
- <view class="time-tools">{{calendar}}</view>
- <view class="button-left"></view>
- <view class="button-right"></view>
- <!-- 涓讳綋 -->
- <view class="info-main" >
- <view class="info-box">
- <y-box>
- <view class="info-box-text">
- <view class="flex-col info-box-text-item">{{infoText.error}}</view>
- </view>
- </y-box>
- </view>
- </view>
- </view>
- </uni-transition>
-
- <!-- 鑷畾涔夊脊鍑哄眰 -->
- <view class="eject-mask" v-show="ejectShow">
- <view class="eject">
- <!-- 寮瑰嚭title -->
- <view class="eject-title">淇敼 / 閰嶇疆</view>
- <!-- input -->
- <view class="eject-input">
- <view class="item">
- <view class="desc">ip锛�</view>
- <view class="input">
- <input type="text" v-model="baseIP">
- </view>
- </view>
- <view class="item">
- <view class="desc">port锛�</view>
- <view class="input">
- <input type="text" v-model="basePort">
- </view>
- </view>
- <view class="item">
- <view class="desc">ledId锛�</view>
- <view class="input">
- <input type="text" v-model="baseLedId">
- </view>
- </view>
- <view class="item">
- <view class="desc">CrnId锛�</view>
- <view class="input">
- <input type="text" v-model="baseCrnId">
- </view>
- </view>
- <view class="item">
- <view class="desc">Url锛�</view>
- <view class="input">
- <input type="text" v-model="baseUrl">
- </view>
- </view>
- </view>
- <!-- button -->
- <view class="eject-button">
- <view class="button-item" @click="ejectClose">鍙� 娑�</view>
- <view class="button-item" @click="ejectConfirm">纭� 璁�</view>
- </view>
- </view>
- </view>
- </view>
->>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
</template>
<script>
-<<<<<<< HEAD
import demodata from '@/mockdata/demodata.json';
import ycqdata from '@/pages/index/data.json';
export default {
data() {
return {
series: [],
- homeViewShow: true,
- infoViewShow: false ,
+ homeViewShow: false,
+ infoViewShow: true ,
errorInfoViewShow: false,
homeMode: [],
infoMode: [],
@@ -667,7 +192,8 @@
count: "",
error: ""
},
- swiperList: []
+ swiperList: [],
+ inspect: 'inspectRed'
}
},
onShow() {
@@ -689,147 +215,30 @@
that.basePort = BasePort
that.baseCrnId = BaseCrnId
this.getUrl()
- setTimeout(()=>{
-=======
- import demodata from '@/mockdata/demodata.json';
- import ycqdata from '@/pages/index/data.json';
- export default {
- data() {
- return {
- series: [],
- homeViewShow: true,
- infoViewShow: false ,
- errorInfoViewShow: false,
- homeMode: [],
- infoMode: [],
- errorInfoMode: [],
- baseInfo: {
- xDistance: 1,
- yDistance: 2,
- xDuration: 3,
- yDuration: 4,
- usedPr: 50,
- used: 3537,
- stockCount: '',
- emptyCount: '',
- noneCount: '',
- },
- chartsData: {
- "Line": {
- "categories": [],
- "series": []
- },
- "Pie": {
- "series": [{
- "data": []
- }]
- },
- },
- duration: 1000,
- calendar: '',
- ringOpts:{},
- chartsDataLine1: {},
- chartsDataPie2: {},
- fontSize: '',
- height: '',
- showCharts: false,
- ejectShow: false,
- baseIP: '',
- basePort: '',
- baseLedId: '',
- baseCrnId: '',
- baseUrl: '',
- info: null,
- error: null,
- infoType: 0,
- text: '',
- infoText: {
- title: '',
- staNo: "",
- matnr: "",
- maknx: "",
- batch: "",
- count: "",
- error: ""
- },
- swiperList: [],
- tableList: [],
- pakin: 10,
- pikout: 20,
- }
- },
- onShow() {
- // 闅愯棌鏃堕棿,鐢甸噺,淇″彿绛�
- // #ifdef APP-PLUS
- plus.navigator.setFullscreen(true)
- // #endif
- },
- mounted() {
- let that = this
- const BaseIP = uni.getStorageSync('BaseIp');
- const BaseLedId = uni.getStorageSync('BaseLedId');
- const BasePort = uni.getStorageSync('BasePort');
- const BaseCrnId = uni.getStorageSync('BaseCrnId');
- const PROJ = uni.getStorageSync('UPROJ');
- that.baseUrl = PROJ
- that.baseIP = BaseIP
- that.baseLedId = BaseLedId
- that.basePort = BasePort
- that.baseCrnId = BaseCrnId
- // this.getUrl()
- },
- onLoad() {
- setInterval(()=>{
->>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
-<<<<<<< HEAD
- setTimeout(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- setTimeout(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- },500)
- },500)
- },500)
},
onLoad() {
setInterval(()=>{
- this.getServerData()
- this.getDate2()
- this.getUrl()
-=======
- this.getDate2()
->>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
- this.getInfo()
- this.getError()
+ // this.getServerData()
+ // this.getDate2()
+ // this.getUrl()
+ // this.getInfo()
+ // this.getError()
// this.getInfo2()
// this.getError2()
- this.controller()
-<<<<<<< HEAD
-=======
- // 娴嬭瘯鐢�
- this.getTop()
->>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
+ this.getInfo3()
+ // this.controller()
},1000)
// setInterval(()=>{
// this.changeErrorShow()
// },5000)
- setInterval(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- },600000)
+ // setInterval(()=>{
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
+ // },600000)
},
methods: {
// 鏃ュ巻 鏈嶅姟鍣�
@@ -842,244 +251,16 @@
url: that.commonUrl + "/monitor/date",
method:"GET",
success(result) {
-<<<<<<< HEAD
// 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.currDate = res.year + "/" + res.month + "/" + res.day
-=======
- var res = result.data
- if (res.data && res.data !== "") {
- var errorInfo = res.data
- if (that.infoType == 1) {
- that.infoType = 3
- that.infoText.title = "鍏朵粬淇℃伅"
- // that.infoText.title = "寮傚父"
- that.infoText.error = errorInfo
- return
- }
- that.infoType = 2
- that.infoText.title = "鍏朵粬淇℃伅"
- // that.infoText.title = "寮傚父"
- that.infoText.error = errorInfo
- } else {
- if (that.infoType == 1) {
- return
- }
- that.infoType = 0
- }
- }
- })
-
- },
- // 鎺у埗鍣�
- controller() {
- switch(this.infoType) {
- // 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
- case 1:
- if (this.homeViewShow) {
- this.homeViewShow = false
- this.homeMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.infoViewShow = true
- this.infoMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.errorInfoViewShow) {
- this.errorInfoViewShow = false
- this.errorInfoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.infoViewShow = true
- this.infoMode = ['fade', 'slide-bottom']
- },1000)
- }
-
- return;
- // 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
- case 2:
- if (this.homeViewShow) {
- this.homeViewShow = false
- this.homeMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.errorInfoViewShow = true
- this.errorInfoMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.infoViewShow) {
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.errorInfoViewShow = true
- this.errorInfoMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
- // 鏈変俊鎭� 涓� 鏈夐敊璇俊鎭�
- case 3:
- if (this.homeViewShow) {
- this.homeViewShow = false
- this.homeMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.errorInfoViewShow = true
- this.errorInfoMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.infoViewShow) {
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.errorInfoViewShow = true
- this.errorInfoMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
- default :
- if (this.errorInfoViewShow) {
- this.errorInfoViewShow = false
- this.errorInfoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.infoViewShow) {
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
- }
-
- },
- // 涓诲睆骞�
- handle(type) {
- this.homeViewShow = !this.homeViewShow
- this.modeClass = type
- },
- // 鎷ｆ枡
- handle1(type) {
- this.infoViewShow = !this.infoViewShow
- this.modeClass = type
- },
- // 寮傚父
- handle2(type) {
- this.errorInfoViewShow = !this.errorInfoViewShow
- this.modeClass = type
- },
- // 閰嶇疆
- ejected () {
- this.ejectShow = true
- },
- // 鍙栨秷閰嶇疆
- ejectClose() {
- this.ejectShow = false
- },
- // 纭閰嶇疆
- ejectConfirm() {
- uni.setStorageSync('BaseIp', this.baseIP);
- uni.setStorageSync('BaseLedId', this.baseLedId);
- uni.setStorageSync('BasePort',this.basePort);
- uni.setStorageSync('BaseCrnId',this.baseCrnId);
- uni.setStorageSync('UPROJ',this.baseUrl);
- this.getUrl()
- this.ejectShow = false
- },
- // 鏃ュ巻
- getDate() {
- var dt = new Date();
- var year,month,day,hours,minutes,seconds,weeks
- year = dt.getFullYear();
- month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
- day = dt.getDate() < 10 ? '0'+dt.getDate() : dt.getDate();
- hours = dt.getHours() < 10 ? '0' + dt.getHours() : dt.getHours();
- minutes = dt.getMinutes() < 10 ? '0' + dt.getMinutes() : dt.getMinutes();
- seconds = dt.getSeconds() < 10 ? '0' + dt.getSeconds() : dt.getSeconds();
- weeks = dt.getDay();
- switch (weeks) {
- case 0: weeks = "鏄熸湡鏃�"; break;
- case 1: weeks = "鏄熸湡涓�"; break;
- case 2: weeks = "鏄熸湡浜�"; break;
- case 3: weeks = "鏄熸湡涓�"; break;
- case 4: weeks = "鏄熸湡鍥�"; break;
- case 5: weeks = "鏄熸湡浜�"; break;
- default : weeks = "鏄熸湡鍏�";
- }
- this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
- },
- // 鏃ュ巻 鏈嶅姟鍣�
- getDate2() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/date",
- method:"GET",
- success(result) {
- var res = result.data.data
- that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
- that.currDate = res.year + "/" + res.month + "/" + res.day
- }
- })
- },
- getDateFormat(value) {
- var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
- date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
- var m = date.getMonth() + 1
- var d = date.getDate()
- var newDate = m + '-' + d
- return newDate
- },
- /*************** 鎶樼嚎鍥� *****************************************************************************************************/
- initlineChart() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/line/charts",
- method:'GET',
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.chartsData.Line.categories = [
- that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
- that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
- that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
- that.chartsData.Line.series = res.data.rows
- that.pakin = res.data.rows[0].data[11]
- that.pikout = res.data.rows[1].data[11]
- }
- }
- })
- },
- /*************** 楗煎浘 *****************************************************************************************************/
- initPieChart() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/loc/rep",
- method:'GET',
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.chartsData.Pie.series[0].data = res.data.pie
- that.baseInfo.stockCount = res.data.stockCunt
- that.baseInfo.emptyCount = res.data.emptyCount
- that.baseInfo.noneCount = res.data.noneCount
- that.baseInfo.used = res.data.used
- that.baseInfo.usedPr = res.data.usedPr
- }
- }
- })
- },
- getOther() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/other",
- data: {
- crnId: that.baseCrnId,
- ledId: that.baseLedId,
->>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
},
fail(res) {
}
})
},
-<<<<<<< HEAD
getUrl() {
this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
@@ -1116,6 +297,25 @@
that.infoType = 0
}
},
+ getInfo3() {
+ let that = this
+ uni.request({
+ url: that.commonUrl + "/open/loc/query/auth/v1",
+ method:"GET",
+ data: {ledId:that.baseLedId},
+ success(result) {
+ var res = result.data
+ for (let k of res.data) {
+ if (k.inspect == 1) {
+ k['inspectSts'] = 'inspectWhite'
+ } else {
+ k['inspectSts'] = 'inspectRed'
+ }
+ }
+ that.swiperList = res.data
+ }
+ })
+ },
getError2 () {
let that = this
let result = ycqdata.dataError2
@@ -1412,25 +612,9 @@
}
}
-=======
- // 鑾峰彇top鍦ㄥ簱
- getTop() {
- let that = this
- uni.request({
- url: that.commonUrl + '/monitor/loc/top',
- success(res) {
- that.tableList = res.data.data
- }
- })
- }
- }
-
- }
->>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
</script>
<style>
-<<<<<<< HEAD
/* @import url("../../static/css/common.css"); */
@import url("home.css");
/* 鍒� */
@@ -1727,301 +911,26 @@
height: 20%;font-size: 8vh;
justify-content: center;
}
-</style>
-=======
- /* @import url("../../static/css/common.css"); */
- @import url("home.css");
- @font-face {
- font-style: normal;
- font-family: DS-DIGI-1;
- src: url('../../static/font-family/DS-DIGI-1.ttf');
- }
-
- /* 鍒� */
- .flex-col {
- display: flex;
- flex-direction: column;
- }
- /* 琛� */
- .flex-row {
- display: flex;
- flex-direction: row;
- }
-
- .container{
- width: 100vw;
- min-height: 100vh;
- background-color: #00163E;
- color: #fff;
+ .beBatch1 {
+ padding: 18rpx;
+ background-color: #60b86b;
+ height: 60rpx;
text-align: center;
-
+ line-height: 60rpx;
+ border-radius: 10rpx;
}
- /* 涓昏鍥� */
- .home-view {
- width: 100vw;
- min-height: 100vh;
- background-image: url(../../static/background.png);
- background-size: 100vw 100vh;
- }
- .home-right {
- width: 50vw;
- height: 89vh;
- /* background-color: cadetblue; */
- }
- .home-right-box {
- width: 98%;
- height: 98%;
- }
- .head {
- width: 100vw;
- height: 11vh;
- font-size:4vw;
- font-weight: 700;
- display: flex;
- align-items: center;
- justify-content: center;
- transform: scale(0.7);
- }
- .time-tools {
- position: absolute;
- right: 2%;
- top: 2%;
- font-size:1vw;
- font-family: DS-DIGI-1;
- }
- .button-left {
- position: absolute;
- background-image: url(../../static/right.png);
- background-size: 100% 100%;
- top: 1.8%;
- left: 21.3%;
- width: 13.5%;
- height: 8.5%;
- transform: scaleX(-1);
- }
- .button-right {
- position: absolute;
- background-image: url(../../static/right.png);
- background-size: 100% 100%;
- top: 1.8%;
- left: 65%;
- width: 13.5%;
- height: 8.5%;
- }
-
- .item-img {
- width: 50%;
- margin-top: 5%;
- display: flex;
- flex-direction: row;
- /* background-color: #00ffff; */
- justify-content: flex-start;
- align-items: flex-start;
- }
- .distance {
-
- }
- .item-img image {
- height: 5vw;
- width: 5vw;
- }
- .progressBar {
- margin-top: 9%;
- /* width: 100%; */
- height: 20%;
- background-color: #233751;
- border-radius: 5vw;
- }
- .progress {
- /* width: 90%; */
- height: 100%;
- background-color: #FF5722;
- border-radius: 5vw;
- }
- .charts-box {
- width: 80%;
- height: 24vh;
- margin-left: 10%;
- }
- .charts-box-ring {
- width: 50%;
- height: 24vh;
- /* background-color: #00ffff; */
- }
- .sub-info {
- font-size: 1.5vw;
- }
- .sub-info image {
- width: 3.5vw;
- height: 3.5vw;
- }
-
-
-
-
- /* 鍏辩敤 */
- .main {
- width: 100vw;
- height: 88vh;
- margin-top: 1vh;
- display: flex;
-
- }
- .mian-item {
- width: 50%;
- height: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- }
- .mian-item-box {
- width: 98%;
- height: 98%;
- }
- .box-item {
- width: 100%;
- margin-top: 4%;
- display: flex;
- flex-direction: column;
- align-items: flex-start;
- justify-content: flex-start;
- }
- .item-title {
- font-size:1.5vw;
- font-weight: 700;
- }
- .item-subTitle {
- font-size:0.5vw;
- text-indent: 0em;
- }
- .item-text {
- font-size: 1vw;
- text-indent: 2em;
- letter-spacing: 1px;
- line-height: 3vh;
- }
-
- /* 鍏ㄦ澘/鎷ｆ枡淇℃伅 */
- .info-view {
- width: 100vw;
- min-height: 100vh;
- background-image: url(../../static/background.png);
- background-size: 100vw 100vh;
- }
- .info-main {
- width: 100vw;
- height: 88vh;
- display: flex;
- justify-content: center;
- align-items: center;
- }
- .info-box {
- width: 98%;
- height: 98%;
- }
- /* 寮傚父淇℃伅 */
- .error-info-view {
- width: 100vw;
- min-height: 100vh;
- background-image: url(../../static/background.png);
- background-size: 100vw 100vh;
- }
-
- /* 寮瑰嚭:閰嶇疆鍖哄煙 */
- .eject-mask {
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.5);
- position: fixed;
- top: 0;
- left: 0;
- z-index: 999;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- .eject{
- position: relative;
- width: 40vw;
- height: 40vh;
- background-color: #fff;
- border-radius: 2rem;
- }
- .eject-title {
- width: 100%;
- height: 5vh;
- line-height: 6vh;
- font-size: 3vh;
- font-weight: 700;
- color: #606266;
+ .beBatch2 {
+ padding: 18rpx;
+ background-color: #fec652;
+ height: 60rpx;
text-align: center;
+ line-height: 60rpx;
+ border-radius: 10rpx;
}
- .eject-input {
-
+ .inspectRed {
+ background-color: rgba(235, 104, 84, .6);
}
- .item {
- display: flex;
- align-items: center;
- margin: 2vh 0 0 0;
- font-size: 1.5vw;
- color: #363636;
- }
- .desc {
- display: inline-block;
- width: 40%;
- text-align: right;
- color: #606266;
-
- }
- .input {
- display: flex;
- align-items: center;
- padding-left: 5px;
- padding-right: 5px;
- width: 100%;
- height: 3vh;
- border: 0.1vh solid #cfd4dc;
- margin-right: 20%;
- text-align: start;
- }
- .eject-input input {
- width: 100%;
- height: 3vh;
- font-size: 1vw;
-
-
- }
- .eject-button {
- display: flex;
- align-items: center;
- position: absolute;
- bottom: 0;
- height: 6vh;
- line-height: 6vh;
- width: 100%;
- border-top: 1px solid #ccc;
- }
- .button-item {
- width: 50%;
- height: 100%;
- font-size: 1.5vw;
- font-weight: bold;
- text-align: center;
- color: #909399;
- }
- .button-item:last-child {
- color: #67C23A;
-
- border-left: 1px solid #ccc;
- }
- .info-box-text {
- width: 100%;height: 100%;
- display: flex;flex-direction: column;align-items: center;justify-content: center;
- }
- .info-box-text-item {
- height: 20%;font-size: 8vh;
- justify-content: center;
+ .inspectWhite {
+ background-color: rgba(255, 255, 255, .4);
}
</style>
->>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
--
Gitblit v1.9.1