|
@@ -17,15 +17,19 @@
|
|
@keyup.enter="handleQuery"
|
|
@keyup.enter="handleQuery"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="控制结果(0-失败,1-成功)" prop="controlResult">
|
|
|
|
- <el-input
|
|
|
|
- v-model="queryParams.controlResult"
|
|
|
|
- placeholder="请输入控制结果(0-失败,1-成功)"
|
|
|
|
- clearable
|
|
|
|
- @keyup.enter="handleQuery"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-form-item label="控制结果" prop="controlResult">
|
|
|
|
+ <el-select v-model="queryParams.controlResult" placeholder="请选择结果" style="width: 140px"
|
|
|
|
+ @keyup.enter="handleQuery">
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in control_result"
|
|
|
|
+ :key="dict.value"
|
|
|
|
+ :label="dict.label"
|
|
|
|
+ :value="dict.value"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="操作人姓名" prop="operatorName">
|
|
|
|
|
|
+
|
|
|
|
+ <el-form-item label="操作人" prop="operatorName">
|
|
<el-input
|
|
<el-input
|
|
v-model="queryParams.operatorName"
|
|
v-model="queryParams.operatorName"
|
|
placeholder="请输入操作人姓名"
|
|
placeholder="请输入操作人姓名"
|
|
@@ -33,6 +37,20 @@
|
|
@keyup.enter="handleQuery"
|
|
@keyup.enter="handleQuery"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="操作类型" prop="controlType">
|
|
|
|
+ <el-select v-model="queryParams.controlType" placeholder="请选择操作类型" clearable style="width: 240px"
|
|
|
|
+ @keyup.enter="handleQuery">
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="dict in root_control_type"
|
|
|
|
+ :key="dict.value"
|
|
|
|
+ :label="dict.label"
|
|
|
|
+ :value="dict.value"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <el-form-item label="操作时间" style="width: 308px">
|
|
|
|
+ <el-date-picker v-model="queryParams.operateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
@@ -40,35 +58,7 @@
|
|
</el-form>
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
<el-row :gutter="10" class="mb8">
|
|
- <el-col :span="1.5">
|
|
|
|
- <el-button
|
|
|
|
- type="primary"
|
|
|
|
- plain
|
|
|
|
- icon="Plus"
|
|
|
|
- @click="handleAdd"
|
|
|
|
- v-hasPermi="['device:control:add']"
|
|
|
|
- >新增</el-button>
|
|
|
|
- </el-col>
|
|
|
|
- <el-col :span="1.5">
|
|
|
|
- <el-button
|
|
|
|
- type="success"
|
|
|
|
- plain
|
|
|
|
- icon="Edit"
|
|
|
|
- :disabled="single"
|
|
|
|
- @click="handleUpdate"
|
|
|
|
- v-hasPermi="['device:control:edit']"
|
|
|
|
- >修改</el-button>
|
|
|
|
- </el-col>
|
|
|
|
- <el-col :span="1.5">
|
|
|
|
- <el-button
|
|
|
|
- type="danger"
|
|
|
|
- plain
|
|
|
|
- icon="Delete"
|
|
|
|
- :disabled="multiple"
|
|
|
|
- @click="handleDelete"
|
|
|
|
- v-hasPermi="['device:control:remove']"
|
|
|
|
- >删除</el-button>
|
|
|
|
- </el-col>
|
|
|
|
|
|
+
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
<el-button
|
|
<el-button
|
|
type="warning"
|
|
type="warning"
|
|
@@ -86,10 +76,19 @@
|
|
<el-table-column label="主键ID1" align="center" prop="id" />
|
|
<el-table-column label="主键ID1" align="center" prop="id" />
|
|
<el-table-column label="设备ID" align="center" prop="deviceId" />
|
|
<el-table-column label="设备ID" align="center" prop="deviceId" />
|
|
<el-table-column label="点位ID" align="center" prop="pointId" />
|
|
<el-table-column label="点位ID" align="center" prop="pointId" />
|
|
- <el-table-column label="控制类型" align="center" prop="controlType" />
|
|
|
|
|
|
+ <el-table-column label="控制类型" align="center" prop="controlType">
|
|
|
|
+ <template #default="scope">
|
|
|
|
+ <dict-tag :options="root_control_type" :value="scope.row.controlType"/>
|
|
|
|
+ </template>
|
|
|
|
+
|
|
|
|
+ </el-table-column>
|
|
<el-table-column label="原值" align="center" prop="oldValue" />
|
|
<el-table-column label="原值" align="center" prop="oldValue" />
|
|
<el-table-column label="新值" align="center" prop="newValue" />
|
|
<el-table-column label="新值" align="center" prop="newValue" />
|
|
- <el-table-column label="控制结果(0-失败,1-成功)" align="center" prop="controlResult" />
|
|
|
|
|
|
+ <el-table-column label="控制结果" align="center" prop="controlResult">
|
|
|
|
+ <template #default="scope">
|
|
|
|
+ <dict-tag :options="control_result" :value="scope.row.controlResult"/>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column label="操作人ID" align="center" prop="operatorId" />
|
|
<el-table-column label="操作人ID" align="center" prop="operatorId" />
|
|
<el-table-column label="操作人姓名" align="center" prop="operatorName" />
|
|
<el-table-column label="操作人姓名" align="center" prop="operatorName" />
|
|
<el-table-column label="操作时间" align="center" prop="operateTime" width="180">
|
|
<el-table-column label="操作时间" align="center" prop="operateTime" width="180">
|
|
@@ -100,8 +99,7 @@
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:control:edit']">修改</el-button>
|
|
|
|
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['device:control:remove']">删除</el-button>
|
|
|
|
|
|
+ <el-button link type="primary" icon="View" @click="handleView(scope.row, scope.index)" v-hasPermi="['device:control:query']">详情</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -115,8 +113,8 @@
|
|
/>
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改设备控制记录对话框 -->
|
|
<!-- 添加或修改设备控制记录对话框 -->
|
|
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
|
|
|
- <el-form ref="controlRef" :model="form" :rules="rules" label-width="80px">
|
|
|
|
|
|
+ <el-dialog :title="title" v-model="open" width="800px" append-to-body>
|
|
|
|
+ <el-form ref="controlRef" :model="form" :rules="rules" label-width="100px" disabled>
|
|
<el-form-item label="设备ID" prop="deviceId">
|
|
<el-form-item label="设备ID" prop="deviceId">
|
|
<el-input v-model="form.deviceId" placeholder="请输入设备ID" />
|
|
<el-input v-model="form.deviceId" placeholder="请输入设备ID" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -129,8 +127,8 @@
|
|
<el-form-item label="新值" prop="newValue">
|
|
<el-form-item label="新值" prop="newValue">
|
|
<el-input v-model="form.newValue" placeholder="请输入新值" />
|
|
<el-input v-model="form.newValue" placeholder="请输入新值" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="控制结果(0-失败,1-成功)" prop="controlResult">
|
|
|
|
- <el-input v-model="form.controlResult" placeholder="请输入控制结果(0-失败,1-成功)" />
|
|
|
|
|
|
+ <el-form-item label="控制结果" prop="controlResult">
|
|
|
|
+ <el-input v-model="form.controlResult" placeholder="请输入控制结果" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="操作人ID" prop="operatorId">
|
|
<el-form-item label="操作人ID" prop="operatorId">
|
|
<el-input v-model="form.operatorId" placeholder="请输入操作人ID" />
|
|
<el-input v-model="form.operatorId" placeholder="请输入操作人ID" />
|
|
@@ -152,7 +150,6 @@
|
|
</el-form>
|
|
</el-form>
|
|
<template #footer>
|
|
<template #footer>
|
|
<div class="dialog-footer">
|
|
<div class="dialog-footer">
|
|
- <el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
<el-button @click="cancel">取 消</el-button>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -164,6 +161,8 @@
|
|
import { listControl, getControl, delControl, addControl, updateControl } from "@/api/device/control";
|
|
import { listControl, getControl, delControl, addControl, updateControl } from "@/api/device/control";
|
|
|
|
|
|
const { proxy } = getCurrentInstance();
|
|
const { proxy } = getCurrentInstance();
|
|
|
|
+const {root_control_type,control_result} = proxy.useDict('root_control_type','control_result');
|
|
|
|
+
|
|
|
|
|
|
const controlList = ref([]);
|
|
const controlList = ref([]);
|
|
const open = ref(false);
|
|
const open = ref(false);
|
|
@@ -281,10 +280,14 @@ function handleUpdate(row) {
|
|
getControl(_id).then(response => {
|
|
getControl(_id).then(response => {
|
|
form.value = response.data;
|
|
form.value = response.data;
|
|
open.value = true;
|
|
open.value = true;
|
|
- title.value = "修改设备控制记录";
|
|
|
|
|
|
+ title.value = "设备控制记录详情";
|
|
});
|
|
});
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+/** 详细按钮操作 */
|
|
|
|
+function handleView(row) {
|
|
|
|
+ open.value = true;
|
|
|
|
+ form.value = row;
|
|
|
|
+}
|
|
/** 提交按钮 */
|
|
/** 提交按钮 */
|
|
function submitForm() {
|
|
function submitForm() {
|
|
proxy.$refs["controlRef"].validate(valid => {
|
|
proxy.$refs["controlRef"].validate(valid => {
|