新加的适配需求

src/views/dataEntry_manage/databaseList.vue

@@ -242,7 +242,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"
@@ -802,6 +802,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: {
@@ -1954,10 +1963,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/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/datasheet_manage/customAnalysis/list.vue

@@ -958,18 +958,19 @@ $normal-font: 14px;
       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;
@@ -985,6 +986,7 @@ $normal-font: 14px;
             display: flex;
             justify-content: space-between;
             align-items: center;
+            white-space: pre;
             .author{
               color: #666666;
               font-size: 16px;
@@ -1005,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,19 +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;
@@ -1078,6 +1080,7 @@ $normal-font: 14px;
             display: flex;
             justify-content: space-between;
             align-items: center;
+            white-space: pre;
             .author{
               color: #666666;
               font-size: 16px;
@@ -1099,10 +1102,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/predictEdb_manage/predictEdb.vue

@@ -194,7 +194,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"
@@ -686,6 +686,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: {
 		/* 设置动态右侧区域宽度 */
@@ -1453,10 +1459,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,6 +128,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>
@@ -724,6 +725,7 @@ export default {
       showPublish: false,
       isDSFB:false,//是否为定时发布
       tableKey:0,
+      selectNum:1
 
       //isApprove:false,//是否开启审批流,若开启,发布相关按钮,筛选项改变
     };
@@ -1136,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();
@@ -1240,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

@@ -775,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();