chore: 调整

src/views/distributionnetwork/power-outage-control/completion-status/components/OverallObjectiveTable.vue

@@ -39,16 +39,28 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          size="mini"
-          :disabled="!selectedRows.length"
-          @click="handleInput(selectedRows[0], '录入原因')"
-          >录入原因</el-button
+      <el-col :span="1.5">
+        <el-upload
+          class="upload-demo"
+          ref="upload"
+          accept=".xls,.xlsx"
+          :limit="1"
+          :multiple="false"
+          action="#"
+          :on-change="handleChange"
+          :auto-upload="false"
+          :show-file-list="false"
         >
-      </el-col> -->
+          <el-button
+            slot="trigger"
+            icon="el-icon-upload2"
+            size="mini"
+            plain
+            type="primary"
+            >人工目标</el-button
+          >
+        </el-upload>
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -56,7 +68,6 @@
     </el-row>
     <div class="table">
       <el-table ref="renewalTable" v-loading="loading" :data="dataList">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column
           label="事件序号"
           align="center"
@@ -205,14 +216,12 @@
     </div>
     <!-- 详情 -->
     <DetailsDrawer ref="detailRef" />
-    <!-- 录入原因 -->
-    <!-- <InputReasonModel ref="inputReasonRef" @refresh="getList" /> -->
   </div>
 </template>
 
 <script>
 import DetailsDrawer from "./DetailsDrawer.vue";
-// import InputReasonModel from "./components/InputReasonModel.vue";
+import { importF } from "@/api/powerdistribution/power-outage-control";
 import { listMaintenanceStatistics } from "@/api/powerdistribution/maintenance";
 export default {
   components: {
@@ -301,6 +310,18 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    handleChange(file) {
+      let data = new FormData();
+      data.append("file", file.raw);
+      importF(data).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("导入成功");
+          this.$emit("refresh");
+        } else {
+          this.$message.error("导入失败" || res.msg);
+        }
+      });
+    },
   },
 };
 </script>

src/views/distributionnetwork/power-outage-control/duration-analysis/index.vue

@@ -49,6 +49,28 @@
           >录入原因</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-upload
+          class="upload-demo"
+          ref="upload"
+          accept=".xls,.xlsx"
+          :limit="1"
+          :multiple="false"
+          action="#"
+          :on-change="handleChange"
+          :auto-upload="false"
+          :show-file-list="false"
+        >
+          <el-button
+            slot="trigger"
+            icon="el-icon-upload2"
+            size="mini"
+            plain
+            type="primary"
+            >人工目标</el-button
+          >
+        </el-upload>
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -206,6 +228,7 @@
 </template>
 
 <script>
+import { importF } from "@/api/powerdistribution/power-outage-control";
 import DetailsDrawer from "./components/DetailsDrawer.vue";
 import InputReasonModel from "./components/InputReasonModel.vue";
 import { listMaintenanceStatistics } from "@/api/powerdistribution/maintenance";
@@ -300,6 +323,18 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    handleChange(file) {
+      let data = new FormData();
+      data.append("file", file.raw);
+      importF(data).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("导入成功");
+          this.$emit("refresh");
+        } else {
+          this.$message.error("导入失败" || res.msg);
+        }
+      });
+    },
   },
 };
 </script>

src/views/distributionnetwork/power-outage-control/target-display-board/components/TargetBar.vue

