作业页面新增查询条件

src/views/distributionnetwork/maintenance/line-info/index.vue

@@ -22,9 +22,21 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="是否检修超期" prop="isMaintOverdue">
+        <el-tooltip placement="top">
+          <div slot="content">
+            超过3年未计划检修
+          </div>
+          <i class="el-icon-question"></i>
+        </el-tooltip>
         <el-checkbox v-model="queryParams.isMaintOverdue"></el-checkbox>
       </el-form-item>
       <el-form-item label="是否重复停电" prop="isRepeatPoweroff">
+        <el-tooltip placement="top">
+          <div slot="content">
+            两个月内停电超过三次
+          </div>
+          <i class="el-icon-question"></i>
+        </el-tooltip>
         <el-checkbox v-model="queryParams.isRepeatPoweroff"></el-checkbox>
       </el-form-item>
       <!--el-form-item label="电压等级" prop="voltLvlDsc">
@@ -149,10 +161,12 @@
             />
             <el-table-column label="状态" prop="runStDsc" align="center" />
             <el-table-column
-              label="停电次数"
+              label="一年内停电次数"
               prop="poweroffNum"
               align="center"
-            />
+              :show-overflow-tooltip="true"
+            >
+            </el-table-column>
 			<el-table-column
 			  label="上次故障停电时间"
 			  prop="faultPoweroffTm"
@@ -203,7 +217,7 @@
           label="电压等级"
           prop="voltLvlDsc"
           align="center"
-          width="150"
+          width="100"
 
         >
         </el-table-column>
@@ -246,7 +260,7 @@
           label="变电站名称"
           prop="subsNm"
           align="center"
-          width="150"
+          width="100"
         />
         <el-table-column
           label="运维单位名称"
@@ -272,12 +286,12 @@
 		  align="center"
 		 width="150"
 		> </el-table-column>
-        <el-table-column label="停电次数" prop="poweroffNum" align="center" />
+        <el-table-column label="一年内停电次数" prop="poweroffNum" align="center"  width="120"/>
         <el-table-column
           label="无故障持续时间"
           prop="faultFreeDuration"
           align="center"
-         width="150"
+         width="200"
         >
         </el-table-column>
         <el-table-column

src/views/distributionnetwork/quantity-of-work/index.vue

@@ -166,7 +166,7 @@
         </el-table-column>
 
         <el-table-column
-          label="批次类别"
+          label="批次类型"
           prop="proCategory"
           align="center"
           width="90"

src/views/distributionnetwork/secure/abnormal-data/index.vue

@@ -7,6 +7,21 @@
       :inline="true"
       v-show="showSearch"
     >
+
+    <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="opTypDsc">
         <el-select v-model="queryParams.opTypDsc" placeholder="请选择">
           <el-option
@@ -280,6 +295,8 @@ export default {
         majorTypDsc: "",
         pageNum: 1,
         pageSize: 10,
+        reportDate: [
+        ],
       },
       // 作业类型
       workTypeList: [],
