From 55f19dcd8411b1dcd927bcb4f631c4b0e3dc9b35 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 22 Jan 2024 15:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                                            | 4 ++--
 src/views/modules/board/AbnormalBoard.vue                  | 2 +-
 src/views/modules/board/SORoutingBoard.vue                 | 2 +-
 src/views/modules/board/shopOrderBoard.vue                 | 4 +---
 src/views/modules/print/label/print_stock_label_preview.js | 2 +-
 static/config/index-prod.js                                | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/index.js b/config/index.js
index d37e229..06dc314 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
-        target: 'http://127.0.0.1:8887',
+        target: 'http://127.0.0.1:8902',
         changeOrigin: true,
         pathRewrite: {
           // 把 /proxyApi 替换成 /
@@ -24,7 +24,7 @@ module.exports = {
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8888, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 8901, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: true,
diff --git a/src/views/modules/board/AbnormalBoard.vue b/src/views/modules/board/AbnormalBoard.vue
index 26d0e53..8931f76 100644
--- a/src/views/modules/board/AbnormalBoard.vue
+++ b/src/views/modules/board/AbnormalBoard.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-    <img class="logo" src="~@/assets/img/jtLogo.jpg" style="  width: 10%; position: absolute;top: 0;left:0;" >
+<!--    <img class="logo" src="~@/assets/img/jtLogo.jpg" style="  width: 10%; position: absolute;top: 0;left:0;" >-->
     <div style="text-align: center">
       <h1>异常处理看板</h1>
     </div>
diff --git a/src/views/modules/board/SORoutingBoard.vue b/src/views/modules/board/SORoutingBoard.vue
index 7ac16ee..c70b5e9 100644
--- a/src/views/modules/board/SORoutingBoard.vue
+++ b/src/views/modules/board/SORoutingBoard.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-    <img class="logo" src="~@/assets/img/jtLogo.jpg" style="  width: 10%; position: absolute;top: 0;left:0;" >
+<!--    <img class="logo" src="~@/assets/img/jtLogo.jpg" style="  width: 10%; position: absolute;top: 0;left:0;" >-->
     <div style="text-align: center">
       <h1>{{lineName}}生产看板</h1>
     </div>
diff --git a/src/views/modules/board/shopOrderBoard.vue b/src/views/modules/board/shopOrderBoard.vue
index 2c867fa..821b014 100644
--- a/src/views/modules/board/shopOrderBoard.vue
+++ b/src/views/modules/board/shopOrderBoard.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="mod-config">
-<!--    <div style="float: left">-->
-    <img class="logo" src="~@/assets/img/jtLogo.jpg" style="  width: 10%; position: absolute;top: 0;left:0;" >
-<!--    </div>-->
+<!--    <img class="logo" src="~@/assets/img/jtLogo.jpg" style="  width: 10%; position: absolute;top: 0;left:0;" >-->
     <div style="text-align: center; ">
       <h1>生产订单周完成情况</h1>
     </div>
diff --git a/src/views/modules/print/label/print_stock_label_preview.js b/src/views/modules/print/label/print_stock_label_preview.js
index 1dc722a..c49cd1e 100644
--- a/src/views/modules/print/label/print_stock_label_preview.js
+++ b/src/views/modules/print/label/print_stock_label_preview.js
@@ -14,7 +14,7 @@ export function printMaterialLabelPreview(printList) {
       LODOP.SET_PRINT_PAGESIZE(0,700,400,"");
       LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
       LODOP.ADD_PRINT_BARCODE(77,182,82,78,"QRCode",printData.seqNo);
-      LODOP.ADD_PRINT_TEXT(2,1,252,19,"苏州江天电子材料有限公司");
+      LODOP.ADD_PRINT_TEXT(2,1,252,19,"苏州XXXX有限公司");
       LODOP.SET_PRINT_STYLEA(0,"FontName","微软雅黑");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
diff --git a/static/config/index-prod.js b/static/config/index-prod.js
index 584465f..03f53ab 100644
--- a/static/config/index-prod.js
+++ b/static/config/index-prod.js
@@ -5,7 +5,7 @@
   window.SITE_CONFIG = {};
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.120:8887';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.120:8902';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名