1

src/views/board.vue

@@ -56,7 +56,7 @@
 						<div :style='{"width":"12px","margin":"0 0 0 20px","background":"yellow","display":"none","height":"12px"}'></div>
 						<div :style='{"padding":"0","alignItems":"center","flexDirection":"row","display":"flex","gap":"6px","width":"100%","justifyContent":"space-evenly","height":"100%"}'>
 							<div :style='{"color":"inherit","fontSize":"14px","height":"auto"}'>温度数据总数</div>
-							<div :style='{"lineHeight":"44px","fontSize":"16px","color":"rgb(212, 107, 8)","fontWeight":"bold","height":"40px","order":"20"}'>{{rainfalldataList?.length??0}}</div>
+							<div :style='{"lineHeight":"44px","fontSize":"16px","color":"rgb(212, 107, 8)","fontWeight":"bold","height":"40px","order":"20"}'>{{rainfalldataList.length>0}}</div>
 						</div>
 					</div>
 				</div>

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

@@ -77,6 +77,26 @@
             :readonly="type == 'view'"
           />
         </el-form-item>
+		<el-form-item label="用户增长率" prop="userGrowthRate">
+		  <el-input
+		    @change="ruleForm.userGrowthRate = parseInt(ruleForm.userGrowthRate)"
+		    type="number"
+		    style="width: 100%"
+		    v-model="ruleForm.userGrowthRate"
+		    placeholder="请输入用户增长率"
+		    :readonly="type == 'view'"
+		  />
+		</el-form-item>
+		<el-form-item label="用户平均使用功率" prop="userPower">
+		  <el-input
+		    @change="ruleForm.userPower = parseInt(ruleForm.userPower)"
+		    type="number"
+		    style="width: 100%"
+		    v-model="ruleForm.userPower"
+		    placeholder="请输入用户平均使用功率"
+		    :readonly="type == 'view'"
+		  />
+		</el-form-item>
         <el-form-item label="负荷报警阀值" prop="alarmThreshold">
           <el-input
             @change="ruleForm.alarmThreshold = parseInt(ruleForm.alarmThreshold)"
@@ -140,8 +160,9 @@ export default {
         compId: undefined,
         compName: undefined,
         cityName: undefined,
-        growRate: undefined,
+        userGrowthRate: undefined,
         remark: undefined,
+		userPower: undefined
       },
       rules: {
         subName: [{ required: true, message: '变电站名称不能为空', trigger: 'blur' }],
@@ -151,6 +172,8 @@ export default {
         alarmThreshold: [{ required: true, message: '负荷报警阀值不能为空', trigger: 'blur' }],
         cityId: [{ required: true, message: '归属市名称不能为空', trigger: 'change' }],
         compId: [{ required: true, message: '归属县旗不能为空', trigger: 'change' }],
+		userGrowthRate: [{ required: true, message: '用户增长率不能为空', trigger: 'change' }],
+		userPower: [{ required: true, message: '用户平均使用功率不能为空', trigger: 'change' }],
       },
       compList: [],
     };

src/views/modules/station/list.vue

@@ -32,34 +32,7 @@
             display: 'flex',
           }"
         >
-          <div
-            :style="{
-              alignItems: 'center',
-              margin: '0 10px 0 0',
-              display: 'flex',
-            }"
-          >
-            <label
-              :style="{
-                margin: '0 10px 0 0',
-                whiteSpace: 'nowrap',
-                color: '#666',
-                display: 'inline-block',
-                lineHeight: '40px',
-                fontSize: 'inherit',
-                fontWeight: '500',
-                height: '40px',
-              }"
-              class="item-label"
-              >变电站</label
-            >
-            <el-input
-              v-model="searchForm.subName"
-              placeholder="变电站"
-              @keydown.enter.native="search()"
-              clearable
-            ></el-input>
-          </div>
+         
           <div
             :style="{
               alignItems: 'center',
