Merge branch 'xingbiao' of http://124.70.43.205:3000/lining/hb_sis_zhfx into lining

src/assets/styles/form.less

@@ -81,6 +81,11 @@
       flex: 0 0 auto;
       margin-left: 50px;
     }
+    .query-actions1 {
+      flex: 0 0 auto;
+     
+    }
+
   }
 
   input {

src/components/arcgis/arcgis.vue

@@ -344,7 +344,7 @@
                     attributes: {},
                     popupTemplate: null
                 };
-                console.log(item)
+            
                 let graphic = new Graphic(item);
                 img_graphics.push(graphic);
                 img_graphicsLayer.add(graphic);

src/components/chart/bar/list-bar-chart2.vue

@@ -69,7 +69,7 @@ export default {
     };
   },
   created() {
-    console.log("this.list", this.list);
+   
   },
   computed: {
     datas() {

src/components/chart/bar/multiple-bar-chart.vue

@@ -364,8 +364,7 @@ export default {
     },
   },
   created() {
-    // console.log(this.list,666666666666666666);
-    // console.log(this.units,444444444444444444);
+ 
     this.$nextTick(() => {
       this.id = "pie-chart-" + util.newGUID();
     });

src/components/chart/combination/area-line-chart.vue

@@ -292,7 +292,7 @@ export default {
       );
     },
     initChart () {
-      console.log("units:",this.units)
+    
       let that = this;
       let chart = echarts.init(this.$el);
 

src/components/chart/line/marker-line-chart.vue

@@ -304,6 +304,7 @@ export default {
   },
   created() {
     this.id = "pie-chart-" + util.newGUID();
+    // console.log('list',this.list);
   },
   mounted() {
     this.$nextTick(() => {

src/components/chart/line/multiple-y-line-chart.vue

@@ -239,7 +239,7 @@
                 const chart = echarts.init(this.$el);
 
                 let option = this.option(themeName);
-                console.log(option)
+           
                 chart.clear();
                 chart.setOption(option);
 

src/components/coms/cards/percent-card-2.vue

@@ -28,7 +28,7 @@
 import PercentBar from "../../chart/bar/percent-bar.vue";
 export default {
     created() {
-      console.log(777777777,this.TotalValue);
+    
     },
   components: {
     PercentBar,

src/components/coms/table/table-unpage.vue

@@ -154,7 +154,7 @@ export default {
       if (col.click) col.click(event, data);
     },
     onSort(col) {
-      // console.log(222222222);
+    
       if (col.sortable == true) {
         this.sortCol = col.field;
         switch (this.sortType) {

src/components/other/cesium/static/index.vue

@@ -295,7 +295,7 @@ export default {
       });
     },
     windyF() {
-      console.log(1111, this.windy);
+  
       var windy = new Windy(response, this.viewer);
       if (this.windy == null) {
         this.flyto(20000000);

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

@@ -284,6 +284,7 @@ export default {
   },
   created() {
     // 创建后
+    // console.log(999999,this.chartData);
   },
   beforeMount() {
     // 渲染前

src/views/Decision/Decision2.vue

@@ -94,7 +94,7 @@
           </div>
         </div>
       </div>
-      <div class="query-actions">
+      <div :class="detailShow == 2 ? 'query-actions1 ' : 'query-actions'">
         <button class="btn green">搜索</button>
         <button class="btn" @click="dbfx">对标分析</button>
         <button class="btn">导出</button>
@@ -178,7 +178,7 @@
     >
       <dayinfo
         :radarValue="radarValue"
-		:title="[windNum,windNum2]"
+        :title="[windNum, windNum2]"
         :windNum="windNum"
         :windNum2="windNum2"
         :tabs="tabs"
@@ -209,6 +209,7 @@ export default {
   },
   data() {
     let that = this;
+  
     return {
       tableIdArr: [], //放checkbox的id数组
       tableId: [],
@@ -229,7 +230,7 @@ export default {
             template: () => {
               return "<input class='check curCheckBox' type='CheckBox' />";
             },
-            click: function(event, data) {
+            click: function (event, data) {
               var dataId = that.tableIdArr[data.index - 1];
               if (event.target.checked == false && that.checkLength <= 2) {
                 that.tableId.forEach((item, i) => {
@@ -434,27 +435,27 @@ export default {
             field: "cz",
             is_num: false,
             is_light: false,
-            template: function() {
+            template: function () {
               return "<a class='action'>详情</a>";
             },
-            click: function(event, data) {
+            click: function (event, data) {
               var dataId = that.tableIdArr[data.index - 1];
               that.clearDb();
               that.detailShow = 2;
-              var that = this;
 
-              api.benchmarkingDetails({
+              api
+                .benchmarkingDetails({
                   id: dataId,
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
                   sort: "",
-              }).then((res) => {
-             var dataTab = [];
+                })
+                .then((res) => {
+                  var dataTab = [];
                   res.data.forEach((item, index) => {
                     that.tableIdArr.push(item.id);
 
-                    console.log(this,that)
                     dataTab.push({
                       //表格
                       index: index + 1,
@@ -486,57 +487,7 @@ export default {
                     });
                   });
                   that.tableDataDetail.data = dataTab;
-              });
-
-              // that.API.requestData({
-              //   method: "GET",
-              //   baseURL: "http://10.83.66.220:8020/",
-              //   subUrl: "benchmarking/details",
-              //   data: {
-              //     id: dataId,
-              //     beginDate: that.value4,
-              //     endDate: that.value5,
-              //     target: "",
-              //     sort: "",
-              //   },
-              //   success(res) {
-              //     var dataTab = [];
-              //     res.data.forEach((item, index) => {
-              //       that.tableIdArr.push(item.id);
-
-              //       dataTab.push({
-              //         //表格
-              //         index: index + 1,
-              //         fdl: item.fdl,
-              //         name: item.name,
-              //         zhpm: item.zhpm,
-              //         gzssdl: item.gzssdl,
-              //         jxssdlpm: item.jxssdlpm,
-              //         jxssdl: item.jxssdl,
-              //         xnssdlpm: item.xnssdlpm,
-              //         xnssdl: item.xnssdl,
-              //         xdssdlpm: item.xdssdlpm,
-              //         xdssdl: item.xdssdl,
-              //         slssdlpm: item.slssdlpm,
-              //         slssdl: item.slssdl,
-              //         fnlylpm: item.fnlylpm,
-              //         fnlyl: item.fnlyl,
-              //         gzsslpm: item.gzsslpm,
-              //         gzssl: item.gzssl,
-              //         jxsslpm: item.jxsslpm,
-              //         jxssl: item.jxssl,
-              //         qflpm: item.qflpm,
-              //         qfl: item.qfl,
-              //         xnsslpm: item.xnsslpm,
-              //         xnssl: item.xnssl,
-              //         slsslpm: item.slsslpm,
-              //         slssl: item.slssl,
-              //         is_light: false,
-              //       });
-              //     });
-              //     that.tableDataDetail.data = dataTab;
-              //   },
-              // });
+                });
             },
           },
         ],
@@ -563,10 +514,10 @@ export default {
             field: "check",
             is_num: false,
             is_light: false,
-            template: function() {
+            template: function () {
               return "<input class='check curCheckBox checkItem' type='CheckBox'/>";
             },
-            click: function(event, data) {
+            click: function (event, data) {
               var dataId = that.tableIdArr[data.index - 1];
               if (event.target.checked == false && that.checkLength <= 2) {
                 that.tableId.forEach((item, i) => {
@@ -770,15 +721,11 @@ export default {
   },
   methods: {
     ChangZhanVal() {
-
-      api.benchmarkingWplist2({
-      }).then((res) => {
-         //   that.value2.push(res.data[0].id);
-          this.ChangZhan = res.data;
-          //  that.AjaxCommon();
-          this.XiangMuVal(this.value2);
-          console.log("resCHANzhan:", res.data);
-          console.log("value2:", this.value2);
+      api.benchmarkingWplist2({}).then((res) => {
+        //   that.value2.push(res.data[0].id);
+        this.ChangZhan = res.data;
+        //  that.AjaxCommon();
+        this.XiangMuVal(this.value2);
       });
 
       // var that = this;
@@ -799,19 +746,20 @@ export default {
     ChangZhanChange(val) {
       this.value1 = val;
       this.value2 = [];
-    //   this.value2 = val;
+      //   this.value2 = val;
       this.value3 = [];
       this.AjaxCommon();
       this.XiangMuVal(val);
       this.clearDb();
     },
     XiangMuVal(val) {
-
- api.benchmarkingProjectList({
-        wpids: val,
-      }).then((res) => {
-       this.XiangMu = res.data;
-      });
+      api
+        .benchmarkingProjectList({
+          wpids: val,
+        })
+        .then((res) => {
+          this.XiangMu = res.data;
+        });
 
       // var that = this;
       // that.API.requestData({
@@ -831,17 +779,18 @@ export default {
       this.value2 = val;
       this.value3 = [];
       this.AjaxCommon();
-    //   this.XiangMuVal(val);
+      //   this.XiangMuVal(val);
       this.XianLuVal(val);
       this.clearDb();
     },
     XianLuVal(val) {
-
-      api.benchmarkingLineList({
-         projects: val,
-      }).then((res) => {
-        this.XianLu = res.data;
-      });
+      api
+        .benchmarkingLineList({
+          projects: val,
+        })
+        .then((res) => {
+          this.XianLu = res.data;
+        });
 
       // var that = this;
       // that.API.requestData({
@@ -888,18 +837,18 @@ export default {
       }
     },
     AjaxCommon() {
-
-      api.benchmarkingWxssl({
-         wpids: this.value1,
+      api
+        .benchmarkingWxssl({
+          wpids: this.value1,
           projectids: this.value2,
           lineids: this.value3,
           beginDate: this.value4,
           endDate: this.value5,
           target: "",
           sort: "",
-      }).then((res) => {
-         this.ajaxData = res.data;
-          console.log("resData:", res);
+        })
+        .then((res) => {
+          this.ajaxData = res.data;
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -1024,7 +973,7 @@ export default {
           this.outerLl = ll;
 
           this.analyis = analyis;
-      });
+        });
 
       // var that = this;
       // that.API.requestData({
@@ -1368,6 +1317,10 @@ export default {
 </script>
 
 <style lang="less">
+// .actions-B {
+//   flex: 0 0 auto;
+//   margin-left: 50px;
+// }
 .decision-page-2 {
   .content .project-table {
     tbody {

src/views/Home/Home.vue

@@ -84,7 +84,7 @@
         </Row>
       </div>
     </Row>
-    <Row type="flex" style="height: calc(40vh - 236px); margin-top: 20px">
+    <Row type="flex" style="height: calc(40vh - 236px); margin-top: 30px">
       <Col :span="12">
         <toolbar-panel
           :title="

src/views/Knowledge/knowinfo.vue

@@ -39,6 +39,10 @@ export default {
 
   mounted() {
     this.infoObj = this.data;
+    console.log('this.infoObj',this.infoObj);
+  },
+  created(){
+    
   },
 
   watch: {

src/views/NewPages/daily.vue

@@ -2,11 +2,7 @@
   <div class="daily">
     <h1 class="tit">国电电力河北新能源日报</h1>
     <div class="daily-table">
-      <el-table
-       
-        :data="tableData"
-        :row-class-name="tableRowClassName"
-      >
+      <el-table :data="tableData" :row-class-name="tableRowClassName">
         <el-table-column
           prop="foreignkeyname"
           align="center"
@@ -137,7 +133,6 @@ export default {
     };
   },
   created() {
-    // console.log(this.dateArea);
     this.getList();
   },
   methods: {
@@ -189,13 +184,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-// /deep/.el-table .warning-row {
-//   background: rgb(34, 34, 33);
-// }
-
-// /deep/.el-table .success-row {
-//   background: #f0f9eb;
-// }
 .daily {
   .tit {
     text-align: center;

src/views/NewPages/form.vue

@@ -10,20 +10,20 @@
         :data="tableData"
         :header-cell-style="{
           height: '40px',
-          background: 'rgba(83, 98, 104,0.2)',
+          background: 'rgba(22, 31, 30,1)',
           color: '#b2bdc0',
           'border-bottom': '0px solid red',
         }"
         :cell-style="{
           height: '40px',
-
+       background: 'rgba(0, 0, 0,1)',
           'border-bottom': 'solid 0px #242424',
         }"
         stripe
         style="
           width: 100%;
           margin-bottom: 10px;
-          background: 'rgba(83, 98, 104)';
+          background: 'rgba(83, 98, 104,1)';
         "
       >
         <el-table-column
@@ -137,4 +137,8 @@ export default {
 /deep/.el-table__fixed::before {
   height: 0;
 }
+/deep/.main-body .el-table.el-table--striped .el-table__body tr.el-table__row--striped td{
+  opacity: 1!important;
+  background-color: yellowgreen;
+}
 </style>

src/views/NewPages/station.vue

@@ -144,30 +144,30 @@ export default {
     },
     addClass({ row, column, rowIndex, columnIndex }) {
       // if(columnIndex === 4){
-      if (parseFloat(row.麻黄山风电场) < 0) {
-        return "background:yellow";
-      }
-      if (parseFloat(row.牛首山风电场) < 0) {
-        return "background:yellow";
-      }
-      if (parseFloat(row.青山风电场) < 0) {
-        return "background:yellow";
-      }
-      if (parseFloat(row.石板泉风电场) < 0) {
-        return "background:yellow";
-      }
-      if (parseFloat(row.香山风电场) < 0) {
-        return "background:yellow";
-      }
-      if (parseFloat(row.大武口电站) < 0) {
-        return "background:yellow";
-      }
-      if (parseFloat(row.平罗光伏电站) < 0) {
-        return "background:yellow";
-      }
-      if (parseFloat(row.宣和光伏发电站) < 0) {
-        return "background:yellow";
-      }
+      // if (parseFloat(row.麻黄山风电场) < 0) {
+      //   return "background:yellow";
+      // }
+      // if (parseFloat(row.牛首山风电场) < 0) {
+      //   return "background:yellow";
+      // }
+      // if (parseFloat(row.青山风电场) < 0) {
+      //   return "background:yellow";
+      // }
+      // if (parseFloat(row.石板泉风电场) < 0) {
+      //   return "background:yellow";
+      // }
+      // if (parseFloat(row.香山风电场) < 0) {
+      //   return "background:yellow";
+      // }
+      // if (parseFloat(row.大武口电站) < 0) {
+      //   return "background:yellow";
+      // }
+      // if (parseFloat(row.平罗光伏电站) < 0) {
+      //   return "background:yellow";
+      // }
+      // if (parseFloat(row.宣和光伏发电站) < 0) {
+      //   return "background:yellow";
+      // }
     },
     changeNum(v) {
       const date = this.routerData.data.theday;

src/views/Status/components/status-panel.vue

@@ -25,18 +25,23 @@
             :key="index"
             :class="{ light: item.is_light }"
           >
-            <div class="f1">{{ item.f1.slice(0, 3) }}</div>
+            <div class="f1">{{ item.f1.substring(0, item.f1.length - 1) }}</div>
             <div class="f2">
-              {{ item.f2 }} <div v-if="item.f3">:</div> 
+              {{ item.f2 }}
+              <div v-if="item.f3">:</div>
               <div class="f3">
                 {{ item.f3 }}
                 <div v-if="!item.f3">0</div>
-                </div>
+              </div>
             </div>
 
             <div class="f4">
-              {{ item.f4 }}<div v-if="item.f5">:</div> 
-              <div class="f5"> <div v-if="!item.f3"></div>{{ item.f5 }}</div>
+              {{ item.f4 }}
+              <div v-if="item.f5">:</div>
+              <div class="f5">
+                <div v-if="!item.f3"></div>
+                {{ item.f5 }}
+              </div>
             </div>
           </div>
         </div>
@@ -239,7 +244,7 @@ export default {
           }
           .f2,
           .f4 {
-              height: 50px;
+            height: 50px;
             display: inline-block;
             text-align: left;
             font-size: 1.8vh;

src/views/allLifeManage/tab3.vue

@@ -211,7 +211,7 @@ export default {
             pagesize: 50000
           },
           success (res) {
-            console.log('resTable:',res)
+   
             that.tableData.data = res.data.records;
           }
         });

src/views/historySearch/index.vue

@@ -237,7 +237,6 @@ export default {
   methods: {
     // 获取设备结构
     getEquipmentStructure() {
-      console.log(6666666666);
       api.paramComparisonEquipmentStructure({}).then((res) => {
         // 请求成功的回调
         let treeData = [];
@@ -303,7 +302,6 @@ export default {
 
     // 获取关键节点
     getEquipmentParams() {
-      console.log(666666666666666666666);
       api.paramComparisonEquipmentParams({}).then((res) => {
         that.gjcsOptions = res.data;
       });

src/views/performanceAnalysis/index.vue

@@ -40,7 +40,7 @@
       </div>
     </div>
     <div class="df-table">
-      <ComTable height="78vh" :data="tableData"></ComTable>
+      <ComTable height="49vh" :data="tableData"></ComTable>
     </div>
     <el-dialog
       title="单机历史性能分析"
@@ -122,7 +122,7 @@
           <button class="btn green" @click="exportExcel2">导出</button>
         </div>
       </div>
-      <ComTable height="78vh" :data="historyTableData"></ComTable>
+      <ComTable height="49vh" :data="historyTableData"></ComTable>
     </el-dialog>
   </div>
 </template>

src/views/singleAnalysis/double-line-chart.vue

@@ -274,6 +274,7 @@ export default {
       this.id = "pie-chart-" + util.newGUID();
     });
     this.newlist = this.list;
+    console.log('this.newlist',this.newlist);
     // console.warn(this.list);
     // console.warn(this.newlist);
   },

src/views/singleAnalysis/index.vue

@@ -57,7 +57,7 @@
       top="10vh"
       custom-class="modal"
       :close-on-click-modal="false"
-	  :destroy-on-close='true'
+      :destroy-on-close="true"
     >
       <ZnzhFx :wtId="wtId" :year="year" :month="month" />
     </el-dialog>
@@ -232,16 +232,18 @@ export default {
       that.year = new Date(this.recorddate).formatDate("yyyy");
       that.month = new Date(this.recorddate).formatDate("MM");
       that.dialogVisible = true;
-      that.$router.push({path:`/decision/znzhfx/${row.windturbineid}/${new Date(this.recorddate).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`})
+      that.$router.push({
+        path: `/decision/znzhfx/${row.windturbineid}/${new Date(
+          this.recorddate
+        ).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`,
+      });
     },
     // 请求服务
     requestData() {
-
-api.powercompareWindfarmAjax({
-      }).then((res) => {
-          this.wpArray = res.data;
-          this.wpId = res.data[0].id;
-          this.getOutputSpeedList(this.wpId);
+      api.powercompareWindfarmAjax({}).then((res) => {
+        this.wpArray = res.data;
+        this.wpId = res.data[0].id;
+        this.getOutputSpeedList(this.wpId);
       });
 
       // let that = this;
@@ -263,15 +265,15 @@ api.powercompareWindfarmAjax({
           msg: "场站与日期不可为空",
         });
       } else {
-
-
-        api.singleanalysisSingleanalysisMain({
-           wpId,
+        api
+          .singleanalysisSingleanalysisMain({
+            wpId,
             isAsc: this.isAsc,
             year: new Date(this.recorddate).getFullYear(),
             month: new Date(this.recorddate).getMonth() + 1,
-      }).then((res) => {
-           res.data.forEach((ele) => {
+          })
+          .then((res) => {
+            res.data.forEach((ele) => {
               for (let key in ele) {
                 ele[key] = ele[key] || 0;
               }
@@ -279,7 +281,7 @@ api.powercompareWindfarmAjax({
             this.tableDataEnd = res.data[res.data.length - 1];
             res.data.pop();
             this.tableData.data = res.data;
-      });
+          });
 
         // that.API.requestData({
         //   method: "POST",