From b35d91a275fe0929f3df19c6de78729369440a45 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 17 十二月 2024 16:52:02 +0800
Subject: [PATCH] 大理片笼样式更改，新增接口。上片更改（部分，不完善）
---
UI-Project/src/views/Returns/upreturns.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 2ae509f..595f20f 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -17,7 +17,11 @@
const blinda = ref(false)
const blindb = ref(false)
const dialoglea = ref(false)
+const canSelectProjecta = ref(true);
+const canSelectProjectb = ref(true);
+const canSelectProjectc = ref(false);
const tableDatax = ref([])
+const tableDatad = ref([])
const upstatus = ref(t('basicData.machineaa'));
const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
@@ -61,16 +65,23 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(0, 2);
+ if(data.loadTask1!=null){
+ tableData.value = data.loadTask1[0]
+ canSelectProjecta.value = false;
+ canSelectProjectb.value = false;
+ canSelectProjectc.value = true;
+}
};
onBeforeUnmount(() => {
closeWebSocket();
});
-// 鍒犻櫎
+// 缁撴潫宸ョ▼
const handledelete = (row) => {
blindb.value = true;
+ deleteTask()
};
const requestData = {
state: 100
@@ -115,7 +126,7 @@
console.error(error);
}
}
-// 鍒犻櫎
+// 缁撴潫宸ョ▼
const deleteTask = async () => {
try {
let engineeringId = window.localStorage.getItem('engineeringId')
@@ -126,7 +137,9 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- blindb.value = false;
+ tableDatad.value = response.data;
+ canSelectProjecta.value = true;
+ canSelectProjectc.value = false;
} else {
ElMessage.error(response.message);
}
@@ -157,6 +170,9 @@
if (response.code == 200) {
ElMessage.success(response.message);
blind.value = false;
+ canSelectProjecta.value = false;
+ canSelectProjectc.value = true;
+
} else {
ElMessage.error(response.message);
}
@@ -303,10 +319,10 @@
}}
</el-button>
</div>
- <el-button style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
+ <el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
<el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
style="margin-top: 5px;margin-left: 20px;">
@@ -382,17 +398,33 @@
</div>
</template>
</el-dialog>
-
- <el-dialog v-model="blindb" top="30vh" width="25%" :title="$t('searchOrder.pdeleteTask')">
- <template #footer>
+<!-- 缁撴潫宸ョ▼ -->
+ <el-dialog v-model="blindb" top="10vh" width="50%">
+ <el-table ref="table" style="margin-top: 20px;height: 300px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="line" fixed align="center" :label="$t('basicData.line')"/>
+ <el-table-column prop="workProcesses" fixed align="center" :label="$t('basicData.process')"/>
+ <el-table-column prop="teamsGroupsName" align="center" :label="$t('basicData.team')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
+ </div>
+ </template>
+ <!-- <template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="deleteTask">
{{ $t('basicData.confirm') }}
</el-button>
<el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
</div>
- </template>
+ </template> -->
</el-dialog>
+ <!-- 鍊肩彮淇℃伅 -->
<el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">
<el-table ref="table" style="margin-top: 20px;height: 300px;"
:data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
--
Gitblit v1.8.0