Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front

src/assets/styles/ruoyi.scss

@@ -351,11 +351,13 @@ $colors: (
 }
 
 .p-3 {
+  flex: 1;
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
   padding: 16px;
-  height: calc(100vh - 88px);
+  overflow: hidden;
+  box-sizing: border-box;
 }
 
 .border-bottom {

src/assets/styles/sidebar.scss

@@ -4,6 +4,8 @@
     transition: margin-left 0.28s;
     margin-left: $base-sidebar-width;
     position: relative;
+    display: flex;
+    flex-direction: column;
   }
 
   .sidebarHide {

src/layout/components/AppMain.vue

@@ -53,10 +53,11 @@ function addIframe() {
 <style lang="scss" scoped>
 .app-main {
     /* 50= navbar  50  */
-    min-height: calc(100vh - 54px);
     width: 100%;
-    position: relative;
+    flex: 1;
     overflow: hidden;
+    display: flex;
+    flex-direction: column;
     background-color: #f5f5f5;
 }
 
@@ -65,10 +66,10 @@ function addIframe() {
 }
 
 .hasTagsView {
-    .app-main {
-        /* 84 = navbar + tags-view = 50 + 34 */
-        min-height: calc(100vh - 84px);
-    }
+    // .app-main {
+    //     /* 84 = navbar + tags-view = 50 + 34 */
+    //     min-height: calc(100vh - 84px);
+    // }
 
     .fixed-header + .app-main {
         padding-top: 84px;

src/layout/index.vue

@@ -1,9 +1,9 @@
 <template>
-  <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
-    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <side-bar v-if="!sidebar.hide" class="sidebar-container" />
-    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
-      <!-- <el-scrollbar>
+    <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
+        <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+        <side-bar v-if="!sidebar.hide" class="sidebar-container" />
+        <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
+            <!-- <el-scrollbar>
         <div :class="{ 'fixed-header': fixedHeader }">
           <navbar ref="navbarRef" @setLayout="setLayout" />
           <tags-view v-if="needTagsView" />
@@ -11,14 +11,14 @@
         <app-main />
         <settings ref="settingRef" />
       </el-scrollbar> -->
-      <div :class="{ 'fixed-header': fixedHeader }">
-        <navbar ref="navbarRef" @set-layout="setLayout" />
-        <tags-view v-if="needTagsView" />
-      </div>
-      <app-main />
-      <settings ref="settingRef" />
+            <div :class="{ 'fixed-header': fixedHeader }">
+                <navbar ref="navbarRef" @set-layout="setLayout" />
+                <tags-view v-if="needTagsView" />
+            </div>
+            <app-main />
+            <settings ref="settingRef" />
+        </div>
     </div>
-  </div>
 </template>
 
 <script setup lang="ts">

src/views/training/materials/index.vue

@@ -38,17 +38,17 @@
                 <div class="flex1 ov-hd">
                     <vxe-table :loading="loading" border :data="dataList" min-height="0" max-height="100%">
                         <vxe-column title="序号" align="center" type="seq" width="60" />
-                        <vxe-column title="标题" align="center" field="newsTitle" :formatter="colNoData" width="400" />
-                        <vxe-column title="发布时间" align="center" field="publishTime" :formatter="colNoData" />
-                        <vxe-column title="来源" align="center" field="newsOrigin" :formatter="colNoData" />
-                        <vxe-column title="浏览量" align="center" field="viewCount" />
-                        <vxe-column title="类型" align="center" field="newsType" class="materials_downloads_type">
+                        <vxe-column title="标题" align="center" field="newsTitle" :formatter="colNoData" min-width="200" />
+                        <vxe-column title="发布时间" align="center" field="publishTime" :formatter="colNoData" min-width="100" />
+                        <vxe-column title="来源" align="center" field="newsOrigin" :formatter="colNoData" min-width="100" />
+                        <vxe-column title="浏览量" align="center" field="viewCount" min-width="70" />
+                        <vxe-column title="类型" align="center" field="newsType" class="materials_downloads_type" min-width="70">
                             <template #default="{ row }">
                                 <dict-tag :options="materials_downloads_type" :value="row.newsType" />
                             </template>
                         </vxe-column>
-                        <vxe-column title="操作人" align="center" field="createByName" :formatter="colNoData" />
-                        <vxe-column title="操作时间" align="center" field="createTime" :formatter="colNoData" />
+                        <vxe-column title="操作人" align="center" field="createByName" :formatter="colNoData" min-width="100" />
+                        <vxe-column title="操作时间" align="center" field="createTime" :formatter="colNoData" min-width="100" />
                         <vxe-column title="状态" align="center" field="newsStatus">
                             <template #default="{ row }">
                                 <dict-tag :options="news_status" :value="row.newsStatus" />