Merge branch 'master' of http://h.gemho.cn:7099/lichunliang/yindong-tongbai-automation

src/api/tyler/common.js

@@ -87,4 +87,13 @@ export function typeNameList(query) {
     method: 'get',
     params: query
   })
+}
+
+//排水系统设备类型
+export function draDeviceName(query) {
+  return request({
+    url: '/business/dra/base/deviceName',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file

src/api/tyler/drainageDev.js

+import request from '@/utils/request'
+
+// 查询排水设备信息列表
+export function listInfo(query) {
+  return request({
+    url: '/business/dra/devices/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询排水设备信息所有列表
+export function listAllInfo(query) {
+  return request({
+    url: '/business/dra/devices/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询排水设备信息详细
+export function getInfo(id) {
+  return request({
+    url: '/business/dra/devices/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增排水设备信息
+export function addInfo(data) {
+  return request({
+    url: '/business/dra/devices/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改排水设备信息
+export function updateInfo(data) {
+  return request({
+    url: '/business/dra/devices/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除排水设备信息
+export function delInfo(id) {
+  return request({
+    url: '/business/dra/devices/remove/' + id,
+    method: 'get'
+  })
+}

src/api/tyler/waterLevelAlarm.js

+import request from '@/utils/request'
+
+// 查询水泵历史信息列表
+export function listSumpAlarmHistory(query) {
+  return request({
+    url: '/business/sump/alarm/history/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询水泵历史信息所有列表
+export function listAllSumpHistory(query) {
+  return request({
+    url: '/business/pump/history/listAll',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

src/api/tyler/waterLevelHis.js

+import request from '@/utils/request'
+
+// 查询水泵历史信息列表
+export function listSumpHistory(query) {
+  return request({
+    url: '/business/sump/history/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询水泵历史信息所有列表
+export function listAllSumpHistory(query) {
+  return request({
+    url: '/business/pump/history/listAll',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

src/api/tyler/waterPumpHis.js

+import request from '@/utils/request'
+
+// 查询水泵历史信息列表
+export function listHistory(query) {
+  return request({
+    url: '/business/pump/history/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询水泵历史信息所有列表
+export function listAllHistory(query) {
+  return request({
+    url: '/business/pump/history/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询水泵历史信息详细
+export function getHistory(id) {
+  return request({
+    url: '/business/pump/history/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增水泵历史信息
+export function addHistory(data) {
+  return request({
+    url: '/business/pump/history/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改水泵历史信息
+export function updateHistory(data) {
+  return request({
+    url: '/business/pump/history/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除水泵历史信息
+export function delHistory(id) {
+  return request({
+    url: '/business/pump/history/remove/' + id,
+    method: 'get'
+  })
+}
+
+// 查询水泵历史信息列表
+export function listWarterPumpAlarmHis(query) {
+  return request({
+    url: '/business/pump/alarm/history/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改水泵历史信息
+export function updateWarterPumpAlarmHis(data) {
+  return request({
+    url: '/business/pump/alarm/history/edit',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file

src/api/tyler/waterPumpSwitchHis.js

+import request from '@/utils/request'
+
+// 查询水泵开关历史信息列表
+export function listPumpStatusHistory(query) {
+  return request({
+    url: '/business/pump/status/list',
+    method: 'get',
+    params: query
+  })
+}

src/views/drainage/waterLevelAlarm/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-item label="" prop="sumpName">
+        <el-select v-model="queryParams.sumpName" placeholder="设备名称" clearable>
+          <el-option
+            v-for="dict in devList"
+            :key="dict.name"
+            :label="dict.name"
+            :value="dict.name"
+          />
+        </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-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-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
+      <el-table-column label="设备名称" align="center" prop="sumpName" />
+      <el-table-column label="设备编号" align="center" prop="sumpId" />
+      <el-table-column label="设备安装位置" align="center" prop="installationLocation" />
+      <el-table-column label="液位高度(m)" align="center" prop="heghtThreshold" />
+      <el-table-column label="报警时间" align="center" prop="alarmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.alarmTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.status==1"
+          >处置</el-button>
+          <span v-else>已处置</span>
+       
+        </template>
+      </el-table-column>
+      <el-table-column label="解除报警时间" align="center" prop="delAlarmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.delAlarmTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 添加或修改排水设备信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="解除原因" prop="delAlarmResion">
+          <el-input type="textarea" v-model="form.delAlarmResion" placeholder="请输入解除原因" />
+        </el-form-item>
+        <el-form-item label="解除报警时长(h)" prop="time">
+          <el-input v-model="form.time" placeholder="请输入解除报警时长(h)" />
+        </el-form-item>
+   
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {listSumpAlarmHistory, updateWarterPumpAlarmHis} from "@/api/tyler/waterLevelAlarm";
+  import {draDeviceName} from "@/api/tyler/common";
+
+  export default {
+  name: "History",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备历史信息表格数据
+      historyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sumpId: null,
+        sumpName: null,
+        motorCurrent: null,
+        motorBearingTemp: null,
+        pumpBearingTemp: null,
+        pumpFlow: null,
+        drainagePressure: null,
+        monitoringTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 日期范围
+      dateRange: [],
+      devList: [],
+    };
+  },
+  created() {
+    draDeviceName({typeId:2}).then(res => {
+      this.devList = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询设备历史信息列表 */
+    getList() {
+      this.loading = true;
+      listSumpAlarmHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.historyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delAlarmResion:null,
+        time:null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备历史信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form.id = row.id;
+      this.open = true;
+      // getHistory(id).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改设备历史信息";
+      // });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateWarterPumpAlarmHis(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHistory(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除设备历史信息编号为"' + ids + '"的数据项？').then(function() {
+        return delHistory(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/history/export', {
+        ...this.queryParams
+      }, `history_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/drainage/waterLevelHis/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-item label="" prop="sumpName">
+        <el-select v-model="queryParams.sumpName" placeholder="设备名称" clearable>
+          <el-option
+            v-for="dict in devList"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.name"
+          />
+        </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-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-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="historyList">
+      <el-table-column label="设备名称" align="center" prop="sumpName" />
+      <el-table-column label="设备编号" align="center" prop="sumpId" />
+      <el-table-column label="设备安装位置" align="center" prop="installationLocation" />
+      <el-table-column label="液位高度（m）" align="center" prop="heghtThreshold" />
+      <el-table-column label="监测时间" align="center" prop="time" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.time) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    
+  </div>
+</template>
+
+<script>
+  import {getHistory, listSumpHistory} from "@/api/tyler/waterLevelHis";
+  import {draDeviceName} from "@/api/tyler/common";
+
+  export default {
+  name: "History",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备历史信息表格数据
+      historyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sumpName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 日期范围
+      dateRange: [],
+      devList: [],
+    };
+  },
+  created() {
+    draDeviceName({typeId:2}).then(res => {
+      this.devList = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询设备历史信息列表 */
+    getList() {
+      this.loading = true;
+      listSumpHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.historyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    
+   
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+};
+</script>

src/views/drainage/waterPumpAlarmHis/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-item label="" prop="pumpName">
+        <el-select v-model="queryParams.pumpName" placeholder="水泵名称" clearable>
+          <el-option
+            v-for="dict in devList"
+            :key="dict.name"
+            :label="dict.name"
+            :value="dict.name"
+          />
+        </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-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-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
+      <el-table-column label="水泵名称" align="center" prop="pumpName" />
+      <el-table-column label="水泵编号" align="center" prop="pumpId" />
+      <el-table-column label="水泵安装位置" align="center" prop="installationLocation" />
+      <el-table-column label="报警项" align="center" prop="alarmProduct" />
+      <el-table-column label="监测值" align="center" prop="alarmValue" />
+      <el-table-column label="报警时间" align="center" prop="alarmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.alarmTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.status==1"
+          >处置</el-button>
+          <span v-else>已处置</span>
+       
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 添加或修改排水设备信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="解除原因" prop="delAlarmResion">
+          <el-input type="textarea" v-model="form.delAlarmResion" placeholder="请输入解除原因" />
+        </el-form-item>
+        <el-form-item label="解除报警时长(h)" prop="time">
+          <el-input v-model="form.time" placeholder="请输入解除报警时长(h)" />
+        </el-form-item>
+   
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {listWarterPumpAlarmHis, updateWarterPumpAlarmHis} from "@/api/tyler/waterPumpHis";
+  import {draDeviceName} from "@/api/tyler/common";
+
+  export default {
+  name: "History",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 水泵历史信息表格数据
+      historyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pumpId: null,
+        pumpName: null,
+        motorCurrent: null,
+        motorBearingTemp: null,
+        pumpBearingTemp: null,
+        pumpFlow: null,
+        drainagePressure: null,
+        monitoringTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 日期范围
+      dateRange: [],
+      devList: [],
+    };
+  },
+  created() {
+    draDeviceName({typeId:1}).then(res => {
+      this.devList = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询水泵历史信息列表 */
+    getList() {
+      this.loading = true;
+      listWarterPumpAlarmHis(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.historyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delAlarmResion:null,
+        time:null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加水泵历史信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form.id = row.id;
+      this.open = true;
+      // getHistory(id).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改水泵历史信息";
+      // });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateWarterPumpAlarmHis(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHistory(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项？').then(function() {
+        return delHistory(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/history/export', {
+        ...this.queryParams
+      }, `history_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/drainage/waterPumpHis/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-item label="" prop="pumpName">
+        <el-select v-model="queryParams.pumpName" placeholder="水泵名称" clearable>
+          <el-option
+            v-for="dict in devList"
+            :key="dict.name"
+            :label="dict.name"
+            :value="dict.name"
+          />
+        </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-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-form-item>
+    </el-form>
+
+    
+
+    <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
+      <el-table-column label="水泵名称" align="center" prop="pumpName" />
+      <el-table-column label="水泵编号" align="center" prop="pumpId" />
+      <el-table-column label="电机电流" align="center" prop="motorCurrent" />
+      <el-table-column label="电机轴承温度" align="center" prop="motorBearingTemp" />
+      <el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemp" />
+      <el-table-column label="水泵流量" align="center" prop="pumpFlow" />
+      <el-table-column label="排水管路压力" align="center" prop="drainagePressure" />
+      <el-table-column label="监测时间" align="center" prop="monitoringTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.monitoringTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    
+  </div>
+</template>
+
+<script>
+  import {getHistory, listHistory} from "@/api/tyler/waterPumpHis";
+  import {draDeviceName} from "@/api/tyler/common";
+
+  export default {
+  name: "History",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 水泵历史信息表格数据
+      historyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pumpId: null,
+        pumpName: null,
+        motorCurrent: null,
+        motorBearingTemp: null,
+        pumpBearingTemp: null,
+        pumpFlow: null,
+        drainagePressure: null,
+        monitoringTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 日期范围
+      dateRange: [],
+      devList: [],
+    };
+  },
+  created() {
+    draDeviceName({typeId:1}).then(res => {
+      this.devList = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询水泵历史信息列表 */
+    getList() {
+      this.loading = true;
+      listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.historyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        pumpId: null,
+        pumpName: null,
+        motorCurrent: null,
+        motorBearingTemp: null,
+        pumpBearingTemp: null,
+        pumpFlow: null,
+        drainagePressure: null,
+        monitoringTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加水泵历史信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getHistory(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改水泵历史信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateHistory(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHistory(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项？').then(function() {
+        return delHistory(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/history/export', {
+        ...this.queryParams
+      }, `history_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/drainage/waterPumpSwitchHis/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-item label="" prop="pumpName">
+        <el-select v-model="queryParams.pumpName" placeholder="水泵名称" clearable>
+          <el-option
+            v-for="dict in devList"
+            :key="dict.name"
+            :label="dict.name"
+            :value="dict.name"
+          />
+        </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-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-form-item>
+    </el-form>
+
+    
+
+    <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
+      <el-table-column label="水泵名称" align="center" prop="pumpName" />
+      <el-table-column label="水泵编号" align="center" prop="pumpId" />
+      <el-table-column label="水泵位置" align="center" prop="installationLocation" />
+      <el-table-column label="水泵状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.status==1">开启</el-tag>
+          <el-tag type="danger" v-else>关闭</el-tag>
+        </template>
+      </el-table-column>
+      
+      <el-table-column label="监测时间" align="center" prop="time" width="180">
+        <template slot-scope="scope">
+          
+          <span>{{ parseTime(scope.row.time) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    
+  </div>
+</template>
+
+<script>
+  import {getHistory, listPumpStatusHistory} from "@/api/tyler/waterPumpSwitchHis";
+  import {draDeviceName} from "@/api/tyler/common";
+
+  export default {
+  name: "History",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 水泵历史信息表格数据
+      historyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pumpId: null,
+        pumpName: null,
+        motorCurrent: null,
+        motorBearingTemp: null,
+        pumpBearingTemp: null,
+        pumpFlow: null,
+        drainagePressure: null,
+        monitoringTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 日期范围
+      dateRange: [],
+      devList: [],
+    };
+  },
+  created() {
+    draDeviceName({typeId:1}).then(res => {
+      this.devList = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询水泵历史信息列表 */
+    getList() {
+      this.loading = true;
+      listPumpStatusHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.historyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        pumpId: null,
+        pumpName: null,
+        motorCurrent: null,
+        motorBearingTemp: null,
+        pumpBearingTemp: null,
+        pumpFlow: null,
+        drainagePressure: null,
+        monitoringTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      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
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加水泵历史信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getHistory(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改水泵历史信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateHistory(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHistory(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项？').then(function() {
+        return delHistory(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/history/export', {
+        ...this.queryParams
+      }, `history_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/index.vue

 <template>
   <div class="app-container">
-    <div style="width: 500px; ">
-      <video width="500"  controls="" autoplay="" name="media">
-        <source :src="`${previewUrl}${videoData}`" type="video/mp4">
+    <div v-if="videoData">
+      <video width="500" controls autoplay name="media">
+        <source :src="videoData" type="video/mp4">
       </video>
     </div>
+    <div v-else>
+      加载中...
+    </div>
     <div class="upv">
       <el-upload
         ref="upload"
@@ -75,18 +78,21 @@ export default {
         name:null,
         videoPath:null
       },
-      videoData:'',
+      videoData:null,
+      fileSize:1024,
     }
   },
-  mounted() {
-    this.$nextTick(function () {
-      this.getList()
-    });
+  created() {
+    this.getList()
   },
   methods: {
     getList(){
+      this.videoData = null;
       listVideo().then(res => {
-        this.videoData = res.data
+        this.videoData = this.previewUrl + res.data;
+        this.$nextTick(() => {
+          this.$forceUpdate();
+        });
       })
     },
     //上传图片

src/views/monitoringDevices/envMonitoringAlarm/index.vue

@@ -162,7 +162,7 @@
   },
   created() {
     typeNameList().then(res => {
-      console.log(res,'res')
+      // console.log(res,'res')
       this.typeName = res.data
     })
     this.getList();
@@ -204,9 +204,10 @@
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
-      this.dateRange = [];
+      
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/monitoringDevices/envMonitoringDevices/index.vue

@@ -37,6 +37,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
           >修改预警值</el-button>
           
         </template>
@@ -66,7 +67,7 @@
         </el-form-item>
       
         <el-form-item label="预警阈值" prop="threshold">
-          <el-input v-model="form.threshold" placeholder="请输入预警阈值" />
+          <el-input-number v-model="form.threshold" :min="0" label="预警阈值"></el-input-number>
         </el-form-item>
        
        

src/views/monitoringDevices/envMonitoringHis/index.vue

@@ -100,7 +100,7 @@
   },
   created() {
     typeNameList().then(res => {
-      console.log(res,'res')
+      // console.log(res,'res')
       this.typeName = res.data
     })
     this.getList();
@@ -139,9 +139,9 @@
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
-      this.dateRange = [];
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/personPos/areaHis/index.vue

@@ -64,7 +64,7 @@
           <span>{{ parseTime(scope.row.leaveTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="停留时间" align="center" prop="residenceTime" />
+      <el-table-column label="停留时间(h)" align="center" prop="residenceTime" />
       
     </el-table>
 

src/views/personPos/perHis/index.vue

@@ -212,11 +212,13 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },