2023-6-3

src/HManagement/archives_sc/archives_scclass/modules/list.vue

@@ -47,7 +47,8 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <slot name="childedit" :data="scope" v-if="scope.data.issystem != 1"></slot>
+            <slot name="childedit" :data="scope"></slot>
+            <!-- <slot name="childedit" :data="scope" v-if="scope.data.issystem != 1"></slot> -->
             <slot name="childdel" :data="scope" v-if="scope.data.issystem != 1"></slot>
           </template>
         </tableLayout>

src/components/newLayout/index.vue

@@ -56,7 +56,7 @@ export default {
         clearTimeout(this.timer)
       }
       this.timer = setTimeout(() => {
-        if (this.$refs.menu.$el.clientWidth < 1210) {
+        if (this.$refs.menu.$el.clientWidth < 1210 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
           this.marginTrue = true
         } else {
           this.marginTrue = false