Browse Source

fix: 修复bug

sy-water-data-board-ui
panyuyi 1 year ago
parent
commit
17700dab13
  1. 2
      src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/index.vue
  2. 9
      src/views/dike/runManage/enginerring/patrolManage/index.vue
  3. 164
      src/views/dike/runManage/monitoring/dike/manage/index.vue
  4. 6
      src/views/dike/runManage/superVisionInspetion/methodsManage/details.vue
  5. 1
      src/views/dike/runManage/superVisionInspetion/tasksManage/tasksDetails.vue
  6. 6
      src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
  7. 1
      src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
  8. 2
      src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/index.vue
  9. 75
      src/views/sluice/runManage/monitoring/sluice/index.vue
  10. 6
      src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue
  11. 1
      src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue

2
src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@ -48,7 +48,7 @@
class=""
>
<el-form-item label="名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
<el-input v-model="ruleForm.name" :maxlength="100"></el-input>
</el-form-item>
</el-form>

9
src/views/dike/runManage/enginerring/patrolManage/index.vue

@ -57,7 +57,10 @@
v-hasPermi="['df:run:checking:plan:config']"
>巡查配置</el-button
>
<el-button @click="handleGoPlan(scope.row)" type="text" size="small"
<el-button
@click="handleGoPlan(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:checking:plan:view']"
>计划管理</el-button
>
@ -263,6 +266,10 @@ export default {
dikeType: this.dikeType || "",
dikeName: this.searchInput || "",
},
params: {
orderBy: "create_time",
sort: "desc",
},
}).then((res) => {
if (res) {
this.tableData = res.records;

164
src/views/dike/runManage/monitoring/dike/manage/index.vue

@ -1,18 +1,18 @@
<!-- 巡查项目管理-堤防 -->
<script>
import Edit from './components/edit.vue'
import Edit from "./components/edit.vue";
import {
getDicts,
postDFDeviceList,
postDFDevice,
putDFDevice,
delDFDevice
delDFDevice,
} from "@/api/management";
let that
let that;
export default {
name: "manage",
components: {
Edit
Edit,
},
data() {
return {
@ -21,13 +21,13 @@ export default {
xcDeviceType: [],
searchForm: {
type: -1,
warningLevel: '',
name: ''
warningLevel: "",
name: "",
},
dialog: {
title: '新增操作记录',
dom: '',
visible: false
title: "新增操作记录",
dom: "",
visible: false,
},
areasOptions: [], //
adcdOptions: [], //
@ -61,35 +61,35 @@ export default {
//
resetSearch() {
this.pageData.pageNum = 1;
if (!this.$refs['searchForm']) return
this.$refs['searchForm'].resetFields()
if (!this.$refs["searchForm"]) return;
this.$refs["searchForm"].resetFields();
this.getTableData();
},
//
handleAdd() {
this.dialog.dom = 'Edit'
this.dialog.visible = true
this.dialog.dom = "Edit";
this.dialog.visible = true;
},
handleCheck(row) {
this.dialog.dom = 'Edit'
this.mdl = {...row}
this.dialog.visible = true
this.dialog.dom = "Edit";
this.mdl = { ...row };
this.dialog.visible = true;
},
handleEdit(row) {
this.dialog.dom = 'Edit'
this.dialog.dom = "Edit";
this.mdl = {
eventType: 'edit',
...row
}
this.dialog.visible = true
eventType: "edit",
...row,
};
this.dialog.visible = true;
},
async handleDelete(row) {
await delDFDevice(row.id)
this.$message.success('删除成功')
this.getTableData()
await delDFDevice(row.id);
this.$message.success("删除成功");
this.getTableData();
},
//
submitForm () {
submitForm() {
this.$refs.component.submitForm(async (from) => {
if (this.mdl) {
await putDFDevice({
@ -99,14 +99,14 @@ export default {
{
maxThreshold: from.maxThreshold,
minThreshold: from.minThreshold,
reportInterval: from.reportInterval
}
reportInterval: from.reportInterval,
},
],
dikeCode: this.$route.query.dikeCode
})
this.$message.success('修改成功')
this.closeDialog()
this.getTableData()
dikeCode: this.$route.query.dikeCode,
});
this.$message.success("修改成功");
this.closeDialog();
this.getTableData();
} else {
await postDFDevice({
...from,
@ -114,31 +114,33 @@ export default {
{
maxThreshold: from.maxThreshold,
minThreshold: from.minThreshold,
reportInterval: from.reportInterval
}
reportInterval: from.reportInterval,
},
],
dikeCode: this.$route.query.dikeCode
})
this.$message.success('新增成功')
this.closeDialog()
this.getTableData()
dikeCode: this.$route.query.dikeCode,
});
this.$message.success("新增成功");
this.closeDialog();
this.getTableData();
}
})
});
},
// dialog
closeDialog() {
this.dialog.visible = false
this.mdl = null
this.dialog.visible = false;
this.mdl = null;
},
//
getTableData() {
postDFDeviceList({
data: {
type: this.searchForm.type === -1 ? '' : this.searchForm.type,
type: this.searchForm.type === -1 ? "" : this.searchForm.type,
name: this.searchForm.name,
warningLevel: this.searchForm.warningLevel === -1 ? '' : this.searchForm.warningLevel,
dikeCode: this.$route.query.dikeCode
warningLevel:
this.searchForm.warningLevel === -1
? ""
: this.searchForm.warningLevel,
dikeCode: this.$route.query.dikeCode,
},
cv: {
name: "name",
@ -155,24 +157,26 @@ export default {
},
},
created() {
that = this
that = this;
},
filters: {
//
filterwarnningType (price) {
const data = that.xcWarnningType.filter((res) => res.dictValue == price)
return data[0] ? data[0].dictLabel : '/'
filterwarnningType(price) {
const data = that.xcWarnningType.filter((res) => res.dictValue == price);
return data[0] ? data[0].dictLabel : "/";
},
//
filterwarnningLevel (price) {
const data = that.xcWarnningLevelType.filter((res) => res.dictValue == price)
return data[0] ? data[0].dictLabel : '/'
filterwarnningLevel(price) {
const data = that.xcWarnningLevelType.filter(
(res) => res.dictValue == price
);
return data[0] ? data[0].dictLabel : "/";
},
//
filterdeviceType (price) {
const data = that.xcDeviceType.filter((res) => res.dictValue == price)
return data[0] ? data[0].dictLabel : '/'
}
filterdeviceType(price) {
const data = that.xcDeviceType.filter((res) => res.dictValue == price);
return data[0] ? data[0].dictLabel : "/";
},
},
async mounted() {
//
@ -197,7 +201,12 @@ export default {
<div class="slider-right">
<div class="top-title">堤防动态监测管理</div>
<div class="table-box">
<el-form inline :model="searchForm" ref="searchForm" class="demo-ruleForm">
<el-form
inline
:model="searchForm"
ref="searchForm"
class="demo-ruleForm"
>
<el-form-item label="设备类型:" prop="type">
<el-select v-model="searchForm.type" placeholder="请选择">
<el-option
@ -221,10 +230,16 @@ export default {
</el-select>
</el-form-item>
<el-form-item label="设备名称:" prop="name">
<el-input v-model="searchForm.name" class="search-input" placeholder="请输入设备名称"></el-input>
<el-input
v-model="searchForm.name"
class="search-input"
placeholder="请输入设备名称"
></el-input>
</el-form-item>
<el-form-item>
<el-button class="search-btn" type="success" @click="search()">查询</el-button>
<el-button class="search-btn" type="success" @click="search()"
>查询</el-button
>
<el-button @click="resetSearch()">重置</el-button>
</el-form-item>
</el-form>
@ -234,9 +249,8 @@ export default {
type="success"
v-hasPermi="['df:run:dtjc:add']"
@click="handleAdd()"
>新增
</el-button
>
>新增
</el-button>
<el-table height="625" :data="tableData" border style="width: 100%">
<el-table-column type="index" align="center" label="序号">
</el-table-column>
@ -265,7 +279,12 @@ export default {
label="预警时间"
>
</el-table-column>
<el-table-column prop="address" align="center" label="操作" min-width="200">
<el-table-column
prop="address"
align="center"
label="操作"
min-width="200"
>
<template slot-scope="scope">
<el-button
style="margin-right: 16px"
@ -298,9 +317,8 @@ export default {
size="small"
slot="reference"
v-hasPermi="['df:run:dtjc:delete']"
>删除
</el-button
>
>删除
</el-button>
</el-popconfirm>
</template>
</el-table-column>
@ -324,13 +342,17 @@ export default {
:visible.sync="dialog.visible"
width="50%"
>
<component v-if="dialog.visible" :is="dialog.dom" ref="component" :model="mdl"></component>
<component
v-if="dialog.visible"
:is="dialog.dom"
ref="component"
:model="mdl"
></component>
<div slot="footer" class="dialog-footer">
<el-button size="mini" @click="closeDialog"> </el-button>
<el-button size="mini" type="primary" @click="submitForm"
>保存
</el-button
>
>保存
</el-button>
</div>
</el-dialog>
</div>

6
src/views/dike/runManage/superVisionInspetion/methodsManage/details.vue

@ -20,7 +20,11 @@
</el-upload>
<div v-else>&nbsp;</div>
<span v-if="editName && $route.query.mode === 'edit'">
<el-input class="input" v-model="detailsData.name"></el-input>
<el-input
class="input"
v-model="detailsData.name"
:maxlength="50"
></el-input>
<i
class="el-icon-check cursor-pointer ml-4 font-16"
style="color: #409eff"

1
src/views/dike/runManage/superVisionInspetion/tasksManage/tasksDetails.vue

@ -359,6 +359,7 @@ export default {
v-model="ruleForm.content"
type="textarea"
:rows="5"
:maxlength="500"
placeholder=" 请输入"
/>
</el-form-item>

6
src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue

@ -20,7 +20,11 @@
</el-upload>
<div v-else>&nbsp;</div>
<span v-if="editName && $route.query.mode === 'edit'">
<el-input class="input" v-model="detailsData.name"></el-input>
<el-input
class="input"
v-model="detailsData.name"
:maxlength="50"
></el-input>
<i
class="el-icon-check cursor-pointer ml-4 font-16"
style="color: #409eff"

1
src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue

@ -359,6 +359,7 @@ export default {
v-model="ruleForm.content"
type="textarea"
:rows="5"
:maxlength="500"
placeholder=" 请输入"
/>
</el-form-item>

2
src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@ -48,7 +48,7 @@
class=""
>
<el-form-item label="名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
<el-input v-model="ruleForm.name" :maxlength="100"></el-input>
</el-form-item>
</el-form>

75
src/views/sluice/runManage/monitoring/sluice/index.vue

@ -3,15 +3,15 @@
import { getDicts } from "@/api/management";
import { getAreasData } from "@/api/areas/index";
import { getRunProjectList } from "@/api/sluice/index";
let that
let that;
export default {
name: "sluice",
data() {
return {
searchForm: {
adcd: '',
adcd: "",
wagaType: -1,
wagaName: ''
wagaName: "",
},
searchInput: "",
searchType: 3,
@ -32,22 +32,29 @@ export default {
};
},
created() {
that = this
that = this;
},
filters: {
//
filterSluice (price) {
const data = that.sluiceType.filter((res) => res.dictValue == price)
return data[0] ? data[0].dictLabel : '/'
filterSluice(price) {
if (!price) return "-";
let typeArr = JSON.parse(price);
// typeArrlabel
let labelArr = [];
typeArr.forEach((item) => {
let label = that.sluiceType.filter((res) => res.dictValue == item);
labelArr.push(label[0].dictLabel);
});
return labelArr.join(",");
},
//
filterAdcd (price) {
let name = ''
filterAdcd(price) {
let name = "";
if (that.adcdOptions.filter((res) => res.id == price)[0]) {
name = that.adcdOptions.filter((res) => res.id == price)[0].name
name = that.adcdOptions.filter((res) => res.id == price)[0].name;
}
return name
}
return name;
},
},
methods: {
handleGoManage(row) {
@ -71,8 +78,8 @@ export default {
//
resetSearch() {
this.pageData.pageNum = 1;
if (!this.$refs['searchForm']) return
this.$refs['searchForm'].resetFields()
if (!this.$refs["searchForm"]) return;
this.$refs["searchForm"].resetFields();
this.getTableData();
},
//
@ -83,8 +90,9 @@ export default {
timeField: "create_time",
},
adcd: this.searchForm.adcd,
wagaType: this.searchForm.wagaType == -1 ? "" : this.searchForm.wagaType,
wagaName: this.searchForm.wagaName
wagaType:
this.searchForm.wagaType == -1 ? "" : this.searchForm.wagaType,
wagaName: this.searchForm.wagaName,
},
cv: {
name: "name",
@ -102,7 +110,7 @@ export default {
//
getTreeData() {
getAreasData().then((items) => {
this.adcdOptions = items.data
this.adcdOptions = items.data;
if (items?.data) {
let res = [];
let getChildren = (res, pid) => {
@ -124,7 +132,7 @@ export default {
});
},
},
async mounted () {
async mounted() {
//
getDicts("sluice_type").then((res) => {
this.sluiceType = res.data;
@ -140,7 +148,12 @@ export default {
<div class="slider-right">
<div class="top-title">水闸动态监测</div>
<div class="table-box">
<el-form inline :model="searchForm" ref="searchForm" class="demo-ruleForm">
<el-form
inline
:model="searchForm"
ref="searchForm"
class="demo-ruleForm"
>
<el-form-item label="区域选择:" prop="adcd">
<el-cascader
:options="areasOptions"
@ -154,20 +167,26 @@ export default {
</el-form-item>
<el-form-item label="水闸类型:" prop="wagaType">
<el-select v-model="searchForm.wagaType" placeholder="请选择">
<el-option label="全部" :value="-1"></el-option>
<el-option
v-for="item in sluiceType"
:label="item.dictLabel"
:value="item.dictValue"
:key="item.id"
></el-option>
<el-option label="全部" :value="-1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="水闸名称:" prop="wagaName">
<el-input v-model="searchForm.wagaName" class="search-input" placeholder="请输入水闸名称"></el-input>
<el-input
v-model="searchForm.wagaName"
class="search-input"
placeholder="请输入水闸名称"
></el-input>
</el-form-item>
<el-form-item>
<el-button class="search-btn" type="success" @click="search">查询</el-button>
<el-button class="search-btn" type="success" @click="search"
>查询</el-button
>
<el-button @click="resetSearch">重置</el-button>
</el-form-item>
</el-form>
@ -178,9 +197,9 @@ export default {
</el-table-column>
<el-table-column prop="wagaName" align="center" label="水闸名称">
</el-table-column>
<el-table-column prop="waterAdministrativeDepartment" align="center" label="水闸类型">
<el-table-column prop="wagaType" align="center" label="水闸类型">
<template slot-scope="scope">
{{ scope.row.waterAdministrativeDepartment | filterSluice }}
{{ scope.row.wagaType | filterSluice }}
</template>
</el-table-column>
<el-table-column prop="name" align="center" label="区域">
@ -188,7 +207,11 @@ export default {
{{ scope.row.adcd | filterAdcd }}
</template>
</el-table-column>
<el-table-column prop="engineeringManagementUnit" align="center" label="管理机构">
<el-table-column
prop="engineeringManagementUnit"
align="center"
label="管理机构"
>
</el-table-column>
<el-table-column prop="address" align="center" label="操作">
<template slot-scope="scope">
@ -198,7 +221,7 @@ export default {
type="text"
size="small"
v-hasPermi="['sz:run:dtjc:view']"
>动态监测管理</el-button
>动态监测管理</el-button
>
</template>
</el-table-column>

6
src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue

@ -20,7 +20,11 @@
</el-upload>
<div v-else>&nbsp;</div>
<span v-if="editName && $route.query.mode === 'edit'">
<el-input class="input" v-model="detailsData.name"></el-input>
<el-input
class="input"
v-model="detailsData.name"
:maxlength="50"
></el-input>
<i
class="el-icon-check cursor-pointer ml-4 font-16"
style="color: #409eff"

1
src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue

@ -359,6 +359,7 @@ export default {
v-model="ruleForm.content"
type="textarea"
:rows="5"
:maxlength="500"
placeholder=" 请输入"
/>
</el-form-item>

Loading…
Cancel
Save