Browse Source

大屏参数设置,增加几个参数

dongjh 1 year ago
parent
commit
ea983ee54a

+ 34 - 7
src/views/modules_guAn/dashboardparam/DashParamModal.vue

@@ -52,19 +52,48 @@
         <a-form-model-item
         <a-form-model-item
           :labelCol="labelCol"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           :wrapperCol="wrapperCol"
-          prop="lognum"
+          prop="records"
           v-if="model.iflog=='Y'"
           v-if="model.iflog=='Y'"
           label="获取历史记录条数">
           label="获取历史记录条数">
-          <a-input-number placeholder="获取历史记录条数" v-model="model.lognum" />
+          <a-input-number placeholder="获取历史记录条数" v-model="model.records" />
         </a-form-model-item>
         </a-form-model-item>
 
 
         <a-form-model-item
         <a-form-model-item
           :labelCol="labelCol"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           :wrapperCol="wrapperCol"
-          prop="logduration"
+          prop="duration"
           v-if="model.iflog=='Y'"
           v-if="model.iflog=='Y'"
           label="获取历史记录时长(H)">
           label="获取历史记录时长(H)">
-          <a-input-number placeholder="获取历史记录时长(H)" v-model="model.logduration" />
+          <a-input-number placeholder="获取历史记录时长(H)" v-model="model.duration" />
+        </a-form-model-item>
+
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="intervals"
+          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-option value="M">分</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>
+
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="datatype"
+          v-if="model.iflog=='Y'"
+          label="数据型态">
+          <a-select placeholder="请选择数据型态" default-value="0" v-model="model.datatype">
+            <a-select-option value="0">最后值</a-select-option>
+            <a-select-option value="1">最小值</a-select-option>
+            <a-select-option value="2">最大值</a-select-option>
+            <a-select-option value="3">平均值</a-select-option>
+          </a-select>
         </a-form-model-item>
         </a-form-model-item>
 
 
       </a-form-model>
       </a-form-model>
@@ -98,8 +127,6 @@
         validatorRules: {
         validatorRules: {
           paramName:  [{required: true, message: '请输入大屏参数名称!'}],
           paramName:  [{required: true, message: '请输入大屏参数名称!'}],
           tagName:  [{required: true, message: '请输入webaccess点名!'}],
           tagName:  [{required: true, message: '请输入webaccess点名!'}],
-          lognum:  [{required: true, message: '请输入获取历史记录条数!'}],
-          // logduration:  [{required: true, message: '请输入获取历史记录时长(小时)!'}],
         },
         },
       }
       }
     },
     },
@@ -135,7 +162,7 @@
           if (valid) {
           if (valid) {
             that.confirmLoading = true;
             that.confirmLoading = true;
             if (this.model.iflog=='N') {
             if (this.model.iflog=='N') {
-              this.model.lognum=0;
+              this.model.records=0;
             }
             }
             let obj;
             let obj;
             if (!this.model.id) {
             if (!this.model.id) {

+ 2 - 2
src/views/modules_guAn/dashboardparam/index.vue

@@ -128,12 +128,12 @@
           {
           {
             title: '获取历史记录条数',
             title: '获取历史记录条数',
             align: "left",
             align: "left",
-            dataIndex: 'lognum',
+            dataIndex: 'records',
           },
           },
           {
           {
             title: '获取历史记录时长(H)',
             title: '获取历史记录时长(H)',
             align: "left",
             align: "left",
-            dataIndex: 'logduration',
+            dataIndex: 'duration',
           },
           },
           {
           {
             title: '操作',
             title: '操作',