From 3b7df2e4479440589d928f398e34934ee56c3952 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 13 Oct 2023 15:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=90=88=E8=AE=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A8=AA=E5=90=91=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kanban/dailyoutput/index.vue | 2 +-
 src/views/mes/hourProduction/index.vue | 1 +
 vue.config.js                          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/kanban/dailyoutput/index.vue b/src/views/kanban/dailyoutput/index.vue
index a43d81dc..36a72cbd 100644
--- a/src/views/kanban/dailyoutput/index.vue
+++ b/src/views/kanban/dailyoutput/index.vue
@@ -1,6 +1,6 @@
 <template>
   <v-scale-screen width="1920" height="1080" :fullScreen="false">
-  <div class="app-container home" style="height: 100vh; overflow: hidden">
+  <div class="app-container home" style="">
     <div class="head">
       <div class="head-content">
         <div class="title">当 日 设 备 产 量</div>
diff --git a/src/views/mes/hourProduction/index.vue b/src/views/mes/hourProduction/index.vue
index 4b795aa8..ce3c5c55 100644
--- a/src/views/mes/hourProduction/index.vue
+++ b/src/views/mes/hourProduction/index.vue
@@ -74,6 +74,7 @@
 		>
 		    <el-table-column label="设备编码" align="center" prop="equCode" min-width="100" />
             <el-table-column label="设备名称" align="center" prop="equName" min-width="100" />
+			<el-table-column label="设备总产量" align="center" prop="quantity" min-width="100" />
             <template v-for="(column, index) in showTitles">
                 <el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
             </template>
diff --git a/vue.config.js b/vue.config.js
index 98b467d1..54e5272f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.3.93:8080`,
+        target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''