|
@@ -10,17 +10,19 @@
|
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="小时" prop="hour">
|
|
<el-form-item label="小时" prop="hour">
|
|
|
- <el-input
|
|
|
|
|
|
|
+ <el-input-number
|
|
|
v-model="queryParams.hour"
|
|
v-model="queryParams.hour"
|
|
|
placeholder="请输入小时"
|
|
placeholder="请输入小时"
|
|
|
clearable
|
|
clearable
|
|
|
|
|
+ :min="0"
|
|
|
|
|
+ :max="23"
|
|
|
@keyup.enter="handleQuery"
|
|
@keyup.enter="handleQuery"
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <el-form-item label="设备ID" prop="deviceId">
|
|
|
|
|
|
|
+ <el-form-item label="设备名称" prop="deviceId">
|
|
|
<el-input
|
|
<el-input
|
|
|
- v-model="queryParams.deviceId"
|
|
|
|
|
- placeholder="请输入设备ID"
|
|
|
|
|
|
|
+ v-model="queryParams.deviceName"
|
|
|
|
|
+ placeholder="设备名称"
|
|
|
clearable
|
|
clearable
|
|
|
@keyup.enter="handleQuery"
|
|
@keyup.enter="handleQuery"
|
|
|
/>
|
|
/>
|
|
@@ -41,92 +43,92 @@
|
|
|
@keyup.enter="handleQuery"
|
|
@keyup.enter="handleQuery"
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <el-form-item label="参数值" prop="paraValue">
|
|
|
|
|
- <el-input
|
|
|
|
|
- v-model="queryParams.paraValue"
|
|
|
|
|
- placeholder="请输入参数值"
|
|
|
|
|
- clearable
|
|
|
|
|
- @keyup.enter="handleQuery"
|
|
|
|
|
- />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="参数分钟级数据" prop="paraMValue">
|
|
|
|
|
- <el-input
|
|
|
|
|
- v-model="queryParams.paraMValue"
|
|
|
|
|
- placeholder="请输入参数分钟级数据"
|
|
|
|
|
- clearable
|
|
|
|
|
- @keyup.enter="handleQuery"
|
|
|
|
|
- />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
|
|
+<!-- <el-form-item label="参数值" prop="paraValue">-->
|
|
|
|
|
+<!-- <el-input-->
|
|
|
|
|
+<!-- v-model="queryParams.paraValue"-->
|
|
|
|
|
+<!-- placeholder="请输入参数值"-->
|
|
|
|
|
+<!-- clearable-->
|
|
|
|
|
+<!-- @keyup.enter="handleQuery"-->
|
|
|
|
|
+<!-- />-->
|
|
|
|
|
+<!-- </el-form-item>-->
|
|
|
|
|
+<!-- <el-form-item label="参数分钟级数据" prop="paraMValue">-->
|
|
|
|
|
+<!-- <el-input-->
|
|
|
|
|
+<!-- v-model="queryParams.paraMValue"-->
|
|
|
|
|
+<!-- placeholder="请输入参数分钟级数据"-->
|
|
|
|
|
+<!-- clearable-->
|
|
|
|
|
+<!-- @keyup.enter="handleQuery"-->
|
|
|
|
|
+<!-- />-->
|
|
|
|
|
+<!-- </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>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
|
|
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
|
|
- <el-col :span="1.5">
|
|
|
|
|
- <el-button
|
|
|
|
|
- type="primary"
|
|
|
|
|
- plain
|
|
|
|
|
- icon="Plus"
|
|
|
|
|
- @click="handleAdd"
|
|
|
|
|
- v-hasPermi="['dye:hour:add']"
|
|
|
|
|
- >新增</el-button>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="1.5">
|
|
|
|
|
- <el-button
|
|
|
|
|
- type="success"
|
|
|
|
|
- plain
|
|
|
|
|
- icon="Edit"
|
|
|
|
|
- :disabled="single"
|
|
|
|
|
- @click="handleUpdate"
|
|
|
|
|
- v-hasPermi="['dye:hour:edit']"
|
|
|
|
|
- >修改</el-button>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="1.5">
|
|
|
|
|
- <el-button
|
|
|
|
|
- type="danger"
|
|
|
|
|
- plain
|
|
|
|
|
- icon="Delete"
|
|
|
|
|
- :disabled="multiple"
|
|
|
|
|
- @click="handleDelete"
|
|
|
|
|
- v-hasPermi="['dye:hour:remove']"
|
|
|
|
|
- >删除</el-button>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="1.5">
|
|
|
|
|
- <el-button
|
|
|
|
|
- type="warning"
|
|
|
|
|
- plain
|
|
|
|
|
- icon="Download"
|
|
|
|
|
- @click="handleExport"
|
|
|
|
|
- v-hasPermi="['dye:hour:export']"
|
|
|
|
|
- >导出</el-button>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
|
|
- </el-row>
|
|
|
|
|
|
|
+<!-- <el-row :gutter="10" class="mb8">-->
|
|
|
|
|
+<!-- <el-col :span="1.5">-->
|
|
|
|
|
+<!-- <el-button-->
|
|
|
|
|
+<!-- type="primary"-->
|
|
|
|
|
+<!-- plain-->
|
|
|
|
|
+<!-- icon="Plus"-->
|
|
|
|
|
+<!-- @click="handleAdd"-->
|
|
|
|
|
+<!-- v-hasPermi="['dye:hour:add']"-->
|
|
|
|
|
+<!-- >新增</el-button>-->
|
|
|
|
|
+<!-- </el-col>-->
|
|
|
|
|
+<!-- <el-col :span="1.5">-->
|
|
|
|
|
+<!-- <el-button-->
|
|
|
|
|
+<!-- type="success"-->
|
|
|
|
|
+<!-- plain-->
|
|
|
|
|
+<!-- icon="Edit"-->
|
|
|
|
|
+<!-- :disabled="single"-->
|
|
|
|
|
+<!-- @click="handleUpdate"-->
|
|
|
|
|
+<!-- v-hasPermi="['dye:hour:edit']"-->
|
|
|
|
|
+<!-- >修改</el-button>-->
|
|
|
|
|
+<!-- </el-col>-->
|
|
|
|
|
+<!-- <el-col :span="1.5">-->
|
|
|
|
|
+<!-- <el-button-->
|
|
|
|
|
+<!-- type="danger"-->
|
|
|
|
|
+<!-- plain-->
|
|
|
|
|
+<!-- icon="Delete"-->
|
|
|
|
|
+<!-- :disabled="multiple"-->
|
|
|
|
|
+<!-- @click="handleDelete"-->
|
|
|
|
|
+<!-- v-hasPermi="['dye:hour:remove']"-->
|
|
|
|
|
+<!-- >删除</el-button>-->
|
|
|
|
|
+<!-- </el-col>-->
|
|
|
|
|
+<!-- <el-col :span="1.5">-->
|
|
|
|
|
+<!-- <el-button-->
|
|
|
|
|
+<!-- type="warning"-->
|
|
|
|
|
+<!-- plain-->
|
|
|
|
|
+<!-- icon="Download"-->
|
|
|
|
|
+<!-- @click="handleExport"-->
|
|
|
|
|
+<!-- v-hasPermi="['dye:hour:export']"-->
|
|
|
|
|
+<!-- >导出</el-button>-->
|
|
|
|
|
+<!-- </el-col>-->
|
|
|
|
|
+<!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
|
|
|
|
|
+<!-- </el-row>-->
|
|
|
|
|
|
|
|
<el-table v-loading="loading" :data="hourList" @selection-change="handleSelectionChange">
|
|
<el-table v-loading="loading" :data="hourList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="统计ID" align="center" prop="chId" />
|
|
|
|
|
|
|
+<!-- <el-table-column label="统计ID" align="center" prop="chId" />-->
|
|
|
<el-table-column label="日期" align="center" prop="dataDate" width="180">
|
|
<el-table-column label="日期" align="center" prop="dataDate" width="180">
|
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
|
<span>{{ parseTime(scope.row.dataDate, '{y}-{m}-{d}') }}</span>
|
|
<span>{{ parseTime(scope.row.dataDate, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="小时" align="center" prop="hour" />
|
|
<el-table-column label="小时" align="center" prop="hour" />
|
|
|
- <el-table-column label="设备ID" align="center" prop="deviceId" />
|
|
|
|
|
|
|
+ <el-table-column label="设备名称" align="center" prop="deviceName" />
|
|
|
<el-table-column label="参数编码" align="center" prop="paraCode" />
|
|
<el-table-column label="参数编码" align="center" prop="paraCode" />
|
|
|
<el-table-column label="参数名称" align="center" prop="paraName" />
|
|
<el-table-column label="参数名称" align="center" prop="paraName" />
|
|
|
<el-table-column label="参数值" align="center" prop="paraValue" />
|
|
<el-table-column label="参数值" align="center" prop="paraValue" />
|
|
|
- <el-table-column label="参数分钟级数据" align="center" prop="paraMValue" />
|
|
|
|
|
|
|
+<!-- <el-table-column label="参数分钟级数据" align="center" prop="paraMValue" />-->
|
|
|
<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="['dye:hour:edit']">修改</el-button>
|
|
|
|
|
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dye:hour:remove']">删除</el-button>
|
|
|
|
|
|
|
+ <el-button link type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
|
|
|
|
|
+<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>-->
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
<pagination
|
|
<pagination
|
|
|
v-show="total>0"
|
|
v-show="total>0"
|
|
|
:total="total"
|
|
:total="total"
|
|
@@ -135,40 +137,58 @@
|
|
|
@pagination="getList"
|
|
@pagination="getList"
|
|
|
/>
|
|
/>
|
|
|
|
|
|
|
|
- <!-- 添加或修改小时统计数据对话框 -->
|
|
|
|
|
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
|
|
|
|
- <el-form ref="hourRef" :model="form" :rules="rules" label-width="80px">
|
|
|
|
|
- <el-form-item label="日期" prop="dataDate">
|
|
|
|
|
- <el-date-picker clearable
|
|
|
|
|
- v-model="form.dataDate"
|
|
|
|
|
- type="date"
|
|
|
|
|
- value-format="YYYY-MM-DD"
|
|
|
|
|
- placeholder="请选择日期">
|
|
|
|
|
- </el-date-picker>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="小时" prop="hour">
|
|
|
|
|
- <el-input v-model="form.hour" placeholder="请输入小时" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="设备ID" prop="deviceId">
|
|
|
|
|
- <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="参数编码" prop="paraCode">
|
|
|
|
|
- <el-input v-model="form.paraCode" placeholder="请输入参数编码" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="参数名称" prop="paraName">
|
|
|
|
|
- <el-input v-model="form.paraName" placeholder="请输入参数名称" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="参数值" prop="paraValue">
|
|
|
|
|
- <el-input v-model="form.paraValue" placeholder="请输入参数值" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="参数分钟级数据" prop="paraMValue">
|
|
|
|
|
- <el-input v-model="form.paraMValue" placeholder="请输入参数分钟级数据" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
|
|
+ <!-- 查看小时统计数据对话框 -->
|
|
|
|
|
+ <el-dialog :title="title" v-model="open" width="700px" append-to-body>
|
|
|
|
|
+ <el-form ref="hourRef" :model="form" :rules="rules" label-width="100px">
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="日期" prop="dataDate">
|
|
|
|
|
+ <el-date-picker clearable
|
|
|
|
|
+ v-model="form.dataDate"
|
|
|
|
|
+ type="date"
|
|
|
|
|
+ value-format="YYYY-MM-DD"
|
|
|
|
|
+ placeholder="请选择日期"
|
|
|
|
|
+ disabled>
|
|
|
|
|
+ </el-date-picker>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="小时" prop="hour">
|
|
|
|
|
+ <el-input v-model="form.hour" placeholder="请输入小时" disabled />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="设备名称" prop="deviceId">
|
|
|
|
|
+ <el-input v-model="form.deviceName" placeholder="请输入设备ID" disabled />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="参数编码" prop="paraCode">
|
|
|
|
|
+ <el-input v-model="form.paraCode" placeholder="请输入参数编码" disabled />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="参数名称" prop="paraName">
|
|
|
|
|
+ <el-input v-model="form.paraName" placeholder="请输入参数名称" disabled />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="参数值" prop="paraValue">
|
|
|
|
|
+ <el-input v-model="form.paraValue" placeholder="请输入参数值" disabled />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+<!-- <el-form-item label="分钟级数据" prop="paraMValue">-->
|
|
|
|
|
+ <div ref="chartRef" style="width: 100%; height: 300px;"></div>
|
|
|
|
|
+<!-- </el-form-item>-->
|
|
|
</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>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
@@ -176,6 +196,7 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script setup name="Hour">
|
|
<script setup name="Hour">
|
|
|
|
|
+import * as echarts from 'echarts';
|
|
|
import { listHour, getHour, delHour, addHour, updateHour } from "@/api/dye/hour";
|
|
import { listHour, getHour, delHour, addHour, updateHour } from "@/api/dye/hour";
|
|
|
|
|
|
|
|
const { proxy } = getCurrentInstance();
|
|
const { proxy } = getCurrentInstance();
|
|
@@ -189,6 +210,8 @@ const single = ref(true);
|
|
|
const multiple = ref(true);
|
|
const multiple = ref(true);
|
|
|
const total = ref(0);
|
|
const total = ref(0);
|
|
|
const title = ref("");
|
|
const title = ref("");
|
|
|
|
|
+const chartRef = ref(null);
|
|
|
|
|
+let chartInstance = null;
|
|
|
|
|
|
|
|
const data = reactive({
|
|
const data = reactive({
|
|
|
form: {},
|
|
form: {},
|
|
@@ -243,6 +266,12 @@ function reset() {
|
|
|
remark: null
|
|
remark: null
|
|
|
};
|
|
};
|
|
|
proxy.resetForm("hourRef");
|
|
proxy.resetForm("hourRef");
|
|
|
|
|
+
|
|
|
|
|
+ // 销毁图表实例
|
|
|
|
|
+ if (chartInstance) {
|
|
|
|
|
+ chartInstance.dispose();
|
|
|
|
|
+ chartInstance = null;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|
|
@@ -264,6 +293,75 @@ function handleSelectionChange(selection) {
|
|
|
multiple.value = !selection.length;
|
|
multiple.value = !selection.length;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+/** 查看按钮操作 */
|
|
|
|
|
+function handleView(row) {
|
|
|
|
|
+ reset();
|
|
|
|
|
+ const _chId = row.chId || ids.value
|
|
|
|
|
+ getHour(_chId).then(response => {
|
|
|
|
|
+ form.value = response.data;
|
|
|
|
|
+ open.value = true;
|
|
|
|
|
+ title.value = "查看小时统计数据";
|
|
|
|
|
+ // 等待DOM更新后初始化图表
|
|
|
|
|
+ nextTick(() => {
|
|
|
|
|
+ initChart();
|
|
|
|
|
+ });
|
|
|
|
|
+ });
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+// 初始化图表
|
|
|
|
|
+function initChart() {
|
|
|
|
|
+ // 销毁之前的图表实例
|
|
|
|
|
+ if (chartInstance) {
|
|
|
|
|
+ chartInstance.dispose();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 初始化图表
|
|
|
|
|
+ chartInstance = echarts.init(chartRef.value);
|
|
|
|
|
+
|
|
|
|
|
+ // 模拟数据格式 [{"time":"1","value":6.77},{"time":"2","value":6.69}]
|
|
|
|
|
+ // 实际项目中应该从form.value.paraMValue解析数据
|
|
|
|
|
+ let chartData = [];
|
|
|
|
|
+ try {
|
|
|
|
|
+ chartData = JSON.parse(form.value.paraMValue || '[]');
|
|
|
|
|
+ } catch (e) {
|
|
|
|
|
+ console.error('解析分钟级数据出错:', e);
|
|
|
|
|
+ chartData = [];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 提取时间和数值
|
|
|
|
|
+ const times = chartData.map(item => item.time);
|
|
|
|
|
+ const values = chartData.map(item => item.value);
|
|
|
|
|
+
|
|
|
|
|
+ // 图表配置
|
|
|
|
|
+ const option = {
|
|
|
|
|
+ tooltip: {
|
|
|
|
|
+ trigger: 'axis'
|
|
|
|
|
+ },
|
|
|
|
|
+ xAxis: {
|
|
|
|
|
+ type: 'category',
|
|
|
|
|
+ data: times,
|
|
|
|
|
+ name: '分钟'
|
|
|
|
|
+ },
|
|
|
|
|
+ yAxis: {
|
|
|
|
|
+ type: 'value',
|
|
|
|
|
+ name: '数值'
|
|
|
|
|
+ },
|
|
|
|
|
+ series: [{
|
|
|
|
|
+ data: values,
|
|
|
|
|
+ type: 'line',
|
|
|
|
|
+ smooth: true
|
|
|
|
|
+ }]
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ // 设置图表配置
|
|
|
|
|
+ chartInstance.setOption(option);
|
|
|
|
|
+
|
|
|
|
|
+ // 监听窗口大小变化,自适应图表
|
|
|
|
|
+ window.addEventListener('resize', () => {
|
|
|
|
|
+ chartInstance.resize();
|
|
|
|
|
+ });
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
/** 新增按钮操作 */
|
|
/** 新增按钮操作 */
|
|
|
function handleAdd() {
|
|
function handleAdd() {
|
|
|
reset();
|
|
reset();
|