chore: 1

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 时长分析详情 -->
   <el-drawer
-    :title="`[` + form.lineName + `]时长分析`"
+    :title="`[` + form.lineNm + `]时长分析`"
     :visible.sync="visible"
     :size="650"
     destroy-on-close
@@ -10,120 +10,107 @@
     <el-container v-loading="loading">
       <el-main>
         <el-form>
-          <el-form-item label="事件序号" prop="stopNo"
-            >{{ form.stopNo }}
+          <el-form-item label="事件序号" prop="eventSn"
+            >{{ form.eventSn }}
           </el-form-item>
           <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="线路名称" prop="lineName"
-                >{{ form.lineName }}
+              <el-form-item label="线路名称" prop="lineNm"
+                >{{ form.lineNm }}
               </el-form-item>
             </el-col>
-            <el-col :lg="12">
+            <!-- <el-col :lg="12">
               <el-form-item label="主分支名称" prop="branchName"
                 >{{ form.branchName }}
               </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24">
+            </el-col> -->
             <el-col :lg="12">
-              <el-form-item label="数据状态" prop="dataStatus"
-                >{{ form.dataStatus }}
-              </el-form-item>
-            </el-col>
-            <el-col :lg="12">
-              <el-form-item label="推送状态" prop="pushStatus"
-                >{{ form.pushStatus }}
+              <el-form-item label="数据状态" prop="excpStDsc"
+                >{{ form.excpStDsc }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="是否可维护" prop="repairFlag"
-                >{{ form.repairFlag }}
+              <el-form-item label="推送状态" prop="pushStDsc"
+                >{{ form.pushStDsc }}
               </el-form-item>
             </el-col>
             <el-col :lg="12">
-              <el-form-item label="是否纯专变" prop="isPureSpecia"
-                >{{ form.isPureSpecia }}
+              <el-form-item label="是否可维护" prop="isEdit">
+                <el-tag v-if="form.isEdit == '1'">是</el-tag>
+                <el-tag v-else>否</el-tag>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="事件类型" prop="eventType"
-                >{{ form.eventType }}
+              <el-form-item label="是否纯专变" prop="isPrivEvent">
+                <el-tag v-if="form.isPrivEvent == '1'">是</el-tag>
+                <el-tag v-else>否</el-tag>
               </el-form-item>
             </el-col>
             <el-col :lg="12">
-              <el-form-item label="研判停电性质" prop="stopType">
-                <div v-for="(ite, i) in stopTypeList" :key="i">
-                  <span v-if="ite.dictValue == form.stopType">
-                    <el-tag type="danger" effect="dark">{{
-                      ite.dictLabel
-                    }}</el-tag></span
-                  >
-                </div>
+              <el-form-item label="事件类型" prop="endEventTypDsc"
+                >{{ form.endEventTypDsc }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="停电起始时间" prop="startDate"
-                >{{ form.startDate }}
+              <el-form-item label="停电起始时间" prop="poweroffStartTm"
+                >{{ form.poweroffStartTm }}
               </el-form-item>
             </el-col>
             <el-col :lg="12">
-              <el-form-item label="停电终止时间" prop="endDate"
-                >{{ form.endDate }}
+              <el-form-item label="停电终止时间" prop="poweroffTermTm"
+                >{{ form.poweroffTermTm }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="停电时户数" prop="stopNum"
-                >{{ form.stopNum }}
+              <el-form-item label="停电时户数" prop="hourNum"
+                >{{ form.hourNum }}
               </el-form-item>
             </el-col>
             <el-col :lg="12">
-              <el-form-item label="所属市公司" prop="cityCompanyName"
-                >{{ form.cityCompanyName }}
+              <el-form-item label="研判停电性质" prop="judgePoweroffNatureDsc">
+                {{ form.judgePoweroffNatureDsc }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="所属县公司" prop="countyCompanyName"
-                >{{ form.countyCompanyName }}
+              <el-form-item label="所属市公司" prop="stdCityOrgNm"
+                >{{ form.stdCityOrgNm }}
               </el-form-item>
             </el-col>
             <el-col :lg="12">
-              <el-form-item label="所属供电所" prop="powerStationName"
-                >{{ form.powerStationName }}
+              <el-form-item label="所属县公司" prop="stdCountyOrgNm"
+                >{{ form.stdCountyOrgNm }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="单位编码" prop="companyNo"
-                >{{ form.companyNo }}
+              <el-form-item label="单位编码" prop="orgNo"
+                >{{ form.orgNo }}
               </el-form-item>
             </el-col>
             <el-col :lg="12">
-              <el-form-item label="变电站名称" prop="siteName"
-                >{{ form.siteName }}
+              <el-form-item label="变电站名称" prop="subsNm"
+                >{{ form.subsNm }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :lg="12">
-              <el-form-item label="停电户次数" prop="powerOutageHouseholds"
-                >{{ form.powerOutageHouseholds }}
+              <el-form-item label="停电户次数" prop="householdNum"
+                >{{ form.householdNum }}
               </el-form-item>
             </el-col>
             <el-col :lg="12">
-              <el-form-item label="停电线次数" prop="powerOutageLine"
-                >{{ form.powerOutageLine }}
+              <el-form-item label="停电线次数" prop="lineNum"
+                >{{ form.lineNum }}
               </el-form-item>
             </el-col>
           </el-row>

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

@@ -12,7 +12,7 @@
         <el-row :gutter="30">
           <el-col :span="24">
             <el-form-item label="事件序号">
-              <el-input v-model="form.stopNo" disabled></el-input>
+              <el-input v-model="form.eventSn" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,7 +72,7 @@ export default {
     cancelForm() {
       this.form = {
         planReason: "",
-        id: null,
+        eventSn: null,
       };
       this.loading = false;
       this.dialog = false;

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

@@ -66,10 +66,10 @@
           <template slot-scope="scope">
             <img
               class="icon-box"
-              v-if="scope.$index < 3"
-              :src="iconMap[`no${scope.$index + 1}`]"
+              v-if="scope.row['rankNum'] < 4"
+              :src="iconMap[`no${scope.row['rankNum']}`]"
             />
-            <span v-else> {{ scope.$index + 1 }}</span>
+            <span v-else> {{ scope.row["rankNum"] }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -107,6 +107,7 @@
         class="page-box"
         v-show="total > 0"
         :total="total"
+        layout="prev, pager, next"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"

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

@@ -93,10 +93,10 @@
         <template slot-scope="scope">
           <img
             class="icon-box"
-            v-if="scope.$index < 3"
-            :src="iconMap[`no${scope.$index + 1}`]"
+            v-if="scope.row['rankNum'] < 4"
+            :src="iconMap[`no${scope.row['rankNum']}`]"
           />
-          <span v-else> {{ scope.$index + 1 }}</span>
+          <span v-else> {{ scope.row["rankNum"] }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="companyName" label="单位" align="center">
@@ -172,6 +172,9 @@ export default {
   width: 100%;
 }
 ::v-deep {
+  .el-table__empty-text {
+    color: #fff;
+  }
   .el-table tr {
     background-color: transparent !important;
   }

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

@@ -74,7 +74,7 @@ export default {
           show: data.length == 0,
           textStyle: {
             color: "#fff",
-            fontSize: 20,
+            // fontSize: 20,
           },
           text: "暂无数据",
           left: "center",

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

@@ -313,7 +313,7 @@ export default {
           show: data.length == 0,
           textStyle: {
             color: "#fff",
-            fontSize: 20,
+            // fontSize: 20,
           },
           text: "暂无数据",
           left: "center",

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

@@ -215,7 +215,7 @@ export default {
           show: this.dataList.length == 0,
           textStyle: {
             color: "#fff",
-            fontSize: 20,
+            // fontSize: 20,
           },
           text: "暂无数据",
           left: "center",
@@ -278,11 +278,24 @@ export default {
             name: "目标值",
             type: "bar",
             data: targetData,
+            label: {
+              show: true,
+              position: "right",
+              fontSize: 14,
+              color: "#fff",
+            },
           },
           {
             name: "实际值",
             type: "bar",
             data: actualData,
+            barMinHeight: 10,
+            label: {
+              show: true,
+              position: "right",
+              fontSize: 14,
+              color: "#fff",
+            },
           },
         ],
       };

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

@@ -117,15 +117,23 @@ export default {
         tooltip: {
           trigger: "item",
           alwaysShowContent: true,
-          formatter: function (params) {
-            const v = Array.isArray(params.value)
-              ? params.value[2]
-              : params.value;
-            return (
-              params.name +
-              "<br/>作业数量 " +
-              `<span class="orange">${v || 0}</span>`
-            );
+          formatter: (params) => {
+            let str = "";
+            Object.keys(this.dataMap).forEach((key) => {
+              str +=
+                key +
+                "-作业数量 " +
+                `<span class="orange">${this.dataMap[key] || 0}</span> <br/>`;
+            });
+            return str;
+            // const v = Array.isArray(params.value)
+            //   ? params.value[2]
+            //   : params.value;
+            // return (
+            //   params.name +
+            //   "-作业数量 " +
+            //   `<span class="orange">${v || 0}</span> <br/>`
+            // );
           },
         },
         // visualMap: {