剩余样式修改

src/views/datasheet_manage/components/sheetListWrap.vue

@@ -4,7 +4,7 @@
     <div class="sheetlist-wrapper" ref="listRef" @scroll="$emit('loadMoreHandle')">
       <el-col
         :span="6"
-        style="margin-bottom: 20px; padding-right: 20px"
+        style="margin-bottom: 20px; padding-right: 20px;min-width: 270px;"
         v-for="cell in list"
         :key="cell.ExcelInfoId"
       >

src/views/ppt_manage/newVersion/components/catalog/mergePPTDialog.vue

@@ -6,7 +6,7 @@
       :visible.sync="mergePptShow" 
       :close-on-click-modal="false" 
       :modal-append-to-body="false"
-      @close="cancelHandle" width="40%" v-dialogDrag center>
+      @close="cancelHandle" v-dialogDrag center width="40%" top="8vh">
       <div slot="title" style="display: flex; alignitems: center">
         <span style="fontsize: 16px">合并PPT</span>
       </div>
@@ -450,6 +450,11 @@ export default {
 </script>
 
 <style lang="scss">
+.merge-ppt-dialog-wrap{
+    .el-dialog{
+        margin-bottom: 0;
+    }
+}
 .dialog-container{
   .tree-container-wrap{
     .tree-container{
@@ -506,6 +511,9 @@ export default {
 </style>
 <style scoped lang="scss">
 .dialog-container{
+    max-height: 700px;
+    height: 65vh;
+    overflow-y: auto;
   .tree-container-wrap{
     width: 100%;
     display: flex;

src/views/report_manage/reportlist.vue

@@ -131,18 +131,6 @@
                 </div>
             </el-popover>
           </el-form-item>
-          <!-- <el-form-item label="">
-            <el-select
-              v-model="searchform.timeType"
-              placeholder="选择时间类型"
-              size="medium"
-              style="width:110px"
-              @change="search"
-            >
-              <el-option :label="isApprove?'审批时间':'发布时间'" value="publish_time"></el-option>
-              <el-option label="更新时间" value="modify_time"></el-option>
-            </el-select>
-          </el-form-item> -->
           <el-form-item label="">
             <el-date-picker
               @change="search"
@@ -157,81 +145,6 @@
               style="width: 280px"
             ></el-date-picker>
           </el-form-item>
-          <!-- <el-form-item label="">
-            <el-select
-              @change="search"
-              v-model="searchform.frequency"
-              placeholder="更新频度筛选"
-              size="medium"
-              clearable
-              style="width: 140px"
-            >
-              <el-option label="年度" value="年度"></el-option>
-              <el-option label="半年度" value="半年度"></el-option>
-              <el-option label="季度" value="季度"></el-option>
-              <el-option label="月度" value="月度"></el-option>
-              <el-option label="双周度" value="双周度"></el-option>
-              <el-option label="周度" value="周度"></el-option>
-              <el-option label="日度" value="日度"></el-option>
-              <el-option label="不定时" value="不定时"></el-option>
-            </el-select>
-          </el-form-item> -->
-          <!-- <el-form-item label="">
-            <el-cascader
-              @change="search"
-              :options="optionsArr"
-              v-model="searchform.classifynameArr"
-              clearable
-              placeholder="类型筛选"
-              size="medium"
-            ></el-cascader>
-          </el-form-item>
-          <el-form-item label="" v-if="!isApprove">
-          </el-form-item> -->
-          <!-- <el-form-item label="">
-            <el-select
-              v-model.number="searchform.publishState"
-              placeholder="发布筛选"
-              size="medium"
-              clearable
-              style="width: 140px"
-              @change="search"
-            >
-              <el-option label="已发布" :value="2"></el-option>
-              <el-option label="未发布" :value="1"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" v-if="isApprove">
-            <el-select
-              v-model.number="searchform.publishState"
-              placeholder="状态筛选"
-              size="medium"
-              clearable
-              style="width: 140px"
-              @change="search"
-            >
-              <el-option label="待提交" :value="1"></el-option>
-              <el-option label="待审批" :value="2"></el-option>
-              <el-option label="已审批" :value="4"></el-option>
-              <el-option label="已驳回" :value="3"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="">
-          </el-form-item> -->
-          <!-- <el-form-item label="">
-            <el-select
-              v-permission="permissionBtn.reportManageBtn.reportManage_reportList_sendTime"
-              @change="search"
-              v-model.number="searchform.msgIsSend"
-              placeholder="推送消息状态"
-              size="medium"
-              clearable
-              style="width: 140px"
-            >
-              <el-option label="未推送消息" :value="1"></el-option>
-              <el-option label="已推送消息" :value="2"></el-option>
-            </el-select>
-          </el-form-item> -->
           <el-form-item style="flex:1;text-align: right;">
             <el-input
               @input="search"

src/views/smartReport/reportList.vue

@@ -2,7 +2,7 @@
     <div class="smart-report-list">
         <el-card class="box-card">
             <div slot="header" class="header">
-                <el-form :inline="true" :model="searchform" @submit.native.prevent>
+                <el-form :inline="true" :model="searchform" @submit.native.prevent style="display:flex;">
                 <el-form-item label="">
                     <el-button
                         v-permission="permissionBtn.smartReportManageBtn.reportManage_reportAdd"
@@ -11,17 +11,91 @@
                         @click="showAddReport=true"
                     >添加研报</el-button>
                 </el-form-item>
+                <!-- 整合的筛选项 -->
                 <el-form-item label="">
-                    <el-select
-                    v-model="searchform.timeType"
-                    placeholder="选择时间类型"
-                    size="medium"
-                    style="width:110px"
-                    @change="search"
-                    >
-                    <el-option :label="isApprove?'审批时间':'发布时间'" value="publish_time"></el-option>
-                    <el-option label="更新时间" value="modify_time"></el-option>
-                    </el-select>
+                    <el-popover 
+                        placement="bottom" 
+                        trigger="click" 
+                        :visible-arrow="false"
+                        popper-class="report-select-popover"
+                        width="320" style="display: inline-block;">
+                        <div class="select-wrap">
+                            <p>筛选项</p>
+                            <div class="select-item">
+                                <el-select
+                                    v-model="searchform.timeType"
+                                    placeholder="选择时间类型"
+                                    size="medium"
+                                    style="width:100%"
+                                    @change="search"
+                                    >
+                                    <el-option :label="isApprove?'审批时间':'发布时间'" value="publish_time"></el-option>
+                                    <el-option label="更新时间" value="modify_time"></el-option>
+                                </el-select>
+                            </div>
+                            <div class="select-item">
+                                <el-select
+                                    @change="search"
+                                    v-model="searchform.frequency"
+                                    placeholder="更新频度筛选"
+                                    size="medium"
+                                    clearable
+                                    style="width:100%"
+                                >
+                                    <el-option label="年度" value="年度"></el-option>
+                                    <el-option label="半年度" value="半年度"></el-option>
+                                    <el-option label="季度" value="季度"></el-option>
+                                    <el-option label="月度" value="月度"></el-option>
+                                    <el-option label="双周度" value="双周度"></el-option>
+                                    <el-option label="周度" value="周度"></el-option>
+                                    <el-option label="日度" value="日度"></el-option>
+                                    <el-option label="不定时" value="不定时"></el-option>
+                                </el-select>
+                            </div>
+                            <div class="select-item">
+                                <el-cascader
+                                    @change="search"
+                                    :options="optionsArr"
+                                    v-model="searchform.classifynameArr"
+                                    clearable
+                                    placeholder="类型筛选"
+                                    style="width:100%;"
+                                />
+                            </div>
+                            <div class="select-item" v-if="!isApprove">
+                                <el-select
+                                    v-model.number="searchform.publishState"
+                                    placeholder="发布筛选"
+                                    size="medium"
+                                    clearable
+                                    style="width:100%;"
+                                    @change="search"
+                                >
+                                    <el-option label="已发布" :value="2"></el-option>
+                                    <el-option label="未发布" :value="1"></el-option>
+                                </el-select>
+                            </div>
+                            <div class="select-item" v-if="isApprove">
+                                <el-select
+                                    v-model.number="searchform.publishState"
+                                    placeholder="状态筛选"
+                                    size="medium"
+                                    clearable
+                                    style="width:100%;"
+                                    @change="search"
+                                >
+                                    <el-option label="待提交" :value="1"></el-option>
+                                    <el-option label="待审批" :value="2"></el-option>
+                                    <el-option label="已审批" :value="4"></el-option>
+                                    <el-option label="已驳回" :value="3"></el-option>
+                                </el-select>
+                            </div>
+                        </div>
+                        <div class="select-btn" slot="reference">
+                            <img src="~@/assets/icons/filter.svg">
+                            <span>筛选条件</span>
+                        </div>
+                    </el-popover>
                 </el-form-item>
                 <el-form-item label="">
                     <el-date-picker
@@ -37,63 +111,6 @@
                         style="width: 280px"
                     />
                 </el-form-item>
-                <el-form-item label="">
-                    <el-select
-                        @change="search"
-                        v-model="searchform.frequency"
-                        placeholder="更新频度筛选"
-                        size="medium"
-                        clearable
-                        style="width: 140px"
-                    >
-                        <el-option label="年度" value="年度"></el-option>
-                        <el-option label="半年度" value="半年度"></el-option>
-                        <el-option label="季度" value="季度"></el-option>
-                        <el-option label="月度" value="月度"></el-option>
-                        <el-option label="双周度" value="双周度"></el-option>
-                        <el-option label="周度" value="周度"></el-option>
-                        <el-option label="日度" value="日度"></el-option>
-                        <el-option label="不定时" value="不定时"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="">
-                    <el-cascader
-                        @change="search"
-                        :options="optionsArr"
-                        v-model="searchform.classifynameArr"
-                        clearable
-                        placeholder="类型筛选"
-                        size="medium"
-                    />
-                </el-form-item>
-                <el-form-item label="" v-if="!isApprove">
-                    <el-select
-                        v-model.number="searchform.publishState"
-                        placeholder="发布筛选"
-                        size="medium"
-                        clearable
-                        style="width: 140px"
-                        @change="search"
-                    >
-                        <el-option label="已发布" :value="2"></el-option>
-                        <el-option label="未发布" :value="1"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="" v-if="isApprove">
-                    <el-select
-                        v-model.number="searchform.publishState"
-                        placeholder="状态筛选"
-                        size="medium"
-                        clearable
-                        style="width: 140px"
-                        @change="search"
-                    >
-                        <el-option label="待提交" :value="1"></el-option>
-                        <el-option label="待审批" :value="2"></el-option>
-                        <el-option label="已审批" :value="4"></el-option>
-                        <el-option label="已驳回" :value="3"></el-option>
-                    </el-select>
-                </el-form-item>
                 <!-- <el-form-item label="">
                     <el-select
                         v-permission="permissionBtn.smartReportManageBtn.reportManage_reportList_sendTime"
@@ -108,7 +125,7 @@
                         <el-option label="已推送消息" :value="2"></el-option>
                     </el-select>
                 </el-form-item> -->
-                <el-form-item>
+                <el-form-item style="flex:1;text-align:right;">
                     <el-input
                         @input="search"
                         placeholder="标题 / 创建人 / 更新人"
@@ -857,6 +874,37 @@ export default {
 }
 </script>
 
-<style>
-
+<style lang="scss">
+.report-select-popover{
+    .select-wrap{
+          padding:8px;
+          margin:0 20px;
+          .select-item{
+              margin-top:20px;
+          }
+      }
+}
+</style>
+<style lang="scss" scoped>
+.smart-report-list{
+    .select-btn{
+        cursor: pointer;
+        width:120px;
+        height: 36px;
+        text-align: center;
+        background-color: #ECF2FE;
+        border-radius: 4px;
+        box-sizing: border-box;
+        line-height:36px;
+        img,span{
+            display: inline-block;
+            vertical-align: middle;
+        }
+    }
+    .header{
+        .el-form-item{
+            margin-bottom: 0;
+        }
+    }
+}
 </style>