feat: 回退

gongchunyi

7 天以前 6db4d38b9761b07a49cb22a0a41cfcdc7bc6dbab

 src/views/equipmentManagement/inspectionManagement/components/formDia.vue

@@ -30,6 +30,17 @@
              <el-input v-model="form.remarks" placeholder="请输入备注" type="textarea" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="任务状态" prop="isActive">
              <el-switch
                v-model="form.isActive"
                :active-value="1"
                :inactive-value="0"
                active-text="启用"
                inactive-text="停用"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
@@ -122,7 +133,8 @@
    frequencyType: '',
    frequencyDetail: '',
    week: '',
    time: ''
    time: '',
    isActive: 1  // 默认启用
  },
   rules: {
      taskId: [{ required: true, message: "请选择设备", trigger: "change" },],
@@ -217,9 +229,35 @@
  await loadDeviceName();
  
  if (type === 'edit' && row) {
    form.value = {...row}
    form.value.inspector = form.value.inspectorIds.split(',').map(Number)
    
    form.value = {
      ...data.form,  // 先复制默认表单
      ...row,        // 再覆盖 row 中的值
    }
    // 确保 inspectorIds 存在才进行 split
    if (form.value.inspectorIds) {
      form.value.inspector = form.value.inspectorIds.split(',').map(Number)
    } else {
      form.value.inspector = []
    }
    // 确保 isActive 有值，默认启用
    if (form.value.isActive === undefined || form.value.isActive === null) {
      form.value.isActive = 1
    }

    if (row.frequencyDetail) {
      if (row.frequencyType === 'WEEKLY') {
        const parts = row.frequencyDetail.split(',')
        if (parts.length === 2) {
          form.value.week = parts[0]
          form.value.time = parts[1]
        }
      } else if (row.frequencyType === 'DAILY') {
        form.value.frequencyDetail = row.frequencyDetail
      } else {
        form.value.frequencyDetail = row.frequencyDetail
      }
    }

    // 如果有设备ID，自动设置设备信息
    if (form.value.taskId) {
      setDeviceModel(form.value.taskId);
@@ -249,7 +287,8 @@
    frequencyType: '',
    frequencyDetail: '',
    week: '',
    time: ''
    time: '',
    isActive: 1  // 默认启用
  }
}

@@ -258,8 +297,11 @@
  proxy.$refs["formRef"].validate(async valid => {
    if (valid) {
      try {
        form.value.inspectorIds = form.value.inspector.join(',')
        delete form.value.inspector
        // 确保 inspector 是数组才进行 join
        if (form.value.inspector && Array.isArray(form.value.inspector)) {
          form.value.inspectorIds = form.value.inspector.join(',')
          delete form.value.inspector
        }
        
        if (form.value.frequencyType === 'WEEKLY') {
          let frequencyDetail = ''