dev-scheduling
wangmeng 3 months ago
parent 54e9a36f3e
commit ef0f4e0e2c
  1. 14
      src/api/safetyManagement/wasteGasRunRec.js
  2. 10
      src/views/safetyManagement/equipmentInspectionPoint/index.vue
  3. 6
      src/views/safetyManagement/equipmentInspectionTask/index.vue
  4. 8
      src/views/safetyManagement/safetyInspectionPoint/index.vue
  5. 13
      src/views/safetyManagement/safetyInspectionTask/index.vue
  6. 7
      src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue
  7. 5
      src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
  8. 33
      src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue
  9. 133
      src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
  10. 9
      src/views/safetyManagement/wastewater/components/dischargeRec.vue
  11. 20
      src/views/safetyManagement/wastewater/components/dosingRecord.vue
  12. 2
      src/views/safetyManagement/wastewater/components/meterParameter.vue
  13. 19
      src/views/safetyManagement/wastewater/components/testRecord.vue

@ -42,6 +42,20 @@ export const update = row => {
});
};
// 根据角色ID获取责任人列表
export const getdutyManList = (data) => {
return request({
url: '/api/blade-system/user/page',
method: 'get',
params: {
status: 1, // 固定状态为1(启用)
current: data.current || 1, // 页码,默认1
size: data.size || 10000000, // 条数,默认查全部
deptId: data.deptId || '', // 部门ID,可选
roleId: data.roleId || ''
}
})
}

