弹框宽度修改

src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable :title="title" v-model="planAddition" width="60%" :before-close="cancelFn">
+    <el-dialog draggable :title="title" v-model="planAddition" width="65%" :before-close="cancelFn">
         <el-form
             :model="formdata"
             :disabled="title == '查看计划' || title == '计划审核'"

src/views/pqs/supervise/interfere/components/terminalNetworkDetection/addForm.vue

@@ -2,7 +2,7 @@
     <el-dialog
         v-model="dialogFormVisible"
         title="台账模型"
-        width="60%"
+        width="65%"
         :append-to-body="true"
         :before-close="close"
         :close-on-click-modal="false"

src/views/pqs/supervise/plan/components/addForm.vue

@@ -2,7 +2,7 @@
     <el-dialog
         v-model="dialogFormVisible"
         title="技术监督计划"
-        width="60%"
+        width="65%"
         :append-to-body="true"
         :before-close="close"
         :close-on-click-modal="false"

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue

@@ -37,7 +37,6 @@ import debug from './debug.vue'
 import { any } from 'vue-types'
 const dictData = useDictData()
 const { push } = useRouter()
-
 const TableHeaderRef = ref()
 const tableRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue

@@ -2,7 +2,7 @@
     <el-dialog
         v-model="dialogFormVisible"
         title="监测点信息"
-        width="60%"
+        width="65%"
         :append-to-body="true"
         :before-close="close"
         :close-on-click-modal="false"
@@ -16,17 +16,13 @@
             :scroll-to-error="true"
             :rules="rules"
             ref="ruleFormRef"
-            label-width="140px"
+            label-width="auto"
             label-position="right"
+            class="form-two"
         >
-            <el-tabs tab-position="left" class="tabs_form" v-model="activeName">
+            <el-tabs tab-position="left" v-model="activeName">
-                <el-tab-pane name="0" label="监测点信息">
+                <el-tab-pane name="0" label="监测点信息" class="form-two">
-                    <div class="form_tab_item">
+                    <div class="fixed_upload">
-                        <el-row>
-                            <el-col :span="12"></el-col>
-                            <el-col :span="12" class="required_position">
-                                <span class="required_icon" style="color: #fff">*</span>
-                                <el-form-item label="监测点台账信息：" prop="lineFilePath">
                         <el-upload
                             v-model:file-list="form.lineFilePath"
                             ref="uploadRef"
@@ -39,15 +35,11 @@
                             :on-progress="uploadFileName('lineFilePath')"
                         >
                             <template #trigger>
-                                            <el-button type="primary">上传文件</el-button>
+                                <el-button type="primary">监测点台账信息</el-button>
                             </template>
                         </el-upload>
-                                </el-form-item>
+                    </div>
-                            </el-col>
-                        </el-row>
                     <!-- 基础信息 -->
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="填报人：" prop="reporterName">
                         <el-input
                             v-model="form.reporterName"
@@ -56,8 +48,6 @@
                             :disabled="true"
                         />
                     </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
                     <el-form-item label="填报日期：" prop="reportDate">
                         <el-date-picker
                             style="width: 100%"
@@ -69,16 +59,9 @@
                             placeholder="请选择填报日期"
                         />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="填报部门：" prop="orgId">
                         <el-input v-model="form.orgName" :disabled="true" autocomplete="off" />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="工程投产日期：" prop="expectedProductionDate">
                         <el-date-picker
                             style="width: 100%"
@@ -91,10 +74,6 @@
                             placeholder="请选择工程投产日期"
                         />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="所属地市：" prop="city">
                         <el-select
                             v-model="form.city"
@@ -111,9 +90,6 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="用户状态：" prop="userStatus">
                         <el-select
                             v-model="form.userStatus"
@@ -130,10 +106,6 @@
                             />
                         </el-select>
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="关联干扰源：" prop="userName">
                         <el-select
                             v-model="form.userName"
@@ -150,8 +122,6 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
                     <el-form-item label="关联设备：" prop="monitoringTerminalCode">
                         <el-select
                             v-model="form.monitoringTerminalCode"
@@ -169,21 +139,10 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                            </el-col>
-                        </el-row>
                     <!-- 监测点信息 -->
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="监测点名称：" prop="lineName">
-                                    <el-input
+                        <el-input v-model="form.lineName" autocomplete="off" placeholder="请输入监测点名称" />
-                                        v-model="form.lineName"
-                                        autocomplete="off"
-                                        placeholder="请输入监测点名称"
-                                    />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="监测点电压等级：" prop="voltageLevel">
                         <el-select
                             v-model="form.voltageLevel"
@@ -199,16 +158,8 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="接入母线：" prop="connectedBus">
-                                    <el-input
+                        <el-input v-model="form.connectedBus" autocomplete="off" placeholder="请输入接入母线" />
-                                        v-model="form.connectedBus"
-                                        autocomplete="off"
-                                        placeholder="请输入接入母线"
-                                    />
                         <!-- <el-select
                                         v-model="form.connectedBus"
                                         clearable
