Merge branch 'master' of http://124.70.43.205:3000/sunzehao/fd_dwgz_zhyw_nx

src/components/chart/pie/radar-pie-chart.vue

@@ -49,6 +49,10 @@
                 type: String,
                 default: "title",
             },
+            unit: {
+                type: String,
+                default: "",
+            },
         },
         data() {
             return {
@@ -59,6 +63,7 @@
         computed: {},
         methods: {
             initChart() {
+                let that = this
                 let option = {
                     color: [
                         "#3e73e9",
@@ -81,6 +86,10 @@
                             color: this.$store.state.themeName === "dark" ? "#fff" : "#000",
                             fontSize: util.vh(16),
                         },
+                        formatter: function(param) {
+                            let marker = '<span style="display:inline-block;margin-right:0.370vh;border-radius:0.926vh;width:0.926vh;height:0.926vh;background-color:' + partten.getColor("green") + ';"></span>';
+                            return param.seriesName + "<br >" + marker + param.name + "：" + param.value + that.unit;
+                        },
                     },
                     grid: {
                         top: 8,
@@ -269,7 +278,7 @@
             this.initChart();
         },
         watch: {
-            "$store.state.themeName"() {
+            list() {
                 this.initChart();
             },
         },

src/views/IntegratedAlarm/reliability/partsTemperatureAnalyse/index2.vue

@@ -94,6 +94,21 @@
               :label="res.name"
               align="center"
             >
+            <template #header="scope">
+              <div v-if="scope.column.label.indexOf('(') > 0">
+                <div style="font-size: 14px">
+                  {{
+                    scope.column.label.slice(0, scope.column.label.indexOf("("))
+                  }}
+                </div>
+                <div style="font-size: 12px">
+                  {{
+                    scope.column.label.slice(scope.column.label.indexOf("("))
+                  }}
+                </div>
+              </div>
+              <div v-else>{{ scope.column.label }}</div>
+            </template>
               <template #default="scope">
                 <span
                   :id="scope.row.id === tableData.length - 3 ? 'lastTable' : ''"

src/views/SandTable/SandTable.vue

@@ -83,6 +83,7 @@
               height="18vh"
               :list="warnChartDataZC"
               :title="warnPC ? '预警频次情况' : '预警时长情况'"
+              :unit="warnPC ? '次' : '秒'"
             />
           </template>
         </PanelSandToolbar>
@@ -144,6 +145,7 @@
               height="18vh"
               :list="probChartDataZC"
               :title="probPC ? '故障频次情况' : '故障时长情况'"
+              :unit="probPC ? '次' : '秒'"
             />
           </template>
         </PanelSandToolbar>
@@ -212,6 +214,7 @@
               height="18vh"
               :list="warnChartDataLH"
               :title="warnPC2 ? '预警频次情况' : '预警时长情况'"
+              :unit="warnPC2 ? '次' : '秒'"
             />
           </template>
         </PanelSandToolbar>
@@ -273,6 +276,7 @@
               height="18vh"
               :list="probChartDataLH"
               :title="probPC ? '故障频次情况' : '故障时长情况'"
+              :unit="probPC ? '次' : '秒'"
             />
           </template>
         </PanelSandToolbar>
@@ -998,12 +1002,12 @@ export default {
               name: it.name,
               value:
                 modelIds === "WT2000D121H85"
-                  ? that.warnPC
+                  ? that.probPC
                     ? it.times
-                    : it.hours
-                  : that.warnPC2
+                    : it.hours?it.hours:0
+                  : that.probPC2
                   ? it.times
-                  : it.hours,
+                  : it.hours?it.hours:0,
             };
             result.push(obj);
           });

src/views/economicsOperation/benchmarkingManagement/intervalBenchmarking/index.vue

@@ -137,7 +137,7 @@
             :key="item.code"
             :prop="item.code"
             :label="item.name"
-            :width="item.name.length == 4 ? 55 : 68"
+            :width="item.name.length == 4 ? 50 : 80"
             show-overflow-tooltip
             sortable
           >

src/views/economicsOperation/benchmarkingManagement/projectBenchmarking/index.vue

@@ -50,7 +50,7 @@
           </el-option>
         </el-select>
       </div> -->
-      <div class="station">
+      <div class="station" v-if="!displayDetail">
         项目：
         <el-select
           size="mini"
@@ -71,7 +71,7 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="station" v-if="!displayDetail">
         日期
         <div class="search-input">
           <el-date-picker
@@ -93,8 +93,8 @@
           round
           size="mini"
           class="buttons"
-          :disabled="displayDetail"
           @click="getXmdb"
+           v-if="!displayDetail"
           >搜 索</el-button
         >
         <el-button
@@ -261,7 +261,7 @@
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
           @size-change="handleSizeDChange"
-          :page-sizes="[23, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
@@ -332,7 +332,7 @@ export default {
         total: 0,
       },
       pageD: {
-        pagesize: 23,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/benchmarkingManagement/wiringBenchmarking/index.vue

@@ -71,7 +71,7 @@
           </el-option>
         </el-select>
       </div> -->
-      <div class="station">
+      <div class="station" v-if="!displayDetail">
         线路：
         <el-select
           size="mini"
@@ -92,7 +92,7 @@
           </el-option>
         </el-select>
       </div>
-      <div class="station">
+      <div class="station" v-if="!displayDetail">
         日期
         <div class="search-input">
               <el-date-picker
@@ -113,7 +113,7 @@
         <el-button
           round
           size="mini"
-          :disabled="displayDetail"
+          v-if="!displayDetail"
           class="buttons"
           @click="gerXldb"
           >搜 索</el-button
@@ -287,7 +287,7 @@
           :current-page="pageD.currentPage"
           :page-size="pageD.pagesize"
           @size-change="handleSizeDChange"
-          :page-sizes="[23, 50, 100, 500]"
+          :page-sizes="[20, 50, 100, 500]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="pageD.total"
         >
@@ -364,7 +364,7 @@ export default {
         total: 0,
       },
       pageD: {
-        pagesize: 23,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/components/search.vue

@@ -26,7 +26,7 @@
           <el-option
             v-for="item in wtList"
             :key="item.id"
-            :label="item.name"
+            :label="item.nemCode"
             :value="item.id"
           >
           </el-option>
@@ -48,9 +48,9 @@
       </el-form-item>
       <el-form-item label="等间隔" class="!mb-0">
         <el-radio-group v-model="queryForm.interval">
-          <el-radio :label="1">十分钟</el-radio>
-          <el-radio :label="2">十五分钟</el-radio>
-          <el-radio :label="3">三十分钟</el-radio>
+          <el-radio :label="1">一分钟</el-radio>
+          <el-radio :label="2">五分钟</el-radio>
+          <el-radio :label="3">十分钟</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item class="!mb-0">
@@ -73,7 +73,7 @@ const queryForm = reactive({
     dayjs().subtract(1, "day").format("YYYY-MM-DD"),
     dayjs().format("YYYY-MM-DD"),
   ],
-  interval: 3,
+  interval: 1,
 });
 /**场站 */
 const stationList = ref([]);
@@ -116,13 +116,13 @@ const funSubmit = async () => {
   };
   switch (queryForm.interval) {
     case 1:
-      query.interval = 600;
+      query.interval = 60;
       break;
     case 2:
-      query.interval = 900;
+      query.interval = 300;
       break;
     case 3:
-      query.interval = 1800;
+      query.interval = 600;
       break;
   }
   emits("submit", query);

src/views/economicsOperation/thematicAnalysis/MTBF/index.vue

@@ -93,7 +93,7 @@
             :label="val"
             v-for="(val, index) in tableHead"
             :key="index"
-            width="140"
+            width="160"
             sortable
           >
             <template v-slot="scope">

src/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/historyDetail.vue

@@ -106,7 +106,7 @@
         :current-page="page.currentPage"
         :page-size="page.pagesize"
         @size-change="handleSizeChange"
-        :page-sizes="[19, 50, 100, 500]"
+        :page-sizes="[20, 50, 100, 500]"
         layout="total, sizes, prev, pager, next, jumper"
         :total="page.total"
       >
@@ -152,7 +152,7 @@ export default {
         { id: -2, name: "光伏" },
       ],
       page: {
-        pagesize: 19,
+        pagesize: 20,
         currentPage: 1,
         total: 0,
       },

src/views/economicsOperation/windAnalyse/monthlyAnalysis/reportDialog.vue

@@ -600,7 +600,17 @@ export default {
     getFiveBarEchart(xAxis, lenged, series) {
       let option = {
         backgroundColor: this.showWhite ? "#fff" : "",
-        color: ["#e17e23", "#ba3237", "#c531c7", "#000", "#05bb4c"],
+        // color: ["#e17e23", "#ba3237", "#c531c7", "#000", "#05bb4c"],
+        color: ["#2999a0",
+        "#67b9ff",
+        "#ff6271",
+        "#05b2fa",
+        "#0ef167",
+        "#05bb4c",
+        "#4b55ae",
+        "#EDB32F",
+        "#DB5520",
+        "#323E6F"],
         title: {
           text: "损失电量分析",
           textStyle: {

src/views/economicsOperation/windAnalyse/singleWindAnasyle/historyDetail.vue

@@ -63,9 +63,21 @@
           header-align="center"
           align="center"
         >
-          <template #header="scope">
-            <div>{{ scope.column.label }}</div>
-          </template>
+        <template #header="scope">
+            <div v-if="scope.column.label.indexOf('(') > 0">
+            <div style="font-size: 14px">
+                {{
+                scope.column.label.slice(0, scope.column.label.indexOf("("))
+                }}
+            </div>
+            <div style="font-size: 12px">
+                {{
+                scope.column.label.slice(scope.column.label.indexOf("("))
+                }}
+            </div>
+            </div>
+            <div v-else>{{ scope.column.label }}</div>
+        </template>
         </el-table-column>
       </el-table>
       <el-pagination
@@ -121,9 +133,9 @@ export default {
       //     { id: -2, name: "光伏" },
       //   ],
       tableHeader: [
-        { title: "日发电量", code: "rfdl" },
-        { title: "月发电量", code: "yfdl" },
-        { title: "年发电量", code: "nfdl" },
+        { title: "日发电量(万kWh)", code: "rfdl" },
+        { title: "月发电量(万kWh)", code: "yfdl" },
+        { title: "年发电量(万kWh)", code: "nfdl" },
         // { title: "日应发电量", code: "ryfdl" },
         // { title: "月应发电量", code: "yyfdl" },
         // { title: "年应发电量", code: "nyfdl" },