src/views/distributionnetwork/maintenance/process/index.vue

@@ -1,6 +1,20 @@
 <template>
   <div class="app-container scroll-auto">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+     <el-form-item label="日期" prop="reportDate">
+       <el-date-picker
+         v-model="queryParams.reportDate"
+         style="width: 240px; margin-right: 8px"
+         type="daterange"
+         range-separator="至"
+         start-placeholder="开始日期"
+         end-placeholder="结束日期"
+         value-format="yyyyMMdd"
+         :clearable="false"
+       >
+       </el-date-picker>
+     </el-form-item>
+
        <el-form-item label="月计划编号" prop="planCode" label-width="120">
            <el-input
              v-model="queryParams.planCode"
@@ -87,6 +101,8 @@
          <el-table-column label="停电设备数" align="center" prop="powerOutageDevices" fixed/>
          <el-table-column label="月计划停电时户数" align="center" prop="perHourHouseholdsM" fixed/>
          <el-table-column label="周计划停电时户数" align="center" prop="perHourHouseholdsW" fixed/>
+         <el-table-column label="开始时间" align="center" prop="weekStartDt" fixed/>
+         <el-table-column label="结束时间" align="center" prop="weekendDt" fixed/>
          <el-table-column label="市州单位" align="center" prop="city" width="150" />
          <el-table-column label="区县单位" align="center" prop="county" width="180"/>
          <el-table-column label="供电服务站/所" align="center" prop="station" width="120" :show-overflow-tooltip="true"/>
@@ -315,7 +331,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         planCode: null,
-		planCodeW:null,
+		    planCodeW:null,
         powerOutageDevices: null,
         perHourHouseholdsM: null,
         perHourHouseholdsW: null,
@@ -330,6 +346,7 @@ export default {
         isApprove: null,
         maintenanceFilePath: null,
         approveFilePath: null,
+        reportDate: [],
       },
       // 表单参数
       form: {},
@@ -348,7 +365,11 @@ export default {
     /** 查询检修计划全流程管理列表 */
     getList() {
       this.loading = true;
-      listProcess(this.queryParams).then(response => {
+      listProcess({
+         ...this.queryParams,
+         startDate: this.queryParams.reportDate[0],
+        endDate: this.queryParams.reportDate[1]
+        }).then(response => {
         this.processList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -364,7 +385,7 @@ export default {
       this.form = {
         id: null,
         planCode: null,
-		planCodeW: null,
+		    planCodeW: null,
         powerOutageDevices: null,
         perHourHouseholdsM: null,
         perHourHouseholdsW: null,
@@ -382,7 +403,8 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        reportDate:[]
       };
       this.resetForm("form");
     },
@@ -459,7 +481,26 @@ export default {
     /** 导出按钮操作 */
    async handleExport() {
      const res = await exportProcess({
-       ...this.queryParams,
+      pageNum: this.queryParams.pageNum,
+      pageSize: this.queryParams.pageSize,
+      planCode: this.queryParams.planCode,
+      planCodeW: this.queryParams.planCodeW,
+      powerOutageDevices: this.queryParams.powerOutageDevices,
+      perHourHouseholdsM: this.queryParams.perHourHouseholdsM,
+      perHourHouseholdsW: this.queryParams.perHourHouseholdsW,
+      city: this.queryParams.city,
+      county: this.queryParams.county,
+      station: this.queryParams.station,
+      lineCode: this.queryParams.lineCode,
+      lineName: this.queryParams.lineName,
+      perHourHouseholdsArtif: this.queryParams.perHourHouseholdsArtif,
+      declarAgency: this.queryParams.declarAgency,
+      isMaintenance: this.queryParams.isMaintenance,
+      isApprove: this.queryParams.isApprove,
+      maintenanceFilePath: this.queryParams.maintenanceFilePath,
+      approveFilePath: this.queryParams.approveFilePath,
+      startDate: this.queryParams.reportDate[0],
+      endDate: this.queryParams.reportDate[1]
      });
      if (res) {
        const elink = document.createElement("a");

src/views/distributionnetwork/secure/components/RankingTable.vue

@@ -3,6 +3,12 @@
   <el-card :header="titleEnum[type]" class="h-full" style="position: relative">
     <div slot="header" class="clearfix">
       <span>{{ titleEnum[type] }}</span>
+      <el-tooltip placement="top">
+        <div slot="content">
+          {{ roleEnum[type] }}
+        </div>
+        <i class="el-icon-question"></i>
+      </el-tooltip>
       <el-select
         style="width: 90px; position: absolute; right: 208px; top: 8px"
         v-model="queryParams.teamType"
@@ -149,6 +155,11 @@ export default {
         2: "工作负责人积分排行",
         3: "作业人员积分排行",
       },
+      roleEnum: {
+        1: "积分规则:队伍（班组）得分等于工作负责人评价得分之和",
+        2: "积分规则:一级作业风险作业信息数×6+二级作业风险作业信息数×4+三级作业风险作业信息数×2+四级作业风险作业信息数×1+五级作业风险作业信息数×0.5-省公司查处严重违章数量×12-省公司查处一般违章数量×4-市公司查处严重违章数量×6-市公司查处一般违章数量×2-县公司查处严重违章数量×3-县公司查处一般违章数量×1-市公司查处严重问题数量×3",
+        3: "积分规则:作业人员评价得分=工作负责人评价得分标准系数*0.3",
+      },
       iconMap: {
         no1,
         no2,