chore: 调整

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

@@ -162,6 +162,14 @@
         <el-table-column label="专业类型" align="center" prop="majorTypDsc">
         </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>
   </div>
 </template>
@@ -186,6 +194,8 @@ export default {
         workTeamNm: "",
         workPrincipNm: "",
         submitOrgNm: "",
+        pageNum: 1,
+        pageSize: 10,
       },
       // 作业类型
       workTypeList: [],
@@ -222,6 +232,7 @@ export default {
       this.loading = true;
       getWorkPlanList({ ...this.queryParams, dataFlag: 1 }).then((response) => {
         this.dataList = response.rows;
+        this.total = response.total;
         this.loading = false;
       });
     },

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

@@ -20,6 +20,8 @@
           format="yyyy"
           value-format="yyyy"
           placeholder="选择年"
+          :clearable="false"
+          @change="getList"
         >
         </el-date-picker>
       </el-form-item>
@@ -30,21 +32,11 @@
           format="yyyy-MM"
           value-format="yyyyMM"
           placeholder="选择月"
+          :clearable="false"
+          @change="getList"
         >
         </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 v-loading="loading" :data="dataList">
@@ -152,6 +144,7 @@ export default {
         this.queryParams.reportDate = moment(new Date()).format("yyyyMM");
         this.queryParams.reportYear = undefined;
       }
+      this.getList();
     },
     /** 查询列表 */
     getList() {

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

@@ -0,0 +1,177 @@
+<template>
+  <el-drawer
+    :title="title"
+    :before-close="cancelForm"
+    :visible.sync="dialog"
+    direction="rtl"
+    ref="drawer"
+  >
+    <div class="demo-drawer__content" style="padding: 0 20px">
+      <el-form :model="form" label-position="left">
+        <el-row :gutter="30">
+          <el-col :span="24">
+            <el-form-item label="作业内容">
+              <el-input v-model="form.opContent" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="作业地址">
+              <el-input v-model="form.opAddr" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="线路/变电站">
+              <el-input v-model="form.subsOrLineNm" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电压等级">
+              <el-input v-model="form.voltLvlCd" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="作业类型">
+              <el-input v-model="form.opTypDsc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理单位">
+              <el-input v-model="form.mgmtOrgNm" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="作业单位">
+              <el-input v-model="form.submitOrgNm" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工作负责人">
+              <el-input v-model="form.workPrincipNm" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="作业班组">
+              <el-input v-model="form.workTeamNm" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="作业风险">
+              <el-input v-model="form.opRiskLvlDsc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="作业人数">
+              <el-input v-model="form.mainBusiOrgOpNum" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="作业开始时间">
+              <el-input v-model="form.planStartWkTm" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="作业结束时间">
+              <el-input v-model="form.planEndTm" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="专业类型">
+              <el-input v-model="form.majorTypDsc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="30">
+          <el-col :span="24" v-if="type == 1">
+            <el-form-item label="取消原因">
+              <el-input
+                type="textarea"
+                :rows="3"
+                placeholder="请输入取消原因"
+                v-model="form.cancelReason"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="type == 2">
+            <el-form-item label="临时计划原因">
+              <el-input
+                type="textarea"
+                :rows="3"
+                placeholder="请输入临时计划原因"
+                v-model="form.planReason"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="demo-drawer__footer" style="text-align: right">
+        <el-button @click="cancelForm">关 闭 </el-button>
+      </div>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      title: "",
+      form: {
+        opContent: "",
+        opAddr: "",
+        subsOrLineId: "",
+        voltLvlCd: "",
+        opTypDsc: "",
+        mgmtOrgNm: "",
+        submitOrgNm: "",
+        workPrincipNm: "",
+        workTeamNm: "",
+        opRiskLvlDsc: "",
+        mainBusiOrgOpNum: "",
+        planStartWkTm: "",
+        planEndTm: "",
+        majorTypDsc: "",
+        cancelReason: "",
+        planReason: "",
+      },
+      loading: false,
+      dialog: false,
+      type: null, //1作业取消计划  2临时计划
+    };
+  },
+  methods: {
+    openModel(data, title, type) {
+      this.form = { ...data };
+      this.title = title;
+      this.dialog = true;
+      this.type = type;
+    },
+    cancelForm() {
+      this.loading = false;
+      this.dialog = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep {
+  .el-drawer.ttb,
+  .el-drawer.btt {
+    height: 90% !important;
+  }
+}
+</style>

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

@@ -6,15 +6,21 @@
     direction="rtl"
     ref="drawer"
   > -->
-  <el-dialog :title="title" :visible.sync="dialog" width="600px" append-to-body>
+  <el-dialog
+    :title="title"
+    :visible.sync="dialog"
+    width="600px"
+    append-to-body
+    @close="cancelForm"
+  >
     <div class="demo-drawer__content" style="padding: 0 20px">
       <el-form :model="form" label-position="left" label-width="70px">
         <el-row :gutter="30">
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="ID">
               <el-input v-model="form.id" disabled></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="作业内容">
               <el-input v-model="form.opContent" disabled></el-input>
@@ -196,6 +202,25 @@ export default {
       });
     },
     cancelForm() {
+      this.form = {
+        opContent: "",
+        opAddr: "",
+        subsOrLineId: "",
+        voltLvlCd: "",
+        opTypDsc: "",
+        mgmtOrgNm: "",
+        submitOrgNm: "",
+        workPrincipNm: "",
+        workTeamNm: "",
+        opRiskLvlDsc: "",
+        mainBusiOrgOpNum: "",
+        planStartWkTm: "",
+        planEndTm: "",
+        majorTypDsc: "",
+        cancelReason: "",
+        planReason: "",
+        id: null,
+      };
       this.loading = false;
       this.dialog = false;
     },
