Merge branch 'gn2.2' into debug

src/views/BI_manage/editBoard.vue

@@ -32,7 +32,7 @@
     <BIBoardContent 
       ref="boardContent" 
       :knowList.sync="knowledgeList" 
-      renderHeight="calc(100vh - 220px)"
+      renderHeight="calc(100vh - 190px)"
       @checkDataList="checkDataList"
       v-model="boardDataList" 
       :canDelete="true" 

src/views/BI_manage/index.vue

@@ -96,7 +96,7 @@
       </div>
     </div>
     <!-- 看板内容模块 -->
-    <BIBoardContent ref="boardContent" :knowList.sync="knowledgeList" v-model="boardDataList" :boardInfo="boardInfo"/>
+    <BIBoardContent ref="boardContent" :knowList.sync="knowledgeList" v-model="boardDataList" :boardInfo="boardInfo" renderHeight="calc(100vh - 260px)"/>
 
     <!-- 设置共享 -->
     <set-share v-model="showSetShare" :boardInfo="boardInfo" @change="handleSetShareBack"/>

src/views/approve_manage/approveDetail.vue

@@ -24,7 +24,7 @@
             <div v-else class="approve-content" 
                 v-loading="isLoading"
                 element-loading-text="看板加载中...">
-                <BIBoardContent ref="boardContent" :knowList.sync="knowledgeList" :value="boardDataList" renderHeight="calc(100vh - 250px)" />
+                <BIBoardContent ref="boardContent" :knowList.sync="knowledgeList" :value="boardDataList" renderHeight="calc(100vh - 200px)" />
             </div>
         </div>
         <div class="approve-tool">

src/views/home_manage/index.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <!-- 看板内容模块 -->
-    <BIBoardContent ref="boardContent" :knowList.sync="knowledgeList" v-model="boardDataList"/>
+    <BIBoardContent ref="boardContent" :knowList.sync="knowledgeList" v-model="boardDataList" renderHeight="calc(100vh - 190px)"/>
 
     <!-- 设置看板 -->
     <SelectBoard v-model="showSet" :boardId="boardId" :homeBoardInfo="homeBoardInfo" @change="getBoardData"/>

src/views/report_manage/reportV2/normalReport/components/KnowResource.vue

@@ -10,11 +10,7 @@
           >{{ item.title }}</span
         >
       </div>
-    </div>
-
-    <div class="main-box">
-      <div class="dialog-top">
-        <div>
+      <div style="display: flex;align-items: center;">
           <el-input
             @input="filterChange"
             placeholder="请输入标题"
@@ -123,15 +119,17 @@
                 <span class="circle-rect"></span>
                 <span>{{ selectNum }}</span>
               </span>
-              <span>筛选条件</span>
+              <span style="margin-left: 4px;">筛选条件</span>
             </div>
           </el-popover>
         </div>
-        <div>
+    </div>
+
+    <div class="main-box">
+      <div class="dialog-top">
           <el-checkbox v-model="filterForm.IsShowMe" @change="filterChange"
             >只看我的</el-checkbox
           >
-        </div>
       </div>
 
       <div style="flex: 1; overflow: hidden">
@@ -153,7 +151,7 @@
             <div class="source">来源：{{ item.SourceFrom }}</div>
           </div>
           <tableNoData
-            :text="$t('ReportManage.ReportList.no_chart_table_available')"
+            :text="$t('Table.prompt_slogan')"
             size="mini"
             v-if="tableData.length === 0 && isEnd"
           />
