diff --git a/ruoyi-ui/src/api/dashboard/fx_technologist.js b/ruoyi-ui/src/api/dashboard/fx_technologist.js
index 479129a89..f6e4edd52 100644
--- a/ruoyi-ui/src/api/dashboard/fx_technologist.js
+++ b/ruoyi-ui/src/api/dashboard/fx_technologist.js
@@ -85,3 +85,24 @@ export function AllDataDataRange(fDateStart,fDateEnd) {
   })
 }
 
+export function getBestHunsha() {
+  return request({
+    url: '/fx_technologist/getBestHunsha',
+    method: 'get'
+  })
+}
+
+
+export function getBestTijiaoxian() {
+  return request({
+    url: '/fx_technologist/getBestTijiaoxian',
+    method: 'get'
+  })
+}
+
+export function getBestHuakuang() {
+  return request({
+    url: '/fx_technologist/getBestHuakuang',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue b/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue
index 05d9e87a9..03d27d3e2 100644
--- a/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue
+++ b/ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue
@@ -231,7 +231,7 @@
               j = j + 1;
             }
 
-            if (data_ajax[i].CurrentYield <= 1.2 | data_ajax[i].CurrentYield !== 0) {
+            if (data_ajax[i].CurrentYield <= 1.2 && data_ajax[i].CurrentYield !== 0 && data_ajax[i].CurrentYield >= 0.3) {
               avg_zhengpin_avg = avg_zhengpin_avg + (data_ajax[i].CurrentYield) * 1;
               k = k + 1;
             }
diff --git a/ruoyi-ui/src/views/fx_technologist/fx_sample_all.vue b/ruoyi-ui/src/views/fx_technologist/fx_sample_all.vue
index f9acc4fe5..e86f18b35 100644
--- a/ruoyi-ui/src/views/fx_technologist/fx_sample_all.vue
+++ b/ruoyi-ui/src/views/fx_technologist/fx_sample_all.vue
@@ -55,7 +55,7 @@
         <div class="ibox-title">
           <h3>汇总表 </h3>
         </div>
-        <div id="tableL01" class="table table-striped table-bordered table-hover float-left">
+        <div id="tableL01"  style="font-size:10px"  class="table table-striped table-bordered table-hover float-left">
         </div>
       </div>
     </el-row>
@@ -157,10 +157,10 @@
             {field: 'SalesMan', title: '销售员', sortable: true, filterControl: 'input', filterStrictSearch: false},
             {field: 'TagName', title: '类型', sortable: true, filterControl: 'select', filterStrictSearch: false},
             {field: 'ProductionLine', title: '产品线', sortable: true, filterControl: 'select', filterStrictSearch: false},
-            {field: 'NewMould', title: '是否新模', sortable: true, filterControl: 'select', filterStrictSearch: false},
+            {field: 'NewMould', title: '是否<br>新模</br>', sortable: true, filterControl: 'select', filterStrictSearch: false},
             {field: '地区', title: '区域', sortable: true, filterControl: 'select', filterStrictSearch: false},
             {field: '经理审核时间', title: '下单日期', sortable: true, filterControl: 'input', filterStrictSearch: false},
-            {field: '分解天数', title: '分解(天)', sortable: true, filterControl: 'input', filterStrictSearch: false},
+            {field: '分解天数', title: '分解<br>(天)</br>', sortable: true, filterControl: 'input', filterStrictSearch: false},
             {
               field: 'FactMakingDate',
               title: '完成时间',
@@ -168,13 +168,13 @@
               filterControl: 'input',
               filterStrictSearch: false
             },
-            {field: '交期天数', title: '交期(天)', sortable: true, filterControl: 'input', filterStrictSearch: false},
+            {field: '交期天数', title: '交期<br>(天)</br>', sortable: true, filterControl: 'input', filterStrictSearch: false},
             {field: '客户是否下单', title: '是否确认', sortable: true, filterControl: 'select', filterStrictSearch: false},
             {field: '折算人民币价税合计', title: '销售金额', sortable: true, filterControl: 'input', filterStrictSearch: false},
-            {field: '客户数量', title: '客户数量', sortable: true, filterControl: 'input', filterStrictSearch: false},
+            {field: '客户数量', title: '客户<br>数量</br>', sortable: true, filterControl: 'input', filterStrictSearch: false},
             {
               field: 'FinishedDensity',
-              title: '打样密度',
+              title: '打样<br>密度</br>',
               sortable: true,
               filterControl: 'input',
               filterStrictSearch: false
@@ -195,6 +195,8 @@
             pageNumber: 1,
             pageList: [],
             cache: false,
+            fixedColumns: true,
+            fixedNumber: 1 ,
             searchText: '',
             filterControl: true,
             disableUnusedSelectOptions: true, striped: true,
diff --git a/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling.vue b/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_odm_oem.vue
similarity index 98%
rename from ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling.vue
rename to ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_odm_oem.vue
index b238e4dd5..d7f93c9a3 100644
--- a/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling.vue
+++ b/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_odm_oem.vue
@@ -83,7 +83,7 @@
 
   export default {
     mixins: [resize],
-    name: 'fx_sample_confirmation',
+    name: 'fx_sample_best_selling_by_odm_oem',
     data() {
       return {
         tableDataODM: [],
diff --git a/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_use.vue b/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_use.vue
new file mode 100644
index 000000000..920d54b80
--- /dev/null
+++ b/ruoyi-ui/src/views/fx_technologist/fx_sample_best_selling_by_use.vue
@@ -0,0 +1,218 @@
+<template>
+  <div class="dashboard-editor-container">
+
+
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+      <el-col :xs="24" :sm="7" :lg="7">
+
+        <div class="ibox ">
+          <div class="ibox-title">
+            <h3>婚纱框爆款 </h3>
+          </div>
+          <div class="ibox-content">
+            <el-table
+              :data="tableDataODM"
+              stripe
+              border
+              style="width: 100%">
+              <el-table-column
+                prop="MouldingStyleCode"
+                sortable
+                label="型号">
+              </el-table-column>
+              <el-table-column
+                prop="CNY"
+                sortable
+                label="销售金额">
+              </el-table-column>
+              <el-table-column
+                prop="Area"
+                sortable
+                label="热销区域">
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="1" :lg="1">
+        <h1></h1>
+      </el-col>
+      <el-col :xs="24" :sm="7" :lg="7">
+
+        <div class="ibox ">
+          <div class="ibox-title">
+            <h3>踢脚线爆款 </h3>
+          </div>
+          <div class="ibox-content">
+            <el-table
+              :data="tableDataOEM"
+              stripe
+              border
+              style="width: 100%">
+              <el-table-column
+                prop="MouldingStyleCode"
+                sortable
+                label="型号">
+              </el-table-column>
+              <el-table-column
+                prop="CNY"
+                sortable
+                label="销售金额">
+              </el-table-column>
+              <el-table-column
+                prop="Area"
+                sortable
+                label="热销区域">
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="1" :lg="1">
+        <h1></h1>
+      </el-col>
+      <el-col :xs="24" :sm="7" :lg="7">
+
+        <div class="ibox ">
+          <div class="ibox-title">
+            <h3>画框爆款 </h3>
+          </div>
+          <div class="ibox-content">
+            <el-table
+              :data="tableDataOEM"
+              stripe
+              border
+              style="width: 100%">
+              <el-table-column
+                prop="MouldingStyleCode"
+                sortable
+                label="型号">
+              </el-table-column>
+              <el-table-column
+                prop="CNY"
+                sortable
+                label="销售金额">
+              </el-table-column>
+              <el-table-column
+                prop="Area"
+                sortable
+                label="热销区域">
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+  </div>
+</template>
+
+<script>
+  import echarts from 'echarts'
+
+  require('echarts/theme/macarons') // echarts theme
+  import resize from '../dashboard/mixins/resize'
+  import {getBestOEM} from '@/api/dashboard/fx_technologist'
+  import {getBestODM} from '@/api/dashboard/fx_technologist'
+
+
+  const lineChartData = {
+    xAxisData: [],
+    actualData: []
+  }
+
+  export default {
+    mixins: [resize],
+    name: 'fx_sample_best_selling_by_use',
+    data() {
+      return {
+        tableData婚纱框: [],
+        tableData画框: [],
+        tableData踢脚线: []
+
+      }
+    },
+
+    created() {
+      this.getData()
+
+    },
+    mounted() {
+
+
+    },
+    methods: {
+      getData() {
+
+        getBestHunsha().then(response => {
+
+
+          for (var i = 0; i < response.data.length; i++) {
+
+
+            this.tableData婚纱框.push({
+              MouldingStyleCode: response.data[i].MouldingStyleCode,
+              CNY: ((response.data[i].CNY)*1).toFixed(2),
+              Area: response.data[i].Area,
+
+            })
+          }
+        })
+
+        getBestTijiaoxian().then(response => {
+
+
+          for (var i = 0; i < response.data.length; i++) {
+
+
+            this.tableData踢脚线.push({
+              MouldingStyleCode: response.data[i].MouldingStyleCode,
+              CNY: ((response.data[i].CNY)*1).toFixed(2),
+              Area: response.data[i].Area,
+            })
+          }
+        })
+
+        getBestHuakuang().then(response => {
+
+
+          for (var i = 0; i < response.data.length; i++) {
+
+
+            this.tableData画框.push({
+              MouldingStyleCode: response.data[i].MouldingStyleCode,
+              CNY: ((response.data[i].CNY)*1).toFixed(2),
+              Area: response.data[i].Area,
+            })
+          }
+        })
+
+      }
+    }
+
+  }
+
+
+</script>
+
+
+<style lang="scss" scoped>
+  .dashboard-editor-container {
+    padding: 32px;
+    background-color: rgb(240, 242, 245);
+    position: relative;
+
+    .chart-wrapper {
+      background: #fff;
+      padding: 16px 16px 0;
+      margin-bottom: 32px;
+    }
+  }
+
+  @media (max-width: 1024px) {
+    .chart-wrapper {
+      padding: 8px;
+    }
+  }
+</style>
+
diff --git a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java
index e7be6057b..416490d00 100644
--- a/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java
+++ b/ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_Technologist_48102.java
@@ -448,5 +448,116 @@ public class DB_Ajax_DashBoard_Technologist_48102 {
 		return jsonpath.toString();
 	}
 
+
+
+	public static List<HashMap<String,String>> getBestHuakuang() {
+		List<HashMap<String,String>> hashMapList = new ArrayList<>();
+		try {
+			Connection conn = getSQLConnection();
+			String sql = "SELECT TOP\n" +
+					"\t20 MouldingStyleCode,\n" +
+					"\t[折算人民币价税合计] AS CNY \n" +
+					"FROM\n" +
+					"\t[chen_12个月_A版本BOM销售额] \n" +
+					"WHERE\n" +
+					"\ttagname = 'OEM' \n" +
+					"ORDER BY\n" +
+					"\t折算人民币价税合计 DESC";
+			Statement stmt = conn.createStatement();//
+
+			ResultSet rs = stmt.executeQuery(sql);
+			while (rs.next()) {
+				// 截面积(mm2)
+				HashMap<String,String> map = new HashMap<>();
+				map.put("MouldingStyleCode",rs.getString("MouldingStyleCode"));
+				map.put("CNY",rs.getString("CNY"));
+				hashMapList.add(map);
+
+			}
+			rs.close();
+			stmt.close();
+			conn.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+
+		}
+		return hashMapList;
+	}
+
+
+	public static List<HashMap<String,String>> getBestTijiaoxian() {
+		List<HashMap<String,String>> hashMapList = new ArrayList<>();
+		try {
+			Connection conn = getSQLConnection();
+			String sql = "SELECT TOP\n" +
+					"\t20 MouldingStyleCode,\n" +
+					"\t[折算人民币价税合计] AS CNY \n" +
+					"FROM\n" +
+					"\t[chen_12个月_A版本BOM销售额] \n" +
+					"WHERE\n" +
+					"\ttagname = 'OEM' \n" +
+					"ORDER BY\n" +
+					"\t折算人民币价税合计 DESC";
+			Statement stmt = conn.createStatement();//
+
+			ResultSet rs = stmt.executeQuery(sql);
+			while (rs.next()) {
+				// 截面积(mm2)
+				HashMap<String,String> map = new HashMap<>();
+				map.put("MouldingStyleCode",rs.getString("MouldingStyleCode"));
+				map.put("CNY",rs.getString("CNY"));
+				hashMapList.add(map);
+
+			}
+			rs.close();
+			stmt.close();
+			conn.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+
+		}
+		return hashMapList;
+	}
+
+
+	public static List<HashMap<String,String>> getBestHunsha() {
+		List<HashMap<String,String>> hashMapList = new ArrayList<>();
+		try {
+			Connection conn = getSQLConnection();
+			String sql = "SELECT TOP\n" +
+					"\t20 MouldingStyleCode,\n" +
+					"\t[折算人民币价税合计] AS CNY \n" +
+					"FROM\n" +
+					"\t[chen_12个月_A版本BOM销售额] \n" +
+					"WHERE\n" +
+					"\ttagname = 'OEM' \n" +
+					"ORDER BY\n" +
+					"\t折算人民币价税合计 DESC";
+			Statement stmt = conn.createStatement();//
+
+			ResultSet rs = stmt.executeQuery(sql);
+			while (rs.next()) {
+				// 截面积(mm2)
+				HashMap<String,String> map = new HashMap<>();
+				map.put("MouldingStyleCode",rs.getString("MouldingStyleCode"));
+				map.put("CNY",rs.getString("CNY"));
+				hashMapList.add(map);
+
+			}
+			rs.close();
+			stmt.close();
+			conn.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+
+		}
+		return hashMapList;
+	}
+
+
+
+
+
+
 }
 
diff --git a/ruoyi/src/main/java/com/ruoyi/project/fx_technologist/controller/TechnologistController.java b/ruoyi/src/main/java/com/ruoyi/project/fx_technologist/controller/TechnologistController.java
index c914a1904..8dcea664b 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/fx_technologist/controller/TechnologistController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/fx_technologist/controller/TechnologistController.java
@@ -90,4 +90,28 @@ public class TechnologistController extends BaseController
         return AjaxResult.success(DB_Ajax_DashBoard_Technologist_48102.AllDataDataRange(fDateStart,fDateEnd));
     }
 
+
+
+    @GetMapping("/getBestOEM")
+    public AjaxResult getBestHuakuang() throws Exception
+    {
+        return AjaxResult.success(DB_Ajax_DashBoard_Technologist_48102.getBestHuakuang());
+    }
+
+    @GetMapping("/getBestODM")
+    public AjaxResult getBestTijiaoxian() throws Exception
+    {
+        return AjaxResult.success(DB_Ajax_DashBoard_Technologist_48102.getBestTijiaoxian());
+    }
+
+    @GetMapping("/getBestODM")
+    public AjaxResult getBestHunsha() throws Exception
+    {
+        return AjaxResult.success(DB_Ajax_DashBoard_Technologist_48102.getBestHunsha());
+    }
+
+
+
+
+
 }