Merge branch 'main' of http://175.27.215.92:3000/caoql/JDAirPort.Ems.UI

src/api/ems/record/recordVibrateInstance.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询震动实时数据列表
+export function listRecordVibrateInstance(query) {
+  return request({
+    url: '/ems/record/recordVibrateInstance/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询震动实时数据详细
+export function getRecordVibrateInstance(objId) {
+  return request({
+    url: '/ems/record/recordVibrateInstance/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增震动实时数据
+export function addRecordVibrateInstance(data) {
+  return request({
+    url: '/ems/record/recordVibrateInstance',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改震动实时数据
+export function updateRecordVibrateInstance(data) {
+  return request({
+    url: '/ems/record/recordVibrateInstance',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除震动实时数据
+export function delRecordVibrateInstance(objId) {
+  return request({
+    url: '/ems/record/recordVibrateInstance/' + objId,
+    method: 'delete'
+  })
+}

src/views/ems/record/recordSteamInstant/index.vue

@@ -182,8 +182,8 @@
         <el-form-item label="采集时间" prop="collectTime">
           <el-date-picker clearable
                           v-model="form.collectTime"
-                          type="date"
+                          type="datetime"
-                          value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           placeholder="请选择采集时间"
           >
           </el-date-picker>
@@ -215,8 +215,8 @@
         <el-form-item label="记录时间" prop="recordTime">
           <el-date-picker clearable
                           v-model="form.recordTime"
-                          type="date"
+                          type="datetime"
-                          value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           placeholder="请选择记录时间"
           >
           </el-date-picker>

src/views/ems/record/recordVibrateInstance/index.vue

@@ -0,0 +1,435 @@
+<template>
+  <div class="app-container">
+
+
+
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <!--                        <el-form-item label="采集时间">
+                                  <el-date-picker
+                                          v-model="daterangeCollectTime"
+                                          style="width: 340px"
+                                          value-format="yyyy-MM-dd HH:mm:ss"
+                                          type="datetimerange"
+                                          range-separator="-"
+                                          start-placeholder="开始时间"
+                                          end-placeholder="结束时间"
+                                  ></el-date-picker>
+                              </el-form-item>-->
+      <el-form-item label="采集时间">
+        <el-date-picker
+          v-model="daterangeCollectTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="震动传感器编号" prop="sensorId">
+        <el-input
+          v-model="queryParams.sensorId"
+          placeholder="请输入震动传感器编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--                        <el-form-item label="速度(mm/s)" prop="speed">
+                                  <el-input
+                                          v-model="queryParams.speed"
+                                          placeholder="请输入速度(mm/s)"
+                                          clearable
+                                          @keyup.enter.native="handleQuery"
+                                  />
+                              </el-form-item>-->
+      <!--                        <el-form-item label="位移(um)" prop="displacement">
+                                  <el-input
+                                          v-model="queryParams.displacement"
+                                          placeholder="请输入位移(um)"
+                                          clearable
+                                          @keyup.enter.native="handleQuery"
+                                  />
+                              </el-form-item>-->
+      <!--                        <el-form-item label="加速度(g)" prop="acceleration">
+                                  <el-input
+                                          v-model="queryParams.acceleration"
+                                          placeholder="请输入加速度(g)"
+                                          clearable
+                                          @keyup.enter.native="handleQuery"
+                                  />
+                              </el-form-item>-->
+      <!--                        <el-form-item label="温度(℃)" prop="temperature">
+                                  <el-input
+                                          v-model="queryParams.temperature"
+                                          placeholder="请输入温度(℃)"
+                                          clearable
+                                          @keyup.enter.native="handleQuery"
+                                  />
+                              </el-form-item>-->
+      <!--                        <el-form-item label="记录时间">
+                                  <el-date-picker
+                                          v-model="daterangeRecodeTime"
+                                          style="width: 340px"
+                                          value-format="yyyy-MM-dd HH:mm:ss"
+                                          type="datetimerange"
+                                          range-separator="-"
+                                          start-placeholder="开始时间"
+                                          end-placeholder="结束时间"
+                                  ></el-date-picker>
+                              </el-form-item>-->
+      <el-form-item label="记录时间">
+        <el-date-picker
+          v-model="daterangeRecodeTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ems/record:recordVibrateInstance:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['ems/record:recordVibrateInstance:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['ems/record:recordVibrateInstance:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['ems/record:recordVibrateInstance:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordVibrateInstanceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!--                    <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>-->
+      <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[1].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="震动传感器编号" align="center" prop="sensorId" v-if="columns[2].visible"/>
+      <el-table-column label="速度(mm/s)" align="center" prop="speed" v-if="columns[3].visible"/>
+      <el-table-column label="位移(um)" align="center" prop="displacement" v-if="columns[4].visible"/>
+      <el-table-column label="加速度(g)" align="center" prop="acceleration" v-if="columns[5].visible"/>
+      <el-table-column label="温度(℃)" align="center" prop="temperature" v-if="columns[6].visible"/>
+      <el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems/record:recordVibrateInstance:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems/record:recordVibrateInstance:remove']"
+          >删除</el-button>
+        </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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <!--                                <el-form-item label="采集时间" prop="collectTime">
+                                            <el-date-picker clearable
+                                                            v-model="form.collectTime"
+                                                            type="date"
+                                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                                            placeholder="请选择采集时间">
+                                            </el-date-picker>
+                                        </el-form-item>-->
+        <el-form-item label="采集时间" prop="collectTime">
+          <el-date-picker
+            v-model="form.collectTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择采集时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="震动传感器编号" prop="sensorId">
+          <el-input v-model="form.sensorId" placeholder="请输入震动传感器编号" />
+        </el-form-item>
+        <el-form-item label="速度(mm/s)" prop="speed">
+          <el-input v-model="form.speed" placeholder="请输入速度(mm/s)" />
+        </el-form-item>
+        <el-form-item label="位移(um)" prop="displacement">
+          <el-input v-model="form.displacement" placeholder="请输入位移(um)" />
+        </el-form-item>
+        <el-form-item label="加速度(g)" prop="acceleration">
+          <el-input v-model="form.acceleration" placeholder="请输入加速度(g)" />
+        </el-form-item>
+        <el-form-item label="温度(℃)" prop="temperature">
+          <el-input v-model="form.temperature" placeholder="请输入温度(℃)" />
+        </el-form-item>
+        <!--                                <el-form-item label="记录时间" prop="recodeTime">
+                                            <el-date-picker clearable
+                                                            v-model="form.recodeTime"
+                                                            type="date"
+                                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                                            placeholder="请选择记录时间">
+                                            </el-date-picker>
+                                        </el-form-item>-->
+        <el-form-item label="记录时间" prop="recodeTime">
+          <el-date-picker
+            v-model="form.recodeTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择记录时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </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 { listRecordVibrateInstance, getRecordVibrateInstance, delRecordVibrateInstance, addRecordVibrateInstance, updateRecordVibrateInstance } from "@/api/ems/record/recordVibrateInstance";
+
+export default {
+  name: "RecordVibrateInstance",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 震动实时数据表格数据
+      recordVibrateInstanceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 备注时间范围
+      daterangeCollectTime: [],
+      // 备注时间范围
+      daterangeRecodeTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        collectTime: null,
+        sensorId: null,
+        speed: null,
+        displacement: null,
+        acceleration: null,
+        temperature: null,
+        recodeTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        sensorId: [
+          {required: true, message: "震动传感器编号不能为空", trigger: "blur"}
+        ],
+        recodeTime: [
+          {required: true, message: "记录时间不能为空", trigger: "blur"}
+        ],
+        collectTime: [
+          {required: true, message: "采集时间不能为空", trigger: "blur"}
+        ],
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: true },
+        { key: 1, label: `采集时间`, visible: true },
+        { key: 2, label: `震动传感器编号`, visible: true },
+        { key: 3, label: `速度(mm/s)`, visible: true },
+        { key: 4, label: `位移(um)`, visible: true },
+        { key: 5, label: `加速度(g)`, visible: true },
+        { key: 6, label: `温度(℃)`, visible: true },
+        { key: 7, label: `记录时间`, visible: true },
+        { key: 8, label: `备注`, visible: true },
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询震动实时数据列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+        this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0];
+        this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1];
+      }
+      if (null != this.daterangeRecodeTime && '' != this.daterangeRecodeTime) {
+        this.queryParams.params["beginRecodeTime"] = this.daterangeRecodeTime[0];
+        this.queryParams.params["endRecodeTime"] = this.daterangeRecodeTime[1];
+      }
+      listRecordVibrateInstance(this.queryParams).then(response => {
+        this.recordVibrateInstanceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        collectTime: null,
+        sensorId: null,
+        speed: null,
+        displacement: null,
+        acceleration: null,
+        temperature: null,
+        recodeTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCollectTime = [];
+      this.daterangeRecodeTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加震动实时数据";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getRecordVibrateInstance(objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改震动实时数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateRecordVibrateInstance(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRecordVibrateInstance(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除震动实时数据编号为"' + objIds + '"的数据项？').then(function() {
+        return delRecordVibrateInstance(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/record/recordVibrateInstance/export', {
+        ...this.queryParams
+      }, `recordVibrateInstance_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>