Merge branch 'master' of http://39.105.58.247:3100/powerForecast/powerForecast-ui

src/views/board.vue

@@ -69,11 +69,11 @@
 					</div>
 					<el-table id="rainfalldataTable" :data="rainfalldataList" border :stripe="false" :style='{"padding":"0","borderColor":"rgba(92,135,230,.3)","borderWidth":"1px 0 0 1px","background":"none","width":"100%","overflow-y":"scroll","borderStyle":"solid","height":"calc(100% - 36px)"}'>
 						<el-table-column :resizable="true" :sortable="false" prop="subNm" label="变电站"/>
-						</el-table-column>
+						<!-- </el-table-column> -->
 							<el-table-column :resizable="true" :sortable="false" prop="compNm" label="归属旗县"/>
-						</el-table-column>
+						<!-- </el-table-column> -->
 						<el-table-column :resizable="true" :sortable="false" prop="temperature" label="温度(℃)"/>
-						</el-table-column>
+						<!-- </el-table-column> -->
 					 <el-table-column :resizable="true" :sortable="true" prop="loadRate" label="负载率(%)">
             <template slot-scope="scope">
               {{ scope.row.loadRate ? (Number(scope.row.loadRate) * 100).toFixed(2) : '--' }}