@@ -332,7 +330,7 @@ div {
       border-radius: 4px;
       border: 1px solid var(--unnamed, #dcdfe6);
       background: var(--gary-gy-3-disabled, #ebeff6);
-      display: flex;
+      display: inline-flex;
       flex-wrap: wrap;
       align-items: center;
       gap: 0 3px;
@@ -353,33 +351,19 @@ div {
         }
       }
     }
-  }
-
-  .main-box {
-    margin-top: 30px;
-    height: calc(100vh - 220px);
-    border-radius: 4px;
-    border: 1px solid var(--gary-gy-5-line, #c8cdd9);
-    background: #fff;
-    padding: 20px;
-    display: flex;
-    flex-direction: column;
-    .dialog-top {
-      padding: 5px 15px 0;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .select-btn {
+    .select-btn {
         cursor: pointer;
         width: 140px;
         height: 40px;
-        text-align: center;
         background-color: #ecf2fe;
         border-radius: 4px;
         box-sizing: border-box;
-        line-height: 40px;
         margin-left: 20px;
         box-sizing: border-box;
+        border: 1px solid #0052D9;
+        display: flex;
+        align-items: center;
+        justify-content: center;
         img,
         span {
           display: inline-block;
@@ -400,6 +384,22 @@ div {
           }
         }
       }
+  }
+
+  .main-box {
+    margin-top: 30px;
+    height: calc(100vh - 260px);
+    border-radius: 4px;
+    border: 1px solid var(--gary-gy-5-line, #c8cdd9);
+    background: #fff;
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+    .dialog-top {
+      padding: 5px 15px 0;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
     .list-wrap {
       height: 100%;

src/views/report_manage/reportV2/smartReport/components/KnowResource.vue

@@ -10,11 +10,7 @@
           >{{ item.title }}</span
         >
       </div>
-    </div>
-
-    <div class="main-box">
-      <div class="dialog-top">
-        <div>
+      <div style="display: flex;align-items: center;">
           <el-input
             @input="filterChange"
             placeholder="请输入标题"
@@ -123,15 +119,17 @@
                 <span class="circle-rect"></span>
                 <span>{{ selectNum }}</span>
               </span>
-              <span>筛选条件</span>
+              <span style="margin-left: 4px;">筛选条件</span>
             </div>
           </el-popover>
         </div>
-        <div>
+    </div>
+
+    <div class="main-box">
+      <div class="dialog-top">
           <el-checkbox v-model="filterForm.IsShowMe" @change="filterChange"
             >只看我的</el-checkbox
           >
-        </div>
       </div>
 
       <div style="flex: 1; overflow: hidden">
@@ -162,7 +160,7 @@
             </div>
           </draggable>
           <tableNoData
-            :text="$t('ReportManage.ReportList.no_chart_table_available')"
+            :text="$t('Table.prompt_slogan')"
             size="mini"
             v-if="tableData.length === 0 && isEnd"
           />
@@ -350,7 +348,7 @@ div {
       border-radius: 4px;
       border: 1px solid var(--unnamed, #dcdfe6);
       background: var(--gary-gy-3-disabled, #ebeff6);
-      display: flex;
+      display: inline-flex;
       flex-wrap: wrap;
       align-items: center;
       gap: 0 3px;
@@ -371,33 +369,19 @@ div {
         }
       }
     }
-  }
-
-  .main-box {
-    margin-top: 30px;
-    height: calc(100vh - 220px);
-    border-radius: 4px;
-    border: 1px solid var(--gary-gy-5-line, #c8cdd9);
-    background: #fff;
-    padding: 20px;
-    display: flex;
-    flex-direction: column;
-    .dialog-top {
-      padding: 5px 15px 0;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .select-btn {
+    .select-btn {
         cursor: pointer;
         width: 140px;
         height: 40px;
-        text-align: center;
         background-color: #ecf2fe;
         border-radius: 4px;
         box-sizing: border-box;
-        line-height: 40px;
         margin-left: 20px;
         box-sizing: border-box;
+        border: 1px solid #0052D9;
+        display: flex;
+        align-items: center;
+        justify-content: center;
         img,
         span {
           display: inline-block;
@@ -418,6 +402,22 @@ div {
           }
         }
       }
+  }
+
+  .main-box {
+    margin-top: 30px;
+    height: calc(100vh - 240px);
+    border-radius: 4px;
+    border: 1px solid var(--gary-gy-5-line, #c8cdd9);
+    background: #fff;
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+    .dialog-top {
+      padding: 5px 15px 0;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
     .list-wrap {
       height: 100%;