up

src/views/exctab/excelmodel/excelmodel.vue

@@ -157,6 +157,8 @@
               style="text-decoration:underline;"
               @click="downloadExcel()"
             >下载EXCEL</el-link>
+
+
           </div>
           <div
             class="rightHeader"

src/views/formula/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container class="h-basic-full">
     <div class="box-dashed flex jc-sb">
       <div class="flex">
         <div class="retain-box">
@@ -37,16 +37,16 @@
       <div class="mg-b-20">函数公式</div>
       <div class="edit-text">
         <span>
-          <formula-item 
-            v-for="(item,index) in resultFormula" :key="index" 
+          <formula-item
+            v-for="(item,index) in resultFormula" :key="index"
             :item="item" @click="obj => equationClick(obj,index,'resultFormula')"
           >
           </formula-item>
         </span>
         <span>=</span>
         <span>
-          <formula-item 
-            v-for="(item,index) in processFormula" :key="index" 
+          <formula-item
+            v-for="(item,index) in processFormula" :key="index"
             :item="item" @click="obj => equationClick(obj,index,'processFormula')"
           >
           </formula-item>
@@ -127,8 +127,8 @@
             </div>
             <div class="border-grey sele-ele-box">
               <div>
-                <formula-item 
-                  v-for="(item,index) in selectEleFormula" :key="index" 
+                <formula-item
+                  v-for="(item,index) in selectEleFormula" :key="index"
                   :item="item" @click="obj => eleFormulaClick(obj,index)"
                 >
                 </formula-item>
@@ -422,7 +422,7 @@ export default {
     equationSelectEle:function(){
       if(this.processType){
         return this[this.processType][this.processSelectIndex];
-      }else{  
+      }else{
         return null;
       }
     },
@@ -621,7 +621,7 @@ export default {
           })
           this.deleEleIndex = -1;
         }
-        
+
       }else if(ele.template && ele.example){
 
         //简单语法判断
@@ -689,7 +689,7 @@ export default {
       }
     },
 
-    
+
     addText(){
       this.inputVisible = true;
     },
@@ -894,7 +894,7 @@ export default {
           return this.checkFormulaLegal(formula);
         }
       }
-      
+
     },
 
     //检测公式合法
@@ -969,7 +969,7 @@ export default {
           });
         })
       }
-      
+
     },
 
     //把公式文本还原数组
@@ -1046,14 +1046,14 @@ export default {
         this.eleList = res.data.data;
       })
     },
-    
+
     //方法下面的点击树节点
     getNodeDetailComp(data) {
       if(this.pid){
         findNodeTableByCondition(data.id, this.pid, this.wbsid).then((res) => {
           if(res.data.data.length){
             this.eleTableListComp = res.data.data;
-  
+
             this.eleTableIdComp = this.eleTableListComp[0].id;
             this.getTableEleComp(this.eleTableIdComp);
           }else{
@@ -1066,7 +1066,7 @@ export default {
         selectByNodeTable(data.id).then((res)=>{
           if(res.data.data.length){
             this.eleTableListComp = res.data.data;
-  
+
             this.eleTableIdComp = this.eleTableListComp[0].id;
             this.getTableEleComp(this.eleTableIdComp);
           }else{
@@ -1128,13 +1128,13 @@ export default {
           message: "转成配置用的数组失败,"+error
         });
       }
-      
+
     },
 
     editorInit: function (editor) {
         console.log('editorInit')
         require('brace/ext/searchbox') //添加搜索功能
-        require('brace/ext/language_tools') //language extension prerequsite...             
+        require('brace/ext/language_tools') //language extension prerequsite...
         require('brace/mode/javascript')    //language
         require('brace/theme/github')
         require('brace/snippets/javascript') //snippet
@@ -1202,7 +1202,7 @@ export default {
 }
 .ele-box{
   border: 1px solid #bbb;
-  height: 26px;
+  //height: 26px;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -1222,3 +1222,13 @@ export default {
   margin-right: 10px;
 }
 </style>
+
+<style lang="scss">
+.basic-container.h-basic-full {
+  height: calc(100% - 30px);
+  overflow: auto;
+  .el-card, .el-card .el-card__body {
+    height: 100%;
+  }
+}
+</style>