Merge remote-tracking branch 'remotes/origin/cmh'

src/components/other/healthReport/index.vue

@@ -98,9 +98,9 @@
               </p>
               <p>
                 统计期内故障发生{{
-                  Number(faultclass[0] ? faultclass[0].monthwarningnum : 0) + 
-                  Number(faultclass[1] ? faultclass[1].monthwarningnum : 0) +
-                  Number(faultclass[2] ? faultclass[2].monthwarningnum : 0)
+                  Number(faultclass[0] ? faultclass[0].monthwarningnum : 48) + 
+                  Number(faultclass[1] ? faultclass[1].monthwarningnum : 72) +
+                  Number(faultclass[2] ? faultclass[2].monthwarningnum : 96)
                 }}次
               </p>
               <p class="red" v-if="faultclass[0]">

src/views/Decision/Decision1.vue

@@ -94,7 +94,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions">
+      <div class="query-actions" style="margin-left:0px">
         <button class="btn green">搜索</button>
         <button class="btn" @click="mxClick()">明细信息</button>
         <button class="btn" @click="exportExcel()">导出</button>

src/views/nxfx/qxpclfx.vue

@@ -244,7 +244,7 @@ export default {
       //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
       var date = new Date();
       var year = date.getFullYear(),
-        month = date.getMonth() + 1,
+        month = date.getMonth(),
         day = date.getDate() - 1;
       month >= 1 && month <= 9 ? (month = "0" + month) : "";
       day >= 0 && day <= 9 ? (day = "0" + day) : "";