From 78b84ce853f9947beb4c3d244666b623d1f9f035 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 18 Sep 2024 11:30:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.staging                                  |  2 +-
 package.json                                  |  5 +--
 src/layout/components/Sidebar/Logo.vue        |  4 +--
 src/views/index_v1.vue                        |  2 +-
 .../finishproduct/BottomRightTable1.vue       |  1 -
 src/views/login.vue                           |  2 +-
 src/views/mes/monthProductionSut/index.vue    | 20 ++++++++++-
 src/views/mes/prepare/index.vue               | 31 +++++++++--------
 src/views/mobile/dailyReport/index.vue        | 34 +++++++++++++++++++
 vue.config.js                                 |  3 +-
 11 files changed, 78 insertions(+), 28 deletions(-)
 create mode 100644 src/views/mobile/dailyReport/index.vue

diff --git a/.env.development b/.env.development
index 456802bb..1cce8b91 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 榄菊管理系统
+VUE_APP_TITLE = 榄菊生产管理系统
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.staging b/.env.staging
index 471773d7..8c0be338 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 榄菊管理系统
+VUE_APP_TITLE = 榄菊生产管理系统
 
 NODE_ENV = production
 
diff --git a/package.json b/package.json
index 60d05e19..0b90b1dd 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "###": "高版本node请使用如下配置启动 SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "dev": "vue-cli-service serve",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
@@ -46,14 +46,12 @@
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
-    "jsbarcode": "^3.11.6",
     "jsencrypt": "3.0.0-rc.1",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
     "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "print-js": "^1.6.0",
-    "qrcode": "^1.5.4",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
@@ -64,7 +62,6 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
-    "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
     "xlsx": "^0.17.0"
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 5481b1b0..b257c169 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -35,8 +35,8 @@ export default {
   },
   data() {
     return {
-      title: '管理系统',
-      logo: logoImg
+      title: '榄菊生产管理系统',
+      // logo: logoImg
     }
   }
 }
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index d2d2ec63..405cb9e7 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -25,7 +25,7 @@
       </el-col>
     </el-row>
 
-    
+
   </div>
 </template>
 
diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue
index 0075416a..228babfe 100644
--- a/src/views/kanban/finishproduct/BottomRightTable1.vue
+++ b/src/views/kanban/finishproduct/BottomRightTable1.vue
@@ -76,7 +76,6 @@ export default {
   width: calc(~"100% + 10px");
   height: 100%;
   margin: 0 -5px;
-  
 
   .border-box-content {
     padding: 20px;
diff --git a/src/views/login.vue b/src/views/login.vue
index 8a264458..30ea557d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -161,7 +161,7 @@ export default {
   justify-content: end;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login-background-none.jpg");
   background-size: cover;
 }
 .title {
diff --git a/src/views/mes/monthProductionSut/index.vue b/src/views/mes/monthProductionSut/index.vue
index fdfc1de0..a50e14ee 100644
--- a/src/views/mes/monthProductionSut/index.vue
+++ b/src/views/mes/monthProductionSut/index.vue
@@ -13,7 +13,19 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes:scrap:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     <el-tabs type="border-card" @tab-click="handleTabClick">
       <el-tab-pane label="当月产线产量汇总" >
         <el-table :data="tableData" border style="width: 100%" :header-cell-style="getHeaderCellStyle" :summary-method="getSummaries" show-summary>
@@ -326,6 +338,12 @@ export default {
 
     handleQuery() {
       this.getList();
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/reportWork/getmonthProductionSut/export', {
+        ...this.queryParams
+      }, `汇总报表_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 16759a71..68061b94 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -272,7 +272,7 @@
 
 				<el-table-column prop="routeCode" width="75" label="实发"></el-table-column>
 				<el-table-column prop="routeCode" width="75" label="数量2"></el-table-column>
-		      
+
           </el-table>
 		  <!-- 底部 -->
           <el-row class="my-print-foot0">
@@ -508,7 +508,7 @@ export default {
 	// 遍历this.printData.workTable
      for (let i = 0; i < this.printData.workTable.length; i += (i==0?this.fenyeNumber:this.fenyeNumberTwo)) {
 
-		
+
 		// 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素）
 		let chunk = this.printData.workTable.slice(i, i + (i==0?this.fenyeNumber:this.fenyeNumberTwo));
 		// 将切割后的数组添加到chunkedArray中
@@ -518,7 +518,7 @@ export default {
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 
-		this.generateBarcode(this.printData.productDate); //条码 根据打印日期生成
+		this.generateBarcode(this.printData.printDate); //条码 根据打印日期生成
       })
     },
 
@@ -656,16 +656,16 @@ export default {
 </script>
 <style>
 .my-print-table .el-table {
-  border-collapse: collapse; 
-  border-spacing: 0; 
+  border-collapse: collapse;
+  border-spacing: 0;
 }
 
 
 .my-print-table .el-table__header-wrapper th {
-  border: 1px solid black !important; 
+  border: 1px solid black !important;
 }
 .my-print-table .el-table__body-wrapper td {
-  border: 1px solid black !important; 
+  border: 1px solid black !important;
 }
 
 .my-print-head {
@@ -686,16 +686,17 @@ export default {
 }
 
 .my-print-foot {
-  margin-top: 10px;
-}
-.my-print-foot0 {
-  margin-top: -1px;
-  padding-top:2px;
-  border-top: 1px solid black;
-  width: 94%;
+  margin-top: 20px;
 }
-
 @media print {
+  body {
+    font-family: 'Arial', sans-serif; /* 设置字体为'Arial'或其他清晰的无衬线字体 */
+    font-size: 14px; /* 设置字体大小 */
+
+  }
+  .my-print-table .el-table {
+  border-collapse: collapse; /* 合并表格边框 */
+}
 
 }
 .fy{
diff --git a/src/views/mobile/dailyReport/index.vue b/src/views/mobile/dailyReport/index.vue
new file mode 100644
index 00000000..152e2b4c
--- /dev/null
+++ b/src/views/mobile/dailyReport/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <div>
+<!--    <u-action-sheet :actions="list" :title="title" :show="show"></u-action-sheet>-->
+<!--    <u-button @click="show = true">打开ActionSheet</u-button>-->
+    <el-button>默认按钮</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      title:'标题',
+      list: [
+        {
+          name:'选项一',
+          subname:"选项一描述",
+          color:'#ffaa7f',
+          fontSize:'20'
+        },
+        {
+          name: '选项二禁用',
+          disabled:true
+        },
+        {
+          name: '开启load加载', //开启后文字不显示
+          loading:true
+        }
+      ],
+      show: false
+    };
+  }
+};
+</script>
diff --git a/vue.config.js b/vue.config.js
index fc2956be..d58fe977 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        // target: `http://192.168.202.20:8080`,
+         target: `http://localhost:8080`,
         // target: `http://192.168.3.93:8080`,
         // target: `http://192.168.3.158:8080`,
         // target: `http://192.168.202.34:30000`,