From 2749a7415c7a354ea506473f41f3208cc82e4d85 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期四, 09 十一月 2023 14:11:44 +0800
Subject: [PATCH] 模具管理字段增加，环境监测修改
---
web/src/views/SecureManage/WisdomVideo.vue | 2
web/src/views/Basics/MouldIndex.vue | 36 ++++++++++++++----
web/src/views/DataAnalyse/ComparisonIndex/components/DuctpieceIndex.vue | 1
web/src/views/GreenBuild/EnvironMonitor.vue | 39 ++++++++++++++++---
web/src/views/DataAnalyse/ComparisonIndex/components/RebarcageIndex.vue | 1
5 files changed, 61 insertions(+), 18 deletions(-)
diff --git a/web/src/views/Basics/MouldIndex.vue b/web/src/views/Basics/MouldIndex.vue
index 50a5987..8044b32 100644
--- a/web/src/views/Basics/MouldIndex.vue
+++ b/web/src/views/Basics/MouldIndex.vue
@@ -191,13 +191,23 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="模具检查预警值：" prop="supplierId">
- <el-input placeholder="请输入次数" v-model="formMould.alarmTimes" style="margin-right:15px">
- <template slot="append">次数</template>
- </el-input>
- <el-input placeholder="请输入天数" v-model="formMould.alarmDays">
- <template slot="append">天数</template>
- </el-input>
+ <el-form-item label="模具检查预警值：" required>
+ <el-row :gutter="10" type="flex">
+ <el-col :span="12">
+ <el-form-item prop="warningValue">
+ <el-input placeholder="请输入次数" v-model="formMould.warningValue" clearable>
+ <template slot="append">次数</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="warningDay">
+ <el-input placeholder="请输入天数" v-model="formMould.warningDay" clearable>
+ <template slot="append">天数</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form-item>
<el-form-item label="使用状态：" prop="status">
<el-select v-model="formMould.status" :size="size" clearable placeholder="请选择使用状态">
@@ -347,6 +357,16 @@
message: '请选择进厂日期',
trigger: ['blur', 'change']
}],
+ warningValue: [{
+ required: true,
+ message: '请输入预警次数',
+ trigger: 'blur'
+ }],
+ waningDay: [{
+ required: true,
+ message: '请输入预警天数',
+ trigger: 'blur'
+ }]
}, // 表单校验规则
mouldTypeDatas: [], // 块号
mouldSizeData: [], // 尺寸
@@ -364,7 +384,7 @@
},{
value: 4,
label: '报废'
- }]
+ }],
}
},
mounted() {
diff --git a/web/src/views/DataAnalyse/ComparisonIndex/components/DuctpieceIndex.vue b/web/src/views/DataAnalyse/ComparisonIndex/components/DuctpieceIndex.vue
index 7b52f97..143c267 100644
--- a/web/src/views/DataAnalyse/ComparisonIndex/components/DuctpieceIndex.vue
+++ b/web/src/views/DataAnalyse/ComparisonIndex/components/DuctpieceIndex.vue
@@ -156,7 +156,6 @@
yAxis: [
{
type: "value",
- max: 100,
splitNumber: 10,
axisLabel: {
formatter: "{value}",
diff --git a/web/src/views/DataAnalyse/ComparisonIndex/components/RebarcageIndex.vue b/web/src/views/DataAnalyse/ComparisonIndex/components/RebarcageIndex.vue
index 987fe31..db7daed 100644
--- a/web/src/views/DataAnalyse/ComparisonIndex/components/RebarcageIndex.vue
+++ b/web/src/views/DataAnalyse/ComparisonIndex/components/RebarcageIndex.vue
@@ -115,7 +115,6 @@
yAxis: [
{
type: "value",
- max: 100,
splitNumber: 10,
axisLabel: {
formatter: "{value}",
diff --git a/web/src/views/GreenBuild/EnvironMonitor.vue b/web/src/views/GreenBuild/EnvironMonitor.vue
index e2954e0..c8faa1b 100644
--- a/web/src/views/GreenBuild/EnvironMonitor.vue
+++ b/web/src/views/GreenBuild/EnvironMonitor.vue
@@ -29,21 +29,36 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="uploadTime" label="采集时间" align="center" ></el-table-column>
- <el-table-column prop="deviceName" label="设备" align="center"></el-table-column>
+ <el-table-column prop="uploadTime" label="采集时间" width="200" align="center" ></el-table-column>
+ <el-table-column prop="deviceName" label="设备" width="200" align="center"></el-table-column>
<el-table-column prop="pm25" label="PM2.5(微克/立方米)" width="200" align="center" ></el-table-column>
<el-table-column prop="pm10" label="PM10(微克/立方米)" width="200" align="center" ></el-table-column>
<el-table-column prop="tsp" label="TSP(微克/立方米)" width="200" align="center" ></el-table-column>
- <el-table-column prop="temperature" label="温度(摄氏度)" align="center" ></el-table-column>
+ <el-table-column prop="temperature" label="温度(摄氏度)" width="200" align="center" ></el-table-column>
<el-table-column prop="humidity" label="湿度(%)" align="center" ></el-table-column>
- <el-table-column prop="bigDeviceModel" label="大气压(千帕)" align="center" ></el-table-column>
- <el-table-column prop="windSpeed" label="风速(米/秒)" align="center" ></el-table-column>
+ <el-table-column prop="data6" label="数据6" align="center" ></el-table-column>
+ <el-table-column prop="pa" label="大气压(千帕)" width="200" align="center" ></el-table-column>
+ <el-table-column prop="windSpeed" label="风速(米/秒)" width="200" align="center" ></el-table-column>
<el-table-column prop="windDirection" label="风向" align="center" ></el-table-column>
- <el-table-column prop="noise" label="噪声(分贝)" align="center" ></el-table-column>
+ <el-table-column prop="tvoc" label="tvoc" align="center" ></el-table-column>
+ <el-table-column prop="no2" label="no2" align="center" ></el-table-column>
+ <el-table-column prop="co" label="co" align="center" ></el-table-column>
+ <el-table-column prop="so2" label="so2" align="center" ></el-table-column>
+ <el-table-column prop="o3" label="o3" align="center" ></el-table-column>
+ <el-table-column prop="noise" label="噪声(分贝)" width="200" align="center" ></el-table-column>
</el-table>
</div>
<div class="main_footer">
-
+ <el-pagination
+ background
+ @current-change="changePageNum"
+ @size-change="changePageSize"
+ :current-page="pageNum"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total">
+ </el-pagination>
</div>
</div>
</template>
@@ -87,6 +102,16 @@
this.loading = false;
})
},
+// 切换页数
+ changePageNum(page) {
+ this.pageNum = page;
+ this.searchEnvironMonitorList();
+ },
+ // 切换每页条数
+ changePageSize(size) {
+ this.pageSize = size;
+ this.searchEnvironMonitorList();
+ },
// 判断按钮权限信息
showButton(str) {
const pinia = buttonPinia();
diff --git a/web/src/views/SecureManage/WisdomVideo.vue b/web/src/views/SecureManage/WisdomVideo.vue
index fe3e90c..c1c5060 100644
--- a/web/src/views/SecureManage/WisdomVideo.vue
+++ b/web/src/views/SecureManage/WisdomVideo.vue
@@ -41,7 +41,7 @@
<el-table-column prop="signTime" label="预警时间" align="center" width="200"></el-table-column>
<el-table-column prop="boxName" label="盒子的名称" align="center" width="200"></el-table-column>
<el-table-column prop="deviceName" label="摄像头的名称" align="center" width="200"></el-table-column>
- <el-table-column prop="type" label="预警消息类型" align="center" width="200"></el-table-column>
+ <el-table-column prop="typeName" label="预警消息类型" align="center" width="200"></el-table-column>
<el-table-column prop="typeName" label="预警消息名称" align="center"></el-table-column>
<el-table-column prop="useYearMonth" label="抓拍大图" align="center"></el-table-column>
<el-table-column prop="signTime" label="抓拍时间" align="center"></el-table-column>
--
Gitblit v1.9.3