Browse Source

Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0

sy-water-data-board-ui
panyuyi 1 year ago
parent
commit
ccde6322ff
  1. 16
      src/api/aiSupervision/layerConfigApi.js
  2. 8
      src/api/dike/index.js
  3. 8
      src/api/sluice/index.js
  4. 2
      src/layout/components/Sidebar/Logo.vue
  5. 2
      src/settings.js
  6. 54
      src/views/aiSupervision/layerManage/resource/LayerDetails.vue
  7. 5
      src/views/dike/runManage/dangerWeakProject/inspectGroup/index.vue
  8. 1
      src/views/dike/runManage/dangerWeakProject/inspectReport/index.vue
  9. 5
      src/views/dike/runManage/dangerWeakProject/inspectTasks/index.vue
  10. 4
      src/views/dike/runManage/enginerring/components/Drawer.vue
  11. 11
      src/views/dike/runManage/enginerring/inspectionItems/index.vue
  12. 49
      src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
  13. 12
      src/views/dike/runManage/enginerring/inspectionPlan/index.vue
  14. 1
      src/views/dike/runManage/enginerring/inspectionRecords/index.vue
  15. 3
      src/views/dike/runManage/enginerring/patrolManage/index.vue
  16. 2
      src/views/dike/runManage/maintenance/maintenanceManage/index.vue
  17. 4
      src/views/dike/runManage/maintenance/maintenancePlan/index.vue
  18. 1
      src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
  19. 1
      src/views/dike/runManage/monitoring/dike/index.vue
  20. 3
      src/views/dike/runManage/monitoring/dike/manage/index.vue
  21. 2
      src/views/dike/runManage/pestAnimalControl/controlManage/index.vue
  22. 4
      src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
  23. 2
      src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
  24. 4
      src/views/dike/runManage/superVisionInspetion/tasksManage/index.vue
  25. 6
      src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
  26. 2
      src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue
  27. 5
      src/views/dike/runManage/supervisionInspetion/tasksManage/index.vue
  28. 2
      src/views/dike/runManage/waterRainReport/testReportManage/index.vue
  29. 2
      src/views/loginbg.vue
  30. 5
      src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue
  31. 1
      src/views/sluice/runManage/dangerWeakProject/inspectReport/index.vue
  32. 1
      src/views/sluice/runManage/dangerWeakProject/inspectTasks/index.vue
  33. 2
      src/views/sluice/runManage/dispatch/plan/index.vue
  34. 1
      src/views/sluice/runManage/dispatch/record/index.vue
  35. 2
      src/views/sluice/runManage/dispatch/utilize/index.vue
  36. 4
      src/views/sluice/runManage/enginerring/components/Drawer.vue
  37. 11
      src/views/sluice/runManage/enginerring/inspectionItems/index.vue
  38. 32
      src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
  39. 11
      src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
  40. 2
      src/views/sluice/runManage/enginerring/inspectionRecords/index.vue
  41. 4
      src/views/sluice/runManage/enginerring/patrolManage/index.vue
  42. 2
      src/views/sluice/runManage/maintenance/maintenanceManage/index.vue
  43. 4
      src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
  44. 1
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
  45. 1
      src/views/sluice/runManage/monitoring/sluice/index.vue
  46. 3
      src/views/sluice/runManage/monitoring/sluice/manage/index.vue
  47. 5
      src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue
  48. 2
      src/views/sluice/runManage/supervisionInspetion/projectManage/projectReportPage.vue
  49. 5
      src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue
  50. 2
      src/views/sluice/runManage/waterRainReport/testReportManage/index.vue
  51. 1
      src/views/system/role/index.vue
  52. 4
      vue.config.js

16
src/api/aiSupervision/layerConfigApi.js

