Merge remote-tracking branch 'origin/master'

This commit is contained in:
2024-05-20 18:48:23 +08:00
11 changed files with 531 additions and 262 deletions

View File

@@ -0,0 +1,32 @@
import createAxios from '@/utils/request'
import { SUPERVISION_BOOT } from '@/utils/constantRequest'
const MAPPING_PATH = SUPERVISION_BOOT + '/tempLine'
/**
* 提交监测点联调表单数据
*/
export const addMointorPointTempLinedebug = (data: any) => {
return createAxios({
url: '/supervision-boot/tempLinedebug/add',
method: 'POST',
data: data
})
}
/**
* 根据id获取监测点联调的详细数据
*/
export const getMointorPointTempLinedebugDetail = (obj: any) => {
let form = new FormData()
form.append('id', obj.id)
return createAxios({
url:'/supervision-boot/tempLinedebug/getDetail',
method: 'POST',
data:form
})
}

View File

@@ -0,0 +1,184 @@
<template>
<el-dialog
v-model="dialogFormVisible"
title="申请联调"
width="30%"
:append-to-body="true"
:before-close="close"
:close-on-click-modal="false"
:lazy="true"
draggable
>
<!--监测点信息录入 基础信息+监测点信息 监测点信息要有工程名称用户状态 -->
<el-form
:model="form"
:validate-on-rule-change="false"
:scroll-to-error="true"
:rules="rules"
ref="ruleFormRef"
label-width="80px"
label-position="right"
>
<el-form-item label="原因:" prop="reason">
<el-input v-model="form.reason" autocomplete="off" place-holder="请输入填报人" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="close()">取消</el-button>
<el-button type="primary" @click="confirmForm()">确定</el-button>
</div>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
import { useDictData } from '@/stores/dictData'
import { useAdminInfo } from '@/stores/adminInfo'
import { addMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
const emits = defineEmits(['onSubmit'])
const props=defineProps({
debugId:{
type:String,
default:''
}
})
const dictData = useDictData()
const dialogFormVisible = ref(false)
const form: any = ref({})
const ruleFormRef = ref(null)
//定义切换form类型
const selectFormType = ref('')
selectFormType.value = '0'
const resetForm = () => {
form.value = {
reason: '', //填报人
}
}
//初始化数据
resetForm()
//定义校验规则
const rules = ref({
//基础信息
reason: [
{
required: true,
message: '请输入原因',
trigger: 'blur'
}
]
})
watch(
() => form.value,
(val, oldVal) => {},
{
deep: true,
immediate: true
}
)
const open = () => {
dialogFormVisible.value = true
}
const close = () => {
//重置表单内容
//取消表单校验状态
ruleFormRef.value && ruleFormRef.value.resetFields()
dialogFormVisible.value = false
emits('onSubmit')
resetForm()
}
onMounted(() => {
console.log()
})
//设置工程投产日期时间选择范围不能<今天
const disabledDate = time => {
return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
}
//提交
const confirmForm = () => {
// 提交监测点信息
ruleFormRef.value.validate(valid => {
if (valid) {
//提交监测点联调信息
form.value={
...form.value,
id:props.debugId
}
addMointorPointTempLinedebug(form.value).then(res => {
ruleFormRef.value.resetFields()
resetForm()
close()
})
} else {
console.log('表单验证失败')
return false
}
})
}
defineExpose({ open })
</script>
<style lang="scss" scoped>
.el-form {
// width: 96%;
height: 100px;
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;
}
//表单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: 10px;
}
.required_text {
padding-left: 20px;
}
}
.no_required::v-deep .el-form-item__label {
padding-left: 10px !important;
width: 70px !important;
margin-left: 0px !important;
}
// ::v-deep .tabs_form{
// height:300px !important;
// }
</style>

View File

