From 84e2a3ccb2e89128db849d30332a8daf142b4086 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 17 二月 2025 15:45:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Returns/upreturns.vue | 79 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index f92f0fb..905e830 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref, computed} from "vue";
import {useRouter} from "vue-router"
import { ElMessage, ElMessageBox } from 'element-plus'
import {useI18n} from 'vue-i18n'
@@ -26,7 +26,24 @@
const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
const tableDatab = ref<any[]>([]);
-const tableData = ref([])
+// const tableData = ref([])
+const tableData = reactive([]);
+const filteredData = computed(() => {
+ // applyFilters 鍑芥暟搴旇鍦ㄦ煇澶勫畾涔夛紝鐢ㄤ簬鏍规嵁褰撳墠绛涢�夋潯浠惰繃婊ゆ暟鎹�
+ return applyFilters(tableData, currentFilters);
+});
+// 褰撳墠绛涢�夋潯浠讹紝搴旇鏄竴涓搷搴斿紡鍙橀噺锛岀敤浜庡瓨鍌ㄧ敤鎴烽�夋嫨鐨勭瓫閫夊��
+const currentFilters = ref<{ state?: string }>({});
+const filterTag = (value: string, row: any) => {
+ // return String(row.state) === value;
+ return row.state === value
+};
+// 搴旂敤绛涢�夋潯浠剁殑鍑芥暟
+const applyFilters = (data: any[], filters: { state?: string }) => {
+ return data.filter(row => {
+ return (!filters.state || String(row.state) === filters.state);
+ });
+};
const titleSelectJson = ref({
engineerId: [],
})
@@ -63,6 +80,7 @@
window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
+ ElMessage.error(response.message);
}
};
let socket = null;
@@ -70,7 +88,9 @@
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(0, 2);
if(data.loadTask1.length !=0){
- tableData.value = data.loadTask1[0]
+ // tableData.value = data.loadTask1[0]
+ tableData.splice(0, tableData.length, ...data.loadTask1[0]);
+ window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
@@ -119,7 +139,7 @@
window.localStorage.setItem('filmRemove', filmRemove.value)
if (response.code == 200) {
ElMessage.success(response.message);
- // closeWebSocket(socket);
+ closeWebSocket(socket);
tableData.value = response.data;
dialogFormVisible.value = false;
selectedProjectNo.value = '';
@@ -137,7 +157,6 @@
const deleteTask = async () => {
try {
let engineeringId = window.localStorage.getItem('engineeringIda')
- console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
engineerId: engineeringId,
@@ -167,13 +186,13 @@
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringIda = window.localStorage.getItem('engineeringIda')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 5,
filmRemove: filmRemove,
- engineerId: engineeringIda,
+ engineerId: engineeringId,
state: 1,
})
if (response.code == 200) {
@@ -181,7 +200,7 @@
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
- // socket = initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
blind.value = false;
} else {
ElMessage.error(response.message);
@@ -198,7 +217,6 @@
try {
let filmRemove = window.localStorage.getItem('filmRemove')
let engineeringId = window.localStorage.getItem('engineeringIda')
- console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
stationCell: 5,
@@ -384,28 +402,12 @@
</el-button>
<div style="margin-left: 70px;">{{ upstatus }}</div>
<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;">{{
- $t('basicData.change')
- }}
- </el-button>
</div>
<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;">
- <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>
- </el-select>
- <el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-top: 5px;margin-left: 20px;" >
- <el-option :label="$t('Mounting.waiting')" value="1"></el-option>
- <el-option :label="$t('film.execution')" value="2"></el-option>
- <el-option :label="$t('film.finish')" value="3"></el-option>
- </el-select>
- <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
<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
@@ -424,21 +426,28 @@
<span>{{ 1 }}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- :label="$t('Mounting.state')"
- min-width="80"
- prop="state"
- >
- <template #default="scope">
- <el-tag
+ <el-table-column
+ align="center"
+ prop="state"
+ :label="$t('Mounting.state')"
+ min-width="80"
+ :filters="[
+ { text: t('Mounting.pass'), value: 100 },
+ { text: t('Mounting.waiting'), value: 0 },
+ ]"
+ :filter-method="filterTag"
+ filter-placement="bottom-end"
+ >
+ <template #default="scope">
+ <el-tag
:type="scope.row.state === 100 ? 'success' : 'warning'"
@click="toggleEnableState(scope.row)"
+ disable-transitions
>
{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
</el-tag>
- </template>
- </el-table-column>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-card>
--
Gitblit v1.8.0