优化

src/views/dataManage/envMonitoring/index.vue

@@ -239,8 +239,8 @@
                 <el-form-item label="监测时间" prop="jcTime">
                     <el-date-picker
                         v-model="monitoringForm.jcTime"
-                        type="date"
+                        type="datetime"
-                        value-format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="请选择监测时间"
                         style="width: 100%"
                     />

src/views/dataManage/projectManage/index.vue

@@ -76,7 +76,11 @@
                     label="计划状态"
                     prop="planStatus"
                     align="center"
-                />
+                >
+                    <template slot-scope="scope">
+                        {{ getPlanStatusText(scope.row.planStatus) }}
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="今日风险"
                     prop="todayRisk"
@@ -402,10 +406,10 @@
                         placeholder="请选择计划状态"
                         style="width: 100%"
                     >
-                        <el-option label="已完成" value="已完成" />
+                        <el-option label="已完成" value="1" />
-                        <el-option label="未完成" value="未完成" />
+                        <el-option label="进行中" value="2" />
-                        <el-option label="进行中" value="未完成" />
+                        <el-option label="未完成" value="3" />
-                        <el-option label="延期" value="未完成" />
+                        <el-option label="延期" value="4" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="今日风险" prop="todayRisk">
@@ -827,6 +831,11 @@ export default {
                 todayRisk: false,
                 bidCode: '',
             }
+            this.$nextTick(() => {
+                if (this.$refs.riskFormRef) {
+                    this.$refs.riskFormRef.clearValidate()
+                }
+            })
             this.riskDialogVisible = true
         },
 
@@ -834,15 +843,29 @@ export default {
         onHandleEditRisk(row) {
             this.riskDialogTitle = '编辑'
             this.riskEditId = row.id
+            // 处理planStatus字段：确保是字符串类型
+            let planStatus = ''
+            if (
+                row.planStatus !== null &&
+                row.planStatus !== undefined &&
+                row.planStatus !== ''
+            ) {
+                planStatus = String(row.planStatus)
+            }
             this.riskForm = {
                 workContent: row.workContent || '',
                 riskLevel: row.riskLevel || '',
                 workStartTime: row.workStartTime || '',
                 workEndTime: row.workEndTime || '',
-                planStatus: row.planStatus || '',
+                planStatus: planStatus,
                 todayRisk: row.todayRisk || false,
                 bidCode: row.bidCode || '',
             }
+            this.$nextTick(() => {
+                if (this.$refs.riskFormRef) {
+                    this.$refs.riskFormRef.clearValidate()
+                }
+            })
             this.riskDialogVisible = true
         },
 
@@ -876,6 +899,13 @@ export default {
                 this.riskSubmitting = true
                 try {
                     const params = { ...this.riskForm }
+                    // 确保planStatus是字符串类型
+                    if (
+                        params.planStatus !== null &&
+                        params.planStatus !== undefined
+                    ) {
+                        params.planStatus = String(params.planStatus)
+                    }
                     if (this.riskEditId) {
                         params.id = this.riskEditId
                     }
@@ -1178,6 +1208,19 @@ export default {
                 this.projectList = res.data
             }
         },
+
+        // 获取计划状态文本
+        getPlanStatusText(status) {
+            const statusMap = {
+                1: '已完成',
+                2: '进行中',
+                3: '未完成',
+                4: '延期',
+            }
+            // 处理数字类型和字符串类型
+            const statusStr = String(status)
+            return statusMap[statusStr] || status || '-'
+        },
     },
 }
 </script>

src/views/dataManage/projectProgress/components/addAndEditForm.vue

@@ -42,7 +42,7 @@
                             placeholder="请选择工序"
                         >
                             <el-option label="土建" value="1" />
-                            <el-option label="电器" value="2" />
+                            <el-option label="电气" value="2" />
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -131,6 +131,23 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <el-row>
+                <el-col :span="24">
+                    <el-form-item label="状态" prop="status">
+                        <el-select
+                            v-model="addAndEditForm.status"
+                            placeholder="请选择状态"
+                            clearable
+                            style="width: 100%"
+                        >
+                            <el-option label="已完成" value="1" />
+                            <el-option label="未完成" value="2" />
+                            <el-option label="进行中" value="3" />
+                            <el-option label="延期" value="4" />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
         </el-form>
     </div>
 </template>
@@ -161,10 +178,10 @@ export default {
                 gx: '',
                 planStartTime: '',
                 planEndTime: '',
-
                 endTime: '',
                 inUser: '',
                 inDevice: '',
+                status: '',
             },
             addAndEditFormRules: {
                 bidCode: [
@@ -224,6 +241,13 @@ export default {
                         trigger: 'blur',
                     },
                 ],
+                status: [
+                    {
+                        required: true,
+                        message: '请选择状态',
+                        trigger: 'change',
+                    },
+                ],
             },
             projectList: [],
         }
@@ -277,16 +301,45 @@ export default {
                         inUser,
                         inDevice,
                         bidCode,
+                        status,
                     } = newVal
                     this.addAndEditForm.gxType = gxType
                     this.addAndEditForm.gx = gx
                     this.addAndEditForm.planStartTime = planStartTime
                     this.addAndEditForm.planEndTime = planEndTime
-
                     this.addAndEditForm.endTime = endTime
                     this.addAndEditForm.inUser = inUser
                     this.addAndEditForm.inDevice = inDevice
                     this.addAndEditForm.bidCode = bidCode
+                    // 处理status字段：确保是字符串类型
+                    if (
+                        status !== null &&
+                        status !== undefined &&
+                        status !== ''
+                    ) {
+                        this.addAndEditForm.status = String(status)
+                    } else {
+                        this.addAndEditForm.status = ''
+                    }
+                } else {
+                    // 新增时重置表单
+                    this.addAndEditForm = {
+                        bidCode: '',
+                        gxType: '',
+                        gx: '',
+                        planStartTime: '',
+                        planEndTime: '',
+                        endTime: '',
+                        inUser: '',
+                        inDevice: '',
+                        status: '',
+                    }
+                    // 清除表单验证
+                    this.$nextTick(() => {
+                        if (this.$refs.addAndEditFormRef) {
+                            this.$refs.addAndEditFormRef.clearValidate()
+                        }
+                    })
                 }
             },
             immediate: true,

src/views/dataManage/projectProgress/index.vue

@@ -70,8 +70,7 @@
                     </template>
 
                     <template v-else-if="column.prop === 'status'">
-                        <span v-if="scope.row[column.prop] == 1"> 已完成 </span>
+                        {{ getStatusText(scope.row[column.prop]) }}
-                        <span v-else> 未完成 </span>
                     </template>
 
                     <template v-else>
@@ -295,6 +294,19 @@ export default {
             this.currentRow = row
             this.currentProgressDialogVisible = true
         },
+
+        // 获取状态文本
+        getStatusText(status) {
+            const statusMap = {
+                1: '已完成',
+                2: '未完成',
+                3: '进行中',
+                4: '延期',
+            }
+            // 处理数字类型和字符串类型
+            const statusStr = String(status)
+            return statusMap[statusStr] || status || '-'
+        },
     },
 }
 </script>