From 55aa572d4750c29b1bb6b21dae800a2dbe71a9d4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 13 十二月 2024 14:26:04 +0800
Subject: [PATCH] 删除废弃代码
---
UI-Project/src/views/Returns/upreturns.vue | 65 +++-----------------------------
1 files changed, 7 insertions(+), 58 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 1c5db80..2ae509f 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -19,11 +19,10 @@
const dialoglea = ref(false)
const tableDatax = ref([])
const upstatus = ref(t('basicData.machineaa'));
-const cuttingMachineStatusColor = ref('#911005'); // 鐢ㄤ簬鍔ㄦ�佽缃甶鏍囩鐨勮儗鏅壊
+const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
const tableDatab = ref<any[]>([]);
const tableData = ref([])
-// const tableData = reactive([]);
const titleSelectJson = ref({
engineerId: [],
})
@@ -59,15 +58,12 @@
ElMessage.error(response.message);
}
} catch (error) {
- // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
- // ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(0, 2);
- // tableDatab.value = data.list[0].slice(2, 4);
};
onBeforeUnmount(() => {
closeWebSocket();
@@ -100,7 +96,6 @@
const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
stationCell: 5,
engineerId: selectedProjectNo.value,
- // filmRemove: filmRemove.value,
filmRemove: parseInt(filmRemove.value, 10),
})
window.localStorage.setItem('engineeringId', selectedProjectNo.value)
@@ -153,7 +148,6 @@
let engineeringId = window.localStorage.getItem('engineeringId')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
- // const response = await request.post('/loadGlass/engineering/engineering/pause', {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 5,
filmRemove: filmRemove,
@@ -170,7 +164,6 @@
console.error(error);
}
} else if (markingMachineStatus.value === '#911005' || cuttingMachineStatus.value === '#911005') {
- // 鎻愮ず鐢ㄦ埛鎵撴爣鏈烘湭灏辩华
ElMessage.warning(t('basicData.pausea'));
}
}
@@ -213,7 +206,6 @@
}
const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
state: selectValuesa[0],
- // state: stateList,
stationCell: 5
})
if (response.code === 200) {
@@ -250,10 +242,9 @@
blinda.value = true;
};
const toggleEnableState = async (row: any) => {
- // 妫�鏌� id 鏄惁涓虹┖
if (!row.id) {
ElMessage.error(t('basicData.updatanull'));
- return; // 濡傛灉 id 涓虹┖锛屽垯涓嶆墽琛屽悗缁搷浣�
+ return;
}
const newState = row.state === 100 ? 0 : 100;
try {
@@ -268,7 +259,6 @@
ElMessage.error(t('basicData.glassnull'));
}
};
-
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -279,7 +269,6 @@
return 'warning';
}
}
-
function getStatusText2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -334,7 +323,7 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
- height="350"
+ height="400"
ref="table"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
:data="tableData"
@@ -346,7 +335,6 @@
<el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
<el-table-column :label="$t('Mounting.projectnumber')" align="center">
<template #default="{ row }">
- <!-- 杩欓噷鎬绘槸鏄剧ず 1 -->
<span>{{ 1 }}</span>
</template>
</el-table-column>
@@ -365,19 +353,6 @@
</el-tag>
</template>
</el-table-column>
- <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
- <!-- <el-table-column
- align="center"
- :label="$t('Mounting.removalmethodp')"
- prop="filmRemove"
- >
- <template #default="scope">
- <el-tag :type="getStatusType2(scope.row.filmRemove)">
- {{ getStatusText2(scope.row.filmRemove) }}
- </el-tag>
- </template>
- </el-table-column> -->
- <!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->
</el-table>
</div>
</el-card>
@@ -387,8 +362,7 @@
<img src="../../assets/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
<el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- >
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
<el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60"/>
<el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80"/>
<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
@@ -397,20 +371,6 @@
</el-table>
</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%;">
- <el-table :data="tableDatab" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- >
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60" />
- <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
- <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
- <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>
<el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
<template #footer>
@@ -439,14 +399,8 @@
<el-table-column prop="line" fixed align="center" :label="$t('searchOrder.line')"/>
<el-table-column prop="workProcesses" fixed align="center" :label="$t('searchOrder.process')"/>
<el-table-column prop="teamsGroupsName" align="center" :label="$t('searchOrder.team')">
- <!-- <template #default="{ row }">
- <el-input v-model="row.teamsGroupsName" autocomplete="off" min-width="150"/>
- </template> -->
</el-table-column>
<el-table-column prop="deviceName" align="center" :label="$t('searchOrder.basic')">
- <!-- <template #default="{ row }">
- <el-input v-model="row.deviceName" autocomplete="off" min-width="150"/>
- </template> -->
</el-table-column>
</el-table>
<template #footer>
@@ -458,8 +412,7 @@
<el-dialog v-model="blinda" top="24vh" width="30%" :title="$t('basicData.whetherpause')">
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item :label="$t('Mounting.loadingline')" :required="true">
- <el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')"
- style="margin-left: 20px;">
+ <el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')" style="margin-left: 20px;">
<el-option :label="$t('Mounting.all')" value="0"></el-option>
<el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
<el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
@@ -520,22 +473,18 @@
</el-dialog>
</div>
</template>
-
<style scoped>
.flex-container {
display: flex;
- align-items: center; /* 鍨傜洿灞呬腑 */
+ align-items: center;
}
.flex-container .el-form-item {
- flex: 1; /* 浣挎瘡涓〃鍗曢」鍗犳嵁鐩哥瓑鐨勭┖闂� */
+ flex: 1;
margin-right: 0; /* 绉婚櫎榛樿鐨勫彸渚ц竟璺� */
}
.flex-container .el-form-item:last-child {
margin-left: 20px; /* 涓虹浜屼釜琛ㄥ崟椤规坊鍔犲乏渚ц竟璺� */
}
-
-
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
--
Gitblit v1.8.0