Merge branch 'release-sy-v1.0.0' into 'dev'

fix: 修复缺陷 See merge request project/water/shuili-vue!13
1 year ago · 50d9b91f8d
11 changed files with 36 additions and 28 deletions
--- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
@ -29,7 +29,7 @@ export default {
        xcId: '',
        frequency: '',
        cycleType: '',
-        messageReminder: false,
+        isReminder: false,
        reminderTime: '',
        operators: [],
        otherConfig: {
@ -52,7 +52,7 @@ export default {
        cycleType: [
          { required: true, message: '请选择巡查周期', trigger: 'change' }
        ],
-        messageReminder: [
+        isReminder: [
          { required: true, message: '请选择消息提醒', trigger: 'change' }
        ],
        reminderTime: [
@ -197,7 +197,7 @@ export default {
        xcId: '',
        frequency: '',
        cycleType: '',
-        messageReminder: false,
+        isReminder: false,
        reminderTime: '',
        operators: [],
        otherConfig: {
@ -354,8 +354,8 @@ export default {
          <el-date-picker v-model="ruleForm.otherConfig.time" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
          </el-date-picker>
        </el-form-item>
-        <el-form-item label-width="120px" label="消息提醒" prop="messageReminder">
-          <el-switch v-model="ruleForm.messageReminder" active-color="#31a08e" inactive-color="#dcdfe6">
+        <el-form-item label-width="120px" label="消息提醒" prop="isReminder">
+          <el-switch v-model="ruleForm.isReminder" active-color="#31a08e" inactive-color="#dcdfe6">
          </el-switch>
        </el-form-item>
        <el-form-item label-width="120px" label="提醒时间" prop="reminderTime">
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@ -4,12 +4,7 @@ import { putDFMaintenancePlan, deleteDFMaintenancePlan,
  postDFMaintenancePlan, postDFMaintenancePlanList, 
  getDFMaintenancePlan } from '@/api/management'
 import {
-  listDikeInfo,
-  getDikeInfo,
-  delDikeInfo,
-  addDikeInfo,
-  updateDikeInfo,
-  exportDikeInfo,
+  listDikeInfo
 } from "@/api/yg/dikeInfo";
 export default {
  name: 'InspectionItems',
@ -128,7 +123,7 @@ export default {
    // 跳转记录页面
    goMaintenanceRecords(row) {
      this.$router.push({
-        path: '/dyke/runManage/maintenance/maintenanceRecords',
+        path: 'maintenanceRecords',
        query: {
          name: row.name
        }
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@ -99,7 +99,7 @@ export default {
        // 遍历用户数据让select组件渲染选项
        if (res.data.operators) {
          this.personnelList = []
-          res.data.operators.forEach(element => {
+          res.data.operators?.forEach(element => {
            listUser({
              data: {
                timeView: {
@ -121,7 +121,7 @@ export default {
        this.ruleForm = res.data
        // 渲染选中项
        this.ruleForm.selectUser = []
-        res.data.operators.forEach(element => {
+        res.data.operators?.forEach(element => {
          let a = {
            id: element.uid,
            lebel: element.name
@ -131,6 +131,10 @@ export default {
        this.dialogVisible = true
      })
    },
+    resetForm(){
+      this.$refs.ruleForm.resetFields()
+      this.dialogVisible = false
+    },
    // 保存维修记录
    submitForm(formName, confirm = false) {
      this.$refs[formName].validate((valid) => {
@ -281,6 +285,7 @@ export default {
    }
    // 获取列表数据
    this.getTableData(this.$route.query.name || '')
+    this.searchPlan('')
    // 获取状态字典
    getDicts('xs_yh_record_status').then((res) => {
      if (res.data && Array.isArray(res.data)) {
@ -357,8 +362,8 @@ export default {
            <el-option v-for="item in planList" :key="item.id" :label="item.name" :value="item.id">
            </el-option>
          </el-select>
-          <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-button :disabled="true" class="ml-6" type="success" size="small">详情</el-button>
+          <el-button :disabled="true" class="ml-6" type="success" size="small">打开地图</el-button>
        </el-form-item>
        <div style="display: flex;">
          <el-form-item label-width="130px" label="堤防名称">
@ -498,6 +503,9 @@ export default {
  }
 }

+.ml-6{
+  margin-left: 6px;
+}
 /deep/.el-input__count {
  height: 15px;
  line-height: 15px;
--- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
@ -263,7 +263,7 @@ export default {
  mounted() {
    // 获取列表数据
    // this.getTableData()
-    getDicts('dike_level').then((res) => {
+    getDicts('embankment_level').then((res) => {
      this.dikeLevel = res.data
    })
    getDicts('dh_jh_type').then((res) => {
--- a/src/views/runManage/engineering/inspectionPlan/Dike.vue
+++ b/src/views/runManage/engineering/inspectionPlan/Dike.vue
@ -104,7 +104,7 @@ export default {
    // 路线设置
    routeSetting(row) {
      this.$router.push({
-        path: '/patrolRouteSettings',
+        path: 'patrolRouteSettings',
        query: { id: row.id, name: row.name, editor: true }
      })
    },
--- a/src/views/runManage/engineering/inspectionPlan/Sluice.vue
+++ b/src/views/runManage/engineering/inspectionPlan/Sluice.vue
@ -104,7 +104,7 @@ export default {
    // 路线设置
    routeSetting(row) {
      this.$router.push({
-        path: '/patrolRouteSettings',
+        path: 'patrolRouteSettings',
        query: { id: row.id, name: row.name, editor: true }
      })
    },
--- a/src/views/runManage/engineering/inspectionRecords/Dike.vue
+++ b/src/views/runManage/engineering/inspectionRecords/Dike.vue
@ -20,7 +20,7 @@ export default {
    routeSetting(row) {
      console.log('🚀row🚀', row)
      this.$router.push({
-        path: '/patrolRouteSettings',
+        path: 'patrolRouteSettings',
        query: { name: row.name, editor: false, id: row.id }
      })
    },
--- a/src/views/runManage/engineering/inspectionRecords/Sluice.vue
+++ b/src/views/runManage/engineering/inspectionRecords/Sluice.vue
@ -20,7 +20,7 @@ export default {
    routeSetting(row) {
      console.log('🚀row🚀', row)
      this.$router.push({
-        path: '/patrolRouteSettings',
+        path: 'patrolRouteSettings',
        query: { name: row.name, editor: false, id: row.id }
      })
    },
--- a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue
@ -26,7 +26,7 @@ export default {
        xcId: '',
        frequency: '',
        cycleType: '',
-        messageReminder: false,
+        isReminder: false,
        reminderTime: '',
        operators: [],
        otherConfig: {
@ -49,7 +49,7 @@ export default {
        cycleType: [
          { required: true, message: '请选择巡查周期', trigger: 'change' }
        ],
-        messageReminder: [
+        isReminder: [
          { required: true, message: '请选择消息提醒', trigger: 'change' }
        ],
        reminderTime: [
@ -196,7 +196,7 @@ export default {
        xcId: '',
        frequency: '',
        cycleType: '',
-        messageReminder: false,
+        isReminder: false,
        reminderTime: '',
        operators: [],
        otherConfig: {
@ -345,8 +345,8 @@ export default {
          <el-date-picker v-model="ruleForm.otherConfig.time" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
          </el-date-picker>
        </el-form-item>
-        <el-form-item label-width="120px" label="消息提醒" prop="messageReminder">
-          <el-switch v-model="ruleForm.messageReminder" active-color="#31a08e" inactive-color="#dcdfe6">
+        <el-form-item label-width="120px" label="消息提醒" prop="isReminder">
+          <el-switch v-model="ruleForm.isReminder" active-color="#31a08e" inactive-color="#dcdfe6">
          </el-switch>
        </el-form-item>
        <el-form-item label-width="120px" label="提醒时间" prop="reminderTime">
--- a/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionRecords/index.vue
@ -20,7 +20,7 @@ export default {
    routeSetting(row) {
      console.log('🚀row🚀', row)
      this.$router.push({
-        path: '/dyke/runManage/enginerring/patrolRouteSettings',
+        path: 'patrolRouteSettings',
        query: { name: row.name, editor: false, id: row.id }
      })
    },
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@ -133,7 +133,7 @@ export default {
    // 跳转记录页面
    goMaintenanceRecords(row) {
      this.$router.push({
-        path: '/dyke/runManage/maintenance/maintenanceRecords',
+        path: 'maintenanceRecords',
        query: {
          name: row.name
        }
@ -211,6 +211,11 @@ export default {
        console.log('🚀表格数据🚀', res)
      })
    },
+    // 重置校验
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogVisible = false
+    },
    // 重置搜索
    resetSearch() {
      this.searchInput = ''