Merge remote-tracking branch 'origin/develop' into develop

2021-09-23 10:46:31 +08:00
parent a07d22f12e 09ca43891d
commit f391df84ae
2 changed files with 5 additions and 6 deletions
@@ -87,9 +87,8 @@
        ref="multipleTable"
        :data="localProTableList"
        tooltip-effect="dark"
-        style="width: 100%"
+        style="width: 100%;height: calc(100% - 150px)"
        border
-        :height="400"
        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
             fontWeight: 'normal', height: '48px'}"
        @selection-change="handleSelectionChange">
@@ -719,10 +719,10 @@
                                    label: '海外标准法规',
                                    value: 'bussstand'
                                },
-                                {
-                                    label: '国内外政策',
-                                    value: 'laws'
-                                },
+                                // {
+                                //     label: '国内外政策',
+                                //     value: 'laws'
+                                // },
                                {
                                    label: '企业标准',
                                    value: 'enterprise'