1

src/views/modules/load-data/index.vue

@@ -44,9 +44,9 @@
                 height: '40px',
               }"
               class="item-label"
-              >变电站名称</label
+              >变电站</label
             >
-            <el-input v-model="searchForm.subName" placeholder="变电站名称" @keydown.enter.native="search()" clearable></el-input>
+            <el-input v-model="searchForm.subName" placeholder="变电站" @keydown.enter.native="search()" clearable></el-input>
           </div>
           <div
             :style="{
@@ -72,7 +72,7 @@
             <el-select
               style="width: 100%"
               v-model="searchForm.compNm"
-              placeholder="归属县旗名称"
+              placeholder="归属县旗"
               @keydown.enter.native="search()"
               clearable
             >
@@ -163,13 +163,13 @@
         >
           <el-table-column :resizable="true" type="selection" align="center" width="50"></el-table-column>
           <el-table-column :resizable="true" :sortable="true" label="序号" type="index" width="50" />
-
-          <el-table-column :resizable="true" :sortable="true" prop="subNm" label="变电站名称">
-            <template slot-scope="scope">
-              {{ scope.row.subNm }}
+		  <el-table-column :resizable="true" :sortable="true" prop="dataDate" label="日期" />
+          <el-table-column :resizable="true" :sortable="true" prop="subNm" label="变电站">
+            <template slot-scope="scope" :resizable="true" :sortable="true">
+			  {{scope.row.subNm  }}
             </template>
           </el-table-column>
-          <el-table-column :resizable="true" :sortable="true" prop="compNm" label="归属旗县">
+         <el-table-column :resizable="true" :sortable="true" prop="compNm" label="归属旗县">
             <template slot-scope="scope">
               {{ scope.row.compNm }}
             </template>
@@ -184,24 +184,23 @@
               {{ scope.row.mainNum }}
             </template>
           </el-table-column>
-          <el-table-column :resizable="true" :sortable="true" prop="mainCapacity" label="主变容量(MVA)">
+          <el-table-column :resizable="true" :sortable="true" prop="mainCapacity" label="主变容量">
             <template slot-scope="scope">
-              {{ scope.row.mainCapacity }}
+              {{ scope.row.mainCapacity }}  MVA
             </template>
           </el-table-column>
-          <el-table-column :resizable="true" :sortable="true" prop="dataDate" label="采集日期" />
-          <el-table-column :resizable="true" :sortable="true" prop="temperature" label="当日温度(℃)">
+         <!-- <el-table-column :resizable="true" :sortable="true" prop="temperature" label="温度">
             <template slot-scope="scope">
-              {{ scope.row.temperature }}
+              {{ scope.row.temperature }}℃
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column :resizable="true" :sortable="true" prop="peakLoad" label="最大负荷(MW)" />
           <el-table-column :resizable="true" :sortable="true" prop="baseLoad" label="基础负荷(MW)" />
           <el-table-column :resizable="true" :sortable="true" prop="electricHeatingLoad" label="电采暖负荷(MW)" />
           <el-table-column :resizable="true" :sortable="true" prop="usersNum" label="用户数" />
           <el-table-column :resizable="true" :sortable="true" prop="pingfangUsers" label="平房区用户数" />
-          <el-table-column :resizable="true" :sortable="true" prop="electricHeatingUsers" label="平房区接入电暖用户数" />
-          <el-table-column :resizable="true" :sortable="true" prop="pingfangElectricHeatingCapacity" label="平房区已接入电采暖容量(MWA)" />
+          <el-table-column :resizable="true" :sortable="true" prop="electricHeatingUsers" label="接入电暖用户数" />
+          <el-table-column :resizable="true" :sortable="true" prop="pingfangElectricHeatingCapacity" label="接入电采暖容量(MWA)" />
           <el-table-column width="120" label="操作">
             <template slot-scope="scope">
               <el-button class="view" type="success" @click="addOrUpdateHandler(scope.row.id, 'view')">

src/views/modules/station/components/add-or-update.vue

@@ -87,14 +87,14 @@
             :readonly="type == 'view'"
           />
         </el-form-item>
-        <el-form-item label="用户增长率(%)" prop="growRate">
+       <!-- <el-form-item label="用户增长率(%)" prop="growRate">
           <el-input
             type="number"
             v-model="ruleForm.growRate"
             placeholder="请输入用户增长率"
             :readonly="type == 'view'"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="ruleForm.remark"

src/views/modules/station/list.vue

@@ -51,11 +51,11 @@
                 height: '40px',
               }"
               class="item-label"
-              >变电站名称</label
+              >变电站</label
             >
             <el-input
               v-model="searchForm.subName"
-              placeholder="变电站名称"
+              placeholder="变电站"
               @keydown.enter.native="search()"
               clearable
             ></el-input>
@@ -79,12 +79,12 @@
                 height: '40px',
               }"
               class="item-label"
-              >归属市名称</label
+              >归属市</label
             >
             <el-select
               style="width: 100%"
               v-model="searchForm.cityId"
-              placeholder="归属市名称"
+              placeholder="归属市"
               @keydown.enter.native="search()"
               @change="getCompList()"
               clearable
@@ -121,7 +121,7 @@
             <el-select
               style="width: 100%"
               v-model="searchForm.compId"
-              placeholder="归属县旗名称"
+              placeholder="归属县旗"
               @keydown.enter.native="search()"
               clearable
             >
@@ -234,12 +234,12 @@
             width="50"
           />
 
-          <el-table-column :resizable="true" :sortable="true" prop="subName" label="变电站名称">
+          <el-table-column :resizable="true" :sortable="true" prop="subName" label="变电站">
             <template slot-scope="scope">
               {{ scope.row.subName }}
             </template>
           </el-table-column>
-          <el-table-column :resizable="true" :sortable="true" prop="cityName" label="归属市名称">
+          <el-table-column :resizable="true" :sortable="true" prop="cityName" label="归属市">
             <template slot-scope="scope">
               {{ scope.row.cityName }}
             </template>
@@ -279,12 +279,12 @@
               {{ scope.row.alarmThreshold }}
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             :resizable="true"
             :sortable="true"
             prop="growRate"
             label="用户增长率(%)"
-          />
+          /> -->
           <el-table-column :resizable="true" :sortable="true" prop="remark" label="备注">
             <template slot-scope="scope">
               {{ scope.row.remark }}