From 7956f09935a708f17b0f1b29a6625475f53c7509 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 16 十月 2024 09:52:15 +0800
Subject: [PATCH] 版本整合03
---
UI-Project/src/views/Slicecage/slicecage.vue | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 6e802dc..e00d842 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,16 +1,15 @@
<script lang="ts" setup>
-import { useI18n } from 'vue-i18n'
- const { t } = useI18n()
- let language = ref(localStorage.getItem('lang') || 'zh')
-import {Search} from "@element-plus/icons-vue";
+import {useI18n} from 'vue-i18n'
import {useRouter} from "vue-router"
-const router = useRouter()
import request from "@/utils/request"
-import { WebSocketHost ,host} from '@/utils/constants'
-import { ref, onMounted , onBeforeUnmount, reactive, computed,onUnmounted } from "vue";
-import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { tr } from "element-plus/es/locale";
+import {host, WebSocketHost} from '@/utils/constants'
+import {computed, onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+import {ElMessage, ElMessageBox} from 'element-plus'
+
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+const router = useRouter()
const dialogFormVisible = ref(false)
const dialoglea = ref(false)
const dialogFormVisiblea = ref(false)
@@ -79,6 +78,7 @@
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
const temperingtotal = ref(0);
const glasstotal = ref(0);
+const fulltotals = ref(0);
const temperingengineerId=ref('');
// 褰撳墠椤电爜鍜屾瘡椤垫樉绀虹殑鏉℃暟
const currentPage = ref(1);
@@ -361,21 +361,22 @@
}
};
// 鎸囧畾閽㈠寲
- const brokee = async(row) => {
+const brokee = async (row, temperingFeedSequence) => {
try {
- const confirmResult = await ElMessageBox.confirm(
- t('searchOrder.specifytemperinga'),
- t('searchOrder.prompt'),
- {
- confirmButtonText: t('searchOrder.yes'),
- cancelButtonText: t('searchOrder.cancel'),
- type: 'warning',
- }
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.specifytemperinga'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
);
if (confirmResult === 'confirm') {
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/TemperingGlass",{
engineerId: row.engineer_id,
temperingLayoutId: row.tempering_layout_id,
+ temperingFeedSequence: temperingFeedSequence
});
if (response.code === 200) {
ElMessage.success(response.message);
@@ -385,7 +386,8 @@
}
} catch (error) {
console.error('鍙戠敓閿欒:', error);
- }
+ }
+ handleganghua();
};
// 鎸囧畾宸ョ▼
const brokek = async(row) => {
@@ -624,11 +626,17 @@
ElMessage.success(response.message);
tableDatagh.value = response.data
temperingtotal.value = response.data.length
- let totalCount = 0;
+ let totalCount = 0;
+ let fullCount = 0;
response.data.forEach(item => {
- totalCount += item.count2 || 0;
+ totalCount += item.count1 || 0;
+ if(item.count2-item.count1-item.count4==0){
+ fullCount+=1;
+ }
});
glasstotal.value = totalCount;
+ fulltotals.value = fullCount;
+
} else {
ElMessage.error(response.message);
}
@@ -1524,6 +1532,13 @@
</el-col>
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('婊＄倝鏁伴噺')" style="width: 14vw">
+ {{ fulltotals }}
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('褰撳墠鎸囧畾宸ョ▼')" style="width: 14vw">
{{ temperingengineerId }}
</el-form-item>
@@ -1544,12 +1559,21 @@
<el-table-column prop="count2" align="center" :label="$t('鎬绘暟閲�')" min-width="150" />
<el-table-column prop="count1" align="center" :label="$t('绗煎瓙鍐呮暟閲�')" min-width="150" />
<el-table-column prop="count3" align="center" :label="$t('缂哄皯鏁伴噺')" min-width="150" />
+ <el-table-column prop="count4" align="center" :label="$t('鐮存崯/鎷胯蛋鏁伴噺')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row)">{{ $t('searchOrder.specifytempering') }}</el-button>
- <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
+ <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">
+ {{ $t('searchOrder.specifytempering') }}
+ </el-button>
+ <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{
+ $t('searchOrder.specifyout')
+ }}
+ </el-button>
+ <el-button size="mini" type="text" plain @click="brokek(scope.row)">{{
+ $t('searchOrder.specifyengineerid')
+ }}
+ </el-button>
</template>
-
</el-table-column>
</el-table>
</el-dialog>
--
Gitblit v1.8.0