验证码显示调整

ruoyi-admin-vue/src/views/inventory/report_view/inventory_detail.vue

@@ -19,6 +19,13 @@
           @click="handleExport"
           v-hasPermi="['inventory:inventory:export']"
         >导出</el-button>
+        <!-- <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="medium"
+          v-print="handlePrint"
+        >打印</el-button> -->
       </template>
     </PageTitle>
 
@@ -60,10 +67,10 @@
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item label="SAP物料号" prop="materialId">
+      <el-form-item label="物料名称" prop="materialId">
         <el-input
           v-model="queryParams.materialId"
-          placeholder="请输入SAP物料号"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -132,7 +139,7 @@
 
       <!-- 表格区域 -->
       <div class="table-container">
-        <el-table v-loading="loading" :data="inventoryList" border height="100%">
+        <el-table v-loading="loading" id="print" :data="inventoryList" border height="100%">
       <el-table-column type="index" label="序号" width="60" align="center" />
       <el-table-column label="物料名称" align="center" prop="materialName" min-width="150" />
       <el-table-column label="SAP物料号" align="center" prop="sapNo" min-width="120" />
@@ -342,7 +349,12 @@ export default {
       detailDialogVisible: false,
       detailLoading: false,
       detailList: [],
-      currentDetailRow: null
+      currentDetailRow: null,
+      handlePrint: {
+          id: 'print',
+          // extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>,打印表格数据<style>#print {width: 100%;}<style>',
+          popTitle: "页眉部分",
+      }
     }
   },
   created() {
@@ -541,7 +553,8 @@ export default {
     /** 导入库存数据 */
     handleImport() {
       this.$refs.import && this.$refs.import.show()
-    }
+    },
+
   }
 }
 </script>
@@ -571,5 +584,33 @@ export default {
 .mb8 {
   margin-bottom: 8px;
 }
+
+/* 打印样式 */
+@media print {
+  @page{
+    size:  auto;
+    margin: 8mm 6mm;
+  }
+  html {
+    /*打印缩放，防止显示不全*/
+    zoom: 90%;
+  }
+  #print table {
+    table-layout: auto !important;
+  }
+  #print .el-table__header-wrapper .el-table__header {
+    width: 100% !important;
+  }
+  #print .el-table__body-wrapper .el-table__body {
+    width: 100% !important;
+  }
+  .el-table--border .el-table__cell, .el-table__body-wrapper td {
+    border: solid 1px #f2f2f2;
+  }
+  td.el-table__cell{
+    border: solid 1px #f2f2f2;
+  }
+}
+
 </style>
 

ruoyi-admin-vue/src/views/inventory/warehouses/index.vue

@@ -29,15 +29,6 @@
           v-hasPermi="['inventory:warehouses:remove']"
         >删除</el-button>
         <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="medium"
-          @click="handleExport"
-          v-hasPermi="['inventory:warehouses:export']"
-        >导出</el-button>
-        <!-- 新增导入按钮（和其他页面保持一致） -->
-        <el-button
           type="success"
           plain
           icon="el-icon-upload"
@@ -45,6 +36,14 @@
           @click="handleImport"
           v-hasPermi="['inventory:warehouses:add']"
         >导入</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="medium"
+          @click="handleExport"
+          v-hasPermi="['inventory:warehouses:export']"
+        >导出</el-button>
       </template>
     </PageTitle>
 

ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java

@@ -59,7 +59,7 @@ public class CaptchaConfig
         // 验证码图片高度 默认为50
         properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
         // 验证码文本字符大小 默认为40
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35");
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "40");
         // KAPTCHA_SESSION_KEY
         properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
         // 验证码文本生成器
@@ -69,13 +69,13 @@ public class CaptchaConfig
         // 验证码文本字符长度 默认为5
         properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6");
         // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
         // 验证码噪点颜色 默认为Color.BLACK
         properties.setProperty(KAPTCHA_NOISE_COLOR, "white");
         // 干扰实现类
         properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise");
         // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
-        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
+//        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
         Config config = new Config(properties);
         defaultKaptcha.setConfig(config);
         return defaultKaptcha;