fix: 统一堤坝字段为dike，不再存在dyke

src/api/management/index.js

@@ -1,4 +1,4 @@
-export * from './dyke'
+export * from './dike'
 export * from './reservoir'
 export * from './sluice'
 export { getDicts } from '../system/dict/data'

src/api/system/upload.js

@@ -36,6 +36,7 @@ export function getPercent(data) {
     data: data
   })
 }
+
 //重置上传进度 前端调用进度之前调用此接口
 export function resetPercent(data) {
   return request({
@@ -110,6 +111,13 @@ export function downloadFileStreamFastDFS(query) {
   })
 }
 
-
+// 上传-路径未定义
+export function uploadApi(data){
+  return request({
+    url:'/',
+    method: 'post',
+    data
+  })
+}
 
 

src/api/yg/dykeInfo.js → src/api/yg/dikeInfo.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询堤防基本信息列表
 export function listDikeInfo(query) {
   return request({
-    url: '/yg/dykeInfo/list',
+    url: '/yg/dikeInfo/list',
     method: 'post',
     data: query
   })
@@ -12,7 +12,7 @@ export function listDikeInfo(query) {
 // 查询堤防基本信息详细
 export function getDikeInfo(id) {
   return request({
-    url: '/yg/dykeInfo/' + id,
+    url: '/yg/dikeInfo/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getDikeInfo(id) {
 // 新增堤防基本信息
 export function addDikeInfo(data) {
   return request({
-    url: '/yg/dykeInfo',
+    url: '/yg/dikeInfo',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addDikeInfo(data) {
 // 修改堤防基本信息
 export function updateDikeInfo(data) {
   return request({
-    url: '/yg/dykeInfo',
+    url: '/yg/dikeInfo',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateDikeInfo(data) {
 // 删除堤防基本信息
 export function delDikeInfo(id) {
   return request({
-    url: '/yg/dykeInfo/' + id,
+    url: '/yg/dikeInfo/' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delDikeInfo(id) {
 // 导出堤防基本信息
 export function exportDikeInfo(query) {
   return request({
-    url: '/yg/dykeInfo/export',
+    url: '/yg/dikeInfo/export',
     method: 'get',
     params: query
   })

src/api/yg/dykeMark.js → src/api/yg/dikeMark.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询堤防标识标牌列表
 export function listDikeMark(query) {
   return request({
-    url: '/df/dykeMark/list',
+    url: '/df/dikeMark/list',
     method: 'post',
     data: query
   })
@@ -12,7 +12,7 @@ export function listDikeMark(query) {
 // 查询堤防标识标牌详细
 export function getDikeMark(id) {
   return request({
-    url: '/df/dykeMark/' + id,
+    url: '/df/dikeMark/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getDikeMark(id) {
 // 新增堤防标识标牌
 export function addDikeMark(data) {
   return request({
-    url: '/df/dykeMark',
+    url: '/df/dikeMark',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addDikeMark(data) {
 // 修改堤防标识标牌
 export function updateDikeMark(data) {
   return request({
-    url: '/df/dykeMark',
+    url: '/df/dikeMark',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateDikeMark(data) {
 // 删除整个水闸标识标牌
 export function delDikeMarkAll(embankmentCode) {
   return request({
-    url: '/df/dykeMark/del/' + embankmentCode,
+    url: '/df/dikeMark/del/' + embankmentCode,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delDikeMarkAll(embankmentCode) {
 // 删除堤防标识标牌
 export function delDikeMark(id) {
   return request({
-    url: '/df/dykeMark/' + id,
+    url: '/df/dikeMark/' + id,
     method: 'delete'
   })
 }
@@ -54,7 +54,7 @@ export function delDikeMark(id) {
 // 导出堤防标识标牌
 export function exportDikeMark(query) {
   return request({
-    url: '/df/dykeMark/export',
+    url: '/df/dikeMark/export',
     method: 'get',
     params: query
   })

src/assets/styles/index.scss

@@ -143,6 +143,8 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 20px;
+  height: 100%;
+  overflow: auto;
   // background-color: #eef3ff;
   background-color: #f4f9f7;
   // min-height: calc(100vh - 56px);

src/layout/components/Navbar.vue

@@ -15,7 +15,7 @@
       <div class="tab-item" v-for="(item) in topTabList" :key="item.value" :class="selectTab == item.value ? 'select-item' : ''" @click="handleSelectTab(item.value)">{{ item.label }}</div>
       <!-- <div class="tab-item" :class="selectTab == 'reservoir' ? 'select-item' : ''" @click="handleSelectTab('reservoir')">水库运行管理</div>
       <div class="tab-item" :class="selectTab == 'sluice' ? 'select-item' : ''" @click="handleSelectTab('sluice')">水闸运行管理</div>
-      <div class="tab-item" :class="selectTab == 'dyke' ? 'select-item' : ''" @click="handleSelectTab('dyke')">堤防运行管理</div> -->
+      <div class="tab-item" :class="selectTab == 'dike' ? 'select-item' : ''" @click="handleSelectTab('dike')">堤防运行管理</div> -->
     </div>
     <div class="right-menu">
       <template v-if="device !== 'mobile'">

src/store/modules/permission.js

@@ -5,10 +5,10 @@ import Layout from '@/layout/index'
   /** 
    * selectTab = 'reservoir',  //水库运行管理
    * selectTab = 'sluice',  //水闸运行管理
-   * selectTab = 'dyke', // 堤防运行管理
+   * selectTab = 'dike', // 堤防运行管理
    */
 // 提取路由
-const pickRoutes = ['/reservoir','/dyke','/sluice']
+const pickRoutes = ['/reservoir','/dike','/sluice']
 
 const permission = {
   state: {
@@ -16,7 +16,7 @@ const permission = {
     routes: [],
     addRoutes: [],
     originRoutes: [],
-    selectTab: sessionStorage.getItem('topTab') || 'dyke',
+    selectTab: sessionStorage.getItem('topTab') || 'dike',
   },
   mutations: {
     SET_ROUTES: (state, {routes,originRoutes}) => {

src/views/dyke/engineeringCondition/dykeBaseInfo/index.vue → src/views/dike/engineeringCondition/dikeBaseInfo/index.vue

@@ -77,7 +77,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['yg:dykeInfo:add']"
+          v-hasPermi="['yg:dikeInfo:add']"
           >新增</el-button
         >
       </el-col>
@@ -88,7 +88,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['yg:dykeInfo:edit']"
+          v-hasPermi="['yg:dikeInfo:edit']"
           >修改</el-button
         >
       </el-col>
@@ -99,7 +99,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['yg:dykeInfo:remove']"
+          v-hasPermi="['yg:dikeInfo:remove']"
           >删除</el-button
         >
       </el-col>
@@ -111,7 +111,7 @@
 
     <el-table
       v-loading="loading"
-      :data="dykeInfoList"
+      :data="dikeInfoList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" fixed />
@@ -356,7 +356,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['yg:dykeInfo:edit']"
+            v-hasPermi="['yg:dikeInfo:edit']"
             >修改</el-button
           >
           <el-button
@@ -364,7 +364,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['yg:dykeInfo:remove']"
+            v-hasPermi="['yg:dikeInfo:remove']"
             >删除</el-button
           >
         </template>
@@ -788,7 +788,7 @@ import {
   addDikeInfo,
   updateDikeInfo,
   exportDikeInfo,
-} from "@/api/yg/dykeInfo";
+} from "@/api/yg/dikeInfo";
 import { getAreasData } from "@/api/areas/index";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
 
@@ -814,7 +814,7 @@ export default {
       // 总条数
       total: 0,
       // 堤防基本信息表格数据
-      dykeInfoList: [],
+      dikeInfoList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -867,7 +867,7 @@ export default {
       // 面包屑，路由信息
       routeList: [
         {
-          path: "/dyke/engineeringCondition/dykeBaseInfo",
+          path: "/dike/engineeringCondition/dikeBaseInfo",
           routeName: "堤防基本信息列表",
         },
       ],
@@ -964,7 +964,7 @@ export default {
     getList() {
       this.loading = true;
       listDikeInfo(this.queryParams).then((response) => {
-        this.dykeInfoList = response.records;
+        this.dikeInfoList = response.records;
         this.total = response.total;
         this.loading = false;
       });
@@ -1158,7 +1158,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       this.routeList.push({
-        path: "/dyke/engineeringCondition/dykeBaseInfo/options",
+        path: "/dike/engineeringCondition/dikeBaseInfo/options",
         routeName: "堤防基本信息",
         isEdit: true,
       });
@@ -1168,7 +1168,7 @@ export default {
       // 跳转到选项卡页面
       this.$router.push({
         path:
-          "/dyke/engineeringCondition/dykeBaseInfo/options?baseDataId=" + id,
+          "/dike/engineeringCondition/dikeBaseInfo/options?baseDataId=" + id,
       });
     },
     /** 提交按钮 */

src/views/dyke/engineeringCondition/dykeBaseInfo/options/basePage.vue → src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue

@@ -388,12 +388,12 @@ import {
   addDikeInfo,
   updateDikeInfo,
   exportDikeInfo,
-} from "@/api/yg/dykeInfo";
+} from "@/api/yg/dikeInfo";
 import { getAreasData } from "@/api/areas/index";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
 
 export default {
-  name: "dykeInfo",
+  name: "dikeInfo",
   data() {
     return {
       areasOptionProps: {

src/views/dyke/engineeringCondition/dykeBaseInfo/options/index.vue → src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue

@@ -67,7 +67,7 @@ export default {
     goCompare() {
       this.$router.push({
         path:
-          "/dyke/engineeringCondition/dykeCompare?embankmentCode=" +
+          "/dike/engineeringCondition/dikeCompare?embankmentCode=" +
           this.$refs.basePage.copyForm.embankmentCode,
       });
     },

src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue → src/views/dike/engineeringCondition/dikeCompare/components/basePage.vue

@@ -190,7 +190,7 @@
   </div>
 </template>
 <script>
-import { getDikeCompare } from "@/api/yg/dykeCompare";
+import { getDikeCompare } from "@/api/yg/dikeCompare";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
 
 export default {

src/views/dyke/engineeringCondition/dykeCompare/components/projectManagement.vue → src/views/dike/engineeringCondition/dikeCompare/components/projectManagement.vue

@@ -225,7 +225,7 @@
   </div>
 </template>
 <script>
-import { getDikeCompare } from "@/api/yg/dykeCompare";
+import { getDikeCompare } from "@/api/yg/dikeCompare";
 import { getFileStream } from "@/api/system/upload";
 export default {
   props: ["projectManagementData"],

src/views/dyke/engineeringCondition/dykeCompare/index.vue → src/views/dike/engineeringCondition/dikeCompare/index.vue

@@ -44,7 +44,7 @@
   </div>
 </template>
 <script>
-import { getDikeCompare } from "@/api/yg/dykeCompare";
+import { getDikeCompare } from "@/api/yg/dikeCompare";
 import comparePart from "./components/comparePart.vue";
 export default {
   components: {
@@ -58,7 +58,7 @@ export default {
       histroy: "",
       routeList: [
         {
-          path: "/dyke/engineeringCondition/dykeBaseInfo",
+          path: "/dike/engineeringCondition/dikeBaseInfo",
           routeName: "堤防基本信息版本对比",
         },
       ],

src/views/dyke/engineeringCondition/identificationPlate/index.vue → src/views/dike/engineeringCondition/identificationPlate/index.vue

@@ -92,7 +92,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
-            v-hasPermi="['yg:dykeMark:add']"
+            v-hasPermi="['yg:dikeMark:add']"
             >新增</el-button
           >
         </el-col>
@@ -103,7 +103,7 @@
             size="mini"
             :disabled="single"
             @click="handleUpdate"
-            v-hasPermi="['yg:dykeMark:edit']"
+            v-hasPermi="['yg:dikeMark:edit']"
             >修改</el-button
           >
         </el-col>
@@ -114,7 +114,7 @@
             size="mini"
             :disabled="multiple"
             @click="handleDelete"
-            v-hasPermi="['yg:dykeMark:remove']"
+            v-hasPermi="['yg:dikeMark:remove']"
             >删除</el-button
           >
         </el-col>
@@ -126,7 +126,7 @@
 
       <el-table
         v-loading="loading"
-        :data="dykeMarkList"
+        :data="dikeMarkList"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" fixed />
@@ -209,7 +209,7 @@
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['yg:dykeMark:edit']"
+              v-hasPermi="['yg:dikeMark:edit']"
               >修改</el-button
             >
             <el-button
@@ -217,7 +217,7 @@
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
-              v-hasPermi="['yg:dykeMark:remove']"
+              v-hasPermi="['yg:dikeMark:remove']"
               >删除</el-button
             >
           </template>
@@ -530,8 +530,8 @@ import {
   addDikeMark,
   updateDikeMark,
   exportDikeMark,
-} from "@/api/yg/dykeMark";
+} from "@/api/yg/dikeMark";
-import { listDikeInfo } from "@/api/yg/dykeInfo";
+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";
@@ -564,7 +564,7 @@ export default {
       // 总条数
       total: 0,
       // 水闸标识标牌表格数据
-      dykeMarkList: [],
+      dikeMarkList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -803,7 +803,7 @@ export default {
     getList() {
       this.loading = true;
       listDikeMark(this.queryParams).then((response) => {
-        this.dykeMarkList = response.records;
+        this.dikeMarkList = response.records;
         this.total = response.total;
         this.loading = false;
       });

src/views/dyke/runManage/enginerring/inspectionPlan/index.vue → src/views/dike/runManage/enginerring/inspectionPlan/index.vue

@@ -1,6 +1,11 @@
 <!-- 巡查计划管理-堤防 -->
 <script>
-import { getDicts, postDFInspectionPlanlist, postDFInspectionPlan, putDFInspectionPlan, postDFInspectionProjectList, getDFInspectionPlan, deleteDFInspectionPlan, listUser } from '@/api/management'
+import { getDicts, postDFInspectionPlanlist, 
+  postDFInspectionPlan, putDFInspectionPlan, 
+  postDFInspectionProjectList, getDFInspectionPlan, 
+  deleteDFInspectionPlan, listUser } from '@/api/management'
+
+import { uploadApi } from '@/api/system/upload'
 export default {
   name: 'InspectionItems',
   data() {
@@ -60,6 +65,7 @@ export default {
     }
   },
   methods: {
+    uploadApi,
     // 编辑巡查项目
     editTableItem(row) {
       getDFInspectionPlan(row.id).then((res) => {
@@ -225,6 +231,14 @@ export default {
         console.log('🚀res1🚀', res)
       })
     },
+    // 上传前
+    beforeAvatarUpload(e){
+      console.log('beforeAvatarUpload >>>>>  ', e)
+    },
+    // 文件上传后
+    handleChange(e){
+      console.log('handleChange >>>>>  ', e)
+    },
     // 重置搜索
     resetSearch() {
       this.searchInput = ''
@@ -347,9 +361,28 @@ export default {
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item v-if="ruleForm.type == 2" label-width="120px" label="检查依据" prop="checkList">
+          <el-upload
+            class="avatar-uploader"
+            action="#"
+            :http-request="uploadApi"
+            :auto-upload="true"
+            :before-upload="beforeAvatarUpload"
+            v-model:file-list="ruleForm.checkList"
+            accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt"
+            :on-change="handleChange"
+          >
+            <el-button type="primary">上传</el-button>
+            <template #tip>
+              <div class="el-upload__tip">
+                支持pdf,doc,docx,excel,ppt,jpg,png,txt等,500M以内
+              </div>
+            </template>
+          </el-upload>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" @click="dialogVisible = false">取消</el-button>
         <el-button size="mini" type="primary" @click="submitForm('ruleForm')">保存</el-button>
       </div>
     </el-dialog>

src/views/dyke/runManage/maintenance/maintenancePlan/index.vue → src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@@ -8,7 +8,7 @@ export default {
       searchInput: '',
       dialogVisible: false,
       prohibitEditing: false,
-      dykeLevel: [
+      dikeLevel: [
         {
           id: 1,
           label: '全部',
@@ -66,7 +66,7 @@ export default {
         total: 0 // 总数量
       },
       ruleForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -76,7 +76,7 @@ export default {
         content: '',
       },
       rules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -178,7 +178,7 @@ export default {
       console.log('触发关闭dialog', ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -240,7 +240,7 @@ export default {
         <el-input class="search-input" v-model="searchInput" placeholder="请输入维养计划名称" />
         <span>堤防级别：</span>
         <el-select v-model="searchLevel" placeholder="请选择">
-          <el-option v-for="item in dykeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
+          <el-option v-for="item in dikeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
         </el-select>
         <el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
         <el-button @click="resetSearch()">重置</el-button>
@@ -283,8 +283,8 @@ export default {
           style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
-        <el-form-item label-width="120px" label="堤防名称" prop="dykeCode">
+        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <el-select v-model="ruleForm.dykeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dykeCode"
+          <el-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dikeCode"
             :disabled="prohibitEditing">
             <el-option v-for="item in embankmentList" :label="item.label" :value="item.value" :key="item.id"></el-option>
           </el-select>

src/views/dyke/runManage/maintenance/maintenanceRecords/index.vue → src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@@ -11,7 +11,7 @@ export default {
       statusList: [], // 状态列表
       personnelList: [], // 用户列表
       planData: {
-        dykeCode: '',
+        dikeCode: '',
         planTime: '',
         nationalSupplement: '',
         selfSupplement: '',
@@ -362,7 +362,7 @@ export default {
         </el-form-item>
         <div style="display: flex;">
           <el-form-item label-width="130px" label="堤防名称">
-            <el-input v-model="planData.dykeCode" disabled />
+            <el-input v-model="planData.dikeCode" disabled />
           </el-form-item>
           <el-form-item label-width="130px" label="计划时间">
             <el-date-picker v-model="planData.planTime" type="month" disabled>

src/views/dyke/runManage/pestAnimalControl/governanceRecords/index.vue → src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue

@@ -74,7 +74,7 @@ export default {
         total: 0 // 总数量
       },
       planForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: 0,
         nationalSupplement: '',
@@ -95,7 +95,7 @@ export default {
         notes: ''
       },
       planRules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -234,7 +234,7 @@ export default {
       console.log('触发关闭dialog', planForm);
       this.$refs[planForm].resetFields();
       this.planForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -349,8 +349,8 @@ export default {
         <span style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="planForm" :rules="planRules" ref="planForm" label-width="100px">
-        <el-form-item label-width="120px" label="防治堤防" prop="dykeCode">
+        <el-form-item label-width="120px" label="防治堤防" prop="dikeCode">
-          <el-input style="width: 202px;" v-model="planForm.dykeCode" placeholder="请输入" disabled />
+          <el-input style="width: 202px;" v-model="planForm.dikeCode" placeholder="请输入" disabled />
           <el-button button class="search-btn" type="success" size="small">详情</el-button>
           <el-button button class="search-btn" type="success" size="small">打开地图</el-button>
         </el-form-item>

src/views/dyke/runManage/pestAnimalControl/planManagement/index.vue → src/views/dike/runManage/pestAnimalControl/planManagement/index.vue

@@ -14,7 +14,7 @@ export default {
       personnelList: [], // 人员列表
       patrolType: [], // 提醒周期类型
       workMonth: [], // 工作月份
-      dykeLevel: [], // 堤防级别列表
+      dikeLevel: [], // 堤防级别列表
       controlType: [], // 防治类型
       tableData: [], // 检查列表
       pageData: {
@@ -24,7 +24,7 @@ export default {
         total: 0 // 总数量
       },
       ruleForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         type: '',
         instruction: '',
@@ -42,7 +42,7 @@ export default {
         reminderTime: '',
       },
       rules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -204,7 +204,7 @@ export default {
       console.log('触发关闭dialog', ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         type: 0,
         instruction: '',
@@ -254,13 +254,17 @@ export default {
       this.searchInput = ''
       this.selectStatus = '2'
       this.getTableData()
-    }
+    },
+    // 打开地图
+    handleOpenMap(){},
+    // 打开详情
+    handleOpenDetail(){},
   },
   mounted() {
     // 获取列表数据
     // this.getTableData()
-    getDicts('dyke_level').then((res) => {
+    getDicts('dike_level').then((res) => {
-      this.dykeLevel = res.data
+      this.dikeLevel = res.data
     })
     getDicts('dh_jh_type').then((res) => {
       this.controlType = res.data
@@ -283,7 +287,7 @@ export default {
         <span>堤防级别：</span>
         <el-select v-model="selectLevel" placeholder="请选择">
           <el-option label="全部" value="0" />
-          <el-option v-for="item in dykeLevel" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
+          <el-option v-for="item in dikeLevel" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
         </el-select>
         <span style="margin-left: 10px;">防治类型：</span>
         <el-select v-model="selectType" placeholder="请选择">
@@ -298,7 +302,7 @@ export default {
       <el-table class="table" height="640" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100" />
         <el-table-column prop="name" align="center" label="防治计划名称" />
-        <el-table-column prop="dykeCode" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防名称" />
         <el-table-column prop="location" align="center" label="堤防级别" />
         <el-table-column prop="content" align="center" label="堤防类型" />
         <el-table-column prop="type" align="center" label="防治类型" />
@@ -321,16 +325,16 @@ export default {
         :total="pageData.total" @size-change="getTableData()">
       </el-pagination>
     </div>
-    <el-dialog title="新增/编辑防治计划" @close="" :visible.sync="dialogVisible" width="38%">
+    <el-dialog title="新增/编辑防治计划" @close="" :visible.sync="dialogVisible" width="720px">
       <div style="display: flex; margin-bottom: 16px;">
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div>
         <span style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
-        <el-form-item label-width="120px" label="堤防名称" prop="dykeCode">
+        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <el-input style="width: 202px;" v-model="ruleForm.dykeCode" placeholder="请输入" :disabled="prohibitEditing" />
+          <el-input style="width: 202px;" v-model="ruleForm.dikeCode" placeholder="请输入" :disabled="prohibitEditing" />
-          <el-button button class="search-btn" type="success" size="small">详情</el-button>
+          <el-button button class="search-btn" type="success" size="small" @click="handleOpenDetail">详情</el-button>
-          <el-button button class="search-btn" type="success" size="small">打开地图</el-button>
+          <el-button button class="search-btn" type="success" size="small" @click="handleOpenMap">打开地图</el-button>
         </el-form-item>
         <div style="display: flex;">
           <el-form-item label-width="120px" label="防治计划名称" prop="name">

src/views/runManage/engineering/inspectionPlan/Dike.vue

@@ -236,9 +236,9 @@ export default {
     this.getTableData()
     getDicts('xs_classfy').then((res) => {
       if (res.data && Array.isArray(res.data)) {
-        res.data.forEach(element => {
+        // res.data.forEach(element => {
-          element.dictValue = element.dictValue
+        //   element.dictValue = element.dictValue
-        });
+        // });
         this.examType = res.data
       }
     })

src/views/runManage/maintenance/maintenancePlan/Dike.vue

@@ -8,7 +8,7 @@ export default {
       searchInput: '',
       dialogVisible: false,
       prohibitEditing: false,
-      dykeLevel: [
+      dikeLevel: [
         {
           id: 1,
           label: '全部',
@@ -66,7 +66,7 @@ export default {
         total: 0 // 总数量
       },
       ruleForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -76,7 +76,7 @@ export default {
         content: '',
       },
       rules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -169,7 +169,7 @@ export default {
       console.log('触发关闭dialog', ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -231,7 +231,7 @@ export default {
         <el-input class="search-input" v-model="searchInput" placeholder="请输入维养计划名称" />
         <span>堤防级别：</span>
         <el-select v-model="searchLevel" placeholder="请选择">
-          <el-option v-for="item in dykeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
+          <el-option v-for="item in dikeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
         </el-select>
         <el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
         <el-button @click="resetSearch()">重置</el-button>
@@ -273,8 +273,8 @@ export default {
           style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
-        <el-form-item label-width="120px" label="堤防名称" prop="dykeCode">
+        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <el-select v-model="ruleForm.dykeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dykeCode"
+          <el-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dikeCode"
             :disabled="prohibitEditing">
             <el-option v-for="item in embankmentList" :label="item.label" :value="item.value" :key="item.id"></el-option>
           </el-select>

src/views/runManage/maintenance/maintenancePlan/Sluice.vue

@@ -8,7 +8,7 @@ export default {
       searchInput: '',
       dialogVisible: false,
       prohibitEditing: false,
-      dykeLevel: [
+      dikeLevel: [
         {
           id: 1,
           label: '全部',
@@ -66,7 +66,7 @@ export default {
         total: 0 // 总数量
       },
       ruleForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -77,7 +77,7 @@ export default {
         wagaCode: 'b'
       },
       rules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -164,7 +164,7 @@ export default {
       console.log('触发关闭dialog', ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -227,7 +227,7 @@ export default {
         <el-input class="search-input" v-model="searchInput" placeholder="请输入维养计划名称" />
         <span>堤防级别：</span>
         <el-select v-model="searchLevel" placeholder="请选择">
-          <el-option v-for="item in dykeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
+          <el-option v-for="item in dikeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
         </el-select>
         <el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
         <el-button @click="resetSearch()">重置</el-button>
@@ -269,8 +269,8 @@ export default {
           style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
-        <el-form-item label-width="120px" label="堤防名称" prop="dykeCode">
+        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <el-select v-model="ruleForm.dykeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dykeCode"
+          <el-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dikeCode"
             :disabled="prohibitEditing">
             <el-option v-for="item in embankmentList" :label="item.label" :value="item.value" :key="item.id"></el-option>
           </el-select>

src/views/runManage/maintenance/maintenanceRecords/Dike.vue

@@ -11,7 +11,7 @@ export default {
       statusList: [], // 状态列表
       personnelList: [], // 用户列表
       planData: {
-        dykeCode: '',
+        dikeCode: '',
         planTime: '',
         nationalSupplement: '',
         selfSupplement: '',
@@ -358,7 +358,7 @@ export default {
         </el-form-item>
         <div style="display: flex;">
           <el-form-item label-width="130px" label="堤防名称">
-            <el-input v-model="planData.dykeCode" disabled />
+            <el-input v-model="planData.dikeCode" disabled />
           </el-form-item>
           <el-form-item label-width="130px" label="计划时间">
             <el-date-picker v-model="planData.planTime" type="month" disabled>

src/views/runManage/maintenance/maintenanceRecords/Sluice.vue

@@ -11,7 +11,7 @@ export default {
       statusList: [], // 状态列表
       personnelList: [], // 用户列表
       planData: {
-        dykeCode: '',
+        dikeCode: '',
         planTime: '',
         nationalSupplement: '',
         selfSupplement: '',
@@ -358,7 +358,7 @@ export default {
         </el-form-item>
         <div style="display: flex;">
           <el-form-item label-width="130px" label="堤防名称">
-            <el-input v-model="planData.dykeCode" disabled />
+            <el-input v-model="planData.dikeCode" disabled />
           </el-form-item>
           <el-form-item label-width="130px" label="计划时间">
             <el-date-picker v-model="planData.planTime" type="month" disabled>

src/views/runManage/pestAnimalControl/governanceRecords/Dike.vue

@@ -74,7 +74,7 @@ export default {
         total: 0 // 总数量
       },
       planForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: 0,
         nationalSupplement: '',
@@ -95,7 +95,7 @@ export default {
         notes: ''
       },
       planRules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -234,7 +234,7 @@ export default {
       console.log('触发关闭dialog', planForm);
       this.$refs[planForm].resetFields();
       this.planForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -349,8 +349,8 @@ export default {
         <span style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="planForm" :rules="planRules" ref="planForm" label-width="100px">
-        <el-form-item label-width="120px" label="防治堤防" prop="dykeCode">
+        <el-form-item label-width="120px" label="防治堤防" prop="dikeCode">
-          <el-input style="width: 202px;" v-model="planForm.dykeCode" placeholder="请输入" disabled />
+          <el-input style="width: 202px;" v-model="planForm.dikeCode" placeholder="请输入" disabled />
           <el-button button class="search-btn" type="success" size="small">详情</el-button>
           <el-button button class="search-btn" type="success" size="small">打开地图</el-button>
         </el-form-item>

src/views/runManage/pestAnimalControl/planManagement/Dike.vue

@@ -14,7 +14,7 @@ export default {
       personnelList: [], // 人员列表
       patrolType: [], // 提醒周期类型
       workMonth: [], // 工作月份
-      dykeLevel: [], // 堤防级别列表
+      dikeLevel: [], // 堤防级别列表
       controlType: [], // 防治类型
       tableData: [], // 检查列表
       pageData: {
@@ -24,7 +24,7 @@ export default {
         total: 0 // 总数量
       },
       ruleForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         type: '',
         instruction: '',
@@ -42,7 +42,7 @@ export default {
         reminderTime: '',
       },
       rules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -204,7 +204,7 @@ export default {
       console.log('触发关闭dialog', ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         type: 0,
         instruction: '',
@@ -259,8 +259,8 @@ export default {
   mounted() {
     // 获取列表数据
     // this.getTableData()
-    getDicts('dyke_level').then((res) => {
+    getDicts('dike_level').then((res) => {
-      this.dykeLevel = res.data
+      this.dikeLevel = res.data
     })
     getDicts('dh_jh_type').then((res) => {
       this.controlType = res.data
@@ -283,7 +283,7 @@ export default {
         <span>堤防级别：</span>
         <el-select v-model="selectLevel" placeholder="请选择">
           <el-option label="全部" value="0" />
-          <el-option v-for="item in dykeLevel" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
+          <el-option v-for="item in dikeLevel" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
         </el-select>
         <span style="margin-left: 10px;">防治类型：</span>
         <el-select v-model="selectType" placeholder="请选择">
@@ -298,7 +298,7 @@ export default {
       <el-table class="table" height="640" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100" />
         <el-table-column prop="name" align="center" label="防治计划名称" />
-        <el-table-column prop="dykeCode" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防名称" />
         <el-table-column prop="location" align="center" label="堤防级别" />
         <el-table-column prop="content" align="center" label="堤防类型" />
         <el-table-column prop="type" align="center" label="防治类型" />
@@ -327,8 +327,8 @@ export default {
         <span style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
-        <el-form-item label-width="120px" label="堤防名称" prop="dykeCode">
+        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <el-input style="width: 202px;" v-model="ruleForm.dykeCode" placeholder="请输入" :disabled="prohibitEditing" />
+          <el-input style="width: 202px;" v-model="ruleForm.dikeCode" placeholder="请输入" :disabled="prohibitEditing" />
           <el-button button class="search-btn" type="success" size="small">详情</el-button>
           <el-button button class="search-btn" type="success" size="small">打开地图</el-button>
         </el-form-item>

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

@@ -1,6 +1,8 @@
 <!-- 巡查计划管理-水闸 -->
 <script>
 import { getDicts, postSZInspectionPlanlist, postSZInspectionPlan, putSZInspectionPlan, postSZInspectionProjectList, getSZInspectionPlan, deleteSZInspectionPlan, listUser } from '@/api/management'
+import { uploadApi } from '@/api/system/upload'
+
 export default {
   name: 'InspectionItems',
   data() {
@@ -60,6 +62,7 @@ export default {
     }
   },
   methods: {
+    uploadApi,
     // 编辑巡查项目
     editTableItem(row) {
       getSZInspectionPlan(row.id).then((res) => {
@@ -232,6 +235,15 @@ export default {
       this.searchInput = ''
       this.getTableData()
     },
+
+    // 上传前
+    beforeAvatarUpload(e){
+      console.log('beforeAvatarUpload >>>>>  ', e)
+    },
+    // 文件上传后
+    handleChange(e){
+      console.log('handleChange >>>>>  ', e)
+    },
   },
   mounted() {
     // 获取列表数据
@@ -350,6 +362,25 @@ export default {
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item v-if="ruleForm.type == 2" label-width="120px" label="检查依据" prop="checkList">
+          <el-upload
+            class="avatar-uploader"
+            action="#"
+            :http-request="uploadApi"
+            :auto-upload="true"
+            :before-upload="beforeAvatarUpload"
+            v-model:file-list="ruleForm.checkList"
+            accept=".PDF,.docx,.doc,.excel,.ppt,.jpg,.png,.txt"
+            :on-change="handleChange"
+          >
+            <el-button type="primary">上传</el-button>
+            <template #tip>
+              <div class="el-upload__tip">
+                支持pdf,doc,docx,excel,ppt,jpg,png,txt等,500M以内
+              </div>
+            </template>
+          </el-upload>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>

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

@@ -8,7 +8,7 @@ export default {
       searchInput: '',
       dialogVisible: false,
       prohibitEditing: false,
-      dykeLevel: [
+      dikeLevel: [
         {
           id: 1,
           label: '全部',
@@ -66,7 +66,7 @@ export default {
         total: 0 // 总数量
       },
       ruleForm: {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -77,7 +77,7 @@ export default {
         wagaCode: 'b'
       },
       rules: {
-        dykeCode: [
+        dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
         name: [
@@ -173,7 +173,7 @@ export default {
       console.log('触发关闭dialog', ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        dykeCode: '',
+        dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
@@ -236,7 +236,7 @@ export default {
         <el-input class="search-input" v-model="searchInput" placeholder="请输入维养计划名称" />
         <span>堤防级别：</span>
         <el-select v-model="searchLevel" placeholder="请选择">
-          <el-option v-for="item in dykeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
+          <el-option v-for="item in dikeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
         </el-select>
         <el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
         <el-button @click="resetSearch()">重置</el-button>
@@ -279,8 +279,8 @@ export default {
           style="font-weight: 600;">基础信息</span>
       </div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
-        <el-form-item label-width="120px" label="堤防名称" prop="dykeCode">
+        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <el-select v-model="ruleForm.dykeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dykeCode"
+          <el-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dikeCode"
             :disabled="prohibitEditing">
             <el-option v-for="item in embankmentList" :label="item.label" :value="item.value" :key="item.id"></el-option>
           </el-select>

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

@@ -11,7 +11,7 @@ export default {
       statusList: [], // 状态列表
       personnelList: [], // 用户列表
       planData: {
-        dykeCode: '',
+        dikeCode: '',
         planTime: '',
         nationalSupplement: '',
         selfSupplement: '',
@@ -362,7 +362,7 @@ export default {
         </el-form-item>
         <div style="display: flex;">
           <el-form-item label-width="130px" label="堤防名称">
-            <el-input v-model="planData.dykeCode" disabled />
+            <el-input v-model="planData.dikeCode" disabled />
           </el-form-item>
           <el-form-item label-width="130px" label="计划时间">
             <el-date-picker v-model="planData.planTime" type="month" disabled>

src/views/yg/dikeInfo/index.vue

@@ -335,7 +335,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['yg:dykeInfo:add']"
+          v-hasPermi="['yg:dikeInfo:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -345,7 +345,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['yg:dykeInfo:edit']"
+          v-hasPermi="['yg:dikeInfo:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -355,7 +355,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['yg:dykeInfo:remove']"
+          v-hasPermi="['yg:dikeInfo:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -364,13 +364,13 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['yg:dykeInfo:export']"
+          v-hasPermi="['yg:dikeInfo:export']"
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dykeInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dikeInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center"/>
 
@@ -434,14 +434,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['yg:dykeInfo:edit']"
+            v-hasPermi="['yg:dikeInfo:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['yg:dykeInfo:remove']"
+            v-hasPermi="['yg:dikeInfo:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -587,7 +587,7 @@
 </template>
 
 <script>
-import { listDikeInfo, getDikeInfo, delDikeInfo, addDikeInfo, updateDikeInfo, exportDikeInfo } from "@/api/yg/dykeInfo";
+import { listDikeInfo, getDikeInfo, delDikeInfo, addDikeInfo, updateDikeInfo, exportDikeInfo } from "@/api/yg/dikeInfo";
 
 export default {
   name: "DikeInfo",
@@ -606,7 +606,7 @@ export default {
       // 总条数
       total: 0,
       // 堤防基本信息表格数据
-      dykeInfoList: [],
+      dikeInfoList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -672,7 +672,7 @@ export default {
     getList() {
       this.loading = true;
       listDikeInfo(this.queryParams).then(response => {
-        this.dykeInfoList = response.records;
+        this.dikeInfoList = response.records;
         this.total = response.total;
         this.loading = false;
       });

src/views/yg/dikeMark/index.vue

@@ -123,7 +123,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['yg.df:dykeMark:add']"
+          v-hasPermi="['yg.df:dikeMark:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -133,7 +133,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['yg.df:dykeMark:edit']"
+          v-hasPermi="['yg.df:dikeMark:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -143,7 +143,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['yg.df:dykeMark:remove']"
+          v-hasPermi="['yg.df:dikeMark:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -152,13 +152,13 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['yg.df:dykeMark:export']"
+          v-hasPermi="['yg.df:dikeMark:export']"
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dykeMarkList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dikeMarkList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center"/>
 
@@ -183,14 +183,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['yg.df:dykeMark:edit']"
+            v-hasPermi="['yg.df:dikeMark:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['yg.df:dykeMark:remove']"
+            v-hasPermi="['yg.df:dikeMark:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -263,7 +263,7 @@
 </template>
 
 <script>
-import { listDikeMark, getDikeMark, delDikeMark, addDikeMark, updateDikeMark, exportDikeMark } from "@/api/yg/dykeMark";
+import { listDikeMark, getDikeMark, delDikeMark, addDikeMark, updateDikeMark, exportDikeMark } from "@/api/yg/dikeMark";
 
 export default {
   name: "DikeMark",
@@ -282,7 +282,7 @@ export default {
       // 总条数
       total: 0,
       // 堤防标识标牌表格数据
-      dykeMarkList: [],
+      dikeMarkList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -324,7 +324,7 @@ export default {
     getList() {
       this.loading = true;
       listDikeMark(this.queryParams).then(response => {
-        this.dykeMarkList = response.records;
+        this.dikeMarkList = response.records;
         this.total = response.total;
         this.loading = false;
       });