风险措施制定人去重;设施环境布局微调

src/views/platform/risk/riskV2.vue

@@ -516,7 +516,8 @@ export default {
                         this.$message.success('提交成功')
                         // 提醒用户推送信息
                         if (addParams.paramWhere.length) {
-                            const ids = addParams.paramWhere.map(item => this.switchIdtoUserName(item.bian_zhi_ren_))
+                            // 对措施制定人去重处理
+                            const ids = [...new Set(addParams.paramWhere.map(item => this.switchIdtoUserName(item.bian_zhi_ren_)))]
                             this.$alert(`已向 ${ids.join(',')} ${ids.length}位措施制定人推送风险改进流程，同时向组长 ${this.infoFxssbData.zu_chang_} 推送风险报告流程！`, '提交成功', {
                                 confirmButtonText: '确定',
                                 callback: action => {

src/views/system/fasc/facilityEnvConfig.vue

@@ -459,15 +459,15 @@ export default {
                 bu_men_: '部门',
                 qu_yu_: '区域',
                 fang_jian_: '房间',
+                deviceno1_: '被控设备编号',
+                devicename1_: '被控设备名称',
+                deviceno2_: '监控设备编号',
                 jian_ce_zhou_qi_: '监测周期',
                 jian_ce_ri_qi_: '监测日期',
                 jian_ce_gang_wei_: '监测岗位',
                 kong_zhi_tiao_jia: '控制条件',
                 xiu_zheng_shi_du_: '湿度修正值',
-                xiu_zheng_wen_du_: '温度修正值',
-                deviceno1_: '被控设备编号',
-                devicename1_: '被控设备名称',
-                deviceno2_: '监控设备编号'
+                xiu_zheng_wen_du_: '温度修正值'
             },
             subIdList: [],
             isFirstDevice: true
@@ -640,7 +640,7 @@ export default {
                 const month = today.getMonth() + 1
                 const qu = this.getQuarter(today)
                 const nowM = quarterList[qu - 1][val - 1]
-                const nextM = quarterList[qu][val - 1]
+                const nextM = quarterList[qu % 4][val - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
                 const yearPJ = today.getFullYear()
@@ -662,7 +662,7 @@ export default {
                 const month = today.getMonth() + 1
                 const qu = month > 6 ? 2 : 1
                 const nowM = midList[qu - 1][val - 1]
-                const nextM = midList[qu][val - 1]
+                const nextM = midList[qu % 2][val - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
                 const yearPJ = today.getFullYear()

src/views/system/fasc/fecDialog.vue

@@ -43,25 +43,25 @@
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="房间：">
-                                <el-select v-model="form.fang_jian_" placeholder="请选择" size="mini" style="width:80%">
+                            <el-form-item label="区域：">
+                                <el-select v-model="form.qu_yu_" placeholder="请选择" size="mini" style="width:80%">
                                     <el-option
-                                        v-for="item in fangJianList"
+                                        v-for="item in quYuList"
                                         :key="item.id_"
-                                        :label="item.fang_jian_ming_ha"
-                                        :value="item.fang_jian_ming_ha"
+                                        :label="item.qu_yu_ming_cheng_"
+                                        :value="item.qu_yu_ming_cheng_"
                                     />
                                 </el-select>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="区域：">
-                                <el-select v-model="form.qu_yu_" placeholder="请选择" size="mini" style="width:80%">
+                            <el-form-item label="房间：">
+                                <el-select v-model="form.fang_jian_" placeholder="请选择" size="mini" style="width:80%">
                                     <el-option
-                                        v-for="item in quYuList"
+                                        v-for="item in fangJianList"
                                         :key="item.id_"
-                                        :label="item.qu_yu_ming_cheng_"
-                                        :value="item.qu_yu_ming_cheng_"
+                                        :label="item.fang_jian_ming_ha"
+                                        :value="item.fang_jian_ming_ha"
                                     />
                                 </el-select>
                             </el-form-item>
@@ -407,7 +407,7 @@ export default {
                 const month = today.getMonth() + 1
                 const qu = this.getQuarter(today)
                 const nowM = quarterList[qu - 1][val - 1]
-                const nextM = quarterList[qu][val - 1]
+                const nextM = quarterList[qu % 4][val - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
                 const yearPJ = today.getFullYear()
@@ -428,7 +428,7 @@ export default {
                 const month = today.getMonth() + 1
                 const qu = month > 6 ? 2 : 1
                 const nowM = midList[qu - 1][val - 1]
-                const nextM = midList[qu][val - 1]
+                const nextM = midList[qu % 2][val - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
                 const yearPJ = today.getFullYear()