3-10

src/views/BorderBenchmark/YardBenchmark.vue

@@ -25,6 +25,7 @@
               <el-date-picker
                 v-model="beginDate"
                 type="date"
+                value-format="yyyy-MM-dd"
                 placeholder="选择日期"
               >
               </el-date-picker>
@@ -32,6 +33,7 @@
 
             <el-form-item label="结束时间">
               <el-date-picker
+              value-format="yyyy-MM-dd"
                 v-model="endDate"
                 type="date"
                 placeholder="选择日期"
@@ -114,6 +116,7 @@
               :formatter="filter_date"
               prop="recordDate"
               label="日期"
+              value-format="yyyy-MM-dd"
               width="80"
             >
             </el-table-column>

src/views/NormRanking/GoodnessfitRank.vue

@@ -20,6 +20,7 @@
               <el-date-picker
                 v-model="beginDate"
                 type="date"
+                value-format="yyyy-MM-dd"
                 placeholder="选择日期"
               >
               </el-date-picker>
@@ -29,6 +30,7 @@
               <el-date-picker
                 v-model="endDate"
                 type="date"
+                value-format="yyyy-MM-dd"
                 placeholder="选择日期"
               >
               </el-date-picker>
@@ -87,6 +89,7 @@
               sortable
               prop="beginDate"
               :formatter="filter_bdate"
+              value-format="yyyy-MM-dd"
               label="起始时间"
               width="280"
             >
@@ -95,6 +98,7 @@
               sortable
               prop="engDate"
               :formatter="filter_edate"
+              value-format="yyyy-MM-dd"
               label="截至日期"
               width="180"
             >

src/views/Performance/NewPerformanceList.vue

@@ -55,6 +55,7 @@
             <el-form-item label="开始时间">
               <el-date-picker
                 v-model="beginDate"
+                value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期"
               >
@@ -64,6 +65,7 @@
             <el-form-item label="结束时间">
               <el-date-picker
                 v-model="endDate"
+                value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期"
               >

src/views/Performance/PerformanceList.vue

@@ -55,6 +55,7 @@
             <el-form-item label="开始时间">
               <el-date-picker
                 v-model="beginDate"
+                value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期"
               >
@@ -64,6 +65,7 @@
             <el-form-item label="结束时间">
               <el-date-picker
                 v-model="endDate"
+                value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期"
               >

src/views/ProjectBenchmark/ProjectBenchmark.vue

@@ -83,7 +83,7 @@
             width="70"
           >
           </el-table-column>
-          <el-table-column sortable prop="fdl" label="发电量" width="90">
+          <el-table-column sortable prop="fdl" :formatter="filter_fdl" label="发电量" width="90">
           </el-table-column>
           <el-table-column
             sortable
@@ -301,7 +301,7 @@
         <div class="box">
           <div
             id="chartHistogram"
-            style="width: 90%; height: 300px; margin: auto"
+            style="width: 90%; height: 300px; margin-bottom:33px;"
           ></div>
         </div>
       </el-row>
@@ -474,6 +474,9 @@ export default {
         return;
       }
     },
+    filter_fdl(cellValue){
+             return parseFloat(cellValue.fdl).toFixed(2);
+    },
     checkproject() {
       if (this.formInline.project == "") {
         this.$message.error("请选择项目！");

src/views/PropertyBenchnark/SingleTransverseBenchmark.vue

@@ -49,6 +49,7 @@
                 <el-form-item label="日期">
                   <el-date-picker
                     v-model="Date1"
+                    value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期"
                   >
@@ -204,6 +205,7 @@
                 <el-form-item label="日期">
                   <el-date-picker
                     v-model="Date1"
+                    value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期"
                   >
@@ -351,6 +353,7 @@
                 <el-form-item label="日期">
                   <el-date-picker
                     v-model="Date1"
+                    value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期"
                   >

src/views/gradeEvaluation/GradeEvaluation.vue

@@ -13,7 +13,7 @@
 						</div>
 						<div class="block" style="width:20%;float: left;">
 							<span>日期</span>
-							<el-date-picker v-model="value1" type="date" placeholder="选择日期" style="margin-left: 5%;">
+							<el-date-picker v-model="value1" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="margin-left: 5%;">
 							</el-date-picker>
 						</div>
 						<div style="width: 2%; float:left;margin-left: 10%;">