@@ -301,7 +318,17 @@ export default {
   methods: {
     async handleExport() {
       const res = await workPlanExport({
-        ...this.queryParams,
+       opTypDsc: this.queryParams.opTypDsc,
+       mgmtOrgNm: this.queryParams.mgmtOrgNm,
+       workTeamNm: this.queryParams.workTeamNm,
+       workPrincipNm: this.queryParams.workPrincipNm,
+       submitOrgNm: this.queryParams.submitOrgNm,
+       opRiskLvlDsc: this.queryParams.opRiskLvlDsc,
+       opAddr: this.queryParams.opAddr,
+       majorTypDsc: this.queryParams.majorTypDsc,
+       planTypCd: this.planTypCd,
+       startDate: this.queryParams.reportDate[0],
+       endDate: this.queryParams.reportDate[1],
         dataFlag: 1,
       });
       if (res) {
@@ -341,7 +368,10 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      getWorkPlanList({ ...this.queryParams, dataFlag: 1 }).then((response) => {
+      getWorkPlanList({ ...this.queryParams, dataFlag: 1 ,
+      startDate: this.queryParams.reportDate[0],
+      endDate: this.queryParams.reportDate[1]
+      }).then((response) => {
         this.dataList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/distributionnetwork/secure/reason-for-cancellation/index.vue

@@ -7,6 +7,20 @@
       :inline="true"
       v-show="showSearch"
     >
+    <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="opTypDsc">
         <el-select v-model="queryParams.opTypDsc" placeholder="请选择">
           <el-option
@@ -249,6 +263,7 @@ import { getWorkPlanList, workPlanExport } from "@/api/secure/pdm-work-plan";
 import { getWorkUnitList } from "@/api/secure/daily-newspaper";
 import WorkPlanModel from "../components/WorkPlanModel.vue";
 import WorkPlanDetailModel from "../components/WorkPlanDetailModel.vue";
+import moment from "moment";
 export default {
   components: { WorkPlanModel, WorkPlanDetailModel },
   data() {
@@ -274,6 +289,8 @@ export default {
         majorTypDsc: "",
         pageNum: 1,
         pageSize: 10,
+        reportDate: [
+        ],
       },
       // 选中数组
       selectedRows: [],
@@ -296,8 +313,17 @@ export default {
   methods: {
     async handleExport() {
       const res = await workPlanExport({
-        ...this.queryParams,
-        planExecStDsc: "已取消",
+       opTypDsc: this.queryParams.opTypDsc,
+       mgmtOrgNm: this.queryParams.mgmtOrgNm,
+       workTeamNm: this.queryParams.workTeamNm,
+       workPrincipNm: this.queryParams.workPrincipNm,
+       submitOrgNm: this.queryParams.submitOrgNm,
+       opAddr: this.queryParams.opAddr,
+       opRiskLvlDsc: this.queryParams.opRiskLvlDsc,
+       majorTypDsc: this.queryParams.majorTypDsc,
+       planExecStDsc: "已取消",
+       startDate: this.queryParams.reportDate[0],
+       endDate: this.queryParams.reportDate[1]
       });
       if (res) {
         const elink = document.createElement("a");
@@ -358,7 +384,11 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      getWorkPlanList({ ...this.queryParams, planExecStDsc: "已取消" }).then(
+      getWorkPlanList({ ...this.queryParams,
+      planExecStDsc: "已取消",
+      startDate: this.queryParams.reportDate[0],
+      endDate: this.queryParams.reportDate[1]
+       }).then(
         (response) => {
           this.dataList = response.rows;
           this.total = response.total;

src/views/distributionnetwork/secure/reason-for-the-plan/index.vue

@@ -7,6 +7,21 @@
       :inline="true"
       v-show="showSearch"
     >
+
+    <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="opTypDsc">
         <el-select v-model="queryParams.opTypDsc" placeholder="请选择">
           <el-option
@@ -288,6 +303,8 @@ export default {
         majorTypDsc: "",
         pageNum: 1,
         pageSize: 10,
+        reportDate: [
+        ],
       },
       planTypCd: "",
       // 选中数组
@@ -313,8 +330,17 @@ export default {
   methods: {
     async handleExport() {
       const res = await workPlanExport({
-        ...this.queryParams,
+        opTypDsc: this.queryParams.opTypDsc,
+        mgmtOrgNm: this.queryParams.mgmtOrgNm,
+        workTeamNm: this.queryParams.workTeamNm,
+        workPrincipNm: this.queryParams.workPrincipNm,
+        submitOrgNm: this.queryParams.submitOrgNm,
+        opRiskLvlDsc: this.queryParams.opRiskLvlDsc,
+        opAddr: this.queryParams.opAddr,
+        majorTypDsc: this.queryParams.majorTypDsc,
         planTypCd: this.planTypCd,
+        startDate: this.queryParams.reportDate[0],
+        endDate: this.queryParams.reportDate[1]
       });
       if (res) {
         const elink = document.createElement("a");
@@ -375,7 +401,11 @@ export default {
     /** 查询列表 */
     async getList() {
       this.loading = true;
-      getWorkPlanList({ ...this.queryParams, planTypCd: this.planTypCd }).then(
+      getWorkPlanList({ ...this.queryParams,
+       planTypCd: this.planTypCd,
+       startDate: this.queryParams.reportDate[0],
+       endDate: this.queryParams.reportDate[1]
+       }).then(
         (response) => {
           this.dataList = response.rows;
           this.total = response.total;

src/views/distributionnetwork/secure/risk-identification/index.vue

@@ -7,6 +7,21 @@
       :inline="true"
       v-show="showSearch"
     >
+
+    <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="opTypDsc">
         <el-select v-model="queryParams.opTypDsc" placeholder="请选择">
           <el-option
@@ -313,6 +328,8 @@ export default {
         majorTypDsc: "",
         pageNum: 1,
         pageSize: 10,
+        reportDate: [
+        ],
       },
       // 作业类型
       workTypeList: [],
@@ -339,7 +356,17 @@ export default {
   methods: {
     async handleExport() {
       const res = await workPlanExport({
-        ...this.queryParams,
+       opTypDsc: this.queryParams.opTypDsc,
+       mgmtOrgNm: this.queryParams.mgmtOrgNm,
+       workTeamNm: this.queryParams.workTeamNm,
+       workPrincipNm: this.queryParams.workPrincipNm,
+       submitOrgNm: this.queryParams.submitOrgNm,
+       opRiskLvlDsc: this.queryParams.opRiskLvlDsc,
+       opAddr: this.queryParams.opAddr,
+       majorTypDsc: this.queryParams.majorTypDsc,
+       planTypCd: this.planTypCd,
+       startDate: this.queryParams.reportDate[0],
+       endDate: this.queryParams.reportDate[1],
         riskFlag: "1",
       });
       if (res) {
@@ -384,7 +411,11 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      getWorkPlanList({ ...this.queryParams, riskFlag: "1" }).then(
+      getWorkPlanList({ ...this.queryParams,
+       riskFlag: "1",
+        startDate: this.queryParams.reportDate[0],
+       endDate: this.queryParams.reportDate[1]
+        }).then(
         (response) => {
           this.dataList = response.rows;
           this.total = response.total;

src/views/home/components/map/index.vue

@@ -46,6 +46,8 @@
             {{ key }}-作业数<span class="orange">{{
               dataMap[key].planSum || 0
             }}</span>
+            完成数
+            <span class="orange">{{ dataMap[key].planCompleteSum || 0 }}</span>
             取消数
             <span class="orange">{{ dataMap[key].cancelSum || 0 }}</span>
             执行率
@@ -73,6 +75,8 @@
             {{ ite.constOrgNm }}-作业数<span class="orange">{{
               ite.planSum || 0
             }}</span>
+            完成数
+            <span class="orange">{{ ite.planCompleteSum || 0 }}</span>
             取消数
             <span class="orange">{{ ite.cancelSum || 0 }}</span>
             执行率
@@ -112,9 +116,10 @@ const mapEnum = {
   南岳区: require("./南岳区.json"),
   祁东县: require("./祁东县.json"),
   石鼓区: require("./石鼓区.json"),
-  雁峰区: require("./雁峰区.json"),
-  蒸湘区: require("./蒸湘区.json"),
+  雁能: require("./雁峰区.json"),
+  城区: require("./蒸湘区.json"),
   珠晖区: require("./珠晖区.json"),
+  //雁能和城区因为没有对应的行政区域，为了展示暂时使用没有数据的替代
 };
 import {
   getWorkNumStatisticsHome,
@@ -260,6 +265,9 @@ export default {
               `<span class="orange">${
                 params.data.value?.planSum || 0
               }</span> ` +
+              `完成数 <span class="orange">${
+                params.data.value?.planCompleteSum || 0
+              }</span> ` +
               `取消数 <span class="orange">${
                 params.data.value?.cancelSum || 0
               }</span> ` +