1

src/views/distributionnetwork/vehicle-monitoring/components/DrivingRecord.vue

@@ -139,9 +139,8 @@ export default {
           pageNum: 1,
           pageSize: 10,
           vehicleNo: this.vehicleInfo.vehicleNo,
-		  drivingDate: [
-		   
-		  ],
+		  drivingDate: [this.vehicleInfo.eventStartDate,this.vehicleInfo.occurDate],
+	      //drivingDate: this.vehicleInfo.monitorDate
           // vehicleGroup: this.vehicleInfo.vehicleGroup,
         };
         this.getList();

src/views/distributionnetwork/vehicle-monitoring/components/WorkTrack.vue

@@ -258,7 +258,7 @@ export default {
 		    pageSize: 10,
 		    vehicleNo: this.vehicleInfo.vehicleNo,
 		    planDate: [
-		     
+		      this.vehicleInfo.eventStartDate,this.vehicleInfo.occurDate
 		    ],
 		    // vehicleGroup: this.vehicleInfo.vehicleGroup,
 		  };

src/views/distributionnetwork/vehicle-monitoring/long-term-inactivity/index.vue

@@ -0,0 +1,284 @@
+<template>
+  <div class="app-container scroll-auto">
+    <el-form
+      ref="queryForm"
+      :model="queryParams"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <!--el-form-item label="区县公司" prop="countyOrgNm">
+        <el-input
+          v-model="queryParams.countyOrgNm"
+          placeholder="请输入区县公司"
+		  clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目负责人" prop="curator">
+        <el-input
+          v-model="queryParams.curator"
+          placeholder="请输入项目负责人"
+		  clearable
+        /-->
+      </el-form-item>
+      <el-form-item label="车牌号" prop="vehicleNo">
+        <el-input v-model="queryParams.vehicleNo" clearable placeholder="请输入车牌号" />
+      </el-form-item>
+      <el-form-item label="车组" prop="vehicleGroup">
+        <el-input v-model="queryParams.vehicleGroup" clearable placeholder="请输入车组" />
+      </el-form-item>
+	   <el-form-item label="日期" prop="monitorDate">
+	     <el-date-picker
+	       v-model="queryParams.monitorDate"
+	       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="table">
+      <el-table ref="renewalTable" border style="width: 100%" :header-cell-style="{fontSize: '12px', backgroundColor: '#f8f8f8',color:'#333',fontWeight: 'bold'}" v-loading="loading" :data="dataList">
+        <<el-table-column prop="" label="序号" width="80" align="center">
+          <template slot-scope="scope">
+            {{
+              scope.$index +
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              1
+            }}
+          </template>
+        </el-table-column>
+		<el-table-column
+				  label="所属车组"
+				  prop="vehicleGroup"
+				  align="center"
+				>  </el-table-column>
+       
+        
+        <el-table-column
+          label="车牌号"
+          prop="vehicleNo"
+          align="center"
+        >
+        </el-table-column>
+       
+      
+        <el-table-column
+          prop="occurDate"
+          label="发生时间"
+          align="center"
+                 
+        />
+        <el-table-column
+          label="最新状态"
+          prop="alarmDesc"
+          align="center"
+        >
+		<template slot-scope="scope" >
+				<el-tag type="danger"  v-if="scope.row.alarmCd!='0'" effect="text">{{scope.row.alarmDesc}}</el-tag>
+				<el-tag type="success" v-else>{{scope.row.alarmDesc}}</el-tag>
+		</template>
+        </el-table-column>
+		<el-table-column
+		  prop="remark"
+		  label="备注"
+		  align="center"
+		         
+		/>
+        <el-table-column
+          label="更新时间"
+          prop="createTime"
+          align="center"
+        >
+        </el-table-column>
+		
+        <el-table-column
+          label="操作"
+          align="center"
+          width="250"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-document"
+              @click="handleRecord(scope.row)"
+              >监控明细</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        class="page-box"
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    
+
+    <driving-record
+      :visible.sync="recordDialogVisible"
+      :vehicle-info="currentVehicle"
+    />
+  </div>
+</template>
+
+<script>
+
+import {
+  listVehicleAlarmHist
+} from "@/api/powerdistribution/vehicle-monitoring";
+import DrivingRecord from "./../components/DrivingRecord.vue";
+
+export default {
+  components: {
+   
+    DrivingRecord
+  },
+  data() {
+    return {
+      dataList: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 遮罩层
+      loading: true,
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        countyOrgNm: "", // 区县公司
+        curator: "", // 项目负责人
+        vehicleNo: "", // 车牌号
+		alarmCd: "2",
+        vehicleGroup: "", // 车组
+		monitorDate: [
+		 
+		],
+      },
+      
+   
+      // 行驶记录相关
+      recordDialogVisible: false,
+	  
+	  
+      // 当前选中的车辆信息
+      currentVehicle: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      listVehicleAlarmHist({ ...this.queryParams,
+	   startDate: this.queryParams.monitorDate[0],
+	   endDate: this.queryParams.monitorDate[1]
+	   }).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        countyOrgNm: "",
+        curator: "",
+        vehicleNo: "",
+        vehicleGroup: "",
+		alarmCd: "2",
+		monitorDate: [
+		 
+		],
+      };
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  
+   
+    /** 查看行驶记录 */
+    handleRecord(row) {
+      this.currentVehicle =row;
+      this.recordDialogVisible = true;
+    },
+	
+  },
+};
+</script>
+<style lang="scss" scoped>
+.table {
+  height: calc(100% - 150px);
+}
+::v-deep {
+  .el-table {
+    height: 100%;
+    width: 100%;
+    .el-table__body-wrapper {
+      width: 100% !important;
+      height: calc(100% - 50px) !important; // 表格高度减去表头的高度
+      overflow-y: scroll;
+    }
+  }
+  .el-form--inline .el-form-item {
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+  // 上传按钮样式调整
+  .el-upload {
+    display: inline-block;
+  }
+  .el-button--text {
+    padding: 0 8px;
+  }
+}
+
+.track-container {
+  min-height: 400px;
+  // 添加地图容器的样式
+}
+
+.record-container {
+  min-height: 400px;
+  padding: 20px;
+
+  .mb20 {
+    margin-bottom: 20px;
+  }
+
+  ::v-deep {
+    .el-table {
+      margin-bottom: 20px;
+    }
+  }
+}
+</style>

src/views/distributionnetwork/vehicle-monitoring/no-traveling-recod/index.vue

@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container scroll-auto">
+    <el-form
+      ref="queryForm"
+      :model="queryParams"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <!--el-form-item label="区县公司" prop="countyOrgNm">
+        <el-input
+          v-model="queryParams.countyOrgNm"
+          placeholder="请输入区县公司"
+		  clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目负责人" prop="curator">
+        <el-input
+          v-model="queryParams.curator"
+          placeholder="请输入项目负责人"
+		  clearable
+        /-->
+      </el-form-item>
+      <el-form-item label="车牌号" prop="vehicleNo">
+        <el-input v-model="queryParams.vehicleNo" clearable placeholder="请输入车牌号" />
+      </el-form-item>
+      <el-form-item label="车组" prop="vehicleGroup">
+        <el-input v-model="queryParams.vehicleGroup" clearable placeholder="请输入车组" />
+      </el-form-item>
+	   <el-form-item label="日期" prop="monitorDate">
+	     <el-date-picker
+	       v-model="queryParams.monitorDate"
+	       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="table">
+      <el-table ref="renewalTable" border style="width: 100%" :header-cell-style="{fontSize: '12px', backgroundColor: '#f8f8f8',color:'#333',fontWeight: 'bold'}" v-loading="loading" :data="dataList">
+        <<el-table-column prop="" label="序号" width="80" align="center">
+          <template slot-scope="scope">
+            {{
+              scope.$index +
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              1
+            }}
+          </template>
+        </el-table-column>
+		<el-table-column
+				  label="所属车组"
+				  prop="vehicleGroup"
+				  align="center"
+				>  </el-table-column>
+       
+        
+        <el-table-column
+          label="车牌号"
+          prop="vehicleNo"
+          align="center"
+        >
+        </el-table-column>
+       
+      
+        <el-table-column
+          prop="occurDate"
+          label="发生时间"
+          align="center"
+                 
+        />
+        <el-table-column
+          label="最新状态"
+          prop="alarmDesc"
+          align="center"
+        >
+		<template slot-scope="scope" >
+				<el-tag type="danger"  v-if="scope.row.alarmCd!='0'" effect="text">{{scope.row.alarmDesc}}</el-tag>
+				<el-tag type="success" v-else>{{scope.row.alarmDesc}}</el-tag>
+		</template>
+        </el-table-column>
+		<el-table-column
+		  prop="remark"
+		  label="备注"
+		  align="center"
+		  width="400"       
+		/>
+        <el-table-column
+          label="更新时间"
+          prop="createTime"
+          align="center"
+        >
+        </el-table-column>
+		
+        <el-table-column
+          label="操作"
+          align="center"
+          width="120"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-document"
+              @click="handleRecord(scope.row)"
+              >作业记录</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        class="page-box"
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    
+
+  <work-track
+    :visible.sync="trackDialogVisible"
+    :vehicle-info="currentVehicle"
+  />
+  </div>
+</template>
+
+<script>
+
+import {
+  listVehicleAlarmHist
+} from "@/api/powerdistribution/vehicle-monitoring";
+import WorkTrack from "./../components/WorkTrack.vue";
+
+export default {
+  components: {
+    WorkTrack
+  },
+  data() {
+    return {
+      dataList: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 遮罩层
+      loading: true,
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        countyOrgNm: "", // 区县公司
+        curator: "", // 项目负责人
+        vehicleNo: "", // 车牌号
+				alarmCd: "3",
+        vehicleGroup: "", // 车组
+		monitorDate: [
+		 
+		],
+      },
+      
+   
+      // 行驶记录相关
+      trackDialogVisible: false,
+	  
+	  
+      // 当前选中的车辆信息
+      currentVehicle: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      listVehicleAlarmHist({ ...this.queryParams,
+	   startDate: this.queryParams.monitorDate[0],
+	   endDate: this.queryParams.monitorDate[1]
+	   }).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        countyOrgNm: "",
+        curator: "",
+        vehicleNo: "",
+        vehicleGroup: "",
+		alarmCd: "3",
+		monitorDate: [
+		 
+		],
+      };
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  
+   
+    /** 查看行驶记录 */
+    handleRecord(row) {
+      this.currentVehicle =row;
+       this.trackDialogVisible = true;
+    },
+	
+  },
+};
+</script>
+<style lang="scss" scoped>
+.table {
+  height: calc(100% - 150px);
+}
+::v-deep {
+  .el-table {
+    height: 100%;
+    width: 100%;
+    .el-table__body-wrapper {
+      width: 100% !important;
+      height: calc(100% - 50px) !important; // 表格高度减去表头的高度
+      overflow-y: scroll;
+    }
+  }
+  .el-form--inline .el-form-item {
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+  // 上传按钮样式调整
+  .el-upload {
+    display: inline-block;
+  }
+  .el-button--text {
+    padding: 0 8px;
+  }
+}
+
+.track-container {
+  min-height: 400px;
+  // 添加地图容器的样式
+}
+
+.record-container {
+  min-height: 400px;
+  padding: 20px;
+
+  .mb20 {
+    margin-bottom: 20px;
+  }
+
+  ::v-deep {
+    .el-table {
+      margin-bottom: 20px;
+    }
+  }
+}
+</style>

src/views/distributionnetwork/vehicle-monitoring/no-work-recod/index.vue

@@ -0,0 +1,284 @@
+<template>
+  <div class="app-container scroll-auto">
+    <el-form
+      ref="queryForm"
+      :model="queryParams"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <!--el-form-item label="区县公司" prop="countyOrgNm">
+        <el-input
+          v-model="queryParams.countyOrgNm"
+          placeholder="请输入区县公司"
+		  clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目负责人" prop="curator">
+        <el-input
+          v-model="queryParams.curator"
+          placeholder="请输入项目负责人"
+		  clearable
+        /-->
+      </el-form-item>
+      <el-form-item label="车牌号" prop="vehicleNo">
+        <el-input v-model="queryParams.vehicleNo" clearable placeholder="请输入车牌号" />
+      </el-form-item>
+      <el-form-item label="车组" prop="vehicleGroup">
+        <el-input v-model="queryParams.vehicleGroup" clearable placeholder="请输入车组" />
+      </el-form-item>
+	   <el-form-item label="日期" prop="monitorDate">
+	     <el-date-picker
+	       v-model="queryParams.monitorDate"
+	       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="table">
+      <el-table ref="renewalTable" border style="width: 100%" :header-cell-style="{fontSize: '12px', backgroundColor: '#f8f8f8',color:'#333',fontWeight: 'bold'}" v-loading="loading" :data="dataList">
+        <<el-table-column prop="" label="序号" width="80" align="center">
+          <template slot-scope="scope">
+            {{
+              scope.$index +
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              1
+            }}
+          </template>
+        </el-table-column>
+		<el-table-column
+				  label="所属车组"
+				  prop="vehicleGroup"
+				  align="center"
+				>  </el-table-column>
+       
+        
+        <el-table-column
+          label="车牌号"
+          prop="vehicleNo"
+          align="center"
+        >
+        </el-table-column>
+       
+      
+        <el-table-column
+          prop="occurDate"
+          label="发生时间"
+          align="center"
+                 
+        />
+        <el-table-column
+          label="最新状态"
+          prop="alarmDesc"
+          align="center"
+        >
+		<template slot-scope="scope" >
+				<el-tag type="danger"  v-if="scope.row.alarmCd!='0'" effect="text">{{scope.row.alarmDesc}}</el-tag>
+				<el-tag type="success" v-else>{{scope.row.alarmDesc}}</el-tag>
+		</template>
+        </el-table-column>
+		<el-table-column
+		  prop="remark"
+		  label="备注"
+		  align="center"
+		  width="400"       
+		/>
+        <el-table-column
+          label="更新时间"
+          prop="createTime"
+          align="center"
+        >
+        </el-table-column>
+		
+        <el-table-column
+          label="操作"
+          align="center"
+          width="120"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-document"
+              @click="handleRecord(scope.row)"
+              >行驶记录</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        class="page-box"
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    
+
+    <driving-record
+      :visible.sync="recordDialogVisible"
+      :vehicle-info="currentVehicle"
+    />
+  </div>
+</template>
+
+<script>
+
+import {
+  listVehicleAlarmHist
+} from "@/api/powerdistribution/vehicle-monitoring";
+import DrivingRecord from "./../components/DrivingRecord.vue";
+
+export default {
+  components: {
+   
+    DrivingRecord
+  },
+  data() {
+    return {
+      dataList: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 遮罩层
+      loading: true,
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        countyOrgNm: "", // 区县公司
+        curator: "", // 项目负责人
+        vehicleNo: "", // 车牌号
+				alarmCd: "4",
+        vehicleGroup: "", // 车组
+		monitorDate: [
+		 
+		],
+      },
+      
+   
+      // 行驶记录相关
+      recordDialogVisible: false,
+	  
+	  
+      // 当前选中的车辆信息
+      currentVehicle: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      listVehicleAlarmHist({ ...this.queryParams,
+	   startDate: this.queryParams.monitorDate[0],
+	   endDate: this.queryParams.monitorDate[1]
+	   }).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        countyOrgNm: "",
+        curator: "",
+        vehicleNo: "",
+        vehicleGroup: "",
+		alarmCd: "4",
+		monitorDate: [
+		 
+		],
+      };
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  
+   
+    /** 查看行驶记录 */
+    handleRecord(row) {
+      this.currentVehicle =row;
+      this.recordDialogVisible = true;
+    },
+	
+  },
+};
+</script>
+<style lang="scss" scoped>
+.table {
+  height: calc(100% - 150px);
+}
+::v-deep {
+  .el-table {
+    height: 100%;
+    width: 100%;
+    .el-table__body-wrapper {
+      width: 100% !important;
+      height: calc(100% - 50px) !important; // 表格高度减去表头的高度
+      overflow-y: scroll;
+    }
+  }
+  .el-form--inline .el-form-item {
+    margin-right: 10px;
+    margin-bottom: 10px;
+  }
+  // 上传按钮样式调整
+  .el-upload {
+    display: inline-block;
+  }
+  .el-button--text {
+    padding: 0 8px;
+  }
+}
+
+.track-container {
+  min-height: 400px;
+  // 添加地图容器的样式
+}
+
+.record-container {
+  min-height: 400px;
+  padding: 20px;
+
+  .mb20 {
+    margin-bottom: 20px;
+  }
+
+  ::v-deep {
+    .el-table {
+      margin-bottom: 20px;
+    }
+  }
+}
+</style>

