常规上传

src/views/Agc/Agc.vue

@@ -2,7 +2,12 @@
   <div class="agc">
     <el-scrollbar>
       <div class="panel-groups">
-        <AgcPanel class="panel-item" v-for="(data, index) of datas" :key="index" :data="data"></AgcPanel>
+        <AgcPanel
+          class="panel-item"
+          v-for="(data, index) of datas"
+          :key="index"
+          :data="data"
+        ></AgcPanel>
       </div>
     </el-scrollbar>
   </div>
@@ -84,13 +89,482 @@ export default {
   },
   // 函数
   methods: {
-    select: function(item) {
+    select: function (item) {
       // console.log(item);
     },
 
     // 请求服务
     requestData(showLoading) {
       let that = this;
+      let datas = [];
+      [{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        },{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        },{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        },{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        },{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        },{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        },{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        },{
+          jcxx: {
+            name: "场站1",
+            icon: "fa fa-gears",
+            ddmc: "副标题",
+            AGC001: 300,
+            AGC002: 300,
+            AGC003: 300,
+            AGC004: 300,
+            AGC005: 1,
+            AGC006: 0,
+            AGC007: 1,
+            AGC008: 0,
+            ZZSGL: 300,
+            ycgl: 500,
+          },
+          tb: [
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+            {
+              time: "2025-04-27 11:03:49",
+              llgl: that.BASE.randomNum(10, 50),
+              sjgl: that.BASE.randomNum(10, 50),
+              xdzl: that.BASE.randomNum(10, 50),
+              ycgl: that.BASE.randomNum(10, 50),
+            },
+          ],
+        }].forEach((pEle) => {
+        pEle.jcxx.icon = "fa fa-gears";
+        pEle.jcxx.color = pEle.jcxx.zt === 0 ? "red" : "green";
+
+        let keys = ["llgl", "sjgl", "xdzl", "ycgl"];
+
+        let tb = [
+          {
+            title: "理论功率",
+            yAxisIndex: 0,
+            value: [],
+          },
+          {
+            title: "实际功率",
+            yAxisIndex: 0,
+            value: [],
+          },
+          {
+            title: "限电指令",
+            yAxisIndex: 0,
+            value: [],
+          },
+          {
+            title: "预测功率",
+            yAxisIndex: 0,
+            value: [],
+          },
+        ];
+
+        keys.forEach((key, keyIndex) => {
+          pEle.tb.forEach((cEle, cIndex) => {
+            tb[keyIndex].value.push({
+              text: new Date(cEle.time).formatDate("hh:mm"),
+              value: cEle[keys[keyIndex]] || 0,
+            });
+          });
+        });
+
+        pEle.tb = tb;
+        datas.push(pEle);
+      });
+      that.datas = datas;
+      return;
+
       that.API.requestData({
         showLoading,
         method: "POST",
@@ -130,7 +604,10 @@ export default {
 
               keys.forEach((key, keyIndex) => {
                 pEle.tb.forEach((cEle, cIndex) => {
-                  tb[keyIndex].value.push({ text: new Date(cEle.time).formatDate("hh:mm"), value: cEle[keys[keyIndex]] || 0 });
+                  tb[keyIndex].value.push({
+                    text: new Date(cEle.time).formatDate("hh:mm"),
+                    value: cEle[keys[keyIndex]] || 0,
+                  });
                 });
               });
 

src/views/Agc/components/agc-panel.vue

@@ -1,5 +1,11 @@
 <template>
-  <ComPanel v-if="data && data.jcxx" :title="data.jcxx.name || '---'" :icon="data.jcxx.icon" :subTitle="data.jcxx.ddmc || '---'" :color="data.jcxx.color">
+  <ComPanel
+    v-if="data && data.jcxx"
+    :title="data.jcxx.name || '---'"
+    :icon="data.jcxx.icon"
+    :subTitle="data.jcxx.ddmc || '---'"
+    :color="data.jcxx.color"
+  >
     <table class="panel-table">
       <tbody>
         <tr>
@@ -54,37 +60,72 @@
           <td>
             <div class="data-item">
               <span class="data-item-name">AGC投入</span>
-              <i :class="'data-item-icon fa fa-chrome ' + (data.jcxx.AGC006 === 1 ? 'red' : 'green')"></i>
+              <i
+                :class="
+                  'data-item-icon fa fa-chrome ' +
+                  (data.jcxx.AGC006 === 1 ? 'red' : 'green')
+                "
+              ></i>
             </div>
           </td>
           <td>
             <div class="data-item">
               <span class="data-item-name">AGC远方</span>
-              <i :class="'data-item-icon fa fa-chrome ' + (data.jcxx.AGC005 === 1 ? 'red' : 'green')"></i>
+              <i
+                :class="
+                  'data-item-icon fa fa-chrome ' +
+                  (data.jcxx.AGC005 === 1 ? 'red' : 'green')
+                "
+              ></i>
             </div>
           </td>
           <td>
             <div class="data-item">
               <span class="data-item-name">有功增闭锁</span>
-              <i :class="'data-item-icon fa fa-chrome ' + (data.jcxx.AGC008 === 1 ? 'red' : 'green')"></i>
+              <i
+                :class="
+                  'data-item-icon fa fa-chrome ' +
+                  (data.jcxx.AGC008 === 1 ? 'red' : 'green')
+                "
+              ></i>
             </div>
           </td>
           <td>
             <div class="data-item">
               <span class="data-item-name">有功减闭锁</span>
-              <i :class="'data-item-icon fa fa-chrome ' + (data.jcxx.AGC007 === 1 ? 'red' : 'green')"></i>
+              <i
+                :class="
+                  'data-item-icon fa fa-chrome ' +
+                  (data.jcxx.AGC007 === 1 ? 'red' : 'green')
+                "
+              ></i>
             </div>
           </td>
         </tr>
       </tbody>
     </table>
     <!-- 查看默认实例去除末尾参数 :list 即可 -->
-    <DoubleLineChart v-if="chartType === 'double'" height="13.889vh" :list="data.tb || chartData" @chartClick="chartClick($event)" :isChartClick="true"></DoubleLineChart>
+    <DoubleLineChart
+      v-if="chartType === 'double'"
+      height="13.889vh"
+      :list="data.tb || chartData"
+      @chartClick="chartClick($event)"
+      :isChartClick="true"
+    ></DoubleLineChart>
     <!-- <MultipleLineChart v-if="chartType === 'multiple'" height="13.889vh" :list="data.tb || chartData" :hoverType="'axis'"></MultipleLineChart> -->
-  	<el-dialog v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
-			:close-on-click-modal="true">
-      <DoubleLineChart height="70vh" :list="data.tb || chartData" myUnit='MW'></DoubleLineChart>
-		</el-dialog>
+    <el-dialog
+      v-model="dialogVisible"
+      width="70%"
+      top="10vh"
+      custom-class="modal"
+      :close-on-click-modal="true"
+    >
+      <DoubleLineChart
+        height="70vh"
+        :list="data.tb || chartData"
+        myUnit="MW"
+      ></DoubleLineChart>
+    </el-dialog>
   </ComPanel>
 </template>
 
@@ -124,7 +165,7 @@ export default {
   // 数据
   data() {
     return {
-      dialogVisible:false,
+      dialogVisible: false,
       list: [
         {
           title: "平均风速",
@@ -233,9 +274,9 @@ export default {
   },
   // 函数
   methods: {
-    chartClick(){
+    chartClick() {
       this.dialogVisible = true;
-    }
+    },
   },
   // 生命周期钩子
   beforeCreate() {
@@ -264,7 +305,7 @@ export default {
     // 数据更新后
   },
   watch: {
-    daya(res) {
+    data(res) {
       this.list = res;
     },
   },

src/views/Decision/Decision3.vue

@@ -87,28 +87,32 @@
         <Table :data="tableData" ref="curRef"></Table>
       </div>
       <!-- 风资源列表 -->
-      <!-- <div class="direction-info mg-b-16">
-				<table class="com-table">
-					<tbody>
-						<tr>
-							<td v-for="(col, i) of tableData.column" :key="i">
-								<div v-if="i == 0">22</div>
-								<div v-if="i == 1">风资源</div>
-								<div v-if="i != 0 && i != 1">
-									<div class="direction-title">3.123</div>
-									<div class="direction-chart">
-										<DirectionRadarChart :width="'70%'" :height="'232px'" :value="90" />
-										<div class="legend mg-t-16">
-											<span class="dot"></span>
-											<span>静风频率为2</span>
-										</div>
-									</div>
-								</div>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div> -->
+      <div class="direction-info mg-b-16">
+        <table class="com-table">
+          <tbody>
+            <tr>
+              <td v-for="(col, i) of tableData.column" :key="i">
+                <div v-if="i == 0">22</div>
+                <div v-if="i == 1">风资源</div>
+                <div v-if="i != 0 && i != 1">
+                  <div class="direction-title">3.123</div>
+                  <div class="direction-chart">
+                    <DirectionRadarChart
+                      :width="'70%'"
+                      :height="'232px'"
+                      :value="90"
+                    />
+                    <div class="legend mg-t-16">
+                      <span class="dot"></span>
+                      <span>静风频率为2</span>
+                    </div>
+                  </div>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
       <el-row class="mg-b-16">
         <el-col :span="12">
           <panel title="发电量占比">
@@ -163,7 +167,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
-		:title="[windNum,windNum2]"
+        :title="[windNum, windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"
@@ -176,6 +180,7 @@
 <script>
 import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
+import DirectionRadarChart from "../../components/chart/radar/direction-radar-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";
 import Table from "./table.vue";
@@ -191,6 +196,7 @@ export default {
     MultipleBarChart,
     Dayinfo,
     ToolbarPanel,
+    DirectionRadarChart,
   },
   data() {
     let that = this;
@@ -199,7 +205,8 @@ export default {
       tableId: [],
       checkLength: 0, //对标分析只能选择2个
       tableData: {
-        column: that.column1,
+        // column: that.column1,
+        column: [{}, {}, {}, {}],
         data: [],
       },
       tableDataDetail: {

src/views/Home/Home.vue

@@ -834,7 +834,7 @@ export default {
   },
   data() {
     return {
-      bba:"",
+      bba: "",
       historyWpId: "",
       historyPlanBtnName: "",
       timmer: null, // 计时器
@@ -855,7 +855,7 @@ export default {
       ],
       tqmap5: [],
       jczbmap: {},
-      rdlmap:{},
+      rdlmap: {},
       wxssmap: {},
       gxkmap: {},
       mxztmap: {},
@@ -995,10 +995,10 @@ export default {
                   ? "日照强度"
                   : "风速",
               value:
-               that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
+                that.wpId === "-2" || that.wpId.indexOf("GDC") !== -1
                   ? that.bba
                   : `${res.data.jczbmap.ssfs}`,
-               
+
               dialogTitle:
                 that.wpId == 0
                   ? "详情"
@@ -1057,17 +1057,17 @@ export default {
               // total: res.data.jczbmap.rfdlsx,
               total:
                 res.data.jczbmap.rycfdl >= res.data.jczbmap.rfdl
-                  ? res.data.jczbmap.rycfdl+1
-                  : res.data.jczbmap.rfdl+1,
+                  ? res.data.jczbmap.rycfdl + 1
+                  : res.data.jczbmap.rfdl + 1,
             },
             {
               name: "实际发电量",
-              value: that.rdlmap.rfdl ,
+              value: that.rdlmap.rfdl,
               // total: res.data.jczbmap.rfdlsx,
               total:
                 res.data.jczbmap.rycfdl >= that.rdlmap.rfdl
-                  ? res.data.jczbmap.rycfdl+1
-                  : that.rdlmap.rfdl+1,
+                  ? res.data.jczbmap.rycfdl + 1
+                  : that.rdlmap.rfdl + 1,
             },
             {
               name: "当月预测电量",
@@ -1110,7 +1110,7 @@ export default {
           id: that.wpId,
         },
         success(res) {
-           console.log(189,res);
+          console.log(189, res);
           // let rdlKey = ["value1", "value2", "value3", "speed"];
           // let dw = {
           //   units: "",
@@ -1233,13 +1233,13 @@ export default {
         },
         success(res) {
           //  console.log(189,res);
-            let nbrdlmap=[]
-          nbrdlmap=res.data.rdlmap
-          const lastItem = nbrdlmap[nbrdlmap.length - 1];  // 获取最后一项对象
-          const desiredProperty = lastItem.speed;  // 获取某个属性的值
-           that.bba=desiredProperty
+          let nbrdlmap = [];
+          nbrdlmap = res.data.rdlmap;
+          const lastItem = nbrdlmap[nbrdlmap.length - 1]; // 获取最后一项对象
+          const desiredProperty = lastItem.speed; // 获取某个属性的值
+          that.bba = desiredProperty;
           //  console.log(that.bba);
-               
+
           let rdlKey = ["value1", "value2", "value3", "speed"];
           let dw = {
             units: "",
@@ -1325,7 +1325,7 @@ export default {
           //     value: [],
           //   },
           // ];
-          console.log(89,res);
+          console.log(89, res);
 
           rdlKey.forEach((keyEle, keyIndex) => {
             res.data.rdlmap.forEach((cEle) => {
@@ -1336,15 +1336,15 @@ export default {
             });
           });
 
-           that.rdlmap={
-            swdl:res.data.zdlmap.swdl.toFixed(2),
-            rfdl:res.data.zdlmap.rfdl.toFixed(2),
-            yfdl:res.data.zdlmap.yfdl.toFixed(2),
-            nfdl:res.data.zdlmap.nfdl.toFixed(2),
-            zjrl:res.data.zdlmap.zjrl.toFixed(2),
-            ylyxs:res.data.zdlmap.ylyxs,
-            nlyxs:res.data.zdlmap.nlyxs
-            }
+          that.rdlmap = {
+            swdl: res.data.zdlmap.swdl.toFixed(2),
+            rfdl: res.data.zdlmap.rfdl.toFixed(2),
+            yfdl: res.data.zdlmap.yfdl.toFixed(2),
+            nfdl: res.data.zdlmap.nfdl.toFixed(2),
+            zjrl: res.data.zdlmap.zjrl.toFixed(2),
+            ylyxs: res.data.zdlmap.ylyxs,
+            nlyxs: res.data.zdlmap.nlyxs,
+          };
 
           // glKey.forEach((keyEle, keyIndex) => {
           //   res.data.glvos.forEach((cEle) => {
@@ -1440,7 +1440,7 @@ export default {
           targetName,
         },
         success(res) {
-          console.log(123,res);
+          console.log(123, res);
           that.dialogShow = true;
           that.dialogData = res.data;
           that.dialogType = dialogType;

src/views/WindSite/components/boosterstation/ak.vue

@@ -4965,11 +4965,7 @@
       custom-class="modal"
       :close-on-click-modal="false"
     >
-<<<<<<< HEAD
-      <nbq-screen :nbqIndex="nbqIndex" :datas="ajaxData" />
-=======
       <nbq-screen :datas="ajaxData" :nbq-index="nbqIndex"/>
->>>>>>> e312d8e426b12733a5b2d4394ab47f9cc7d9d90c
     </el-dialog>
     <!-- agc信息图 -->
     <el-dialog