UI-Project/src/lang/en.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
UI-Project/src/lang/py.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
UI-Project/src/lang/zh.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
UI-Project/src/views/Caching/cachingbefore.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
UI-Project/src/views/Caching/cachingun.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
UI-Project/src/views/hollow/hollowslicecage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
UI-Project/src/lang/en.js
@@ -132,6 +132,8 @@ takeon:'The arrangement is complete', }, searchOrder:{ successfullyprocessed:'任务成功处理', psuccessfullyprocessed:'是否进行任务成功处理?', totallogarithms:'总对数', numberpairs:'配对数', numberoccupied:'占用格子数', UI-Project/src/lang/py.js
@@ -131,6 +131,8 @@ takeaway: 'Взять вручную', }, searchOrder: { successfullyprocessed:'任务成功处理', psuccessfullyprocessed:'是否进行任务成功处理?', totallogarithms:'总对数', numberpairs:'配对数', numberoccupied:'占用格子数', UI-Project/src/lang/zh.js
@@ -131,6 +131,8 @@ takeon:'摆片完成', }, searchOrder:{ successfullyprocessed:'任务成功处理', psuccessfullyprocessed:'是否进行任务成功处理?', totallogarithms:'总对数', numberpairs:'配对数', numberoccupied:'占用格子数', UI-Project/src/views/Caching/cachingbefore.vue
@@ -183,7 +183,32 @@ } catch (error) { console.error('发生错误:', error); } }; }; // 任务成功处理 const successfull = async() => { try { const confirmResult = await ElMessageBox.confirm( t('searchOrder.psuccessfullyprocessed'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), cancelButtonText: t('workOrder.cancel'), type: 'warning', } ); if (confirmResult === 'confirm') { var url="/cacheGlass/edgStorageDeviceTask/taskSuccess?deviceId="+ 1; const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage.error(response.msg); } } } catch (error) { console.error('发生错误:', error); } }; // 删除 const handledelete = async(row) => { try { @@ -308,6 +333,8 @@ <div style="height: 500px;"> <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading"> <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handlehistorical" type="primary">{{ $t('searchOrder.historicaltasks') }}</el-button> <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handleptask()" type="warning">{{ $t('searchOrder.partask') }}</el-button> <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="successfull()" type="success">{{ $t('searchOrder.successfullyprocessed') }}</el-button> <div style="position: relative; width: 100%; height: 100%;"> <!-- 添加相对定位 --> <div style="position: absolute; margin-top: 28px; left: 430px; display: flex; z-index: 10;"> <!-- 添加绝对定位 --> <div>{{ $t('searchOrder.projectnumber') }}</div> @@ -399,11 +426,6 @@ </el-table-column> <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="120" /> <el-table-column prop="formattedupdateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" /> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150"> <template #default="scope"> <el-button size="mini" type="text" plain @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> </template> </el-table-column> </el-table> </div> </el-card> UI-Project/src/views/Caching/cachingun.vue
@@ -171,7 +171,7 @@ } ); if (confirmResult === 'confirm') { var url="/cacheGlass/edgStorageDeviceTask/resetTask?deviceId="+ 1; var url="/cacheGlass/edgStorageDeviceTask/resetTask?deviceId="+ 2; const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); @@ -183,6 +183,31 @@ console.error('发生错误:', error); } }; // 任务成功处理 const successfull = async() => { try { const confirmResult = await ElMessageBox.confirm( t('searchOrder.psuccessfullyprocessed'), t('workOrder.prompt'), { confirmButtonText: t('workOrder.yes'), cancelButtonText: t('workOrder.cancel'), type: 'warning', } ); if (confirmResult === 'confirm') { var url="/cacheGlass/edgStorageDeviceTask/taskSuccess?deviceId="+ 2; const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage.error(response.msg); } } } catch (error) { console.error('发生错误:', error); } }; // 删除 const handledelete = async(row) => { try { @@ -307,6 +332,8 @@ <div style="height: 500px;"> <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading"> <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handlehistorical" type="primary">{{ $t('searchOrder.historicaltasks') }}</el-button> <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handleptask()" type="warning">{{ $t('searchOrder.partask') }}</el-button> <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="successfull()" type="success">{{ $t('searchOrder.successfullyprocessed') }}</el-button> <div style="position: relative; width: 100%; height: 100%;"> <!-- 添加相对定位 --> <div style="position: absolute; margin-top: 28px; left: 430px; display: flex; z-index: 10;"> <!-- 添加绝对定位 --> <div>{{ $t('searchOrder.projectnumber') }}</div> @@ -398,11 +425,6 @@ </el-table-column> <el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="120" /> <el-table-column prop="formattedupdateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" /> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150"> <template #default="scope"> <el-button size="mini" type="text" plain @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> </template> </el-table-column> </el-table> </div> </el-card> UI-Project/src/views/hollow/hollowslicecage.vue
@@ -299,8 +299,8 @@ let socket = null; const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`; const handleMessage = (data) => { if(data.bigStorageSummary!=null){ tableDatass.value = data.bigStorageSummary[0] if(data.bigStorageCageUsageSummary!=null){ tableDatass.value = data.bigStorageCageUsageSummary[0] }else{ tableDatass.value = '' } @@ -782,7 +782,7 @@ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" /> <el-table-column prop="sumCount" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" /> <el-table-column prop="pairCount" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" /> <el-table-column prop="sumCountlayer" align="center" :label="$t('hellow.totalnumber')" min-width="120" /> <el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="120" /> <el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="120" /> <el-table-column prop="slotCount" align="center" :label="$t('searchOrder.numberoccupied')" min-width="120" /> </el-table>