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

设施环境和设备维护周期计算逻辑调整;设施环境总览页调整

luoaoxuan 1 год назад
Родитель
Сommit
9fd2422b65

+ 3 - 3
src/views/component/deviceSubtableDialog.vue

@@ -285,7 +285,7 @@ export default {
                 const month = today.getMonth() + 1
                 const qu = this.getQuarter(today)
                 const nowM = this.quarterList[qu - 1][turnVal - 1]
-                const nextM = this.quarterList[qu][turnVal - 1]
+                const nextM = this.quarterList[qu % 4][turnVal - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
                 const yearPJ = today.getFullYear()
@@ -302,10 +302,10 @@ export default {
                 const month = today.getMonth() + 1
                 const qu = month > 6 ? 2 : 1
                 const nowM = this.midList[qu - 1][turnVal - 1]
-                const nextM = this.midList[qu][turnVal - 1]
+                const nextM = this.midList[qu % 2][turnVal - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
-                const yearPJ = today.getFullYear()
+                const yearPJ = month >= nowM ? today.getFullYear() + 1 : today.getFullYear()
                 const monthPJ = endMonth > 9 ? endMonth : '0' + endMonth
 
                 this.periodMidYearDate = yearPJ + '-' + monthPJ + '-01'

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

@@ -103,7 +103,7 @@
                         </el-row>
                         <el-row v-if="form.zhou_qi_!==''">
                             <el-col :span="12">
-                                <el-form-item :label="labelShow">
+                                <el-form-item :label="labelShow" label-width="150">
                                     <el-checkbox-group v-if="form.zhou_qi_==='每日'" v-model="dayCheck">
                                         <el-checkbox :label="1">周一</el-checkbox>
                                         <el-checkbox :label="2">周二</el-checkbox>
@@ -158,7 +158,7 @@
 
                             </el-col>
                             <el-col v-if="nextDate" :span="12">
-                                <el-form-item label="下次监测日期为:">
+                                <el-form-item label="下次监测日期为:" label-width="150">
                                     <el-tag>{{ nextDate }}</el-tag>
                                 </el-form-item>
                             </el-col>
@@ -717,7 +717,7 @@ export default {
                 const nextM = midList[qu % 2][val - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
-                const yearPJ = today.getFullYear()
+                const yearPJ = month >= nowM ? today.getFullYear() + 1 : today.getFullYear()
                 const monthPJ = endMonth > 9 ? endMonth : '0' + endMonth
 
                 this.nextDate = yearPJ + '-' + monthPJ + '-01'

+ 1 - 1
src/views/system/fasc/fecDialog.vue

@@ -372,7 +372,7 @@ export default {
                 const nextM = midList[qu % 2][val - 1]
 
                 const endMonth = month >= nowM ? nextM : nowM
-                const yearPJ = today.getFullYear()
+                const yearPJ = month >= nowM ? today.getFullYear() + 1 : today.getFullYear()
                 const monthPJ = endMonth > 9 ? endMonth : '0' + endMonth
 
                 this.nextDate = yearPJ + '-' + monthPJ + '-01'

+ 1 - 2
src/views/system/fasc/index.vue

@@ -6,9 +6,8 @@
             :class="isComplete(card.children)?'completed' : 'incomplete'"
             class="fasc-card"
         >
-            <div slot="header" class="clearfix fasc-card-hearder">
+            <div slot="header" class="clearfix fasc-card-hearder" @click="goToDetailPage(card)">
                 <span>{{ card.facs_type.split('-')[1] }}</span>
-                <el-button size="medium" @click="goToDetailPage(card)">管理</el-button>
             </div>
 
             <el-collapse v-model="card.activeName" accordion>