数据组添加周期

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -103,7 +103,7 @@
     <el-dialog
         :title="groupDialogTitle"
         class="group-dialog"
-        width="450px"
+        width="600px"
         center
         v-dialog-drag
         v-if="groupDialogVisible"
@@ -154,11 +154,11 @@
           </div>
         </el-tab-pane>
         <el-tab-pane name="rate-setting">
-          <div slot="label">频率设置</div>
+          <div slot="label">采样设置</div>
           <div class="cy-form">
             <el-form ref="groupRateForm" :label-position="labelPosition" :model='groupRateForm' :rules="groupRateRules" label-width='100px'>
-              <el-form-item label='读取模式' prop="readMode">
-                <el-select v-model="groupRateForm.readMode" placeholder="请选择读取模式" style="width: 100%;" @change="readModeChange">
+              <el-form-item label='记录模式' prop="readMode">
+                <el-select v-model="groupRateForm.readMode" placeholder="请选择记录模式" style="width: 100%;" @change="readModeChange">
                   <el-option
                       v-for="dict in readModeList"
                       :key="dict.value"
@@ -181,7 +181,18 @@
                   </template>
                 </el-input>
               </el-form-item>
-              <el-form-item label='读取时期' prop="valuePeriod">
+              <el-form-item label='日期设置' prop="daySetting">
+                <el-checkbox-group v-model="groupRateForm.daySetting">
+                  <el-checkbox name="daySetting" label="1">周一</el-checkbox>
+                  <el-checkbox name="daySetting" label="2">周二</el-checkbox>
+                  <el-checkbox name="daySetting" label="3">周三</el-checkbox>
+                  <el-checkbox name="daySetting" label="4">周四</el-checkbox>
+                  <el-checkbox name="daySetting" label="5">周五</el-checkbox>
+                  <el-checkbox name="daySetting" label="6">周六</el-checkbox>
+                  <el-checkbox name="daySetting" label="0">周日</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+              <el-form-item label='记录周期' prop="valuePeriod">
                 <el-time-picker
                     style="width: 100%;"
                     is-range
@@ -569,7 +580,7 @@ export default {
         'key': '时',
         'value': '3'
       }],
-      // 读取模式
+      // 记录模式
       readModeList: [{
         'key': '按周期读取数据',
         'value': '0'
@@ -611,6 +622,7 @@ export default {
         readMode: null,
         modeValue: '',
         modeValueUnit: '1',
+        daySetting: [],
         valuePeriod: ['00:00:00', '23:59:59']
       },
       updateGroupData: null,
@@ -623,13 +635,16 @@ export default {
       },
       groupRateRules: {
         readMode: [
-          { required: true, message: '请选择读取模式', trigger: 'blur' }
+          { required: true, message: '请选择记录模式', trigger: 'blur' }
         ],
         modeValue: [
           { validator: this.testModeValue }
         ],
+        daySetting: [
+          { type: 'array', required: true, message: '请至少选择一个日期设置', trigger: 'change' }
+        ],
         valuePeriod: [
-          { required: true, message: '请选择读取时期', trigger: 'blur' }
+          { required: true, message: '请选择记录周期', trigger: 'blur' }
         ]
       },
       // 驱动数据返回类型：0 通用 1 WINCC
@@ -951,6 +966,7 @@ export default {
         readMode: null,
         modeValue: '',
         modeValueUnit: '1',
+        daySetting: [],
         valuePeriod: ['00:00:00', '23:59:59']
       }
       this.modeValueTips = '模式值'
@@ -978,6 +994,7 @@ export default {
           }
           params.startReadTime = this.groupRateForm.valuePeriod[0]
           params.endReadTime = this.groupRateForm.valuePeriod[1]
+          params.readWeek = this.groupRateForm.daySetting.join()
           if (params.id) {
             this.addGroupItem(params, '修改')
           } else {
@@ -1100,6 +1117,7 @@ export default {
           this.groupRateForm.modeValue = item.modeValue
         }
         this.groupRateForm.valuePeriod = [item.startReadTime, item.endReadTime]
+        this.groupRateForm.daySetting = item.readWeek.split(',')
         switch (this.groupRateForm.readMode) {
           case '0':
             this.modeValueTips = '周期值'
@@ -1327,11 +1345,11 @@ export default {
         this.updateGroupItem()
       }
     },
-    /** 读取模式值单位改变事件 */
+    /** 记录模式值单位改变事件 */
     readModeValueUnitChange(val) {
       console.log(val + ', ' + this.groupRateForm.modeValueUnit)
     },
-    /** 读取模式值改变事件 */
+    /** 记录模式值改变事件 */
     readModeChange(val) {
       this.groupRateForm.readMode = val
       switch (val) {
@@ -1351,7 +1369,7 @@ export default {
         showAlertWin(this, e)
       })
     },
-    /** 查询字典表：读取模式 */
+    /** 查询字典表：记录模式 */
     getReadMode() {
       getDictByKey({
         'keyType': 'read_policy'
@@ -1427,14 +1445,14 @@ export default {
       }
       if (!this.groupRateForm.readMode) {
         this.$message({
-          message: '频率设置中读取模式不能为空！',
+          message: '采样设置中记录模式不能为空！',
           type: 'warning'
         })
         return false
       }
       if (this.groupRateForm.readMode != '1' && !this.groupRateForm.modeValue) {
         this.$message({
-          message: '频率设置中' + this.modeValueTips + '不能为空！',
+          message: '采样设置中' + this.modeValueTips + '不能为空！',
           type: 'warning'
         })
         return false
@@ -1443,7 +1461,7 @@ export default {
         let regNum = /^[1-9]\d*$/
         if (!regNum.test(this.groupRateForm.modeValue)) {
           this.$message({
-            message: '频率设置中周期值只能为正整数！',
+            message: '采样设置中周期值只能为正整数！',
             type: 'warning'
           })
           return false
@@ -1452,19 +1470,19 @@ export default {
         let regNum = /^(\-)?\d+(\.\d{1,2})?$/
         if (!regNum.test(this.groupRateForm.modeValue)) {
           this.$message({
-            message: '频率设置中阈值不合法！',
+            message: '采样设置中阈值不合法！',
             type: 'warning'
           })
           return false
         }
       }
-      // if (parseFloat(this.groupRateForm.modeValue) <= 0) {
-      //   this.$message({
-      //     message: '频率设置中读取模式值必须大于0！',
-      //     type: 'warning'
-      //   })
-      //   return false
-      // }
+      if (this.groupRateForm.daySetting.length == 0) {
+        this.$message({
+          message: '请至少选择一项日期设置！',
+          type: 'warning'
+        })
+        return false
+      }
       if (!this.groupBasicForm.dataSourceId) {
         this.$message({
           message: '请选择数据源！',