@@ -97,42 +70,71 @@
               />
             </el-select>
           </div>
-          <div
-            :style="{
-              alignItems: 'center',
-              margin: '0 10px 0 0',
-              display: 'flex',
-            }"
-          >
-            <label
-              :style="{
-                margin: '0 10px 0 0',
-                whiteSpace: 'nowrap',
-                color: '#666',
-                display: 'inline-block',
-                lineHeight: '40px',
-                fontSize: 'inherit',
-                fontWeight: '500',
-                height: '40px',
-              }"
-              class="item-label"
-              >归属县旗</label
-            >
-            <el-select
-              style="width: 100%"
-              v-model="searchForm.compId"
-              placeholder="归属县旗"
-              @keydown.enter.native="search()"
-              clearable
-            >
-              <el-option
-                v-for="item in compList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </div>
+		  <div
+		    :style="{
+		      alignItems: 'center',
+		      margin: '0 10px 0 0',
+		      display: 'flex',
+		    }"
+		  >
+		    <label
+		      :style="{
+		        margin: '0 10px 0 0',
+		        whiteSpace: 'nowrap',
+		        color: '#666',
+		        display: 'inline-block',
+		        lineHeight: '40px',
+		        fontSize: 'inherit',
+		        fontWeight: '500',
+		        height: '40px',
+		      }"
+		      class="item-label"
+		      >归属县旗</label
+		    >
+		    <el-select
+		      style="width: 100%"
+		      v-model="searchForm.compId"
+		      placeholder="归属县旗"
+		      @keydown.enter.native="search()"
+		      clearable
+		    >
+		      <el-option
+		        v-for="item in compList"
+		        :key="item.value"
+		        :label="item.label"
+		        :value="item.value"
+		      />
+		    </el-select>
+		  </div>
+		  <div
+		    :style="{
+		      alignItems: 'center',
+		      margin: '0 10px 0 0',
+		      display: 'flex',
+		    }"
+		  >
+		    <label
+		      :style="{
+		        margin: '0 10px 0 0',
+		        whiteSpace: 'nowrap',
+		        color: '#666',
+		        display: 'inline-block',
+		        lineHeight: '40px',
+		        fontSize: 'inherit',
+		        fontWeight: '500',
+		        height: '40px',
+		      }"
+		      class="item-label"
+		      >变电站</label
+		    >
+		    <el-input
+		      v-model="searchForm.subName"
+		      placeholder="变电站"
+		      @keydown.enter.native="search()"
+		      clearable
+		    ></el-input>
+		  </div>
+          
 
           <el-button class="search" type="success" @click="search()">
             <span
@@ -269,11 +271,21 @@
               {{ scope.row.mainCapacity }}
             </template>
           </el-table-column>
+		  <el-table-column :resizable="true" :sortable="true" prop="userGrowthRate" label="用户增长率">
+		    <template slot-scope="scope">
+		      {{ scope.row.userGrowthRate }}
+		    </template>
+		  </el-table-column>
+		  <el-table-column :resizable="true" :sortable="true" prop="userPower" label="用户使用功率">
+		    <template slot-scope="scope">
+		      {{ scope.row.userPower }}
+		    </template>
+		  </el-table-column>
           <el-table-column
             :resizable="true"
             :sortable="true"
             prop="alarmThreshold"
-            label="负荷报警阀值"
+            label="报警阀值"
           >
             <template slot-scope="scope">
               {{ scope.row.alarmThreshold }}
@@ -285,11 +297,11 @@
             prop="growRate"
             label="用户增长率(%)"
           /> -->
-          <el-table-column :resizable="true" :sortable="true" prop="remark" label="备注">
+         <!-- <el-table-column :resizable="true" :sortable="true" prop="remark" label="备注">
             <template slot-scope="scope">
               {{ scope.row.remark }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column width="260" label="操作">
             <template slot-scope="scope">
               <el-button