@ -1,5 +1,5 @@
import request from '@/utils/request.js';
import { exportBzhjs } from './../yg/bzhjs';
import axios from 'axios';
export function addOrEditDirectoryApi(options) {
return request({
@ -146,3 +146,17 @@ export function deleteLayerApi(id) {
method: 'delete'
});
}
// 获取图层详情
export function queryServiceInfoApi(url) {
return new Promise(async (resolve, reject) => {
const result = await axios.get(`${url}.json`);
if (result.status === 200 && result.data) {
const layerId = result.data.layers.find((f) => f.parentLayerId === -1)?.subLayerIds?.[0];
const data = await axios.get(`${url}/${layerId}?f=json`);
if (data.status === 200 && data.data) {
resolve(data.data);
}
}
});
}

8
src/api/dike/index.js

@ -18,7 +18,13 @@ export function getInspectionProjectDetails(id) {
method: 'get',
})
}
//检查是否被引用
export function checkUsed(id) {
return request({
url: `/run/df/checking/check-use/${id}`,
method: 'get',
})
}
// 巡查项目管理-新增巡视检查
export function postInspectionProjectData(data) {
return request({

8
src/api/sluice/index.js

@ -18,6 +18,14 @@ export function getInspectionProjectDetails(id) {
method: 'get',
})
}
//检查是否被引用
export function checkUsed(id) {
return request({
url: `/run/sz/checking/check-use/${id}`,
method: 'get',
})
}
// 巡查项目管理-新增巡视检查
export function postInspectionProjectData(data) {
return request({

2
src/layout/components/Sidebar/Logo.vue

@ -35,7 +35,7 @@ export default {
},
data() {
return {
title: "广东省水工程运行管理系统",
title: "智慧水利水工程应用v24.3.0",
// title: '',
logo: logoImg,
};

2
src/settings.js

@ -1,6 +1,6 @@
module.exports = {
// title: '安全知识图谱管理平台',
title: '广东省水工程运行管理系统后台',
title: '智慧水利水工程应用v24.3.0',
/**
* 是否系统布局配置

54
src/views/aiSupervision/layerManage/resource/LayerDetails.vue

@ -91,7 +91,7 @@
<el-button type="primary" class="btn" @click="addRow">添加</el-button>
<el-button type="danger" class="btn" @click="deleteRow">删除</el-button>
</div>
<el-table :data="extendTable" border @selection-change="handleSelectionChange">
<el-table max-height="400px" :data="extendTable" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center"></el-table-column>
<el-table-column prop="field" label="字段名称">
<template slot-scope="scope">
@ -146,6 +146,23 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="字段配置" name="3">
<el-table max-height="400px" :data="fieldsTable" border>
<el-table-column type="index" width="50" align="center"></el-table-column>
<el-table-column prop="field" label="字段名称"> </el-table-column>
<el-table-column prop="fieldName" label="字段别名">
<template slot-scope="scope">
<el-input v-model="scope.row.fieldName"></el-input>
</template>
</el-table-column>
<el-table-column prop="fieldType" label="字段类型"> </el-table-column>
<el-table-column prop="isShow" label="是否支持查询" width="50">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isShow" :true-label="1" :false-label="0"></el-checkbox>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
@ -199,7 +216,8 @@ import {
saveOrUpdateLayerApi,
getLayerListApi,
deleteLayerApi,
getDirectoryByIdApi
getDirectoryByIdApi,
queryServiceInfoApi
} from '@/api/aiSupervision/layerConfigApi.js';
export default {
components: {
@ -255,7 +273,10 @@ export default {
styleDialogVisible: false, //
activeName: '1',
extendTable: [],
multipleSelection: []
multipleSelection: [],
activeFields: [],
fieldsTable: [],
queryServiceUrlMap: new Map()
};
},
watch: {
@ -266,6 +287,26 @@ export default {
if (val === false) {
this.initData();
}
},
'editDataInfoForm.serviceUrl'(val) {
if (val) {
if (!this.queryServiceUrlMap.has(val)) {
queryServiceInfoApi(val).then((res) => {
this.fieldsTable =
res?.fields?.map((item) => {
return {
field: item.name,
fieldName: item.alias,
fieldType: item.type,
isShow: this.activeFields.includes(item.name) ? 1 : 0
};
}) || [];
this.queryServiceUrlMap.set(val, this.fieldsTable);
});
} else {
this.fieldsTable = this.queryServiceUrlMap.get(val);
}
}
}
},
created() {
@ -292,6 +333,7 @@ export default {
this.editDataInfoForm.relationStyleId = row.relationStyleId;
this.editDataInfoForm.relationStyleName = row.relationStyleName;
this.extendTable = (row.extendData && JSON.parse(row.extendData)) || [];
this.activeFields = row?.fields.map((item) => item.field) || [];
this.dialogTitle = '编辑图层';
this.dialogFormVisible = true;
},
@ -349,11 +391,15 @@ export default {
}
const params = {
...this.editDataInfoForm,
extendData: JSON.stringify(this.extendTable)
extendData: JSON.stringify(this.extendTable),
fields: this.fieldsTable
};
this.queryServiceUrlMap.set(this.editDataInfoForm.serviceUrl, this.fieldsTable);
await saveOrUpdateLayerApi(params);
this.getLayerList();
this.dialogFormVisible = false;
this.fieldsTable = [];
this.extendTable = [];
},
handleLayerStyleTypeChange() {
this.styleDialogVisible = true;

5
src/views/dike/runManage/dangerWeakProject/inspectGroup/index.vue

@ -231,6 +231,7 @@ export default {
class="search-btn mb-10"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['df:run:jc:group:add']"
@click="handleAddNew()"
>创建</el-button
>
@ -247,10 +248,10 @@ export default {
<el-button type="text" size="small" @click="handleCheck(scope.row)"
>查看</el-button
>
<el-button type="text" size="small" @click="handleEdit(scope.row)"
<el-button v-hasPermi="['df:run:jc:group:edit']" type="text" size="small" @click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button type="text" size="small" @click="handleDel(scope.row)"
<el-button v-hasPermi="['df:run:jc:group:delete']" type="text" size="small" @click="handleDel(scope.row)"
>删除</el-button
>
</template>

1
src/views/dike/runManage/dangerWeakProject/inspectReport/index.vue

@ -298,6 +298,7 @@ export default {
type="text"
size="small"
@click="handleCheckReport(scope.row)"
v-hasPermi="['df:run:jc:report:view']"
>查看报告</el-button
>
</template>

5
src/views/dike/runManage/dangerWeakProject/inspectTasks/index.vue

@ -286,6 +286,7 @@ export default {
class="search-btn"
style="margin-left: auto"
type="success"
v-hasPermi="['df:run:jc:task:add']"
@click="handleGoDetails()"
>添加</el-button
>
@ -315,10 +316,10 @@ export default {
@click="handlePreview(scope.row)"
>查看</el-button
>
<el-button type="text" size="small" @click="handleEdit(scope.row)"
<el-button v-hasPermi="['df:run:jc:task:edit']" type="text" size="small" @click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button type="text" size="small" @click="handleDel(scope.row)"
<el-button v-hasPermi="['df:run:jc:task:delete']" type="text" size="small" @click="handleDel(scope.row)"
>删除</el-button
>
</template>

4
src/views/dike/runManage/enginerring/components/Drawer.vue

@ -44,9 +44,7 @@ export default {
matchXcTreeData(treeData, dataList) {
treeData.forEach((v) => {
if (!v.children?.length) {
for (let i = 0; i < dataList.length; i++) {
const item = dataList[i];
for (const item of dataList) {
if (intersection(v.parts, item.parts).length === v.parts.length) {
//
v.problem = item.problem || "-";

11
src/views/dike/runManage/enginerring/inspectionItems/index.vue

@ -1,6 +1,6 @@
<!-- 巡查项目管理-堤防 -->
<script>
import { getDicts, postDFInspectionProjectList } from "@/api/management";
import { getDicts, postDFInspectionProjectList,deleteDFInspectionProject } from "@/api/management";
export default {
name: "InspectionItems",
components: {},
@ -31,6 +31,12 @@ export default {
this.pageData.pageSize = pageSize;
this.getTableData();
},
deleteTableItem(row) {
deleteDFInspectionProject(row.id).then((res) => {
this.getTableData();
this.$message.success("删除成功");
});
},
//
searchTableList() {
postDFInspectionProjectList({
@ -152,6 +158,7 @@ export default {
class="search-btn"
style="float: right"
type="success"
v-hasPermi="['df:run:checking:item:add']"
@click="handleAddItem"
>添加</el-button
>
@ -188,6 +195,7 @@ export default {
<el-button
style="margin-right: 16px"
@click="editTableItem(scope.row)"
v-hasPermi="['df:run:checking:item:edit']"
type="text"
size="small"
>编辑</el-button
@ -205,6 +213,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['df:run:checking:item:delete']"
>删除</el-button
>
</el-popconfirm>

49
src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue

@ -5,13 +5,15 @@
<div class="top-box">
<span>巡视检查名称</span>
<el-input
:disabled="isEdit"
v-model="formData.name"
:maxlength="50"
size="small"
class="search-input"
placeholder="请输入巡视检查名称"
></el-input>
<span>巡检类型</span>
<el-select v-model="formData.type" placeholder="请选择">
<el-select :disabled="isEdit" v-model="formData.type" placeholder="请选择">
<el-option
v-for="item in xcTypeOptions"
:key="item.dictValue"
@ -89,7 +91,7 @@
class="flex flex-1 items-center p-4 r-b-border h-full"
>
<el-input
:disabled="!item3.check"
:disabled="!item3.check || isEdit"
v-model="item3.content"
type="textarea"
:rows="1"
@ -101,11 +103,12 @@
class="w-120 flex justify-center items-center p-4 r-b-border h-full"
>
<el-radio-group
:disabled="isEdit"
class="inspection-radio-group"
v-model="item3.check"
>
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
<el-radio :disabled="isEdit" :label="true"></el-radio>
<el-radio :disabled="isEdit" :label="false"></el-radio>
</el-radio-group>
</div>
</div>
@ -115,7 +118,7 @@
<div v-else class="flex flex-1 items-center">
<div class="flex-1 flex items-center p-4 r-b-border h-full">
<el-input
:disabled="!item2.check"
:disabled="!item2.check || isEdit"
v-model="item2.content"
type="textarea"
:rows="1"
@ -127,10 +130,11 @@
class="w-120 flex justify-center items-center p-4 r-b-border h-full"
>
<el-radio-group
:disabled="isEdit"
class="inspection-radio-group"
v-model="item2.check"
>
<el-radio :label="true"></el-radio>
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</div>
@ -141,7 +145,7 @@
<div v-else class="flex flex-1 items-center">
<div class="flex-1 flex items-center p-4 r-b-border h-full">
<el-input
:disabled="!item.check"
:disabled="!item.check || isEdit"
v-model="item.content"
type="textarea"
:rows="1"
@ -153,6 +157,7 @@
class="w-120 flex justify-center items-center p-4 r-b-border h-full"
>
<el-radio-group
:disabled="isEdit"
class="inspection-radio-group"
v-model="item.check"
>
@ -168,7 +173,7 @@
</div>
<div class="bottom-btns">
<el-button type="primary" @click="handleSave">保存</el-button>
<el-button :disabled="isEdit" type="primary" @click="handleSave">保存</el-button>
<el-button @click="$router.go(-1)">返回</el-button>
</div>
</div>
@ -177,6 +182,7 @@
import { intersection } from "lodash";
import {
putInspectionProjectData,
checkUsed,
postInspectionProjectData,
getCheckingDictTree,
getInspectionProjectDetails,
@ -187,6 +193,7 @@ export default {
return {
xcTreeData: [],
xcTypeOptions: [],
isEdit: false,
formData: {
id: null,
name: "",
@ -208,17 +215,19 @@ export default {
async getDetailsData() {
const dictData = await getCheckingDictTree("df_xs_c_classfy");
let _xcTreeData = this.transformArr(dictData?.data);
const detailData = await getInspectionProjectDetails(
this.$route.query.id
);
if (detailData?.data?.items) {
// xcTreeData
this.formData.name = detailData.data.name;
this.formData.type = detailData.data.type;
this.matchXcTreeData(_xcTreeData, detailData.data.items);
const checkId = this.$route.query.id;
if(checkId){
const detailData = await getInspectionProjectDetails(checkId);
if (detailData?.data?.items) {
// xcTreeData
this.formData.name = detailData.data.name;
this.formData.type = detailData.data.type;
this.matchXcTreeData(_xcTreeData, detailData.data.items);
}
const checkUsedData = await checkUsed(this.$route.query.id);
this.isEdit = checkUsedData?.data;
}
this.xcTreeData = _xcTreeData;
this.xcTreeData = _xcTreeData;
},
//
transformArr(treeList) {
@ -229,6 +238,7 @@ export default {
item.children.forEach((v) => {
if (!v.children || v.children.length === 0) {
v.parts = [...item.parts, v.key];
v.content = v.remark || "";
} else {
deepCalc(v, item.parts);
}
@ -245,8 +255,7 @@ export default {
matchXcTreeData(treeData, dataList) {
treeData.forEach((v) => {
if (!v.children?.length) {
for (let i = 0; i < dataList.length; i++) {
const item = dataList[i];
for (const item of dataList) {
v.id = item.id;
if (intersection(v.parts, item.parts).length === v.parts.length) {
//

12
src/views/dike/runManage/enginerring/inspectionPlan/index.vue

@ -60,6 +60,9 @@ export default {
cycleType: [
{ required: true, message: "请选择巡查周期", trigger: "change" },
],
frequency: [
{ required: true, message: "请输入巡查次数", trigger: "blur" },
],
isReminder: [
{ required: true, message: "请选择消息提醒", trigger: "change" },
],
@ -241,6 +244,7 @@ export default {
timeField: "create_time",
},
dikeCode: this.$route.query.dikeCode,
name: search,
},
cv: {
name: "name",
@ -337,6 +341,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['df:run:checking:plan:add']"
@click="dialogVisible = true"
>添加</el-button
>
@ -377,6 +382,7 @@ export default {
@click="editTableItem(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:checking:plan:edit']"
>编辑</el-button
>
<el-popconfirm
@ -392,10 +398,12 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['df:run:checking:plan:delete']"
>删除</el-button
>
</el-popconfirm>
<el-button @click="routeSetting(scope.row)" type="text" size="small"
v-hasPermi="['df:run:checking:plan:config']"
>路线设置</el-button
>
</template>
@ -452,7 +460,7 @@ export default {
v-if="ruleForm.type == 0"
label-width="120px"
label="巡查周期"
prop="cycleType"
prop="frequency"
>
<el-input
style="width: 202px"
@ -491,7 +499,7 @@ export default {
>
</el-switch>
</el-form-item>
<el-form-item label-width="120px" label="提醒时间" prop="reminderTime">
<el-form-item v-if="ruleForm.isReminder == true" label-width="120px" label="提醒时间" prop="reminderTime">
<el-radio-group
v-if="ruleForm.cycleType == 1 && ruleForm.type == 0"
v-model="ruleForm.otherConfig.week"

1
src/views/dike/runManage/enginerring/inspectionRecords/index.vue

@ -129,6 +129,7 @@ export default {
<el-table-column prop="address" align="center" label="操作">
<template slot-scope="scope">
<el-button @click="routeSetting(scope.row)" type="text" size="small"
v-hasPermi="['df:run:checking:records:trace:view']"
>巡查轨迹</el-button
>
</template>

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

@ -54,15 +54,18 @@
@click="handleSet(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:checking:plan:config']"
>巡查配置</el-button
>
<el-button @click="handleGoPlan(scope.row)" type="text" size="small"
v-hasPermi="['df:run:checking:plan:view']"
>计划管理</el-button
>
<el-button
@click="handleGoRecord(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:checking:plan:record:view']"
>巡查记录</el-button
>
</template>

2
src/views/dike/runManage/maintenance/maintenanceManage/index.vue

@ -58,12 +58,14 @@
@click="handleGoPlan(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:main:plan:view']"
>维养计划管理</el-button
>
<el-button
@click="handleGoRecord(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:main:record:view']"
>维修养护记录</el-button
>
</template>

4
src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@ -308,6 +308,7 @@ export default {
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
@click="addPlan"
v-hasPermi="['df:run:main:plan:add']"
>添加</el-button
>
</div>
@ -352,12 +353,14 @@ export default {
@click="viewOrEditPlanDetails(scope.row, true)"
type="text"
size="small"
v-hasPermi="['df:run:main:plan:edit']"
>编辑</el-button
>
<el-button
style="margin-right: 9px"
type="text"
size="small"
v-hasPermi="['df:run:main:record:view']"
@click="goMaintenanceRecords(scope.row)"
>记录</el-button
>
@ -374,6 +377,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['df:run:main:plan:delete']"
>删除</el-button
>
</el-popconfirm>

1
src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@ -387,6 +387,7 @@ export default {
style="margin-right: 16px; margin-bottom: 8px"
type="success"
@click="dialogVisible = true"
v-hasPermi="['df:run:main:record:add']"
>添加</el-button
>
</div>

1
src/views/dike/runManage/monitoring/dike/index.vue

@ -236,6 +236,7 @@ export default {
@click="handleGoManage(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:dtjc:view']"
>动态监测管理</el-button
>
</template>

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

@ -232,6 +232,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['df:run:dtjc:add']"
@click="handleAdd()"
>新增
</el-button
@ -279,6 +280,7 @@ export default {
@click="handleEdit(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:dtjc:edit']"
>
编辑
</el-button>
@ -295,6 +297,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['df:run:dtjc:delete']"
>删除
</el-button
>

2
src/views/dike/runManage/pestAnimalControl/controlManage/index.vue

@ -51,12 +51,14 @@
@click="handleGoPlan(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:fz:plan:view']"
>防治计划</el-button
>
<el-button
@click="handleGoRecord(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:fz:record:view']"
>防治记录</el-button
>
</template>

4
src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue

@ -418,6 +418,7 @@ export default {
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
@click="handleOpenDialog"
v-hasPermi="['df:run:fz:record:add']"
>添加</el-button
>
</div>
@ -466,6 +467,7 @@ export default {
@click="viewOrEditPlanDetails(scope.row, true)"
type="text"
size="small"
v-hasPermi="['df:run:fz:record:edit']"
>编辑</el-button
>
<el-button
@ -473,6 +475,7 @@ export default {
type="text"
size="small"
@click="handleConfirm(scope.row)"
v-hasPermi="['df:run:fz:record:confirm']"
>确认</el-button
>
<el-popconfirm
@ -488,6 +491,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['df:run:fz:record:delete']"
>删除</el-button
>
</el-popconfirm>

2
src/views/dike/runManage/pestAnimalControl/planManagement/index.vue

@ -435,6 +435,7 @@ export default {
@click="viewOrEditPlanDetails(scope.row, true)"
type="text"
size="small"
v-hasPermi="['df:run:fz:plan:edit']"
>编辑</el-button
>
<!-- <el-popconfirm
@ -631,6 +632,7 @@ export default {
type="text"
size="small"
@click="addWorkItem"
v-hasPermi="['df:run:fz:plan:add']"
>添加</el-button
>
<el-popconfirm

4
src/views/dike/runManage/superVisionInspetion/tasksManage/index.vue

@ -153,10 +153,10 @@ export default {
/>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleEdit(scope.row)"
<el-button v-hasPermi="['sz:run:jc:task:edit']" type="text" size="small" @click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button type="text" size="small" @click="handleDel(scope.row)"
<el-button v-hasPermi="['df:run:jc:task:delete']" type="text" size="small" @click="handleDel(scope.row)"
>删除</el-button
>
</template>

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

@ -136,6 +136,7 @@ export default {
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
@click="handleAddMethod()"
v-hasPermi="['df:run:sup:meth:add']"
>添加</el-button
>
<el-table class="table" height="640" :data="tableData" border>
@ -168,11 +169,13 @@ export default {
type="text"
size="small"
@click="handleEditMethod(scope.row)"
v-hasPermi="['df:run:sup:meth:edit']"
>编辑</el-button
>
<el-button
type="text"
size="small"
v-hasPermi="['df:run:sup:meth:view']"
@click="handlePreviewMethod(scope.row)"
>预览</el-button
>
@ -180,18 +183,21 @@ export default {
type="text"
size="small"
@click="handleExportMethod(scope.row)"
v-hasPermi="['df:run:sup:meth:down']"
>导出</el-button
>
<el-button
type="text"
size="small"
@click="handleCopyMethod(scope.row)"
v-hasPermi="['df:run:sup:meth:edit']"
>复制</el-button
>
<el-button
type="text"
size="small"
@click="handleToItemsList(scope.row)"
v-hasPermi="['df:run:sup:meth:config']"
>配置数据项</el-button
>
</template>

2
src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue

@ -1,7 +1,7 @@
<template>
<div class="report-page">
<div class="sticky-top flex justify-between">
<el-button type="primary" @click="handleDownPdf">下载报告</el-button>
<el-button v-hasPermi="['df:run:sup:project:down']" type="primary" @click="handleDownPdf">下载报告</el-button>
<el-button @click="$router.go(-1)">返回</el-button>
</div>
<div class="flex justify-center mt-16">

5
src/views/dike/runManage/supervisionInspetion/tasksManage/index.vue

@ -137,6 +137,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['df:run:sup:task:add']"
@click="handleGoDetails()"
>添加</el-button
>
@ -153,10 +154,10 @@ export default {
/>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleEdit(scope.row)"
<el-button v-hasPermi="['df:run:sup:task:edit']" type="text" size="small" @click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button type="text" size="small" @click="handleDel(scope.row)"
<el-button v-hasPermi="['df:run:sup:task:delete']" type="text" size="small" @click="handleDel(scope.row)"
>删除</el-button
>
</template>

2
src/views/dike/runManage/waterRainReport/testReportManage/index.vue

@ -75,12 +75,14 @@
@click="handleGoReport(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:yq:record:view']"
>水雨情监测</el-button
>
<el-button
@click="handleGoAnalyse(scope.row)"
type="text"
size="small"
v-hasPermi="['df:run:yq:analyse:view']"
>智能分析</el-button
>
</template>

2
src/views/loginbg.vue

@ -3,7 +3,7 @@
<div class="logo-text" style="text-align: center">
<!-- <img src="@/assets/image/bg/title.png" style="width: 579px" alt="" /> -->
<img src="@/assets/logo/logo-shuili.jpg" alt="" />
<span>广东省水工程运行管理系统</span>
<span>智慧水利水工程应用v24.3.0</span>
</div>
<div class="wrapper">

5
src/views/sluice/runManage/dangerWeakProject/inspectGroup/index.vue

@ -231,6 +231,7 @@ export default {
class="search-btn mb-10"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['sz:run:jc:group:add']"
@click="handleAddNew()"
>创建</el-button
>
@ -247,10 +248,10 @@ export default {
<el-button type="text" size="small" @click="handleCheck(scope.row)"
>查看</el-button
>
<el-button type="text" size="small" @click="handleEdit(scope.row)"
<el-button v-hasPermi="['sz:run:jc:group:edit']" type="text" size="small" @click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button type="text" size="small" @click="handleDel(scope.row)"
<el-button v-hasPermi="['sz:run:jc:group:delete']" type="text" size="small" @click="handleDel(scope.row)"
>删除</el-button
>
</template>

1
src/views/sluice/runManage/dangerWeakProject/inspectReport/index.vue

@ -297,6 +297,7 @@ export default {
type="text"
size="small"
@click="handleCheckReport(scope.row)"
v-hasPermi="['sz:run:jc:report:view']"
>查看报告</el-button
>
</template>

1
src/views/sluice/runManage/dangerWeakProject/inspectTasks/index.vue

@ -292,6 +292,7 @@ export default {
class="search-btn"
style="margin-left: auto"
type="success"
v-hasPermi="['sz:run:jc:task:add']"
@click="handleGoDetails()"
>添加</el-button
>

2
src/views/sluice/runManage/dispatch/plan/index.vue

@ -159,6 +159,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['sz:run:du:plan:add']"
@click="handleAdd()"
>新增
</el-button
@ -201,6 +202,7 @@ export default {
@click="handleEdit(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:du:plan:edit']"
>编辑
</el-button
>

1
src/views/sluice/runManage/dispatch/record/index.vue

@ -156,6 +156,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['sz:run:du:record:add']"
@click="handleAdd()"
>新增
</el-button

2
src/views/sluice/runManage/dispatch/utilize/index.vue

@ -126,6 +126,7 @@ export default {
@click="handleGoPlan(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:du:plan:view']"
>计划管理</el-button
>
<el-button
@ -133,6 +134,7 @@ export default {
@click="handleGoRecord(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:du:record:view']"
>巡查记录</el-button
>
</template>

4
src/views/sluice/runManage/enginerring/components/Drawer.vue

@ -44,9 +44,7 @@ export default {
matchXcTreeData(treeData, dataList) {
treeData.forEach((v) => {
if (!v.children?.length) {
for (let i = 0; i < dataList.length; i++) {
const item = dataList[i];
for (const item of dataList) {
if (intersection(v.parts, item.parts).length === v.parts.length) {
//
v.problem = item.problem || "-";

11
src/views/sluice/runManage/enginerring/inspectionItems/index.vue

@ -1,6 +1,6 @@
<!-- 巡查项目管理-水闸 -->
<script>
import { getDicts, postSZInspectionProjectList } from "@/api/management";
import { getDicts, postSZInspectionProjectList,deleteSZInspectionProject } from "@/api/management";
export default {
name: "InspectionItems",
data() {
@ -69,6 +69,12 @@ export default {
},
});
},
deleteTableItem(row) {
deleteSZInspectionProject(row.id).then((res) => {
this.getTableData();
this.$message.success("删除成功");
});
},
//
editTableItem(row) {
this.$router.push({
@ -148,6 +154,7 @@ export default {
class="search-btn"
style="float: right"
type="success"
v-hasPermi="['sz:run:checking:item:add']"
@click="handleAddItem"
>添加</el-button
>
@ -186,6 +193,7 @@ export default {
@click="editTableItem(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:checking:item:edit']"
>编辑</el-button
>
<el-popconfirm
@ -201,6 +209,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['sz:run:checking:item:delete']"
>删除</el-button
>
</el-popconfirm>

32
src/views/sluice/runManage/enginerring/inspectionItems/inspectionItemDetails.vue

@ -5,13 +5,15 @@
<div class="top-box">
<span>巡视检查名称</span>
<el-input
:disabled="isEdit"
v-model="formData.name"
:maxlength="50"
size="small"
class="search-input"
placeholder="请输入巡视检查名称"
></el-input>
<span>巡检类型</span>
<el-select v-model="formData.type" placeholder="请选择">
<el-select :disabled="isEdit" v-model="formData.type" placeholder="请选择">
<el-option
v-for="item in xcTypeOptions"
:key="item.dictValue"
@ -89,7 +91,7 @@
class="flex flex-1 items-center p-4 r-b-border h-full"
>
<el-input
:disabled="!item3.check"
:disabled="!item3.check || isEdit"
v-model="item3.content"
type="textarea"
:rows="1"
@ -101,6 +103,7 @@
class="w-120 flex justify-center items-center p-4 r-b-border h-full"
>
<el-radio-group
:disabled="isEdit"
class="inspection-radio-group"
v-model="item3.check"
>
@ -115,7 +118,7 @@
<div v-else class="flex flex-1 items-center">
<div class="flex-1 flex items-center p-4 r-b-border h-full">
<el-input
:disabled="!item2.check"
:disabled="!item2.check || isEdit"
v-model="item2.content"
type="textarea"
:rows="1"
@ -127,6 +130,7 @@
class="w-120 flex justify-center items-center p-4 r-b-border h-full"
>
<el-radio-group
:disabled="isEdit"
class="inspection-radio-group"
v-model="item2.check"
>
@ -141,7 +145,7 @@
<div v-else class="flex flex-1 items-center">
<div class="flex-1 flex items-center p-4 r-b-border h-full">
<el-input
:disabled="!item.check"
:disabled="!item.check || isEdit"
v-model="item.content"
type="textarea"
:rows="1"
@ -153,6 +157,7 @@
class="w-120 flex justify-center items-center p-4 r-b-border h-full"
>
<el-radio-group
:disabled="isEdit"
class="inspection-radio-group"
v-model="item.check"
>
@ -168,7 +173,7 @@
</div>
<div class="bottom-btns">
<el-button type="primary" @click="handleSave">保存</el-button>
<el-button :disabled="isEdit" type="primary" @click="handleSave">保存</el-button>
<el-button @click="$router.go(-1)">返回</el-button>
</div>
</div>
@ -177,6 +182,7 @@
import { intersection } from "lodash";
import {
putInspectionProjectData,
checkUsed,
postInspectionProjectData,
getCheckingDictTree,
getInspectionProjectDetails,
@ -187,6 +193,7 @@ export default {
return {
xcTreeData: [],
xcTypeOptions: [],
isEdit: false,
formData: {
id: null,
name: "",
@ -209,16 +216,18 @@ export default {
const dictData = await getCheckingDictTree("sz_xs_c_classfy");
let _xcTreeData = this.transformArr(dictData?.data);
if (this.$route.query.id) {
const detailData = await getInspectionProjectDetails(
this.$route.query.id
);
const checkId = this.$route.query.id;
if (checkId) {
const detailData = await getInspectionProjectDetails(checkId);
if (detailData?.data?.items) {
// xcTreeData
this.formData.name = detailData.data.name;
this.formData.type = detailData.data.type;
this.matchXcTreeData(_xcTreeData, detailData.data.items);
}
const checkUsedData = await checkUsed(checkId);
this.isEdit = checkUsedData?.data;
}
this.xcTreeData = _xcTreeData;
},
@ -231,6 +240,7 @@ export default {
item.children.forEach((v) => {
if (!v.children || v.children.length === 0) {
v.parts = [...item.parts, v.key];
v.content = v.remark || "";
} else {
deepCalc(v, item.parts);
}
@ -240,6 +250,7 @@ export default {
treeList.forEach((item) => {
deepCalc(item);
console.log(item);
});
return treeList;
},
@ -247,8 +258,7 @@ export default {
matchXcTreeData(treeData, dataList) {
treeData.forEach((v) => {
if (!v.children?.length) {
for (let i = 0; i < dataList.length; i++) {
const item = dataList[i];
for (const item of dataList) {
v.id = item.id;
if (intersection(v.parts, item.parts).length === v.parts.length) {
//

11
src/views/sluice/runManage/enginerring/inspectionPlan/index.vue

@ -60,6 +60,9 @@ export default {
cycleType: [
{ required: true, message: "请选择巡查周期", trigger: "change" },
],
frequency: [
{ required: true, message: "请输入巡查次数", trigger: "blur" },
],
isReminder: [
{ required: true, message: "请选择消息提醒", trigger: "change" },
],
@ -244,6 +247,7 @@ export default {
timeField: "create_time",
},
wagaCode: this.$route.query.wagaCode,
name: search,
},
cv: {
name: "name",
@ -357,6 +361,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['sz:run:checking:plan:add']"
@click="dialogVisible = true"
>添加</el-button
>
@ -394,6 +399,7 @@ export default {
@click="editTableItem(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:checking:plan:edit']"
>编辑</el-button
>
<el-popconfirm
@ -409,6 +415,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['sz:run:checking:plan:delete']"
>删除</el-button
>
</el-popconfirm>
@ -469,7 +476,7 @@ export default {
v-if="ruleForm.type == 0"
label-width="120px"
label="巡查周期"
prop="cycleType"
prop="frequency"
>
<el-input
style="width: 202px"
@ -508,7 +515,7 @@ export default {
>
</el-switch>
</el-form-item>
<el-form-item label-width="120px" label="提醒时间" prop="reminderTime">
<el-form-item v-if="ruleForm.isReminder" label-width="120px" label="提醒时间" prop="reminderTime">
<el-radio-group
v-if="ruleForm.cycleType == 1 && ruleForm.type == 0"
v-model="ruleForm.otherConfig.week"

2
src/views/sluice/runManage/enginerring/inspectionRecords/index.vue

@ -120,7 +120,7 @@ export default {
</el-table-column>
<el-table-column prop="address" align="center" label="操作">
<template slot-scope="scope">
<el-button @click="routeSetting(scope.row)" type="text" size="small"
<el-button v-hasPermi="['sz:run:checking:records:trace:view']" @click="routeSetting(scope.row)" type="text" size="small"
>巡查轨迹</el-button
>
</template>

4
src/views/sluice/runManage/enginerring/patrolManage/index.vue

@ -54,12 +54,14 @@
@click="handleSet(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:checking:plan:config']"
>巡查配置</el-button
>
<el-button @click="handleGoPlan(scope.row)" type="text" size="small"
<el-button v-hasPermi="['sz:run:checking:plan:view']" @click="handleGoPlan(scope.row)" type="text" size="small"
>计划管理</el-button
>
<el-button
v-hasPermi="['sz:run:checking:plan:record:view']"
@click="handleGoRecord(scope.row)"
type="text"
size="small"

2
src/views/sluice/runManage/maintenance/maintenanceManage/index.vue

@ -58,9 +58,11 @@
@click="handleGoPlan(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:main:plan:view']"
>维养计划管理</el-button
>
<el-button
v-hasPermi="['sz:run:main:record:view']"
@click="handleGoRecord(scope.row)"
type="text"
size="small"

4
src/views/sluice/runManage/maintenance/maintenancePlan/index.vue

@ -256,6 +256,7 @@ export default {
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
@click="addPlan"
v-hasPermi="['sz:run:main:plan:add']"
>添加</el-button
>
</div>
@ -300,12 +301,14 @@ export default {
@click="viewOrEditPlanDetails(scope.row, true)"
type="text"
size="small"
v-hasPermi="['sz:run:main:plan:edit']"
>编辑</el-button
>
<el-button
style="margin-right: 9px"
type="text"
size="small"
v-hasPermi="['sz:run:main:record:view']"
@click="goMaintenanceRecords(scope.row)"
>记录</el-button
>
@ -322,6 +325,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['sz:run:main:plan:delete']"
>删除</el-button
>
</el-popconfirm>

1
src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@ -375,6 +375,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px"
type="success"
v-hasPermi="['sz:run:main:record:add']"
@click="dialogVisible = true"
>添加</el-button
>

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

@ -197,6 +197,7 @@ export default {
@click="handleGoManage(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:dtjc:view']"
>动态监测管理</el-button
>
</template>

3
src/views/sluice/runManage/monitoring/sluice/manage/index.vue

@ -226,6 +226,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['sz:run:dtjc:add']"
@click="handleAdd()"
>新增
</el-button
@ -273,6 +274,7 @@ export default {
@click="handleEdit(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:dtjc:edit']"
>
编辑
</el-button>
@ -289,6 +291,7 @@ export default {
type="text"
size="small"
slot="reference"
v-hasPermi="['sz:run:dtjc:delete']"
>删除
</el-button
>

5
src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue

@ -167,18 +167,21 @@ export default {
<el-button
type="text"
size="small"
v-hasPermi="['sz:run:sup:meth:edit']"
@click="handleEditMethod(scope.row)"
>编辑</el-button
>
<el-button
type="text"
size="small"
v-hasPermi="['sz:run:sup:meth:view']"
@click="handlePreviewMethod(scope.row)"
>预览</el-button
>
<el-button
type="text"
size="small"
v-hasPermi="['sz:run:sup:meth:down']"
@click="handleExportMethod(scope.row)"
>导出</el-button
>
@ -186,11 +189,13 @@ export default {
type="text"
size="small"
@click="handleCopyMethod(scope.row)"
v-hasPermi="['sz:run:sup:meth:edit']"
>复制</el-button
>
<el-button
type="text"
size="small"
v-hasPermi="['sz:run:sup:meth:config']"
@click="handleToItemsList(scope.row)"
>配置数据项</el-button
>

2
src/views/sluice/runManage/supervisionInspetion/projectManage/projectReportPage.vue

@ -1,7 +1,7 @@
<template>
<div class="report-page">
<div class="sticky-top flex justify-between">
<el-button type="primary" @click="handleDownPdf">下载报告</el-button>
<el-button v-hasPermi="['sz:run:sup:project:down']" type="primary" @click="handleDownPdf">下载报告</el-button>
<el-button @click="$router.go(-1)">返回</el-button>
</div>
<div class="flex justify-center mt-16">

5
src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue

@ -137,6 +137,7 @@ export default {
class="search-btn"
style="margin-right: 16px; margin-bottom: 8px; float: right"
type="success"
v-hasPermi="['sz:run:sup:task:add']"
@click="handleGoDetails()"
>添加</el-button
>
@ -153,10 +154,10 @@ export default {
/>
<el-table-column prop="operate" align="center" label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleEdit(scope.row)"
<el-button v-hasPermi="['sz:run:sup:task:edit']" type="text" size="small" @click="handleEdit(scope.row)"
>编辑</el-button
>
<el-button type="text" size="small" @click="handleDel(scope.row)"
<el-button v-hasPermi="['sz:run:sup:task:delete']" type="text" size="small" @click="handleDel(scope.row)"
>删除</el-button
>
</template>

2
src/views/sluice/runManage/waterRainReport/testReportManage/index.vue

@ -56,12 +56,14 @@
@click="handleGoReport(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:yq:record:view']"
>水雨情监测</el-button
>
<el-button
@click="handleGoAnalyse(scope.row)"
type="text"
size="small"
v-hasPermi="['sz:run:yq:analyse:view']"
>智能分析</el-button
>
</template>

1
src/views/system/role/index.vue

@ -180,6 +180,7 @@
show-checkbox
ref="menu"
node-key="id"
:check-strictly="true"
empty-text="加载中,请稍后"
:props="defaultProps"
></el-tree>

4
vue.config.js

@ -7,7 +7,7 @@ function resolve(dir) {
return path.join(__dirname, dir);
}
const name = defaultSettings.title || '广东省水工程运行管理系统'; // 标题
const name = defaultSettings.title || '智慧水利水工程应用v24.3.0'; // 标题
const port = process.env.port || process.env.npm_config_port || 80; // 端口
@ -61,7 +61,7 @@ module.exports = {
// },
[process.env.VUE_APP_BASE_API]: {
target: 'http://shuili-admin.product.dev.com:30115',
// target: 'http://172.16.34.59:18083',
// target: 'http://172.16.34.59:18082',
// target: "http://172.16.34.27:18082",
// target: "http://127.0.0.1:18082",
changeOrigin: true,

Loading…
Cancel
Save