Browse Source

Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili-vue

sy-water-data-board-ui
hxh 10 months ago
parent
commit
c0e688caef
  1. 148
      src/components/linkNameSelect/linkDike.vue
  2. 155
      src/components/linkNameSelect/linkSluice.vue
  3. 93
      src/components/myUpload/index.vue
  4. 16
      src/layout/components/Sidebar/index.vue
  5. 9
      src/main.js
  6. 14
      src/utils/directives/select.js
  7. 38
      src/utils/fileUpload.js
  8. 25
      src/views/dike/engineeringCondition/dikeBaseInfo/index.vue
  9. 28
      src/views/dike/engineeringCondition/identificationPlate/components/markForm.vue
  10. 54
      src/views/dike/engineeringCondition/identificationPlate/index.vue
  11. 30
      src/views/dike/managementGuarantee/archivesManagement/index.vue
  12. 4
      src/views/dike/managementGuarantee/fundGuarantee/components/maintenanceFund.vue
  13. 4
      src/views/dike/managementGuarantee/fundGuarantee/components/personnelExpenses.vue
  14. 124
      src/views/dike/managementGuarantee/fundGuarantee/index.vue
  15. 32
      src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
  16. 20
      src/views/dike/safetyManage/confirmDelimitationManage/index.vue
  17. 31
      src/views/dike/safetyManage/declarationManage/declare/components/dataCharts.vue
  18. 88
      src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
  19. 1
      src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/basePage.vue
  20. 29
      src/views/dike/safetyManage/declarationManage/examine/components/dataCharts.vue
  21. 53
      src/views/dike/safetyManage/floodControlManagement/power.vue
  22. 35
      src/views/dike/safetyManage/floodControlManagement/preplan.vue
  23. 58
      src/views/dike/safetyManage/floodControlManagement/supplies.vue
  24. 72
      src/views/dike/safetyManage/floodControlManagement/tissue.vue
  25. 40
      src/views/dike/safetyManage/responsiblePersonManage/components/list.vue
  26. 31
      src/views/dike/safetyManage/safeProduction/components/list.vue
  27. 17
      src/views/dike/safetyManage/safetyAppraisal/task.vue
  28. 6
      src/views/sluice/engineeringCondition/identificationPlate/components/markForm.vue
  29. 33
      src/views/sluice/engineeringCondition/identificationPlate/index.vue
  30. 13
      src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue
  31. 30
      src/views/sluice/managementGuarantee/archivesManagement/index.vue
  32. 4
      src/views/sluice/managementGuarantee/fundGuarantee/components/maintenanceFund.vue
  33. 4
      src/views/sluice/managementGuarantee/fundGuarantee/components/personnelExpenses.vue
  34. 77
      src/views/sluice/managementGuarantee/fundGuarantee/index.vue
  35. 32
      src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
  36. 20
      src/views/sluice/safetyManage/confirmDelimitationManage/index.vue
  37. 29
      src/views/sluice/safetyManage/declarationManage/declare/components/dataCharts.vue
  38. 6
      src/views/sluice/safetyManage/declarationManage/declare/components/listPage/index.vue
  39. 29
      src/views/sluice/safetyManage/declarationManage/examine/components/dataCharts.vue
  40. 53
      src/views/sluice/safetyManage/floodControlManagement/power.vue
  41. 50
      src/views/sluice/safetyManage/floodControlManagement/preplan.vue
  42. 48
      src/views/sluice/safetyManage/floodControlManagement/supplies.vue
  43. 22
      src/views/sluice/safetyManage/floodControlManagement/tissue.vue
  44. 33
      src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
  45. 22
      src/views/sluice/safetyManage/safeProduction/components/list.vue
  46. 19
      src/views/sluice/safetyManage/safetyAppraisal/task.vue

148
src/components/linkNameSelect/linkDike.vue

@ -0,0 +1,148 @@
<template>
<div>
<el-select
v-if="isMultiple"
v-model="form.dikeCodes"
placeholder="请选择堤防名称"
style="width: 100%"
v-scroll="selectSearch"
filterable
clearable
remote
reserve-keyword
:remote-method="remoteMethod"
:loading="loading"
@change="handleChange"
multiple
>
<el-option
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.dikeCode"
@click.native="chooseDike(dict)"
></el-option>
</el-select>
<el-select
v-else
v-model="form.dikeCode"
placeholder="请选择堤防名称"
style="width: 100%"
v-scroll="selectSearch"
filterable
:filter-method="aaaa"
clearable
remote
reserve-keyword
:remote-method="remoteMethod"
:loading="loading"
@change="handleChange"
@blur="handleChange"
>
<el-option
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.dikeCode"
@click.native="chooseDike(dict)"
></el-option>
</el-select>
</div>
</template>
<script>
import { listJbxx, getJbxx } from "@/api/yg/dike/jbxx";
export default {
props: ["form", "isMultiple"],
data() {
return {
loading: false,
dikeNameOptions: [],
//
dikeNameQueryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
dikeName: null,
dikeCode: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
},
};
},
created() {
if (this.form.dikeName) {
this.dikeNameQueryParams.data.dikeName = this.form.dikeName;
}
listJbxx(this.dikeNameQueryParams).then((res) => {
console.log(111, res);
this.dikeNameOptions = res.records;
});
},
methods: {
aaaa(value) {
console.log(999);
return true;
},
reset() {
this.dikeNameQueryParams = {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
dikeName: null,
dikeCode: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
};
},
handleChange(keyWork) {
// console.log(1111, this.form);
// if (!keyWork) {
this.reset();
listJbxx(this.dikeNameQueryParams).then((res) => {
this.dikeNameOptions = res.records;
});
// }else{
// }
},
remoteMethod(query) {
this.selectLoading = true;
if (query !== "") {
// console.log(444, query);
this.dikeNameQueryParams.data.dikeName = query;
} else {
this.reset();
}
listJbxx(this.dikeNameQueryParams).then((res) => {
this.dikeNameOptions = res.records;
this.selectLoading = false;
});
},
selectSearch() {
this.dikeNameQueryParams.pageNum += 1;
listJbxx(this.dikeNameQueryParams).then((res) => {
// console.log(111, res);
this.dikeNameOptions = [...this.dikeNameOptions, ...res.records];
// console.log(111, this.dikeNameOptions);
});
},
chooseDike(item) {
this.form.dikeName = item.dikeName;
},
},
};
</script>

155
src/components/linkNameSelect/linkSluice.vue

@ -0,0 +1,155 @@
<template>
<div>
<el-select
v-if="isMultiple"
v-model="form.wagaCodes"
placeholder="请选择水闸名称"
style="width: 100%"
v-scroll="selectSearch"
filterable
clearable
remote
reserve-keyword
:remote-method="remoteMethod"
:loading="loading"
@change="handleChange"
multiple
>
<el-option
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.wagaCode"
@click.native="chooseDike(dict)"
></el-option>
</el-select>
<el-select
v-else
v-model="form.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
v-scroll="selectSearch"
filterable
clearable
remote
reserve-keyword
:remote-method="remoteMethod"
:loading="loading"
@change="handleChange"
>
<el-option
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.wagaCode"
@click.native="chooseDike(dict)"
></el-option>
</el-select>
</div>
</template>
<script>
import { listJbxx, getJbxx } from "@/api/yg/jbxx";
export default {
props: ["form", "isMultiple"],
data() {
return {
loading: false,
wagaNameOptions: [],
//
wagaNameQueryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
wagaName: null,
wagaCode: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
},
};
},
created() {
if (this.form.wagaName) {
this.wagaNameQueryParams.data.wagaName = this.form.wagaName;
}
listJbxx(this.wagaNameQueryParams)
.then((res) => {
// console.log(111, res);
this.wagaNameOptions = res.records;
})
.then(() => {
// if (this.form.wagaName) {
// this.wagaNameQueryParams.data.wagaName = this.form.wagaName;
// listJbxx(this.wagaNameQueryParams).then((res) => {
// let bool = this.wagaNameOptions.some(
// (item) => item.wagaCode === res.records[0]?.wagaCode
// );
// this.wagaNameOptions = [
// ...(bool ? [] : res.records),
// ...this.wagaNameOptions,
// ];
// this.wagaNameQueryParams.data.wagaName = null;
// });
// }
});
},
methods: {
reset() {
this.wagaNameQueryParams = {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
wagaName: null,
wagaCode: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
};
},
handleChange(keyWork) {
// if (!keyWork) {
this.reset();
listJbxx(this.wagaNameQueryParams).then((res) => {
this.wagaNameOptions = res.records;
});
// }/
},
remoteMethod(query) {
this.selectLoading = true;
if (query !== "") {
// console.log(444, query);
this.wagaNameQueryParams.data.wagaName = query;
} else {
this.reset();
}
listJbxx(this.wagaNameQueryParams).then((res) => {
this.wagaNameOptions = res.records;
this.selectLoading = false;
});
},
selectSearch() {
this.wagaNameQueryParams.pageNum += 1;
listJbxx(this.wagaNameQueryParams).then((res) => {
// console.log(111, res);
this.wagaNameOptions = [...this.wagaNameOptions, ...res.records];
// console.log(111, this.wagaNameOptions);
});
},
chooseDike(item) {
this.form.wagaName = item.wagaName;
},
},
};
</script>

93
src/components/myUpload/index.vue

