Sfoglia il codice sorgente

公式配置,结构调换

duy 2 anni fa
parent
commit
a65691dfaa
2 ha cambiato i file con 321 aggiunte e 352 eliminazioni
  1. 20 20
      src/views/formula/edit.vue
  2. 301 332
      src/views/manager/projectinfo/tree.vue

+ 20 - 20
src/views/formula/edit.vue

@@ -183,16 +183,33 @@
             </formula-template>
           </template>
           <template v-else>
-            <div class="flex" style="height:calc(100vh - 460px)">
+            <div class="flex" style="height:calc(100vh - 460px);    justify-content: space-between;">
               <div class="flex flex-d-c">
                 <component ref="dynamiccomponent" v-bind:is="componentMap[item.name]" :formulainfo="item" :curele="equationSelectEle" :formulamap="formulaMap" @uncheck="unCheckEleComp" class="flex1"></component>
-                <div v-show="item.showSelectEle">
+                <div class="flex1" v-show="item.showSelectEle" style="margin-top:10px">
+                  <el-scrollbar style="height: 100%">
+                    <el-tree
+                      class="filter-tree"
+                      :data="treeData"
+                      :default-expanded-keys="defaultExpanded"
+                      @node-click="getNodeDetailComp"
+                      :props="defaultProps"
+                      :expand-on-click-node="false"
+                      highlight-current
+                      node-key="id"
+                      ref="tree"
+                    >
+                    </el-tree>
+                  </el-scrollbar>
+                </div>
+              </div>
+                 <div v-show="item.showSelectEle">
                   <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:100%">
                     <el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
                     <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
                   </el-select>
                   <div class="mg-t-10 mg-b-10 no-mb-col" style="width:900px">
-                    <el-scrollbar style="height: 210px;">
+                    <el-scrollbar style="height:430px;">
                       <el-row>
                         <el-col :span="6" v-for="item in eleListComp" :key="item.id">
                           <div class="ele-box">
@@ -205,23 +222,6 @@
                     </el-scrollbar>
                   </div>
                 </div>
-              </div>
-              <div class="flex1" v-show="item.showSelectEle">
-                <el-scrollbar style="height: 100%">
-                  <el-tree
-                    class="filter-tree"
-                    :data="treeData"
-                    :default-expanded-keys="defaultExpanded"
-                    @node-click="getNodeDetailComp"
-                    :props="defaultProps"
-                    :expand-on-click-node="false"
-                    highlight-current
-                    node-key="id"
-                    ref="tree"
-                  >
-                  </el-tree>
-                </el-scrollbar>
-              </div>
             </div>
           </template>
         </el-tab-pane>

File diff suppressed because it is too large
+ 301 - 332
src/views/manager/projectinfo/tree.vue


Some files were not shown because too many files changed in this diff