fix: 接口名称修改

1 year ago · b45c8bf8b7
7 changed files with 99 additions and 102 deletions
--- a/src/api/management/dike.js
+++ b/src/api/management/dike.js
@ -10,7 +10,7 @@ export function getPersonnelInformation(id) {
 }

 // 巡查项目管理-巡视检查列表
-export function postEmbankmentInspectionChecklist(data) {
+export function postDFInspectionProjectList(data) {
  return request({
    url: '/run/df/checking/list',
    method: 'post',
@ -19,7 +19,7 @@ export function postEmbankmentInspectionChecklist(data) {
 }

 // 巡查项目管理-巡视检查详情
-export function getEmbankmentInspectionCheck(id) {
+export function getDFInspectionProject(id) {
  return request({
    url: `/run/df/checking/${id}`,
    method: 'get',
@ -27,7 +27,7 @@ export function getEmbankmentInspectionCheck(id) {
 }

 // 巡查项目管理-新增巡视检查
-export function postEmbankmentInspection(data) {
+export function postDFInspectionProject(data) {
  return request({
    url: '/run/df/checking',
    method: 'post',
@ -36,7 +36,7 @@ export function postEmbankmentInspection(data) {
 }

 // 巡查项目管理-修改巡视检查
-export function putEmbankmentInspection(data) {
+export function putDFInspectionProject(data) {
  return request({
    url: '/run/df/checking',
    method: 'put',
@ -44,16 +44,16 @@ export function putEmbankmentInspection(data) {
  })
 }

-// 巡查项目管理-堤防巡视检查
-export function deleteEmbankmentInspection(id) {
+// 巡查项目管理-删除巡视检查
+export function deleteDFInspectionProject(id) {
  return request({
    url: `/run/df/checking/${id}`,
-    method: 'delete',
+    method: 'delete'
  })
 }

-// 巡查计划管理-查询巡视检查列表
-export function postInspectionPlanlist(data) {
+// 巡查计划管理-巡查计划列表
+export function postDFInspectionPlanlist(data) {
  return request({
    url: '/run/df/plan/list',
    method: 'post',
@ -61,16 +61,16 @@ export function postInspectionPlanlist(data) {
  })
 }

-// 巡查计划管理-巡视检查详情
-export function getInspectionPlan(id) {
+// 巡查计划管理-巡查计划详情
+export function getDFInspectionPlan(id) {
  return request({
    url: `/run/df/plan/${id}`,
    method: 'get',
  })
 }

-// 巡查计划管理-新增巡视检查
-export function postInspectionPlan(data) {
+// 巡查计划管理-新增巡查计划
+export function postDFInspectionPlan(data) {
  return request({
    url: '/run/df/plan',
    method: 'post',
@ -78,7 +78,7 @@ export function postInspectionPlan(data) {
  })
 }

-// 巡查计划管理-堤防巡视检查
+// 巡查计划管理-更新巡查计划
 export function putInspectionPlan(data) {
  return request({
    url: '/run/df/plan',
@ -87,8 +87,8 @@ export function putInspectionPlan(data) {
  })
 }

-// 巡查计划管理-堤防巡视检查
-export function deleteInspectionPlan(id) {
+// 巡查计划管理-删除巡查计划
+export function deleteDFInspectionPlan(id) {
  return request({
    url: `/run/df/plan/${id}`,
    method: 'delete',
@ -96,7 +96,7 @@ export function deleteInspectionPlan(id) {
 }

 // 巡查计划管理-巡查点位设置
-export function postInspectionRoute(id, data) {
+export function postDFInspectionRoute(id, data) {
  return request({
    url: `/run/df/plan/points/${id}`,
    method: 'post',
@ -105,7 +105,7 @@ export function postInspectionRoute(id, data) {
 }

 // 巡查计划管理-获取巡查点位
-export function getInspectionRoute(id) {
+export function getDFInspectionRoute(id) {
  return request({
    url: `/run/df/plan/points/${id}`,
    method: 'get',
@ -113,7 +113,7 @@ export function getInspectionRoute(id) {
 }

 // 巡查记录-巡查记录列表
-export function postInspectionRecordsList(data) {
+export function postDFInspectionRecordsList(data) {
  return request({
    url: '/run/df/record/list',
    method: 'post',
@ -122,7 +122,7 @@ export function postInspectionRecordsList(data) {
 }

 // 巡查记录-新增巡查记录
-export function postNewInspectionRecords(data) {
+export function postDFInspectionRecords(data) {
  return request({
    url: '/run/df/record',
    method: 'post',
@ -131,7 +131,7 @@ export function postNewInspectionRecords(data) {
 }

 // 巡查记录-巡查记录轨迹列表
-export function postInspectionRecordsTrajectoryList(data) {
+export function postDFInspectionRecordsTrajectoryList(data) {
  return request({
    url: '/run/df/trace/list',
    method: 'post',
@ -140,7 +140,7 @@ export function postInspectionRecordsTrajectoryList(data) {
 }

 // 维修计划管理-维修计划列表
-export function postMaintenancePlanList(data) {
+export function postDFMaintenancePlanList(data) {
  return request({
    url: '/run/df/yh/plan/list',
    method: 'post',
@ -148,8 +148,16 @@ export function postMaintenancePlanList(data) {
  })
 }

+// 维修计划管理-维修计划详情
+export function getDFMaintenancePlan(id) {
+  return request({
+    url: `/run/df/yh/plan/${id}`,
+    method: 'get'
+  })
+}
+
 // 维修计划管理-新增维修计划
-export function postNewMaintenancePlan(data) {
+export function postDFMaintenancePlan(data) {
  return request({
    url: '/run/df/yh/plan',
    method: 'post',
@ -158,7 +166,7 @@ export function postNewMaintenancePlan(data) {
 }

 // 维修计划管理-更新维修计划
-export function putUpdateMaintenancePlan(data) {
+export function putDFMaintenancePlan(data) {
  return request({
    url: '/run/df/yh/plan',
    method: 'put',
@ -167,24 +175,15 @@ export function putUpdateMaintenancePlan(data) {
 }

 // 维修计划管理-删除维修计划
-export function deleteMaintenancePlan(id) {
+export function deleteDFMaintenancePlan(id) {
  return request({
    url: `/run/df/yh/plan/${id}`,
    method: 'delete'
  })
 }

-// 维修计划管理-维修计划详情
-export function getMaintenancePlan(id) {
-  return request({
-    url: `/run/df/yh/plan/${id}`,
-    method: 'get'
-  })
-
-}
-
 // 维修记录-维修记录列表
-export function postMaintenanceRecordsList(data) {
+export function postDFMaintenanceRecordsList(data) {
  return request({
    url: '/run/df/yh/record/list',
    method: 'post',
@ -192,8 +191,16 @@ export function postMaintenanceRecordsList(data) {
  })
 }

+// 维修记录-维修记录详情
+export function getDFMaintenanceRecords(id) {
+  return request({
+    url: `/run/df/yh/record/${id}`,
+    method: 'get'
+  })
+}
+
 // 维修记录-新增维修记录
-export function postNewMaintenanceRecords(data) {
+export function postDFMaintenanceRecords(data) {
  return request({
    url: '/run/df/yh/record',
    method: 'post',
@ -202,7 +209,7 @@ export function postNewMaintenanceRecords(data) {
 }

 // 维修记录-更新维修记录
-export function putUpdateMaintenanceRecords(data) {
+export function putDFMaintenanceRecords(data) {
  return request({
    url: '/run/df/yh/record',
    method: 'put',
@ -211,17 +218,9 @@ export function putUpdateMaintenanceRecords(data) {
 }

 // 维修记录-删除维修记录
-export function deleteMaintenanceRecords(id) {
+export function deleteDFMaintenanceRecords(id) {
  return request({
    url: `/run/df/yh/record/${id}`,
    method: 'delete'
  })
-}
-
-// 维修记录-维修记录详情
-export function getMaintenanceRecords(id) {
-  return request({
-    url: `/run/df/yh/record/${id}`,
-    method: 'get'
-  })
-}
+}
--- a/src/views/runManage/engineering/inspectionItems/Dike.vue
+++ b/src/views/runManage/engineering/inspectionItems/Dike.vue
@ -1,6 +1,6 @@
 <!-- 巡查项目管理-堤防 -->
 <script>
-import { getDicts, postEmbankmentInspectionChecklist, postEmbankmentInspection, putEmbankmentInspection, deleteEmbankmentInspection, getEmbankmentInspectionCheck } from '@/api/management'
+import { getDicts, postDFInspectionProjectList, postDFInspectionProject, putDFInspectionProject, deleteDFInspectionProject, getDFInspectionProject } from '@/api/management'
 export default {
  name: 'InspectionItems',
  data() {
@ -43,7 +43,7 @@ export default {
  methods: {
    // 表格筛选
    searchTableList() {
-      postEmbankmentInspectionChecklist({
+      postDFInspectionProjectList({
        data: {
          timeView: {
            timeField: "create_time"
@ -67,7 +67,7 @@ export default {
    },
    // 编辑巡查项目
    editTableItem(row) {
-      getEmbankmentInspectionCheck(row.id).then((res) => {
+      getDFInspectionProject(row.id).then((res) => {
        console.log('🚀res🚀', res.data)
        this.ruleForm = res.data
        this.ruleForm.checkContentType = res.data.items[0].parts[0]
@ -86,8 +86,7 @@ export default {
    },
    // 删除对应巡查项目
    deleteTableItem(row) {
-      deleteEmbankmentInspection(row.id).then((res) => {
-        console.log('🚀res🚀', res)
+      deleteDFInspectionProject(row.id).then((res) => {
        this.getTableData()
      })
    },
@ -154,7 +153,7 @@ export default {
        if (valid) {
          console.log(this.ruleForm);
          if (this.ruleForm.id) {
-            putEmbankmentInspection(this.ruleForm).then(() => {
+            putDFInspectionProject(this.ruleForm).then(() => {
              this.getTableData()
              this.dialogVisible = false
              this.$message.success('更新成功');
@ -162,7 +161,7 @@ export default {
              this.$message.error(err);
            })
          } else {
-            postEmbankmentInspection(this.ruleForm).then(() => {
+            postDFInspectionProject(this.ruleForm).then(() => {
              this.getTableData()
              this.dialogVisible = false
              this.$message.success('添加成功');
@ -176,18 +175,21 @@ export default {
        }
      });
    },
+    // 重置校验
    resetForm(formName) {
      this.$refs[formName].resetFields();
      this.dialogVisible = false
    },
-    // 添加巡查项目
-    addInspectionItems() {
-
+    // 关闭dialog
+    closeDialog(ruleForm = 'ruleForm') {
+      console.log('触发关闭dialog', ruleForm);
+      this.$refs[ruleForm].resetFields();
    },
+    // 获取列表数据
    getTableData() {
      this.searchInput = '',
        this.searchType = 3,
-        postEmbankmentInspectionChecklist({
+        postDFInspectionProjectList({
          data: {
            timeView: {
              timeField: "create_time"
@ -217,6 +219,7 @@ export default {
        res.data.forEach(element => {
          element.dictValue = Number(element.dictValue)
        });
+        console.log('🚀res.data🚀', res.data)
        this.examType = res.data
      }
    })
@ -255,7 +258,8 @@ export default {
        </el-table-column>
        <el-table-column align="center" label="巡查类型">
          <template slot-scope="scope">
-            <span v-if="examType.length > 0">{{ examType.find(item => item.dictValue == scope.row.type).dictLabel ||
+            <span v-if="examType.length > 0 && scope.row.type !== null">{{ examType.find(item => item.dictValue ==
+              scope.row.type).dictLabel ||
              ''
            }}</span>
          </template>
@ -280,7 +284,7 @@ export default {
        :total="pageData.total" @size-change="getTableData()">
      </el-pagination>
    </div>
-    <el-dialog title="新增/编辑巡查项目" destroy-on-close :visible.sync="dialogVisible" width="50%">
+    <el-dialog title="新增/编辑巡查项目" @close="closeDialog" :visible.sync="dialogVisible" width="50%">
      <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>
@ -341,7 +345,7 @@ export default {
        </el-table-column>
      </el-table>
      <div slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="resetForm('ruleForm')">取 消</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>
--- a/src/views/runManage/engineering/inspectionPlan/Dike.vue
+++ b/src/views/runManage/engineering/inspectionPlan/Dike.vue
@ -1,6 +1,6 @@
 <!-- 巡查计划管理-堤防 -->
 <script>
-import { getDicts, postInspectionPlanlist, postInspectionPlan, putInspectionPlan, postEmbankmentInspectionChecklist, getInspectionPlan, deleteInspectionPlan, listUser } from '@/api/management'
+import { getDicts, postDFInspectionPlanlist, postDFInspectionPlan, putInspectionPlan, postDFInspectionProjectList, getDFInspectionPlan, deleteDFInspectionPlan, listUser } from '@/api/management'
 export default {
  name: 'InspectionItems',
  data() {
@ -55,8 +55,7 @@ export default {
  methods: {
    // 编辑巡查项目
    editTableItem(row) {
-      getInspectionPlan(row.id).then((res) => {
-        console.log('🚀res🚀', res)
+      getDFInspectionPlan(row.id).then((res) => {
        // 遍历用户数据让select组件渲染选项
        if (res.data.otherConfig.selectUser) {
          this.personnelList = []
@ -90,15 +89,12 @@ export default {
    },
    // 删除对应巡查项目
    deleteTableItem(row) {
-      console.log('🚀row🚀', row.id)
-      deleteInspectionPlan(row.id).then((res) => {
-        console.log('🚀res🚀', res)
+      deleteDFInspectionPlan(row.id).then((res) => {
        this.getTableData()
      })
    },
    // 路线设置
    routeSetting(row) {
-      console.log('🚀row🚀', row)
      this.$router.push({
        path: '/patrolRouteSettings',
        query: { id: row.id, name: row.name, editor: true }
@ -134,11 +130,9 @@ export default {
            }
            user.push(a)
          });
-          console.log('🚀user🚀', user)
          this.ruleForm.operators = user
          if (this.ruleForm.id) {
            putInspectionPlan(this.ruleForm).then((res) => {
-              console.log('🚀res🚀', res)
              this.getTableData()
              this.dialogVisible = false
              this.$message.success('更新成功');
@ -146,8 +140,7 @@ export default {
              this.$message.error(err);
            })
          } else {
-            postInspectionPlan(this.ruleForm).then((res) => {
-              console.log('🚀res🚀', res)
+            postDFInspectionPlan(this.ruleForm).then((res) => {
              this.getTableData()
              this.dialogVisible = false
              this.$message.success('添加成功');
@ -161,14 +154,10 @@ export default {
        }
      });
    },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-      this.dialogVisible = false
-    },
    // 更改巡查类型
    changePatrolType(ruleForm) {
      this.$set(ruleForm, 'xcId', '')
-      postEmbankmentInspectionChecklist({
+      postDFInspectionProjectList({
        data: {
          timeView: {
            timeField: "create_time"
@ -202,12 +191,17 @@ export default {
        pageNum: 1
      }).then((res) => {
        this.personnelList = res.records
-        console.log('🚀用户数据🚀', res)
-        console.log('🚀用户数据🚀', this.ruleForm.operators)
      })
    },
+    // 关闭dialog
+    closeDialog(ruleForm = 'ruleForm') {
+      console.log('触发关闭dialog', ruleForm);
+      this.$refs[ruleForm].resetFields();
+      this.patrolTableData = []
+    },
+    // 获取数据
    getTableData(search) {
-      postInspectionPlanlist({
+      postDFInspectionPlanlist({
        data: {
          timeView: {
            timeField: "create_time"
@ -291,7 +285,7 @@ export default {
        :total="pageData.total" @size-change="getTableData()">
      </el-pagination>
    </div>
-    <el-dialog title="新增/编辑巡查计划" destroy-on-close :visible.sync="dialogVisible" width="50%">
+    <el-dialog title="新增/编辑巡查计划" @close="closeDialog" :visible.sync="dialogVisible" width="50%">
      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
        <el-form-item label-width="120px" label="计划名称" prop="name">
          <el-input style="width: 202px;" v-model="ruleForm.name"></el-input>
@ -343,7 +337,7 @@ export default {
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="resetForm('ruleForm')">取 消</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>
--- a/src/views/runManage/engineering/inspectionRecords/Dike.vue
+++ b/src/views/runManage/engineering/inspectionRecords/Dike.vue
@ -1,6 +1,6 @@
 <!-- 巡查记录-堤防 -->
 <script>
-import { postInspectionRecordsList, } from '@/api/management'
+import { postDFInspectionRecordsList, } from '@/api/management'
 export default {
  name: 'InspectionItems',
  data() {
@ -25,7 +25,7 @@ export default {
      })
    },
    getTableData(search) {
-      postInspectionRecordsList({
+      postDFInspectionRecordsList({
        data: {
          timeView: {
            timeField: "create_time"
--- a/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue
+++ b/src/views/runManage/engineering/patrolRouteSettings/components/GaoDeMap.vue
@ -11,7 +11,7 @@
 </template>
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
-import { postInspectionRoute, getInspectionRoute, postInspectionRecordsTrajectoryList } from '@/api/management'
+import { postDFInspectionRoute, getDFInspectionRoute, postDFInspectionRecordsTrajectoryList } from '@/api/management'
 import Drawer from './Drawer.vue'
 export default {
  name: "map-view",
@ -114,7 +114,7 @@ export default {
        }
        data.push(a)
      });
-      postInspectionRoute(this.$route.query.id, data).then((res) => {
+      postDFInspectionRoute(this.$route.query.id, data).then((res) => {
        this.$message({
          message: '保存成功',
          type: 'success'
@ -147,13 +147,13 @@ export default {
            console.log('🚀地图加载完毕🚀')
            if (this.$route.query.editor) {
              // 添加点位
-              getInspectionRoute(this.$route.query.id).then((res) => {
+              getDFInspectionRoute(this.$route.query.id).then((res) => {
                res.data.forEach((element, index) => {
                  this.addCheckpoint("检查点" + (index + 1), [element.longitude, element.latitude])
                });
              })
            } else {
-              postInspectionRecordsTrajectoryList({
+              postDFInspectionRecordsTrajectoryList({
                data: {
                  timeView: {
                    timeField: "create_time"
--- a/src/views/runManage/maintenance/maintenancePlan/Dike.vue
+++ b/src/views/runManage/maintenance/maintenancePlan/Dike.vue
@ -1,6 +1,6 @@
 <!-- 维修计划管理-堤防 -->
 <script>
-import { putUpdateMaintenancePlan, deleteMaintenancePlan, postNewMaintenancePlan, postMaintenancePlanList, getMaintenancePlan } from '@/api/management'
+import { putDFMaintenancePlan, deleteDFMaintenancePlan, postDFMaintenancePlan, postDFMaintenancePlanList, getDFMaintenancePlan } from '@/api/management'
 export default {
  name: 'InspectionItems',
  data() {
@ -111,7 +111,7 @@ export default {
  methods: {
    // 删除对应维修计划
    deleteTableItem(row) {
-      deleteMaintenancePlan(row.id).then((res) => {
+      deleteDFMaintenancePlan(row.id).then((res) => {
        console.log('🚀res🚀', res)
        this.getTableData()
      })
@ -121,7 +121,7 @@ export default {
      if (!edit) {
        this.prohibitEditing = true
      }
-      getMaintenancePlan(row.id).then((res) => {
+      getDFMaintenancePlan(row.id).then((res) => {
        console.log('🚀res🚀', res)
        this.ruleForm = res.data
        this.ruleForm.budget = res.data.nationalSupplement + res.data.selfSupplement
@ -147,12 +147,12 @@ export default {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          if (this.ruleForm.id) {
-            putUpdateMaintenancePlan(this.ruleForm).then(() => {
+            putDFMaintenancePlan(this.ruleForm).then(() => {
              this.getTableData()
              this.dialogVisible = false
            })
          } else {
-            postNewMaintenancePlan(this.ruleForm).then(() => {
+            postDFMaintenancePlan(this.ruleForm).then(() => {
              this.getTableData()
              this.dialogVisible = false
            })
@ -174,7 +174,7 @@ export default {
    },
    // 获取数据
    getTableData(value = '') {
-      postMaintenancePlanList({
+      postDFMaintenancePlanList({
        data: {
          timeView: {
            timeField: "create_time"
--- a/src/views/runManage/maintenance/maintenanceRecords/Dike.vue
+++ b/src/views/runManage/maintenance/maintenanceRecords/Dike.vue
@ -1,6 +1,6 @@
 <!-- 维修记录-堤防 -->
 <script>
-import { putUpdateMaintenanceRecords, deleteMaintenanceRecords, postNewMaintenanceRecords, postMaintenanceRecordsList, getMaintenanceRecords, getDicts, postMaintenancePlanList, getMaintenancePlan, listUser } from '@/api/management'
+import { putDFMaintenanceRecords, deleteDFMaintenanceRecords, postDFMaintenanceRecords, postDFMaintenanceRecordsList, getDFMaintenanceRecords, getDicts, postDFMaintenancePlanList, getDFMaintenancePlan, listUser } from '@/api/management'
 export default {
  name: 'InspectionItems',
  data() {
@ -84,7 +84,7 @@ export default {
  methods: {
    // 删除对应维修记录
    deleteTableItem(row) {
-      deleteMaintenanceRecords(row.id).then((res) => {
+      deleteDFMaintenanceRecords(row.id).then((res) => {
        console.log('🚀res🚀', res)
        this.getTableData()
      })
@ -94,7 +94,7 @@ export default {
      if (!edit) {
        this.prohibitEditing = true
      }
-      getMaintenanceRecords(row.id).then((res) => {
+      getDFMaintenanceRecords(row.id).then((res) => {
        console.log('🚀res🚀', res)
        // this.ruleForm.selectUser = []
        // res.data.operators.forEach(element => {
@ -165,12 +165,12 @@ export default {
          }
          this.ruleForm.maintenanceFunds = Number(this.ruleForm.maintenanceFunds)
          if (this.ruleForm.id) {
-            putUpdateMaintenanceRecords(this.ruleForm).then(() => {
+            putDFMaintenanceRecords(this.ruleForm).then(() => {
              this.getTableData()
              this.dialogVisible = false
            })
          } else {
-            postNewMaintenanceRecords(this.ruleForm).then(() => {
+            postDFMaintenanceRecords(this.ruleForm).then(() => {
              this.getTableData()
              this.dialogVisible = false
            })
@ -183,7 +183,7 @@ export default {
    },
    // 搜索计划
    searchPlan(value) {
-      postMaintenancePlanList({
+      postDFMaintenancePlanList({
        data: {
          timeView: {
            timeField: "create_time"
@ -204,7 +204,7 @@ export default {
    },
    // 改变选中计划
    changeSelectPlan() {
-      getMaintenancePlan(this.ruleForm.planId).then((res) => {
+      getDFMaintenancePlan(this.ruleForm.planId).then((res) => {
        if (res.data) {
          this.ruleForm.name = res.data.name
          this.planData = res.data
@ -240,7 +240,7 @@ export default {
    },
    // 获取数据
    getTableData(value = '') {
-      postMaintenanceRecordsList({
+      postDFMaintenanceRecordsList({
        data: {
          timeView: {
            timeField: "create_time"