@@ -0,0 +1,57 @@
<template>
<div class="default-main">
<el-descriptions :column="2" border>
<el-descriptions-item label="监测点名称">
{{ detailData.lineName }}
</el-descriptions-item>
<el-descriptions-item label="调试原因">
{{ detailData.reason}}
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive } from 'vue'
import { useRoute } from 'vue-router'
import { propTypes } from '@/utils/propTypes'
import { getMointorPointTempLinedebugDetail } from '@/api/supervision-boot/jointDebugList/index'
defineOptions({ name: 'BpmUserReportDetail' })
const { query } = useRoute() // 查询参数
const props = defineProps({
id: propTypes.string.def(undefined)
})
const detailLoading = ref(false) // 表单的加载中
const detailData = ref<any>({}) // 详情数据
const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
/** 获得数据 */
const getInfo = async () => {
detailLoading.value = true
try {
await getMointorPointTempLinedebugDetail({ id: props.id || queryId }).then(res => {
detailData.value = res.data
})
} finally {
detailLoading.value = false
}
}
defineExpose({ open: getInfo }) // 提供 open 方法,用于打开弹窗
/** 初始化 **/
onMounted(() => {
getInfo()
})
</script>
<style lang="scss">
.default-main {
height: calc(100vh - 100px);
overflow: auto;
}
::v-deep.el-icon svg {
margin: 5px !important;
position: absolute !important;
top: 20px !important;
}
</style>

View File

@@ -0,0 +1,171 @@
<!---终端入网检测-->
<template>
<TableHeader area datePicker ref="TableHeaderRef">
<!-- <template #select>
<el-form-item label="工程名称">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">
<el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市">
<el-option
v-for="item in areaOptionList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template> -->
<template #operation>
<!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
<!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
</template>
</TableHeader>
<Table ref="tableRef" />
<!-- 申请联调弹框 -->
<debug ref="debugForms" @onSubmit="tableStore.index()" :debugId="debugId"></debug>
</template>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { useRouter } from 'vue-router'
import { useDictData } from '@/stores/dictData'
import { getLoadTypeUserList } from '@/api/process-boot/interference'
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')
const ruleFormRef = ref()
const show: any = ref(false)
const fileList = ref([])
const tableStore = new TableStore({
url: '/supervision-boot/tempLinedebug/list',
publicHeight: 65,
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{ field: 'lineName', title: '监测点名称', minWidth: 170 },
{
field: 'status',
title: '审核状态',
minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消',
null:'/'
}
},
{ field: 'reason', title: '调试原因', minWidth: 170 },
{
title: '操作',
minWidth: 150,
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId)
},
disabled: row => {
return !row.processInstanceId;
}
},
{
name: 'productSetting',
title: '申请联调',
type: 'success',
icon: 'el-icon-add',
render: 'basicButton',
click: row => {
handleDebug(row)
},
disabled: row => {
return row.reason;
}
}
]
}
],
beforeSearchFun: () => {
tableStore.table.params.orgNo = tableStore.table.params.deptIndex
tableStore.table.params.statveList = [2]
// tableStore.table.params.relationUserName = tableStore.table.params.userName
}
})
// tableStore.table.params.loadType = ''
// tableStore.table.params.userName = ''
// tableStore.table.params.fileUploadflag = ''
provide('tableStore', tableStore)
const exportEvent = () => {
let form = JSON.parse(JSON.stringify(tableStore.table.params))
form.pageNum = 1
form.pageSize = tableStore.table.total
getLoadTypeUserList(form).then(res => {
tableRef.value.getRef().exportData({
filename: '未建档非线性用户', // 文件名字
sheetName: 'Sheet1',
type: 'xlsx', //导出文件类型 xlsx 和 csv
useStyle: true,
data: res.data.records, // 数据源 // 过滤那个字段导出
columnFilterMethod: function (column: any) {
return !(column.$columnIndex === 0)
}
})
})
}
onMounted(() => {
tableStore.index()
})
/** 处理审批按钮 */
const handleAudit = (instanceId: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
id: instanceId
}
})
}
//申请联调
const debugForms = ref()
const debugId = ref('')
const handleDebug = (row: any) => {
debugId.value = row.id
console.log(debugId.value)
debugForms.value.open()
}
</script>
<style scoped lang="scss">
:deep(.el-upload-list__item) {
width: 400px;
}
::v-deep .el-input__wrapper {
// width: 200px !important;
}
</style>

View File

