zhaoyun 4 kuukautta sitten
vanhempi
commit
9ab57c29fd

+ 3 - 2
src/api/powerdistribution/vehicle-monitoring.js

@@ -28,9 +28,10 @@ export function vehicleDrivingRecordList(params) {
 }
 
 // 根据车辆编号查询作业信息
-export function selectWorkPlanByVchicleNo(vchicleNo) {
+export function selectWorkPlanByVchicleNo(params) {
   return request({
-    url: `/power/workPlan/selectWorkPlanByVchicleNo?vchicleNo=${vchicleNo}`,
+    url: `/power/workPlan/selectWorkPlanByVchicleNo`,
     method: "get",
+	params,
   });
 }

+ 65 - 3
src/views/distributionnetwork/vehicle-monitoring/components/DrivingRecord.vue

@@ -7,8 +7,40 @@
     @close="handleClose"
   >
     <div class="record-container">
-      <div class="mb20">车牌号:{{ vehicleInfo.vehicleNo }}</div>
-      <el-table :data="driveRecords" border style="width: 100%">
+			<el-form size="small" :inline="true">
+					<el-form-item label="车牌号" prop="vehicleNo">
+					  <el-input
+					    v-model="queryParams.vehicleNo"
+					    placeholder="车牌号"
+					  />
+					</el-form-item>
+					<el-form-item label="日期" prop="drivingDate">
+					  <el-date-picker
+					    v-model="queryParams.drivingDate"
+					    style="width: 240px; margin-right: 8px"
+					    type="daterange"
+					    range-separator="至"
+					    start-placeholder="开始日期"
+					    end-placeholder="结束日期"
+					    value-format="yyyy-MM-dd"
+					    :clearable="false"
+					  >
+					  </el-date-picker>
+					</el-form-item>
+					<el-form-item>
+					  <el-button
+					    type="primary"
+					    icon="el-icon-search"
+					    size="mini"
+					    @click="handleQuery"
+					    >搜索</el-button
+					  >
+					  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+					    >重置</el-button
+					  >
+					</el-form-item>
+			 </el-form>
+      <el-table :data="driveRecords" border style="width: 100%"  v-loading="loading">
         <el-table-column
           prop="vehicleNo"
           label="车牌号"
@@ -69,7 +101,7 @@
 
 <script>
 import { vehicleDrivingRecordList } from "@/api/powerdistribution/vehicle-monitoring";
-
+import moment from "moment";
 export default {
   name: "DrivingRecord",
   props: {
@@ -84,6 +116,7 @@ export default {
   },
   data() {
     return {
+	  loading: true,
       driveRecords: [],
       recordTotal: 0,
       queryParams: {
@@ -91,7 +124,12 @@ export default {
         pageSize: 10,
         vehicleNo: "",
         vehicleGroup: "",
+		drivingDate: [
+		  moment().endOf("day").format("YYYY-MM-DD"),
+		  moment().endOf("day").format("YYYY-MM-DD"),
+		],
       },
+	 
     };
   },
   watch: {
@@ -101,6 +139,9 @@ export default {
           pageNum: 1,
           pageSize: 10,
           vehicleNo: this.vehicleInfo.vehicleNo,
+		  drivingDate: [
+		   
+		  ],
           // vehicleGroup: this.vehicleInfo.vehicleGroup,
         };
         this.getList();
@@ -109,13 +150,34 @@ export default {
   },
   methods: {
     getList() {
+	  this.loading = true;
       vehicleDrivingRecordList({
         ...this.queryParams,
+		startTm: this.queryParams.drivingDate[0],
+		endTm: this.queryParams.drivingDate[1],
       }).then((response) => {
         this.driveRecords = response.rows || [];
         this.recordTotal = response.total;
+		this.loading=false;
       });
     },
+	/** 搜索按钮操作 */
+	handleQuery() {
+	  this.getList();
+	},
+	resetQuery() {
+	  this.queryParams = {
+	    pageNum: 1,
+	    pageSize: 10,
+		vehicleNo: this.vehicleInfo.vehicleNo,
+	    vehicleGroup: "",
+		drivingDate: [
+		 
+		],
+	  };
+	  this.resetForm("queryForm");
+	  this.handleQuery();
+	},
     handleClose() {
       this.$emit("update:visible", false);
     },

+ 86 - 4
src/views/distributionnetwork/vehicle-monitoring/components/WorkTrack.vue

@@ -7,8 +7,42 @@
     @close="handleClose"
   >
     <div class="track-container">
-      <div class="mb20">车牌号:{{ vehicleInfo.vehicleNo }}</div>
-      <el-table :data="trackList" border style="width: 100%">
+      <el-form size="small" :inline="true">
+      		<el-form-item label="车牌号" prop="vehicleNo">
+      		  <el-input
+      		    v-model="queryParams.vehicleNo"
+      		    placeholder="车牌号"
+      		  />
+      		</el-form-item>
+      		<el-form-item label="日期" prop="planDate">
+      		  <el-date-picker
+      		    v-model="queryParams.planDate"
+      		    style="width: 240px; margin-right: 8px"
+      		    type="daterange"
+      		    range-separator="至"
+      		    start-placeholder="开始日期"
+      		    end-placeholder="结束日期"
+      		    value-format="yyyy-MM-dd"
+      		    :clearable="false"
+      		  >
+      		  </el-date-picker>
+      		</el-form-item>
+      		<el-form-item>
+      		  <el-button
+      		    type="primary"
+      		    icon="el-icon-search"
+      		    size="mini"
+      		    @click="handleQuery"
+      		    >搜索</el-button
+      		  >
+      		  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+      		    >重置</el-button
+      		  >
+      		</el-form-item>
+       </el-form>
+			
+			<!--div class="mb20">车牌号:{{ vehicleInfo.vehicleNo }}</div-->
+      <el-table :data="trackList" border style="width: 100%" v-loading="loading">
         <el-table-column
           prop="weekPlanNo"
           label="周计划编号"
@@ -172,13 +206,20 @@
           width="100"
         ></el-table-column>
       </el-table>
+	  <pagination
+	    v-show="total > 0"
+	    :total="total"
+	    :page.sync="queryParams.pageNum"
+	    :limit.sync="queryParams.pageSize"
+	    @pagination="getTrackInfo"
+	  />
     </div>
   </el-dialog>
 </template>
 
 <script>
 import { selectWorkPlanByVchicleNo } from "@/api/powerdistribution/vehicle-monitoring";
-
+import moment from "moment";
 export default {
   name: "WorkTrack",
   props: {
@@ -193,14 +234,34 @@ export default {
   },
   data() {
     return {
+	 loading: true,
       trackList: [],
       total: 0,
+	  queryParams: {
+	    pageNum: 1,
+	    pageSize: 10,
+	    vehicleNo: "",
+	    vehicleGroup: "",
+	  		planDate: [
+	  		  moment().endOf("day").format("YYYY-MM-DD"),
+	  		  moment().endOf("day").format("YYYY-MM-DD"),
+	  		],
+	  },
       vehicleNo: "",
     };
   },
   watch: {
     visible(val) {
       if (val) {
+		  this.queryParams = {
+		    pageNum: 1,
+		    pageSize: 10,
+		    vehicleNo: this.vehicleInfo.vehicleNo,
+		    planDate: [
+		     
+		    ],
+		    // vehicleGroup: this.vehicleInfo.vehicleGroup,
+		  };
         this.vehicleNo = this.vehicleInfo.vehicleNo;
         this.getTrackInfo();
       }
@@ -208,11 +269,32 @@ export default {
   },
   methods: {
     getTrackInfo() {
-      selectWorkPlanByVchicleNo(this.vehicleNo).then((response) => {
+	  this.loading = true;
+      selectWorkPlanByVchicleNo({ ...this.queryParams,
+		startDate: this.queryParams.planDate[0],
+		endDate: this.queryParams.planDate[1],}).then((response) => {
         this.trackList = response.rows || [];
         this.total = response.total;
+		this.loading=false;
       });
     },
+	/** 搜索按钮操作 */
+	handleQuery() {
+	  this.getTrackInfo();
+	},
+	resetQuery() {
+	  this.queryParams = {
+	    pageNum: 1,
+	    pageSize: 10,
+		vehicleNo: this.vehicleInfo.vehicleNo,
+	    vehicleGroup: "",
+		planDate: [
+		 
+		],
+	  };
+	  this.resetForm("queryForm");
+	  this.handleQuery();
+	},
     handleClose() {
       this.$emit("update:visible", false);
     },

+ 25 - 16
src/views/distributionnetwork/vehicle-monitoring/index.vue

@@ -62,7 +62,7 @@
     </el-row>
     <div class="table">
       <el-table ref="renewalTable" v-loading="loading" :data="dataList">
-        <!-- <el-table-column prop="" label="序号" width="80" align="center">
+        <<el-table-column prop="" label="序号" width="80" align="center">
           <template slot-scope="scope">
             {{
               scope.$index +
@@ -70,14 +70,14 @@
               1
             }}
           </template>
-        </el-table-column> -->
-        <el-table-column
-          label="所属县区公司"
-          align="center"
-          prop="countyOrgNm"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
+		<el-table-column
+				  label="所属车组"
+				  prop="vehicleGroup"
+				  align="center"
+				  width="250"
+				>  </el-table-column>
+       
         <el-table-column
           label="项目负责人"
           align="center"
@@ -91,13 +91,8 @@
           :show-overflow-tooltip="true"
         >
         </el-table-column>
-        <el-table-column
-          label="所属车组"
-          prop="vehicleGroup"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
+       
+      
         <el-table-column
           label="设备号"
           prop="equipNo"
@@ -112,6 +107,13 @@
           :show-overflow-tooltip="true"
         >
         </el-table-column>
+		<el-table-column
+		  label="所属县区公司"
+		  align="center"
+		  prop="countyOrgNm"
+		  :show-overflow-tooltip="true"
+		>
+		</el-table-column>
         <el-table-column
           label="状态"
           prop="alarmDesc"
@@ -123,9 +125,16 @@
           label="创建时间"
           prop="createTime"
           align="center"
-          :show-overflow-tooltip="true"
+		    width="200"
         >
         </el-table-column>
+		<el-table-column
+		  label="最后更新时间"
+		  prop="updateTime"
+		  align="center"
+		   width="200"
+		>
+		</el-table-column>
         <el-table-column
           label="操作"
           align="center"