From 8db8083d8d2ae3b9fd18f43f796235977423bfea Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 03 十一月 2023 09:36:34 +0800
Subject: [PATCH] #
---
/dev/null | 25 ------------
Monitor-APP/pages/index.vue | 20 ++--------
Monitor-APP/pages.json | 72 ++++++++++++++++++------------------
3 files changed, 40 insertions(+), 77 deletions(-)
diff --git a/Monitor-APP/pages.json b/Monitor-APP/pages.json
index 81bde86..4386521 100644
--- a/Monitor-APP/pages.json
+++ b/Monitor-APP/pages.json
@@ -1,26 +1,6 @@
{
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
{
- "path": "pages/test/test",
- "style": {
- "navigationStyle": "custom",
- // 鍘绘帀椤堕儴瀵艰埅鏍�
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
- "path": "pages/home/home",
- "style": {
- "navigationStyle": "custom",
- // 鍘绘帀椤堕儴瀵艰埅鏍�
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
"path": "pages/index",
"style": {
"navigationStyle": "custom",
@@ -29,23 +9,43 @@
"titleNView": false
}
}
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationStyle": "custom",
- // 鍘绘帀椤堕儴瀵艰埅鏍�
- "app-plus": {
- "titleNView": false
- }
- }
- },
- {
- "path": "pages/index/monitor",
- "style": {
- "navigationStyle": "custom"
- }
}
+ // {
+ // "path": "pages/home/home",
+ // "style": {
+ // "navigationStyle": "custom",
+ // // 鍘绘帀椤堕儴瀵艰埅鏍�
+ // "app-plus": {
+ // "titleNView": false
+ // }
+ // }
+ // },
+ // {
+ // "path": "pages/index",
+ // "style": {
+ // "navigationStyle": "custom",
+ // // 鍘绘帀椤堕儴瀵艰埅鏍�
+ // "app-plus": {
+ // "titleNView": false
+ // }
+ // }
+ // },
+ // {
+ // "path": "pages/index/index",
+ // "style": {
+ // "navigationStyle": "custom",
+ // // 鍘绘帀椤堕儴瀵艰埅鏍�
+ // "app-plus": {
+ // "titleNView": false
+ // }
+ // }
+ // },
+ // {
+ // "path": "pages/index/monitor",
+ // "style": {
+ // "navigationStyle": "custom"
+ // }
+ // }
],
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
deleted file mode 100644
index e34c0e7..0000000
--- a/Monitor-APP/pages/home/home.css
+++ /dev/null
@@ -1,36 +0,0 @@
-.text-content {
- width: 100%;
- height: 100%;
- font-size: 44px;
- /* background-color: aliceblue; */
-}
-.swiper-head {
- width: 100%;
- height: 10%;
- background-color: rgba(54, 94, 226, 0.5);
- display: flex;
- /* grid-template-columns: 2fr 3fr 2fr 2fr 1fr; */
- align-items: center;
-
-}
-.swiper-body {
- width: 100%;
- height: 90%;
- /* background-color: #aa0000; */
-}
-.swiper-body-main {
- width: 100%;
- height: 100%;
- /* background-color: #00a8ff; */
-}
-.swiper-item {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- text-align: start;
- border-bottom: 2px solid #000;
- background-color: rgba(0, 0, 0, .2);
-}
-.swiper-item:nth-child(2n-1) {
- /* background-color: rgba(255, 255, 255, .1); */
-}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
deleted file mode 100644
index 2ef9df5..0000000
--- a/Monitor-APP/pages/home/home.vue
+++ /dev/null
@@ -1,1131 +0,0 @@
-<template>
- <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;">KM</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;">KM</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;">H</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;">H</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/vietnam.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: 30%;">鎵樼洏鐮�: {{infoText.barcode}}</view>
- <view style="width: 20%;">宸ヤ綔鍙�: {{infoText.workNo}}</view>
- <view style="width: 30%;">婧愬簱浣�: {{infoText.sourceLocNo}}</view>
- <view style="width: 20%;">鐩爣绔�: {{infoText.staNo}}</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="3"
- circular="true" :autoplay="true" :interval="3000" :duration="2000">
- <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
- <!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
- <view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
- <view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
-
-
- <view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
- <view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
- <view style="width: 30%;">澶囨敞: {{item.memo}}</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 -->
- <scroll-view scroll-y 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>
- </scroll-view>
- <!-- button -->
- <view class="eject-button">
- <view class="button-item" @click="ejectClose">鍙� 娑�</view>
- <view class="button-item" @click="ejectConfirm">纭� 璁�</view>
- </view>
- </view>
- </view>
- <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
- 杩炴帴瓒呮椂: {{times}} s
- </view>
- </view>
-</template>
-<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":7460,"staNo":110,"sourceStaNo":null,"locNo":null,"sourceLocNo":"0807102","matDtos":[{"matNo":"50460834","maknx":"200x60妗岄潰","count":26.0}],"emptyMk":false,"ioType":101}]} -->
-<script>
- 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: "",
- specs: "",
- count: "",
- error: "",
- barcode: ""
- },
- swiperList: [],
- timeOut: false,
- times: 0,
- currDate: ''
- }
- },
- 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(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
- // this.getDate()
- this.getDate2()
- this.getInfo()
- this.getError()
- // this.getInfo2()
- // this.getError2()
- this.getUrl()
- this.controller()
- // 娴嬭瘯鐢�
-
- },1000)
- },
- methods: {
- timeOut() {
- console.log(this.times);
- },
- getUrl() {
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
- },
- getServerData() {
- this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
- this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
- },
- // 鑾峰彇閿欒淇℃伅
- getInfo2() {
- let that = this
- var result = ycqdata.dataInfo2
- var res = result.data
- if (res.data && res.data !== "") {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
- that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- } else if(res.data[0].ioType === 107) {
- that.infoText.title = '鐩樼偣鍑哄簱'
- } else if(res.data[0].ioType === 1) {
- that.infoText.title = '鍏ュ簱'
- } else if(res.data[0].ioType === 10) {
- that.infoText.title = '绌烘墭鍏ュ簱'
- } else if(res.data[0].ioType === 110) {
- that.infoText.title = '绌烘墭鍑哄簱'
- }
- that.infoText.barcode = res.data[0].barcode
- that.infoText.workNo = res.data[0].workNo
- that.infoText.sourceLocNo = res.data[0].sourceLocNo
- that.infoText.staNo = res.data[0].staNo
- that.swiperList = res.data[0].matDtos
- // that.infoText.matnr = res.data[0].matDtos[0].matnr
- // that.infoText.specs = res.data[0].matDtos[0].specs
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
- },
- getError2 () {
- let that = this
- let result = ycqdata.dataError2
- 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
- }
- },
- getInfo() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/led",
- method:"GET",
- data: {ledId:that.baseLedId},
- success(result) {
- that.timeOut = false
- that.times = 0
- var res = result.data
- if (res.data && res.data !== "") {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
- that.infoType = 1
- if (res.data[0].ioType === 101) {
- that.infoText.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.infoText.title = '妫�鏂欏嚭搴�'
- } else if(res.data[0].ioType === 107) {
- that.infoText.title = '鐩樼偣鍑哄簱'
- } else if(res.data[0].ioType === 1) {
- that.infoText.title = '鍏ュ簱'
- } else if(res.data[0].ioType === 10) {
- that.infoText.title = '绌烘墭鍏ュ簱'
- } else if(res.data[0].ioType === 110) {
- that.infoText.title = '绌烘墭鍑哄簱'
- }
- that.infoText.barcode = res.data[0].barcode
- that.infoText.workNo = res.data[0].workNo
- that.infoText.sourceLocNo = res.data[0].sourceLocNo
- that.infoText.staNo = res.data[0].staNo
- that.swiperList = res.data[0].matDtos
- // that.infoText.matnr = res.data[0].matDtos[0].matnr
- // that.infoText.specs = res.data[0].matDtos[0].specs
- // that.infoText.maknx = res.data[0].matDtos[0].maknx
- // that.infoText.count = res.data[0].matDtos[0].count
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
- },
- fail(err) {
- that.timeOut = true
- that.times = that.times+3
- that.infoType = 0
- }
- })
-
- },
- getError() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/led/error",
- data: {ledId:that.baseLedId},
- method:"GET",
- success(result) {
- that.timeOut = false
- that.times = 0
- 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
- }
- },
- fail(err) {
- that.timeOut = true
- that.infoType = 0
- }
- })
-
- },
- // 鎺у埗鍣�
- controller() {
- switch(this.infoType) {
- // 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
- case 0:
- 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)
- } else if (this.errorInfoViewShow && this.infoViewShow) {
- this.errorInfoViewShow = false
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
- 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;
-
- }
-
- },
- // 涓诲睆骞�
- 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
- },
- // 鏃ュ巻 鏈嶅姟鍣�
- 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
- }
- })
- },
-
- // 鏃ュ巻
- 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
- },
- getDateFormat(value) {
- var date = new Date(this.currDate);// 鑾峰彇褰撳墠鏃堕棿
- 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
- }
- }
- })
- },
- /*************** 楗煎浘 *****************************************************************************************************/
- 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,
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.baseInfo.xDistance = res.data.xDistance
- that.baseInfo.yDistance = res.data.yDistance
- that.baseInfo.xDuration = res.data.xDuration
- that.baseInfo.yDuration = res.data.yDuration
- } else if (res.code === 403) {
-
- } else {
-
- }
- }
- })
- },
- }
-
- }
-</script>
-
-<style>
- /* @import url("../../static/css/common.css"); */
- @import url("home.css");
- /* 鍒� */
- .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;
- text-align: center;
-
- }
- /* 涓昏鍥� */
- .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;
- transform: scale(0.8);
- }
- .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%;
- }
- .img-box {
- width: 100%;
- /* background-color: #666666; */
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- flex-wrap: wrap;
- font-size: 1vw;
- }
- .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;
- text-align: center;
- }
- .eject-input {
- margin-top: 2vh;
- height: 25vh;
- /* background-color: #00163E; */
- ::-webkit-scrollbar{display:none}
- }
- .item {
- display: flex;
- align-items: center;
- margin: 1vh 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;
- }
-</style>
\ No newline at end of file
diff --git a/Monitor-APP/pages/index.vue b/Monitor-APP/pages/index.vue
index 1053320..f93ca81 100644
--- a/Monitor-APP/pages/index.vue
+++ b/Monitor-APP/pages/index.vue
@@ -1,23 +1,11 @@
<template>
- <view class="container">
+ <view>
+
</view>
</template>
-<script setup lang="ts">
-
-
+<script>
</script>
-<style lang="less" scoped>
- // page 璁剧疆鍙互閲嶇疆杩欎簺
- page {
- width: 100%;
- height: 100%;
- }
- .container {
- height: 100%;
- width: 100%;
- background-image: url(../static/background.png);
- background-size: 100% 100%;
- }
+<style>
</style>
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/data.js b/Monitor-APP/pages/index/data.js
deleted file mode 100644
index 390d266..0000000
--- a/Monitor-APP/pages/index/data.js
+++ /dev/null
@@ -1,91 +0,0 @@
- // {"msg":"鎿嶄綔鎴愬姛","code":200,"data":"鎷ｆ枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518517\n\n"}
- // "鎷ｆ枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518517\n\n"
-// {"msg":"鎿嶄綔鎴愬姛",
-// "code":200,
-// "data":[{
-// "title":"鍏ㄦ澘鍑哄簱",
-// "workNo":7016,
-// "ioType":101, 101 鍏ㄦ澘鍑哄簱 103 妫�鏂欏嚭搴�
-// "staNo":181,
-// "sourceStaNo":null,
-// "locNo":null,
-// "sourceLocNo":"0900107",
-// "matDtos":[
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037502300","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505146","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504801","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507729","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507727","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507731","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504807","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504805","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504797","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504794","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504791","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504793","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505141","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507728","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504810","count":1.0},
-// {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505148","count":1.0}],
-// "emptyMk":false}]}
- getEEE() {
- var result = ycqdata.dataEEE
- let that = this
- let res = result.data
- if (res.data && res.data !== "") {
- that.title = ''
- that.staNo = ''
- that.pakinShow = false
- that.errorShow = true
- that.errorPaper = res.data
- that.move = false // 鏄剧ず
- } else {
- that.errorPaper = ''
- that.errorShow = false
- if (that.pakinShow) {
- return;
- } else {
- that.move = true // 闅愯棌
- }
- }
- },
- getYYY() {
- var result = ycqdata.dataYYY
- let that = this
- var newsData = ''
- var str = ''
- let res = result.data
- if(res.data && res.data !== null) {
- if (res.data[0].matDtos.length > 0) {
- that.pakinShow = true
- that.pakinGun = true
- if (res.data[0].ioType === 101) {
- that.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.title = '妫�鏂欏嚭搴�'
- }
- that.staNo = '鐩爣绔�' + res.data[0].staNo
- for (var i = 0; i < res.data[0].matDtos.length; i++) {
- str = res.data[0].matDtos[i].matnr + ' - ' + res.data[0].matDtos[i].batch + '\n'
- newsData = newsData + str
- }
- if (that.errorShow) {
- // that.pakinShow = false
- return;
- } else {
- that.newspaper = newsData
- that.move = false
- }
- if (res.data[0].matDtos.length <= 8) {
- that.errorShow = true
- that.pakinShow = true
- that.pakinGun = false
- }
- } else {
- that.move = true
- }
- } else {
- that.move = true
- }
-
- },
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
deleted file mode 100644
index 6a4f283..0000000
--- a/Monitor-APP/pages/index/data.json
+++ /dev/null
@@ -1,170 +0,0 @@
-{
- "dataInfo2": {
- "data": {
- "msg": "鎿嶄綔鎴愬姛",
- "code": 200,
- "data": [{
- "title": "鍏ㄦ澘鍑哄簱",
- "workNo": 8046,
- "staNo": 200,
- "sourceStaNo": null,
- "locNo": null,
- "sourceLocNo": "1500502",
- "barcode": "80009901",
- "matDtos": [{
- "matnr": "020101000001",
- "maknx": "63-90鍨嬪崟绔嬫煴",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "绾㈣壊",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "鏆傚瓨",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "绾㈣壊",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "",
- "total" : 200
- },
- {
- "matnr": "LPJ.SLJ.XG.037",
- "maknx": "宸ョ▼濉戞枡涓嬪集澶�",
- "batch": null,
- "count": 40.0,
- "specs": "gcslxwt",
- "info": "娴欐睙涓壃",
- "bz": "17鍙锋",
- "total" : 200
- }
- ],
- "emptyMk": false,
- "ioType": 101
- }]
- }
- },
- "dataError2": {
- "data": {
- "msg": "鎿嶄綔鎴愬姛",
- "code": 200,
- "data": ""
- }
- },
- "lineData": {
- "msg": "鎿嶄綔鎴愬姛",
- "code": 200,
- "data": {
- "rows": [{
- "name": "鍏ュ簱鏁伴噺",
- "data": [0, 0, 0, 0, 1, 1, 0, 0, 4, 4, 0, 4]
- },
- {
- "name": "鍑哄簱鏁伴噺",
- "data": [
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 3,
- 4,
- 0,
- 1
- ]
- }
- ]
- }
- },
- "pieData": {
- "msg": "鎿嶄綔鎴愬姛",
- "code": 200,
- "data": {
- "emptyCount": 3582,
- "noneCount": 256,
- "total": 3840,
- "stockCunt": 2,
- "usedPr": 0.1,
- "used": 2,
- "pie": [{
- "name": "鍦ㄥ簱",
- "value": 2
- },
- {
- "name": "绌�",
- "value": 3582
- },
- {
- "name": "浣跨敤",
- "value": 0
- },
- {
- "name": "绂佺敤",
- "value": 256
- }
- ]
- }
- },
- "other": {
- "msg": "鎿嶄綔鎴愬姛",
- "code": 200,
- "data": {
- "xDistance": 15651.0,
- "xSpeed": 32704.0,
- "zSpeed": 32704.0,
- "yDistance": 15,
- "yDuration": 0.0,
- "ySpeed": 32704.0,
- "xDuration": 0.0,
- "content": "",
- "forkPos": 1,
- "isShow": false
- }
- }
-}
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
deleted file mode 100644
index b24e432..0000000
--- a/Monitor-APP/pages/index/index.vue
+++ /dev/null
@@ -1,1272 +0,0 @@
-<template>
- <view class="container">
- <!-- 璺冲姩淇℃伅鏉� -->
- <view class="floor-screen" :class="floorMove" >
- <!-- 澶撮儴 -->
- <view class="head">
- <text @click="port()">鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
- <view class="time-tools">{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}} {{week}}</view>
- <view class="button-left" @click="ejected()"></view>
- <view class="button-right" @click="ledId()"></view>
- </view>
- <view class="main">
- <view class="main-sides" style="width: 100%;">
- <view class="box" style="height: 90%;">
- <view class="box-border box-border1"></view>
- <view class="box-border box-border2"></view>
- <view class="box-border box-border3"></view>
- <view class="box-border box-border4"></view>
- <view style="width: 100%;height: 100%;" v-show="!errorShow">
- <!-- 鍒嗘湁鏃犺鍗曞垝鍒嗕袱閮ㄥ垎 -->
- <!-- 宸︿晶淇℃伅 -->
- <view style="" :class="width">
- <!-- 鍏ㄦ澘鍑哄簱 -->
- <view class="box-items">{{title}}</view>
- <!-- 鐩爣绔� -->
- <view class="box-items">{{staNo}}</view>
- <!-- 鍟嗗搧缂栧彿 -->
- <!-- <view class="box-items">{{matnr}}</view> -->
- <!-- 鍟嗗搧鍚嶇О -->
- <view class="box-items">{{maknx}}</view>
- <!-- 鍟嗗搧鍚嶇О -->
- <view class="box-items">{{specs}}</view>
- <!-- 鍑哄簱鏁伴噺 -->
- <view class="box-items">{{count}}</view>
- </view>
- <view style="width: 50%;height: 100%;display: inline-block;float: left;" v-show="orderShow">
- <!-- 璁㈠崟鍙� -->
- <view class="box-items">{{orderNo}}</view>
- <!-- 宸插嚭鎵樼洏鏁� -->
- <view class="box-items">{{doneOfTray}}</view>
- <!-- 鎵樼洏鎬绘暟閲� -->
- <view class="box-items">{{totalOfTray}}</view>
- <!-- 宸插嚭绠辨暟 -->
- <view class="box-items">{{doneOfUnit}}</view>
- <!-- 鎬荤鏁� -->
- <view class="box-items">{{totalOfUnit}}</view>
- </view>
- </view>
- <view style="width: 100%;height: 100%;" v-show="errorShow">
- <view style="line-height: 700px;font-size: 175rpx;">{{errorMsg}}</view>
- </view>
-
- <!-- 鍏ㄦ澘鍑哄簱 -->
- <!-- <view style="width: 10%;height: 100%;display:inline-block;float: left;text-align: center;padding-top: 180px;">
- <text>{{title}}</text>
- </view> -->
- <!-- 婊氬姩鍖哄煙 -->
- <!-- <view style="width: 80%;height: 100%;display: inline-block;"> -->
- <!--鏄剧ずorder璁㈠崟缂栧彿 -->
- <!-- <text v-show="orderShow" style="display: block;font-size: 140rpx;" >{{orderNo}}</text>
- <swiper :class="swiper" circular="true" vertical="true" display-multiple-items="6" :autoplay="autoplay" :interval="interval" :duration="duration">
- <swiper-item v-for="(item,index) in matList" :key="index">
- <view style="font-size: 160rpx;">{{item}}</view>
- </swiper-item>
- </swiper>
- </view> -->
- <!-- 绔欏彴鍙� -->
- <!-- <view style="width: 10%;height: 100%;display: inline-block;float: right;padding-top: 180px;">
- <text>{{staNo}}</text>
- </view> -->
- </view>
- </view>
- </view>
- </view>
- <view class="top-screen" :class="topMove">
- <view class="head">
- <text @click="port()">鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
- <view class="time-tools">{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}} {{week}}</view>
- <view class="button-left" @click="ejected()"></view>
- <view class="button-right" @click="ledId()"></view>
- </view>
- <view class="main">
- <view class="main-sides">
- <view class="box box-lg">
- <view class="box-border box-border1"></view>
- <view class="box-border box-border2"></view>
- <view class="box-border box-border3"></view>
- <view class="box-border box-border4"></view>
- <view class="box-item introduce">
- <h3>鑷姩鍖栫珛浣撲粨搴�</h3>
- <p class="english">Automatic Storageand Retrieval System</p>
- <p class="introduce-content"> 鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆�
- 鑷姩鍖栫珛浣撲粨搴撶殑涓讳綋鐢辫揣鏋躲�佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆�
- 璐ф灦鏄挗缁撴瀯鎴栭挗绛嬫贩鍑濆湡缁撴瀯鐨勫缓绛戠墿鎴栫粨鏋勪綋锛岃揣鏋跺唴鏄爣鍑嗗昂瀵哥殑璐т綅绌洪棿锛屽贩閬撳爢鍨涜捣閲嶆満绌胯浜庤揣鏋朵箣闂寸殑宸烽亾涓紝瀹屾垚瀛樸�佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</p>
- </view>
- <view class="box-item charge-info">
- <h3>浠撳簱鏁版嵁</h3>
- <p class="english">warehouse data</p>
- <view class="charge-info-item">
- <image src="../../static/a1.png" mode="aspectFit"></image>
- <view>
- <text class="count">{{xDistance}}</text>
- <text class="unit">m</text>
- </view>
- <view>绱璧拌璺濈(绫�)</view>
- </view>
- <view class="charge-info-item">
- <image src="../../static/b1.png" mode="aspectFit"></image>
- <view>
- <text class="count">{{yDistance}}</text>
- <text class="unit">m</text>
- </view>
- <view>绱鍗囬檷璺濈(绫�)</view>
- </view>
- <view class="charge-info-item">
- <image src="../../static/c1.png" mode="aspectFit"></image>
- <view>
- <text class="count">{{xDuration}}</text>
- <text class="unit">m</text>
- </view>
- <view>绱璧拌鏃堕暱(绉�)</view>
- </view>
- <view class="charge-info-item">
- <image src="../../static/d1.png" mode="aspectFit"></image>
- <view>
- <text class="count">{{yDuration}}</text>
- <text class="unit">m</text>
- </view>
- <view>绱鍗囬檷鏃堕暱(绉�)</view>
- </view>
- </view>
- <view class="box-item use-info">
- <view class="use-left">
- <h3>搴撲綅浣跨敤鐜�</h3>
- <p class="english">EQUIPMENT USAGE THIS MONTH</p>
- </view>
- <view class="use-right">
- <h3>{{usedPr}}%</h3>
- <p class="english">鍚屾瘮涓婃湀 + 5%</p>
- </view>
- <view class="use-main">
- <view class="left">
- <view class="progressBar">
- <view class="progress" :style="'width:'+ usedPr + '%'"></view>
- </view>
- <!-- <progress percent="20"activeColor="#FF5722" backgroundColor="#233751" stroke-width="30"></progress> -->
- </view>
- <view class="right">
- {{used}}
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="main-sides">
- <view class="box box-tp">
- <view class="box-border box-border1"></view>
- <view class="box-border box-border2"></view>
- <view class="box-border box-border3"></view>
- <view class="box-border box-border4"></view>
- <view class="box-item right-item">
- <view class="sub-left">
- <h3>鍏ュ嚭搴撶粺璁�</h3>
- <p class="english">ORDER STATISTICS</p>
- </view>
- <view class="sub-right">
- <h3>31</h3>
- <p class="english">浠婃棩璁㈠崟鏁�</p>
- </view>
- <view class="sub-main">
- <view class="charts-box">
- <qiun-data-charts type="line" :chartData="chartsDataLine1" :echartsH5="true" :echartsApp="true"/>
- </view>
- </view>
- </view>
- </view>
- <view class="box box-md">
- <view class="box-border box-border1"></view>
- <view class="box-border box-border2"></view>
- <view class="box-border box-border3"></view>
- <view class="box-border box-border4"></view>
- <view class="box-item right-item">
- <view class="sub-left">
- <h3>搴撳瓨绫诲瀷</h3>
- <p class="english">INCOME DATE</p>
- </view>
- <view class="sub-right">
- <h3>浠婂ぉ</h3>
- <p class="english">Today</p>
- </view>
- <view class="sub-main">
- <view class="charts-box ring">
- <qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
- </view>
- <view class="sub-main-right">
- <view class="sub-info">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <text>鍦ㄥ簱</text>
- <text>{{stockCount}}</text>
- </view>
- <view class="sub-info">
- <image src="../../static/f1.png" mode="aspectFit"></image>
- <text>绌哄簱</text>
- <text>{{emptyCount}}</text>
- </view>
- <view class="sub-info">
- <image src="../../static/e1.png" mode="aspectFit"></image>
- <text>绂佺敤</text>
- <text>{{noneCount}}</text>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="box box-bt">
- <view class="box-border box-border1"></view>
- <view class="box-border box-border2"></view>
- <view class="box-border box-border3"></view>
- <view class="box-border box-border4"></view>
- <!-- <text>娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</text>
- <text>褰撳墠鐗堟湰鍙�</text> -->
- <view @click="crn()">鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃</view>
- <!-- <image src="../../static/barcode.png" mode="aspectFit"></image> -->
- </view>
- </view>
- </view>
- </view>
- <view>
- <!-- 杈撳叆url -->
- <uni-popup ref="url" type="dialog">
- <uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆url" :value="baseIP"
- placeholder="绀轰緥:192.168.1.1" @confirm="baseUrlConfirm"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 杈撳叆ledId -->
- <uni-popup ref="ledId" type="dialog">
- <uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆ledId" :value="baseLedId"
- placeholder="绀轰緥:188" @confirm="ledIdConfirm"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 杈撳叆port -->
- <uni-popup ref="port" type="dialog">
- <uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆绔彛鍙�" :value="basePort"
- placeholder="绀轰緥:9090" @confirm="portConfirm"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 杈撳叆crnId -->
- <uni-popup ref="crnId" type="dialog">
- <uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆鍫嗗灈鏈�" :value="crnId"
- placeholder="绀轰緥:1" @confirm="crnConfirm"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 鑷畾涔夊脊鍑哄眰 -->
- <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>
- <!-- button -->
- <view class="eject-button">
- <view class="button-item" @click="ejectClose">鍙� 娑�</view>
- <view class="button-item" @click="ejectConfirm">纭� 璁�</view>
- </view>
- </view>
-
- </view>
- </view>
-</template>
-
-<script>
- import ycqdata from '@/pages/index/data.json';
- import demodata from '@/mockdata/demodata.json';
- export default {
- data() {
- return {
- commonUrl:null, // 閫氱敤url
- show: true,
- modeClass: 'fade',
- styles: {},
- baseIP:'',
- baseLedId:'',
- basePort:'',
- crnId:'',
- value: '',
- xDistance: 0,
- yDistance:0,
- xDuration:0,
- yDuration:0,
- used:317,
- usedPr: 90,
- stockCount:0,
- emptyCount:0,
- noneCount:0,
- chartsData: {
- "Line": {
- "categories": [],
- "series": []
- },
- "Pie": {
- "series": [{
- "data": []
- }]
- },
- },
- chartsDataLine1: {},
- chartsDataPie2: {},
- ringOpts:{},
- year:2022,
- month:4,
- day:14,
- hours:13,
- minutes:38,
- seconds:13,
- week:'鏄熸湡鍥�',
- ani:'',
- // move: 'upMove 1.5s 1;',
- move:false,
- topMove:'topUp',
- floorMove:'',
- version:'',
- // newspaper:'鎷ｆ枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518517\n\n',
- newspaper:'',
- errorPaper:'',
- title:'',
- staNo:'',
- matnr:'',
- maknx:'',
- specs:'',
- count:'',
- orderNo:null,
- doneOfTray:'',
- totalOfTray:'',
- doneOfUnit:'',
- totalOfUnit:'',
- errorMsg:null,
- width:'full-width',
- errorShow:'',
- pakinShow:'',
- pakinGun:'',
- orderShow:false,
- swiper:'swiper-here',
- autoplay:true, // 鑷姩寰幆
- interval:1000, // 璋冪敤鏃堕暱
- duration:8000, // 绉诲姩閫熷害
- matList:[], // 璁㈠崟鍒楄〃
- ejectShow: false,
-
- }
- },
- mounted() {
- let that = this
- const BaseIP = uni.getStorageSync('BaseIp');
- const BaseLedId = uni.getStorageSync('BaseLedId');
- const BasePort = uni.getStorageSync('BasePort');
- const BaseCrnId = uni.getStorageSync('BaseCrnId');
- that.baseIP = BaseIP
- that.baseLedId = BaseLedId
- that.basePort = BasePort
- that.baseCrnId = BaseCrnId
- this.getUrl()
- },
- onLoad() {
-
- },
- onReady() {
- setInterval(() => {
- // 鑾峰緱鍒濆鏁版嵁
- this.initlineChart();
- this.initPieChart();
- // 涓婚〉淇℃伅
- this.getServerData();
- this.getOther();
- // 鍏朵粬淇℃伅
- this.getDate();
- this.getPakin();
- this.getError();
- // this.getYYY();
- // this.getEEE();
- this.animation()
- this.getUrl()
- },1000)
- },
- methods: {
- // 鑾峰彇url
- getUrl() {
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + this.baseUrl
- this.chartsDataLine1 = JSON.parse(JSON.stringify(demodata.Line))
- },
- // 鑾峰彇閿欒淇℃伅
- getYYY() {
- let that = this
- var result = ycqdata.dataEEE
- // 娴嬭瘯鐢� 鈫�
- var res = result.data
- // 娴嬭瘯鐢� 鈫�
- // 杩斿洖缁撴灉鏈夊�� 涓斿�间笉绛変簬绌哄�� 灏辨槸鏈夐敊璇俊鎭渶瑕佸睍绀�
- if (res.data && res.data !== "") {
-
- that.errorMsg = res.data
- that.errorShow = true
- that.move = false // 鏄剧ず
- } else {
- that.errorPaper = ''
- that.errorShow = false
- if (that.pakinShow) {
- return;
- } else {
- that.move = true // 闅愯棌
- }
- }
- },
- getEEE () {
- let that = this
- var newsData = ''
- var str = ''
- let result = ycqdata.dataYYY
- // 娴嬭瘯鐢� 鈫�
- let res = result.data
- // 娴嬭瘯鐢� 鈫�
- if(res.data && res.data !== null) {
- if (res.data[0].ioType === 101) {
- that.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.title = '妫�鏂欏嚭搴�'
- }
- that.staNo = '鐩爣绔�:' + res.data[0].staNo
- that.matnr = '鍟嗗搧缂栧彿锛�' + res.data[0].matDtos[0].matnr
- that.maknx = '鍟嗗搧鍚嶇О锛�' + res.data[0].matDtos[0].maknx
- that.count = '鍑哄簱鏁伴噺锛�' + res.data[0].matDtos[0].count
- if (res.data[0].orderNo) {
- that.orderNo = "璁㈠崟鍙凤細" + res.data[0].orderNo
- that.orderShow = true
- that.width = 'half-width'
- } else {
- that.orderNo = null;
- that.orderShow = false
- that.width = 'full-width'
- }
- that.doneOfTray = '宸插嚭鎵樼洏鏁�:' + res.data[0].doneOfTray
- that.totalOfTray = '鎵樼洏鎬绘暟閲忥細' + res.data[0].totalOfTray
- that.doneOfUnit = '宸插嚭绠辨暟锛�' + res.data[0].doneOfUnit
- that.totalOfUnit = '鎬荤鏁帮細' + res.data[0].totalOfUnit
- if (that.errorShow) {
- return;
- } else {
- that.newspaper = newsData
- that.move = false
- }
- }else {
- that.move = true
- }
-
-
- },
- // 鑾峰彇閿欒淇℃伅
- getError() {
- let that = this
- var res
- uni.request({
- url: that.commonUrl + "/monitor/led/error",
- data: {
- ledId:that.baseLedId
- },
- method:'GET',
- success(result) {
- res = result.data
- if (res.data && res.data !== "") {
- that.errorMsg = res.data
- that.errorShow = true
- that.move = false // 鏄剧ず
- } else {
- that.errorShow = false
- // if (that.pakinShow) {
- // return;
- // } else {
- // // that.move = true // 闅愯棌
- // }
- }
- }
- });
- },
- getPakin () {
- let that = this
- that.matList = [] // 娓呯┖鏉＄爜鍒楄〃
- var newsData = ''
- var str = ''
- let res
- uni.request({
- url: that.commonUrl + "/monitor/led",
- data: {
- ledId:that.baseLedId
- },
- method:'GET',
- success(result) {
- res = result.data
- if (that.errorShow) {
- return; // 鏈夐敊璇俊鎭�
- }
- if(res.data && res.data !== null) {
- if (res.data[0].ioType === 101) {
- that.title = '鍏ㄦ澘鍑哄簱'
- } else if(res.data[0].ioType === 103) {
- that.title = '妫�鏂欏嚭搴�'
- } else
- that.title = res.data[0].title
- that.staNo = '鐩爣绔�:' + res.data[0].staNo
- that.matnr = '鍟嗗搧缂栧彿锛�' + res.data[0].matDtos[0].matnr
- that.maknx = '鍟嗗搧鍚嶇О锛�' + res.data[0].matDtos[0].maknx
- that.specs = '瑙勬牸锛�' + res.data[0].matDtos[0].specs
- that.count = '鍑哄簱鏁伴噺锛�' + res.data[0].matDtos[0].count
- if (res.data[0].orderNo) {
- that.orderNo = "璁㈠崟鍙凤細" + res.data[0].orderNo
- that.orderShow = true
- that.width = 'half-width'
- } else {
- that.orderNo = null;
- that.orderShow = false
- that.width = 'full-width'
- }
- that.doneOfTray = '宸插嚭鎵樼洏鏁�:' + res.data[0].doneOfTray
- that.totalOfTray = '鎵樼洏鎬绘暟閲忥細' + res.data[0].totalOfTray
- that.doneOfUnit = '宸插嚭绠辨暟锛�' + res.data[0].doneOfUnit
- that.totalOfUnit = '鎬荤鏁帮細' + res.data[0].totalOfUnit
- that.newspaper = newsData
- that.move = false
- }else {
- that.move = true
- }
- }
- });
- },
- animation() {
- if (this.move) {
- this.topMove = 'topUp'
- this.floorMove = 'floorUp'
- } else {
- this.topMove = 'topDown'
- this.floorMove = 'floorDown'
- }
- },
- 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
- console.log(result);
- 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
- }
- }
- })
- },
-/*************** 楗煎浘 *****************************************************************************************************/
- 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.stockCount = res.data.stockCunt
- that.emptyCount = res.data.emptyCount
- that.noneCount = res.data.noneCount
- that.used = res.data.used
- that.usedPr = res.data.usedPr
- }
- }
- })
- },
- getOther() {
- let that = this
- uni.request({
- // http://10.10.0.222:9090/jkwcs/monitor/led?ledId=186
- url: that.commonUrl + "/monitor/other",
- data: {
- crnId: that.baseCrnId,
- ledId: 1,
- },
- success(result) {
- console.log(result);
- var res = result.data
- if (res.code === 200) {
- that.xDistance = res.data.xDistance
- that.yDistance = res.data.yDistance
- that.xDuration = res.data.xDuration
- that.yDuration = res.data.yDuration
- } else if (res.code === 403) {
-
- } else {
-
- }
- }
- })
- },
- ejected () {
- this.ejectShow = true
- },
- // 寮瑰嚭灞傜‘璁�
- ejectConfirm() {
- uni.setStorageSync('BaseIp', this.baseIP);
- uni.setStorageSync('BaseLedId', this.baseLedId);
- uni.setStorageSync('BasePort',this.basePort);
- uni.setStorageSync('BaseCrnId',this.baseCrnId);
- this.getUrl()
- this.ejectShow = false
- },
- // 寮瑰嚭灞傚彇娑�
- ejectClose() {
- this.ejectShow = false
- },
- getServerData() {
- this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
- this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
- },
- complete(e) {
- console.log("娓叉煋瀹屾垚浜嬩欢",e);
- },
- getDate() {
- var dt = new Date();
- this.year = dt.getFullYear();
- this.month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
- this.day = dt.getDate() < 10 ? '0'+dt.getDate() : dt.getDate();
- this.hours = dt.getHours() < 10 ? '0' + dt.getHours() : dt.getHours();
- this.minutes = dt.getMinutes() < 10 ? '0' + dt.getMinutes() : dt.getMinutes();
- this.seconds = dt.getSeconds() < 10 ? '0' + dt.getSeconds() : dt.getSeconds();
- this.weeks = dt.getDay();
- switch (this.weeks) {
- case 0: this.week = "鏄熸湡鏃�"; break;
- case 1: this.week = "鏄熸湡涓�"; break;
- case 2: this.week = "鏄熸湡浜�"; break;
- case 3: this.week = "鏄熸湡涓�"; break;
- case 4: this.week = "鏄熸湡鍥�"; break;
- case 5: this.week = "鏄熸湡浜�"; break;
- default : this.week = "鏄熸湡鍏�";
- }
- },
- }
- }
-</script>
-
-<style>
- /* 寮瑰嚭:閰嶇疆鍖哄煙 */
- .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: 600px;
- height: 350px;
- background-color: #eaeaea;
- border-radius: 25rpx;
- }
- .eject-title {
- width: 100%;
- height: 100px;
- line-height: 100px;
- font-size: 20px;
- font-weight: 700;
- color: #606266;
- text-align: center;
- }
- .eject-input {
-
- }
- .item {
- display: flex;
- align-items: center;
- margin: 10px 0 0 0;
- }
- .desc {
- display: inline-block;
- width: 40%;
- text-align: right;
- color: #606266;
- font-size: 18px;
- }
- .input {
- display: flex;
- align-items: center;
- padding-left: 5px;
- padding-right: 5px;
- width: 100%;
- height: 30px;
- border: 1px solid #C0C4CC;
- margin-right: 50px;
- }
- .eject-input input {
- width: 100%;
-
-
- }
- .eject-button {
- display: flex;
- align-items: center;
- position: absolute;
- bottom: 0;
- height: 60px;
- line-height: 60px;
- width: 100%;
- border-top: 1px solid #ccc;
- }
- .button-item {
- width: 50%;
- height: 100%;
- font-size: 20px;
- font-weight: bold;
- text-align: center;
- color: #909399;
- }
- .button-item:last-child {
- color: #67C23A;
-
- border-left: 1px solid #ccc;
- }
- .full-width {
- width: 100%;
- height: 100%;
- display: inline-block;
- float: left;
- }
- .half-width {
- width: 50%;
- height: 100%;
- display: inline-block;
- float: left;
- }
- .box-items {
- height: 20%;
- width: 100%;
- /* background-color: #233751; */
- line-height: 300rpx;
- }
- /* 褰撳墠椤甸潰鏃� orderNo */
- .swiper-here {
- display: inline-block;
- margin: 0 auto;
- width: 100%;
- height: 100%;
- }
- /* 褰撳墠椤甸潰鏈� orderNo */
- .swiper-here-oN{
- display: inline-block;
- /* background-color: #063A7B; */
- margin: 0 auto;
- width: 100%;
- height: 90%;
- }
- /* 褰撳墠椤甸潰鏈� error鎻愮ず */
- .swiper-here-error {
- display: inline-block;
- /* background-color: #063A7B; */
- /* margin: 0 auto; */
- margin-top: 20%;
- width: 100%;
- height: 100%;
- }
- .animate {
- display: inline-block;
- /* white-space: nowrap; */
- animation: 25s wordsLoop linear infinite normal;
- }
-
- @keyframes wordsLoop {
- 0% {
- transform: translateY(100px);
- -webkit-transform: translateY(100px);
- }
- 100% {
- transform: translateY(-100%);
- -webkit-transform: translateY(-100%);
- }
- }
-
- @-webkit-keyframes wordsLoop {
- 0% {
- transform: translateY(100px);
- -webkit-transform: translateY(100px);
- }
- 100% {
- transform: translateY(-100%);
- -webkit-transform: translateY(-100%);
- }
- }
- /* animation:upMove 1.5s 1; */
- /* downMove */
- /* 涓婂眰鍚戜笂 */
- .topUp {
- animation: topUp 1.5s 1;
- animation-fill-mode: both;
- }
- @keyframes topUp {
- from {
- opacity: 0.5;
- /* background-color:blue; */
- top:-1080px
- }
- to {
- opacity: 1;
- /* background-color:red; */
- top: 0;
- }
- }
- /* 涓婂眰鍚戜笅 */
- .topDown {
- animation: topDown 1.5s 1;
- animation-fill-mode: both;
- }
- @keyframes topDown
- {
- from {
- opacity: 1;
- /* background-color:red; */
- top: 0;
- }
- to {
- opacity: 0.5;
- /* background-color:blue; */
- top:-1080px
- }
- }
- /* 涓嬪眰鍚戜笂 */
- .floorUp {
- animation: floorUp 1.5s 1;
- animation-fill-mode: both;
- }
- @keyframes floorUp {
- from {
- opacity: 0.5;
- /* background-color:blue; */
- top: 0px;
- }
- to {
- opacity: 1;
- /* background-color:red; */
- top: 1080px;
- }
- }
- /* 涓嬪眰鍚戜笅 */
- .floorDown {
- animation: floorDown 1.5s 1;
- animation-fill-mode: both;
- }
- @keyframes floorDown {
- from {
- opacity: 0.5;
- /* background-color:blue; */
- top: 1080px;
- }
- to {
- opacity: 1;
- /* background-color:red; */
- top: -0px;
- }
- }
- .top-screen {
- position: fixed;
- width: 1920px;
- height: 1080px;
- /* top: -1000px; */
- background-image: url(../../static/background.png);
- /* background:red; */
- /* animation:upMove 1.5s 1; */
- z-index: 999;
- }
- .floor-screen {
- width: 1920px;
- height: 1080px;
- position: relative;
- color: #FFFFFF;
- text-align: center;
- font-size: 120rpx;
- letter-spacing: 5rpx;
- background-image: url(../../static/background.png);
- }
- .container {
- width: 1920px;
- height: 1080px;
-
- position: relative;
- /* background: #000428;
- background: -webkit-linear-gradient(to right, #004e92, #000428);
- background: linear-gradient(to right, #004e92, #000428); */
- }
- .head {
- /* background-color: #55aaff; */
- width: 100%;
- height: 10%;
- text-align: center;
- line-height: 110px;
- color: #FFFFFF;
- font-size: 40px;
- font-weight: 700;
- letter-spacing: 5px;
- }
- .head text {
- transform: scale(1,0.9);
- }
- .time-tools {
- height: 5%;
- /* background-color: #007AFF; */
- position: absolute;
- top: 0;
- float: right;
- right: 50px;
- font-size: 16px;
- font-weight: 400;
- line-height: 70px;
- letter-spacing: 1px;
- }
- .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%;
- }
- .main {
- /* background-color: #3F536E; */
- position: relative;
- width: 100%;
- height: 90%;
- }
- .main-sides {
- /* background-color: #004E92; */
- position: relative;
- display: inline-block;
- float: left;
- width: 50%;
- height: 100%;
- /* margin: 2% auto 0 3.2%;
- border: 1px solid rgba(20, 80, 136, 1); */
- }
- .box {
- position: relative;
- /* background-color: #ffffff; */
- margin: 3% 2% 0 2%;
- width: 96%;
- height: 30%;
- border: 1px solid rgba(20, 80, 136, 1);
- overflow: hidden;
- }
- .box-lg {
- height: 94%;
- }
- .box-border {
- position: absolute;
- /* background-color: #4CD964; */
- width: 10px;
- height: 10px;
- }
- .box-border1 {
- top: 0;
- left: 0;
- border-left: 2px solid #31c4c4;
- border-top: 2px solid #31c4c4;
- }
- .box-border2 {
- top: 0;
- right: 0;
- border-right: 2px solid #31c4c4;
- border-top: 2px solid #31c4c4;
- }
- .box-border3 {
- bottom: 0;
- left: 0;
- border-bottom: 2px solid #31c4c4;
- border-left: 2px solid #31c4c4;
- }
- .box-border4 {
- bottom: 0;
- right: 0;
- border-right: 2px solid #31c4c4;
- border-bottom: 2px solid #31c4c4;
- }
- .content {
- display: flex;
- flex-direction: column;
- flex: 1;
- }
-
- .charts-box {
- width: 80%;
- height: 230px;
- margin-left: 10%;
- /* background-color: #fff; */
- }
- .ring {
- display: inline-block;
- float: left;
- width: 60%;
- height: 300px;
- margin-left: -10%;
- }
- .box-item {
- /* background-color: #2C405A; */
- width: 92%;
- height: 20%;
- margin-left: 4%;
- padding-top: 1em;
- color: #FFFFFF;
- }
- .introduce {
- height: 30%;
- }
- .introduce h2 {
- letter-spacing: 5px;
-
- }
- .english {
- font-size: 14px;
- }
- .introduce-content {
- font-size: 20px;
- padding-top: 2em;
- text-indent: 2em;
- line-height: 2em;
- }
- .charge-info {
- /* background-color: #2C405A; */
- height: 45%;
- }
- .charge-info-item {
- /* background-color: #EE6666; */
- display: inline-block;
- width: 50%;
- height: 40%;
- }
- .charge-info-item image {
- display: inline-block;
- float: left;
- /* background-color: #4CD964; */
- height: 100%;
- width: 20%;
- }
- .charge-info-item view {
- display: inline-block;
- position: relative;
- margin-left: 10%;
- width: 70%;
- height: 49%;
- /* background-color: #1890FF; */
- }
- .charge-info-item .count, .charge-info-item .unit{
- position: absolute;
- display: inline-block;
- font-size: 32px;
- bottom: 0;
- padding-left: 5%;
- }
- .charge-info-item .unit {
- font-size: 16px;
- float: right;
- right: 20%;
- }
- .footer {
- position: absolute;
- border: 1px solid rgba(20, 80, 136, 1);
- height: 15%;
- }
- .use-info {
- /* background-color: #007AFF; */
- }
- .use-left {
- display: inline-block;
- /* background-color: #2C405A; */
- width: 40%;
- }
- .use-right {
- display: inline-block;
- /* background-color: #2C405A; */
- float: right;
- width: 20%;
- }
- .use-main {
- width: 100%;
- height: 75%;
- /* background-color: #4CD964; */
- }
- .use-main .left {
- /* background-color: #ffaa7f; */
- display: inline-block;
- float: left;
- height: 100%;
- width: 70%;
- line-height: 20px;
- }
- .left .progressBar {
- /* margin-left: ; */
- margin-top: 9%;
- width: 100%;
- height: 20%;
- background-color: #233751;
- border-radius: 20px;
- }
- .left .progress {
- /* width: 90%; */
- height: 100%;
- background-color: #FF5722;
- border-radius: 20px;
- }
- .left progress {
- margin-left: 10%;
- margin-top: 10%;
- display: block;
- }
- .use-main .right {
- /* background-color: #ffaaff; */
- display: inline-block;
- float: right;
- height: 100%;
- width: 20%;
- font-size: 40px;
- color: #FF5722;
- line-height: 130px;
- }
- .box-tp {
- height: 30%;
- }
- .box-tp .sub-main {
- /* background-color: #FFFFFF; */
- }
- .box-md {
- height: 43%;
- }
- .box-md .sub-main {
- }
- .sub-main-right {
- display: inline-block;
- height: 100%;
- width: 50%;
- }
- .sub-info {
- width: 100%;
- height: 33%;
- }
- .sub-info image {
- display: inline-block;
- float: left;
- height: 100%;
- width: 15%;
- }
- .sub-info text {
- display: inline-block;
- width: 40%;
- height: 100%;
- text-align: center;
- line-height: 120px;
- font-size: 20px;
- }
- .box-bt {
- background-color: #063A7B;
- border: none;
- height: 15%;
- color: #FFFFFF;
- }
- .box-bt image {
- position: absolute;
- float: right;
- right: 0;
- top: 0;
- width: 20%;
- height: 100%;
- }
- .box-bt {
- font-size: 36px;
- line-height: 140px;
- text-indent: 5em;
- }
- .right-item {
- height: 94%;
- }
- .sub-left {
- display: inline-block;
- float: left;
- width: 40%;
- }
- .sub-right {
- display: inline-block;
- float: right;
- width: 20%;
- }
- .sub-main {
- position: absolute;
- /* background-color: #31C4C4; */
- width: 92%;
- height: 80%;
- bottom: 0;
- }
-</style>
-<!-- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037502300","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505146","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504801","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507729","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507727","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507731","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504807","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504805","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504797","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504794","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504791","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504793","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505141","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507728","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504810","count":1.0},
- {"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505148","count":1.0} -->
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/monitor.vue b/Monitor-APP/pages/index/monitor.vue
deleted file mode 100644
index 95ae7ab..0000000
--- a/Monitor-APP/pages/index/monitor.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-
-<template>
- <view>
- <view>
- <swiper style="height: 500px;" circular="true" vertical="true" display-multiple-items="16" :autoplay="autoplay" :interval="interval" :duration="duration">
- <swiper-item v-for="(item,index) in list" :key="index">
- <view>{{item}}</view>
- </swiper-item>
- </swiper>
- </view>
- </view>
-</template>
-
-<script>
- export default{
- name:'',
- data(){
- return{
- autoplay:true,
- interval:1000,
- duration:1000,
- list:[
- '璇风偣鍑诲彂琛岃彍鍗曡繘琛屽彂甯�',
- '1',
- '浣撶Н杈冨ぇ锛涜嫢瑕佹寮忓彂甯�',
- '2',
- '杩愯妯″紡涓嬩笉鍘嬬缉浠ｇ爜涓斿惈鏈塻ourcemap',
- '3',
- '妫�鏌ユ槸鍚﹀惎鍔ㄥ涓井淇″紑鍙戣�呭伐鍏凤紝濡傛灉鏄垯鍏抽棴鎵�鏈夋墦寮�鐨勫井淇″紑鍙戣�呭伐鍏凤紝',
- '4',
- '鐒跺悗鍐嶉噸鏂拌繍琛�',
- '5',
- '濡傛灉鍑虹幇寰俊寮�鍙戣�呭伐鍏峰惎鍔ㄥ悗鐧藉睆鐨勯棶棰�',
- '6',
- '鎴栬�呭叧闂井淇″紑鍙戣�呭伐鍏凤紝鐒跺悗鍐嶄粠HBuilderX涓惎鍔ㄦ寚瀹氶〉闈�',
- '7',
- '鍙互閫氳繃寰俊寮�鍙戣�呭伐鍏峰垏鎹ages.json涓璫ondition閰嶇疆鐨勯〉闈�',
- '8',
- '涓慨鏀规枃浠跺苟淇濆瓨锛屼細鑷姩鍒锋柊寰俊妯℃嫙鍣�',
- '9',
- '寰俊寮�鍙戣�呭伐鍏峰凡鍚姩锛屽湪HBuilderX',
- '10',
- ],
- }
- },
- }
-</script>
-
-<style scoped lang="scss">
- .scroll_box{
- background: #FFFFFF;
- margin: 30rpx;
- border-radius: 10rpx;
- .swiper{
- margin-top: 200px;
- height: 70px;
- }
- }
-</style>
\ No newline at end of file
diff --git a/Monitor-APP/pages/test/test.vue b/Monitor-APP/pages/test/test.vue
deleted file mode 100644
index ded83e4..0000000
--- a/Monitor-APP/pages/test/test.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
- <view>1231</view>
-</template>
-
-<script>
- export default {
- data() {
- return {
-
- }
- },
- onShow() {
- var i;
- setInterval(()=>{
- console.log(i++);
- },1000)
- },
- methods: {
-
- }
- }
-</script>
-
-<style>
-</style>
\ No newline at end of file
--
Gitblit v1.9.1