Merge branch 'ETA1.3.6'

src/components/chart/chartListWrap.vue

@@ -8,7 +8,7 @@
     >
       <el-col
         :span="6"
-        style="margin-bottom: 20px; padding-right: 20px"
+        style="margin-bottom: 20px; padding-right: 20px;min-width: 270px;"
         v-for="chart in list"
         :key="chart.ChartInfoId"
       >

src/views/Login.vue

@@ -695,6 +695,23 @@ export default {
 			}
 			#login-container ,.login-box{
 				width: 70%;
+				top:15%;
+			}
+		}
+		@media screen and (max-width:1440px){
+			#login-container ,.login-box{
+				.login-title{
+					font-size: 32px;
+				}
+			}
+			
+		}
+		@media screen and (max-height:720px) {
+			#login-container ,.login-box{
+				top:20%;
+				.login-title{
+					margin-bottom: 30px;
+				}
 			}
 		}
 	}

src/views/chartRelevance_manage/components/chartCard.vue

@@ -4,7 +4,7 @@
       <div class="title text_twoLine">
          <span>{{cardTitle}}</span>
       </div>
-      <div style="flex-shrink: 0">
+      <div style="flex-shrink: 0;align-self: flex-start;">
         <template v-if="isHaveEdbHandle">
           <el-dropdown 
             v-show="isEdbAdd" 

src/views/chartRelevance_manage/css/index.scss

