UI-Project/src/views/Caching/cachingbefore.vue
@@ -446,7 +446,7 @@ </div> </div> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="10vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Caching/cachingun.vue
@@ -423,7 +423,7 @@ </div> </div> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="10vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -554,7 +554,7 @@ </el-table> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="10vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Identify/identifwu.vue
@@ -144,9 +144,13 @@ const handleMessage = (data: any) => { if (data.engineer != null) { ava.value = data.engineer[0] }else{ ava.value = 0 } if (data.engineer != null) { avanum.value = data.sequence[0] }else{ avanum.value = 0 } const scaleFactor = 1621.78 / 6000; const scaleFactory = 750 / 3300; UI-Project/src/views/Identify/identifwutwo.vue
@@ -56,9 +56,13 @@ const handleMessage = (data: any) => { if (data.engineer != null) { ava.value = data.engineer[0] }else{ ava.value = 0 } if (data.engineer != null) { avanum.value = data.sequence[0] }else{ avanum.value = 0 } const scaleFactor = 1621.78 / 6000; const scaleFactory = 750 / 3300; UI-Project/src/views/ReportWork/reportWork.vue
@@ -49,8 +49,8 @@ <el-table-column prop="engineerId" align="center" :label="$t('reportmanage.projectnumber')" min-width="120" /> <el-table-column prop="temperingLayoutId" align="center" :label="$t('reportmanage.layoutID')" min-width="120" /> <el-table-column prop="damageTime" align="center" :label="$t('reportmanage.productiontime')" min-width="230" /> <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.productiontime')" min-width="230" />damageTime <el-table-column prop="type" align="center" :label="$t('reportmanage.type')" min-width="120" /> <el-table-column prop="status" align="center" :label="$t('reportmanage.state')" min-width="120" /> <el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="140" /> @@ -173,11 +173,8 @@ const selectValuese = reactive({}); const inputValuesa = reactive({}); const inputValuesb = reactive({}); const selectedType = ref(true); const selectedStatus = ref(false); // 查询数据 const selectReportData = async () => { const response = await request.post("/cacheVerticalGlass/damage/selectDamage", { @@ -198,13 +195,16 @@ selectedStatus.value = false; } if (response.code === 200) { reportData.value = response.data; const formattedData = response.data.map(record => ({ ...record, formattedCreateTime: formatTimestamp(record.createTime), })); reportData.value = formattedData; ElMessage.success(response.message); } else { ElMessage.error(response.message); } // const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", { // glassId:"P24081502|1|1", // line:"1001", UI-Project/src/views/Returns/upreturns.vue
@@ -611,7 +611,7 @@ </template> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindbd" top="10vh" width="90%"> <el-dialog v-model="blindbd" top="10vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Returns/upreturns2.vue
@@ -496,7 +496,7 @@ </div> </div> <!-- 历史任务 --> <el-dialog v-model="blindbd" top="10vh" width="90%"> <el-dialog v-model="blindbd" top="10vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Slicecage/slicecage.vue
@@ -821,6 +821,11 @@ adjusta.value = '' } if(data.bigStorageCageDetailsFeedTask!=null){ tableDatax.value = data.bigStorageCageDetailsFeedTask[0] } else { tableDatax.value = '' } if(data.bigStorageCageDetailsFeedTask!=null){ tableDatad.value = data.bigStorageCageDetailsFeedTask[0] adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined); }else{ @@ -1141,20 +1146,6 @@ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading"> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 300px;"> <el-table height="300px" ref="table" :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" /> <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" /> <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" /> <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157"> <template #default="scope"> <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag> </template> </el-table-column> </el-table> </div> </el-card> <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading"> <el-table height="300px" ref="table" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> @@ -1174,6 +1165,20 @@ </template> </el-table-column> </el-table> </div> </el-card> <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading"> <el-table height="300px" ref="table" :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"> <el-table-column prop="glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="140" /> <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" /> <el-table-column prop="targetSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" /> <el-table-column prop="taskState" align="center" :label="$t('searchOrder.taskstatus')" min-width="157"> <template #default="scope"> <el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag> </template> </el-table-column> </el-table> </el-card> </div> <div style="padding: 10px;display: flex;height:130px;"> @@ -1439,7 +1444,7 @@ </div> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="10vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/Slicecage/slicecagehistory.vue
@@ -34,20 +34,20 @@ </div> </el-col> <el-col :span="5"> <div id="dta" style="font-size: 15px;"> <el-form-item :label="$t('hellow.countOut')" style="width: 14vw"> {{ countOut }} </el-form-item> </div> </el-col> <el-col :span="4"> <div id="dt" style="font-size: 15px;"> <el-form-item :label="$t('hellow.totalAreaIn')" style="width: 14vw"> {{ totalAreaIn }} </el-form-item> </div> </el-col> <el-col :span="4"> <el-col :span="5"> <div id="dta" style="font-size: 15px;"> <el-form-item :label="$t('hellow.countOut')" style="width: 14vw"> {{ countOut }} </el-form-item> </div> </el-col> <el-col :span="5"> <div id="dt" style="font-size: 15px;"> <el-form-item :label="$t('hellow.totalAreaOut')" style="width: 14vw"> {{ totalAreaOut }} UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -168,10 +168,10 @@ <div> <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading"> <div style="display: flex;"> <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{ <!-- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }} </el-button> </el-button> --> <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable style="margin-left: 20px;margin-bottom: 10px;"> <el-option :label="$t('workOrder.edgingone')" value="930"></el-option> @@ -229,7 +229,7 @@ </el-card> </div> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="10vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/hollow/hellowslicecagehistory.vue
@@ -26,7 +26,7 @@ <div style="margin-bottom: 10px;margin-top: 20px;margin-left: 20px;"> <el-form> <el-row style="margin-top: -15px;margin-bottom: -2px;"> <el-col :span="4"> <el-col :span="5"> <div id="dt" style="font-size: 15px;"> <el-form-item :label="$t('hellow.hollowCountOutOne')" style="width: 14vw"> {{ hollowCountOutOne }} @@ -34,19 +34,19 @@ </div> </el-col> <el-col :span="5"> <div id="dta" style="font-size: 15px;"> <el-form-item :label="$t('hellow.hollowCountOutTwo')" style="width: 14vw"> {{ hollowCountOutTwo }} </el-form-item> </div> </el-col> <el-col :span="4"> <div id="dt" style="font-size: 15px;"> <el-form-item :label="$t('hellow.hollowTotalAreaOutOne')" style="width: 14vw"> {{ hollowTotalAreaOutOne }} </el-form-item> </div> </el-col> <el-col :span="5"> <div id="dta" style="font-size: 15px;"> <el-form-item :label="$t('hellow.hollowCountOutTwo')" style="width: 14vw"> {{ hollowCountOutTwo }} </el-form-item> </div> </el-col> <el-col :span="4"> <div id="dt" style="font-size: 15px;"> <el-form-item :label="$t('hellow.hollowTotalAreaOutTwo')" style="width: 14vw"> UI-Project/src/views/hollow/hollowequipment.vue
@@ -986,7 +986,7 @@ </template> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="5vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -480,7 +480,7 @@ </template> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="5vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px" UI-Project/src/views/hollow/hollowslicecage.vue
@@ -958,7 +958,7 @@ </div> </el-dialog> <!-- 历史任务 --> <el-dialog v-model="blindb" top="10vh" width="90%"> <el-dialog v-model="blindb" top="5vh" width="95%"> <iframe :src="iframeUrl" marginwidth="2000px"
