时间

Signed-off-by: hsshuxian <3049816743@qq.com>

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

@@ -118,7 +118,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="倍率" prop="magnification">
-              <el-input v-model="form.magnification" oninput="value=value.replace(/^0(0+|\d+)|[^\d]+/g,'')" placeholder="请输入倍率" />
+              <el-input-number v-model="form.magnification" :min="1" :max="99" @change="handleChange"></el-input-number>
             </el-form-item>
             <el-form-item label="规格描述" prop="specDesc">
               <el-input v-model="form.specDesc" placeholder="请输入规格描述" />
@@ -218,7 +218,6 @@ export default {
         areaCode: [{ required: true, message: '选择服务区', trigger: 'blur' }],
         deviceCode: [{ required: true, message: '设备代码不能为空', trigger: 'blur' }],
         meterCls: [{ required: true, message: '计量类别不能为空', trigger: 'blur' }],
-        meterCls: [{ required: true, message: '计量类别不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -298,10 +297,15 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加计量设备'
-      this.areaMod = true
+      this.reset();
+      this.open = true;
+      this.title = '添加计量设备';
+      this.areaMod = true;
+      if (this.activeTab === '电表') {
+        this.form.meterCls = 45;
+      } else if (this.activeTab === '水表') {
+        this.form.meterCls = 70;
+      }
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

ems-ui-cloud/src/views/devmgr/meterData/index.vue

@@ -9,11 +9,12 @@
         <div class="head-container">
           <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree"
                    node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+
         </div>
       </el-col>
       <el-col :span="20" :xs="24">
         <el-tabs v-model="activeTab" @tab-click="handleTabChange">
-          <el-tab-pane label="电报读数" name="first">
+          <el-tab-pane label="电表读数" name="first">
           </el-tab-pane>
           <el-tab-pane label="水表读数" name="second">
           </el-tab-pane>
@@ -37,9 +38,10 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          @select="handleQuery"
         ></el-date-picker>
       </el-form-item>
-      
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -152,6 +154,8 @@
 <script>
 import { listElecMeterH, delElecMeterH, addElecMeterH, updateElecMeterH,listWaterMeterH } from "@/api/device/elecMeterH";
 import { areaTreeSelect } from '@/api/basecfg/area'
+import { dateFormat } from '@/utils'
+import { listElecStoreH } from '@/api/mgr/elecStoreH'
 
 export default {
   name: "ElecMeterH",
@@ -188,7 +192,8 @@ export default {
         deviceCode: null,
         recordTime: null,
         startRecTime:null,
-        endRecTime:null
+        endRecTime:null,
+        meterCls:45
 
       },
       // 区域名称
@@ -247,41 +252,44 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.areaCode = data.id
+      console.log("this.queryParams.areaCode ",this.queryParams.areaCode )
       this.handleQuery()
-    },
+     },
     async getAreaTreeSelect(areaCode, recursion) {
       await areaTreeSelect(areaCode, recursion).then(response => {
         this.areaOptions = response.data
       })
     },
+    /** 查询区域树结构 */
+    // getAreaTreeSelect(areaCode, recursion) {
+    //   areaTreeSelect(areaCode, recursion).then(response => {
+    //     this.areaOptions = [{
+    //       id: '-1',
+    //       label: '全部',
+    //       children: response.data
+    //     }]
+    //   })
+    // },
     /** 查询用电计量-小时列表 */
     getElecList() {
       this.loading = true;
-      // this.queryParams.params = {};
-      // if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
-      //   this.queryParams.params["startRecTime"] = this.daterangeRecordTime[0];
-      //   this.queryParams.params["endRecTime"] = this.daterangeRecordTime[1];
-      // }
-      listElecMeterH(this.addDateRange(this.queryParams, this.daterangeRecordTime)).then(response => {
+      listElecMeterH(this.queryParams).then(response => {
         this.elecMeterHList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+
     /** 查询用水计量-小时列表 */
     getWaterList() {
       this.loading = true;
-      // this.queryParams.params = {};
-      // if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
-      //   this.queryParams.params["beginRecordTime"] = this.daterangeRecordTime[0];
-      //   this.queryParams.params["endRecordTime"] = this.daterangeRecordTime[1];
-      // }
-      listWaterMeterH(this.addDateRange(this.queryParams, this.daterangeRecordTime)).then(response => {
+      listWaterMeterH(this.queryParams).then(response => {
         this.waterMeterHList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+
     // 取消按钮
     cancel() {
       this.open = false;
@@ -308,14 +316,17 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.startRecTime = this.daterangeRecordTime[0];
+      this.queryParams.endRecTime = this.daterangeRecordTime[1];
       if (this.activeTab === 'first'){
+        this.queryParams.meterCls = '45'
         this.queryParams.pageNum = 1;
         this.getElecList();
       }else if(this.activeTab === 'second'){
+        this.queryParams.meterCls = '70'
         this.queryParams.pageNum = 1;
         this.getWaterList();
       }
-
     },
     /** 重置按钮操作 */
     resetQuery() {