update - ems用电实时数据优化

src/views/energy/powerUse/RealTime/index.vue

@@ -41,7 +41,8 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-            >一键秒表</el-button>
+            >一键秒表
+            </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
@@ -50,44 +51,50 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
           <el-table-column label="计量设备编号" align="center" key="monitorId" prop="monitorId" v-if="columns[0].visible"/>
-          <el-table-column label="计量设备名称" align="center" key="monitorName" prop="monitorName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="计量设备名称" align="center" key="monitorName" prop="monitorName" v-if="columns[1].visible"
-          <el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+                           :show-overflow-tooltip="true"/>
-          <el-table-column label="A项电压(V)" align="center" key="va" prop="va" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime" v-if="columns[2].visible"
+                           :show-overflow-tooltip="true"/>
+          <el-table-column label="A项电压(V)" align="center" key="va" prop="va" v-if="columns[3].visible"
+                           :show-overflow-tooltip="true"/>
           <el-table-column label="B项电压(V)" align="center" key="vb" prop="vb" v-if="columns[4].visible" width="120"/>
           <el-table-column label="C项电压(V)" align="center" key="vc" prop="vc" v-if="columns[5].visible" width="120"/>
           <el-table-column label="A项电流(A)" align="center" key="ia" prop="ia" v-if="columns[6].visible" width="120"/>
           <el-table-column label="B项电流(A)" align="center" key="ib" prop="ib" v-if="columns[7].visible" width="120"/>
           <el-table-column label="C项电流(A)" align="center" key="ic" prop="ic" v-if="columns[8].visible" width="120"/>
           <el-table-column label="功率因数" align="center" key="glys" prop="glys" v-if="columns[9].visible" width="120"/>
-          <el-table-column label="正向有功(kW·h)" align="center" key="zxyg" prop="zxyg" v-if="columns[10].visible" width="120" />
+          <el-table-column label="正向有功(kW·h)" align="center" key="zxyg" prop="zxyg" v-if="columns[10].visible"
+                           width="120"/>
           <!-- <el-table-column label="有功功率(KW)" align="center" key="activePower" prop="activePower" v-if="columns[11].visible" width="120" />
           <el-table-column label="无功功率(Kvar)" align="center" key="reactivePower" prop="reactivePower" v-if="columns[12].visible" width="120" />
           <el-table-column label="采集方式" align="center" key="collectType" prop="collectType" v-if="columns[13].visible" width="120" /> -->
         </el-table>
 
         <!-- 分页 -->
-        <pagination
+<!--        <pagination-->
-          v-show="total>0"
+<!--          v-show="total>0"-->
-          :total="total"
+<!--          :total="total"-->
-          :page.sync="queryParams.pageNum"
+<!--          :page.sync="queryParams.pageNum"-->
-          :limit.sync="queryParams.pageSize"
+<!--          :limit.sync="queryParams.pageSize"-->
-          @pagination="getList"
+<!--          @pagination="getList"-->
-        />
+<!--        />-->
         <el-card style="margin-top: 30px;" class="box-card">
           <el-table v-loading="loading" :data="userListtwo" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center"/>
             <el-table-column label="计量设备编号" align="center" key="monitorId" prop="monitorId"/>
-          <el-table-column label="回路计量设备名称" align="center" key="monitorName" prop="monitorName" :show-overflow-tooltip="true" />
+            <el-table-column label="回路计量设备名称" align="center" key="monitorName" prop="monitorName"
-          <el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime" :show-overflow-tooltip="true" />
+                             :show-overflow-tooltip="true"/>
+            <el-table-column label="采集时间" align="center" key="collectTime" prop="collectTime"
+                             :show-overflow-tooltip="true"/>
             <el-table-column label="正向有功(kW·h)" align="center" key="zxyg" prop="zxyg" width="120"/>
           </el-table>
-        <pagination
+<!--          <pagination-->
-          v-show="total>0"
+<!--            v-show="total>0"-->
-          :total="total"
+<!--            :total="total"-->
-          :page.sync="queryParams.pageNum"
+<!--            :page.sync="queryParams.pageNum"-->
-          :limit.sync="queryParams.pageSize"
+<!--            :limit.sync="queryParams.pageSize"-->
-          @pagination="getListtwo"
+<!--            @pagination="getListtwo"-->
-        />
+<!--          />-->
         </el-card>
       </el-col>
     </el-row>
@@ -184,21 +191,6 @@ export default {
         children: "children",
         label: "name"
       },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
-      },
       monitorIddata: '',
       // 查询参数
       queryParams: {
@@ -207,7 +199,6 @@ export default {
         orderByColumn: "collectTime",
         isAsc: "desc",
         monitorSubset: '',
-        collectType: undefined,
         collectType: '',
         params: {beginCollectTime: '', endCollectTime: ''}
 
@@ -229,34 +220,6 @@ export default {
         // { key: 12, label: `无功功率(Kvar)`, visible: true },
         // { key: 13, label: `采集方式`, visible: true }
       ],
-      // 表单校验
-      rules: {
-        userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
     };
   },
   watch: {
@@ -340,7 +303,6 @@ export default {
             item.lable = item.name
         })
         this.deptOptions = this.tranListToTreeData(response);
-        console.log(this.deptOptions)
       });
     },
     // 筛选节点
@@ -372,9 +334,6 @@ export default {
     },
     // 二次弹窗节点单击事件
     handleCheckChange(data, checked, indeterminat) {
-      console.log('data',data, checked, indeterminat);
-      // this.formadd.deptId = data.label;
-      //this.monitorIdslist.push(data.monitorId);
       if (checked === false) {
         this.formadd.monitorIds.map((item, index) => {
           if (data.monitorId == item) {
@@ -384,14 +343,10 @@ export default {
       } else {
         this.formadd.monitorIds.push(data.monitorId);
       }
-
-console.log('this.formadd.monitorIds',this.formadd.monitorIds)
-     // this.handleQuery();
     },
     //二次弹窗确认按钮
     submitFormtwo: function () {
       let paramsstr = this.formadd.monitorIds.join('+');
-      console.log('paramsstr',paramsstr);
       editMeterReading({monitorIds: paramsstr}).then(response => {
         if (response.msg === "操作成功") {
           this.$message({
@@ -466,6 +421,7 @@ console.log('this.formadd.monitorIds',this.formadd.monitorIds)
 <style lang="scss" scoped>
 .tree {
   width: 220px;
+
   ::v-deep .el-tree-node {
     white-space: normal; //关键代码!!!!!!!!!
     .el-tree-node__content {