@ -0,0 +1,93 @@
<template>
<el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
:before-upload="(file) => $fileBeforeUpload(file, 'fileList')"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
multiple
:on-exceed="handleExceed"
:on-success="submitUpload"
:file-list="fileList"
>
<el-button size="small" type="primary" plain>
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div slot="tip" class="el-upload__tip">
支持jpg/png/pdf/word/excel文件等不超过200M
</div>
</el-upload>
</template>
<script>
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
export default {
props: {
fileList: {
type: Array,
default() {
return [];
},
},
},
data() {
return {
headers: {
shuili: "water " + getToken(),
},
// fileList:[]
};
},
methods: {
//
submitUpload(_, file) {
console.log(file);
this.fileList.push({
name: file.name,
fileName: file.response.fileName,
url: file.response.url,
uid: file.uid,
});
console.log("this.fileList", this.fileList);
},
handleRemove(file) {
// console.log(file, fileList1);
let index = this.fileList.findIndex((item) => item.uid === file.uid);
//
this.fileList.splice(index, 1);
},
//
handlePreview(file) {
// console.log(file);
getFileStream({ fileName: file.fileName }).then((res) => {
const blob = new Blob([res], {
// type
// application/xlsx application/zip
type: "application/xlsx",
}); //excel,pdf
const href = URL.createObjectURL(blob); //URLblob
const a = document.createElement("a"); //a
a.style.display = "none";
a.href = href; //
a.download = file.name; //
a.click(); //
URL.revokeObjectURL(a.href); //URL
});
},
handleExceed(files, fileList) {
this.$message.warning(
`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
files.length + fileList.length
} 个文件`
);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}`);
},
},
};
</script>

16
src/layout/components/Sidebar/index.vue

@ -47,11 +47,25 @@ export default {
activeMenu() {
const route = this.$route;
const { meta, path } = route;
let newPath = path;
if (path.includes("/sluice/engineeringCondition/sluiceBaseInfo/")) {
newPath = "/sluice/engineeringCondition/sluiceBaseInfo";
} else if (path.includes("/sluice/safetyManage/declare/")) {
newPath = "/sluice/safetyManage/declare";
} else if (path.includes("/sluice/safetyManage/examine/")) {
newPath = "/sluice/safetyManage/examine";
} else if (path.includes("/dike/engineeringCondition/dikeBaseInfo/")) {
newPath = "/dike/engineeringCondition/dikeBaseInfo";
} else if (path.includes("/dike/safetyManage/declare/")) {
newPath = "/dike/safetyManage/declare";
} else if (path.includes("/dike/safetyManage/examine/")) {
newPath = "/dike/safetyManage/examine";
}
// if set path, the sidebar will highlight the path you set
if (meta.activeMenu) {
return meta.activeMenu;
}
return path;
return newPath;
},
showLogo() {
return this.$store.state.settings.sidebarLogo;

9
src/main.js

@ -20,6 +20,7 @@ import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import MyUpload from "@/components/myUpload";
import Pagination from "@/components/Pagination";
//自定义表格工具扩展
import RightToolbar from "@/components/RightToolbar"
@ -81,6 +82,13 @@ Vue.prototype.$formatAdcd=function(row) {
}
}
import { fileBeforeUpload } from "@/utils/fileUpload";
Vue.prototype.$fileBeforeUpload=fileBeforeUpload
import select from "@/utils/directives/select";
Object.keys(select).forEach(item => {
Vue.directive(item, select[item])
})
// 全局方法挂载
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
@ -118,6 +126,7 @@ Vue.use(Viewer);
// 全局挂载echarts
// Vue.component('v-chart',v_echarts);
// 全局组件挂载
Vue.component('MyUpload', MyUpload)
Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar)
// 上传文件组件

14
src/utils/directives/select.js

@ -0,0 +1,14 @@
export default {
scroll: {
bind (el, binding) {
const SELECTWRAP_DOM=el.querySelector(".el-select-dropdown .el-select-dropdown__wrap")
SELECTWRAP_DOM.addEventListener('scroll', function () {
const CONDITION = this.scrollHeight - this.scrollTop <= this.clientHeight
if (CONDITION) {
binding.value()
}
})
}
}
}

38
src/utils/fileUpload.js

@ -0,0 +1,38 @@
import { getFileStream } from "@/api/system/upload";
export function fileBeforeUpload (file, fileListName) {
const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
const whiteList = ["jpg", "jpeg", "png", "doc", "docx", "xls", "xlsx", "ppt", "pptx","bmp", "gif", "html", "htm", "txt", "rar", "zip", "gz", "bz2", "pdf"];
if (whiteList.indexOf(fileSuffix) === -1) {
this.msgError("上传文件只能是 jpg, jpeg, png, doc, docx, xls, xlsx, ppt, pptx,bmp, gif, html, htm, txt, rar, zip, gz, bz2, pdf]格式", "error");
// return false;
this[fileListName] = this[fileListName].slice(0, this[fileListName].length);
}
const isLt2M = file.size / 1024 / 1024 <200.01;
if (!isLt2M) {
this.msgError("上传文件大小不能超过 200MB", "error");
this[fileListName] = this[fileListName].slice(0, this[fileListName].length);
// return false;
}
}
export function myDownLoadFile(file) {
getFileStream({ fileName: file.fileName }).then((res) => {
const blob = new Blob([res], {
// type类型后端返回来的数据中会有,根据自己实际进行修改
// 表格下载为 application/xlsx,压缩包为 application/zip等,
type: "application/xlsx",
}); //excel,pdf等
const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
const a = document.createElement("a"); //创建a标签
a.style.display = "none";
a.href = href; // 指定下载链接
a.download = file.name; //指定下载文件名
a.click(); //触发下载
URL.revokeObjectURL(a.href); //释放URL对象
});
}

25
src/views/dike/engineeringCondition/dikeBaseInfo/index.vue

@ -50,6 +50,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="行政区划" prop="adcd">
<el-cascader
:options="areasOptions"
v-model="queryParams.data.adcd"
:props="areasOptionProps"
placeholder="请选择行政区划"
clearable
size="small"
style="width: 100%"
@change="handleQuery"
>
</el-cascader>
</el-form-item>
<el-form-item>
<!-- <el-button
@ -516,7 +529,7 @@ export default {
startDate: null,
compDate: null,
admDep: null,
isGateProject: "0",
isGateProject: null,
observationProject: null,
levelDatum: null,
dikeOverview: null,
@ -527,7 +540,7 @@ export default {
owerDept: null,
remark: null,
relation: null,
status: "0",
status: null,
securityCategory: null,
adcd: null,
hzStatus: null,
@ -593,7 +606,7 @@ export default {
startDate: null,
compDate: null,
admDep: null,
isGateProject: "0",
isGateProject: null,
observationProject: null,
levelDatum: null,
dikeOverview: null,
@ -604,11 +617,11 @@ export default {
owerDept: null,
remark: null,
relation: null,
status: "0",
status: null,
securityCategory: null,
adcd: null,
hzStatus: "0",
zxStatus: "0",
hzStatus: null,
zxStatus: null,
reason: null,
startLoc: null,
endLoc: null,

28
src/views/dike/engineeringCondition/identificationPlate/components/markForm.vue

@ -29,8 +29,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="上传图片" prop="photo">
<!-- <el-input v-model="form.photo" placeholder="请输入上传图片" /> -->
<el-upload
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -51,7 +51,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
</el-col>
<el-col :span="12">
@ -131,8 +131,8 @@ export default {
this.form = this.editItem;
this.form.type = this.type;
this.form.dikeName = this.comForm.embankmentName;
this.form.embankmentCode = this.comForm.embankmentCode;
this.form.dikeName = this.comForm.dikeName;
this.form.dikeCode = this.comForm.dikeCode;
this.form.adcd = this.comForm.adcd;
if (this.form.photo) {
this.fileList = JSON.parse(this.form.photo);
@ -141,7 +141,7 @@ export default {
this.form = {
id: null,
adcd: null,
embankmentCode: null,
dikeCode: null,
markName: null,
dikeName: null,
markLocation: null,
@ -160,8 +160,8 @@ export default {
};
this.form.type = this.type;
// console.log(7777777777, this.comForm);
this.form.dikeName = this.comForm.embankmentName;
this.form.embankmentCode = this.comForm.embankmentCode;
this.form.dikeName = this.comForm.dikeName;
this.form.dikeCode = this.comForm.dikeCode;
this.form.adcd = this.comForm.adcd;
}
console.log("this.form in components", this.form);
@ -182,22 +182,22 @@ export default {
// console.log("name", newVal);
},
},
"comForm.embankmentName": {
"comForm.dikeName": {
// deep: true, // true
handler(newVal, oldVal) {
// console.log("name", newVal);
// console.log("name", oldVal);
this.form.embankmentName = newVal;
// this.form.embankmentCode = newVal;
this.form.dikeName = newVal;
// this.form.dikeCode = newVal;
},
},
"comForm.embankmentCode": {
"comForm.dikeCode": {
// deep: true, // true
handler(newVal, oldVal) {
// console.log("code", newVal);
// console.log("code", oldVal);
// this.form.dikeName = newVal;
this.form.embankmentCode = newVal;
this.form.dikeCode = newVal;
},
},
"comForm.adcd": {
@ -214,7 +214,7 @@ export default {
// this.form = {
// id: null,
// adcd: null,
// embankmentCode: null,
// dikeCode: null,
// markName: null,
// suliceName: null,
// markLocation: null,

54
src/views/dike/engineeringCondition/identificationPlate/index.vue

@ -22,9 +22,9 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="标志名称" prop="markName">
<el-form-item label="堤防名称" prop="dikeName">
<el-input
v-model="queryParams.data.markName"
v-model="queryParams.data.dikeName"
placeholder="请输入标志名称"
clearable
size="small"
@ -39,6 +39,23 @@
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="标志名称" prop="markName">
<el-input
v-model="queryParams.data.markName"
placeholder="请输入标志名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item> -->
<!-- <el-form-item label="标牌类型" prop="type">
<el-select
v-model="queryParams.data.type"
@ -158,7 +175,7 @@
<el-table-column
label="堤防名称"
align="center"
prop="embankmentName"
prop="dikeName"
min-width="120"
/>
<el-table-column
@ -261,9 +278,10 @@
label-width="80px"
>
<el-col :span="12">
<el-form-item label="堤防名称" prop="embankmentName">
<el-select
v-model="comForm.embankmentName"
<el-form-item label="堤防名称" prop="dikeCode">
<linkDike :form="comForm" v-if="open" />
<!-- <el-select
v-model="comForm.dikeName"
placeholder="请选择堤防名称"
clearable
filterable
@ -271,13 +289,13 @@
style="width: 100%"
>
<el-option
v-for="dict in embankmentNameOptions"
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.dikeName"
@click.native="chooseEmbankmenName(dict)"
/>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
</el-form>
@ -547,13 +565,14 @@ import { listDikeInfo } from "@/api/yg/dikeInfo";
import markForm from "./components/markForm.vue";
import { getAreasData } from "@/api/areas/index";
import { regionData, codeToText, TextToCode } from "element-china-area-data";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
// import Vue from "vue";
export default {
name: "DikeMark",
components: {
markForm,
linkDike,
},
data() {
return {
@ -601,6 +620,7 @@ export default {
pageSize: 10,
ids: null,
data: {
dikeName: null,
markName: null,
type: null,
markType: null,
@ -616,7 +636,7 @@ export default {
//
form: {},
comForm: {
embankmentName: null,
dikeName: null,
embankmentCode: null,
adcd: null,
},
@ -627,8 +647,8 @@ export default {
//
comRule: {
embankmentName: [
{ required: true, message: "请选择堤防名称", trigger: "blur" },
dikeCode: [
{ required: true, message: "请选择堤防名称", trigger: "change" },
],
},
rules: {
@ -636,7 +656,7 @@ export default {
{ required: true, message: "请输入标志名称", trigger: "blur" },
],
},
embankmentNameOptions: [],
dikeNameOptions: [],
isEdit: false,
counter0: [{}],
counter1: [{}],
@ -664,8 +684,8 @@ export default {
this.markTypeOptions4 = response.data;
});
listDikeInfo({ data: { exprDate: null } }).then((response) => {
console.log("embankmentNameOptions", response);
this.embankmentNameOptions = response.records;
console.log("dikeNameOptions", response);
this.dikeNameOptions = response.records;
});
},
// mounted() {
@ -846,7 +866,7 @@ export default {
this.counter2 = [{}];
this.counter3 = [{}];
this.comForm = {
embankmentName: null,
dikeName: null,
embankmentCode: null,
adcd: null,
};
@ -1000,7 +1020,7 @@ export default {
getDikeMark(embankmentCode).then((response) => {
// this.form = response.data;
console.log("回显的数据", response);
this.comForm.embankmentName = response.data[0].embankmentName;
this.comForm.dikeName = response.data[0].dikeName;
this.comForm.embankmentCode = response.data[0].embankmentCode;
this.comForm.adcd = response.data[0].adcd;
console.log("this.comForm", this.comForm);

30
src/views/dike/managementGuarantee/archivesManagement/index.vue

@ -231,8 +231,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="124px">
<el-form-item label="堤防名称" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防编码" /> -->
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择堤防名称"
style="width: 100%"
@ -243,14 +243,11 @@
:label="dict.dikeName"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="堤防调度规程" prop="regulationsAttachment">
<!-- <el-input
v-model="form.regulationsAttachment"
placeholder="请输入堤防调度规程"
/> -->
<el-upload
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -269,14 +266,11 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
<el-form-item label="年度调度运用计划" prop="planAttachment">
<!-- <el-input
v-model="form.planAttachment"
placeholder="请输入年度调度运用计划"
/> -->
<el-upload
<myUpload :fileList="fileLis2" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -295,7 +289,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -318,9 +312,13 @@ import {
import { listJbxx } from "@/api/yg/dike/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Dagl",
components: {
linkDike,
},
data() {
return {
//
@ -425,6 +423,8 @@ export default {
},
//
reset() {
this.fileList1 = [];
this.fileList2 = [];
this.form = {
id: null,
dikeCode: null,

4
src/views/dike/managementGuarantee/fundGuarantee/components/maintenanceFund.vue

@ -142,6 +142,9 @@ export default {
form: {},
//
rules: {
unitName: [
{ required: true, message: "请输入单位名称", trigger: "blur" },
],
peopleNum: [
{
pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
},
],
funds: [
{ required: true, message: "请输入经费", trigger: "blur" },
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,

4
src/views/dike/managementGuarantee/fundGuarantee/components/personnelExpenses.vue

@ -142,6 +142,9 @@ export default {
form: {},
//
rules: {
unitName: [
{ required: true, message: "请输入单位名称", trigger: "blur" },
],
peopleNum: [
{
pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
},
],
funds: [
{ required: true, message: "请输入经费", trigger: "blur" },
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,

124
src/views/dike/managementGuarantee/fundGuarantee/index.vue

@ -15,8 +15,43 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="堤防名称" prop="dikeName">
<el-input
v-model="queryParams.data.dikeName"
placeholder="请输入堤防名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<el-form-item label="堤防主管部门" prop="unit">
<el-input
v-model="queryParams.data.unit"
placeholder="请输入堤防主管部门"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!--
<el-form-item label="单位名称" prop="unitName">
<el-input
v-model="queryParams.data.unitName"
@ -33,7 +68,7 @@
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
</el-form-item> -->
<el-form-item>
<!-- <el-button
@ -50,18 +85,46 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['df:jfgl:add']"
>新增</el-button
>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['df:jfgl:edit']"
>修改</el-button
>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['df:jfgl:remove']"
>删除</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="jfglList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" fixed />
<el-table v-loading="loading" :data="jfglList">
<!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
<el-table-column
label="序号"
type="index"
@ -158,12 +221,14 @@
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="8">
<el-form-item label="堤防编码" prop="dikeCode">
<el-form-item label="堤防名称" prop="dikeName">
<el-input
v-model="form.dikeCode"
placeholder="请输入堤防编码"
:disabled="true"
v-model="form.dikeName"
placeholder="请输入堤防名称"
disabled
/>
<!-- <linkDike :form="form" v-if="open" /> -->
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防编码" /> -->
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择堤防名称"
@ -179,11 +244,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="堤防名称" prop="dikeName">
<el-form-item label="堤防编码" prop="dikeCode">
<el-input
v-model="form.dikeName"
placeholder="请输入堤防名称"
:disabled="true"
v-model="form.dikeCode"
placeholder="请输入堤防编码"
disabled
/>
</el-form-item>
</el-col>
@ -194,7 +259,7 @@
v-model="form.dikeType"
placeholder="请选择堤防类型"
style="width: 100%"
:disabled="true"
disabled
>
<el-option
v-for="dict in dikeTypeOptions"
@ -239,10 +304,10 @@
</div>
<maintenanceFund ref="maintenanceFund" :dikeCode="this.form.dikeCode" />
</el-row>
<div slot="footer" class="dialog-footer">
<!-- <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</div> -->
</el-dialog>
</div>
</template>
@ -256,15 +321,18 @@ import {
updateJfgl,
exportJfgl,
} from "@/api/yg/dike/jfgl";
import { listDagl } from "@/api/yg/dike/dagl";
// import { listJbxx } from "@/api/yg/jbxx";
import personnelExpenses from "./components/personnelExpenses.vue";
import maintenanceFund from "./components/maintenanceFund.vue";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Jfgl",
components: {
personnelExpenses,
maintenanceFund,
linkDike,
},
data() {
return {
@ -291,21 +359,15 @@ export default {
//
projectScaleOptions: [],
//
//
queryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
dikeCode: null,
unitName: null,
peopleNum: null,
funds: null,
fundsPurpose: null,
createUid: null,
updateUid: null,
owerDept: null,
relation: null,
type: null,
dikeName: null,
unit: null,
},
//
params: {
@ -350,7 +412,7 @@ export default {
/** 查询经费管理列表 */
getList() {
this.loading = true;
listJfgl(this.queryParams).then((response) => {
listDagl(this.queryParams).then((response) => {
this.jfglList = response.records;
this.total = response.total;
this.loading = false;
@ -374,7 +436,9 @@ export default {
this.form = {
id: null,
dikeCode: null,
dikeName: null,
unitName: null,
unit: null,
peopleNum: null,
funds: null,
fundsPurpose: null,
@ -397,7 +461,9 @@ export default {
data: {
id: null,
dikeCode: null,
dikeName: null,
unitName: null,
unit: null,
peopleNum: null,
funds: null,
fundsPurpose: null,

32
src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue

@ -178,8 +178,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="堤防名称" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防编码" /> -->
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择堤防名称"
style="width: 100%"
@ -190,15 +190,12 @@
:label="dict.dikeName"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="验收申请" prop="acceptanceAttachment">
<!-- <el-input
v-model="form.acceptanceAttachment"
placeholder="请输入验收申请"
/> -->
<el-upload
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -217,7 +214,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
<!-- <el-form-item label="状态" prop="stauts">
@ -606,9 +603,13 @@ import {
import { listJbxx } from "@/api/yg/dike/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Bzhjs",
components: {
linkDike,
},
data() {
return {
//
@ -658,7 +659,11 @@ export default {
//
form: {},
//
rules: {},
rules: {
dikeCode: [
{ required: true, message: "请选择堤防名称", trigger: "change" },
],
},
//
headers: {
shuili: "water " + getToken(),
@ -735,6 +740,7 @@ export default {
});
},
closeDialog() {
this.fileList1 = [];
this.evalForm = {
score: {},
reason: {},
@ -831,6 +837,9 @@ export default {
const id = row.id || this.ids;
getBzhjs(id).then((response) => {
this.form = response.data;
if (this.form.acceptanceAttachment) {
this.fileList1 = JSON.parse(this.form.acceptanceAttachment);
}
if (this.form.score) {
this.evalForm = JSON.parse(this.form.score);
}
@ -840,6 +849,9 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.form.acceptanceAttachment = this.fileList1.length
? JSON.stringify(this.fileList1)
: null;
this.$refs["form"].validate((valid) => {
if (valid) {
this.form.score = JSON.stringify(this.evalForm);

20
src/views/dike/safetyManage/confirmDelimitationManage/index.vue

@ -214,7 +214,7 @@
@close="closeView"
>
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="84px">
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<!-- <el-form-item label="堤防id" prop="dikeId">
<el-input v-model="form.dikeId" placeholder="请输入堤防id" />
</el-form-item> -->
@ -258,11 +258,8 @@
</el-date-picker>
</el-form-item>
<el-form-item label="产权证书" prop="certificateTitle">
<!-- <el-input
v-model="form.certificateTitle"
placeholder="请输入产权证书"
/> -->
<el-upload
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -283,7 +280,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
<el-form-item label="管理范围" prop="managementScope">
<el-input
@ -526,7 +523,11 @@ export default {
//
form: {},
//
rules: {},
rules: {
propertyOwner: [
{ required: true, message: "请输入产权所有者", trigger: "blur" },
],
},
//
routeList: [
{
@ -577,6 +578,7 @@ export default {
},
methods: {
closeView() {
this.fileList = [];
this.form = {};
this.viewMsg = {};
},
@ -769,7 +771,7 @@ export default {
owerDept: null,
remark: null,
relation: null,
status: "0",
status: null,
securityCategory: null,
securityStatus: null,
},

31
src/views/dike/safetyManage/declarationManage/declare/components/dataCharts.vue

@ -1,5 +1,5 @@
<template>
<div class="content">
<div class="content" v-loading="loading">
<div ref="pieEle" style="width: 30%; height: 100%"></div>
<div ref="barEle" style="width: 70%; height: 100%"></div>
</div>
@ -11,7 +11,9 @@ export default {
data() {
return {
pieChartData: [],
selected: {},
barChartData: [],
loading: true,
};
},
created() {
@ -19,18 +21,29 @@ export default {
},
methods: {
async getData() {
this.loading = true;
const res1 = await getPie();
const res2 = await getHistogram();
this.pieChartData = [];
for (let key in res1[0]) {
this.pieChartData.push({ value: res1[0][key], name: key });
this.pieChartData.push({
value: res1[0][key],
name: key?.substring(0, 10),
});
}
//
for (let i = 0; i < this.pieChartData.length; i++) {
let name = this.pieChartData[i].name;
this.selected[name] = i < 7; //10 name
}
// for (let key in res1[0]) {
// this.barChartData.push({ value: res1[0][key], name: key });
// }
this.barChartData = res2;
this.pieInit();
this.barInit();
this.loading = false;
console.log("pieChartData", this.pieChartData);
console.log("barChartData", this.barChartData);
},
@ -51,6 +64,8 @@ export default {
orient: "horizontal",
bottom: "2%",
icon: "circle",
type: "scroll",
selected: this.selected,
},
series: [
{
@ -106,6 +121,18 @@ export default {
bottom: "12%",
containLabel: true,
},
dataZoom: [
{
type: "inside",
show: false,
xAxisIndex: [0],
start: 0,
end: 50,
// textStyle: {
// color: "#ccd7d7",
// },
},
],
xAxis: {
type: "category",
axisLine: {

88
src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue

@ -161,37 +161,51 @@
fixed="right"
>
<template slot-scope="scope">
<el-button
<template
v-if="
scope.row.status == '0' ||
scope.row.status == '1' ||
scope.row.status == '2'
"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleAddEdit(scope.row)"
v-hasPermi="['df:jbxx:addEdit']"
>修改申报</el-button
>
<el-button
v-if="scope.row.status == '3'"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['df:jbxx:edit']"
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleAddEdit(scope.row)"
v-hasPermi="['df:jbxx:addEdit']"
>修改申报</el-button
>
</template>
<template
v-if="
scope.row.status == '3' ||
(scope.row.status != '0' &&
scope.row.status != '1' &&
scope.row.status != '2' &&
scope.row.status != '3')
"
>
{{ scope.row.status == "3" ? "登记" : "" }}
{{
scope.row.status != "0" &&
scope.row.status != "1" &&
scope.row.status != "2" &&
scope.row.status != "3"
? "修改登记"
: ""
}}
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['df:jbxx:edit']"
>
{{ scope.row.status == "3" ? "登记" : "" }}
{{
scope.row.status != "0" &&
scope.row.status != "1" &&
scope.row.status != "2" &&
scope.row.status != "3"
? "修改登记"
: ""
}}
</el-button>
</template>
<!-- <el-button
v-if="
scope.row.status != '0' &&
@ -206,16 +220,16 @@
v-hasPermi="['df:jbxx:edit']"
>修改登记</el-button
> -->
<el-button
v-if="scope.row.status == '6'"
size="mini"
type="text"
icon="el-icon-folder-checked"
@click="transformCertificate(scope.row)"
v-hasPermi="['df:jbxx:transform']"
>换证</el-button
>
<template v-if="scope.row.status == '6'">
<el-button
size="mini"
type="text"
icon="el-icon-folder-checked"
@click="transformCertificate(scope.row)"
v-hasPermi="['df:jbxx:transform']"
>换证</el-button
>
</template>
<el-popconfirm
icon="el-icon-info"
@ -925,7 +939,9 @@ export default {
form: {},
//
rules: {
adcd: [{ required: true, message: "请选择行政区划", trigger: "blur" }],
adcd: [
{ required: true, message: "请选择行政区划", trigger: "change" },
],
dikeName: [
{ required: true, message: "堤防名称不能为空", trigger: "blur" },
],
@ -965,7 +981,7 @@ export default {
},
],
securityCategory: [
{ required: true, message: "请选择安全类别", trigger: "blur" },
{ required: true, message: "请选择安全类别", trigger: "change" },
],
},
//

1
src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/basePage.vue

@ -18,6 +18,7 @@
v-model="form.securityCategory"
placeholder="请选择安全类别"
style="width: 100%"
disabled
>
<el-option
v-for="dict in securityCategoryOptions"

29
src/views/dike/safetyManage/declarationManage/examine/components/dataCharts.vue

@ -1,5 +1,5 @@
<template>
<div class="content">
<div class="content" v-loading="loading">
<div ref="pieEle" style="width: 30%; height: 100%"></div>
<div ref="barEle" style="width: 70%; height: 100%"></div>
</div>
@ -11,7 +11,9 @@ export default {
data() {
return {
pieChartData: [],
selected: {},
barChartData: [],
loading: true,
};
},
created() {
@ -19,11 +21,19 @@ export default {
},
methods: {
async getData() {
this.loading = true;
const res1 = await getPie();
const res2 = await getHistogram();
this.pieChartData = [];
for (let key in res1[0]) {
this.pieChartData.push({ value: res1[0][key], name: key });
this.pieChartData.push({
value: res1[0][key],
name: key?.substring(0, 10),
});
}
for (let i = 0; i < this.pieChartData.length; i++) {
let name = this.pieChartData[i].name;
this.selected[name] = i < 7; //10 name
}
// for (let key in res1[0]) {
// this.barChartData.push({ value: res1[0][key], name: key });
@ -31,6 +41,7 @@ export default {
this.barChartData = res2;
this.pieInit();
this.barInit();
this.loading = false;
console.log("pieChartData", this.pieChartData);
console.log("barChartData", this.barChartData);
},
@ -51,6 +62,8 @@ export default {
orient: "horizontal",
bottom: "2%",
icon: "circle",
type: "scroll",
selected: this.selected,
},
series: [
{
@ -106,6 +119,18 @@ export default {
bottom: "12%",
containLabel: true,
},
dataZoom: [
{
type: "inside",
show: false,
xAxisIndex: [0],
start: 0,
end: 50,
// textStyle: {
// color: "#ccd7d7",
// },
},
],
xAxis: {
type: "category",
axisLine: {

53
src/views/dike/safetyManage/floodControlManagement/power.vue

@ -16,7 +16,24 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联堤防" prop="dikeCode">
<el-form-item label="关联堤防" prop="dikeName">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入堤防名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="关联堤防" prop="dikeCode">
<el-select
v-model="queryParams.data.dikeCode"
placeholder="请选择关联堤防"
@ -30,13 +47,14 @@
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="备用电源种类" prop="powerType" label-width="96px">
<el-select
v-model="queryParams.data.powerType"
placeholder="请选择备用电源种类"
clearable
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in powerTypeOptions"
@ -113,14 +131,19 @@
align="center"
fixed
/>
<el-table-column
label="关联堤防"
align="center"
prop="dikeName"
min-width="120"
/>
<!-- <el-table-column
label="关联堤防"
align="center"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
/> -->
<el-table-column
label="备用电源数量(字段未有)"
align="center"
@ -188,8 +211,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
@ -200,7 +223,7 @@
:label="dict.dikeName"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="备用电源种类" prop="powerType">
<el-select
@ -259,12 +282,14 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/dike/jbxx";
import powerList from "./components/powerList.vue";
import powerRecords from "./components/powerRecords.vue";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Bydyzb",
components: {
powerList,
powerRecords,
linkDike,
},
data() {
return {
@ -315,6 +340,11 @@ export default {
owerDept: null,
relation: null,
},
cv: {
type: "like",
name: "dikeName",
value: null,
},
//
params: {
//
@ -328,10 +358,10 @@ export default {
//
rules: {
dikeCode: [
{ required: true, message: "请选择关联堤防", trigger: "blur" },
{ required: true, message: "请选择关联堤防", trigger: "change" },
],
powerType: [
{ required: true, message: "请选择备用电源种类", trigger: "blur" },
{ required: true, message: "请选择备用电源种类", trigger: "change" },
],
},
prowerTypeId: "",
@ -415,6 +445,11 @@ export default {
remark: null,
relation: null,
},
cv: {
type: "like",
name: "dikeName",
value: null,
},
//
params: {
//

35
src/views/dike/safetyManage/floodControlManagement/preplan.vue

@ -16,10 +16,10 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联堤防" prop="dikeCode">
<el-form-item label="关联堤防" prop="dikeName">
<el-input
v-model="queryParams.data.dikeCode"
placeholder="请输入堤防id"
v-model="queryParams.cv.value"
placeholder="请输入堤防名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
@ -110,14 +110,19 @@
align="center"
fixed
/>
<el-table-column
label="关联堤防"
align="center"
prop="dikeName"
min-width="120"
/>
<!-- <el-table-column
label="关联堤防"
align="center"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
/> -->
<!-- <el-table-column
label="堤防代码"
align="center"
@ -217,8 +222,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
@ -229,7 +234,7 @@
:label="dict.dikeName"
:value="dict.id"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="负责人" prop="personName">
@ -312,9 +317,13 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/dike/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Yaxx",
components: {
linkDike,
},
data() {
return {
//
@ -372,6 +381,11 @@ export default {
owerDept: null,
relation: null,
},
cv: {
type: "like",
name: "dikeName",
value: null,
},
//
params: {
//
@ -475,6 +489,11 @@ export default {
remark: null,
relation: null,
},
cv: {
type: "like",
name: "dikeName",
value: null,
},
params: {
//
orderBy: "create_time",

58
src/views/dike/safetyManage/floodControlManagement/supplies.vue

@ -16,25 +16,24 @@
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="堤防id" prop="dikeCode">
<el-form-item label="关联堤防" prop="dikeName">
<el-input
v-model="queryParams.data.dikeCode"
placeholder="请输入堤防id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="堤防名称" prop="dikeName">
<el-input
v-model="queryParams.data.dikeName"
v-model="queryParams.cv.value"
placeholder="请输入堤防名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="关联堤防" prop="dikeCode">
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="关联堤防" prop="dikeCode">
<el-select
v-model="queryParams.data.dikeCode"
placeholder="请选择关联堤防"
@ -48,7 +47,7 @@
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="物资名称" prop="materialName">
<el-input
v-model="queryParams.data.materialName"
@ -150,14 +149,19 @@
align="center"
fixed
/>
<el-table-column
label="关联堤防"
align="center"
prop="dikeName"
min-width="120"
/>
<!-- <el-table-column
label="关联堤防"
align="center"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
/> -->
<el-table-column
label="物资名称"
align="center"
@ -258,8 +262,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
@ -270,7 +274,7 @@
:label="dict.dikeName"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="物资名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物资名称" />
@ -338,9 +342,13 @@ import {
exportFxwz,
} from "@/api/yg/dike/fxwz";
import { listJbxx, getJbxx } from "@/api/yg/dike/jbxx";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Fxwz",
components: {
linkDike,
},
data() {
return {
//
@ -392,6 +400,11 @@ export default {
owerDept: null,
relation: null,
},
cv: {
type: "like",
name: "dikeName",
value: null,
},
//
params: {
//
@ -512,6 +525,11 @@ export default {
remark: null,
relation: null,
},
cv: {
type: "like",
name: "dikeName",
value: null,
},
params: {
//
orderBy: "create_time",

72
src/views/dike/safetyManage/floodControlManagement/tissue.vue

@ -53,7 +53,7 @@
>
</el-cascader>
</el-form-item>
<el-form-item
<!-- <el-form-item
label="负责人职务"
prop="chargePersonDuites"
label-width="84px"
@ -65,7 +65,7 @@
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item>
<!-- <el-button
type="cyan"
@ -133,12 +133,18 @@
fixed
/>
<el-table-column
label="堤防名称"
align="center"
prop="dikeName"
min-width="120"
/>
<!-- <el-table-column
label="堤防名称"
align="center"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
/> -->
<el-table-column
label="组织名称"
align="center"
@ -239,18 +245,27 @@
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<el-form-item label="堤防名称" prop="dikeCode">
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择堤防名称"
style="width: 100%"
v-scroll="selectSearch"
filterable
clearable
remote
reserve-keyword
:remote-method="remoteMethod"
:loading="selectLoading"
>
<el-option
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.dikeCode"
@click.native="chooseDike(dict)"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-col :span="12">
<el-form-item label="组织名称" prop="organizationName">
@ -369,11 +384,13 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/dike/jbxx";
import { getAreasData } from "@/api/areas/index";
import msFxzzMember from "./components/msFxzzMember.vue";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Fxzz",
components: {
msFxzzMember,
linkDike,
},
data() {
return {
@ -391,6 +408,7 @@ export default {
areasOptions: [],
//
loading: true,
selectLoading: false,
//
ids: [],
//
@ -411,6 +429,22 @@ export default {
typeOptions: [],
//
dikeNameOptions: [],
//
dikeNameQueryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
dikeName: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
},
//
queryParams: {
pageNum: 1,
@ -466,7 +500,7 @@ export default {
},
created() {
this.getList();
listJbxx({ data: {} }).then((res) => {
listJbxx(this.dikeNameQueryParams).then((res) => {
// console.log(111, res);
this.dikeNameOptions = res.records;
});
@ -476,6 +510,28 @@ export default {
});
},
methods: {
remoteMethod(query) {
if (query !== "") {
this.selectLoading = true;
// console.log(444, query);
this.dikeNameQueryParams.data.dikeName = query;
listJbxx(this.dikeNameQueryParams).then((res) => {
this.dikeNameOptions = res.records;
this.selectLoading = false;
});
}
},
selectSearch() {
this.dikeNameQueryParams.pageNum += 1;
listJbxx(this.dikeNameQueryParams).then((res) => {
// console.log(111, res);
this.dikeNameOptions = [...this.dikeNameOptions, ...res.records];
// console.log(111, this.dikeNameOptions);
});
},
chooseDike(item) {
this.form.dikeName = item.dikeName;
},
addForm(index) {
// console.log(44444, this.$refs.noticePart.$refs["noticeForm0"]);
//
@ -636,12 +692,14 @@ export default {
this.reset();
this.isEdit = true;
const id = row.id || this.ids;
const organizationId = row.id || this.ids[0];
console.log(444, id);
getFxzz(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改防汛组织";
});
listFxzzcy({ data: { organizationId: id } }).then((res) => {
listFxzzcy({ data: { organizationId: organizationId } }).then((res) => {
console.log(6666, res);
this.counter = res.records;
});

40
src/views/dike/safetyManage/responsiblePersonManage/components/list.vue

@ -7,7 +7,7 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="堤防名称" prop="dikeName">
<!-- <el-form-item label="堤防名称" prop="dikeName">
<el-select
v-model="queryParams.data.dikeId"
placeholder="请选择堤防名称"
@ -23,6 +23,23 @@
:value="dict.id"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="堤防名称" prop="dikeName">
<el-input
v-model="queryParams.data.dikeName"
placeholder="请输入堤防名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="堤防类型" prop="dikeType">
<el-input
@ -111,12 +128,18 @@
fixed
/>
<el-table-column
label="堤防名称"
align="center"
prop="dikeName"
min-width="120"
>
<!-- <el-table-column
label="堤防名称"
align="center"
prop="dikeId"
:formatter="dikeIdFormat"
min-width="120"
>
> -->
</el-table-column>
<el-table-column
label="责任人名称"
@ -224,7 +247,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="124px">
<el-form-item label="堤防名称" prop="dikeCode">
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择堤防名称"
style="width: 100%"
@ -235,7 +259,7 @@
:label="dict.dikeName"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="责任人部门类型" prop="type">
<el-select
@ -328,10 +352,14 @@ import {
exportFzr,
} from "@/api/yg/dike/fzr";
import { listJbxx, getJbxx } from "@/api/yg/dike/jbxx";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Fzr",
props: ["chartEleGetData"],
components: {
linkDike,
},
data() {
return {
//
@ -393,10 +421,10 @@ export default {
//
rules: {
dikeCode: [
{ required: true, message: "请选择堤防名称", trigger: "blur" },
{ required: true, message: "请选择堤防名称", trigger: "change" },
],
type: [
{ required: true, message: "请选择责任人类型", trigger: "blur" },
{ required: true, message: "请选择责任人类型", trigger: "change" },
],
name: [
{ required: true, message: "请输入责任人姓名", trigger: "blur" },

31
src/views/dike/safetyManage/safeProduction/components/list.vue

@ -89,14 +89,19 @@
align="center"
fixed
/>
<el-table-column
label="关联堤防"
align="center"
prop="dikeName"
min-width="120"
/>
<!-- <el-table-column
label="关联堤防"
align="center"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
/> -->
<el-table-column
label="提出人"
align="center"
@ -212,8 +217,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
<linkDike :form="form" v-if="open" />
<!-- <el-select
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
@ -225,7 +230,7 @@
:label="dict.dikeName"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="提出人" prop="proposer" v-if="!isResolve">
<el-input v-model="form.proposer" placeholder="请输入提出人" />
@ -298,12 +303,8 @@
</el-form-item>
<el-form-item label="图片" prop="photo">
<!-- <el-input
v-model="form.photo"
type="textarea"
placeholder="请输入内容"
/> -->
<el-upload
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -322,7 +323,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -345,10 +346,14 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/dike/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Yhxx",
props: ["chartEleGetData"],
components: {
linkDike,
},
data() {
return {
//
@ -518,7 +523,7 @@ export default {
instrument: null,
dangerDetail: null,
photo: null,
status: "0",
status: null,
cost: null,
finishMethod: null,
result: null,

17
src/views/dike/safetyManage/safetyAppraisal/task.vue

@ -237,13 +237,9 @@
<el-form-item label="任务名称" prop="taskName">
<el-input v-model="form.taskName" placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label="任务堤防Code" prop="dikeCodes">
<!-- <el-input
v-model="form.dikeCodes"
type="textarea"
placeholder="请输入内容"
/> -->
<el-select
<el-form-item label="任务堤防" prop="dikeCodes">
<linkDike :form="form" :isMultiple="true" v-if="open" />
<!-- <el-select
v-model="form.dikeCodes"
placeholder="请选择堤防名称"
style="width: 100%"
@ -255,7 +251,7 @@
:label="dict.dikeName"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="计划完成时间" prop="planCompletionTime">
<el-date-picker
@ -344,9 +340,11 @@ import {
exportAqrw,
} from "@/api/yg/dike/aqrw";
import { listJbxx } from "@/api/yg/dike/jbxx";
import linkDike from "@/components/linkNameSelect/linkDike.vue";
export default {
name: "Aqrw",
components: { linkDike },
data() {
return {
//
@ -412,6 +410,9 @@ export default {
taskName: [
{ required: true, message: "任务名称不能为空", trigger: "blur" },
],
dikeCodes: [
{ required: true, message: "请选择任务堤防", trigger: "change" },
],
},
};
},

6
src/views/sluice/engineeringCondition/identificationPlate/components/markForm.vue

@ -30,8 +30,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="上传图片" prop="photo">
<!-- <el-input v-model="form.photo" placeholder="请输入上传图片" /> -->
<el-upload
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -52,7 +52,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
</el-col>
<el-col :span="12">

33
src/views/sluice/engineeringCondition/identificationPlate/index.vue

@ -22,7 +22,24 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="标志名称" prop="markName">
<el-form-item label="水闸名称" prop="wagaName">
<el-input
v-model="queryParams.data.wagaName"
placeholder="请输入水闸名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="标志名称" prop="markName">
<el-input
v-model="queryParams.data.markName"
placeholder="请输入标志名称"
@ -38,7 +55,7 @@
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="标牌类型" prop="type">
<el-select
v-model="queryParams.data.type"
@ -261,8 +278,9 @@
label-width="80px"
>
<el-col :span="12">
<el-form-item label="水闸名称" prop="wagaName">
<el-select
<el-form-item label="水闸名称" prop="wagaCode">
<linkSluice :form="comForm" v-if="open" />
<!-- <el-select
v-model="comForm.wagaName"
placeholder="请选择水闸名称"
clearable
@ -277,7 +295,7 @@
:value="dict.wagaName"
@click.native="choosewagaName(dict)"
/>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
</el-form>
@ -547,6 +565,7 @@ import { listSluiceInfo } from "@/api/yg/sluiceInfo";
import markForm from "./components/markForm.vue";
import { getAreasData } from "@/api/areas/index";
import { regionData, codeToText, TextToCode } from "element-china-area-data";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
// import Vue from "vue";
@ -554,6 +573,7 @@ export default {
name: "SluiceMark",
components: {
markForm,
linkSluice,
},
data() {
return {
@ -601,6 +621,7 @@ export default {
pageSize: 10,
ids: null,
data: {
wagaName: null,
markName: null,
type: null,
markType: null,
@ -627,7 +648,7 @@ export default {
//
comRule: {
wagaName: [
wagaCode: [
{ required: true, message: "请选择水闸名称", trigger: "blur" },
],
},

13
src/views/sluice/engineeringCondition/sluiceBaseInfo/index.vue

@ -50,6 +50,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="行政区划" prop="adcd">
<el-cascader
:options="areasOptions"
v-model="queryParams.data.adcd"
:props="areasOptionProps"
placeholder="请选择行政区划"
clearable
size="small"
style="width: 100%"
@change="handleQuery"
>
</el-cascader>
</el-form-item>
<el-form-item>
<!-- <el-button

30
src/views/sluice/managementGuarantee/archivesManagement/index.vue

@ -231,8 +231,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="124px">
<el-form-item label="水闸名称" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸编码" /> -->
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
@ -243,14 +243,11 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="水闸调度规程" prop="regulationsAttachment">
<!-- <el-input
v-model="form.regulationsAttachment"
placeholder="请输入水闸调度规程"
/> -->
<el-upload
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -269,14 +266,11 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
<el-form-item label="年度调度运用计划" prop="planAttachment">
<!-- <el-input
v-model="form.planAttachment"
placeholder="请输入年度调度运用计划"
/> -->
<el-upload
<myUpload :fileList="fileList2" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -295,7 +289,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -318,9 +312,13 @@ import {
import { listJbxx } from "@/api/yg/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Dagl",
components: {
linkSluice,
},
data() {
return {
//
@ -425,6 +423,8 @@ export default {
},
//
reset() {
this.fileList1 = [];
this.fileList2 = [];
this.form = {
id: null,
wagaCode: null,

4
src/views/sluice/managementGuarantee/fundGuarantee/components/maintenanceFund.vue

@ -142,6 +142,9 @@ export default {
form: {},
//
rules: {
unitName: [
{ required: true, message: "请输入单位名称", trigger: "blur" },
],
peopleNum: [
{
pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
},
],
funds: [
{ required: true, message: "请输入经费", trigger: "blur" },
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,

4
src/views/sluice/managementGuarantee/fundGuarantee/components/personnelExpenses.vue

@ -142,6 +142,9 @@ export default {
form: {},
//
rules: {
unitName: [
{ required: true, message: "请输入单位名称", trigger: "blur" },
],
peopleNum: [
{
pattern: /^[1-9]\d*$/,
@ -150,6 +153,7 @@ export default {
},
],
funds: [
{ required: true, message: "请输入经费", trigger: "blur" },
{
pattern:
/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,

77
src/views/sluice/managementGuarantee/fundGuarantee/index.vue

@ -15,9 +15,43 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="单位名称" prop="unitName">
<el-form-item label="水闸名称" prop="wagaName">
<el-input
v-model="queryParams.data.wagaName"
placeholder="请输入水闸名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<el-form-item label="水闸主管部门" prop="unit">
<el-input
v-model="queryParams.data.unit"
placeholder="请输入水闸主管部门"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="单位名称" prop="unitName">
<el-input
v-model="queryParams.data.unitName"
placeholder="请输入单位名称"
@ -33,7 +67,7 @@
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
</el-form-item> -->
<el-form-item>
<!-- <el-button
@ -50,18 +84,25 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['sz:jfgl:remove']"
>删除</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="jfglList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" fixed />
<el-table v-loading="loading" :data="jfglList">
<!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
<el-table-column
label="序号"
type="index"
@ -256,6 +297,7 @@ import {
updateJfgl,
exportJfgl,
} from "@/api/yg/jfgl";
import { listDagl } from "@/api/yg/dagl";
// import { listJbxx } from "@/api/yg/jbxx";
import personnelExpenses from "./components/personnelExpenses.vue";
import maintenanceFund from "./components/maintenanceFund.vue";
@ -297,15 +339,8 @@ export default {
ids: null,
data: {
wagaCode: null,
unitName: null,
peopleNum: null,
funds: null,
fundsPurpose: null,
createUid: null,
updateUid: null,
owerDept: null,
relation: null,
type: null,
wagaName: null,
unit: null,
},
//
params: {
@ -350,7 +385,7 @@ export default {
/** 查询经费管理列表 */
getList() {
this.loading = true;
listJfgl(this.queryParams).then((response) => {
listDagl(this.queryParams).then((response) => {
this.jfglList = response.records;
this.total = response.total;
this.loading = false;
@ -374,6 +409,8 @@ export default {
this.form = {
id: null,
wagaCode: null,
wagaName: null,
unit: null,
unitName: null,
peopleNum: null,
funds: null,
@ -397,6 +434,8 @@ export default {
data: {
id: null,
wagaCode: null,
wagaName: null,
unit: null,
unitName: null,
peopleNum: null,
funds: null,

32
src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue

@ -178,8 +178,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="水闸名称" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸编码" /> -->
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
@ -190,15 +190,12 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="验收申请" prop="acceptanceAttachment">
<!-- <el-input
v-model="form.acceptanceAttachment"
placeholder="请输入验收申请"
/> -->
<el-upload
<myUpload :fileList="fileList1" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -217,7 +214,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
<!-- <el-form-item label="状态" prop="stauts">
@ -606,9 +603,13 @@ import {
import { listJbxx } from "@/api/yg/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Bzhjs",
components: {
linkSluice,
},
data() {
return {
//
@ -658,7 +659,11 @@ export default {
//
form: {},
//
rules: {},
rules: {
wagaCode: [
{ required: true, message: "请选择水闸名称", trigger: "change" },
],
},
//
headers: {
shuili: "water " + getToken(),
@ -735,6 +740,7 @@ export default {
});
},
closeDialog() {
this.fileList1 = [];
this.evalForm = {
score: {},
reason: {},
@ -831,6 +837,9 @@ export default {
const id = row.id || this.ids;
getBzhjs(id).then((response) => {
this.form = response.data;
if (this.form.acceptanceAttachment) {
this.fileList1 = JSON.parse(this.form.acceptanceAttachment);
}
if (this.form.score) {
this.evalForm = JSON.parse(this.form.score);
}
@ -840,6 +849,9 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.form.acceptanceAttachment = this.fileList1.length
? JSON.stringify(this.fileList1)
: null;
this.$refs["form"].validate((valid) => {
if (valid) {
this.form.score = JSON.stringify(this.evalForm);

20
src/views/sluice/safetyManage/confirmDelimitationManage/index.vue

@ -207,7 +207,7 @@
@close="closeView"
>
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="84px">
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<!-- <el-form-item label="水闸id" prop="wagaCode">
<el-input v-model="form.wagaCode" placeholder="请输入水闸id" />
</el-form-item> -->
@ -251,11 +251,8 @@
</el-date-picker>
</el-form-item>
<el-form-item label="产权证书" prop="certificateTitle">
<!-- <el-input
v-model="form.certificateTitle"
placeholder="请输入产权证书"
/> -->
<el-upload
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -276,7 +273,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
<el-form-item label="管理范围" prop="managementScope">
<el-input
@ -513,7 +510,11 @@ export default {
//
form: {},
//
rules: {},
rules: {
propertyOwner: [
{ required: true, message: "请输入产权所有者", trigger: "blur" },
],
},
//
routeList: [
{
@ -564,6 +565,7 @@ export default {
},
methods: {
closeView() {
this.fileList = [];
this.form = {};
this.viewMsg = {};
},
@ -768,7 +770,7 @@ export default {
owerDept: null,
remark: null,
relation: null,
status: "0",
status: null,
securityCategory: null,
securityStatus: null,
},

29
src/views/sluice/safetyManage/declarationManage/declare/components/dataCharts.vue

@ -1,5 +1,5 @@
<template>
<div class="content">
<div class="content" v-loading="loading">
<div ref="pieEle" style="width: 30%; height: 100%"></div>
<div ref="barEle" style="width: 70%; height: 100%"></div>
</div>
@ -11,7 +11,9 @@ export default {
data() {
return {
pieChartData: [],
selected: {},
barChartData: [],
loading: true,
};
},
created() {
@ -19,11 +21,19 @@ export default {
},
methods: {
async getData() {
this.loading = true;
const res1 = await getPie();
const res2 = await getHistogram();
this.pieChartData = [];
for (let key in res1[0]) {
this.pieChartData.push({ value: res1[0][key], name: key });
this.pieChartData.push({
value: res1[0][key],
name: key?.substring(0, 10),
});
}
for (let i = 0; i < this.pieChartData.length; i++) {
let name = this.pieChartData[i].name;
this.selected[name] = i < 7; //10 name
}
// for (let key in res1[0]) {
// this.barChartData.push({ value: res1[0][key], name: key });
@ -31,6 +41,7 @@ export default {
this.barChartData = res2;
this.pieInit();
this.barInit();
this.loading = false;
console.log("pieChartData", this.pieChartData);
console.log("barChartData", this.barChartData);
},
@ -51,6 +62,8 @@ export default {
orient: "horizontal",
bottom: "2%",
icon: "circle",
type: "scroll",
selected: this.selected,
},
series: [
{
@ -106,6 +119,18 @@ export default {
bottom: "12%",
containLabel: true,
},
dataZoom: [
{
type: "inside",
show: false,
xAxisIndex: [0],
start: 0,
end: 50,
// textStyle: {
// color: "#ccd7d7",
// },
},
],
xAxis: {
type: "category",
axisLine: {

6
src/views/sluice/safetyManage/declarationManage/declare/components/listPage/index.vue

@ -688,7 +688,9 @@ export default {
form: {},
//
rules: {
adcd: [{ required: true, message: "请选择行政区划", trigger: "blur" }],
adcd: [
{ required: true, message: "请选择行政区划", trigger: "change" },
],
wagaName: [
{ required: true, message: "水闸名称不能为空", trigger: "blur" },
],
@ -728,7 +730,7 @@ export default {
},
],
securityCategory: [
{ required: true, message: "请选择安全类别", trigger: "blur" },
{ required: true, message: "请选择安全类别", trigger: "change" },
],
},
//

29
src/views/sluice/safetyManage/declarationManage/examine/components/dataCharts.vue

@ -1,5 +1,5 @@
<template>
<div class="content">
<div class="content" v-loading="loading">
<div ref="pieEle" style="width: 30%; height: 100%"></div>
<div ref="barEle" style="width: 70%; height: 100%"></div>
</div>
@ -11,7 +11,9 @@ export default {
data() {
return {
pieChartData: [],
selected: {},
barChartData: [],
loading: true,
};
},
created() {
@ -19,11 +21,19 @@ export default {
},
methods: {
async getData() {
this.loading = true;
const res1 = await getPie();
const res2 = await getHistogram();
this.pieChartData = [];
for (let key in res1[0]) {
this.pieChartData.push({ value: res1[0][key], name: key });
this.pieChartData.push({
value: res1[0][key],
name: key?.substring(0, 10),
});
}
for (let i = 0; i < this.pieChartData.length; i++) {
let name = this.pieChartData[i].name;
this.selected[name] = i < 7; //10 name
}
// for (let key in res1[0]) {
// this.barChartData.push({ value: res1[0][key], name: key });
@ -31,6 +41,7 @@ export default {
this.barChartData = res2;
this.pieInit();
this.barInit();
this.loading = false;
console.log("pieChartData", this.pieChartData);
console.log("barChartData", this.barChartData);
},
@ -51,6 +62,8 @@ export default {
orient: "horizontal",
bottom: "2%",
icon: "circle",
type: "scroll",
selected: this.selected,
},
series: [
{
@ -106,6 +119,18 @@ export default {
bottom: "12%",
containLabel: true,
},
dataZoom: [
{
type: "inside",
show: false,
xAxisIndex: [0],
start: 0,
end: 50,
// textStyle: {
// color: "#ccd7d7",
// },
},
],
xAxis: {
type: "category",
axisLine: {

53
src/views/sluice/safetyManage/floodControlManagement/power.vue

@ -16,7 +16,24 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联水闸" prop="wagaCode">
<el-form-item label="关联水闸" prop="wagaName">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入水闸名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="关联水闸" prop="wagaCode">
<el-select
v-model="queryParams.data.wagaCode"
placeholder="请选择关联水闸"
@ -30,13 +47,14 @@
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="备用电源种类" prop="powerType" label-width="96px">
<el-select
v-model="queryParams.data.powerType"
placeholder="请选择备用电源种类"
clearable
size="small"
@change="handleQuery"
>
<el-option
v-for="dict in powerTypeOptions"
@ -113,14 +131,19 @@
align="center"
fixed
/>
<el-table-column
label="关联水闸"
align="center"
prop="wagaName"
min-width="120"
/>
<!-- <el-table-column
label="关联水闸"
align="center"
prop="wagaCode"
:formatter="wagaCodeFormat"
min-width="120"
/>
/> -->
<el-table-column
label="备用电源数量(字段未有)"
align="center"
@ -188,8 +211,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
@ -200,7 +223,7 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="备用电源种类" prop="powerType">
<el-select
@ -259,12 +282,14 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/jbxx";
import powerList from "./components/powerList.vue";
import powerRecords from "./components/powerRecords.vue";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Bydyzb",
components: {
powerList,
powerRecords,
linkSluice,
},
data() {
return {
@ -315,6 +340,11 @@ export default {
owerDept: null,
relation: null,
},
cv: {
type: "like",
name: "wagaName",
value: null,
},
//
params: {
//
@ -328,10 +358,10 @@ export default {
//
rules: {
wagaCode: [
{ required: true, message: "请选择关联水闸", trigger: "blur" },
{ required: true, message: "请选择关联水闸", trigger: "change" },
],
powerType: [
{ required: true, message: "请选择备用电源种类", trigger: "blur" },
{ required: true, message: "请选择备用电源种类", trigger: "change" },
],
},
prowerTypeId: "",
@ -415,6 +445,11 @@ export default {
remark: null,
relation: null,
},
cv: {
type: "like",
name: "wagaName",
value: null,
},
//
params: {
//

50
src/views/sluice/safetyManage/floodControlManagement/preplan.vue

@ -16,7 +16,24 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联水闸" prop="wagaCode">
<el-form-item label="关联水闸" prop="wagaName">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入水闸名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="关联水闸" prop="wagaCode">
<el-input
v-model="queryParams.data.wagaCode"
placeholder="请输入水闸id"
@ -32,7 +49,7 @@
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="预案类型" prop="type">
<el-select
@ -110,14 +127,19 @@
align="center"
fixed
/>
<el-table-column
label="关联水闸"
align="center"
prop="wagaName"
min-width="120"
/>
<!-- <el-table-column
label="关联水闸"
align="center"
prop="wagaCode"
:formatter="wageIdFormat"
min-width="120"
/>
/> -->
<!-- <el-table-column
label="水闸代码"
align="center"
@ -217,8 +239,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
@ -229,7 +251,7 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="负责人" prop="personName">
@ -312,9 +334,13 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Yaxx",
components: {
linkSluice,
},
data() {
return {
//
@ -372,6 +398,11 @@ export default {
owerDept: null,
relation: null,
},
cv: {
type: "like",
name: "wagaName",
value: null,
},
//
params: {
//
@ -475,6 +506,11 @@ export default {
remark: null,
relation: null,
},
cv: {
type: "like",
name: "wagaName",
value: null,
},
params: {
//
orderBy: "create_time",

48
src/views/sluice/safetyManage/floodControlManagement/supplies.vue

@ -34,7 +34,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-form-item label="关联水闸" prop="wagaCode">
<el-select
v-model="queryParams.data.wagaCode"
placeholder="请选择关联水闸"
@ -48,6 +48,23 @@
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="关联水闸" prop="wagaName">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入水闸名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<el-form-item label="物资名称" prop="materialName">
<el-input
@ -150,14 +167,19 @@
align="center"
fixed
/>
<el-table-column
label="关联水闸"
align="center"
prop="wagaName"
min-width="120"
/>
<!-- <el-table-column
label="关联水闸"
align="center"
prop="wagaCode"
:formatter="wageIdFormat"
min-width="120"
/>
/> -->
<el-table-column
label="物资名称"
align="center"
@ -258,8 +280,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
@ -270,7 +292,7 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="物资名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物资名称" />
@ -338,9 +360,13 @@ import {
exportFxwz,
} from "@/api/yg/fxwz";
import { listJbxx, getJbxx } from "@/api/yg/jbxx";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Fxwz",
components: {
linkSluice,
},
data() {
return {
//
@ -392,6 +418,11 @@ export default {
owerDept: null,
relation: null,
},
cv: {
type: "like",
name: "wagaName",
value: null,
},
//
params: {
//
@ -512,6 +543,11 @@ export default {
remark: null,
relation: null,
},
cv: {
type: "like",
name: "wagaName",
value: null,
},
params: {
//
orderBy: "create_time",

22
src/views/sluice/safetyManage/floodControlManagement/tissue.vue

@ -53,7 +53,7 @@
>
</el-cascader>
</el-form-item>
<el-form-item
<!-- <el-form-item
label="负责人职务"
prop="chargePersonDuites"
label-width="84px"
@ -65,7 +65,7 @@
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item>
<!-- <el-button
type="cyan"
@ -133,12 +133,18 @@
fixed
/>
<el-table-column
label="水闸名称"
align="center"
prop="wagaName"
min-width="120"
/>
<!-- <el-table-column
label="水闸名称"
align="center"
prop="wagaCode"
:formatter="wagaCodeFormat"
min-width="120"
/>
/> -->
<el-table-column
label="组织名称"
align="center"
@ -239,7 +245,8 @@
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<el-form-item label="水闸名称" prop="wagaCode">
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
@ -250,7 +257,7 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-col :span="12">
<el-form-item label="组织名称" prop="organizationName">
@ -369,11 +376,13 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/jbxx";
import { getAreasData } from "@/api/areas/index";
import msFxzzMember from "./components/msFxzzMember.vue";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Fxzz",
components: {
msFxzzMember,
linkSluice,
},
data() {
return {
@ -636,12 +645,13 @@ export default {
this.reset();
this.isEdit = true;
const id = row.id || this.ids;
const organizationId = row.id || this.ids[0];
getFxzz(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改防汛组织";
});
listFxzzcy({ data: { organizationId: id } }).then((res) => {
listFxzzcy({ data: { organizationId: organizationId } }).then((res) => {
console.log(6666, res);
this.counter = res.records;
});

33
src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue

@ -7,7 +7,7 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="水闸名称" prop="wageName">
<!-- <el-form-item label="水闸名称" prop="wageName">
<el-select
v-model="queryParams.data.wagaCode"
placeholder="请选择水闸名称"
@ -23,6 +23,23 @@
:value="dict.id"
></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="水闸名称" prop="wageName">
<el-input
v-model="queryParams.data.wageName"
placeholder="请输入水闸名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="水闸类型" prop="wageType">
<el-input
@ -224,7 +241,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="124px">
<el-form-item label="水闸名称" prop="wagaCode">
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
@ -235,7 +253,7 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="责任人部门类型" prop="type">
<el-select
@ -328,10 +346,13 @@ import {
exportFzr,
} from "@/api/yg/fzr";
import { listJbxx, getJbxx } from "@/api/yg/jbxx";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Fzr",
props: ["chartEleGetData"],
components: {
linkSluice,
},
data() {
return {
//
@ -393,10 +414,10 @@ export default {
//
rules: {
wagaCode: [
{ required: true, message: "请选择水闸名称", trigger: "blur" },
{ required: true, message: "请选择水闸名称", trigger: "change" },
],
type: [
{ required: true, message: "请选择责任人类型", trigger: "blur" },
{ required: true, message: "请选择责任人类型", trigger: "change" },
],
name: [
{ required: true, message: "请输入责任人姓名", trigger: "blur" },

22
src/views/sluice/safetyManage/safeProduction/components/list.vue

@ -212,8 +212,8 @@
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
<linkSluice :form="form" v-if="open" />
<!-- <el-select
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
@ -225,7 +225,7 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="提出人" prop="proposer" v-if="!isResolve">
<el-input v-model="form.proposer" placeholder="请输入提出人" />
@ -298,12 +298,8 @@
</el-form-item>
<el-form-item label="图片" prop="photo">
<!-- <el-input
v-model="form.photo"
type="textarea"
placeholder="请输入内容"
/> -->
<el-upload
<myUpload :fileList="fileList" />
<!-- <el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
@ -322,7 +318,7 @@
<div slot="tip" class="el-upload__tip">
支持jpg/png文件等不超过100M
</div>
</el-upload>
</el-upload> -->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -345,10 +341,14 @@ import {
import { listJbxx, getJbxx } from "@/api/yg/jbxx";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Yhxx",
props: ["chartEleGetData"],
components: {
linkSluice,
},
data() {
return {
//
@ -518,7 +518,7 @@ export default {
instrument: null,
dangerDetail: null,
photo: null,
status: "0",
status: null,
cost: null,
finishMethod: null,
result: null,

19
src/views/sluice/safetyManage/safetyAppraisal/task.vue

@ -237,13 +237,9 @@
<el-form-item label="任务名称" prop="taskName">
<el-input v-model="form.taskName" placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label="任务水闸Code" prop="wagaCodes">
<!-- <el-input
v-model="form.wagaCodes"
type="textarea"
placeholder="请输入内容"
/> -->
<el-select
<el-form-item label="任务水闸" prop="wagaCodes">
<linkSluice :form="form" :isMultiple="true" v-if="open" />
<!-- <el-select
v-model="form.wagaCodes"
placeholder="请选择水闸名称"
style="width: 100%"
@ -255,7 +251,7 @@
:label="dict.wagaName"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="计划完成时间" prop="planCompletionTime">
<el-date-picker
@ -344,9 +340,13 @@ import {
exportAqrw,
} from "@/api/yg/aqrw";
import { listJbxx } from "@/api/yg/jbxx";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
export default {
name: "Aqrw",
components: {
linkSluice,
},
data() {
return {
//
@ -412,6 +412,9 @@ export default {
taskName: [
{ required: true, message: "任务名称不能为空", trigger: "blur" },
],
wagaCodes: [
{ required: true, message: "请选择任务水闸", trigger: "change" },
],
},
};
},

Loading…
Cancel
Save