Просмотр исходного кода

设施环境配置周期添加按需监测

shenqilong 10 месяцев назад
Родитель
Сommit
80f5661ee5

+ 3 - 2
src/views/system/fasc/defaultSettingDialog.vue

@@ -57,7 +57,7 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-row v-if="form.zhou_qi_!==''" :gutter="20">
+                    <el-row v-if="form.zhou_qi_!==''&& form.zhou_qi_ !== '按需'" :gutter="20">
                         <el-col :span="12">
                             <el-form-item :label="labelShow">
                                 <el-checkbox-group v-if="form.zhou_qi_==='每日'" v-model="dayCheck" style="width:100%">
@@ -243,7 +243,8 @@ export default {
                 { label: '季度监测', value: '每季度' },
                 { label: '半年监测', value: '每半年' },
                 { label: '年监测', value: '每年' },
-                { label: '按时间间隔监测', value: '间隔' }
+                { label: '按时间间隔监测', value: '间隔' },
+                { label: '按需监测', value: '按需' }
             ]
         }
     },

+ 2 - 2
src/views/system/fasc/facilityEnvConfig.vue

@@ -69,7 +69,7 @@
                                 <span class="label">监测周期:</span>
                                 <el-select v-model="search.zhouQi" placeholder="请选择" size="mini" :clearable="true">
                                     <el-option
-                                        v-for="item in ['每日','每周','每月','每季度','每半年','每年']"
+                                        v-for="item in ['每日','每周','每月','每季度','每半年','每年','按需']"
                                         :key="item"
                                         :label="item"
                                         :value="item"
@@ -770,7 +770,7 @@ export default {
                 if (item.bu_men_ === '') {
                     return this.$message.warning(`子表第${i + 1}行部门信息缺失!`)
                 }
-                if (item.jian_ce_ri_qi_ === '') {
+                if (item.jian_ce_ri_qi_ === '' && item.jian_ce_zhou_qi_ !== '按需') {
                     return this.$message.warning(`子表第${i + 1}行监测日期信息缺失!`)
                 }
                 if (item.jian_ce_gang_wei_ === '') {

+ 9 - 3
src/views/system/fasc/fecDialog.vue

@@ -202,7 +202,7 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-row v-if="form.jian_ce_zhou_qi_!==''">
+                    <el-row v-if="form.jian_ce_zhou_qi_!==''&&form.jian_ce_zhou_qi_!=='按需'">
                         <el-col :span="12">
                             <el-form-item :label="labelShow">
                                 <template slot="label">
@@ -378,7 +378,8 @@ export default {
                 { label: '季度监测', value: '每季度' },
                 { label: '半年监测', value: '每半年' },
                 { label: '年监测', value: '每年' },
-                { label: '按时间间隔监测', value: '间隔' }
+                { label: '按时间间隔监测', value: '间隔' },
+                { label: '按需监测', value: '按需' }
             ],
             config: {}
         }
@@ -627,6 +628,11 @@ export default {
                         this.form.jian_ce_ri_qi_ = ''
                         this.form.ri_qi_lie_biao_ = ''
                     }
+                    break
+                case '按需':
+
+                    this.form.jian_ce_ri_qi_ = '按需'
+
                     break
                 default:
                     break
@@ -636,7 +642,7 @@ export default {
             if (this.form.bu_men_ === '') {
                 throw new Error('部门信息缺失!')
             }
-            if (this.form.jian_ce_ri_qi_ === '') {
+            if (this.form.jian_ce_ri_qi_ === '' && this.form.jian_ce_zhou_qi_ !== '按需') {
                 throw new Error('监测日期信息缺失!')
             }
             if (this.form.jian_ce_gang_wei_ === '') {