Merge remote-tracking branch 'origin/master'

apps/l2/src/assets/styles/sidebar.scss

@@ -148,7 +148,7 @@
     }
   }
 
-  .el-menu-item.is-active.submenu-title-noDropdown {
+  .el-menu-item.is-active {
     background: #657b96; // 激活背景
     color: #000; // 激活文字白色
     font-weight: 600;

apps/l2/src/layout/components/Sidebar/index.vue

@@ -3,7 +3,7 @@
         <logo v-if="showLogo" :collapse="isCollapse" />
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu
-              active-text-color="#000"
+                active-text-color="#000"
                 :default-active="activeMenu"
                 :collapse="isCollapse"
                 :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"

apps/l2/src/views/l2/track/rect.vue

@@ -833,9 +833,10 @@ export default {
     // 打开操作对话框
     handleOperate(row, operation) {
       this.$refs.operateForm?.resetFields()
+      console.log(this.selectCard, row.posIdx)
       this.operateMatForm = {
-        porIdx: row.posIdx || null,
-        trIdx: row.posIdx || null,
+        porIdx: row.posIdx.toString() || '',
+        trIdx: row.posIdx.toString() || '',
         planId: row.planId || '',
         entryMatId: row.matId || '',
         planNo: row.planNo || '',