src/views/distributionnetwork/vehicle-monitoring/vehicle-traveling/index.vue

@@ -0,0 +1,291 @@
+<template>
+    <div class="record-container">
+			<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 label="行驶里程不为0" prop="vehicleNo">
+					  <el-checkbox v-model="queryParams.greaterThanZero"></el-checkbox>
+					</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-row :gutter="10" class="mb8">
+			   <el-col :span="1.5">
+			     <el-upload
+			       :action="uploadUrl"
+			       :headers="headers"
+			       :data="uploadData"
+			       name="file"
+			       :show-file-list="false"
+			       :before-upload="beforeUpload"
+			       :on-success="handleSuccess"
+			       :on-error="handleError"
+			     >
+			       <el-button type="primary" icon="el-icon-upload" size="mini"
+			         >导入行驶记录</el-button
+			       >
+			     </el-upload>
+			   </el-col>
+			   <right-toolbar
+			     :showSearch.sync="showSearch"
+			     @queryTable="getList"
+			   ></right-toolbar>
+			 </el-row>
+      <el-table :data="driveRecords" border style="width: 100%"  v-loading="loading">
+	  <el-table-column prop="" label="序号" width="80" align="center">
+		    <template slot-scope="scope">
+		      {{
+		        scope.$index +
+		        (queryParams.pageNum - 1) * queryParams.pageSize +
+		        1
+		      }}
+		    </template>
+		  </el-table-column>
+        <el-table-column
+          prop="vehicleNo"
+          label="车牌号"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="vehicleGroup"
+          label="所属车组"
+          align="center"
+          
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="equipNo"
+          label="设备号"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="equipNm"
+          label="设备名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="startTm"
+          label="开始时间"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="endTm"
+          label="结束时间"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mileage"
+          label="行驶里程(km)"
+          align="center"
+          width="100"
+        >
+      <template slot-scope="scope">
+            {{ scope.row.mileage || 0 }}
+          </template>
+        </el-table-column>
+		<el-table-column
+		  prop="createTime"
+		  label="导入时间"
+		  align="center"
+		></el-table-column>
+      </el-table>
+	  
+      <pagination
+        v-show="recordTotal > 0"
+        :total="recordTotal"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+</template>
+
+<script>
+import { vehicleDrivingRecordList } from "@/api/powerdistribution/vehicle-monitoring";
+import moment from "moment";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "DrivingRecord",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+	// 文件类型, 例如['png', 'jpg', 'jpeg']
+	fileType: {
+	  type: Array,
+	  default: () => ["csv"],
+	},
+    vehicleInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+	  loading: true,
+      driveRecords: [],
+      recordTotal: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        vehicleNo: "",
+        vehicleGroup: "",
+		greaterThanZero:false,
+		drivingDate: [
+		 
+		],
+      },
+	  // 上传相关配置
+	  uploadUrl:
+	    process.env.VUE_APP_BASE_API +"/powerdistribution/vehicleDrivingRecord/import",
+	  headers: {
+	    Authorization: "Bearer " + getToken(),
+	  },
+	  uploadData: {
+	    // 如果需要额外的参数可以在这里添加
+	  },
+	 
+    };
+  },
+  // watch: {
+  //   visible(val) {
+  //     if (val) {
+  //       this.queryParams = {
+  //         pageNum: 1,
+  //         pageSize: 10,
+  //         vehicleNo: this.vehicleInfo.vehicleNo,
+		//   drivingDate: [
+		   
+		//   ],
+  //         // vehicleGroup: this.vehicleInfo.vehicleGroup,
+  //       };
+  //       this.getList();
+  //     }
+  //   },
+  // },
+  created() {
+    this.getList();
+  },
+  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;
+      });
+    },
+	/** 文件上传前的处理 */
+	beforeUpload(file) {
+	  // const isCsv =
+	  //   file.type ===
+	  //     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ||
+	  //   file.type === "application/vnd.ms-excel" ||
+	  //   file.type === "text/csv";
+	  // if (!isCsv) {
+	  //   this.$message.error("只能上传CSV文件!");
+	  //   return false;
+	  // }
+	  if (this.fileType) {
+			const fileName = file.name.split('.');
+			const fileExt = fileName[fileName.length - 1];
+			const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
+			if (!isTypeOk) {
+			  this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+			  return false;
+			}
+		}
+	  
+	  const isLt5M = file.size / 1024 / 1024 < 5;
+	  if (!isLt5M) {
+	    this.$message.error("文件大小不能超过 5MB!");
+	    return false;
+	  }
+	  return true;
+	},
+	/** 文件上传成功的处理 */
+	handleSuccess(response, file) {
+	  if (response.code === 200) {
+	  this.$modal.msgSuccess("导入成功");
+	  this.getList();
+	  } else {
+	    this.$modal.msgError(response.msg || "导入失败");
+	  }
+	},
+	/** 文件上传失败的处理 */
+	handleError(error) {
+		alert(error)
+	  this.$modal.msgError("导入失败，请重试");
+	  console.error("上传失败:", error);
+	},
+	/** 搜索按钮操作 */
+	handleQuery() {
+	  this.getList();
+	},
+	resetQuery() {
+	  this.queryParams = {
+	    pageNum: 1,
+	    pageSize: 10,
+		vehicleNo: "",
+	    vehicleGroup: "",
+		greaterThanZero:false,
+		drivingDate: [
+		 
+		],
+	  };
+	  this.resetForm("queryForm");
+	  this.handleQuery();
+	},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.record-container {
+  min-height: 400px;
+  padding: 10px;
+
+  .mb20 {
+    margin-bottom: 20px;
+  }
+
+  ::v-deep {
+    .el-table {
+      margin-bottom: 20px;
+    }
+  }
+}
+</style>