Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/components/360View/commonForm/threeVision.vue

@@ -518,7 +518,7 @@
                 <div class="Lline">L</div>
                 <div class="Lline-os">R</div>
               </div>
-              <div v-else-if="scope.row.name === 'TITMUS(近)'" class="flex">
+              <div v-else-if="scope.row.name === 'TITMUS(近)'" class="flex" style="align-items: center">
                 <span>TITMUS(近):</span>
                 <el-select v-model="dataForm.titmus" placeholder="" filterable allow-create clearable style="display: inline-block;width: 95px;margin-left: 8px">
                   <el-option
@@ -1394,6 +1394,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+#operation-record {
+  height: 100%;
+  overflow: auto;
+}
 .flex{
   display: flex;
 }
@@ -1439,16 +1443,17 @@ export default {
 #threeFunc{
   ::v-deep .el-input__inner {
     border: none;
+    height: 36px !important;
     line-height: 26px !important;
     text-align: center;
     border-bottom: 1px solid #ccc;
     border-radius: 0;
     padding: 0;
   }
-  .el-textarea__inner{
+  ::v-deep .el-textarea__inner{
     border: none;
   }
-  .el-input__prefix {
+  ::v-deep .el-input__prefix {
     display: none;
   }
   .center {
@@ -1635,12 +1640,6 @@ export default {
     font-weight: 400;
   }
 }
-
-::v-deep .el-input-group__append, ::v-deep .el-input-group__prepend{
-  border: none;
-  padding: 0 5px !important;
-}
-
 #threeFunc{
   .operation-record-table{
     ::v-deep .el-input__inner {
@@ -1650,6 +1649,11 @@ export default {
       border-radius: 0;
     }
   }
+  ::v-deep .el-input-group__append, ::v-deep .el-input-group__prepend{
+    border: none;
+    background-color: transparent;
+    padding: 0 5px !important;
+  }
   ::v-deep .el-table__cell{
     padding: 3px 0 !important;
   }
@@ -1689,29 +1693,29 @@ export default {
     }
     ::v-deep .el-table tr{
       td:nth-child(1) {
-        border-right: 1px solid #212020;
+        //border-right: 1px solid #212020;
       }
       td:nth-child(2) {
-        border-right: 1px solid #212020;
+        //border-right: 1px solid #212020;
       }
 
     }
     ::v-deep .el-table tbody {
-      tr:nth-child(2) {
-        td{
-          border-bottom: 1px solid #212020;
-        }
-      }
-      tr:nth-child(4) {
-        td{
-          border-bottom: 1px solid #212020;
-        }
-      }
-      tr:nth-child(6) {
+      tr {
         td{
           border-bottom: 1px solid #212020;
         }
       }
+      //tr:nth-child(4) {
+      //  td{
+      //    border-bottom: 1px solid #212020;
+      //  }
+      //}
+      //tr:nth-child(6) {
+      //  td{
+      //    border-bottom: 1px solid #212020;
+      //  }
+      //}
     }
 
   }