Merge remote-tracking branch 'origin/master'

src/views/modules_guAn/dashboardparam/DashParamModal.vue

@@ -74,11 +74,11 @@
           v-if="model.iflog=='Y'"
           label="每笔数据之间隔时间">
           <a-input-number placeholder="每笔数据之间隔时间" v-model="model.intervals" />
-          <a-select placeholder="请选择时间单位" default-value="M" v-model="model.intervaltype">
-            <a-select-option value="S">秒</a-select-option>
+          <a-select placeholder="请选择时间单位" default-value="M" style="width:100px;" v-model="model.intervaltype">
+            <!-- <a-select-option value="S">秒</a-select-option> -->
             <a-select-option value="M">分</a-select-option>
-            <a-select-option value="H">时</a-select-option>
-            <a-select-option value="D">日</a-select-option>
+            <!-- <a-select-option value="H">时</a-select-option>
+            <a-select-option value="D">日</a-select-option> -->
           </a-select>
         </a-form-model-item>