@ -25,7 +25,7 @@
</el-button>
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport"
<el-button type="primary" @click="handleImport"
>导入
</el-button>
</template>
@ -116,7 +116,7 @@ export default {
searchLabelWidth: 90,
rules: [
{
required: false,
required: true,
message: "请输入巡检点编号",
trigger: "blur",
},
@ -132,7 +132,7 @@ export default {
searchLabelWidth: 90,
rules: [
{
required: false,
required: true,
message: "请输入巡检点位置",
trigger: "blur",
},
@ -153,7 +153,7 @@ export default {
],
rules: [
{
required: false,
required: true,
message: "请输入巡检点位置",
trigger: "blur",
},
@ -170,7 +170,7 @@ export default {
// type: 'number',
rules: [
{
required: false,
required: true,
message: "请输入巡检周期(h)",
trigger: "blur",
},

@ -104,7 +104,7 @@ export default {
sortable: true,
filter: true,
search: true,
searchLabelWidth: 100,
searchLabelWidth: 90,
},
{
label: "巡检点位置",
@ -112,7 +112,7 @@ export default {
sortable: true,
filter: true,
search: true,
searchLabelWidth: 100,
searchLabelWidth: 90,
},
{
label: "巡检点类型",
@ -183,6 +183,7 @@ export default {
sortable: true,
filter: true,
search: true,
searchLabelWidth: 70,
},
{
label: "检验时间",
@ -190,6 +191,7 @@ export default {
sortable: true,
filter: true,
search: true,
searchLabelWidth: 80,
hide: true,
type: "datetime",
format: 'YYYY-MM-DD HH:mm:ss',

@ -23,7 +23,7 @@
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-printer" @click="handlePrint">打印 </el-button>
<el-button type="primary" icon="el-icon-upload" @click="handleImport">导入 </el-button>
<el-button type="primary" @click="handleImport">导入 </el-button>
</template>
</avue-crud>
<!-- 导入 -->
@ -32,7 +32,7 @@
title="导入"
:isShow="isShowImport"
templateUrl="/blade-desk/bsSafeInspectionPoint/downloadExcelTemplate"
templateName="安全巡检点配置模板.xlsx"
templateName="安全巡检点配置导入模板.xlsx"
importUrl="/blade-desk/bsSafeInspectionPoint/importExcel"
@closeDialog="closeImportDialog"
></basic-import>
@ -122,7 +122,7 @@ export default {
searchLabelWidth: 90,
rules: [
{
required: false,
required: true,
message: '请输入巡检点编号',
trigger: 'blur',
},
@ -138,7 +138,7 @@ export default {
searchLabelWidth: 90,
rules: [
{
required: false,
required: true,
message: '请输入巡检点位置',
trigger: 'blur',
},

@ -43,7 +43,7 @@ export default {
height: "auto",
calcHeight: 32,
tip: false,
size: "medium",
size: "default",
simplePage: true,
searchShow: true,
searchMenuSpan: 6,
@ -93,6 +93,7 @@ export default {
search: true,
type: "select",
value: "2",
searchLabelWidth: 80,
dicData: [
{
label: "已检",
@ -115,7 +116,7 @@ export default {
sortable: true,
filter: true,
search: true,
searchLabelWidth: 100,
searchLabelWidth: 90,
},
{
label: "巡检点位置",
@ -123,7 +124,7 @@ export default {
sortable: true,
filter: true,
search: true,
searchLabelWidth: 100,
searchLabelWidth: 90,
},
{
label: "等待周期",
@ -208,6 +209,8 @@ export default {
//
onLoad(page, params = {}) {
this.loading = true;
console.log("params", params)
console.log("this.query", this.query)
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
(res) => {
this.data = res.data.data.records;
@ -221,6 +224,10 @@ export default {
selectionChange(list) {
this.selectionList = list;
},
currentChange(val) {
this.page.currentPage = val;
this.onLoad(this.page);
},
//
searchReset() {
this.query = {}

@ -24,7 +24,7 @@
</el-button>
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport"
<el-button type="primary" @click="handleImport"
>导入
</el-button>
</template>
@ -35,7 +35,7 @@
title="导入"
:isShow="isShowImport"
templateUrl="/blade-desk/bsTower/downloadExcelTemplate"
templateName="报警点配置模板.xlsx"
templateName="报警点配置导入模板.xlsx"
importUrl="/blade-desk/bsTower/importExcel"
@closeDialog="closeImportDialog"
></basic-import>
@ -105,6 +105,7 @@ export default {
filter: true,
span: 12,
search: true,
searchLabelWidth: 50,
rules: [
{
required: true,
@ -117,6 +118,7 @@ export default {
label: "名称",
prop: "btName",
search: true,
searchLabelWidth: 50,
sortable: true,
filter: true,
span: 12,
@ -147,6 +149,7 @@ export default {
label: "报警阙值",
prop: "threshold",
search: true,
searchLabelWidth: 80,
sortable: true,
filter: true,
type: "number",

@ -91,6 +91,7 @@ export default {
label: "状态",
prop: "dealStatus",
search: true,
searchLabelWidth: 50,
sortable: true,
filter: true,
type: "select",
@ -112,11 +113,13 @@ export default {
sortable: true,
filter: true,
search: true,
searchLabelWidth: 50,
},
{
label: "日期",
prop: "queryBtDate",
search: true,
searchLabelWidth: 50,
sortable: true,
hide: true,
filter: true,
@ -141,6 +144,7 @@ export default {
label: "错误点",
prop: "errorPoint",
search: true,
searchLabelWidth: 65,
sortable: true,
filter: true,
},
@ -148,6 +152,7 @@ export default {
label: "消息文本",
prop: "messText",
search: true,
searchLabelWidth: 80,
sortable: true,
filter: true,
},

@ -23,7 +23,7 @@
</el-button> -->
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport">导入 </el-button>
<el-button type="primary" @click="handleImport">导入 </el-button>
</template>
</avue-crud>
<!-- 导入 -->
@ -32,9 +32,9 @@
title="导入"
:isShow="isShowImport"
templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate"
templateName="废气加药记录模板.xlsx"
templateName="废气加药记录导入模板.xlsx"
importUrl="/blade-desk/bsDosingRec/importExcel"
@closeDialog="closeDialog"
@closeDialog="closeImportDialog"
></basic-import>
<!-- 新增 -->
<addEditDialogDosingRecord
@ -115,7 +115,7 @@ export default {
prop: 'device',
sortable: true,
filter: true,
span: 12,
width: 210,
search: true,
rules: [
{
@ -124,6 +124,7 @@ export default {
trigger: 'blur',
},
],
searchLabelWidth: 50,
},
{
label: '药品',
@ -131,7 +132,7 @@ export default {
search: true,
sortable: true,
filter: true,
span: 12,
width: 210,
rules: [
{
required: true,
@ -139,6 +140,7 @@ export default {
trigger: 'blur',
},
],
searchLabelWidth: 50,
},
{
label: '剂量(kg)',
@ -146,7 +148,7 @@ export default {
search: true,
sortable: true,
filter: true,
span: 12,
width: 210,
rules: [
{
required: true,
@ -154,14 +156,15 @@ export default {
trigger: 'blur',
},
],
searchLabelWidth: 70,
},
{
label: '加药时间',
prop: 'queryDosingTime',
search: true,
width: 210,
sortable: true,
filter: true,
span: 12,
hide: true,
editDisplay:false,
type: 'datetime',
@ -175,6 +178,7 @@ export default {
},
],
searchRange: true,
searchLabelWidth: 80,
},
{
label: '加药时间',
@ -182,7 +186,6 @@ export default {
// search: true,
sortable: true,
filter: true,
span: 12,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@ -198,9 +201,10 @@ export default {
label: '加药人',
prop: 'dosingMan',
search: true,
width: 210,
searchLabelWidth: 60,
sortable: true,
filter: true,
span: 12,
type: "select",
dicData: [],
rules: [
@ -221,7 +225,7 @@ export default {
search: false,
sortable: true,
filter: true,
span: 12,
},
],
},
@ -261,7 +265,14 @@ export default {
},
//
closeDialog() {
this.addOpen = false
this.addOpen = false;
this.onLoad(this.page);
},
//
closeImportDialog() {
this.isShowImport = false;
this.onLoad(this.page);
},
//
rowUpdate(row, index, done, loading) {

@ -9,7 +9,7 @@
</template>
<!-- 运行 1 停止0 -->
<template #fan="scope">
<el-tag v-if="scope.row.fan === 1" type="success">运行</el-tag>
<el-tag v-if="scope.row.fan === true" type="success">运行</el-tag>
<el-tag v-else type="danger">停止</el-tag>
</template>
<template #pump="scope">
@ -43,11 +43,12 @@
</avue-crud>
</template>
<script>
import { getList ,remove, update } from '@/api/safetyManagement/wasteGasRunRec.js';
import { getList ,remove, update , getdutyManList } from '@/api/safetyManagement/wasteGasRunRec.js';
export default {
data() {
return {
selectionList: [],
dutyManList:[],
loading:false,
option: {
height: "auto",
@ -104,18 +105,26 @@ export default {
filter: true,
search: true,
width: 120,
rules: [
{
required: true,
message: '请输入设备编号',
trigger: 'blur',
},
],
},
{
label: "日期",
prop: "startTime",
search: false,
sortable: true,
filter: true,
type: "date",
format: "YYYY-MM-DD",
valueFormat: "YYYY-MM-DD",
width: 120,
},
// {
// label: "",
// prop: "startTime",
// search: false,
// sortable: true,
// filter: true,
// type: "date",
// format: "YYYY-MM-DD",
// valueFormat: "YYYY-MM-DD",
// width: 120,
// },
// {
// label: "",
// prop: "runTime",
@ -127,25 +136,72 @@ export default {
// label: "",
// prop: "runTimeLong",
// },
{
label: '开始时间',
prop: 'queryStartTime',
search: true,
sortable: true,
filter: true,
display: false,
hide: true,
editDisplay: false,
span: 12,
type: 'datetime',
searchRange: true,
startPlaceholder: "开始时间",
endPlaceholder: "结束时间",
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
{
label: "开始时间",
prop: "startTime",
search: true,
search: false,
sortable: true,
filter: true,
width: 120,
type: 'datetime',
rules: [
{
required: true,
message: '请选择开始时间',
trigger: 'blur',
},
],
},
{
label: '结束时间',
prop: 'queryEndTime',
search: true,
sortable: true,
hide: true,
filter: true,
display: false,
editDisplay: false,
span: 12,
type: 'datetime',
searchRange: true,
startPlaceholder: "开始时间",
endPlaceholder: "结束时间",
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
{
label: "结束时间",
prop: "endTime",
search: true,
search: false,
sortable: true,
filter: true,
width: 120,
type: 'datetime',
rules: [
{
required: true,
message: '请选择开始时间',
trigger: 'blur',
},
],
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
@ -193,8 +249,8 @@ export default {
prop: "fan",
type: 'switch',
dicData: [
{ label: '停止', value: 0 },
{ label: '运行', value: 1 }, // 1 0
{ label: '停止', value:false},
{ label: '运行', value: true }, // true false
],
value: 1
},
@ -292,12 +348,26 @@ export default {
},
{
label: "责任人",
prop: "dutyMan",
search: false,
label: '责任人',
prop: 'dutyMan',
search: true,
searchLabelWidth: 70,
sortable: true,
filter: true,
width: 120,
span: 12,
type: "select",
dicData: [],
rules: [
{
required: true,
message: '请选择责任人',
trigger: 'blur',
},
],
props: {
label: 'name',
value: 'id'
},
},
],
},
@ -309,7 +379,28 @@ export default {
},
};
},
mounted() {
this.fetchdutyManList()
},
methods: {
//
fetchdutyManList() {
getdutyManList({
current: 1,
size: 10000000,
// deptId
roleId: '2008473811712327681'
}).then(res => {
const result = res.data.data.records
this.dutyManList = result
console.log("result", result)
this.option.column.forEach(col => {
if (col.prop === 'dutyMan') {
col.dicData = this.dutyManList;
}
});
})
},
//
rowSave(row, done, loading) {
//

@ -10,7 +10,7 @@
<el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport">导入
<el-button type="primary" @click="handleImport">导入
</el-button>
</template>
</avue-crud>
@ -27,7 +27,7 @@
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/bsDischargeRec/downloadExcelTemplate" templateName="槽液排放记录模板.xlsx"
templateUrl="/blade-desk/bsDischargeRec/downloadExcelTemplate" templateName="槽液排放记录导入模板.xlsx"
importUrl="/blade-desk/bsDischargeRec/importExcel" @closeDialog="closeDialog"></basic-import>
</div>
</template>
@ -105,7 +105,7 @@ export default {
filter: true,
span: 12,
search: true,
searchLabelWidth: 120,
searchLabelWidth: 100,
type: 'select',
remote: true,
dicUrl: '/api/blade-system/dict/dictionary?code=ScrapTankSolType',
@ -150,7 +150,7 @@ export default {
sortable: true,
filter: true,
span: 12,
searchLabelWidth: 140,
searchLabelWidth: 110,
rules: [
{
required: true,
@ -163,6 +163,7 @@ export default {
label: "日期",
prop: "queryDirDate",
search: true,
searchLabelWidth: 50,
sortable: true,
filter: true,
hide: true,

@ -10,7 +10,7 @@
<el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport">导入 </el-button>
<el-button type="primary" @click="handleImport">导入 </el-button>
</template>
</avue-crud>
<!-- 新增弹窗 -->
@ -22,8 +22,8 @@
</addEditDialogDosingRecord>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" templateName="废水加药记录模板.xlsx"
importUrl="/blade-desk/bsDosingRec/importExcel" @closeDialog="closeDialog"></basic-import>
templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" templateName="废水加药记录导入模板.xlsx"
importUrl="/blade-desk/bsDosingRec/importExcel" @closeDialog="closeImportDialog"></basic-import>
</div>
</template>
<script>
@ -95,7 +95,7 @@ export default {
filter: true,
span: 12,
search: true,
searchLabelWidth: 140,
searchLabelWidth: 50,
rules: [
{
required: true,
@ -111,6 +111,7 @@ export default {
sortable: true,
filter: true,
span: 12,
searchLabelWidth: 50,
rules: [
{
required: true,
@ -126,7 +127,7 @@ export default {
sortable: true,
filter: true,
span: 12,
searchLabelWidth: 140,
searchLabelWidth: 70,
rules: [
{
required: true,
@ -155,6 +156,8 @@ export default {
searchRange: true,
startPlaceholder: "开始时间",
endPlaceholder: "结束时间",
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
{
label: '加药时间',
@ -170,11 +173,13 @@ export default {
trigger: 'blur',
},
],
},
{
label: '加药人',
prop: 'dosingMan',
search: true,
searchLabelWidth: 60,
sortable: true,
filter: true,
span: 12,
@ -223,6 +228,11 @@ export default {
closeDialog() {
this.addOpen = false
this.onLoad(this.page);
},
//
closeImportDialog() {
this.isShowImport = false; //
this.onLoad(this.page);
},
//
fetchDosingManList() {

@ -30,7 +30,7 @@
title="导入"
:isShow="isShowImport"
templateUrl="/blade-safety/wasteWaterMeterParameter/download-excel-template"
templateName="废水计量参数模板.xlsx"
templateName="废水计量参数导入模板.xlsx"
importUrl="/blade-safety/wasteWaterMeterParameter/import-excel"
@closeDialog="closeDialog"
></basic-import>

@ -23,7 +23,7 @@
<el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
</template>
<template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport">导入 </el-button>
<el-button type="primary" @click="handleImport">导入 </el-button>
</template>
</avue-crud>
<!-- 导入 -->
@ -32,9 +32,9 @@
title="导入"
:isShow="isShowImport"
templateUrl="/blade-desk/bsInsTest/downloadExcelTemplate"
templateName="废水加药记录模板.xlsx"
templateName="废水化验记录导入模板.xlsx"
importUrl="/blade-desk/bsInsTest/importExcel"
@closeDialog="closeDialog"
@closeDialog="closeImportDialog"
></basic-import>
<!-- 新增 -->
<addEditDialogTestRecord
@ -119,7 +119,7 @@ export default {
filter: true,
span: 12,
search: true,
searchLabelWidth: 140,
searchLabelWidth: 50,
rules: [
{
required: true,
@ -132,6 +132,7 @@ export default {
label: '化验时间',
prop: 'dosingTime',
search: true,
searchLabelWidth: 80,
sortable: true,
filter: true,
span: 12,
@ -153,7 +154,7 @@ export default {
sortable: true,
filter: true,
span: 12,
searchLabelWidth: 140,
searchLabelWidth: 60,
type: 'select',
dicData: [],
props: {
@ -175,6 +176,7 @@ export default {
sortable: true,
filter: true,
span: 12,
searchLabelWidth: 40,
rules: [
{
required: true,
@ -289,7 +291,12 @@ export default {
this.addOpen = false;
this.onLoad(this.page);
},
},
//
closeImportDialog() {
this.isShowImport = false; //
this.onLoad(this.page);
},
//
handleSubmitData(data) {
this.$message.success("数据提交成功!");

Loading…
Cancel
Save