diff --git a/ruoyi-ui/src/views/kpi/spacePlan/index.vue b/ruoyi-ui/src/views/kpi/spacePlan/index.vue
index 8fdbaa9..f1cfa12 100644
--- a/ruoyi-ui/src/views/kpi/spacePlan/index.vue
+++ b/ruoyi-ui/src/views/kpi/spacePlan/index.vue
@@ -76,8 +76,8 @@ export default {
       loadingKeys: {},
       // 图表数据
       chartData: {
-        x: [],
-        y: [],
+        x: ['1列','2列','3列','4列','5列','6列','7列','8列','9列','10列','11列',],
+        y: ['14排','13排','12排','11排','10排','9排','8排','7排','6排','5排','4排','3排','2排','1排',],
         empty: [],
         full: [],
         inAllot: [],
@@ -148,10 +148,14 @@ export default {
         const data = response.data
         // 调整坐标值以匹配实际位置
         const adjustCoordinates = (data) => {
-          return data.map(item => [item[0] - 1, item[1] - 1, item[2]]);
+          return data.map(item => {
+            const rowLabel = item[1] + '排';
+            const rowIndex = this.chartData.y.indexOf(rowLabel);
+            return [item[0] - 1, rowIndex > -1 ? rowIndex : item[1] - 1, item[2]];
+          });
         };
-        this.chartData.x = eval('(' + data["column"] + ')');
-        this.chartData.y = eval('(' + data["floor"] + ')');
+        // this.chartData.x = eval('(' + data["column"] + ')');
+        // this.chartData.y = eval('(' + data["floor"] + ')');
         this.chartData.empty = adjustCoordinates(eval('(' + data["empty"] + ')'));
         this.chartData.full = adjustCoordinates(eval('(' + data["full"] + ')'));
         this.chartData.inAllot = adjustCoordinates(eval('(' + data["inAllot"] + ')'));
@@ -321,20 +325,23 @@ export default {
     },
     // 格式化普通仓库提示信息
     formatTooltip(params) {
+      const rowIndex = params.data[1];
+      const rowLabel = this.chartData.y[rowIndex];
+
       if (params.seriesName !== '满位') {
         // 排
         if  (this.$i18n.locale ==='zh-cn') {
-          return params.seriesName + '<br>' + (params.data[1] + 1) + '排' + (params.data[0] + 1) + '列' + this.queryParams.theFloor+ '层';
+          return params.seriesName + '<br>' + rowLabel + (params.data[0] + 1) + '列' + this.queryParams.theFloor+ '层';
         }
         else{
-          return params.seriesName + '<br>' + (params.data[1] + 1) + '排' + (params.data[0] + 1) + '列' + this.queryParams.theFloor+ '层';
+          return params.seriesName + '<br>' + rowLabel + (params.data[0] + 1) + '列' + this.queryParams.theFloor+ '层';
 
         }
 
       }
 
       const returnData = {
-        "thePlatoon": params.data[1] + 1,
+        "thePlatoon": rowLabel.replace(/[^\d]/g, ''),
         "theColumn": params.data[0] + 1,
         "theFloor": this.queryParams.theFloor,
         "warehouseId": this.queryParams.warehouseId
@@ -347,16 +354,16 @@ export default {
       // 如果已经在加载中，返回基本信息
       if (this.loadingKeys && this.loadingKeys[key]) {
         if (this.$i18n.locale === 'zh-cn') {
-          return params.seriesName + '<br>' + (params.data[1] + 1) + '排' + (params.data[0] + 1) + '列' + this.queryParams.theFloor + '层';
+          return params.seriesName + '<br>' + rowLabel + (params.data[0] + 1) + '列' + this.queryParams.theFloor + '层';
 
         } else {
-          return params.seriesName + '<br>' + (params.data[1] + 1) + '排' + (params.data[0] + 1) + '列' + this.queryParams.theFloor+ '层';
+          return params.seriesName + '<br>' + rowLabel + (params.data[0] + 1) + '列' + this.queryParams.theFloor+ '层';
 
         }
       }
 
       // 返回基本信息
-      const baseStr = `${params.seriesName}<br>${(params.data[1] + 1)}排${params.data[0] + 1}列${this.queryParams.theFloor}层`;
+      const baseStr = `${params.seriesName}<br>${rowLabel}${params.data[0] + 1}列${this.queryParams.theFloor}层`;
 
       // 设置加载状态
       if (!this.loadingKeys) this.loadingKeys = {};