@@ -210,4 +235,4 @@ export default {
     height: 90% !important;
   }
 }
-</style>
+</style>

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

@@ -70,7 +70,7 @@
         >
       </el-form-item>
     </el-form>
-    <!-- <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -81,16 +81,22 @@
           >录入取消原因</el-button
         >
       </el-col>
-    </el-row> -->
+    </el-row>
     <div class="table">
-      <el-table ref="renewalTable" v-loading="loading" :data="dataList">
-        <el-table-column prop="id" label="ID" width="80" align="center">
+      <el-table
+        ref="renewalTable"
+        v-loading="loading"
+        :data="dataList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column prop="" label="序号" width="80" align="center">
           <template slot-scope="scope">
-            <a
-              @click="handleUpdate(scope.row, '录入取消原因')"
-              style="color: blue; cursor: pointer"
-              >{{ scope.row.id }}</a
-            >
+            {{
+              scope.$index +
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              1
+            }}
           </template>
         </el-table-column>
         <el-table-column
@@ -98,7 +104,15 @@
           align="center"
           prop="opContent"
           :show-overflow-tooltip="true"
-        />
+        >
+          <template slot-scope="scope">
+            <a
+              @click="handleDetail(scope.row, '明细')"
+              style="color: blue; cursor: pointer"
+              >{{ scope.row.opContent }}</a
+            >
+          </template>
+        </el-table-column>
         <el-table-column
           label="作业地址"
           align="center"
@@ -211,8 +225,17 @@
           </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>
     <WorkPlanModel ref="workPlanModelRef" @refresh="getList()"></WorkPlanModel>
+    <WorkPlanDetailModel ref="workPlanDetailModelRef"></WorkPlanDetailModel>
   </div>
 </template>
 
