问题修改

2024-05-29 15:06:53 +08:00
parent 62e68e4434
commit 32be424616
12 changed files with 137 additions and 244 deletions
--- a/src/views/pqs/supervise/plan/components/addForm.vue
+++ b/src/views/pqs/supervise/plan/components/addForm.vue
@@ -71,7 +71,7 @@
            <el-form-item for="-" label="监督对象名称：" prop="supvObjName">
                <el-input v-model="form.supvObjName" autocomplete="off" placeholder="请输入监督对象名称" />
            </el-form-item>
-            <el-form-item for="-" label="监督对象电压等级：" prop="supvObjName">
+            <el-form-item for="-" label="监督对象电压等级：" prop="objVoltageLevel">
                <el-select
                    v-model="form.objVoltageLevel"
                    clearable
@@ -99,8 +99,15 @@
            <el-form-item for="-" label="监督对象属性名称：" prop="objTypeName">
                <el-input v-model="form.objTypeName" autocomplete="off" placeholder="请输入监督对象属性名称" />
            </el-form-item>
-            <el-form-item for="-" label="监督对象协议容量(MVA)：" prop="objCapacity">
-                <el-input v-model="form.objCapacity" autocomplete="off" placeholder="请输入监督对象监督对象协议容量" />
+            <el-form-item for="-" label="监督对象协议容量：" prop="objCapacity">
+                <el-input
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    v-model="form.objCapacity"
+                    autocomplete="off"
+                    placeholder="请输入监督对象监督对象协议容量"
+                >
+                    <template #append>MVA</template>
+                </el-input>
            </el-form-item>
            <el-form-item for="-" label="监督对象关联电站：" prop="substationName">
                <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入监督对象关联电站" />
@@ -130,6 +137,16 @@
                    ></el-option>
                </el-select>
            </el-form-item>
+            <el-form-item for="-" label="实施人员：">
+                <el-select v-model="form.effectUserId" clearable style="width: 100%" placeholder="请选择实施人员">
+                    <el-option
+                        v-for="item in effectUserIdList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
            <el-form-item for="-" label="开始实施时间：">
                <el-date-picker
                    style="width: 100%"
@@ -170,16 +187,6 @@
                    placeholder="请选择电能质量问题发生时间"
                />
            </el-form-item>
-            <el-form-item for="-" label="实施人员：">
-                <el-select v-model="form.effectUserId" clearable style="width: 100%" placeholder="请选择实施人员">
-                    <el-option
-                        v-for="item in effectUserIdList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
            <el-form-item for="-" label="计划状态：">
                <el-select v-model="form.planStatus" clearable style="width: 100%" placeholder="请选择计划状态">
                    <el-option
@@ -190,8 +197,9 @@
                    ></el-option>
                </el-select>
            </el-form-item>
-            <el-form-item for="-" label="其他要求：">
+            <el-form-item for="-" label="其他要求：" style="width:100%;">
                <el-input
+                    type="textarea"
                    v-model="form.otherRemark"
                    autocomplete="off"
                    placeholder="请输入其他要求"
@@ -399,7 +407,7 @@ const resetForm = () => {
        workPlanName: '', //计划名称
        supvOrgId: '', //监督单位
        planOrgId: '', //计划编制单位
-        supvType: '', //监督类型
+        supvType: supvTypeList[0].id, //监督类型
        supvStage: supvStageList[0]?.id, //监督阶段
        planSupvDate: '', //计划监督时间
        supvObjType: supvObjTypeList[0]?.id, //监督对象类型
@@ -672,9 +680,15 @@ const confirmForm = () => {
            //     assessReport: assessReport.value //评估报告
            // }
            addPlanFormData(confirmFormData).then(res => {
-                ruleFormRef.value.resetFields()
-                resetForm()
-                close()
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        message: '新建技术监督计划成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
            })
        } else {
            console.log('表单验证失败')
@@ -685,16 +699,5 @@ const confirmForm = () => {
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>
-.fixed-dialog {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    max-height: calc(100% - 30px);
-}
-.el-form {
-}
-.dialog-footer {
-    padding: 10px;
-}
+
 </style>
--- a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
+++ b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
@@ -395,9 +395,15 @@ const confirmForm = () => {
            form.value.planId = props.planId
            let confirmFormData = JSON.parse(JSON.stringify(form.value))
            addPlanProblemFormData(confirmFormData).then(res => {
-                ruleFormRef.value.resetFields()
-                resetForm()
-                close()
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        message: '新增实施问题成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
            })
        } else {
            console.log('表单验证失败')
@@ -407,17 +413,3 @@ const confirmForm = () => {
 }
 defineExpose({ open })
 </script>
-<style lang="scss" scoped>
-.fixed-dialog {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    max-height: calc(100% - 30px);
-}
-.el-form {
-}
-.dialog-footer {
-    padding: 10px;
-}
-</style>
--- a/src/views/pqs/supervise/plan/components/effectProblem/index.vue
+++ b/src/views/pqs/supervise/plan/components/effectProblem/index.vue
@@ -205,76 +205,3 @@ const handleEdit = (row: any) => {
 onMounted(() => {})
 defineExpose({ open })
 </script>
-<style lang="scss" scoped>
-.fixed-dialog {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    max-height: calc(100% - 30px);
-}
-.el-form {
-    width: 96%;
-    height: 400px;
-    margin: 0 auto;
-    overflow-y: auto;
-    padding-top: 20px;
-}
-.dialog-footer {
-    padding: 10px;
-}
-/* 调整标签的换行行为 */
-.label_over_warp::v-deep .el-form-item__label {
-    // white-space: pre-line !important;
-    line-height: 16px !important;
-}
-::v-deep .el-form-item {
-    padding: 0 10px;
-    height: auto !important;
-}
-::v-deep .el-form-item__label {
-    justify-content: flex-start !important;
-}
-.form-label-left-align {
-    text-align: left;
-}
-::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-}
-.no_required::v-deep .el-form-item__label {
-    padding-left: 10px !important;
-}
-::v-deep .el-input {
-    width: 200px !important;
-}
-::v-deep .el-select {
-    width: 200px !important;
-}
-::v-deep .required_position {
-    position: relative;
-    .required_icon {
-        position: absolute;
-        left: -10px;
-        margin-top: 8px;
-        color: #f56c6c;
-        margin-left: 20px;
-        margin-right: 10px;
-    }
-    .required_icon_white {
-        color: #fff;
-        position: absolute;
-        left: -10px;
-        padding-left: 10px;
-        margin: 8px 10px 0 10px;
-    }
-    .required_text {
-        // padding-left: 20px;
-    }
-    .el-form-item__label {
-        padding-left: 10px;
-    }
-}
-// ::v-deep .tabs_form{
-//     height:300px !important;
-// }
-</style>