| UI-Project/src/views/Caching/cachingbefore.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/Caching/cachingun.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/hollow/hollowequipment.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/hollow/hollowequipmenttwo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI-Project/src/views/hollow/hollowslicecage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
UI-Project/src/views/Caching/cachingbefore.vue
@@ -297,12 +297,21 @@ <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> <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> <div style="margin-left: 155px;">{{ $t('hellow.flowCardId') }}</div> <div style="margin-left: 152px;">{{ $t('searchOrder.glassID') }}</div> <div style="margin-left: 165px;">{{ $t('searchOrder.width') }}</div> <div style="margin-left: 185px;">{{ $t('searchOrder.height') }}</div> <div style="margin-left: 172px;">{{ $t('searchOrder.thickness') }}</div> <div style="margin-left: 145px;">{{ $t('hellow.operate') }}</div> </div> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table ref="table" style="margin-top: 20px; height: 360px;" :data="tableDataa" :row-class-name="rowClassName" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" row-key="id" > @@ -325,14 +334,14 @@ <template #default="props"> <el-table :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" :data="props.row.details" style="width: 100%;height: 100px;"> <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="80" /> <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="80" /> <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" /> <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" /> <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" /> <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" /> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150"> :data="props.row.details" style="width: 100%;height: 70px;"> <el-table-column prop="engineerId" align="center" min-width="80" /> <el-table-column prop="flowCardId" align="center" min-width="80" /> <el-table-column prop="glassId" align="center" min-width="80" /> <el-table-column prop="width" align="center" min-width="80" /> <el-table-column prop="height" align="center" min-width="80" /> <el-table-column prop="thickness" align="center" min-width="80" /> <el-table-column fixed="right" align="center" width="150"> <template #default="scope"> <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button> <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button> @@ -344,6 +353,7 @@ </el-table-column> </el-table> </div> </div> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;margin-top: 15px;"> <el-table height="90" ref="table" @selection-change="handleSelectionChange" UI-Project/src/views/Caching/cachingun.vue
@@ -296,12 +296,21 @@ <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> <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> <div style="margin-left: 155px;">{{ $t('hellow.flowCardId') }}</div> <div style="margin-left: 152px;">{{ $t('searchOrder.glassID') }}</div> <div style="margin-left: 165px;">{{ $t('searchOrder.width') }}</div> <div style="margin-left: 185px;">{{ $t('searchOrder.height') }}</div> <div style="margin-left: 172px;">{{ $t('searchOrder.thickness') }}</div> <div style="margin-left: 145px;">{{ $t('hellow.operate') }}</div> </div> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table ref="table" style="margin-top: 20px; height: 360px;" :data="tableDataa" :row-class-name="rowClassName" :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" row-key="id" > @@ -324,14 +333,14 @@ <template #default="props"> <el-table :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }" :data="props.row.details" style="width: 100%;height: 100px;"> <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="80" /> <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="80" /> <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" /> <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" /> <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" /> <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" /> <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150"> :data="props.row.details" style="width: 100%;height: 70px;"> <el-table-column prop="engineerId" align="center" min-width="80" /> <el-table-column prop="flowCardId" align="center" min-width="80" /> <el-table-column prop="glassId" align="center" min-width="80" /> <el-table-column prop="width" align="center" min-width="80" /> <el-table-column prop="height" align="center" min-width="80" /> <el-table-column prop="thickness" align="center" min-width="80" /> <el-table-column fixed="right" align="center" width="150"> <template #default="scope"> <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button> <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button> @@ -343,6 +352,7 @@ </el-table-column> </el-table> </div> </div> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;margin-top: 15px;"> <el-table height="90" ref="table" @selection-change="handleSelectionChange" UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -896,8 +896,8 @@ :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`, width: `${rect.width}px`, height: `${rect.height}px`, width: `${rect.widtha}px`, height: `${rect.heighta}px`, backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor1(rect.state) }"> <div class="centered-text"> <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div> @@ -924,8 +924,8 @@ :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`, width: `${rect.width}px`, height: `${rect.height}px`, width: `${rect.widtha}px`, height: `${rect.heighta}px`, backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor2(rect.state) }"> <div class="centered-text"> <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div> @@ -962,7 +962,7 @@ @click="showDialoga(rect)" class="rect" :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`, width: `${rect.width}px`, height: `${rect.height}px`, width: `${rect.widtha}px`, height: `${rect.heighta}px`, backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state) }"> <div class="centered-text"> <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div> @@ -989,7 +989,7 @@ @click="showDialogb(rect)" class="rect" :style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`, width: `${rect.width}px`, height: `${rect.height}px`, width: `${rect.widtha}px`, height: `${rect.heighta}px`, backgroundColor: rect.isActive ? '#ADFF2F' : getRectColorb(rect.state) }"> <!-- backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }"> --> <div class="centered-text"> UI-Project/src/views/hollow/hollowequipment.vue
@@ -347,7 +347,7 @@ <div id="dt" style="font-size: 15px;"> <div> <el-form-item :label="$t('hellow.intervalFrameTypedOne')" :required="true" style="width: 16vw;"> <el-select v-model="intervalFrameTypeTwo" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecOne')"> <el-select v-model="intervalFrameTypeOne" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecOne')"> <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option> <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option> </el-select> @@ -624,7 +624,7 @@ <div id="dt" style="font-size: 15px;"> <div> <el-form-item :label="$t('hellow.intervalFrameTypedOne')" :required="true" style="width: 16vw;"> <el-select v-model="intervalFrameTypeTwo" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecOne')"> <el-select v-model="intervalFrameTypeOne" clearable style="width: 220px" :placeholder="$t('hellow.intervalFrameTypecOne')"> <el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option> <el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option> </el-select> @@ -1100,7 +1100,7 @@ const currentPageKeyValue = currentPageKey.value; const currentPageData = allPageData[currentPageKeyValue]; if (data.free0neReguestEntity != null) { freeone.value = data.freeone == 1 ? 'green' : '#911005'; freeone.value = data.free0neReguestEntity == 1 ? 'green' : '#911005'; } // if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) { // tableDataa.value = currentPageData[0]; @@ -1353,6 +1353,7 @@ if (response.code == 200) { ElMessage.success(response.message); tableDatax.value = response.data; fetchmulan() add.value = false formulaName.value = ''; filmRemove.value = ''; @@ -1461,7 +1462,8 @@ const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { fetchmulan() } else { ElMessage.error(response.msg); } } UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -593,7 +593,7 @@ const currentPageKeyValue = currentPageKey.value; const currentPageData = allPageData[currentPageKeyValue]; if (data.freeTwoReqvestEntity != null) { freetwo.value = data.freetwo[0] == true ? 'green' : '#911005'; freetwo.value = data.freeTwoReqvestEntity[0] == true ? 'green' : '#911005'; } // if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) { // tableDataa.value = currentPageData[0]; @@ -765,6 +765,7 @@ leftRemove.value = ''; rightRemove.value = ''; topRemove.value = ''; fetchmulan() } else { ElMessage.error('Failed to fetch data'); } @@ -815,7 +816,8 @@ const response = await request.post(url) if (response.code === 200) { ElMessage.success(response.message); } else { fetchmulan() } else { ElMessage.error(response.msg); } } UI-Project/src/views/hollow/hollowslicecage.vue
@@ -310,13 +310,13 @@ outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005'; } if (data.freeTwoReqvestEntity != null) { freetwo.value = data.freetwo[0] == true ? 'green' : '#911005'; freetwo.value = data.freeTwoReqvestEntity[0] == true ? 'green' : '#911005'; } if (data.outRequestEntity != null) { outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005'; } if (data.free0neReguestEntity != null) { freeone.value = data.freeone == 1 ? 'green' : '#911005'; freeone.value = data.free0neReguestEntity == 1 ? 'green' : '#911005'; } if(data.bigStorageCageDetailsOutTask!=null){ tableDatac.value = data.bigStorageCageDetailsOutTask[0]