@@ -220,8 +243,9 @@
 import { getWorkPlanList } 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";
 export default {
-  components: { WorkPlanModel },
+  components: { WorkPlanModel, WorkPlanDetailModel },
   data() {
     return {
       dataList: [],
@@ -238,6 +262,8 @@ export default {
         workTeamNm: "",
         workPrincipNm: "",
         submitOrgNm: "",
+        pageNum: 1,
+        pageSize: 10,
       },
       // 选中数组
       selectedRows: [],
@@ -281,21 +307,25 @@ export default {
         );
       }
       // 记录选择的行
-      this.selectedRows = selectedRows;
+      this.selectedRows = [selectedRows[selectedRows.length - 1]];
     },
     /** 修改按钮操作 */
     handleUpdate(row, title) {
       this.$refs.workPlanModelRef.openModel({ ...row }, title, 1);
     },
+    handleDetail(row, title) {
+      this.$refs.workPlanDetailModelRef.openModel({ ...row }, title, 1);
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;
-      getWorkPlanList({ ...this.queryParams }).then((response) => {
-        this.dataList = response.rows.filter(
-          (ite) => ite.planExecStDsc == "已取消"
-        );
-        this.loading = false;
-      });
+      getWorkPlanList({ ...this.queryParams, planExecStDsc: "已取消" }).then(
+        (response) => {
+          this.dataList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
     },
     /** 搜索按钮操作 */
     handleQuery() {

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

@@ -70,7 +70,7 @@
         >
       </el-form-item>
     </el-form>
-    <!-- <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -81,16 +81,22 @@
           >录入临时计划原因</el-button
         >
       </el-col>
-    </el-row> -->
+    </el-row>
     <div class="table">
-      <el-table ref="renewalTable" v-loading="loading" :data="dataList">
-        <el-table-column prop="id" label="ID" width="80" align="center">
+      <el-table
+        ref="renewalTable"
+        v-loading="loading"
+        :data="dataList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column prop="" label="序号" width="80" align="center">
           <template slot-scope="scope">
-            <a
-              @click="handleUpdate(scope.row, '录入临时计划原因')"
-              style="color: blue; cursor: pointer"
-              >{{ scope.row.id }}</a
-            >
+            {{
+              scope.$index +
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              1
+            }}
           </template>
         </el-table-column>
         <el-table-column
@@ -98,7 +104,15 @@
           align="center"
           prop="opContent"
           :show-overflow-tooltip="true"
-        />
+        >
+          <template slot-scope="scope">
+            <a
+              @click="handleDetail(scope.row, '明细')"
+              style="color: blue; cursor: pointer"
+              >{{ scope.row.opContent }}</a
+            >
+          </template>
+        </el-table-column>
         <el-table-column
           label="作业地址"
           align="center"
@@ -205,8 +219,17 @@
           </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>
     <WorkPlanModel ref="workPlanModelRef" @refresh="getList()"></WorkPlanModel>
+    <WorkPlanDetailModel ref="workPlanDetailModelRef"></WorkPlanDetailModel>
   </div>
 </template>
 
@@ -214,8 +237,9 @@
 import { getWorkPlanList } 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";
 export default {
-  components: { WorkPlanModel },
+  components: { WorkPlanModel, WorkPlanDetailModel },
   data() {
     return {
       dataList: [],
@@ -232,6 +256,8 @@ export default {
         workTeamNm: "",
         workPrincipNm: "",
         submitOrgNm: "",
+        pageNum: 1,
+        pageSize: 10,
       },
       planTypCd: "",
       // 选中数组
@@ -278,18 +304,22 @@ export default {
         );
       }
       // 记录选择的行
-      this.selectedRows = selectedRows;
+      this.selectedRows = [selectedRows[selectedRows.length - 1]];
     },
     /** 修改按钮操作 */
     handleUpdate(row, title) {
       this.$refs.workPlanModelRef.openModel({ ...row }, title, 2);
     },
+    handleDetail(row, title) {
+      this.$refs.workPlanDetailModelRef.openModel({ ...row }, title, 2);
+    },
     /** 查询列表 */
     async getList() {
       this.loading = true;
       getWorkPlanList({ ...this.queryParams, planTypCd: this.planTypCd }).then(
         (response) => {
           this.dataList = response.rows;
+          this.total = response.total;
           this.loading = false;
         }
       );

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

@@ -181,6 +181,14 @@
           </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>
   </div>
 </template>
@@ -206,6 +214,8 @@ export default {
         workTeamNm: "",
         workPrincipNm: "",
         submitOrgNm: "",
+        pageNum: 1,
+        pageSize: 10,
       },
       // 作业类型
       workTypeList: [],
@@ -250,6 +260,7 @@ export default {
       getWorkPlanList({ ...this.queryParams, riskFlag: "1" }).then(
         (response) => {
           this.dataList = response.rows;
+          this.total = response.total;
           this.loading = false;
         }
       );