Răsfoiți Sursa

停机统计时间修改

wukai 4 zile în urmă
părinte
comite
180608e580
1 a modificat fișierele cu 12 adăugiri și 42 ștergeri
  1. 12 42
      src/views/calc/calcStop/index.vue

+ 12 - 42
src/views/calc/calcStop/index.vue

@@ -1,34 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <!--
-      <el-form-item label="设备号" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="停机类型" prop="stopType">
-        <el-select v-model="queryParams.stopType" placeholder="请选择" clearable style="width: 120px;">
-          <el-option
-            v-for="dict in stop_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      -->
-      <el-form-item label="日期" prop="daterangeTime">
+      <el-form-item label="日期" prop="time">
         <el-date-picker clearable
-          v-model="queryParams.daterangeTime"
-          type="datetimerange"
-          value-format="YYYY-MM-DD HH:mm"
-          time-format="HH:mm"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间">
+                        v-model="queryParams.dataDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -137,7 +115,7 @@
               </template>
             </el-table-column>
           </el-table>
-          
+
           <pagination
             v-show="total>0"
             :total="total"
@@ -147,7 +125,7 @@
           />
           <template #footer>
             <div class="dialog-footer" style="text-align: center;">
-              <el-button type="primary" @click="cancel">关 闭</el-button> 
+              <el-button type="primary" @click="cancel">关 闭</el-button>
             </div>
           </template>
      </el-dialog>
@@ -245,12 +223,12 @@ const data = reactive({
     pageNum: 1,
     pageSize: 15,
     deviceId: null,
-    daterangeTime:[ new Date(day).Format('yyyy-MM-dd')+' 00:00',new Date(day).Format('yyyy-MM-dd')+' 23:00'],
+    dataDate: new Date(new Date().getTime()-31*60*60*1000).Format('yyyy-MM-dd'),
     hour: null,
     sTime: null,
     eTime: null,
     calcStatus: null,
-    stopType: '',    
+    stopType: '',
   },
   rules: {
   }
@@ -259,7 +237,7 @@ const { stop_type } = proxy.useDict('stop_type');
 function getStopTypeName(v){
   for (let index = 0; index < stop_type.value.length; index++) {
     const element = stop_type.value[index];
-    if(element.value==v) return element.label;    
+    if(element.value==v) return element.label;
   }
   return '';
 }
@@ -274,10 +252,6 @@ function detailList(type){
 function getList() {
   loading.value = true;
   calcStopList.value=[];
-  if(queryParams.value.daterangeTime==null){
-    queryParams.value.daterangeTime = [new Date(day).Format('yyyy-MM-dd')+' 00:00',new Date(day).Format('yyyy-MM-dd')+' 23:00'];
-  }
-  queryParams.value['params']={"sTime":queryParams.value.daterangeTime[0]+':00',"eTime":queryParams.value.daterangeTime[1]+':00'}
   listCalcStop(queryParams.value).then(response => {
     loading.value = false;
     if(response.code!=200){
@@ -289,12 +263,8 @@ function getList() {
 }
 
 function getStat() {
-  loading.value = true; 
+  loading.value = true;
   calcStopStat.value=[];
-  if(queryParams.value.daterangeTime==null){
-    queryParams.value.daterangeTime = [new Date(day).Format('yyyy-MM-dd')+' 00:00',new Date(day).Format('yyyy-MM-dd')+' 23:00'];
-  }
-  queryParams.value['params']={"sTime":queryParams.value.daterangeTime[0]+':00',"eTime":queryParams.value.daterangeTime[1]+':00'}
   statCalcStop(queryParams.value).then(response => {
     loading.value = false;
     if(response.code!=0){
@@ -314,7 +284,7 @@ function handerBFChange(type){
   bfFilterStopType.value=type;
   calcBF2.value = calcBF.value.filter((row, index) => {
         if (type==null || row.type==type) {
-          return true; 
+          return true;
         }
         return false;
   });