add:bug修复

src/api/tyler/hoistSys.js

@@ -12,7 +12,7 @@ export function listHoistSelectData(query) {
 // 查询提升机历史数据列表
 export function queryHoistHisData(query) {
   return request({
-    url: '/business/elevator/history/record',
+    url: '/business/elevator/history/query',
     method: 'get',
     params: query
   })

src/views/Screen/items/hjjc.vue

@@ -308,7 +308,9 @@ export default {
     });
     getRcData().then((res) => {
       this.rightCenterLssjData.list = res.data || [];
-      this.rcPlayFun(this.rightTopLssjData);
+      console.log(res);
+
+      this.rcPlayFun(this.rightCenterLssjData);
     });
     getDeviceStatus().then((res) => {
       // this.equipmentList = res.data;
@@ -913,7 +915,7 @@ export default {
         },
         yAxis: {
           type: "value",
-          max: maxData,
+          max: mkData > maxData ? mkData : maxData,
           min: minData,
           boundaryGap: false,
           axisTick: {
@@ -995,9 +997,10 @@ export default {
     // 轮播eChart
     // 更改数据达到轮播效果
     rtPlayFun(data) {
-      // 启动定时器，每隔 3 秒执行一次
+      // 启动定时器，每隔 15 秒执行一次
       let i = 0;
       let l = 0;
+      let timer = null;
       let grid = {
         left: "4%",
         right: "5%",
@@ -1005,24 +1008,39 @@ export default {
         top: "7%",
         containLabel: true,
       };
-      const timer = setInterval(() => {
+      if (!timer) {
+        // 页面进来的时候要触发一次
+        this.rightTopLssjData.mark = 0;
+        this.rightTopLssjData.name = data.list[0].value[0].name;
+        this.initEchartBox(
+          "sssj",
+          data.list[0].value[0].value.xData.data,
+          data.list[0].value[0].value.yData.data,
+          data.list[0].value[0].value.yData.alarm,
+          4,
+          grid
+        );
+      }
+      timer = setInterval(() => {
         if (i < data.list.length) {
           if (
             Array.isArray(data.list[i].value) &&
             l < data.list[i].value.length
           ) {
             this.rightTopLssjData.mark = i;
-            this.rightTopLssjData.name = data.list[i].value[l].tpName;
+            this.rightTopLssjData.name = data.list[i].value[l].name;
             this.initEchartBox(
               "sssj",
-              data.list[i].value[l].data.xData.data,
-              data.list[i].value[l].data.yData.data,
-              data.list[i].value[l].data.yData.alarm,
+              data.list[i].value[l].value.xData.data,
+              data.list[i].value[l].value.yData.data,
+              data.list[i].value[l].value.yData.alarm,
               4,
               grid
             );
             l++;
           } else {
+            // 需要l重置，否则进不去判断i错乱
+            l = 0;
             i++;
           }
         } else {
@@ -1030,6 +1048,7 @@ export default {
           l = 0;
         }
       }, 15000);
+
       this.$on("hook:activated", () => {
         if (timer === null) {
           // 避免重复开启定时器
@@ -1051,6 +1070,7 @@ export default {
                 );
                 l++;
               } else {
+                l = 0;
                 i++;
               }
             } else {
@@ -1071,6 +1091,7 @@ export default {
       // 启动定时器，每隔 3 秒执行一次
       let i = 0;
       let l = 0;
+      let timer = null;
       let grid = {
         left: "4%",
         right: "5%",
@@ -1078,24 +1099,37 @@ export default {
         top: "7%",
         containLabel: true,
       };
-      const timer = setInterval(() => {
+      if (!timer) {
+        this.rightCenterLssjData.mark = i;
+        this.rightCenterLssjData.name = data.list[i].value[l].name;
+        this.initEchartBox(
+          "rclssj",
+          data.list[i].value[l].value.xData.data,
+          data.list[i].value[l].value.yData.data,
+          data.list[i].value[l].value.yData.alarm,
+          4,
+          grid
+        );
+      }
+      timer = setInterval(() => {
         if (i < data.list.length) {
           if (
             Array.isArray(data.list[i].value) &&
             l < data.list[i].value.length
           ) {
             this.rightCenterLssjData.mark = i;
-            this.rightCenterLssjData.name = data.list[i].value[l].tpName;
+            this.rightCenterLssjData.name = data.list[i].value[l].name;
             this.initEchartBox(
               "rclssj",
-              data.list[i].value[l].data.xData.data,
-              data.list[i].value[l].data.yData.data,
-              data.list[i].value[l].data.yData.alarm,
+              data.list[i].value[l].value.xData.data,
+              data.list[i].value[l].value.yData.data,
+              data.list[i].value[l].value.yData.alarm,
               4,
               grid
             );
             l++;
           } else {
+            l = 0;
             i++;
           }
         } else {
@@ -1116,14 +1150,15 @@ export default {
                 this.rightCenterLssjData.name = data.list[i].value[l].tpName;
                 this.initEchartBox(
                   "rclssj",
-                  data.list[i].value[l].data.xData.data,
-                  data.list[i].value[l].data.yData.data,
-                  data.list[i].value[l].data.yData.alarm,
+                  data.list[i].value[l].value.xData.data,
+                  data.list[i].value[l].value.yData.data,
+                  data.list[i].value[l].value.yData.alarm,
                   4,
                   grid
                 );
                 l++;
               } else {
+                l = 0;
                 i++;
               }
             } else {

src/views/Screen/items/psxt.vue

@@ -98,7 +98,7 @@
                   <p>
                     <span>吸水负压</span>：{{
                       item.inletVacuum | decimalFilter
-                    }}Mpa
+                    }}pa
                   </p>
                   <p>
                     <span>前振动</span>：{{

src/views/Screen/items/tfxt.vue

@@ -200,6 +200,7 @@
           class="fengji-button"
           v-if="item.isBoolean == 1"
           style="margin-left: 50px"
+          @click="remoteControl(item)"
         >
           远程控制
         </div>
@@ -596,7 +597,7 @@ export default {
     submitPumpSetting(status) {
       const param = {
         devicesId: this.currentDevice.deviceId,
-        devicesType: 0,
+        devicesType: 1,
         devicesStatus: status,
       };
       // 提交时使用 this.currentDevice 获取设备信息

src/views/hoistSys/hoistHis/index.vue

@@ -59,7 +59,7 @@
         align="center"
         prop="controlPosition"
       />
-      <el-table-column label="当前动作" align="center" prop="currentAction">
+      <!-- <el-table-column label="当前动作" align="center" prop="currentAction">
         <template slot-scope="scope">
           <span>{{
             ["去井口", "去一中", "去二中", "去三中", "去四中", "去五中"][
@@ -232,6 +232,7 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
+       -->
       <el-table-column
         fixed="right"
         label="记录时间"

src/views/monitoringDevices/envMonitoringShishiData/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="" prop="tpName">
         <el-input
           v-model="queryParams.tpName"
@@ -10,7 +17,11 @@
         />
       </el-form-item>
       <el-form-item label="" prop="typeName">
-        <el-select v-model="queryParams.typeName" placeholder="请选择监测项名称" clearable>
+        <el-select
+          v-model="queryParams.typeName"
+          placeholder="请选择监测项名称"
+          clearable
+        >
           <el-option
             v-for="dict in typeName"
             :key="dict"
@@ -20,17 +31,35 @@
         </el-select>
       </el-form-item>
       <el-form-item label="日期查询">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
-   
-
-    <el-table v-loading="loading" :data="alarmList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="alarmList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column label="测点名称" align="center" prop="tpName" />
       <el-table-column label="测点编号" align="center" prop="tpNum" />
       <el-table-column label="监测项名称" align="center" prop="typeName" />
@@ -41,16 +70,16 @@
           <span>{{ parseTime(scope.row.time) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="state">
+      <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.state==1">正常</el-tag>
+          <el-tag v-if="scope.row.status == 1">正常</el-tag>
           <el-tag v-else type="warning">异常</el-tag>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -60,12 +89,15 @@
     <!-- 添加或修改环境监测报警数据对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-       
         <el-form-item label="解除报警时长" prop="updateHour">
           <el-input-number :min="0" v-model="form.updateHour"></el-input-number>
         </el-form-item>
         <el-form-item label="解除原因" prop="delAlarmReason">
-          <el-input type="textarea" v-model="form.delAlarmReason" placeholder="请输入解除原因" />
+          <el-input
+            type="textarea"
+            v-model="form.delAlarmReason"
+            placeholder="请输入解除原因"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -77,10 +109,10 @@
 </template>
 
 <script>
- import {get2502, list2502} from "@/api/tyler/envMonitoringShishiData";
-  import {typeNameList} from "@/api/tyler/common";
+import { get2502, list2502 } from "@/api/tyler/envMonitoringShishiData";
+import { typeNameList } from "@/api/tyler/common";
 
-  export default {
+export default {
   name: "envMonitoringAlarm",
   data() {
     return {
@@ -114,7 +146,7 @@
         status: null,
         delAlarmTime: null,
         delAlarmReason: null,
-        updateHour:null,
+        updateHour: null,
       },
       // 日期范围
       dateRange: [],
@@ -123,31 +155,33 @@
       // 表单校验
       rules: {
         updateHour: [
-          { required: true, message: "解除报警时长不能为空", trigger: "blur" }
+          { required: true, message: "解除报警时长不能为空", trigger: "blur" },
         ],
         delAlarmReason: [
-          { required: true, message: "解除报警原因不能为空", trigger: "blur" }
+          { required: true, message: "解除报警原因不能为空", trigger: "blur" },
         ],
       },
-      typeName:[]
+      typeName: [],
     };
   },
   created() {
-    typeNameList().then(res => {
+    typeNameList().then((res) => {
       // console.log(res,'res')
-      this.typeName = res.data
-    })
+      this.typeName = res.data;
+    });
     this.getList();
   },
   methods: {
     /** 查询环境监测报警数据列表 */
     getList() {
       this.loading = true;
-      list2502(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.alarmList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      list2502(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
+          this.alarmList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
     },
     // 取消按钮
     cancel() {
@@ -165,7 +199,7 @@
         delAlarmReason: null,
         typeName: null,
         tpName: null,
-        updateHour:null,
+        updateHour: null,
       };
       this.resetForm("form");
     },
@@ -179,13 +213,12 @@
       this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
-      
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -197,7 +230,7 @@
     handleUpdate(row) {
       this.reset();
       this.form = row;
-      this.form.updateHour = row.updateHour||0;
+      this.form.updateHour = row.updateHour || 0;
       this.open = true;
       this.title = "修改环境监测报警数据";
       // const id = row.id || this.ids
@@ -209,31 +242,38 @@
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
-        updateAlarm(this.form).then(response => {
+      this.$refs["form"].validate((valid) => {
+        updateAlarm(this.form).then((response) => {
           this.$modal.msgSuccess("修改成功");
           this.open = false;
           this.getList();
         });
-          
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除？').then(function() {
-        return delAlarm(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {
+          return delAlarm(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('business/alarm/export', {
-        ...this.queryParams
-      }, `alarm_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "business/alarm/export",
+        {
+          ...this.queryParams,
+        },
+        `alarm_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>