@@ -73,12 +73,12 @@ export default {
       var option = {
         legend: {
           type: "scroll",
-          top: "10%",
+          top: "8%",
         },
         grid: {
           left: "1%",
-          right: "1%",
-          bottom: "3%",
+          right: "3%",
+          bottom: "1%",
           containLabel: true,
         },
         tooltip: {},

src/views/distributionnetwork/power-outage-control/target-display-board/components/TargetLine.vue

@@ -67,12 +67,12 @@ export default {
         legend: {
           data: legend,
           type: "scroll",
-          top: "10%",
+          top: "8%",
         },
         grid: {
           left: "1%",
-          right: "1%",
-          bottom: "3%",
+          right: "3%",
+          bottom: "1%",
           containLabel: true,
         },
         xAxis: {

src/views/distributionnetwork/power-outage-control/target-display-board/index.vue

@@ -238,13 +238,13 @@
     <el-row :gutter="10" v-show="currentType != '列表'" v-loading="loading">
       <el-col :span="6">
         <el-card header="" class="mb8">
-          <TargetBar height="250px" ref="targetBarRef"></TargetBar>
+          <TargetBar height="350px" ref="targetBarRef"></TargetBar>
         </el-card>
       </el-col>
       <el-col :span="6">
         <el-card class="mb8">
           <TargetLine
-            height="250px"
+            height="350px"
             id="stopTimeMonth"
             ref="stopTargetLineRef"
           ></TargetLine>
@@ -253,7 +253,7 @@
       <el-col :span="6">
         <el-card class="mb8">
           <TargetLine
-            height="250px"
+            height="350px"
             id="planStopTimeMonth"
             ref="planStopTargetLineRef"
           ></TargetLine>
@@ -262,7 +262,7 @@
       <el-col :span="6">
         <el-card>
           <TargetLine
-            height="250px"
+            height="350px"
             id="errorStopTimeMonth"
             ref="errorStopTargetLineRef"
           ></TargetLine>
@@ -271,7 +271,7 @@
       <el-col :span="24">
         <el-card class="mb8">
           <TargetLine
-            height="250px"
+            height="300px"
             id="stopTimeMonth"
             ref="stopTargetLineRef"
           ></TargetLine>
@@ -280,7 +280,7 @@
       <el-col :span="24">
         <el-card class="mb8">
           <TargetLine
-            height="250px"
+            height="300px"
             id="planStopTimeMonth"
             ref="planStopTargetLineRef"
           ></TargetLine>
@@ -289,7 +289,7 @@
       <el-col :span="24">
         <el-card>
           <TargetLine
-            height="250px"
+            height="300px"
             id="errorStopTimeMonth"
             ref="errorStopTargetLineRef"
           ></TargetLine>

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

@@ -37,6 +37,16 @@
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item prop="reportDate" v-if="type == 1">
+        <el-radio-group
+          v-model="queryParams.teamType"
+          size="mini"
+          @change="getList"
+        >
+          <el-radio-button label="1">内部</el-radio-button>
+          <el-radio-button label="2">外部</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <div class="table">
       <el-table v-loading="loading" :data="dataList">
@@ -127,6 +137,7 @@ export default {
         pageSize: 10,
         reportDate: moment(new Date()).format("yyyyMM"),
         reportYear: null,
+        teamType: "1",
       },
       dataList: [],
     };

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

@@ -220,20 +220,6 @@
           prop="remark"
           :show-overflow-tooltip="true"
         />
-        <!-- <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row, '明细')"
-              >明细</el-button
-            >
-          </template>
-        </el-table-column> -->
       </el-table>
       <pagination
         class="page-box"

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

@@ -63,6 +63,24 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="风险类型" prop="exceptionType">
+        <el-select
+          style="margin-right: 8px"
+          size="mini"
+          v-model="queryParams.exceptionType"
+          placeholder="请选择"
+          clearable
+        >
+          <el-option label="全部" value=""> </el-option>
+          <el-option
+            v-for="item in workUnitOptions"
+            :key="item.organAbbr"
+            :label="item.organAbbr"
+            :value="item.organAbbr"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -108,6 +126,22 @@
           </template>
         </el-table-column>
         <el-table-column
+          label="风险类型"
+          align="center"
+          prop="exceptionType"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div v-for="(ite, i) in riskTypeList" :key="i">
+              <span v-if="ite.roleCode == scope.row.riskType">
+                <el-tag type="danger" effect="dark">{{
+                  ite.roleName
+                }}</el-tag></span
+              >
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
           label="作业风险"
           align="center"
           prop="riskType"
@@ -247,6 +281,7 @@ export default {
         workTeamNm: "",
         workPrincipNm: "",
         submitOrgNm: "",
+        exceptionType: "",
         pageNum: 1,
         pageSize: 10,
       },