4
0

2 Commitit cbeeb1f875 ... 6a7f26a59b

Tekijä SHA1 Viesti Päivämäärä
  gongyb 6a7f26a59b Merge remote-tracking branch 'origin/master' 4 vuotta sitten
  gongyb 486109c37d 样本自定义搜素 样本来源自定义搜索 样式bug修改 4 vuotta sitten

+ 10 - 9
src/dashoo.cn/frontend_animal/src/components/samples/samplesearchdialog.vue

@@ -4,19 +4,20 @@
              width="90%"
              :before-close="beforeClose"
              :close-on-click-modal="false">
-    <el-row class="inputrow">
-      <el-col :span="4">
-         <el-row style="height:100%">
-        <el-tabs type="border-card">
+    <el-row class="inputrow" type="flex">
+      <el-col :span="4"  >
+
+        <el-row style="height:100%">
+        <el-tabs type="border-card" style="height:100%">
           <el-tab-pane label="基础字段"
-                       style="height:69vh">
+                       style="height:100%">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data1"
                        @node-click="handleNodeClick"></el-tree>
             </div>
           </el-tab-pane>
           <el-tab-pane label="扩展字段"
-                       style="height:69vh">
+                       style="height:100%">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data3"
                        @node-click="handleNodeClicKuoZhan"></el-tree>
@@ -24,14 +25,14 @@
 
           </el-tab-pane>
           <el-tab-pane label="样本来源基础字段"
-                       style="height:69vh">
+                       style="height:100%">
             <div :style="{'width':'100%','height': '100%','overflow':'auto'}">
               <el-tree :data="data2"
                        @node-click="handleNodeClickSource"></el-tree>
             </div>
           </el-tab-pane>
           <el-tab-pane label="样本来源扩展字段"
-                       style="height:69vh">
+                       style="height:100%">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data"
                        @node-click="handleNodeClicKuoZhanSource"></el-tree>
@@ -49,7 +50,7 @@
          </el-row>
 
       </el-col>
-      <el-col :span="18">
+      <el-col :span="18" type="flex" justify="space-bwteen">
         <el-row style="margin-bottom:20px;">
           <el-col :span="24">
             <el-card>

+ 4 - 4
src/dashoo.cn/frontend_animal/src/components/samples/samplesourcesearchdialog.vue

@@ -4,19 +4,19 @@
              width="90%"
              :before-close="beforeClose"
              :close-on-click-modal="false">
-    <el-row class="inputrow">
+    <el-row class="inputrow" type="flex">
       <el-col :span="4">
         <!-- <el-row> -->
-        <el-tabs type="border-card">
+        <el-tabs type="border-card" style="height:100%">
           <el-tab-pane label="基础字段"
-                       style="height:69vh">
+                       style="height:100%">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data1"
                        @node-click="handleNodeClick"></el-tree>
             </div>
           </el-tab-pane>
           <el-tab-pane label="扩展字段"
-                       style="height:69vh">
+                       style="height:100%">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data"
                        @node-click="handleNodeClicKuoZhan"></el-tree>