diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json
index 530985e..5133b46 100644
--- a/apps/hand-factory/manifest.json
+++ b/apps/hand-factory/manifest.json
@@ -2,7 +2,7 @@
     "name" : "科伦普",
     "appid" : "__UNI__E781B49",
     "description" : "",
-    "versionName" : "1.3.10",
+    "versionName" : "1.3.12",
     "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue
index 22736eb..d7e3413 100644
--- a/apps/hand-factory/pages/easycode/easycode.vue
+++ b/apps/hand-factory/pages/easycode/easycode.vue
@@ -224,7 +224,7 @@
 								coilId: coilData.coilId,
 								currentCoilNo: coilData.currentCoilNo,
 								actionType: parseInt(actionType),
-								actionStatus: 0, // 待处理
+								actionStatus: 0,    // 待处理
 								sourceType: 'scan', // 扫码来源
 								scanTime: new Date().toISOString(),
 								scanDevice: this.getDeviceInfo(),
diff --git a/apps/l2/.env.staging b/apps/l2/.env.staging
index fe053f8..e209927 100644
--- a/apps/l2/.env.staging
+++ b/apps/l2/.env.staging
@@ -11,4 +11,4 @@ ENV = 'staging'
 # 若依管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
 
-VUE_APP_SERVICE_BASE_API = 'http://140.143.206.120:18081'
+VUE_APP_SERVICE_BASE_API = 'http://140.143.206.120:10082/prod-api'
diff --git a/apps/l2/src/views/l2/log/index.vue b/apps/l2/src/views/l2/log/index.vue
index 1b1a1f4..846e440 100644
--- a/apps/l2/src/views/l2/log/index.vue
+++ b/apps/l2/src/views/l2/log/index.vue
@@ -60,12 +60,14 @@
         <el-table-column prop="timestamp" label="发生时间" width="180" align="center"></el-table-column>
         <el-table-column prop="module" label="报警模块" align="center">
           <template slot-scope="scope">
-            <el-tag>{{ formatModule(scope.row.module) }}</el-tag>
+            <!-- <el-tag>{{ formatModule(scope.row.module) }}</el-tag> -->
+            <dict-tag :options="dict.type.main_log_module" :value="scope.row.module" />
           </template>
         </el-table-column>
         <el-table-column prop="logtype" label="报警类型" align="center">
           <template slot-scope="scope">
-            <el-tag :type="getLogTypeTagType(scope.row.logtype)">{{ formatLogType(scope.row.logtype) }}</el-tag>
+            <!-- <el-tag :type="getLogTypeTagType(scope.row.logtype)">{{ formatLogType(scope.row.logtype) }}</el-tag> -->
+            <dict-tag :options="dict.type.main_log_type" :value="scope.row.logtype" />
           </template>
         </el-table-column>
         <el-table-column prop="logtext" label="警报内容" min-width="200"></el-table-column>