@@ -48,9 +48,9 @@
<!-- 基础信息 -->
<el-row>
<el-col :span="12">
<el-form-item label="填报人:" prop="reporter">
<el-form-item label="填报人:" prop="reporterName">
<el-input
v-model="form.reporter"
v-model="form.reporterName"
autocomplete="off"
place-holder="请输入填报人"
:disabled="true"
@@ -369,7 +369,8 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<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"
@@ -390,7 +391,8 @@
</el-row>
<el-row>
<el-col :span="12">
<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,7 +402,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<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"
@@ -553,6 +556,7 @@ const getSelectableList = () => {
...form.value,
city: obj.city,
reporter: obj.reporter,
reporterName:obj.reporterName,
reportDate: obj.reportDate,
orgId: obj.orgId,
orgName:obj.orgName,
@@ -567,9 +571,7 @@ const monitoringTerminalList = ref([])
//获取关联设备
const findAllMonitoringTerminalList = () => {
getDeviceList().then(res => {
console.log(res, '-------------')
monitoringTerminalList.value = res.data
console.log(monitoringTerminalList.value[0].monitoringTerminalCode, '++++++++++')
monitoringTerminalList.value = res.data;
})
}
//查询关联设备下拉框
@@ -589,6 +591,7 @@ selectFormType.value = '0'
const resetForm = () => {
form.value = {
reporter: '', //填报人
reporterName:'',//填报人名称
reportDate: '', //填报日期
orgId: '', //填报部门id
orgName:'', //填报部门名称
@@ -624,13 +627,7 @@ const resetForm = () => {
voltageDeviationUpperLimit: '0', // 电压偏差上限
voltageLevel: voltageLevelList[0].id //监测点电压等级
}
// form.value.reporter = adminInfo.$state.name
// form.value.orgId = adminInfo.$state.deptName
}
//初始化数据
resetForm()
getSelectableList()
findAllMonitoringTerminalList()
//获取树形图数据
@@ -665,66 +662,27 @@ const changeLoadType = async () => {
//选择关联干扰源回显数据
const changeUserName = () => {
let obj = projectList.value.find(item => {
return form.value.userName == item.projectName
return form.value.reporter == item.reporter
})
form.value = {
...form.value,
city: obj.city,
reporter: obj.reporter,
reportDate: obj.reportDate,
orgId: obj.orgId,
orgName: obj.orgName,
userName: obj.projectName,
userId: obj.id,
expectedProductionDate: obj.expectedProductionDate
city: obj?.city,
reporter: obj?.reporter,
reporterName:obj?.reporterName,
reportDate: obj?.reportDate,
orgId: obj?.orgId,
orgName: obj?.orgName,
userName: obj?.projectName,
userId: obj?.id,
expectedProductionDate: obj?.expectedProductionDate
}
console.log(obj, '选择关联干扰源回显数据')
}
//监测点信息表单格式
const monitorPointForm = ref({
reporter: '', //填报人
reportDate: '', //填报日期
orgId: '', //填报部门
orgName:'',
expectedProductionDate: '', //工程投产日期
city: areaOptionList[0].name, //所属地市
userStatus: userStateList[1].id, //用户状态
userName: '', //工程名称
userId: '',
monitoringTerminalCode: '', //关联设备
monitoringTerminalName: '',
//监测点信息实体
// supervisionTempLineReportParam: {
businessType: '', // 干扰源类别
connectedBus: '', // 接入母线
ctRatio: '0', //CT变比
dealCapacity: '0', //协议容量
devCapacity: '0', //设备容量
isGridConnectionPoint: '0', //是否并网点
isStatistical: '0', // 是否参与统计
lineId: '', // 监测点编码
lineName: '', // 监测点名称
loadType: '', //干扰源类型
mainWiringDiagram: '', // 主接线图
objName: '', //监测点对象名称
operationStatus: '', //监测点运行状态
pointNature: '', //监测点性质
powerSubstationName: '', //电网侧变电站
ptRatio: '0', // PT变比
shortCapacity: '0', // 短路容量
standardCapacity: '0', //基准容量
timeInterval: '0', //测量间隔
voltageDeviationLowerLimit: '0', //电压偏差下限
voltageDeviationUpperLimit: '0', // 电压偏差上限
voltageLevel: '' //监测点电压等级
// }
})
//定义校验规则
const rules = ref({
//基础信息
reporter: [
reporterName: [
{
required: true,
message: '请输入填报人',
@@ -946,6 +904,9 @@ watch(
)
const open = () => {
dialogFormVisible.value = true
//初始化数据
resetForm()
getSelectableList()
}
const close = () => {
//重置表单内容
@@ -1008,13 +969,6 @@ const confirmForm = () => {
form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
let confirmFormData = JSON.parse(JSON.stringify(form.value))
//1.判断是否上传
// if (!lineFilePath.value) {
// return ElMessage({
// message: '请上传监测点台账信息',
// type: 'warning'
// })
// }
if (!mainWiringDiagram.value) {
return ElMessage({
message: '请上传主接线图',
@@ -1088,18 +1042,21 @@ defineExpose({ open })
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;
// padding-left: 20px;
}
}
.no_required::v-deep .el-form-item__label {
padding-left: 10px !important;
width: 70px !important;
margin-left: 0px !important;
}
// ::v-deep .tabs_form{
// height:300px !important;
// }

View File

@@ -1,6 +1,14 @@
<template>
<div class="default-main">
<el-descriptions :column="2" border>
<el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
<el-icon>
<Link />
</el-icon>
<a :href="detailData?.lineFilePath.url">
{{ detailData?.lineFilePath.name }}
</a>
</el-descriptions-item>
<el-descriptions-item label="填报人">
{{ detailData.reporter }}
</el-descriptions-item>
@@ -33,7 +41,11 @@
{{ detailData.lineName }}
</el-descriptions-item>
<el-descriptions-item label="监测点电压等级">
{{ detailData.voltageLevel }}
{{
voltageLevelList.find((item)=>{
return detailData.voltageLevel==item.id
})?.name
}}
</el-descriptions-item>
<el-descriptions-item label="接入母线">
{{ detailData.connectedBus }}
@@ -69,10 +81,10 @@
{{ detailData.businessType }}
</el-descriptions-item>
<el-descriptions-item label="监测点性质">
{{ detailData.pointNature }}
{{ detailData.pointNature=='0'?'电网侧':'非电网侧' }}
</el-descriptions-item>
<el-descriptions-item label="是否参与统计">
{{ detailData.isStatistical=='0'?'是':'否' }}
{{ detailData.isStatistical == '0' ? '是' : '否' }}
</el-descriptions-item>
<el-descriptions-item label="对象名称(对端)">
{{ detailData.objName }}
@@ -81,7 +93,7 @@
{{ detailData.powerSubstationName }}
</el-descriptions-item>
<el-descriptions-item label="是否并网点">
{{ detailData.isGridConnectionPoint=='0'?'是':'否' }}
{{ detailData.isGridConnectionPoint == '0' ? '是' : '否' }}
</el-descriptions-item>
<el-descriptions-item label="电压偏差上限">
{{ detailData.voltageDeviationUpperLimit }}
@@ -90,17 +102,13 @@
{{ detailData.voltageDeviationLowerLimit }}
</el-descriptions-item>
<el-descriptions-item label="监测点运行状态">
{{ detailData.operationStatus }}
{{
operationStatusList.find((item)=>{
return detailData.operationStatus==item.id
})?.name
}}
</el-descriptions-item>
<!--文件地址-->
<el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
<el-icon>
<Link />
</el-icon>
<a :href="detailData?.lineFilePath.url">
{{ detailData?.lineFilePath.name }}
</a>
</el-descriptions-item>
<el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
<el-icon>
<Link />
@@ -118,7 +126,6 @@ import { useRoute } from 'vue-router'
import { formatDate } from '@/utils/formatTime'
import { propTypes } from '@/utils/propTypes'
import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
import { getDictTreeById } from '@/api/system-boot/dictTree'
import { useDictData } from '@/stores/dictData'
import { getFileNameAndFilePath } from '@/api/system-boot/file'
import { Link } from '@element-plus/icons-vue'
@@ -154,79 +161,37 @@ const userStateList = reactive([
}
])
const dictData = useDictData()
//字典获取所属地市
const areaOptionList = dictData.getBasicData('jibei_area')
//定义监测装置安装位置下拉框数据
const monitoringDeviceInstallationPositionList = [
//字典获取监测点电压等级
const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
//定义监测点运行状态下拉框数据
const operationStatusList = [
{
id: '0',
name: '电网侧'
name: '运行'
},
{
id: '1',
name: '用户侧'
}
]
//定义召唤标志下拉框数据
const summonFlagList = [
{
id: '0',
name: '周期触发'
},
{
id: '1',
name: '变为触发'
}
]
//定义终端模型下拉框数据
const terminalModelList = [
{
id: '0',
name: '虚拟设备'
},
{
id: '1',
name: '虚拟设备'
name: '检修'
},
{
id: '2',
name: '虚拟设备'
}
]
//定义通讯状态下拉框数据
const communicationStatusList = [
{
id: '0',
name: '中断'
name: '停运'
},
{
id: '1',
name: '正常'
id: '3',
name: '调试'
},
{
id: '4',
name: '退运'
}
]
//字典获取监测点电压等级
const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
//字典获取数据类型
const dataTypeList = dictData.getBasicData('System_Type')
//字典获取终端型号
const terminalTypeList = dictData.getBasicData('Dev_Type')
//字典获取电压互感器类型
const voltageTransformerTypeList = dictData.getBasicData('Voltage_Transformer')
//字典获取中性点接线方式
const neutralPointWiringMethodList = dictData.getBasicData('Neutral_Point')
//字典获取所属前置机
const frontEndMachineList = dictData.getBasicData('Front_Type')
//字典获取终端接线方式类型
const terminalWiringMethodTypeList = dictData.getBasicData('Dev_Connect')
//字典获取厂家
const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
/** 获得数据 */
const getInfo = async () => {
detailLoading.value = true
try {
await getTempLineDetailsById({ id: props.id || queryId }).then(res => {
detailData.value = res.data
console.log(detailData.value, '++++获取监测点详情数据+++++')
getFileName()
})
} finally {
@@ -234,115 +199,30 @@ const getInfo = async () => {
}
}
const getFileName = async () => {
//验收检验报告
if (detailData.value.acceptanceInspectionReport) {
await getFileNamePath(detailData.value.acceptanceInspectionReport, 'acceptanceInspectionReport')
}
//验收检验报告单
if (detailData.value.acceptanceInspectionReportSingle) {
await getFileNamePath(detailData.value.acceptanceInspectionReportSingle, 'acceptanceInspectionReportSingle')
}
//出厂检验报告
if (detailData.value.factoryInspectionReport) {
await getFileNamePath(detailData.value.factoryInspectionReport, 'factoryInspectionReport')
}
//信息安全检测报告
if (detailData.value.informationSecurityTestReport) {
await getFileNamePath(detailData.value.informationSecurityTestReport, 'informationSecurityTestReport')
}
//监测点台账信息
if (detailData.value.lineFilePath) {
await getFileNamePath(detailData.value.lineFilePath, 'lineFilePath')
}
//其他附件
if (detailData.value.otherAttachments) {
await getFileNamePath(detailData.value.otherAttachments, 'otherAttachments')
//主接线图
else if (detailData.value.mainWiringDiagram) {
await getFileNamePath(detailData.value.mainWiringDiagram, 'mainWiringDiagram')
}
//性能检测报告
if (detailData.value.performanceTestReport) {
await getFileNamePath(detailData.value.performanceTestReport, 'performanceTestReport')
}
//型式实验报告
if (detailData.value.typeExperimentReport) {
await getFileNamePath(detailData.value.typeExperimentReport, 'typeExperimentReport')
}
//其他附件
// if (detailData.value.additionalAttachments) {
// getFileNamePath(detailData.value.additionalAttachments, 'additionalAttachments')
// }
}
//根据文件名请求
const getFileNamePath = async (val: any, pathName: any) => {
await getFileNameAndFilePath({ filePath: val }).then(res => {
console.log(111111111)
if (res.data) {
//可研报告
if (pathName == 'acceptanceInspectionReport' && detailData.value.acceptanceInspectionReport) {
detailData.value.acceptanceInspectionReport = {
name: res.data.fileName,
url: res.data.url
}
}
//终端台账信息
else if (
pathName == 'acceptanceInspectionReportSingle' &&
detailData.value.acceptanceInspectionReportSingle
) {
detailData.value.acceptanceInspectionReportSingle = {
name: res.data.fileName,
url: res.data.url
}
}
//预测评估报告
else if (pathName == 'factoryInspectionReport' && detailData.value.factoryInspectionReport) {
detailData.value.factoryInspectionReport = {
name: res.data.fileName,
url: res.data.url
}
}
//预测评估评审意见报告
else if (pathName == 'informationSecurityTestReport' && detailData.value.informationSecurityTestReport) {
detailData.value.informationSecurityTestReport = {
name: res.data.fileName,
url: res.data.url
}
}
//用户接入变电站主接线示意图
else if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
//监测点台账信息
if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
detailData.value.lineFilePath = {
name: res.data.fileName,
url: res.data.url
}
}
//主要敏感设备清单
else if (pathName == 'otherAttachments' && detailData.value.otherAttachments) {
detailData.value.otherAttachments = {
name: res.data.fileName,
url: res.data.url
}
}
//抗扰度测试报告
else if (pathName == 'performanceTestReport' && detailData.value.performanceTestReport) {
detailData.value.performanceTestReport = {
name: res.data.fileName,
url: res.data.url
}
}
//背景电能质量测试报告
else if (pathName == 'typeExperimentReport' && detailData.value.typeExperimentReport) {
detailData.value.typeExperimentReport = {
name: res.data.fileName,
url: res.data.url
}
}
//其他附件
else if (pathName == 'additionalAttachments' && detailData.value.additionalAttachments) {
detailData.value.additionalAttachments = {
//主接线图
else if (pathName == 'mainWiringDiagram' && detailData.value.mainWiringDiagram) {
detailData.value.mainWiringDiagram = {
name: res.data.fileName,
url: res.data.url
}

View File

@@ -72,7 +72,7 @@ const tableStore = new TableStore({
}
},
{ field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
{ field: 'substation', title: '所属变电站', minWidth: 170 },
// { field: 'substation', title: '所属变电站', minWidth: 170 },
// {
// field: 'userType',
// title: '用户性质',

View File

@@ -210,7 +210,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="测终端编码:" prop="monitoringTerminalCode">
<el-form-item label="测终端编码:" prop="monitoringTerminalCode">
<el-input
v-model="form.monitoringTerminalCode"
autocomplete="off"
@@ -221,7 +221,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="测终端名称:" prop="monitoringTerminalName">
<el-form-item label="测终端名称:" prop="monitoringTerminalName">
<el-input
v-model="form.monitoringTerminalName"
autocomplete="off"
@@ -1470,14 +1470,7 @@ const confirmForm = () => {
devReportForm.value.orgId = adminInfo.$state.deptId
let confirmFormData = JSON.parse(JSON.stringify(devReportForm.value))
//1.判断是否上传
// if (!deviceFilePath.value) {
// activeName.value = '1'
// return ElMessage({
// message: '请上传终端台账信息',
// type: 'warning'
// })
// }
if (!acceptanceInspectionReportSingle.value) {
return ElMessage({
message: '请上传验收检验报告单',

View File

@@ -34,9 +34,7 @@
</el-descriptions-item>
<el-descriptions-item label="所属供电公司">
{{
areaOptionList.find(item => {
return item.id == detailData.supervisionTempDeviceReport?.powerCompany
})?.name
detailData.supervisionTempDeviceReport?.powerCompany
}}
</el-descriptions-item>
<el-descriptions-item label="所属变电站">
@@ -349,7 +347,6 @@ const getInfo = async () => {
try {
await getTerminalDetailsById({ id: props.id || queryId }).then(res => {
detailData.value = res.data
console.log(detailData.value, '+++++++++')
getFileName()
})
} finally {
@@ -402,7 +399,6 @@ const getFileName = async () => {
//根据文件名请求
const getFileNamePath = async (val: any, pathName: any) => {
await getFileNameAndFilePath({ filePath: val }).then(res => {
console.log(111111111)
if (res.data) {
//可研报告
if (pathName == 'acceptanceInspectionReport' && detailData.value.acceptanceInspectionReport) {

View File

@@ -71,8 +71,8 @@ const tableStore = new TableStore({
4: '已取消'
}
},
{ field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
{ field: 'substation', title: '所属变电站', minWidth: 170 },
// { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
// { field: 'substation', title: '所属变电站', minWidth: 170 },
// {
// field: 'userType',
// title: '用户性质',
@@ -137,7 +137,6 @@ const tableStore = new TableStore({
// tableStore.table.params.loadType = ''
// tableStore.table.params.userName = ''
// tableStore.table.params.fileUploadflag = ''
console.log(tableStore.table.params,"=========查询列表");
provide('tableStore', tableStore)

View File

@@ -8,7 +8,7 @@
<monitorpoint v-if="activeName == '2'" />
</el-tab-pane>
<el-tab-pane label="监测点联调列表" name="3">
<!-- <terminalNetworkDetection v-if="activeName == '3'"></terminalNetworkDetection> -->
<jointDebugList v-if="activeName == '3'" />
</el-tab-pane>
</el-tabs>
</div>
@@ -16,10 +16,10 @@
<script setup lang="ts">
import { onMounted, reactive, ref, provide } from 'vue'
import undocumented from './components/undocumented/index.vue'
import { mainHeight } from '@/utils/layout'
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'
})