Merge pull request '1' (#209) from pc-master into portal

Reviewed-on: #209

src/assets/css/main.css

@@ -146,6 +146,10 @@ textarea {
   cursor: pointer;
 }
 
+.el-collapse-item__header {
+  line-height: unset;
+}
+
 .collapse .el-collapse {
   border: none;
 }
@@ -276,7 +280,6 @@ textarea {
 
 .collapse.set-params .el-collapse-item__header .name {
   color: #A8B6C8;
-  white-space: nowrap;
 }
 
 .collapse.set-params .table-ul .table-li {

src/assets/css/main.scss

@@ -143,6 +143,9 @@ textarea{
         } 
     }
 }
+.el-collapse-item__header{
+    line-height: unset;
+}
 .collapse {
     .el-collapse {
         border: none;
@@ -285,7 +288,7 @@ textarea{
         .el-collapse-item__header {
             .name {
                 color: #A8B6C8;
-                white-space: nowrap;
+                // white-space: nowrap;
             }
 
         }

src/views/page/skylight.vue

@@ -49,6 +49,14 @@
           type="text" value="60" placeholder="60" />
         <span>分钟</span>
       </div>
+      <div class="input-main-80" style="width: auto;">
+        <span>卷膜关闭限制时间:</span>
+        <input @blur="blurChange('21667', $event)" v-model="inputData['21667']" @input="change('21667', $event)"
+          type="text" value="60" placeholder="60" />
+          <span>:</span>
+          <input @blur="blurChange('21668', $event)" v-model="inputData['21668']" @input="change('21668', $event)"
+          type="text" value="60" placeholder="60" />
+      </div>
     </div>
     <div class="flex-view  border-bottom">
       <div class="input-main border-right">