From d6553637062ccdf220ace0b8128a425e7f1356da Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期四, 10 四月 2025 15:11:42 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhuHaiChuangZhi/GanFengLiYeNew
---
代码管理/NEWCode/WIDESEAWCS_PDA/pages/叫料/正极叫料.vue | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
index 6485579..4dcadc0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_PDA/pages/\345\217\253\346\226\231/\346\255\243\346\236\201\345\217\253\346\226\231.vue"
@@ -92,21 +92,32 @@
}
},
submit(cb) {
- this.$t.message.loading();
- let formDataParam = {
- current: this.current,
- size: this.size
- };
- // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
- this.$u.post(' http://192.168.30.240:9090/makerwit/selectKHWareType', null).then(res => {
- console.log(res);
- this.$t.message.closeLoading();
- cb && cb();
- if (cb != null) this.listData = [];
- this.listData = [...this.listData, ...res.data];
- console.log(this.listData);
- }).catch((err) => {
- this.$t.message.toast(err.message);
+ uni.getStorage({
+ key: 'storage_key_ipAddress',
+ success: (res) => {
+ this.$t.message.loading();
+ let formDataParam = {
+ current: this.current,
+ size: this.size
+ };
+ // 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
+ this.$u.post(res.data.CZFJiP + '/api/PDA/AGVPage', null).then(res => {
+ console.log(res);
+ this.$t.message.closeLoading();
+ cb && cb();
+ if (cb != null) this.listData = [];
+ this.listData = [...this.listData, ...res.data];
+ console.log(this.listData);
+ }).catch((err) => {
+ this.$t.message.toast(err.message);
+ });
+ },
+ fail: (err) => {
+ this.$t.message.toast('璇峰厛璁剧疆IP鍦板潃');
+ uni.navigateTo({
+ url: '/pages/SetAddress/SetAddress',
+ });
+ },
});
},
clickLoadMore(e) {
@@ -150,8 +161,9 @@
};
this.$u.post('/api/PDA/AddCZTask', formDataParam).then(res => {
if (res.status) {
+ const value = uni.getStorageSync('storage_key_ipAddress');
// 浣跨敤鍒涙櫤瀹屾暣鎺ュ彛
- this.$u.post('http://192.168.30.240:9090/makerwit/insertTask', formDataParam).then(res => {
+ this.$u.post(value.CZZJip + '/api/PDA/insertTask', formDataParam).then(res => {
this.$t.message.closeLoading();
if (res.code == 200) {
this.$t.message.toast('鍛煎彨鎴愬姛');
--
Gitblit v1.9.3