xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

点巡检模块修改

Browse Source
1.2.6
zhouhy 10 months ago
parent 607ade70ae
commit c7223e21f3
5 changed files with 164 additions and 123 deletions
Show Stats Download Patch File Download Diff File

57
hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
Unescape Escape View File

@ -17,6 +17,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检查类型" prop="inspectType">
<el-select
v-model="queryParams.inspectType"
placeholder="检查类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="记录方式" prop="recordMethod">-->
<!-- <el-input-->
<!-- v-model="queryParams.recordMethod"-->
@ -108,11 +123,11 @@
<el-table-column label="项目编号" align="center" prop="inspectProjectCode" />
<el-table-column label="巡检项目" align="center" prop="inspectProject" />
<!-- <el-table-column label="检查类型(1巡检,2点检)" align="center" prop="inspectType" />-->
<!-- <el-table-column label="检查类型" align="center" prop="inspectType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="检查类型" align="center" prop="inspectType">
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<el-table-column label="记录方式" align="center" prop="recordMethod" />
<el-table-column label="上限" align="center" prop="upLimit" />
<el-table-column label="下限" align="center" prop="lowLimit" />
@ -159,15 +174,15 @@
<el-form-item label="记录方式" prop="recordMethod">
<el-input v-model="form.recordMethod" placeholder="请输入记录方式" />
</el-form-item>
<!-- <el-form-item label="检查类型" prop="checkState">-->
<!-- <el-radio-group v-model="form.inspectType">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.dms_inspect_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{dict.label}}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="检查类型" prop="checkState">
<el-radio-group v-model="form.inspectType">
<el-radio
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="上限" prop="upLimit">
<el-input v-model="form.upLimit" placeholder="请输入上限" />
</el-form-item>
@ -200,7 +215,6 @@ export default {
dicts:['dms_inspect_type'],
data() {
return {
inspectType:'',
// 遮罩层
loading: true,
// 选中数组
@ -254,16 +268,7 @@ export default {
methods: {
/** 查询巡检项目信息列表 */
getList() {
if (this.$route.path=='/dms/inspect/dmsBaseInspectProject')
{
this.queryParams.inspectType =1
this.inspectType = 1
}
else
{
this.queryParams.inspectType = 2
this.inspectType= 2
}
this.loading = true;
listDmsBaseInspectProject(this.queryParams).then(response => {
this.dmsBaseInspectProjectList = response.rows;
@ -333,14 +338,12 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.inspectProjectId != null) {
this.form.inspectType = this.inspectType
updateDmsBaseInspectProject(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.inspectType = this.inspectType
addDmsBaseInspectProject(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

76
hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
Unescape Escape View File

@ -17,6 +17,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检查类型" prop="inspectType">
<el-select
v-model="queryParams.inspectType"
placeholder="检查类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="循环周期" prop="cyclePeriod">-->
<!-- <el-input-->
<!-- v-model="queryParams.cyclePeriod"-->
@ -106,12 +121,17 @@
</el-table-column>
<el-table-column label="线路名称" align="center" prop="routeName" />
<!-- <el-table-column label="线路类型(1巡检,2点检)" align="center" prop="inspectType" />-->
<!-- <el-table-column label="线路类型" align="center" prop="inspectType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="循环周期" align="center" prop="cyclePeriod" />
<el-table-column label="线路类型" align="center" prop="inspectType">
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<!-- <el-table-column label="循环周期" align="center" prop="cyclePeriod" />-->
<el-table-column label="循环周期" align="center" prop="cyclePeriod">
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_cycle_period" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<!-- <el-table-column label="设备类型ID，关联dms_base_device_type的device_type_id" align="center" prop="deviceTypeId" />-->
<el-table-column label="设备类型" align="center" prop="deviceTypeId" >
<template slot-scope="scope">
@ -164,8 +184,17 @@
<el-form-item label="线路名称" prop="routeName">
<el-input v-model="form.routeName" placeholder="请输入线路名称" />
</el-form-item>
<!-- <el-form-item label="循环周期" prop="cyclePeriod">-->
<!-- <el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />-->
<!-- </el-form-item>-->
<el-form-item label="循环周期" prop="cyclePeriod">
<el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />
<el-radio-group v-model="form.cyclePeriod">
<el-radio
v-for="dict in dict.type.dms_cycle_period"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="设备类型ID，关联dms_base_device_type的device_type_id" prop="deviceTypeId">-->
<!-- <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID，关联dms_base_device_type的device_type_id" />-->
@ -180,15 +209,15 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="线路类型" prop="checkState">-->
<!-- <el-radio-group v-model="form.inspectType">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.dms_inspect_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{dict.label}}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="线路类型" prop="checkState">
<el-radio-group v-model="form.inspectType">
<el-radio
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="是否标识：1-是；0-否" prop="isFlag">-->
<!-- <el-input v-model="form.isFlag" placeholder="请输入是否标识：1-是；0-否" />-->
<!-- </el-form-item>-->
@ -210,7 +239,7 @@ import { listDevicetype } from '@/api/dms/devicetype'
export default {
name: "DmsBaseInspectRoute",
dicts:['dms_inspect_type'],
dicts:['dms_inspect_type','dms_cycle_period'],
data() {
return {
inspectType:'',
@ -276,16 +305,7 @@ export default {
},
/** 查询巡检线路信息列表 */
getList() {
if (this.$route.path=='/dms/inspect/dmsBaseInspectRoute')
{
this.queryParams.inspectType =1;
this.inspectType = 1;
}
else
{
this.queryParams.inspectType = 2
this.inspectType = 2;
}
this.loading = true;
listDmsBaseInspectRoute(this.queryParams).then(response => {
this.dmsBaseInspectRouteList = response.rows;
@ -353,14 +373,12 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.inspectRouteId != null) {
this.form.inspectType = this.inspectType;
updateDmsBaseInspectRoute(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.inspectType = this.inspectType;
addDmsBaseInspectRoute(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

8
hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
Unescape Escape View File

@ -261,14 +261,6 @@ export default {
},
/** 查询巡检标准信息列表 */
getList() {
// if (this.$route.path=='/dms/inspect/dmsBaseInspectStandard')
// {
// this.queryParams.inspectType =1
// }
// else
// {
// this.queryParams.inspectType = 2
// }
this.loading = true;
listDmsBaseInspectStandard(this.queryParams).then(response => {
this.dmsBaseInspectStandardList = response.rows;

76
hw-ui/src/views/dms/dmsPlanInspect/index.vue
Unescape Escape View File

@ -18,6 +18,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检查类型" prop="inspectType">
<el-select
v-model="queryParams.inspectType"
placeholder="检查类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="巡检线路ID，关联dm_base_inspect_route的inspect_route_id" prop="inspectRouteId">-->
<!-- <el-input-->
<!-- v-model="queryParams.inspectRouteId"-->
@ -124,11 +139,11 @@
<el-table-column label="计划编号" align="center" prop="planInspectCode" />
<el-table-column label="计划名称" align="center" prop="planInspectName" />
<!-- <el-table-column label="检查类型(1巡检,2点检)" align="center" prop="inspectType" />-->
<!-- <el-table-column label="巡检类型" align="center" prop="inspectType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="巡检类型" align="center" prop="inspectType">
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<!-- <el-table-column label="巡检线路ID，关联dm_base_inspect_route的inspect_route_id" align="center" prop="inspectRouteId" />-->
<el-table-column label="巡检线路" align="center" prop="inspectRouteId" >
<template slot-scope="scope">
@ -148,7 +163,12 @@
<span>{{ parseTime(scope.row.planTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="循环周期" align="center" prop="cyclePeriod" />
<!-- <el-table-column label="循环周期" align="center" prop="cyclePeriod" />-->
<el-table-column label="循环周期" align="center" prop="cyclePeriod">
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_cycle_period" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<el-table-column label="执行人员" align="center" prop="performer" />
<!-- <el-table-column label="是否标识：1-是；0-否" align="center" prop="isFlag" />-->
<el-table-column label="备注" align="center" prop="remark" />
@ -202,15 +222,15 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="巡检类型" prop="checkState">-->
<!-- <el-radio-group v-model="form.inspectType">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.dms_inspect_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{dict.label}}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="巡检类型" prop="checkState">
<el-radio-group v-model="form.inspectType">
<el-radio
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="设备总数" prop="deviceAmount">
<el-input v-model="form.deviceAmount" placeholder="请输入设备总数" />
</el-form-item>
@ -222,8 +242,17 @@
placeholder="请选择计划巡检时间">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="循环周期" prop="cyclePeriod">-->
<!-- <el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />-->
<!-- </el-form-item>-->
<el-form-item label="循环周期" prop="cyclePeriod">
<el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />
<el-radio-group v-model="form.cyclePeriod">
<el-radio
v-for="dict in dict.type.dms_cycle_period"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="执行人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入执行人员" />
@ -249,10 +278,9 @@ import { listDmsBaseInspectRoute } from '@/api/dms/dmsBaseInspectRoute'
export default {
name: "DmsPlanInspect",
dicts:['dms_inspect_type'],
dicts:['dms_inspect_type','dms_cycle_period'],
data() {
return {
inspectType:'',
dmsBaseInspectRouteList:[],
// 遮罩层
loading: true,
@ -309,16 +337,6 @@ export default {
},
/** 查询巡检计划信息列表 */
getList() {
if (this.$route.path=='/dms/inspect/dmsPlanInspect')
{
this.queryParams.inspectType =1
this.inspectType = 1
}
else
{
this.queryParams.inspectType = 2
this.inspectType = 2
}
this.loading = true;
listDmsPlanInspect(this.queryParams).then(response => {
this.dmsPlanInspectList = response.rows;
@ -389,14 +407,12 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.planInspectId != null) {
this.form.inspectType = this.inspectType;
updateDmsPlanInspect(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.inspectType = this.inspectType;
addDmsPlanInspect(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

70
hw-ui/src/views/dms/dmsRecordInspect/index.vue
Unescape Escape View File

@ -10,6 +10,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检查类型" prop="inspectType">
<el-select
v-model="queryParams.inspectType"
placeholder="检查类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="巡检线路,关联dms_base_inspect_route的inspect_route_id" prop="inspectRouteId">-->
<!-- <el-input-->
<!-- v-model="queryParams.inspectRouteId"-->
@ -132,11 +147,11 @@
<!-- <el-table-column label="主键标识" align="center" prop="recordInspectId" />-->
<el-table-column label="巡检单号" align="center" prop="billsInspectCode" />
<!-- <el-table-column label="检查类型(1巡检,2点检)" align="center" prop="inspectType" />-->
<!-- <el-table-column label="检查类型" align="center" prop="inspectType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="检查类型" align="center" prop="inspectType">
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<!-- <el-table-column label="巡检线路,关联dms_base_inspect_route的inspect_route_id" align="center" prop="inspectRouteId" />-->
<el-table-column label="巡检线路" align="center" prop="inspectRouteId" >
<template slot-scope="scope">
@ -206,7 +221,7 @@
<!-- 添加或修改巡检记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="巡检单号" prop="billsInspectCode">
<el-input v-model="form.billsInspectCode" placeholder="请输入巡检单号" />
</el-form-item>
@ -253,15 +268,15 @@
<el-form-item label="执行人员" prop="performer">
<el-input v-model="form.performer" placeholder="请输入执行人员" />
</el-form-item>
<!-- <el-form-item label="线路类型" prop="checkState">-->
<!-- <el-radio-group v-model="form.inspectType">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.dms_inspect_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{dict.label}}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="线路类型" prop="checkState">
<el-radio-group v-model="form.inspectType">
<el-radio
v-for="dict in dict.type.dms_inspect_type"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="巡检状态" prop="checkState">
<el-radio-group v-model="form.inspectStatus">
<el-radio
@ -295,7 +310,7 @@ import { listDmsBaseInspectRoute } from '@/api/dms/dmsBaseInspectRoute'
export default {
name: "DmsRecordInspect",
dicts:['dms_inspect_type','dms_inspect_status'],
dicts:['dms_inspect_type','dms_inspect_status','dms_cycle_period'],
data() {
return {
inspectTypes:'',
@ -361,17 +376,16 @@ export default {
},
/** 查询巡检记录列表 */
getList() {
if (this.$route.path=='/dms/inspect/dmsRecordInspect')
{
this.queryParams.inspectType =1;
this.inspectTypes = 1;
}
else
{
this.inspectTypes = 2;
this.queryParams.inspectType = 2
}
console.log(this.$route)
// if (this.$route.path=='/dms/inspect/dmsRecordInspect')
// {
// this.queryParams.inspectType =1;
// this.inspectTypes = 1;
// }
// else
// {
// this.inspectTypes = 2;
// this.queryParams.inspectType = 2
// }
this.loading = true;
listDmsRecordInspect(this.queryParams).then(response => {
this.dmsRecordInspectList = response.rows;
@ -444,14 +458,12 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.recordInspectId != null) {
updateDmsRecordInspect(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.inspectType = this.inspectTypes;
addDmsRecordInspect(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

Write Preview
Loading…
Cancel
Save