From 4829439b3c4d52ecee6e9858068552b2f9d8ac79 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 17 七月 2024 14:17:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index f478ff0..36af612 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -1,7 +1,7 @@
<template>
<div class="glass-rack">
<div >
- <svg width="500" height="500" xmlns="http://www.w3.org/2000/svg">
+ <svg width="500" height="370" xmlns="http://www.w3.org/2000/svg">
<g stroke="null" id="Layer_1">
<!-- 浣跨敤 v-for 寰幆娓叉煋鏁版嵁 -->
<g v-for="(rack, index) in racks" :key="index" :data="tableData">
@@ -46,7 +46,7 @@
{ x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678',downGlassInfoList:"" } },
- { x: 140, y: 320, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' ,downGlassInfoList:""} }
+ { x: 140, y: 280, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' ,downGlassInfoList:""} }
]);
@@ -171,8 +171,7 @@
Swal.fire({
// title: '鐜荤拑淇℃伅',
- title: this.$t('reportWork.glassinformation'),
- // title: "$t('reportWork.glassinformation')",
+ title: t('reportWork.glassinformation'),
html: tableContent,
customClass: {
popup: 'format-pre'
@@ -199,7 +198,7 @@
<style scoped>
.glass-rack {
- margin-left: 20px;
+ /* margin-left: 10px; */
width: 500px;
margin-top: 5px;
}
--
Gitblit v1.8.0