计量模型修改

ems-ui/src/views/basecfg/meterdevc/index.vue

@@ -133,13 +133,13 @@
           <el-input v-model="form.deviceCode" placeholder="请输入设备代码" />
         </el-form-item>
 
-        <el-form-item label="服务区" prop="deviceCode">
+        <el-form-item label="设备归属" prop="deviceCode">
           <el-select v-model="form.areaCode" @change="handleAreaSelect">
             <el-option v-for="item in areaOptions" :label="item.areaName" :value="item.areaCode" :key="item.areaCode" />
           </el-select>
         </el-form-item>
 
-        <el-form-item label="对象类型" prop="objType">
+        <el-form-item label="计量分类" prop="objType">
           <el-select v-model="form.objType" @change="changeObjOptions">
             <el-option v-for="item in objTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
           </el-select>

ems-ui/src/views/mgr/powergrid.vue

@@ -76,18 +76,14 @@
       </el-table-column>
       <el-table-column label="时间" align="center" prop="time" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, '{h}:{i}') }}</span>
+          <span>{{ scope.row.time }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时间序列" align="center" prop="timeIndex" />
       <el-table-column label="计量类型" align="center" prop="meterType"/>
       <el-table-column label="单位电价" align="center" prop="meterUnitPrice" />
-      <el-table-column label="用电读数" align="center" prop="useElecReading" />
       <el-table-column label="用电量" align="center" prop="useElecQuantity" />
       <el-table-column label="用电电费" align="center" prop="useElecCost" />
-      <el-table-column label="上网读数" align="center" prop="upElecReading" />
-      <el-table-column label="上网电量" align="center" prop="upElecQuantity" />
-      <el-table-column label="上网收益" align="center" prop="upElecEarn" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -145,20 +141,10 @@
           <el-input v-model="form.timeIndex" placeholder="请输入时间序列" />
         </el-form-item>
         <el-form-item label="计量类型" prop="meterType">
-          <el-select v-model="form.meterType" placeholder="请选择计量类型">
-            <el-option
-                v-for="dict in dict.type.meter_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
+          <el-input v-model="form.meterType" placeholder="请输入计量类型" />
         </el-form-item>
-        <el-form-item label="单位电价" prop="meterUnitPrice">
-          <el-input v-model="form.meterUnitPrice" placeholder="请输入单位电价" />
-        </el-form-item>
-        <el-form-item label="用电读数" prop="useElecReading">
-          <el-input v-model="form.useElecReading" placeholder="请输入用电读数" />
+        <el-form-item label="计量单价" prop="meterUnitPrice">
+          <el-input v-model="form.meterUnitPrice" placeholder="请输入计量单价" />
         </el-form-item>
         <el-form-item label="用电量" prop="useElecQuantity">
           <el-input v-model="form.useElecQuantity" placeholder="请输入用电量" />
@@ -166,15 +152,6 @@
         <el-form-item label="用电电费" prop="useElecCost">
           <el-input v-model="form.useElecCost" placeholder="请输入用电电费" />
         </el-form-item>
-        <el-form-item label="上网读数" prop="upElecReading">
-          <el-input v-model="form.upElecReading" placeholder="请输入上网读数" />
-        </el-form-item>
-        <el-form-item label="上网电量" prop="upElecQuantity">
-          <el-input v-model="form.upElecQuantity" placeholder="请输入上网电量" />
-        </el-form-item>
-        <el-form-item label="上网收益" prop="upElecEarn">
-          <el-input v-model="form.upElecEarn" placeholder="请输入上网收益" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -288,12 +265,8 @@ export default {
         timeIndex: null,
         meterType: null,
         meterUnitPrice: null,
-        useElecReading: null,
         useElecQuantity: null,
-        useElecCost: null,
-        upElecReading: null,
-        upElecQuantity: null,
-        upElecEarn: null,
+        useElecCost: null
       };
       this.resetForm('form');
     },

ems-ui/src/views/mgr/poweruse.vue

@@ -80,13 +80,11 @@
       </el-table-column>
       <el-table-column label="时间" align="center" prop="time" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, '{h}:{i}') }}</span>
+          <span>{{ scope.row.time }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时间序列" align="center" prop="timeIndex" />
-      <el-table-column label="电表读数" align="center" prop="elecReading" />
       <el-table-column label="用电量" align="center" prop="elecQuantity" />
-      <el-table-column label="电费" align="center" prop="elecCost" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -124,12 +122,6 @@
         <el-form-item label="设施代码" prop="facsCode">
           <el-input v-model="form.facsCode" placeholder="请输入设施代码" />
         </el-form-item>
-        <el-form-item label="设施类型" prop="facsType">
-          <el-input v-model="form.facsType" placeholder="请输入设施类型" />
-        </el-form-item>
-        <el-form-item label="设施子类" prop="facsSubtype">
-          <el-input v-model="form.facsSubtype" placeholder="请输入设施代码" />
-        </el-form-item>
         <el-form-item label="日期" prop="date">
           <el-date-picker clearable
             v-model="form.date"
@@ -147,15 +139,9 @@
         <el-form-item label="时间序列" prop="timeIndex">
           <el-input v-model="form.timeIndex" placeholder="请输入时间序列" />
         </el-form-item>
-        <el-form-item label="电表读数" prop="elecReading">
-          <el-input v-model="form.elecReading" placeholder="请输入电表读数" />
-        </el-form-item>
         <el-form-item label="用电量" prop="elecQuantity">
           <el-input v-model="form.elecQuantity" placeholder="请输入用电量 单位：kW-h" />
         </el-form-item>
-        <el-form-item label="电费" prop="elecCost">
-          <el-input v-model="form.elecCost" placeholder="请输入电费 单位: ￥" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -196,14 +182,9 @@ export default {
         pageSize: 10,
         areaCode: null,
         facsCode: null,
-        facsType: null,
-        facsSubtype: null,
         date: null,
         time: null,
-        timeIndex: null,
-        elecReading: null,
-        elecQuantity: null,
-        elecCost: null
+        timeIndex: null
       },
       // 表单参数
       form: {},
@@ -215,17 +196,11 @@ export default {
         facsCode: [
           { required: true, message: "设施代码不能为空", trigger: "blur" }
         ],
-        facsType: [
-          { required: true, message: "设施类型不能为空", trigger: "change" }
-        ],
-        facsSubtype: [
-          { required: true, message: "设施子类不能为空", trigger: "change" }
-        ],
         date: [
           { required: true, message: "日期 yyyy-MM-dd不能为空", trigger: "blur" }
         ],
         time: [
-          { required: true, message: "时间 HH:mm:ss不能为空", trigger: "blur" }
+          { required: true, message: "时间 HH:mm不能为空", trigger: "blur" }
         ],
         timeIndex: [
           { required: true, message: "时间序列不能为空", trigger: "blur" }
@@ -262,9 +237,7 @@ export default {
         date: null,
         time: null,
         timeIndex: null,
-        elecReading: null,
         elecQuantity: null,
-        elecCost: null
       };
       this.resetForm("form");
     },