@@ -28,7 +28,7 @@ $normal-font: 14px;
     display: flex;
 
     .main-left {
-      width: 400px;
+      width: 300px;
       min-width: 300px;
       background: #fff;
       margin-right: 20px;
@@ -46,6 +46,8 @@ $normal-font: 14px;
         border: 1px solid #ececec;
         box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
         margin-bottom: 20px;
+        display: flex;
+        justify-content: space-between;
       }
       .search-cont {
         padding: 0 20px;
@@ -78,6 +80,7 @@ $normal-font: 14px;
       }
       .target_tree {
         color: #333;
+        overflow: hidden;
         .custom-tree-node {
           display: flex !important;
           justify-content: space-between;

src/views/chartRelevance_manage/fittingEquationChartEditor.vue

@@ -416,7 +416,7 @@ export default {
 	}
   .left-cont {
     width: 400px;
-    min-width: 300px;
+    min-width: 310px;
     background: #fff;
     margin-right: 20px;
     border: 1px solid #ececec;
@@ -496,9 +496,11 @@ export default {
 			display: flex;
 			flex-wrap: wrap;
 			.card-wrapper {
-				width: 50%;
+				width: 48%;
         margin-bottom: 20px;
         min-height: 350px;
+        min-width: 410px;
+        margin-right: 15px;
 				.card-item {
 					padding: 20px;
 					.top {

src/views/chartRelevance_manage/list.vue

@@ -189,7 +189,7 @@
             </el-col>
             <el-col
               :span="3"
-              style="position: absolute; height: 100%; right: 0"
+              style="position: absolute; height: 100%; right: 0;min-width: 115px;"
             >
               <!-- 操作 -->
               <chartHandlesWrap

src/views/chartRelevance_manage/relevanceChartEditor.vue

@@ -283,7 +283,6 @@
     <div
       class="right-cont"
       id="right"
-      :style="isSlideLeft ? 'width:100%' : `width:80%`"
     >
       <div
         class="chart-min-cont"
@@ -867,7 +866,7 @@ export default {
     }
   }
   .right-cont {
-    width: 80%;
+    flex:1;
     /* =================== */
     .chart-min-cont {
       /* background: #fff; */
@@ -882,9 +881,9 @@ export default {
         background: #fff;
         margin-bottom: 20px;
         min-height: 350px;
-        &:nth-child(2n) {
-          margin-left: 15px;
-        } 
+        min-width:410px;
+        margin-right: 15px;
+        
         .card-item {
           padding: 20px;
           .top {

src/views/chartRelevance_manage/statisticFeatureChartEditor.vue

@@ -739,9 +739,8 @@ export default {
         width: 48%;
         margin-bottom: 20px;
         min-height: 350px;
-        &:nth-child(2n) {
-          margin-left: 15px;
-        } 
+        min-width:410px;
+        margin-right: 15px;
         .card-item {
           padding: 20px;
           background: #fff;

src/views/dataEntry_manage/chartSetting.vue

@@ -496,7 +496,7 @@
                 <!-- 异常显示 -->
                 <p class="error-tip" style="min-height: 400px;" v-if="chartInfo.WarnMsg">{{chartInfo.WarnMsg}}</p>
               </el-col>
-              <el-col :span="3" style="position: absolute;height: 100%;right: 0;">
+              <el-col :span="3" style="position: absolute;height: 100%;right: 0;min-width: 115px;">
                 <ul class="right-actions">
                     <li>操作</li>
                     <li
@@ -637,7 +637,32 @@
             ref="listChartPage"
             @scroll="loadMorePublicChart"
           >
-            <el-col
+            <div class="chart-list-item-wrap">
+                <div class="chart-list-item" v-for="chart in chartPublicList" :key="chart.ChartInfoId">
+                    <div class="chart-item-top" style="position:relative;">
+                        <div class="chartEn-mark" v-show="chart.IsEnChart">En</div>
+                        <span class="text_oneLine" :style="{'padding-left':chart.IsEnChart?'24px':''}">{{ currentLang === 'en' ? (chart.ChartNameEn||chart.ChartName) : chart.ChartName }}</span>
+                    </div>
+                    <div class="chart-item-img" @click="detailShowHandle(chart)"
+                    :style="chart.ChartImage?{background: `no-repeat top/cover url('${chart.ChartImage}')`}:{}"></div>
+                    <div class="chart-item-bottom">
+                        <span>创建时间: {{ chart.CreateTime.slice(0,10) }}</span>
+                        <span v-permission="permissionBtn.chartLibPermission.chartLib_addMy"
+                            class="join_txt"
+                            @click="addMychartHandle(chart)"
+                        >
+                            <img
+                            :src="$icons.chart_join_ico"
+                            alt=""
+                            style="width: 13px; height: 12px; vertical-align: middle"
+                            />
+                            加入我的图库
+                        </span>
+                    </div>
+                </div>
+            </div>
+            
+            <!-- <el-col
               :span="6"
               style="margin-bottom: 20px; padding-right: 20px"
               v-for="chart in chartPublicList"
@@ -669,7 +694,7 @@
                   </span>
                 </div>
               </el-card>
-            </el-col>
+            </el-col> -->
           </div>
           <div v-if="!public_total" class="nodata">
             <tableNoData text="暂无图表"/>
@@ -2479,6 +2504,7 @@ export default {
       margin-bottom: 20px;
       .right-actions {
         /* max-width: 160px; */
+        min-width: 115px;
         height: 100%;
         padding: 20px 10px;
         border-left: 1px solid #DCDFE6;
@@ -2562,6 +2588,14 @@ export default {
           }
         }
       }
+      .chart-list-item{
+          width:23%;
+          min-width:230px;
+          .chart-item-top,.chart-item-bottom{
+              display: flex;
+              justify-content: space-between;
+          }
+      }
     }
   }
   .nodata {
@@ -2728,7 +2762,7 @@ export default {
         }
       }
       .main-right {
-        width: 80%;
+        flex:1;
         .mx-datepicker {
           width: 220px !important;
         }

src/views/dataEntry_manage/coal/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="lzTarget-container">
-    <div class="left-cont minHeight">
+    <span
+        class="slide-btn-icon"
+        :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" v-show="isLeftWrapShow">
       <div class="left-top">
         <!-- <el-button type="primary" plain size="medium" @click="exportClick" :loading="btnload">导出Excel</el-button> -->
         <el-button
@@ -135,6 +142,7 @@ export default {
   },
   data() {
     return {
+      isLeftWrapShow:true,
       dataloading: false,
       rightShow: false,
       exportBase: process.env.VUE_APP_API_ROOT + "/entry/export/coalList", //中国煤炭网数据导出接口
@@ -526,6 +534,15 @@ export default {
 <style lang="scss" scoped>
 .lzTarget-container {
   display: flex;
+  position:relative;
+  .slide-btn-icon{
+        &.slide-left{
+            left:235px;
+        }
+        &.slide-right{
+            left: 0;
+        }
+    }
   * {
     box-sizing: border-box;
   }
@@ -540,6 +557,7 @@ export default {
   }
   .left-cont {
     min-width: 250px;
+    width:250px;
     margin-right: 20px;
     padding: 30px 0;
     // overflow: hidden;
@@ -566,11 +584,12 @@ export default {
     }
   }
   .right-cont {
-    width: 80%;
+    flex:1;
+    overflow-x: auto;
     padding: 30px;
     .right-box {
       max-width: 100%;
-      max-height: calc(100vh - 230px);
+      max-height: calc(100vh - 240px);
       border-left: 1px solid #dcdfe6;
       border-right: 1px solid #dcdfe6;
       overflow: auto;
@@ -594,9 +613,12 @@ export default {
       margin-top: 20px;
       display: flex;
       flex-wrap: wrap;
+      gap:20px;
+      .el-button{
+            margin-left: 0 !important;
+        }
       .frequency-btn {
         width: 112px;
-        margin: 0 30px 10px 0;
       }
     }
   }

src/views/dataEntry_manage/css/baseTargetPage.scss

@@ -0,0 +1,22 @@
+//可调整宽度目录的统一样式
+.target-container{
+    position:relative;
+    .slide-btn-icon{
+        &.slide-left{
+            right:0;
+        }
+        &.slide-right{
+            left: 0;
+        }
+    }
+    .right-cont{
+        flex:1;
+        overflow-x: auto;
+    }
+    .frequency-list{
+        gap:20px;
+        .el-button{
+            margin-left: 0 !important;
+        }
+    }
+}

src/views/dataEntry_manage/css/exchangedata.scss

@@ -4,6 +4,15 @@ div{
 .exchangedata-wrap{
     display: flex;
     height: 86vh;
+    position: relative;
+    .slide-btn-icon{
+        &.slide-left{
+            left:185px;
+        }
+        &.slide-right{
+            left: 0;
+        }
+      }
     .box{
         background: #FFFFFF;
         border: 1px solid #ECECEC;
@@ -73,6 +82,8 @@ div{
         }
         .num-warp{
             display: flex;
+            flex-wrap: wrap;
+            gap:20px;
             margin-top: 20px;
             .num-box{
                 line-height: 40px;
@@ -84,7 +95,6 @@ div{
                 min-width: 100px;
                 padding: 0 10px;
                 cursor: pointer;
-                margin-right: 20px;
                 color: #409EFF;
             }
             .num-active{

src/views/dataEntry_manage/dataEntry.vue

@@ -1,7 +1,14 @@
 <template>
   <div>
     <div class="data-entry-wrap" @click="rightMouseMenu.show = false">
-      <div class="left-wrap wrap-box">
+        <span
+            class="slide-btn-icon"
+            :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
+      <div class="left-wrap wrap-box" v-show="isLeftWrapShow">
         <div
           style="display: flex; justify-content: space-between; flex-wrap: wrap"
           v-if="role != 'special_researcher'"
@@ -205,8 +212,7 @@
             v-for="item in frequencyList"
             :key="item"
             @click="handleFrequencyChange(item)"
-            >{{ item }}</span
-          >
+            >{{ item }}</span>
         </div>
       </div>
     </div>
@@ -247,6 +253,7 @@ export default {
   components: { insertData },
   data() {
     return {
+      isLeftWrapShow:true,
       timeArr: [],
       TradeCode: "",
       exportDataurl: process.env.VUE_APP_API_ROOT + "/entry/export/dataList", //导出数据
@@ -1146,13 +1153,23 @@ export default {
 <style lang="scss" scoped>
 .data-entry-wrap {
   display: flex;
+  position: relative;
+    .slide-btn-icon{
+        &.slide-left{
+            left:285px;
+        }
+        &.slide-right{
+            left: 0;
+        }
+    }
   .wrap-box {
     background: #ffffff;
     border: 1px solid #ececec;
     box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
     border-radius: 4px;
     padding: 15px;
-    height: calc(100vh - 160px);
+    height: calc(100vh - 120px);
+    box-sizing: border-box;
   }
   .left-wrap {
     min-width: 300px;
@@ -1180,7 +1197,8 @@ export default {
     }
   }
   .right-wrap {
-    width: 80%;
+    flex:1;
+    overflow-x: auto;
     .sticky {
       position: sticky;
       border-right: 1px solid #dcdfe6;
@@ -1225,6 +1243,9 @@ export default {
 
     .frequency-wrap {
       margin-top: 20px;
+      display: flex;
+      flex-wrap: wrap;
+      gap:20px;
       .item {
         cursor: pointer;
         width: 105px;
@@ -1236,7 +1257,6 @@ export default {
         display: inline-block;
         line-height: 40px;
         text-align: center;
-        margin-right: 30px;
       }
       .active {
         color: #fff;

src/views/dataEntry_manage/databaseList.vue

@@ -243,7 +243,7 @@
 								type="text" @click.stop="saveEdbLimit">保存</el-button>
 							<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
 								type="text" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
-							<el-popover 
+							<el-popover v-if="showPopver"
 								placement="bottom-end" 
 								trigger="hover"
 								popper-class="edb-tool-popover"
@@ -804,6 +804,15 @@ export default {
 		//是否显示指标详情
 		isShowDetail(){
 			return !this.showAssociateChart&&!this.showAssociateComputeData&&this.selected_edbid
+		},
+		//是否显示更多操作
+		showPopver(){
+			return this.isEdbBtnShow('setEn')||
+			this.EdbData.Button.InsertNewDataButton&&this.isEdbBtnShow('newValue')||
+			this.EdbData.EdbType===2&&this.isEdbBtnShow('calculateAgain')||
+			this.EdbData.EdbType===1&&this.isEdbBtnShow('refreshAll')||
+			this.isEdbBtnShow('copyData')||
+			this.EdbData.Button.DeleteButton&&this.isEdbBtnShow('deleteEdb')
 		}
 	},
 	methods: {
@@ -1955,10 +1964,6 @@ export default {
 		next()
 	},
 	mounted() {
-		if (document.body.clientWidth <= 1400) {
-			//小屏适配
-			this.isMainLeftShow = false;
-		}
 		this.getlabelList()
 		this.getEdbChartList()
 		this.$route.query.code 

src/views/dataEntry_manage/targetList.vue

@@ -12,7 +12,7 @@
 				placeholder="关键字搜索"
 				v-model="search_txt"
 				@input="searchHandle"
-				style="maxWidth:520px;float:right">
+				style="maxWidth:260px;float:right">
 				<i slot="prefix" class="el-input__icon el-icon-search"></i>
 			</el-input>
 		</div>

src/views/dataEntry_manage/thirdBase/BAIINFOTargetbase.vue

@@ -1,6 +1,20 @@
 <template>
-  <div class="smmTarget-container" id="box">
-    <div class="left-cont minHeight" id="left">
+  <div class="smmTarget-container target-container" id="box">
+    <span
+        v-show="!isLeftWrapShow"
+        class="slide-btn-icon slide-right"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" id="left" v-show="isLeftWrapShow">
+        <span
+            v-show="isLeftWrapShow"
+            class="slide-btn-icon slide-left"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
       <div class="left-top">
         <el-button
           v-permission="permissionBtn.dataSourcePermission.bcyfData_export"
@@ -295,6 +309,7 @@ export default {
   watch: {},
   data() {
     return {
+      isLeftWrapShow:true,
       exportBase:
         process.env.VUE_APP_API_ROOT + "/datamanage/export/baiinfoList", //ssm数据导出接口
       dataloading: false,
@@ -1190,6 +1205,7 @@ export default {
 </script>
 <style lang="scss">
 @import "../css/customtree.scss";
+@import "../css/baseTargetPage.scss";
 .smmTarget-dialog-cont {
   .el-cascader {
     .el-input {
@@ -1289,11 +1305,10 @@ export default {
     }
   }
   .right-cont {
-    width: 82%;
     padding: 30px;
     .right-box {
       max-width: 100%;
-      max-height: calc(100vh - 230px);
+      max-height: calc(100vh - 240px);
       border-left: 1px solid #dcdfe6;
       border-right: 1px solid #dcdfe6;
       overflow: auto;
@@ -1319,7 +1334,6 @@ export default {
       flex-wrap: wrap;
       .frequency-btn {
         width: 112px;
-        margin: 0 30px 10px 0;
       }
     }
     .nodata-cont {

src/views/dataEntry_manage/thirdBase/NationalDataBase.vue

@@ -38,7 +38,14 @@
       >
     </div>
     <div class="data-show-cotainer" v-loading="searchLoading">
-      <div class="data-list-wrap wrap">
+        <span
+            class="slide-btn-icon"
+            :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
+      <div class="data-list-wrap wrap" v-show="isLeftWrapShow">
         <p class="sub-menu-title" v-if="currentMenu">{{ currentMenu.label }}</p>
         <div class="search-box">
           <el-select
@@ -122,6 +129,7 @@ export default {
   components: { lzTable },
   data() {
     return {
+      isLeftWrapShow:true,
       /* menu */
       menuList: [], //菜单列表
       currentMenu: null, //当前选择的菜单
@@ -545,8 +553,17 @@ export default {
   }
   .data-show-cotainer {
     display: flex;
+    position: relative;
+    .slide-btn-icon{
+        &.slide-left{
+            left:385px;
+        }
+        &.slide-right{
+            left: 0;
+        }
+    }
     .wrap {
-      height: calc(100vh - 192px);
+      height: calc(100vh - 194px);
       background-color: white;
       border: 1px solid #dcdfe6;
       border-radius: 4px;

src/views/dataEntry_manage/thirdBase/SCITargetbase.vue

@@ -1,6 +1,20 @@
 <template>
-  <div class="smmTarget-container" id="box">
-    <div class="left-cont minHeight" id="left">
+  <div class="smmTarget-container target-container" id="box">
+    <span
+        v-show="!isLeftWrapShow"
+        class="slide-btn-icon slide-right"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" id="left" v-show="isLeftWrapShow">
+        <span
+            v-show="isLeftWrapShow"
+            class="slide-btn-icon slide-left"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
       <div class="left-top">
         <el-button
           v-permission="permissionBtn.dataSourcePermission.hongtao3Data_export"
@@ -247,6 +261,7 @@ export default {
   watch: {},
   data() {
     return {
+      isLeftWrapShow:true,
       exportBase: process.env.VUE_APP_API_ROOT + "/datamanage/export/sciList", //sci数据导出接口
       dataloading: false,
       rightShow: false,
@@ -1078,6 +1093,7 @@ export default {
 </script>
 <style lang="scss">
 @import "../css/customtree.scss";
+@import "../css/baseTargetPage.scss";
 .smmTarget-dialog-cont {
   .el-cascader {
     .el-input {

src/views/dataEntry_manage/thirdBase/chinaFinancialFutures.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="exchangedata-wrap">
-        <div class="left-wrap box">
+    <span
+        class="slide-btn-icon"
+        :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+        <div class="left-wrap box" v-show="isLeftWrapShow">
             <el-date-picker 
                 style="width:100%" 
                 v-model="time" 
@@ -75,6 +82,7 @@ export default {
     name:"chinaFinancialFutures",
     data() {
         return {
+            isLeftWrapShow:true,
             labelArr: {
                 Rank: "名次",
                 DealShortName: "会员简称",

src/views/dataEntry_manage/thirdBase/dlExchangeData.vue

@@ -1,6 +1,13 @@
 <template>
     <div class="exchangedata-wrap">
-        <div class="left-wrap box">
+        <span
+            class="slide-btn-icon"
+            :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
+        <div class="left-wrap box" v-show="isLeftWrapShow">
             <el-date-picker 
                 style="width:100%" 
                 v-model="time" 
@@ -73,6 +80,7 @@ export default {
     name: "大连交易所数据",
     data() {
         return {
+            isLeftWrapShow:true,
             labelArr: {
                 Rank: "名次",
                 DealShortName: "会员简称",

src/views/dataEntry_manage/thirdBase/elaSteoBase.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="eteo-container">
-    <div class="left-cont minHeight">
+    <span
+        class="slide-btn-icon"
+        :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" v-show="isLeftWrapShow">
       <div class="left-top">
         <el-button
           v-permission="permissionBtn.dataSourcePermission.eiaData_export"
@@ -83,6 +90,7 @@ export default {
   components: { lzTable },
   data() {
     return {
+      isLeftWrapShow:true,
       exportBase: process.env.VUE_APP_API_ROOT + "/datamanage/eia_steo/data", //数据导出接口
       dataloading: false,
       rightShow: false,
@@ -296,6 +304,15 @@ export default {
 <style lang="scss" scoped>
 .eteo-container {
   display: flex;
+  position:relative;
+  .slide-btn-icon{
+    &.slide-left{
+        left:225px;
+    }
+    &.slide-right{
+        left: 0;
+    }
+  }
   * {
     box-sizing: border-box;
   }
@@ -309,7 +326,8 @@ export default {
     width: 5px !important;
   }
   .left-cont {
-    min-width: 160px;
+    min-width: 240px;
+    width:240px;
     margin-right: 20px;
     padding: 30px 0;
     overflow: hidden;
@@ -336,8 +354,9 @@ export default {
     }
   }
   .right-cont {
-    width: 86%;
+    flex:1;
     padding: 30px;
+    overflow-x: auto;
     .right-box {
       max-width: 100%;
       max-height: calc(100vh - 230px);

src/views/dataEntry_manage/thirdBase/glTargetbase.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="lzTarget-container">
-    <div class="left-cont minHeight">
+    <span
+        class="slide-btn-icon"
+        :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" v-show="isLeftWrapShow">
       <div class="left-top">
         <!-- <el-button type="primary" plain size="medium" @click="exportClick" :loading="btnload">导出Excel</el-button> -->
         <el-button
@@ -114,6 +121,7 @@ export default {
   },
   data() {
     return {
+      isLeftWrapShow:true,
       dataloading: false,
       rightShow: false,
       exportBase: process.env.VUE_APP_API_ROOT + "/datamanage/export/glList", //钢联数据导出接口
@@ -439,6 +447,15 @@ export default {
 <style lang="scss" scoped>
 .lzTarget-container {
   display: flex;
+  position:relative;
+  .slide-btn-icon{
+        &.slide-left{
+            left:225px;
+        }
+        &.slide-right{
+            left: 0;
+        }
+    }
   * {
     box-sizing: border-box;
   }
@@ -452,7 +469,8 @@ export default {
     width: 5px !important;
   }
   .left-cont {
-    min-width: 140px;
+    min-width: 240px;
+    width:240px;
     margin-right: 20px;
     padding: 30px 0;
     overflow: hidden;
@@ -479,11 +497,12 @@ export default {
     }
   }
   .right-cont {
-    width: 86%;
+    flex:1;
     padding: 30px;
+    overflow-x: auto;
     .right-box {
       max-width: 100%;
-      max-height: calc(100vh - 230px);
+      max-height: calc(100vh - 240px);
       border-left: 1px solid #dcdfe6;
       border-right: 1px solid #dcdfe6;
       overflow: auto;
@@ -507,9 +526,12 @@ export default {
       margin-top: 20px;
       display: flex;
       flex-wrap: wrap;
+      gap:20px;
+      .el-button{
+            margin-left: 0 !important;
+        }
       .frequency-btn {
         width: 112px;
-        margin: 0 30px 10px 0;
       }
     }
   }

src/views/dataEntry_manage/thirdBase/lzTargetbase.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="lzTarget-container">
-    <div class="left-cont minHeight">
+    <span
+        class="slide-btn-icon"
+        :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" v-show="isLeftWrapShow">
       <div class="left-top">
         <el-button
           v-permission="permissionBtn.dataSourcePermission.longzhongData_export"
@@ -103,6 +110,7 @@ export default {
   },
   data() {
     return {
+      isLeftWrapShow:true,
       dataloading: false,
       rightShow: false,
       exportBase: process.env.VUE_APP_API_ROOT + "/datamanage/export/lzList", //隆众数据导出接口
@@ -372,6 +380,15 @@ export default {
 <style lang="scss" scoped>
 .lzTarget-container {
   display: flex;
+  position: relative;
+  .slide-btn-icon{
+        &.slide-left{
+            left:225px;
+        }
+        &.slide-right{
+            left: 0;
+        }
+    }
   * {
     box-sizing: border-box;
   }
@@ -385,7 +402,8 @@ export default {
     width: 5px !important;
   }
   .left-cont {
-    min-width: 140px;
+    min-width: 240px;
+    width:240px;
     margin-right: 20px;
     padding: 30px 0;
     overflow: hidden;
@@ -412,13 +430,13 @@ export default {
     }
   }
   .right-cont {
-    width: 86%;
+    flex:1;
     padding: 30px;
-
+    overflow-x: auto;
     .right-box {
       max-width: 100%;
-      max-height: calc(100vh - 230px);
-      border-left: 1px solid #dcdfe6;
+      max-height: calc(100vh - 240px);
+      /* border-left: 1px solid #dcdfe6; */
       border-right: 1px solid #dcdfe6;
       overflow: auto;
       .data-header {
@@ -441,9 +459,12 @@ export default {
       margin-top: 20px;
       display: flex;
       flex-wrap: wrap;
+      gap:20px;
+      .el-button{
+            margin-left: 0 !important;
+        }
       .frequency-btn {
         width: 112px;
-        margin: 0 30px 10px 0;
       }
     }
   }

src/views/dataEntry_manage/thirdBase/shEnergy.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="exchangedata-wrap">
-        <div class="left-wrap box">
+        <span
+            class="slide-btn-icon"
+            :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
+        <div class="left-wrap box" v-show="isLeftWrapShow">
             <el-date-picker 
                 style="width:100%" 
                 v-model="time" 
@@ -70,6 +77,7 @@ export default {
     name: "上海国际能源交易中心",
     data() {
         return {
+            isLeftWrapShow:true,
             labelArr: {
                 Rank: "名次",
                 DealShortName: "会员简称",

src/views/dataEntry_manage/thirdBase/shFutures.vue

@@ -1,6 +1,13 @@
 <template>
     <div class="exchangedata-wrap">
-        <div class="left-wrap box">
+        <span
+            class="slide-btn-icon"
+            :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
+        <div class="left-wrap box" v-show="isLeftWrapShow">
             <el-date-picker
                 style="width: 100%"
                 v-model="time"
@@ -88,6 +95,7 @@ export default {
     name: "上海期货交易所",
     data() {
         return {
+            isLeftWrapShow:true,
             labelArr: {
                 Rank: "名次",
                 DealShortName: "会员简称",

src/views/dataEntry_manage/thirdBase/smmTargetbase.vue

@@ -1,6 +1,20 @@
 <template>
-  <div class="smmTarget-container" id="box">
-    <div class="left-cont minHeight" id="left">
+  <div class="smmTarget-container target-container" id="box">
+    <span
+        v-show="!isLeftWrapShow"
+        class="slide-btn-icon slide-right"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" id="left" v-show="isLeftWrapShow">
+        <span
+            v-show="isLeftWrapShow"
+            class="slide-btn-icon slide-left"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
       <div class="left-top">
         <el-button
           v-permission="permissionBtn.dataSourcePermission.smmData_export"
@@ -263,6 +277,7 @@ export default {
   watch: {},
   data() {
     return {
+      isLeftWrapShow:true,
       exportBase: process.env.VUE_APP_API_ROOT + "/datamanage/export/smmList", //ssm数据导出接口
       dataloading: false,
       rightShow: false,
@@ -1146,6 +1161,7 @@ export default {
 </script>
 <style lang="scss">
 @import "../css/customtree.scss";
+@import "../css/baseTargetPage.scss";
 .smmTarget-dialog-cont {
   .el-cascader {
     .el-input {
@@ -1245,11 +1261,10 @@ export default {
     }
   }
   .right-cont {
-    width: 82%;
     padding: 30px;
     .right-box {
       max-width: 100%;
-      max-height: calc(100vh - 230px);
+      max-height: calc(100vh - 240px);
       border-left: 1px solid #dcdfe6;
       border-right: 1px solid #dcdfe6;
       overflow: auto;
@@ -1275,7 +1290,6 @@ export default {
       flex-wrap: wrap;
       .frequency-btn {
         width: 112px;
-        margin: 0 30px 10px 0;
       }
     }
     .nodata-cont {

src/views/dataEntry_manage/thirdBase/steelChemicalbase.vue

@@ -1,6 +1,20 @@
 <template>
   <div class="steelChemical-container" id="box">
-    <div class="left-cont minHeight" id="left">
+    <span
+        v-show="!isLeftWrapShow"
+        class="slide-btn-icon slide-right"
+        @click="isLeftWrapShow = !isLeftWrapShow"
+    >
+        <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+    </span>
+    <div class="left-cont minHeight" id="left" v-show="isLeftWrapShow">
+        <span
+            v-show="isLeftWrapShow"
+            class="slide-btn-icon slide-left"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
       <div class="left-top">
         <div>
           <el-button v-permission="permissionBtn.dataSourcePermission.mysteelData_add"
@@ -254,6 +268,7 @@ export default {
   components: { lzTable, mDialog, targetDialog,batchAddEdbDia },
   data() {
     return {
+      isLeftWrapShow:true,
       dataloading: false,
       rightShow: false,
       exportBase:
@@ -716,6 +731,15 @@ export default {
 <style lang="scss" scoped>
 .steelChemical-container {
   display: flex;
+  position: relative;
+  .slide-btn-icon{
+        &.slide-left{
+            right:0;
+        }
+        &.slide-right{
+            left: 0;
+        }
+    }
   * {
     box-sizing: border-box;
   }
@@ -787,12 +811,13 @@ export default {
     }
   }
   .right-cont {
-    width: 82%;
+    flex:1;
+    overflow-x: auto;
     padding: 30px;
     position: relative;
     .right-box {
       max-width: 100%;
-      max-height: calc(100vh - 230px);
+      max-height: calc(100vh - 240px);
       border-left: 1px solid #dcdfe6;
       border-right: 1px solid #dcdfe6;
       overflow: auto;
@@ -816,9 +841,12 @@ export default {
       margin-top: 20px;
       display: flex;
       flex-wrap: wrap;
+      gap:20px;
+      .el-button{
+            margin-left: 0 !important;
+        }
       .frequency-btn {
         width: 112px;
-        margin: 0 30px 10px 0;
       }
     }
   }

src/views/dataEntry_manage/thirdBase/zzExchangeData.vue

@@ -1,6 +1,13 @@
 <template>
     <div class="exchangedata-wrap">
-        <div class="left-wrap box">
+        <span
+            class="slide-btn-icon"
+            :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
+            @click="isLeftWrapShow = !isLeftWrapShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
+        </span>
+        <div class="left-wrap box" v-show="isLeftWrapShow">
             <el-date-picker 
                 style="width:100%" 
                 v-model="time" 
@@ -65,6 +72,7 @@ export default {
     name: "郑州交易所数据",
     data() {
         return {
+            isLeftWrapShow:true,
             labelArr: {
                 Rank: "名次",
                 DealShortName: "会员简称",

src/views/datasheet_manage/components/SheetExcel.vue

@@ -33,6 +33,13 @@ export default {
       let optionData = this.option ? this.option : {};
       let callbackItems={updated:this.updateEmit}
       initSheet('sheet-container',optionData,this.sheetInfo,this.limit,callbackItems)
+      setTimeout(() => {
+        //获取sheet-container的宽度，设置更多操作的宽度
+        //#luckysheet-icon-morebtn-div
+        const sheetDom = document.querySelector('#sheet-container')
+        const morebtn = document.querySelector('#luckysheet-icon-morebtn-div')
+        morebtn.style.maxWidth = sheetDom.clientWidth - 70 +'px';
+      }, 300);
     },
     copyDisable(e){
       // 变向的禁止复制

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: 260px;"
         v-for="cell in list"
         :key="cell.ExcelInfoId"
       >

src/views/datasheet_manage/customAnalysis/list.vue

@@ -955,20 +955,22 @@ $normal-font: 14px;
 
     .main-right {
       width: 80%;
-      min-width: 900px;
+      min-width: 800px;
       position: relative;
+      height: calc(100vh - 120px);
+      display: flex;
       .sheet-detail-wrapper {
-        height: 100%;
+        flex: 1;
         border: 1px solid #ececec;
         border-radius: 4px;
         box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
-        overflow: auto;
         background: #fff;
+        box-sizing: border-box;
+        overflow-x: auto;
+        display: flex;
+        flex-direction: column;
         .detail-top {
           padding: 20px;
-          // display: flex;
-          // justify-content: space-between;
-          // align-items: center;
           border-bottom: 1px solid #ececec;
           .sheet-name {
             font-size: 18px;
@@ -984,6 +986,7 @@ $normal-font: 14px;
             display: flex;
             justify-content: space-between;
             align-items: center;
+            white-space: pre;
             .author{
               color: #666666;
               font-size: 16px;
@@ -1004,10 +1007,10 @@ $normal-font: 14px;
           }
         }
         .sheet-wrap {
+          flex:1;
           position: relative;
-          height: calc(100vh - 210px);
+          box-sizing: border-box;
           padding: 15px;
-          /* min-height: 500px; */
         }
       }
 

src/views/datasheet_manage/sheetList.vue

@@ -218,7 +218,7 @@
           <div class="sheet-wrap">
             <Sheet
               ref="sheetRef"
-              v-if="sheetDetailInfo.Source === 1"
+              v-if="sheetDetailInfo.Source === 1&&sheetDetailInfo.ExcelInfoId"
               :option="{
                 data: [{
                   ...JSON.parse(sheetDetailInfo.Content),
@@ -801,8 +801,8 @@ export default {
           this.editButtonText = this.sheetDetailInfo.CanEdit?'':`${this.sheetDetailInfo.Editor}编辑中`
 
           this.$nextTick(() => {
-
-            this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
+            //sheet组件Mounted已经init一次,再次调用会导致工具栏样式错乱
+            //this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
 
             this.sheetDetailInfo.Source === 2 &&
               this.$refs.customTableRef.initSheetData(res.Data.TableData);
@@ -1050,18 +1050,21 @@ $normal-font: 14px;
     .main-right {
       width: 80%;
       min-width: 800px;
+      position: relative;
+      height: calc(100vh - 120px);
+      display: flex;
       .sheet-detail-wrapper {
-        height: 100%;
+        flex: 1;
         border: 1px solid #ececec;
         border-radius: 4px;
         box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
-        overflow: auto;
         background: #fff;
+        box-sizing: border-box;
+        overflow-x: auto;
+        display: flex;
+        flex-direction: column;
         .detail-top {
           padding: 20px;
-          // display: flex;
-          // justify-content: space-between;
-          // align-items: center;
           border-bottom: 1px solid #ececec;
           .sheet-name {
             font-size: 18px;
@@ -1077,6 +1080,7 @@ $normal-font: 14px;
             display: flex;
             justify-content: space-between;
             align-items: center;
+            white-space: pre;
             .author{
               color: #666666;
               font-size: 16px;
@@ -1098,8 +1102,9 @@ $normal-font: 14px;
 
         }
         .sheet-wrap {
+          flex:1;
           position: relative;
-          height: calc(100vh - 210px);
+          box-sizing: border-box;
           padding: 15px;
           overflow-y: auto;
           /* min-height: 500px; */

src/views/futures_manage/commodityChartBase.vue

@@ -14,6 +14,7 @@
 						<el-button v-permission="permissionBtn.productPricePermission.goodsPrice_priceLine"
 							type="primary" @click="goAddChart('price')">添加价格曲线</el-button>
 						<el-button v-permission="permissionBtn.productPricePermission.goodsPrice_incomeLine"
+							style="margin-left:0;"
 							type="primary" @click="goAddChart('profit')">添加利润曲线</el-button>
 				</div>
 

src/views/futures_manage/futuresBase.vue

@@ -67,7 +67,7 @@
       :data="tableData"
       style="box-shadow: 0px 3px 6px rgba(155, 170, 219, 0.2);margin-top: 20px"
       border
-      max-height="680"
+      height="auto"
       ref="table"
     >
       <el-table-column
@@ -238,10 +238,17 @@ export default {
   border-radius: 4px;
   height: calc(100vh - 120px);
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
+  display: flex;
+  flex-direction: column;
   .header {
     display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
     align-items: center;
+    gap:20px 0;
+  }
+  .el-table{
+    flex: 1;
   }
   .nodata {
     padding: 150px 0; 

src/views/login_manage/css/formStyle.scss

@@ -4,6 +4,9 @@
         margin-top: -10px;
         margin-bottom: 60px !important;
         width: 100%;
+        @media screen and (max-height:720px) {
+            margin-bottom:40px !important;
+        }
         .hint-text{
             color: #606266 !important;
             font-size: 16px;

src/views/mychart_manage/components/chooseChart.vue

@@ -53,7 +53,7 @@
             :span="5"
             v-for="chart in chartPublicList"
             :key="chart.ChartInfoId"
-            style="padding-right: 20px;margin-bottom:20px;"
+            style="padding-right: 20px;margin-bottom:20px;min-width: 260px;"
           >
             <el-card shadow class="public-chart-item">
               <div slot="header" class="item-top">
@@ -227,7 +227,9 @@ export default {
     .chart-public-list {
       display: flex;
       flex-wrap: wrap;
-      height: 650px;
+      /* height: 650px; */
+      max-height: 650px;
+      height: 65vh;
       padding: 0 0 0 20px;
       overflow: hidden;
       overflow-y: auto;

src/views/mychart_manage/index.vue

@@ -188,7 +188,7 @@
               :span="6"
               v-for="chart in chartList"
               :key="chart.ChartInfoId"
-              style="margin-bottom: 20px; padding-right: 20px"
+              style="margin-bottom: 20px; padding-right: 20px;min-width: 270px;"
             >
               <el-card class="public-chart-item">
                 <div slot="header" class="item-top">

src/views/positionAnalysis_manage/components/chartDetail.vue

@@ -285,7 +285,13 @@ export default {
 .chart-position-analysis-page {
   padding-bottom: calc(160px + constant(safe-area-inset-bottom));
   padding-bottom: calc(160px + env(safe-area-inset-bottom));
+  overflow-x: auto;
 }
+.chart-wrap-box{
+    min-width: 743px;
+    height: 100%;
+    overflow-y: hidden;
+  }
 .chart-wrap {
   width: 100%;
   margin-bottom: 60px;
@@ -306,11 +312,13 @@ export default {
 .empty-wrap {
   text-align: center;
   padding: 150px 0;
+  box-sizing: border-box;
 }
 
 // @media (min-width: 600px){
 .chart-position-analysis-page-pc {
   padding: 0;
+  height: 100%;
   .top-sticky-wrap {
     display: none;
   }

src/views/positionAnalysis_manage/detail.vue

@@ -255,7 +255,7 @@ export default {
     justify-content: space-between;
   }
   .detail-content {
-      flex: 1;
+    flex: 1;
     padding: 20px;
     background: #fff;
     border-right: 2px solid #F2F2F2;

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/predictEdb_manage/predictEdb.vue

@@ -195,7 +195,7 @@
 									v-if="detail_show_chart&&isEdbBtnShow('edbPreData_save')">保存</el-button>
 							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_edbSource"
 								type="text" @click="isLookHistory=true;lookEdbId=select_id">指标溯源</el-button>
-							<el-popover 
+							<el-popover v-if="showPopover"
 								placement="bottom-end" 
 								trigger="hover"
 								popper-class="edb-tool-popover"
@@ -685,6 +685,12 @@ export default {
 			let id = parseInt(localStorage.getItem('AdminId'));
 			return id;
 		},
+		showPopover(){
+			return this.isEdbBtnShow('edbPreData_enNameSetting')||
+			this.isEdbBtnShow('edbPreData_recalcu')||
+			this.edbButton.DeleteButton&&this.isEdbBtnShow('edbPreData_del')||
+			this.isEdbBtnShow('edbPreData_copyData')
+		}
 	},
 	watch: {
 		/* 设置动态右侧区域宽度 */
@@ -1452,10 +1458,6 @@ export default {
 		}
 	},
 	mounted() {
-		if (document.body.clientWidth <= 1400) {
-			//小屏适配
-			this.isSlideLeft = true;
-		}
 		const obj=sessionStorage.getItem('predictEdbTreeData')
 		if(obj||this.$route.query.code){
 			let code=obj?JSON.parse(obj).code:this.$route.query.code

src/views/report_manage/reportEn/reportlist.vue

@@ -96,6 +96,7 @@
                 <div class="select-btn" slot="reference">
                     <img src="~@/assets/icons/filter.svg">
                     <span>筛选条件</span>
+                    <span class="select-num">+{{selectNum}}</span>
                 </div>
             </el-popover>
           </el-form-item>
@@ -461,6 +462,16 @@ export default {
   watch: {
     searchform: {
       handler() {
+        this.selectNum = 1;
+        //检测筛选项的值,更新selectNum;
+        //frequency:string;classifynameArr:array;publishState:number;
+        ['frequency','classifynameArr','publishState','EmailState'].forEach(key=>{
+            const keyType = typeof(this.searchform[key])
+            if(this.searchform[key]&&keyType!=='object')
+                this.selectNum++;
+            if(keyType==='object'&&this.searchform[key].length>0)
+                this.selectNum++;
+        })
         this.page_no = 1;
         this.getTableData()
       },
@@ -582,6 +593,7 @@ export default {
       editId:0,//编辑策略报告id
 
       isPull:false,//是否正在同步获取报告
+      selectNum:1,
     };
   },
   mounted() {
@@ -969,6 +981,15 @@ export default {
             display: inline-block;
             vertical-align: middle;
           }
+          .select-num{
+            width:20px;
+            height:20px;
+            line-height: 20px;
+            border-radius: 50%;
+            background-color:#0052D9;
+            color:white;
+            font-size: 12px;
+        }
       }
   }
   .opt-btns {

src/views/report_manage/reportlist.vue

@@ -128,21 +128,10 @@
                 <div class="select-btn" slot="reference">
                     <img src="~@/assets/icons/filter.svg">
                     <span>筛选条件</span>
+                    <span class="select-num">+{{selectNum}}</span>
                 </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 +146,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"
@@ -811,6 +725,7 @@ export default {
       showPublish: false,
       isDSFB:false,//是否为定时发布
       tableKey:0,
+      selectNum:1
 
       //isApprove:false,//是否开启审批流,若开启,发布相关按钮,筛选项改变
     };
@@ -1223,6 +1138,16 @@ export default {
     search() {
       //搜索
       this.ispage = false;
+      this.selectNum = 1;
+        //检测筛选项的值,更新selectNum;
+        //frequency:string;classifynameArr:array;publishState:number;msgIsSend:number;
+        ['frequency','classifynameArr','publishState','msgIsSend'].forEach(key=>{
+            const keyType = typeof(this.searchform[key])
+            if(this.searchform[key]&&keyType!=='object')
+                this.selectNum++;
+            if(keyType==='object'&&this.searchform[key].length>0)
+                this.selectNum++;
+        })
       this.$nextTick(() => {
         this.PageIndex = 1;
         this.getlist();
@@ -1327,6 +1252,15 @@ export default {
             display: inline-block;
             vertical-align: middle;
           }
+          .select-num{
+            width:20px;
+            height:20px;
+            line-height: 20px;
+            border-radius: 50%;
+            background-color:#0052D9;
+            color:white;
+            font-size: 12px;
+        }
       }
   }
   .opt-btns {

src/views/smartReport/components/TextEdit.vue

@@ -112,6 +112,30 @@ export default {
 }
 </script>
 
-<style>
-
+<style lang="scss">
+.text-edit-wrap{
+    .fr-box.fr-basic{
+        flex: 1;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        .fr-wrapper{
+            flex: 1;
+            overflow: auto;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.text-edit-wrap{
+    width:100%;
+    height: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    #froala-editor{
+        flex:1;
+        overflow: auto;
+    }
+}
 </style>

src/views/smartReport/editReport.vue

@@ -139,8 +139,8 @@
                 <div class="close-icon" @click="handleCloseRight">
                     <img src="~@/assets/img/smartReport/icon14.png" alt="">
                 </div>
-                <div style="overflow-x:auto">
-                <div style="min-width:800px">
+                <div style="overflow-x:auto;height:calc(100% + 12px);">
+                <div style="min-width:800px;height: 100%;">
                 <TextEdit 
                     v-if="rightType==='text'"
                     :key="activeId"

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,92 @@
                         @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>
+                            <span class="select-num">+{{selectNum}}</span>
+                        </div>
+                    </el-popover>
                 </el-form-item>
                 <el-form-item label="">
                     <el-date-picker
@@ -37,63 +112,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 +126,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="标题 / 创建人 / 更新人"
@@ -137,6 +155,7 @@
                     label="报告标题"
                     align="center"
                     min-width="140"
+                    fixed
                 >
                     <template slot-scope="scope">
                     <div @click="lookreportdtl(scope.row)">
@@ -166,6 +185,7 @@
                     label="摘要"
                     align="center"
                     min-width="140"
+                    fixed
                 ></el-table-column>
                 <el-table-column label="报告类型" align="center" min-width="140">
                     <template slot-scope="scope"
@@ -262,7 +282,7 @@
                     >{{ hasUV? scope.row.Pv+'/'+scope.row.Uv:scope.row.Pv }}</template
                     >
                 </el-table-column>
-                <el-table-column label="操作" align="center" min-width="130">
+                <el-table-column label="操作" align="center" min-width="130" fixed="right">
                     <template slot-scope="scope">
                     <div class="opt-btns">
                         <!-- 不走审批流的按钮 -->
@@ -560,7 +580,8 @@ export default {
             isDSFB:false,
 
             reportImgUrl:'',
-            showReportImg:false
+            showReportImg:false,
+            selectNum:1
         }
     },
     methods:{
@@ -754,6 +775,17 @@ export default {
         //搜索
         search() {
             this.ispage = false;
+            this.selectNum = 1;
+            //检测筛选项的值,更新selectNum;
+            //frequency:string;classifynameArr:array;publishState:number;
+            ['frequency','classifynameArr','publishState'].forEach(key=>{
+                const keyType = typeof(this.searchform[key])
+                if(this.searchform[key]&&keyType!=='object')
+                    this.selectNum++;
+                if(keyType==='object'&&this.searchform[key].length>0)
+                    this.selectNum++;
+            })
+
             this.$nextTick(() => {
                 this.PageIndex = 1;
                 this.getReportList();
@@ -907,8 +939,47 @@ export default {
 }
 </script>
 
-<style lang='scss' scoped>
+<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;
+        }
+        .select-num{
+            width:20px;
+            height:20px;
+            line-height: 20px;
+            border-radius: 50%;
+            background-color:#0052D9;
+            color:white;
+            font-size: 12px;
+        }
+    }
+    .header{
+        .el-form-item{
+            margin-bottom: 0;
+        }
+    }
     .report-img-box{
         position: fixed;
         left: 0;

src/views/supply_manage/components/plantTable.vue

@@ -169,7 +169,7 @@ export default {
         {
           label: '地点',
           key: 'address',
-          minwidthsty: '120px'
+          minwidthsty: '140px'
         },
         {
           label: '工厂',

src/views/system_manage/departManage.vue

@@ -77,6 +77,7 @@
 					<el-table-column
 					prop="RealName"
 					label="姓名"
+					width="200"
 					align="center">
 						<template slot-scope="scope">
 							<el-tag size="small" 
@@ -113,7 +114,7 @@
 							<span :style="{color:scope.row.Enabled===0?'#FF0000':null}">{{scope.row.Enabled===0?'禁用':'启用'}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" align="center" width="300">
+					<el-table-column label="操作" align="center" width="300" fixed="right">
 						<template slot-scope="scope">
 							<div style="color:#4099ef; font-size:24px;display: flex;gap:0 10px;">
 								<span  v-permission="permissionBtn.sysDepartPermission.sysDepart_saveUser"
@@ -1408,7 +1409,7 @@ export default {
 				top: 0;
 				bottom: 0;
 				overflow-y: hidden;
-				z-index: 2;
+				z-index: 3;
 				box-shadow: -3px 0 6px rgba(0, 0, 0, 0.1);
 				border: 1px solid #ececec;
 				padding: 60px 30px;

src/views/system_manage/enAuthManage.vue

@@ -38,6 +38,7 @@
           :key="item.label"
           :label="item.label"
           :prop="item.key"
+          :width="item.width"
           align="center"
         >
           <template slot-scope="{ row }">
@@ -150,6 +151,7 @@ export default {
         {
           label: "姓名",
           key: "RealName",
+          width:"200"
         },
         {
           label: "手机号",

src/views/system_manage/etaBaseConfig.vue

@@ -148,7 +148,7 @@
                         </el-form-item>
                     </div>
                     
-                    <el-form-item label="PPT封面图" prop="CnPptCoverImgs">
+                    <el-form-item label="PPT封面图" prop="CnPptCoverImgs" style="min-width:400px;">
                         <div class="input-line" style="display:flex;">
                             <ImgUpload 
                                 :imgUrl="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs[2]:''"
@@ -197,7 +197,7 @@
                             <el-input type="color" style="width:64px;" v-model="formData.PptFontColorEn"></el-input>
                         </el-form-item>
                     </div>
-                    <el-form-item label="PPT封面图" prop="EnPptCoverImgs">
+                    <el-form-item label="PPT封面图" prop="EnPptCoverImgs" style="min-width:400px;">
                         <div class="input-line" style="display:flex;">
                             <ImgUpload 
                                 :imgUrl="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs[2]:''"

src/views/system_manage/operateAuthManage.vue

@@ -4,22 +4,21 @@
       <ul class="tab-ul">
         <li :class="['tab-li',{act: default_tab===item.key}]" v-for="item in authTabs" :key="item.key" @click="changeTab(item)">{{item.label}}</li>
       </ul>
-
-      <div class="right-side" v-if="authTabs.length">
-        <el-input 
-          v-model="searchForm.key_word" 
-          :placeholder="default_tab === 5 ? '请输入图表名称' : '请输入指标Id/指标名称'" 
-          style="width: 300px"
-          @change="changeUser"
-          clearable
-        >
-          <i slot="prefix" class="el-input__icon el-icon-search"/>
-        </el-input>
-      </div>
     </div>
 
     <div class="top">
         <div v-if="authTabs.length">
+            <el-input 
+            v-model="searchForm.key_word" 
+            :placeholder="default_tab === 5 ? '请输入图表名称' : '请输入指标Id/指标名称'" 
+            style="width: 300px;margin-right:20px;"
+            @change="changeUser"
+            clearable
+            >
+            <i slot="prefix" class="el-input__icon el-icon-search"/>
+            </el-input>
+        </div>
+        <div v-if="authTabs.length" style="margin-right:auto;">
           <el-cascader
             v-model="searchForm.classification"
             :options="classificationList"
@@ -101,7 +100,7 @@
           <tableNoData text="暂无数据" size="mini"/>
 				</div>
     </el-table>
-    <el-col :span="24" style="height:35px">
+    <el-col :span="24" style="height:35px;text-align: right;float: none;">
       <m-page
         :page_no="page_no"
         :pageSize="pageSize"
@@ -419,7 +418,8 @@ export default {
 
 <style lang="scss" scoped>
 .container {
-  min-height: calc(100vh - 160px);
+  box-sizing: border-box;
+  min-height: calc(100vh - 120px);
   padding: 20px 30px;
   background: #fff;
   position: relative;

src/views/system_manage/roleManage.vue

@@ -266,6 +266,9 @@ export default {
 </script>
 <style lang='scss' >
 .roleManage_container {
+	min-height: calc(100vh - 120px);
+	display: flex;
+	flex-direction: column;
 	/* reset */
 	.el-form-item__label {
 		font-size: 16px;
@@ -285,7 +288,8 @@ export default {
 		box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
 	}
 	.role_bot {
-		min-height: calc(100vh - 260px);
+		flex: 1;
+		//min-height: calc(100vh - 260px);
 		padding: 20px 30px;
 		background: #fff;
 		margin-top: 20px;