From 044c32c15ee9ccac6f3b60eb6745025e2f4480f2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 十二月 2024 16:59:54 +0800
Subject: [PATCH] 报工回传+库位显示
---
UI-Project/src/views/Marking/marking.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/views/Marking/marking.vue b/UI-Project/src/views/Marking/marking.vue
index ff5e1ee..d7807ce 100644
--- a/UI-Project/src/views/Marking/marking.vue
+++ b/UI-Project/src/views/Marking/marking.vue
@@ -6,6 +6,7 @@
import { useI18n } from 'vue-i18n'
import { WebSocketHost ,host} from '@/utils/constants'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
+import {gridDateFormatter} from '@/stores/tool';
let language = ref(localStorage.getItem('lang') || 'zh')
const { t } = useI18n()
@@ -217,6 +218,7 @@
<el-table-column prop="width" :label="$t('glassInfo.width')"/>
<el-table-column prop="thickness" :label="$t('glassInfo.thickness')"/>
<el-table-column prop="workState" :label="$t('glassInfo.workState')"/>
+ <el-table-column prop="operationRecordTime" :formatter="gridDateFormatter" :label="$t('glassInfo.operationRecordTime')" width="180"/>
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
<template #default="scope">
<el-button size="mini" link type="primary" plain @click="workStatus(scope.row, '閲嶅彂')" >{{$t('functionState.anew')}}</el-button>
@@ -229,7 +231,8 @@
</div>
<div id="main-body" style="width: 100%; height: 460px;min-width: 1200px;">
- <el-image style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../src/assets/鑷姩鎵撴爣鏈�.png"></el-image>
+ <img style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../assets/鑷姩鎵撴爣鏈�.png">
+ <!-- <el-image style="width: 70%;min-width: 900px; height: 460px;float: left;" src="../../src/assets/鑷姩鎵撴爣鏈�.png"></el-image> -->
<!-- <div style="width: 70%;min-width: 900px; height: 460px;background-image: url('../../src/assets/鑷姩鎵撴爣鏈�.png') ;background-size: 100% 100%;float: left;">
</div> -->
--
Gitblit v1.8.0