Merge branch 'ch/dongwu1.2' of eta_mini/eta_mini_crm_front into debug

src/layout/components/LeftWrap.vue

@@ -64,7 +64,7 @@ function getMenuIcon(item){
           :index="level1.Path"
           v-if="level1.Children.length===0"
         >
-          <svg-icon :name="getMenuIcon(level1)" style="font-size:16px;"></svg-icon>
+          <svg-icon :name="getMenuIcon(level1)" style="font-size:16px; margin-right: 10px;"></svg-icon>
           <span>{{ level1.Name }}</span>
         </el-menu-item>
         <el-sub-menu
@@ -72,7 +72,7 @@ function getMenuIcon(item){
           v-if="level1.Children.length>0"
         >
           <template #title>
-            <svg-icon :name="getMenuIcon(level1)" style="font-size:16px"></svg-icon>
+            <svg-icon :name="getMenuIcon(level1)" style="font-size:16px; margin-right: 10px;"></svg-icon>
             <span>{{ level1.Name }}</span>
           </template>
           <el-menu-item
@@ -80,7 +80,7 @@ function getMenuIcon(item){
             :index="child.Path"
             :key="child.Path"
           >
-            <el-icon></el-icon>
+            <!-- <el-icon></el-icon> -->
             <span>{{ child.Name }}</span>
           </el-menu-item>
         </el-sub-menu>
@@ -114,6 +114,8 @@ function getMenuIcon(item){
   --el-menu-hover-bg-color: rgba(255, 255, 255, 0.15);
   --el-menu-text-color: #ffffff;
   --el-menu-active-color: #ffae4f;
+  --el-menu-item-height: 40px;
+  --el-menu-sub-item-height: 40px;
   width: 180px;
   z-index: 50;
   position: fixed;

src/views/pushReportList/components/bulkOperations.vue

@@ -25,7 +25,7 @@
     const show = defineModel('show', { type: Boolean, default: false })
 
     const currentPage = ref(1);
-    const pageSize = ref(6);
+    const pageSize = ref(5);
     const currentPageData = ref([])
     const totalItems = ref(0);
 
@@ -177,13 +177,14 @@
             </el-table>
             <div class="pagination">
                 <el-pagination
+                    pager-count="3"
                     background
                     @current-change="handleCurrentChange"
                     :current-page="currentPage"
                     :page-size="pageSize"
                     layout="prev, pager, next"
                     :total="totalItems"
-                    style="margin-top: 30px; width: 85%; justify-content: space-between;"
+                    style="margin-top: 30px; width: 55%; justify-content: space-between;"
                 />
             </div>  
         </div>

src/views/pushReportList/index.vue

@@ -190,9 +190,6 @@ import { tr } from 'element-plus/es/locale/index.mjs';
     }
   }
 
-  function handlePreviewPdf(e){
-    window.open(e.PdfUrl,'__blank')
-  }
 
   function getClassifyName(e){
     if (!e) {
@@ -208,7 +205,13 @@ import { tr } from 'element-plus/es/locale/index.mjs';
     return ''
   }
 
-
+  function success(res) {
+    // tableRef.value.clearSelection() // 如果批量推送完成清空表格选中数据
+    // selectedRows.value.forEach(row => {
+    //   tableRef.value.toggleRowSelection(row, isSelectAll.value); // 选中当前页数据
+    // });
+    handleFilterList()
+  }
 
 </script>
 
@@ -284,8 +287,8 @@ import { tr } from 'element-plus/es/locale/index.mjs';
           v-model="filterState.updateTime"
           type="daterange"
           range-separator="至"
-          start-placeholder="更新时间"
-          end-placeholder="更新时间"
+          start-placeholder="推送时间"
+          end-placeholder="推送时间"
           value-format="YYYY-MM-DD"
           clearable
           @change="handleFilterList"
@@ -341,7 +344,6 @@ import { tr } from 'element-plus/es/locale/index.mjs';
           </template>
           <template #default="{ row }">
             <span v-if="column.key === 'Title'"
-              @click="handlePreviewPdf(row)"
               >{{ row.Title }}（{{ getTitleTime(row) }}）</span
             >
             <span v-else-if="column.key === 'ClassifyNameFirst'">{{getClassifyName(row)}}</span>
@@ -400,7 +402,7 @@ import { tr } from 'element-plus/es/locale/index.mjs';
     :allHandUncheckDataId="allHandUncheckDataId"
     :filterState="filterState"
     :isSelectedAll ="isSelectAll"
-    @success="handleFilterList"
+    @success="success"
   />
 </template>