Merge remote-tracking branch 'origin/master'

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -145,6 +145,16 @@
                   <template slot="append" v-if="groupRateForm.readMode == '2'">秒</template>
                 </el-input>
               </el-form-item>
+              <el-form-item label='取值模式' prop="valueMode">
+                <el-select v-model="groupRateForm.valueMode" placeholder="请选择取值模式" style="width: 100%;">
+                  <el-option
+                      v-for="dict in valueModeList"
+                      :key="dict.value"
+                      :label="dict.key"
+                      :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
             </el-form>
           </div>
         </el-tab-pane>
@@ -354,6 +364,19 @@ export default {
         'key': '频率',
         'value': '2'
       }],
+      valueModeList: [{
+        'key': '平均值',
+        'value': '0'
+      }, {
+        'key': '最大值',
+        'value': '1'
+      }, {
+        'key': '最小值',
+        'value': '2'
+      }, {
+        'key': '瞬时值',
+        'value': '3'
+      }],
       // 数据源
       dataSourceList: [],
       // 数据项
@@ -373,7 +396,8 @@ export default {
       },
       groupRateForm: {
         readMode: null,
-        modeValue: ''
+        modeValue: '',
+        valueMode: ''
       },
       updateGroupData: null,
       tempItemList: [],
@@ -561,7 +585,8 @@ export default {
       }
       this.groupRateForm = {
         readMode: null,
-        modeValue: ''
+        modeValue: '',
+        valueMode: ''
       }
       this.chooseItemDataView = false
       this.getDataSourceList()
@@ -575,6 +600,7 @@ export default {
           let params = JSON.parse(JSON.stringify(this.groupBasicForm))
           params.readMode = this.groupRateForm.readMode
           params.modeValue = this.groupRateForm.modeValue
+          params.valueCondition = this.groupRateForm.valueMode
           if (params.id) {
             this.addGroupItem(params, '修改')
           } else {
@@ -637,6 +663,7 @@ export default {
         this.chooseItemDataView = true
         this.groupRateForm.readMode = item.readMode + ''
         this.groupRateForm.modeValue = item.modeValue
+        this.groupRateForm.valueMode = item.valueCondition
       }).catch((e) => {
       })
     },
@@ -787,6 +814,13 @@ export default {
         })
         return false
       }
+      if (!this.groupRateForm.valueMode) {
+        this.$message({
+          message: '频率设置中取值模式不能为空！',
+          type: 'warning'
+        })
+        return false
+      }
       if (!this.groupBasicForm.dataSourceId) {
         this.$message({
           message: '请选择数据源！',