@@ -223,81 +174,30 @@
                                         ></el-option>
                                     </el-select> -->
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="短路容量：" prop="shortCapacity">
-                                    <el-input
+                        <el-input v-model="form.shortCapacity" autocomplete="off" placeholder="请输入短路容量" />
-                                        v-model="form.shortCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入短路容量"
-                                    />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="协议容量：" prop="dealCapacity">
-                                    <el-input
+                        <el-input v-model="form.dealCapacity" autocomplete="off" placeholder="请输入协议容量" />
-                                        v-model="form.dealCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入协议容量"
-                                    />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="设备容量：" prop="devCapacity">
-                                    <el-input
+                        <el-input v-model="form.devCapacity" autocomplete="off" placeholder="请输入设备容量" />
-                                        v-model="form.devCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入设备容量"
-                                    />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="基准容量：" prop="standardCapacity">
-                                    <el-input
+                        <el-input v-model="form.standardCapacity" autocomplete="off" placeholder="请输入基准容量" />
-                                        v-model="form.standardCapacity"
-                                        autocomplete="off"
-                                        placeholder="请输入基准容量"
-                                    />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="CT变比：" prop="ctRatio">
                         <el-input v-model="form.ctRatio" autocomplete="off" placeholder="请输入CT变比" />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="PT变比：" prop="ptRatio">
                         <el-input v-model="form.ptRatio" autocomplete="off" placeholder="请输入PT变比" />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="监测点编码：" prop="lineId">
                         <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入监测点编码" />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="测量间隔：" prop="timeInterval">
-                                    <el-input
+                        <el-input v-model="form.timeInterval" autocomplete="off" placeholder="请输入测量间隔" />
-                                        v-model="form.timeInterval"
-                                        autocomplete="off"
-                                        placeholder="请输入测量间隔"
-                                    />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="干扰源类型：" prop="loadType">
                         <el-select
                             v-model="form.loadType"
@@ -314,10 +214,6 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="干扰源类别：" prop="businessType">
                         <el-select
                             v-model="form.businessType"
@@ -333,9 +229,6 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="监测点性质：" prop="pointNature">
                         <el-select v-model="form.pointNature" placeholder="请选择监测点性质">
                             <el-option
@@ -346,31 +239,15 @@
                             />
                         </el-select>
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="是否参与统计：" prop="isStatistical">
                         <el-radio-group v-model="form.isStatistical">
                             <el-radio value="1">是</el-radio>
                             <el-radio value="0">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="对象名称(对端)：" prop="objName">
-                                    <el-input
+                        <el-input v-model="form.objName" autocomplete="off" placeholder="请输入监测点对象名称" />
-                                        v-model="form.objName"
-                                        autocomplete="off"
-                                        placeholder="请输入监测点对象名称"
-                                    />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12"  class="required_position">
-                                <span class="required_icon_white">*</span>
                     <el-form-item label="电网侧变电站：" prop="powerSubstationName">
                         <el-input
                             v-model="form.powerSubstationName"
@@ -378,21 +255,12 @@
                             placeholder="请输入电网侧变电站"
                         />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12">
                     <el-form-item label="是否并网点：" prop="isGridConnectionPoint">
                         <el-radio-group v-model="form.isGridConnectionPoint">
                             <el-radio value="1">是</el-radio>
                             <el-radio value="0">否</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-
-                        <el-row>
-                            <el-col :span="12"  class="required_position">
-                                <span class="required_icon_white">*</span>
                     <el-form-item label="电压偏差上限：" prop="voltageDeviationUpperLimit">
                         <el-input
                             v-model="form.voltageDeviationUpperLimit"
@@ -400,10 +268,6 @@
                             placeholder="请输入电压偏差上限"
                         />
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12"  class="required_position">
-                                <span class="required_icon_white">*</span>
                     <el-form-item label="电压偏差下限：" prop="voltageDeviationLowerLimit">
                         <el-input
                             v-model="form.voltageDeviationLowerLimit"
@@ -411,10 +275,6 @@
                             placeholder="请输入电压偏差下限"
                         />
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
                     <el-form-item label="监测点运行状态：" prop="operationStatus">
                         <el-select v-model="form.operationStatus" placeholder="请选择运行状态">
                             <el-option
@@ -425,10 +285,6 @@
                             />
                         </el-select>
                     </el-form-item>
-                            </el-col>
-
-                            <el-col :span="12" class="required_position">
-                                <span class="required_icon">*</span>
                     <el-form-item label="主接线图：" prop="mainWiringDiagram">
                         <el-upload
                             v-model:file-list="form.mainWiringDiagram"
@@ -446,9 +302,6 @@
                             </template>
                         </el-upload>
                     </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </div>
                 </el-tab-pane>
             </el-tabs>
         </el-form>
@@ -544,20 +397,20 @@ const getSelectableList = () => {
     let obj = {}
     getList(obj).then(res => {
         projectList.value = res.data
-        userNameList.value=  res.data;
+        userNameList.value = res.data
         //初始化
         let obj = res.data[0]
         form.value = {
             ...form.value,
             city: obj.city,
             reporter: obj.reporter,
-            reporterName:obj.reporterName,
+            reporterName: obj.reporterName,
             reportDate: obj.reportDate,
             orgId: obj.orgId,
-            orgName:obj.orgName,
+            orgName: obj.orgName,
             expectedProductionDate: obj.expectedProductionDate,
-            userName:userNameList.value[0]?.name,
+            userName: userNameList.value[0]?.name,
-            userId:userNameList.value[0]?.id
+            userId: userNameList.value[0]?.id
         }
     })
 }
