Merge branch 'feature-ui-20221205' of e.coding.yili.com:yldc/ylst/ylst-survey-web into feature-ui-20221205

src/components/Pagination.vue

@@ -28,7 +28,7 @@ function getPagination() {
     defaultPageSize: 10,
     pageSize: 10,
     pageSizeOptions: ["10", "20", "30"],
-    showQuickJumper: true,
+    // showQuickJumper: true,
     showSizeChanger: true,
     showTotal: (total) => `共 ${total} 条`,
     total: 0,
@@ -86,8 +86,11 @@ export default {
 <style scoped lang="less">
 .pagination {
   display: inline-flex;
+  justify-content: flex-end;
   position: relative;
   left: 50%;
   transform: translateX(-50%);
+  border-radius: 0 0 2px 2px;
+  width: 100%;
 }
 </style>

src/views/DataAnalyse/crosstabs/analysis.vue

@@ -7,23 +7,35 @@
             <!-- 总计表头 -->
             <vxe-column min-width="85" fixed="left" key="total" type="html" show-overflow="ellipsis" title="" field="option_title">
               <template #default="{ row }">
-                <a-popover :overlayStyle="{'max-width':'20%'}">
+                <a-tooltip placement="topLeft" :overlayStyle="{'max-width':'20%'}">
+                  <template #title>
+                      <div class="pop-span"><span v-html="row.option_title"></span></div>
+                  </template>
+                  <div class="pop-div" style="width:67px;"><span v-html="row.option_title"></span></div>
+                </a-tooltip>
+                <!-- <a-popover :overlayStyle="{'max-width':'20%'}">
                     <template #content>
                       <div class="pop-span"><span v-html="row.option_title"></span></div>
                     </template>
                     <div class="pop-div" style="width:67px;"><span v-html="row.option_title"></span></div>
-                  </a-popover>
+                  </a-popover> -->
               </template>
             </vxe-column>
             <!-- 其他表头 -->
-            <vxe-colgroup min-width="170" align="center" v-for="(columnsDateItem,columnsDate_index) in item.header" :title="columnsDateItem.title" :key="columnsDate_index">
+            <vxe-colgroup min-width="170" align="left" v-for="(columnsDateItem,columnsDate_index) in item.header" :title="columnsDateItem.title" :key="columnsDate_index">
               <template #header>
-                <a-popover :overlayStyle="{'max-width':'20%'}">
+                <a-tooltip placement="topLeft" :overlayStyle="{'max-width':'20%'}">
+                  <template #title>
+                    <div class="pop-span"><span v-html="columnsDateItem.title"></span></div>
+                  </template>
+                  <div class="pop-div"><span v-html="columnsDateItem.title"></span></div>
+                </a-tooltip>
+                <!-- <a-popover :overlayStyle="{'max-width':'20%'}">
                   <template #content>
                     <div class="pop-span"><span v-html="columnsDateItem.title"></span></div>
                   </template>
                   <div class="pop-div"><span v-html="columnsDateItem.title"></span></div>
-                </a-popover>
+                </a-popover> -->
               </template>
               <vxe-column min-width="80" v-for="(children,children_index) in columnsDateItem.child" :key="'children'+children_index" :title="children.title"  :field="children.key"></vxe-column>
             </vxe-colgroup>

src/views/DataAnalyse/crosstabs/analysisDetail.vue

@@ -46,23 +46,23 @@
                 <!-- 总计表头 -->
                 <vxe-column min-width="85" fixed="left" key="total" type="html" show-overflow="ellipsis" title="" field="option_title">
                   <template #default="{ row }">
-                    <a-popover :overlayStyle="{'max-width':'20%'}">
+                    <a-tooltip placement="topLeft" :overlayStyle="{'max-width':'20%'}">
-                        <template #content>
+                        <template #title>
                           <div class="pop-span"><span v-html="row.option_title"></span></div>
                         </template>
                         <div class="pop-div" style="width:67px;"><span v-html="row.option_title"></span></div>
-                      </a-popover>
+                      </a-tooltip>
                   </template>
                 </vxe-column>
                 <!-- 其他表头 -->
-                <vxe-colgroup min-width="170" align="center" v-for="(columnsDateItem,columnsDate_index) in item.header" :title="columnsDateItem.title" :key="columnsDate_index">
+                <vxe-colgroup min-width="170" align="left" v-for="(columnsDateItem,columnsDate_index) in item.header" :title="columnsDateItem.title" :key="columnsDate_index">
                   <template #header>
-                    <a-popover :overlayStyle="{'max-width':'20%'}">
+                    <a-tooltip placement="topLeft" :overlayStyle="{'max-width':'20%'}">
-                      <template #content>
+                      <template #title>
                         <div class="pop-span"><span v-html="columnsDateItem.title"></span></div>
                       </template>
                       <div class="pop-div"><span v-html="columnsDateItem.title"></span></div>
-                    </a-popover>
+                    </a-tooltip>
                   </template>
                   <vxe-column min-width="80" v-for="(children,children_index) in columnsDateItem.child" :key="'children'+children_index" :title="children.title"  :field="children.key"></vxe-column>
                 </vxe-colgroup>
@@ -83,22 +83,22 @@
               >
                 <a-table-column fixed="left" key="total" title="" data-index="columnChil0" >
                   <template #default="{ record }">
-                    <a-popover :overlayStyle="{'max-width':'25%'}">
+                    <a-tooltip placement="topLeft" :overlayStyle="{'max-width':'25%'}">
-                        <template #content>
+                        <template #title>
                           <div class="pop-span"><span v-html="record.columnChil0"></span></div>
                         </template>
                         <div class="pop-div" style="width:67px"><span v-html="record.columnChil0"></span></div>
-                      </a-popover>
+                      </a-tooltip>
                   </template>
                 </a-table-column>
                 <a-table-column-group v-for="(columnsDateItem,columnsDate_index) in item.columnsData" :key="columnsDate_index">
                   <template #title>
-                      <a-popover :overlayStyle="{'max-width':'25%'}">
+                      <a-tooltip placement="topLeft" :overlayStyle="{'max-width':'25%'}">
-                        <template #content>
+                        <template #title>
                           <div class="pop-span"><span v-html="columnsDateItem.title"></span></div>
                         </template>
                         <div class="pop-div"><span v-html="columnsDateItem.title"></span></div>
-                      </a-popover>
+                      </a-tooltip>
                   </template>
                   <a-table-column v-for="(children,children_index) in columnsDateItem.children" :key="'children'+children_index" :data-index="children.dataIndex">
                     <template #title><span>{{children.title}}</span></template>

src/views/DataAnalyse/kndiagram/questions/components/combinedAnalysis.vue

@@ -3,15 +3,15 @@
   <div class="analysisResult">
     <div class="tit">
       <span>分析结果</span>
-      <a-popover class="poppver" placement="topLeft" arrow-point-at-center>
+      <a-tooltip class="poppver" placement="topLeft" arrow-point-at-center :overlayStyle="{'max-width':'630px'}">
-        <template #content>
+        <template #title>
           <p>PMC(可采纳最低价格): “太便宜”和“贵”的交点，低于此临界点就会太便宜</p>
           <p>PME(可采纳的最高价格): “便宜”和“太贵”的交点，高于此临界点就会太贵</p>
           <p>OPP(最优价格): “太便宜”和“太贵“的交点，最优价格</p>
           <p>IPP(既不贵也不便宜的价格): “便宜”和“贵”的交点，不太贵和不太便宜基本一样，模棱两可的价格</p>
         </template>
         <i class="icon iconfont">&#xe6de;</i>
-      </a-popover>
+      </a-tooltip>
     </div>
     <div class="arrow">四条折线分别代表四种态度对应的价格认可占比；</div>
     <div class="arrow">

src/views/DataAnalyse/kndiagram/questions/mxd.vue

@@ -335,7 +335,7 @@ const pagination = computed(() => {
     current: analysisResults.value?.meta.current_page ?? 1,
     pageSize: analysisResults.value?.meta.per_page ?? 5,
     showSizeChanger: true,
-    showQuickJumper: true,
+    // showQuickJumper: true,
     pageSizeOptions: ["5", "10", "20", "30", "40"],
     showTotal: (total) => `共 ${total} 条数据`,
   };

src/views/DataAnalyse/recycleBin/binList/detailData.vue

@@ -61,7 +61,6 @@
         <template v-slot:footer>
           <a-pagination
             class="pagination"
-            :showQuickJumper="true"
             :showTotal="(total) => `共 ${total} 条`"
             show-size-changer
             v-model:current="pagination.current"

src/views/ProjectManage/fragment/TableList.vue

@@ -876,3 +876,8 @@ export default defineComponent({
 }
 
 </style>
+<style lang="scss">
+.ant-pagination-prev .ant-pagination-item-link, .ant-pagination-next .ant-pagination-item-link, .ant-pagination-item, .ant-select:not(.ant-select-customize-input) .ant-select-selector {
+  border-radius: 4px;
+}
+</style>