| UI-Project/src/views/Returns/upreturns.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/Returns/upreturns2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/Slicecage/slicecage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
UI-Project/src/views/Returns/upreturns.vue
@@ -17,6 +17,7 @@ const blinda = ref(false) const blindb = ref(false) const dialoglea = ref(false) const ReportData = ref(true); const canSelectProjecta = ref(true); const canSelectProjectb = ref(true); const canSelectProjectc = ref(false); @@ -27,24 +28,18 @@ const tableDataa = ref<any[]>([]); const tableDatab = ref<any[]>([]); const tableData = ref([]) const filteredData = computed(() => { // applyFilters 函数应该在某处定义，用于根据当前筛选条件过滤数据 return applyFilters(tableData, currentFilters); }); // 当前筛选条件，应该是一个响应式变量，用于存储用户选择的筛选值 const currentFilters = ref<{ state?: string }>({}); const filterTag = (value: string, row: any) => { 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: [], }) request.post("/loadGlass/up-patten-usage/setUpPattenRequest",{ state: null, stationCell: 5 }).then((response) => { if (response.code == 200) { } else { ElMessage.warning(response.msg) } }); const handlezhiban = () => { dialoglea.value = true; fetchFlowCardId(); @@ -140,6 +135,7 @@ filmRemove.value = ''; markingMachineStatus.value = '#911005'; cuttingMachineStatus.value = '#911005'; ReportData.value = false; } else { ElMessage.error(response.message); } @@ -167,7 +163,8 @@ canSelectProjectc.value = true; socket = initializeWebSocket(socketUrl, handleMessage); blind.value = false; } else { ReportData.value = true; } else { ElMessage.error(response.message); } } catch (error) { @@ -328,6 +325,7 @@ console.error('发生错误:', error); } }; // 架子复位 const handleptask = async (workstationId: number) => { console.log(workstationId); @@ -440,6 +438,18 @@ <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="deleteTask">{{ $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.all')" value="null"></el-option> <el-option :label="$t('Mounting.waiting')" value="0"></el-option> <el-option :label="$t('Mounting.pass')" value="100"></el-option> </el-select> <el-button :disabled="!ReportData" 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 @@ -455,27 +465,20 @@ <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/> <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/> <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" > align="center" :label="$t('Mounting.state')" min-width="80" prop="state" > <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> :type="scope.row.state === 100 ? 'success' : 'warning'" @click="toggleEnableState(scope.row)" > {{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }} </el-tag> </template> </el-table-column> </el-table-column> </el-table> </div> </el-card> UI-Project/src/views/Returns/upreturns2.vue
@@ -15,6 +15,7 @@ const dialogFormVisible = ref(false) const blind = ref(false) const blinda = ref(false) const ReportData = ref(true); const blindb = ref(false) const dialoglea = ref(false) const canSelectProjecta = ref(true); @@ -27,25 +28,18 @@ const tableDataa = ref<any[]>([]); const tableDatab = ref<any[]>([]); const tableData = ref([]) 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: [], }) request.post("/loadGlass/up-patten-usage/setUpPattenRequest",{ state: null, stationCell: 6 }).then((response) => { if (response.code == 200) { } else { ElMessage.warning(response.msg) } }); const handlezhiban = () => { dialoglea.value = true; fetchFlowCardId(); @@ -175,6 +169,7 @@ filmRemove.value = ''; markingMachineStatus.value = '#911005'; cuttingMachineStatus.value = '#911005'; ReportData.value = false; } else { ElMessage.error(response.message); } @@ -235,6 +230,7 @@ canSelectProjectc.value = true; socket = initializeWebSocket(socketUrl, handleMessage); blind.value = false; ReportData.value = true; } else { ElMessage.error(response.message); } @@ -446,6 +442,18 @@ <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="deleteTask">{{ $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.all')" value="null"></el-option> <el-option :label="$t('Mounting.waiting')" value="0"></el-option> <el-option :label="$t('Mounting.pass')" value="100"></el-option> </el-select> <el-button :disabled="!ReportData" 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 @@ -461,27 +469,20 @@ <el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/> <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/> <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 align="center" :label="$t('Mounting.state')" min-width="80" prop="state" > <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> UI-Project/src/views/Slicecage/slicecage.vue
@@ -50,11 +50,6 @@ const adjustedRectsa = ref([]); const adjustedRectsb = ref([]); const adjustedRectsc = ref([]); const adjustedRectsd = ref([]); const adjustedRectse = ref([]); const adjustedRectsf = ref([]); const adjustedRectsg = ref([]); const adjustedRectsh = ref([]); const currentRow = reactive({}); // 当前行的数据 const currentPage2 = ref(1) const inputValuesa = reactive({}); @@ -73,11 +68,6 @@ const cell2=ref(true); const cell3=ref(true); const cell4=ref(true); const cell5=ref(true); const cell6=ref(true); const cell7=ref(true); const cell8=ref(true); const cell9=ref(true); const canEdit = ref(true); const selectedRow = ref(null); const temperingtotal = ref(0); @@ -1036,13 +1026,13 @@ </div> </div> <div style="position: relative;"> <div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:50px;left: 495px;"> <div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 585px;"> <div v-for="(rect, index) in adjustedRects" :key="rect" :style="{ position: 'absolute', width: '227px', width: '200px', left: '0px', top: index*rect.top+`px`, height: `${rect.height}px`, @@ -1063,7 +1053,7 @@ </div> </div> </div> <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:51px;left: 495px;"> <div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:67px;left: 585px;"> <div v-for="(rect, index) in adjustedRectsa" :key="rect.id" @@ -1090,7 +1080,7 @@ </div> </div> </div> <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:110px;left: 495px;"> <div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:72px;left: 585px;"> <div v-for="(rect, index) in adjustedRectsb" :key="rect.id" @@ -1117,147 +1107,9 @@ </div> </div> </div> <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:140px;left: 495px;"> <div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:77px;left: 585px;"> <div v-for="(rect, index) in adjustedRectsc" :key="rect.id" :style="{ position: 'absolute', width: '227px', left: '0px', top: index*rect.top+`px`, height: `${rect.height}px`, }" > <div v-for="(rects, index) in rect.bigStorageCageDetails" :key="rects" :style="{ float:'left', width: '18px', height: `${rect.height}px`, backgroundColor: '#911005', top: '0px', marginRight: rects.gap/5000*227+'px' }" > </div> </div> </div> <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:170px;left: 495px;"> <div v-for="(rect, index) in adjustedRectsd" :key="rect.id" :style="{ position: 'absolute', width: '227px', left: '0px', top: index*rect.top+`px`, height: `${rect.height}px`, }" > <div v-for="(rects, index) in rect.bigStorageCageDetails" :key="rects" :style="{ float:'left', width: '18px', height: `${rect.height}px`, backgroundColor: '#911005', top: '0px', marginRight: rects.gap/5000*227+'px' }" > </div> </div> </div> <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:241px;left: 495px;"> <div v-for="(rect, index) in adjustedRectse" :key="rect.id" :style="{ position: 'absolute', width: '227px', left: '0px', top: index*rect.top+`px`, height: `${rect.height}px`, }" > <div v-for="(rects, index) in rect.bigStorageCageDetails" :key="rects" :style="{ float:'left', width: '18px', height: `${rect.height}px`, backgroundColor: '#911005', top: '0px', marginRight: rects.gap/5000*227+'px' }" > </div> </div> </div> <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:271px;left: 495px;"> <div v-for="(rect, index) in adjustedRectsf" :key="rect.id" :style="{ position: 'absolute', width: '227px', left: '0px', top: index*rect.top+`px`, height: `${rect.height}px`, }" > <div v-for="(rects, index) in rect.bigStorageCageDetails" :key="rects" :style="{ float:'left', width: '18px', height: `${rect.height}px`, backgroundColor: '#911005', top: '0px', marginRight: rects.gap/5000*227+'px' }" > </div> </div> </div> <div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:301px;left: 495px;"> <div v-for="(rect, index) in adjustedRectsg" :key="rect.id" :style="{ // display:'flex', position: 'absolute', width: '227px', // backgroundColor: 'red', left: '0px', top: index*rect.top+`px`, height: `${rect.height}px`, }" > <div v-for="(rects, index) in rect.bigStorageCageDetails" :key="rects" :style="{ float:'left', width: '18px', height: `${rect.height}px`, backgroundColor: '#911005', // border:'1px solid black', top: '0px', marginRight: rects.gap/5000*227+'px' }" > </div> </div> </div> <div v-show="cell9" style="width: 227px;height: 29px;position: absolute;top:332px;left: 495px;"> <div v-for="(rect, index) in adjustedRectsh" :key="rect.id" :style="{ position: 'absolute',