@@ -566,7 +419,7 @@ const monitoringTerminalList = ref([])
 //获取关联设备
 const findAllMonitoringTerminalList = () => {
     getDeviceList().then(res => {
-        monitoringTerminalList.value = res.data;
+        monitoringTerminalList.value = res.data
     })
 }
 //查询关联设备下拉框
@@ -586,10 +439,10 @@ selectFormType.value = '0'
 const resetForm = () => {
     form.value = {
         reporter: '', //填报人
-        reporterName:'',//填报人名称
+        reporterName: '', //填报人名称
         reportDate: '', //填报日期
         orgId: '', //填报部门id
-        orgName:'', //填报部门名称
+        orgName: '', //填报部门名称
         expectedProductionDate: '', //工程投产日期
         city: areaOptionList[0].name, //所属地市
         userStatus: userStateList[1].id, //用户状态
@@ -597,7 +450,6 @@ const resetForm = () => {
         monitoringTerminalName: monitoringTerminalList.value[0]?.monitoringTerminalName,
         userName: projectList.value[0]?.id, //工程名称
         userId: '', //工程id
-
         //监测点信息实体
         businessType: '', //	干扰源类别
         connectedBus: '', //	接入母线
@@ -663,7 +515,7 @@ const changeUserName = () => {
         ...form.value,
         city: obj?.city,
         reporter: obj?.reporter,
-        reporterName:obj?.reporterName,
+        reporterName: obj?.reporterName,
         reportDate: obj?.reportDate,
         orgId: obj?.orgId,
         orgName: obj?.orgName,
@@ -868,7 +720,7 @@ const rules = ref({
     ],
     mainWiringDiagram: [
         {
-            required: false,
+            required: true,
             message: '请上传主接线图',
             trigger: 'change'
         }
@@ -954,7 +806,6 @@ const activeName = ref('0')
 const confirmForm = () => {
     console.log(form.value, '打印form对象')
     // 先判断提交终端信息与监测点信息
-
     // 提交监测点信息
     ruleFormRef.value.validate(valid => {
         if (valid) {
@@ -962,7 +813,6 @@ const confirmForm = () => {
             //处理填报日期时间格式
             form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
             let confirmFormData = JSON.parse(JSON.stringify(form.value))
-                
             if (!mainWiringDiagram.value) {
                 return ElMessage({
                     message: '请上传主接线图',
@@ -990,68 +840,22 @@ defineExpose({ open })
 </script>
 <style lang="scss" scoped>
 .el-form {
-    width: 96%;
+    // width: 96%;
-    height: 400px;
+    // height: 400px;
-    margin: 0 auto;
+    // margin: 0 auto;
-    overflow-y: auto;
+    // overflow-y: auto;
-    padding-top: 20px;
+    // padding-top: 20px;
 }
 .dialog-footer {
     padding: 10px;
 }
-/* 调整标签的换行行为 */
+.fixed_upload {
-.label_over_warp::v-deep .el-form-item__label {
+    width: 100%;
-    // white-space: pre-line !important;
+    height: 50px;
-    line-height: 16px !important;
+    display: flex;
+    justify-content: flex-end;
 }
-::v-deep .el-form-item {
+::v-deep .el-tabs__content{
-    padding: 0 10px;
+    height:100% !important;
-    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;
-}
-
-//表单tab容器
-.form_tab_item {
-    height: 400px;
-    overflow-y: auto;
-}
-::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-left: 10px;
-        
-    }
-    .required_icon_white {
-        color: #fff;
-        position: absolute;
-        left: -10px;
-        padding-left: 30px;
-        margin: 8px 10px 0 30px;
-    }
-    .required_text {
-        // padding-left: 20px;
-    }
-}
-// ::v-deep .tabs_form{
-//     height:300px !important;
-// }
 </style>

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue

@@ -37,7 +37,6 @@ import { getLoadTypeUserList } from '@/api/process-boot/interference'
 import addForm from './addForm.vue'
 const dictData = useDictData()
 const { push } = useRouter()
-
 const TableHeaderRef = ref()
 const tableRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue

@@ -37,7 +37,6 @@ import { getLoadTypeUserList } from '@/api/process-boot/interference'
 import addForm from './addForm.vue'
 const dictData = useDictData()
 const { push } = useRouter()
-
 const TableHeaderRef = ref()
 const tableRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')

src/views/pqs/supervise/terminalNetworkDetection/index.vue

@@ -21,7 +21,7 @@ import terminal from './components/terminainal/index.vue'
 import monitorpoint from './components/monitorpoint/index.vue'
 import jointDebugList from './components/jointDebugList/index.vue'
 defineOptions({
-    name: 'Processsupervision/interferencemanagement'
+    name: 'amdin/terminalNetwotk'
 })
 const activeName = ref('1')
 const Statistics = ref()