@@ -127,6 +129,7 @@ import { getLogDataPage, alarmAck } from '@/api/l2/log'; // 假设API文件路
 
 export default {
   name: 'LogDataTable',
+  dicts: ['main_log_type', 'main_log_module'],
   data() {
     return {
       // 查询表单数据
diff --git a/apps/l2/src/views/l2/roller/components/filter.vue b/apps/l2/src/views/l2/roller/components/filter.vue
index 8f721b0..1f338f7 100644
--- a/apps/l2/src/views/l2/roller/components/filter.vue
+++ b/apps/l2/src/views/l2/roller/components/filter.vue
@@ -205,8 +205,8 @@ export default {
     padding: 15px;
     display: flex;
     flex-direction: column;
-    background: #ffffff;
-    border: 1px solid #dcdcdc;
+    // background: #ffffff;
+    // border: 1px solid #dcdcdc;
     border-radius: 4px;
     box-sizing: border-box;
   }
diff --git a/apps/l2/src/views/l2/roller/components/history.vue b/apps/l2/src/views/l2/roller/components/history.vue
index 179a7c1..3ff0fab 100644
--- a/apps/l2/src/views/l2/roller/components/history.vue
+++ b/apps/l2/src/views/l2/roller/components/history.vue
@@ -17,12 +17,12 @@
         <el-table-column prop="standid" label="机架号" align="center" show-overflow-tooltip />
         <el-table-column label="位置" align="center" prop="position">
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.roller_position" :value="scope.row.position" />
+            <dict-tag :options="dict.type.main_roll_position" :value="scope.row.position" />
           </template>
         </el-table-column>
         <el-table-column label="类型" align="center" prop="type" >
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.roller_type" :value="scope.row.type" />
+            <dict-tag :options="dict.type.main_roll_type" :value="scope.row.type" />
           </template>
         </el-table-column>
         <el-table-column prop="changeType" label="换辊类型" align="center" show-overflow-tooltip />
@@ -65,7 +65,7 @@
 import { getRollHistorytList } from '@/api/l2/roller'
 
 export default {
-  dicts: ['roller_type','roller_position'],
+  dicts: ['main_roll_type','main_roll_position'],
   name: 'RollerHistory',
   data() {
     return {
@@ -93,8 +93,8 @@ export default {
         { label: '换辊号', prop: 'changeid' },
         { label: '轧辊号', prop: 'rollid' },
         { label: '机架号', prop: 'standid' },
-        { label: '位置', prop: 'position', dict: 'roller_position' },
-        { label: '类型', prop: 'type', dict: 'roller_type' },
+        { label: '位置', prop: 'position', dict: 'main_roll_position' },
+        { label: '类型', prop: 'type', dict: 'main_roll_type' },
         { label: '换辊类型', prop: 'changeType' },
         { label: '换辊时间', prop: 'changeTime' },
         { label: '安装时间', prop: 'instalTime' },
diff --git a/apps/l2/src/views/l2/roller/components/online.vue b/apps/l2/src/views/l2/roller/components/online.vue
index 426cb44..03c1c85 100644
--- a/apps/l2/src/views/l2/roller/components/online.vue
+++ b/apps/l2/src/views/l2/roller/components/online.vue
@@ -17,14 +17,12 @@
       <el-table-column prop="rollid" label="轧辊号" show-overflow-tooltip />
       <el-table-column label="位置" align="center" prop="position"  show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.position }}</span>
-          <dict-tag :options="dict.type.roller_position" :value="scope.row.position" />
+          <dict-tag :options="dict.type.main_roll_position" :value="scope.row.position" />
         </template>
       </el-table-column>
       <el-table-column label="类型" align="center" prop="type" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.type }}</span>
-          <dict-tag :options="dict.type.roller_type" :value="scope.row.type" />
+          <dict-tag :options="dict.type.main_roll_type" :value="scope.row.type" />
         </template>
       </el-table-column>
       <el-table-column prop="diameter" label="直径"  show-overflow-tooltip />
@@ -41,7 +39,7 @@
 <script>
 export default {
   name: "Online",
-  dicts: ['roller_type','roller_position'],
+  dicts: ['main_roll_type','main_roll_position'],
   props: {
     onlineData: {
       type: Array,
diff --git a/apps/l2/src/views/l2/roller/components/standby.vue b/apps/l2/src/views/l2/roller/components/standby.vue
index 567833c..b33c9e7 100644
--- a/apps/l2/src/views/l2/roller/components/standby.vue
+++ b/apps/l2/src/views/l2/roller/components/standby.vue
@@ -61,7 +61,7 @@ import { getOfflineRollList, backupRoll, getReadyRollList, onlineRoll } from '@/
 
 export default {
   name: 'Standby',
-  dicts: ['roller_type', 'roller_position'],
+  dicts: ['main_roll_type', 'main_roll_position'],
   props: {
     onlineData: {
       type: Array,
diff --git a/apps/l2/src/views/l2/roller/index.vue b/apps/l2/src/views/l2/roller/index.vue
index e2789eb..da7a998 100644
--- a/apps/l2/src/views/l2/roller/index.vue
+++ b/apps/l2/src/views/l2/roller/index.vue
@@ -1,30 +1,30 @@
 <template>
   <div class="roller-page" v-loading="loading">
-    <el-row :gutter="12" class="panel-row">
-      <el-col :span="7" class="panel-col">
+    <el-row class="panel-row">
+      <el-col :span="7">
         <div class="panel-card tall-panel">
           <Standby :onlineData="onlineData" @online="fetchData" />
         </div>
       </el-col>
-      <el-col :span="12" class="panel-col">
+      <el-col :span="12">
         <div class="panel-card tall-panel">
           <Online :onlineData="onlineData" />
         </div>
       </el-col>
-      <el-col :span="5" class="panel-col">
+      <el-col :span="5">
         <div class="panel-card tall-panel">
           <Standard :onlineData="onlineData" />
         </div>
       </el-col>
     </el-row>
 
-    <el-row :gutter="12" class="panel-row bottom-row">
-      <el-col :span="18" class="panel-col">
+    <el-row :gutter="12" style="height: 520px;">
+      <el-col :span="18" class="panel-col" style="height: 100%;">
         <div class="panel-card">
           <History :historyData="historyData" :params="historyParams" />
         </div>
       </el-col>
-      <el-col :span="6" class="panel-col">
+      <el-col :span="6" class="panel-col" style="height: 100%;">
         <div class="panel-card">
           <FilterVue @filter="setHistoryParams" />
         </div>