From 3ea473d429ccb261df894826b10a2af72ee0f4f5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:50:21 +0800
Subject: [PATCH] 义乌前端最新代码
---
UI-Project/config.js | 8 ++++----
UI-Project/src/views/Returns/upreturns.vue | 6 ++++--
UI-Project/src/views/Returns/upreturns2.vue | 12 +++++++-----
UI-Project/src/lang/zh.js | 1 +
UI-Project/src/utils/constants.js | 4 ++--
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index e752fc6..3f97658 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,10 +1,10 @@
export default {
- // serverUrl: "10.153.19.150:88/api",
+ serverUrl: "10.153.19.150:88/api",
// serverUrl: "192.168.1.199:88/api",
- serverUrl: "127.0.0.1:88/api",
- // serverUrl2: "10.153.19.150:88"
+ // serverUrl: "127.0.0.1:88/api",
+ serverUrl2: "10.153.19.150:88"
// serverUrl2: "192.168.1.199:88"
- serverUrl2: "127.0.0.1:88"
+ // serverUrl2: "127.0.0.1:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 544e3c4..ec0eac4 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -634,6 +634,7 @@
createtime: '鍒涘缓鏃堕棿',
all: '鍏ㄩ��',
removalmethod: '璇烽�夋嫨闄よ啘鏂瑰紡',
+ removalmethodp: '闄よ啘鏂瑰紡',
removalmethoda: '闄よ啘鏂瑰紡锛�',
noremoval: '涓嶉櫎鑶�',
coarselyground: '绮楃（',
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 69000bc..b551cfb 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
// export const WebSocketHost = "192.168.1.199";
-// export const WebSocketHost = "10.153.19.150";
-export const WebSocketHost = "127.0.0.1";
+export const WebSocketHost = "10.153.19.150";
+// export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 5f4091a..a7a4448 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -121,8 +121,8 @@
let engineeringId = window.localStorage.getItem('engineeringId')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ // const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 5,
filmRemove: filmRemove,
engineerId: engineeringId,
@@ -311,6 +311,8 @@
</template>
</el-table-column>
<el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
+ <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
+ <!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->
</el-table>
</div>
</el-card>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index bc4cdb7..f4fdcab 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -121,8 +121,8 @@
let engineeringId = window.localStorage.getItem('engineeringId')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
- const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
- // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ // const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 6,
filmRemove: filmRemove,
engineerId: engineeringId,
@@ -311,6 +311,8 @@
</template>
</el-table-column>
<el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
+ <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
+ <!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->
</el-table>
</div>
</el-card>
@@ -328,8 +330,8 @@
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
</el-table>
- </div>
- </div>
+ </div>
+ </div>
<!-- <div style="width: 48%;float: right;">
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
@@ -398,7 +400,7 @@
</div>
</template>
</el-dialog>
- </div>
+ </div>
<el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
<div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item :label="$t('Mounting.loadingline')" :required="true">
--
Gitblit v1.8.0