From 1423cf4834aa03da31ed75a0757268a4c3939154 Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期四, 12 五月 2022 21:28:53 +0800 Subject: [PATCH] # --- Monitor-APP/pages/index/index.vue | 70 ++++++++++++++--------------------- Monitor-APP/pages/index/data.js | 30 +++++++++++++++ 2 files changed, 58 insertions(+), 42 deletions(-) diff --git a/Monitor-APP/pages/index/data.js b/Monitor-APP/pages/index/data.js new file mode 100644 index 0000000..53532a5 --- /dev/null +++ b/Monitor-APP/pages/index/data.js @@ -0,0 +1,30 @@ + // {"msg":"鎿嶄綔鎴愬姛","code":200,"data":"鎷f枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518517\n\n"} + // "鎷f枡鍑哄簱锛�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}]} \ No newline at end of file diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue index 23606d6..062d9f8 100644 --- a/Monitor-APP/pages/index/index.vue +++ b/Monitor-APP/pages/index/index.vue @@ -1,38 +1,8 @@ <template> - <!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":"鎷f枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518517\n\n"} --> - <!-- "鎷f枡鍑哄簱锛�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}]} --> <view class="container"> <view class="floor-screen" :class="floorMove" > <view class="head"> - <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text> + <text @click="port()">鑷姩浠撳簱WCS鐩戞帶骞冲彴</text> <view class="time-tools">{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}} {{week}}</view> <view class="button-left" @click="url()"></view> <view class="button-right" @click="ledId()"></view> @@ -59,7 +29,7 @@ </view> <view class="top-screen" :class="topMove"> <view class="head"> - <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text> + <text @click="port()">鑷姩浠撳簱WCS鐩戞帶骞冲彴</text> <view class="time-tools">{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}} {{week}}</view> <view class="button-left" @click="url()"></view> <view class="button-right" @click="ledId()"></view> @@ -213,15 +183,22 @@ <view> <!-- 杈撳叆url --> <uni-popup ref="url" type="dialog"> - <uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆url" value="" + <uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆url" :value="baseUrl" 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="" + <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> @@ -237,6 +214,7 @@ styles: {}, baseUrl:'10.10.0.200', baseLedId:'', + basePort:'', value: '', xDistance: 0, yDistance:0, @@ -282,19 +260,15 @@ let that = this const BaseUrl = uni.getStorageSync('BaseUrl'); const BaseLedId = uni.getStorageSync('BaseLedId'); + const BasePort = uni.getStorageSync('BasePort'); if (BaseUrl && BaseLedId) { that.baseUrl = BaseUrl that.baseLedId = BaseLedId + that.basePort = BasePort } else { that.baseUrl = '' that.baseLedId = '' } - }, - onLoad() { - var that=this - plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) { - that.version=wgtinfo.version - }); }, onReady() { setTimeout(() => { @@ -313,11 +287,17 @@ this.animation(); },1000) }, + onLoad() { + // var that=this + // plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) { + // that.version=wgtinfo.version + // }); + }, methods: { getPakin () { let that = this uni.request({ - url: "http://" + that.baseUrl + ":9090/jkwcs/monitor/led", + url: "http://" + that.baseUrl + ":" + that.basePort + "/jkwcs/monitor/led", data: { ledId:that.baseLedId }, @@ -413,12 +393,14 @@ } }) }, + port() { + this.$refs.port.open() + }, url() { this.$refs.url.open() }, ledId() { this.$refs.ledId.open() - // this.$refs.ledId.open() }, baseUrlConfirm(val) { this.baseUrl = val @@ -428,6 +410,10 @@ this.baseLedId = val uni.setStorageSync('BaseLedId', this.baseLedId); }, + portConfirm(val) { + this.basePort = val + uni.setStorageSync('BasePort',this.basePort); + }, getServerData() { this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line)) this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie)) -- Gitblit v1.9.1