Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx into mw

# Conflicts:
#	src/views/report/fdczzdy.vue
#	src/views/report/fdxmzdy.vue
#	src/views/report/gfczzdy.vue
#	src/views/report/gfxmzdy.vue

src/views/layout/Menu.vue

@@ -336,23 +336,23 @@ export default {
               icon: "svg-qxfx",
               path: "/decision/fs",
             },
-            {
-              text: "电量预测",
-              icon: "svg-dlyc",
-              path: "/decision/nhycfsdl",
-              children: [
-                {
-                  text: "预测拟合风速电量",
-                  icon: "svg-wind-sitenhycfsdl",
-                  path: "/decision/nhycfsdl",
-                },
-                {
-                  text: "修正预测风速电量",
-                  icon: "svg-wind-site",
-                  path: "/decision/xzycfsdl",
-                },
-              ],
-            },
+            // {
+            //   text: "电量预测",
+            //   icon: "svg-dlyc",
+            //   path: "/decision/nhycfsdl",
+            //   children: [
+            //     {
+            //       text: "预测拟合风速电量",
+            //       icon: "svg-wind-sitenhycfsdl",
+            //       path: "/decision/nhycfsdl",
+            //     },
+            //     {
+            //       text: "修正预测风速电量",
+            //       icon: "svg-wind-site",
+            //       path: "/decision/xzycfsdl",
+            //     },
+            //   ],
+            // },
             // {
             //   text: "单机分析",
             //   icon: "svg-wind-site",
@@ -526,11 +526,11 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/kkxfx/malfunctionStatistics",
                 },
-                {
-                  text: "部件评判分析",
-                  icon: "svg-wind-site",
-                  path: "/health/kkxfx/bjgltjb",
-                },
+                // {
+                //   text: "部件评判分析",
+                //   icon: "svg-wind-site",
+                //   path: "/health/kkxfx/bjgltjb",
+                // },
               ],
             },
             {
@@ -748,11 +748,11 @@ export default {
                   icon: "svg-matrix",
                   path: "/others/tjfx",
                 },
-                {
-                  text: "表底值查询",
-                  icon: "svg-matrix",
-                  path: "/others/bdzcx",
-                },
+                // {
+                //   text: "表底值查询",
+                //   icon: "svg-matrix",
+                //   path: "/others/bdzcx",
+                // },
               ],
             },
             // {

src/views/report/fdczzdy.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$KUOIX7IQO6X6I4CUDE5J0JUCDDUVZPCP.rptolap"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
     }
   }
 }

src/views/report/fdxmzdy.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$KUOIX7IQO6X6I4CUDE5J0JUCDDUVZPCP.rptolap"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
     }
   }
 }

src/views/report/gfczzdy.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
     }
   }
 }

src/views/report/gfxmzdy.vue

@@ -11,7 +11,7 @@
 export default {
   data(){
     return {
-      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap"
+      url: "http://10.155.32.4:8000/bi47/showreport.do?resid=EBI$12$0C375MRT9PPPNMNCCTULLVQINXCND95K$1$LDBDTULZIVZV1WQD163KP6ICTCDUT99L.rptolap&id=admin&pw=admin"
     }
   }
 }

src/views/singleAnalysis/index.vue

@@ -25,8 +25,8 @@
           <div class="search-input">
             <el-date-picker
               v-model="recorddate"
-              type="date"
-              value-format="YYYY-MM-DD"
+              type="month"
+              value-format="YYYY-MM"
               placeholder="选择日期"
               popper-class="date-select"
             >
@@ -89,7 +89,7 @@ export default {
       year: "",
       month: "",
       recorddate: new Date(new Date().getTime() - 3600 * 1000 * 24).formatDate(
-        "yyyy-MM-dd"
+        "yyyy-MM"
       ),
       tableDataEnd: [], //合计
       tableData: {