监测点联调列表、申请联调、详情联调

This commit is contained in:
zhujiyan
2024-05-20 15:55:11 +08:00
parent 2f1e3c97be
commit d192fe4ff9
9 changed files with 50 additions and 1619 deletions

View File

@@ -1,8 +1,8 @@
<template> <template>
<el-dialog <el-dialog
v-model="dialogFormVisible" v-model="dialogFormVisible"
title="联调申请" title="申请联调"
width="60%" width="30%"
:append-to-body="true" :append-to-body="true"
:before-close="close" :before-close="close"
:close-on-click-modal="false" :close-on-click-modal="false"
@@ -16,57 +16,12 @@
:scroll-to-error="true" :scroll-to-error="true"
:rules="rules" :rules="rules"
ref="ruleFormRef" ref="ruleFormRef"
label-width="140px" label-width="80px"
label-position="right" label-position="right"
> >
<!-- 基础信息 --> <el-form-item label="原因:" prop="reason">
<el-row> <el-input v-model="form.reason" autocomplete="off" place-holder="请输入填报人" />
<el-col :span="12">
<el-form-item label="填报人:" prop="reporter">
<el-input
v-model="form.reporter"
autocomplete="off"
place-holder="请输入填报人"
:disabled="true"
/>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="填报日期:" prop="reportDate">
<el-date-picker
style="width: 100%"
v-model="form.reportDate"
:disabled="true"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
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%"
v-model="form.expectedProductionDate"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:disabled="true"
:disabled-date="disabledDate"
placeholder="请选择工程投产日期"
/>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
@@ -78,15 +33,16 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue' import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
import { genFileId, ElMessage } from 'element-plus'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
import { useAdminInfo } from '@/stores/adminInfo' import { useAdminInfo } from '@/stores/adminInfo'
import { uploadFile } from '@/api/system-boot/file' import { addMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
import { getDeviceList } from '@/api/supervision-boot/terminal/index'
import { addMointorPointFormData, getList } from '@/api/supervision-boot/monitorpoint/index'
import { queryByAllCode } from '@/api/system-boot/dictTree'
const emits = defineEmits(['onSubmit']) const emits = defineEmits(['onSubmit'])
const props=defineProps({
debugId:{
type:String,
default:''
}
})
const dictData = useDictData() const dictData = useDictData()
const dialogFormVisible = ref(false) const dialogFormVisible = ref(false)
const form: any = ref({}) const form: any = ref({})
@@ -94,53 +50,23 @@ const ruleFormRef = ref(null)
//定义切换form类型 //定义切换form类型
const selectFormType = ref('') const selectFormType = ref('')
selectFormType.value = '0' selectFormType.value = '0'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
const resetForm = () => { const resetForm = () => {
form.value = { form.value = {
reporter: '', //填报人 reason: '', //填报人
reportDate: new Date(), //填报日期
orgId: '', //填报部门id
orgName: '', //填报部门名称
} }
form.value.reporter = adminInfo.$state.name
form.value.orgName = adminInfo.$state.deptName
} }
//初始化数据 //初始化数据
resetForm() resetForm()
//定义校验规则 //定义校验规则
const rules = ref({ const rules = ref({
//基础信息 //基础信息
reporter: [ reason: [
{ {
required: true, required: true,
message: '请输入填报人', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }
], ]
reportDate: [
{
required: true,
message: '请选择填报日期',
trigger: 'change'
}
],
orgId: [
{
required: true,
message: '请选择填报部门',
trigger: 'change'
}
],
expectedProductionDate: [
{
required: true,
message: '请选择工程投产日期',
trigger: 'change'
}
],
}) })
watch( watch(
() => form.value, () => form.value,
@@ -165,7 +91,6 @@ onMounted(() => {
console.log() console.log()
}) })
//设置工程投产日期时间选择范围不能<今天 //设置工程投产日期时间选择范围不能<今天
const disabledDate = time => { const disabledDate = time => {
return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天 return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
@@ -175,17 +100,12 @@ const confirmForm = () => {
// 提交监测点信息 // 提交监测点信息
ruleFormRef.value.validate(valid => { ruleFormRef.value.validate(valid => {
if (valid) { if (valid) {
//整理上传文件的数据 //提交监测点联调信息
//处理填报日期时间格式 form.value={
form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd') ...form.value,
let confirmFormData = JSON.parse(JSON.stringify(form.value)) id:props.debugId
//提交终端信息
confirmFormData = {
...confirmFormData,
} }
addMointorPointFormData(confirmFormData).then(res => { addMointorPointTempLinedebug(form.value).then(res => {
ruleFormRef.value.resetFields() ruleFormRef.value.resetFields()
resetForm() resetForm()
close() close()
@@ -201,7 +121,7 @@ defineExpose({ open })
<style lang="scss" scoped> <style lang="scss" scoped>
.el-form { .el-form {
// width: 96%; // width: 96%;
height: 400px; height: 100px;
margin: 0 auto; margin: 0 auto;
// overflow-y: auto; // overflow-y: auto;
padding-top: 20px; padding-top: 20px;

View File

@@ -1,122 +1,11 @@
<template> <template>
<div class="default-main"> <div class="default-main">
666666
<el-descriptions :column="2" border> <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>
<el-descriptions-item label="填报日期">
{{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="填报部门">
{{ detailData.orgName }}
</el-descriptions-item>
<el-descriptions-item label="工程投产日期">
{{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
</el-descriptions-item>
<el-descriptions-item label="所属地市">
{{ detailData.city }}
</el-descriptions-item>
<el-descriptions-item label="用户状态">
{{
userStateList.find(item => {
return item.value == detailData.userStatus
})?.label
}}
</el-descriptions-item>
<el-descriptions-item label="关联干扰源">
{{ detailData.userName }}
</el-descriptions-item>
<el-descriptions-item label="关联设备">
{{ detailData.monitoringTerminalName }}
</el-descriptions-item>
<el-descriptions-item label="监测点名称"> <el-descriptions-item label="监测点名称">
{{ detailData.lineName }} {{ detailData.lineName }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="监测点电压等级"> <el-descriptions-item label="调试原因">
{{ {{ detailData.reason}}
voltageLevelList.find((item)=>{
return detailData.voltageLevel==item.id
})?.name
}}
</el-descriptions-item>
<el-descriptions-item label="接入母线">
{{ detailData.connectedBus }}
</el-descriptions-item>
<el-descriptions-item label="短路容量">
{{ detailData.shortCapacity }}
</el-descriptions-item>
<el-descriptions-item label="协议容量">
{{ detailData.dealCapacity }}
</el-descriptions-item>
<el-descriptions-item label="设备容量">
{{ detailData.devCapacity }}
</el-descriptions-item>
<el-descriptions-item label="基准容量">
{{ detailData.standardCapacity }}
</el-descriptions-item>
<el-descriptions-item label="CT变比">
{{ detailData.ctRatio }}
</el-descriptions-item>
<el-descriptions-item label="PT变比">
{{ detailData.ptRatio }}
</el-descriptions-item>
<el-descriptions-item label="监测点编码">
{{ detailData.lineId }}
</el-descriptions-item>
<el-descriptions-item label="测量间隔">
{{ detailData.timeInterval }}
</el-descriptions-item>
<el-descriptions-item label="干扰源类型">
{{ detailData.loadType }}
</el-descriptions-item>
<el-descriptions-item label="干扰源类别">
{{ detailData.businessType }}
</el-descriptions-item>
<el-descriptions-item label="监测点性质">
{{ detailData.pointNature=='0'?'电网侧':'非电网侧' }}
</el-descriptions-item>
<el-descriptions-item label="是否参与统计">
{{ detailData.isStatistical == '0' ? '是' : '否' }}
</el-descriptions-item>
<el-descriptions-item label="对象名称(对端)">
{{ detailData.objName }}
</el-descriptions-item>
<el-descriptions-item label="电网侧变电站">
{{ detailData.powerSubstationName }}
</el-descriptions-item>
<el-descriptions-item label="是否并网点">
{{ detailData.isGridConnectionPoint == '0' ? '是' : '否' }}
</el-descriptions-item>
<el-descriptions-item label="电压偏差上限">
{{ detailData.voltageDeviationUpperLimit }}
</el-descriptions-item>
<el-descriptions-item label="电压偏差下限">
{{ detailData.voltageDeviationLowerLimit }}
</el-descriptions-item>
<el-descriptions-item label="监测点运行状态">
{{
operationStatusList.find((item)=>{
return detailData.operationStatus==item.id
})?.name
}}
</el-descriptions-item>
<!--文件地址-->
<el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
<el-icon>
<Link />
</el-icon>
<a :href="detailData?.mainWiringDiagram.url">
{{ detailData?.mainWiringDiagram.name }}
</a>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
@@ -124,18 +13,10 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted, ref, reactive } from 'vue' import { onMounted, ref, reactive } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import { formatDate } from '@/utils/formatTime'
import { propTypes } from '@/utils/propTypes' import { propTypes } from '@/utils/propTypes'
import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index' import { getMointorPointTempLinedebugDetail } from '@/api/supervision-boot/jointDebugList/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'
defineOptions({ name: 'BpmUserReportDetail' }) defineOptions({ name: 'BpmUserReportDetail' })
const { query } = useRoute() // 查询参数 const { query } = useRoute() // 查询参数
const props = defineProps({ const props = defineProps({
id: propTypes.string.def(undefined) id: propTypes.string.def(undefined)
}) })
@@ -143,159 +24,18 @@ const detailLoading = ref(false) // 表单的加载中
const detailData = ref<any>({}) // 详情数据 const detailData = ref<any>({}) // 详情数据
const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
//用户状态数组
const userStateList = reactive([
{
label: '可研',
value: '0'
},
{
label: '建设',
value: '1'
},
{
label: '运行',
value: '2'
},
{
label: '退运',
value: '3'
}
])
const dictData = useDictData()
//字典获取所属地市
const areaOptionList = dictData.getBasicData('jibei_area')
//定义监测装置安装位置下拉框数据
const monitoringDeviceInstallationPositionList = [
{
id: '0',
name: '电网侧'
},
{
id: '1',
name: '用户侧'
}
]
//定义召唤标志下拉框数据
const summonFlagList = [
{
id: '0',
name: '周期触发'
},
{
id: '1',
name: '变为触发'
}
]
//定义终端模型下拉框数据
const terminalModelList = [
{
id: '0',
name: '虚拟设备'
},
{
id: '1',
name: '虚拟设备'
},
{
id: '2',
name: '虚拟设备'
}
]
//定义通讯状态下拉框数据
const communicationStatusList = [
{
id: '0',
name: '中断'
},
{
id: '1',
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 operationStatusList = [
{
id: '0',
name: '运行'
},
{
id: '1',
name: '检修'
},
{
id: '2',
name: '停运'
},
{
id: '3',
name: '调试'
},
{
id: '4',
name: '退运'
}
]
/** 获得数据 */ /** 获得数据 */
const getInfo = async () => { const getInfo = async () => {
detailLoading.value = true detailLoading.value = true
try { try {
await getTempLineDetailsById({ id: props.id || queryId }).then(res => { await getMointorPointTempLinedebugDetail({ id: props.id || queryId }).then(res => {
detailData.value = res.data detailData.value = res.data
getFileName()
}) })
} finally { } finally {
detailLoading.value = false detailLoading.value = false
} }
} }
const getFileName = async () => {
//监测点台账信息
if (detailData.value.lineFilePath) {
await getFileNamePath(detailData.value.lineFilePath, 'lineFilePath')
}
//主接线图
else if (detailData.value.mainWiringDiagram) {
await getFileNamePath(detailData.value.mainWiringDiagram, 'mainWiringDiagram')
}
}
//根据文件名请求
const getFileNamePath = async (val: any, pathName: any) => {
await getFileNameAndFilePath({ filePath: val }).then(res => {
if (res.data) {
//监测点台账信息
if (pathName == 'lineFilePath' && detailData.value.lineFilePath) {
detailData.value.lineFilePath = {
name: res.data.fileName,
url: res.data.url
}
}
//主接线图
else if (pathName == 'mainWiringDiagram' && detailData.value.mainWiringDiagram) {
detailData.value.mainWiringDiagram = {
name: res.data.fileName,
url: res.data.url
}
}
}
})
}
defineExpose({ open: getInfo }) // 提供 open 方法,用于打开弹窗 defineExpose({ open: getInfo }) // 提供 open 方法,用于打开弹窗
/** 初始化 **/ /** 初始化 **/

View File

@@ -22,11 +22,8 @@
</template> </template>
</TableHeader> </TableHeader>
<Table ref="tableRef" /> <Table ref="tableRef" />
<!-- 新增弹框 -->
<addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
<!-- 申请联调弹框 --> <!-- 申请联调弹框 -->
<debug ref="debugForms" @onSubmit="tableStore.index()"></debug> <debug ref="debugForms" @onSubmit="tableStore.index()" :debugId="debugId"></debug>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue' import { ref, onMounted, provide, nextTick } from 'vue'
@@ -36,7 +33,6 @@ import TableHeader from '@/components/table/header/index.vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
import { getLoadTypeUserList } from '@/api/process-boot/interference' import { getLoadTypeUserList } from '@/api/process-boot/interference'
import addForm from './addForm.vue'
import debug from './debug.vue' import debug from './debug.vue'
import { any } from 'vue-types' import { any } from 'vue-types'
const dictData = useDictData() const dictData = useDictData()
@@ -49,14 +45,12 @@ const ruleFormRef = ref()
const show: any = ref(false) const show: any = ref(false)
const fileList = ref([]) const fileList = ref([])
const tableStore = new TableStore({ const tableStore = new TableStore({
url: '/supervision-boot/tempLine/list', url: '/supervision-boot/tempLinedebug/list',
publicHeight: 65, publicHeight: 65,
method: 'POST', method: 'POST',
column: [ column: [
{ title: '序号', type: 'seq', width: 80 }, { title: '序号', type: 'seq', width: 80 },
{ field: 'orgName', title: '填报部门名称' , minWidth: 170 }, { field: 'lineName', title: '监测点名称', minWidth: 170 },
{ field: 'reportDate', title: '填报日期', minWidth: 170},
{ field: 'reporter', title: '填报人', minWidth: 80 },
{ {
field: 'status', field: 'status',
title: '审核状态', title: '审核状态',
@@ -72,46 +66,11 @@ const tableStore = new TableStore({
1: '审批中', 1: '审批中',
2: '审批通过', 2: '审批通过',
3: '审批不通过', 3: '审批不通过',
4: '已取消' 4: '已取消',
null:'/'
} }
}, },
{ field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 }, { field: 'reason', title: '调试原因', minWidth: 170 },
{ field: 'substation', title: '所属变电站', minWidth: 170 },
// {
// field: 'userType',
// title: '用户性质',
// minWidth: 150,
// formatter: (obj: any) => {
// const userType = obj.row.userType
// return getUserTypeName(userType)
// }
// },
// { field: 'informationSecurityTestReport', title: '信息安全检测报告', minWidth: 170 },
// { field: 'otherAttachments', title: '其他附件', minWidth: 170 },
// { field: 'orgName', title: '填报部门名称'},
// { field: 'performanceTestReport', title: '性能检测报告', minWidth: 170 },
// {
// field: 'userStatus',
// title: '用户状态',
// minWidth: 100,
// render: 'tag',
// custom: {
// 0: 'primary',
// 1: 'primary',
// 2: 'success',
// 3: 'warning'
// },
// replaceValue: {
// 0: '可研',
// 1: '建设',
// 2: '运行',
// 3: '退运'
// }
// },
// { field: 'substation', title: '变电站', minWidth: 100 },
// { field: 'createTime', title: '开始时间', minWidth: 170 },
{ {
title: '操作', title: '操作',
minWidth: 150, minWidth: 150,
@@ -126,6 +85,9 @@ const tableStore = new TableStore({
render: 'basicButton', render: 'basicButton',
click: row => { click: row => {
handleAudit(row.processInstanceId) handleAudit(row.processInstanceId)
},
disabled: row => {
return !row.processInstanceId;
} }
}, },
{ {
@@ -136,6 +98,9 @@ const tableStore = new TableStore({
render: 'basicButton', render: 'basicButton',
click: row => { click: row => {
handleDebug(row) handleDebug(row)
},
disabled: row => {
return row.reason;
} }
} }
] ]
@@ -155,14 +120,6 @@ const tableStore = new TableStore({
provide('tableStore', tableStore) provide('tableStore', tableStore)
const addForms = ref()
const addFormModel = () => {
setTimeout(() => {
addForms.value.open()
}, 0);
}
const exportEvent = () => { const exportEvent = () => {
let form = JSON.parse(JSON.stringify(tableStore.table.params)) let form = JSON.parse(JSON.stringify(tableStore.table.params))
form.pageNum = 1 form.pageNum = 1
@@ -195,8 +152,10 @@ const handleAudit = (instanceId: any) => {
} }
//申请联调 //申请联调
const debugForms = ref() const debugForms = ref()
const debugId = ref('')
const handleDebug = (row: any) => { const handleDebug = (row: any) => {
console.log(row,"=============") debugId.value = row.id
console.log(debugId.value)
debugForms.value.open() debugForms.value.open()
} }
</script> </script>

View File

@@ -627,9 +627,6 @@ const resetForm = () => {
voltageDeviationUpperLimit: '0', // 电压偏差上限 voltageDeviationUpperLimit: '0', // 电压偏差上限
voltageLevel: voltageLevelList[0].id //监测点电压等级 voltageLevel: voltageLevelList[0].id //监测点电压等级
} }
// form.value.reporter = adminInfo.$state.name
// form.value.orgId = adminInfo.$state.deptName
} }
findAllMonitoringTerminalList() findAllMonitoringTerminalList()
@@ -972,13 +969,6 @@ const confirmForm = () => {
form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd') form.value.reportDate = window.XEUtils.toDateString(form.value.reportDate, 'yyyy-MM-dd')
let confirmFormData = JSON.parse(JSON.stringify(form.value)) let confirmFormData = JSON.parse(JSON.stringify(form.value))
//1.判断是否上传
// if (!lineFilePath.value) {
// return ElMessage({
// message: '请上传监测点台账信息',
// type: 'warning'
// })
// }
if (!mainWiringDiagram.value) { if (!mainWiringDiagram.value) {
return ElMessage({ return ElMessage({
message: '请上传主接线图', message: '请上传主接线图',

View File

@@ -126,7 +126,6 @@ import { useRoute } from 'vue-router'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { propTypes } from '@/utils/propTypes' import { propTypes } from '@/utils/propTypes'
import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index' import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
import { getDictTreeById } from '@/api/system-boot/dictTree'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
import { getFileNameAndFilePath } from '@/api/system-boot/file' import { getFileNameAndFilePath } from '@/api/system-boot/file'
import { Link } from '@element-plus/icons-vue' import { Link } from '@element-plus/icons-vue'
@@ -162,72 +161,8 @@ const userStateList = reactive([
} }
]) ])
const dictData = useDictData() const dictData = useDictData()
//字典获取所属地市
const areaOptionList = dictData.getBasicData('jibei_area')
//定义监测装置安装位置下拉框数据
const monitoringDeviceInstallationPositionList = [
{
id: '0',
name: '电网侧'
},
{
id: '1',
name: '用户侧'
}
]
//定义召唤标志下拉框数据
const summonFlagList = [
{
id: '0',
name: '周期触发'
},
{
id: '1',
name: '变为触发'
}
]
//定义终端模型下拉框数据
const terminalModelList = [
{
id: '0',
name: '虚拟设备'
},
{
id: '1',
name: '虚拟设备'
},
{
id: '2',
name: '虚拟设备'
}
]
//定义通讯状态下拉框数据
const communicationStatusList = [
{
id: '0',
name: '中断'
},
{
id: '1',
name: '正常'
}
]
//字典获取监测点电压等级 //字典获取监测点电压等级
const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand') 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 operationStatusList = [ const operationStatusList = [
{ {

View File

@@ -1470,14 +1470,7 @@ const confirmForm = () => {
devReportForm.value.orgId = adminInfo.$state.deptId devReportForm.value.orgId = adminInfo.$state.deptId
let confirmFormData = JSON.parse(JSON.stringify(devReportForm.value)) let confirmFormData = JSON.parse(JSON.stringify(devReportForm.value))
//1.判断是否上传
// if (!deviceFilePath.value) {
// activeName.value = '1'
// return ElMessage({
// message: '请上传终端台账信息',
// type: 'warning'
// })
// }
if (!acceptanceInspectionReportSingle.value) { if (!acceptanceInspectionReportSingle.value) {
return ElMessage({ return ElMessage({
message: '请上传验收检验报告单', message: '请上传验收检验报告单',

View File

@@ -349,7 +349,6 @@ const getInfo = async () => {
try { try {
await getTerminalDetailsById({ id: props.id || queryId }).then(res => { await getTerminalDetailsById({ id: props.id || queryId }).then(res => {
detailData.value = res.data detailData.value = res.data
console.log(detailData.value, '+++++++++')
getFileName() getFileName()
}) })
} finally { } finally {

View File

@@ -137,7 +137,6 @@ const tableStore = new TableStore({
// tableStore.table.params.loadType = '' // tableStore.table.params.loadType = ''
// tableStore.table.params.userName = '' // tableStore.table.params.userName = ''
// tableStore.table.params.fileUploadflag = '' // tableStore.table.params.fileUploadflag = ''
console.log(tableStore.table.params,"=========查询列表");
provide('tableStore', tableStore) provide('tableStore', tableStore)