修改测试问题

This commit is contained in:
zhujiyan
2024-06-05 13:28:21 +08:00
parent 709ddc143b
commit ae5339eff3
19 changed files with 652 additions and 3397 deletions

View File

@@ -15,6 +15,29 @@ export const addMointorPointTempLinedebug = (data: any) => {
})
}
/**
* 重新发起监测点联调表单数据
*/
export const updateMointorPointTempLinedebug = (data: any) => {
return createAxios({
url: '/supervision-boot/tempLinedebug/update',
method: 'POST',
data: data
})
}
/**
* 取消发起监测点联调表单数据
*/
export const cancelMointorPointTempLinedebug = (data: any) => {
return createAxios({
url: '/supervision-boot/tempLinedebug/cancel',
method: 'POST',
data: data
})
}
/**
* 根据id获取监测点联调的详细数据
*/

View File

@@ -2,14 +2,14 @@
<div ref="tableHeader" class="cn-table-header">
<div class="table-header ba-scroll-style">
<el-form
style="flex:1;height: 34px; margin-right: 20px; display: flex;flex-wrap:wrap;"
style="flex: 1; height: 34px; margin-right: 20px; display: flex; flex-wrap: wrap"
ref="headerForm"
@submit.prevent=""
@keyup.enter="onComSearch"
label-position="left"
:inline="true"
>
<el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 600px;">
<el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 600px">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
@@ -47,6 +47,7 @@ import Area from '@/components/form/area/index.vue'
import { mainHeight } from '@/utils/layout'
import { useDictData } from '@/stores/dictData'
import { Search, RefreshLeft } from '@element-plus/icons-vue'
import { defineProps } from 'vue'
const tableStore = inject('tableStore') as TableStore
const tableHeader = ref()

View File

@@ -6,6 +6,7 @@
:rules='rules'
label-width='auto'
class='form-one'
scroll-to-error
>
<el-form-item label='普测负责单位:'>
<el-input v-model='form.deptName' disabled></el-input>
@@ -95,7 +96,6 @@ const form: any = ref({
planEndTime: '',
planName: '',
substationName: '',
completeTime: '',
completeBy: '',
testReport: '',

View File

@@ -114,7 +114,7 @@ const tableStore = new TableStore({
},
click: row => {
// planTestRef.value.open('查看计划', row)
handleAudit(row.processInstanceId)
handleAudit(row.processInstanceId,row.historyInstanceId)
}
},
{
@@ -203,11 +203,12 @@ const cancelLeave = async (row: any) => {
/** 处理审批按钮 */
const handleAudit = (instanceId: any) => {
const handleAudit = (instanceId: any,historyInstanceId:any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
id: instanceId
state: {
id: instanceId,
historyInstanceId
}
})
}

View File

@@ -46,7 +46,7 @@
:disabled="openType == 'detail'"
/>
</el-form-item>
<el-form-item label="用户名称:" prop="projectName">
<el-form-item label="用户名称:" prop="projectName">
<el-input
v-model="form.projectName"
autocomplete="off"
@@ -54,7 +54,7 @@
:disabled="openType == 'detail'"
/>
</el-form-item>
<el-form-item label="用户状态:" prop="userStatus">
<el-form-item label="用户状态:" prop="userStatus">
<el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="openType == 'detail'">
<el-option
v-for="(item, index) in userStateList"
@@ -65,7 +65,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="变电站:" prop="substation">
<el-form-item label="变电站:" prop="substation">
<el-input
v-model="form.substation"
autocomplete="off"
@@ -73,7 +73,7 @@
:disabled="openType == 'detail'"
/>
</el-form-item>
<el-form-item v-if="form.userType == '0' || form.userType == '1'" label="电压等级:" prop="voltageLevel">
<el-form-item v-if="form.userType == '0' || form.userType == '1'" label="电压等级:" prop="voltageLevel">
<el-select
v-model="form.voltageLevel"
placeholder="请选择电压等级"
@@ -88,7 +88,7 @@
/>
</el-select>
</el-form-item>
<el-form-item
<el-form-item
v-if="form.userType == '0' || form.userType == '1'"
label="预测评估单位:"
prop="evaluationDept"
@@ -112,11 +112,7 @@
<el-radio :value="0"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
v-if="form.userReportSubstationPO"
label="是否开展背景测试:"
prop="backgroundTestPerformed"
>
<el-form-item v-if="form.userReportSubstationPO" label="是否开展背景测试:" prop="backgroundTestPerformed">
<el-radio-group
v-model="form.userReportSubstationPO.backgroundTestPerformed"
:disabled="openType == 'detail'"
@@ -143,7 +139,7 @@
<el-form-item label="填报部门:" prop="orgId">
<el-input v-model="form.orgId" :disabled="true" autocomplete="off" />
</el-form-item>
<el-form-item
<el-form-item
class="uploadFile"
:label="bussType == 0 ? '入网设计方案审查报告:' : '治理工程验收报告:'"
prop="goToNetReport"
@@ -175,7 +171,7 @@
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, defineProps, defineEmits } from 'vue'
import type { UploadProps, UploadRawFile } from 'element-plus'
import type { UploadProps, UploadRawFile } from 'element-plus'
import { genFileId, ElMessage } from 'element-plus'
import { useDictData } from '@/stores/dictData'
import { useAdminInfo } from '@/stores/adminInfo'
@@ -191,10 +187,10 @@ const props = defineProps({
id: {
type: String
},
bussType:{
bussType: {
type: Number
},
titleButton:{
titleButton: {
type: String
}
})
@@ -268,7 +264,7 @@ const resetForm = () => {
reporter: '', //填报人
reportDate: new Date(), //填报日期
orgId: '', //填报部门
goToNetReport:[],//报告
goToNetReport: [], //报告
userType: 0, //用户性质
city: areaOptionList[0].name, //所属地市
responsibleDepartment: '', //归口管理部门
@@ -278,8 +274,8 @@ const resetForm = () => {
backgroundTestPerformed: 0, //是否开展背景测试
antiInterferenceTest: 0, //是否开展抗扰度测试
voltageLevel: voltageLevelList[0].id, //电压等级
evaluationDept: evaluationDeptList[0].name, //预测评估单位
}
evaluationDept: evaluationDeptList[0].name //预测评估单位
}
form.value.reporter = adminInfo.$state.name
form.value.orgId = adminInfo.$state.deptName
}
@@ -301,24 +297,17 @@ const getInfo = async () => {
}
}
const open = () => {
dialogFormVisible.value = true
resetForm()
getInfo()
}
const close = () => {
//重置表单内容
resetForm()
dialogFormVisible.value = false
}
// 上传报告
const uploadRef = ref()
const handleExceed: UploadProps['onExceed'] = files => {
@@ -329,7 +318,7 @@ const handleExceed: UploadProps['onExceed'] = files => {
}
//移除文件上传
const removeFile = (file: any,uploadFiles:any) => {
const removeFile = (file: any, uploadFiles: any) => {
console.log(file, uploadFiles)
}
@@ -343,29 +332,28 @@ const choose = (e: any) => {
})
}
//提交
const confirmForm = () => {
if(goToNetReport.value ==null ||goToNetReport.value ==''){
if (goToNetReport.value == null || goToNetReport.value == '') {
return ElMessage({
message: '请上传报告',
message: props.bussType == 0 ? '请上传入网设计方案审查报告' : '请上传治理工程验收报告',
type: 'warning'
})
}
let data = {
let data = {
type: props.bussType,
userReportId: props.id,
reportUrl: goToNetReport.value
}
submitGoNet(data).then((res:any) => {
if(res.code==='A0000'){
submitGoNet(data).then((res: any) => {
if (res.code === 'A0000') {
ElMessage({
message: '新建流程成功',
type: 'success'
})
emits("onSubmit")
emits('onSubmit')
close()
}
}
})
}
defineExpose({ open })

View File

@@ -1,349 +0,0 @@
<template>
<div class="default-main">
<el-descriptions :column="2" border>
<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.projectName }}
</el-descriptions-item>
<!--文件地址-->
>
<el-descriptions-item label="终端台账信息">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.preliminaryDesignDescription.url">
{{ proviteData?.preliminaryDesignDescription.name }}
</a>
</el-descriptions-item>
<el-descriptions-item label="监测点台账信息">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.predictionEvaluationReport.url">
{{ proviteData?.predictionEvaluationReport.name }}
</a>
</el-descriptions-item>
<el-descriptions-item label="验收检验报告单">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.predictionEvaluationReviewOpinions.url">
{{ proviteData?.predictionEvaluationReviewOpinions.name }}
</a>
</el-descriptions-item>
<el-descriptions-item label="验收检验报告">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.sensitiveDevices.url">{{ proviteData?.sensitiveDevices.name }}</a>
</el-descriptions-item>
<el-descriptions-item label="型式实验报告">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.antiInterferenceReport.url">{{ proviteData?.antiInterferenceReport.name }}</a>
</el-descriptions-item>
<el-descriptions-item label="出厂检验报告">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.powerQualityReport.url">{{ proviteData?.powerQualityReport.name }}</a>
</el-descriptions-item>
<el-descriptions-item label="性能检测报告">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.antiInterferenceReport.url">{{ proviteData?.antiInterferenceReport.name }}</a>
</el-descriptions-item>
<el-descriptions-item label="信息安全检测报告">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.powerQualityReport.url">{{ proviteData?.powerQualityReport.name }}</a>
</el-descriptions-item>
<el-descriptions-item label="其他附件">
<el-icon>
<Link />
</el-icon>
<a :href="proviteData?.additionalAttachments.url">{{ proviteData?.additionalAttachments.name }}</a>
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive } from 'vue'
import { useRoute } from 'vue-router'
import { formatDate } from '@/utils/formatTime'
import { propTypes } from '@/utils/propTypes'
import { getUserReportById } from '@/api/supervision-boot/userReport/form'
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' })
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 userTypeList = reactive([
{
label: '新建电网工程',
value: '0'
},
{
label: '扩建电网工程',
value: '1'
},
{
label: '新建非线性负荷用户',
value: '2'
},
{
label: '扩建非线性负荷用户',
value: '3'
},
{
label: '新建新能源发电站',
value: '4'
},
{
label: '扩建新能源发电站',
value: '5'
},
{
label: '敏感及重要用户',
value: '6'
}
])
//用户状态数组
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 energyQualityIndexList = dictData.getBasicData('Indicator_Type')
//字典获取行业类型
const industryList = dictData.getBasicData('industry_type_jb')
//字典电压等级
const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
//字典评估类型
const evaluationTypeList = dictData.getBasicData('Evaluation_Type')
//字典预测评估单位
const evaluationDeptList = dictData.getBasicData('evaluation_dept')
/** 获得数据 */
const getInfo = async () => {
detailLoading.value = true
try {
await getUserReportById(props.id || queryId).then(res => {
detailData.value = res.data
getProviteData()
})
} finally {
detailLoading.value = false
}
}
const proviteData = ref()
//判断userType选择取用的对象
const getProviteData = async () => {
if (detailData.value.userType == '0' || detailData.value.userType == '1') {
proviteData.value = detailData.value.userReportProjectPO
//查询非线性设备类型
await getDictTreeById(proviteData.value.nonlinearDeviceType).then(res => {
proviteData.value.nonlinearDeviceType = res.data?.name
})
} else if (
detailData.value.userType == '2' ||
detailData.value.userType == '3' ||
detailData.value.userType == '4' ||
detailData.value.userType == '5'
) {
proviteData.value = detailData.value.userReportSubstationPO
//查询非线性负荷类型
await getDictTreeById(proviteData.value.nonlinearLoadType).then(res => {
proviteData.value.nonlinearLoadType = res.data?.name
})
} else {
proviteData.value = detailData.value.userReportSensitivePO
}
//可研报告
if (proviteData.value.feasibilityReport) {
await getFileNamePath(proviteData.value.feasibilityReport, 'feasibilityReport')
}
//终端台账信息
if (proviteData.value.preliminaryDesignDescription) {
await getFileNamePath(proviteData.value.preliminaryDesignDescription, 'preliminaryDesignDescription')
}
//预测评估报告
if (proviteData.value.predictionEvaluationReport) {
await getFileNamePath(proviteData.value.predictionEvaluationReport, 'predictionEvaluationReport')
}
//预测评估评审意见报告
if (proviteData.value.predictionEvaluationReviewOpinions) {
await getFileNamePath(
proviteData.value.predictionEvaluationReviewOpinions,
'predictionEvaluationReviewOpinions'
)
}
//用户接入变电站主接线示意图
if (proviteData.value.substationMainWiringDiagram) {
await getFileNamePath(proviteData.value.substationMainWiringDiagram, 'substationMainWiringDiagram')
}
//主要敏感设备清单
if (proviteData.value.sensitiveDevices) {
await getFileNamePath(proviteData.value.sensitiveDevices, 'sensitiveDevices')
}
//抗扰度测试报告
if (proviteData.value.antiInterferenceReport) {
await getFileNamePath(proviteData.value.antiInterferenceReport, 'antiInterferenceReport')
}
//背景电能质量测试报告
if (proviteData.value.powerQualityReport) {
await getFileNamePath(proviteData.value.powerQualityReport, 'powerQualityReport')
}
//其他附件
if (proviteData.value.additionalAttachments) {
getFileNamePath(proviteData.value.additionalAttachments, 'additionalAttachments')
}
}
//根据文件名请求
const getFileNamePath = async (val: any, pathName: any) => {
await getFileNameAndFilePath({ filePath: val }).then(res => {
if (res.data && res.data.name && res.data.url) {
//可研报告
if (pathName == 'feasibilityReport' && proviteData.value.feasibilityReport) {
proviteData.value.feasibilityReport = {
name: res.data.fileName,
url: res.data.url
}
}
//终端台账信息
else if (pathName == 'preliminaryDesignDescription' && proviteData.value.preliminaryDesignDescription) {
proviteData.value.preliminaryDesignDescription = {
name: res.data.fileName,
url: res.data.url
}
}
//预测评估报告
else if (pathName == 'predictionEvaluationReport' && proviteData.value.predictionEvaluationReport) {
proviteData.value.predictionEvaluationReport = {
name: res.data.fileName,
url: res.data.url
}
}
//预测评估评审意见报告
else if (
pathName == 'predictionEvaluationReviewOpinions' &&
proviteData.value.predictionEvaluationReviewOpinions
) {
proviteData.value.predictionEvaluationReviewOpinions = {
name: res.data.fileName,
url: res.data.url
}
}
//用户接入变电站主接线示意图
else if (pathName == 'substationMainWiringDiagram' && proviteData.value.substationMainWiringDiagram) {
proviteData.value.substationMainWiringDiagram = {
name: res.data.fileName,
url: res.data.url
}
}
//主要敏感设备清单
else if (pathName == 'sensitiveDevices' && proviteData.value.sensitiveDevices) {
proviteData.value.sensitiveDevices = {
name: res.data.fileName,
url: res.data.url
}
}
//抗扰度测试报告
else if (pathName == 'antiInterferenceReport' && proviteData.value.antiInterferenceReport) {
proviteData.value.antiInterferenceReport = {
name: res.data.fileName,
url: res.data.url
}
}
//背景电能质量测试报告
else if (pathName == 'powerQualityReport' && proviteData.value.powerQualityReport) {
proviteData.value.powerQualityReport = {
name: res.data.fileName,
url: res.data.url
}
}
//其他附件
else if (pathName == 'additionalAttachments' && proviteData.value.additionalAttachments) {
proviteData.value.additionalAttachments = {
name: res.data.fileName,
url: res.data.url
}
}
}
})
}
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

@@ -1,217 +0,0 @@
<!---终端入网检测-->
<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" />
<!-- 新增弹框 -->
<addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
</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 addForm from './addForm.vue'
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/deVReport/list',
publicHeight: 65,
method: 'POST',
column: [
{ title: '序号', type: 'seq', width: 80 },
{ field: 'orgName', title: '填报部门名称' },
{ field: 'reportDate', title: '填报日期'},
{ field: 'reporter', title: '填报人', minWidth: 80 },
{
field: 'status',
title: '审核状态',
minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消'
}
},
{ field: 'monitoringTerminalName', 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: '操作',
minWidth: 150,
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId)
}
}
]
}
],
beforeSearchFun: () => {
tableStore.table.params.orgNo = tableStore.table.params.deptIndex
// tableStore.table.params.relationUserName = tableStore.table.params.userName
}
})
// tableStore.table.params.loadType = ''
// tableStore.table.params.userName = ''
// tableStore.table.params.fileUploadflag = ''
provide('tableStore', tableStore)
const addForms = ref()
const addFormModel = () => {
setTimeout(() => {
addForms.value.open()
}, 0);
}
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 getUserTypeName = (userType: any) => {
if (userType === 0) {
return '新建电网工程'
}
if (userType === 1) {
return '扩建电网工程'
}
if (userType === 2) {
return '新建非线性负荷用户'
}
if (userType === 3) {
return '扩建非线性负荷用户'
}
if (userType === 4) {
return '新建新能源发电站'
}
if (userType === 5) {
return '扩建新能源发电站'
}
if (userType === 6) {
return '敏感及重要用户'
}
return '新建电网工程'
}
</script>
<style scoped lang="scss">
:deep(.el-upload-list__item) {
width: 400px;
}
::v-deep .el-input__wrapper {
// width: 200px !important;
}
</style>

View File

@@ -11,7 +11,7 @@
custom-class="fixed-dialog"
@closed="close"
> -->
<TableHeader area datePicker ref="TableHeaderRef">
<TableHeader :showSearch="false" ref="TableHeaderRef">
<!-- <template #select>
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>

View File

@@ -186,6 +186,9 @@ const tableStore = new TableStore({
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id ||row.status!=3
},
click: row => {
handleEffectProblem(row)
}

View File

@@ -122,7 +122,7 @@ const open = async (text: string, tempData?: any) => {
}
form.value.deviceType = '1'
form.value.devStatus = '0'
changeType(form.value.deviceType)
// changeType(form.value.deviceType)
dialogVisible.value = true
}

View File

@@ -19,19 +19,21 @@
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref ,watch} from 'vue'
import { useRouter } from 'vue-router'
import MonitorQuitPopup from '@/views/pqs/supervise/retire/monitorQuitPopup.vue'
import { ElMessage } from 'element-plus'
import { ElMessageBox } from 'element-plus/es'
import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
defineOptions({
name: 'supervision/retire'
})
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const deviceQuitPopup = ref()
const tableStore = new TableStore({
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
@@ -108,7 +110,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status !== 3
return row.createBy != adminInfo.$state.id || row.status !== 3
},
click: row => {
deviceQuitPopup.value.open('重新发起退运', row)
@@ -121,7 +123,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
return row.createBy != adminInfo.$state.id || row.status !== 1
},
click: row => {
cancelLeave(row)
@@ -185,5 +187,17 @@ const cancelLeave = async (row: any) => {
tableStore.index()
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>

View File

@@ -1,59 +1,51 @@
<template>
<el-dialog
draggable
class='cn-operate-dialog'
v-model='dialogVisible'
:title='title'
width='450px'
top='20vh'
>
<el-scrollbar>
<el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
<!-- <el-form-item label="设备类型" prop="deviceType">
<el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="450px" top="20vh">
<el-scrollbar>
<el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
<!-- <el-form-item label="设备类型" prop="deviceType">
<el-radio-group v-model="form.deviceType" :disabled="title == '监测点退运'" @change="changeType">
<el-radio border label="1">监测装置</el-radio>
<el-radio border label="2">监测点</el-radio>
</el-radio-group>
</el-form-item> -->
<el-form-item label="监测点" prop="deviceId">
<el-tree-select
v-model="form.deviceId"
:data="data"
filterable
:default-expand-all="true"
style="width: 100%"
@change="changeDevStatus"
clearable
/>
</el-form-item>
<el-form-item label='监测点' prop='deviceId'>
<el-tree-select
v-model='form.deviceId'
:data='data'
filterable
:default-expand-all='true'
style='width: 100%'
@change='changeDevStatus'
clearable
/>
</el-form-item>
<el-form-item label='退运原因' prop='propertyNo'>
<!-- <el-input
<el-form-item label="退运原因" prop="propertyNo">
<!-- <el-input
v-model='form.propertyNo'
clearable
placeholder='请输入退役原因'
/> -->
<el-input
type='textarea'
clearable
:autosize='{ minRows: 2, maxRows: 4 }'
placeholder='请输入退运原因'
v-model='form.propertyNo'
></el-input>
</el-form-item>
</el-form>
</el-scrollbar>
<el-input
type="textarea"
clearable
:autosize="{ minRows: 2, maxRows: 4 }"
placeholder="请输入退运原因"
v-model="form.propertyNo"
></el-input>
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<span class='dialog-footer'>
<el-button @click='dialogVisible = false'>取消</el-button>
<el-button type='primary' @click='submit'>确认</el-button>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submit">确认</el-button>
</span>
</template>
</el-dialog>
</template>
</el-dialog>
</template>
<script lang='ts' setup>
<script lang="ts" setup>
import { ref, inject } from 'vue'
import { ElMessage } from 'element-plus'
import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
@@ -72,75 +64,75 @@ const formRef = ref()
const dialogVisible = ref(false)
// 注意不要和表单ref的命名冲突
const form = ref({
id: '',
deviceId: '',
deviceType: '2',
devOriginalStatus: '0',
propertyNo: ''
id: '',
deviceId: '',
deviceType: '2',
devOriginalStatus: '0',
propertyNo: ''
})
//form表单校验规则
const rules = {
deviceId: [{ required: true, message: '设备不能为空', trigger: 'change' }],
propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
deviceId: [{ required: true, message: '设备不能为空', trigger: 'change' }],
propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
}
const resetForm = () => {
if (formRef.value) {
formRef.value.resetFields()
}
if (formRef.value) {
formRef.value.resetFields()
}
}
const open = async (text: string, tempData?: any) => {
title.value = text
//监测点
await getTerminalSelectTree(6).then(res => {
lineList.value = res.data
})
sourceData.value = lineList.value
data.value = lineList.value
if (tempData) {
// 表单赋值
for (let key in form.value) {
form.value[key] = tempData[key]
title.value = text
//监测点
await getTerminalSelectTree(6).then(res => {
lineList.value = res.data
})
sourceData.value = lineList.value
data.value = lineList.value
if (tempData) {
// 表单赋值
for (let key in form.value) {
form.value[key] = tempData[key]
}
form.value.deviceType = form.value.deviceType + ''
} else {
resetForm()
// 在此处恢复默认表单
for (let key in form.value) {
form.value[key] = ''
}
form.value.deviceType = '1'
}
form.value.deviceType = form.value.deviceType + ''
} else {
resetForm()
// 在此处恢复默认表单
for (let key in form.value) {
form.value[key] = ''
}
form.value.deviceType = '1'
}
form.value.deviceType = '2'
changeType(form.value.deviceType)
dialogVisible.value = true
form.value.deviceType = '2'
dialogVisible.value = true
}
/**
* 提交用户表单数据
*/
const submit = () => {
formRef.value.validate(async (valid: any) => {
if (valid) {
if (form.value.devOriginalStatus == '4') {
ElMessage.warning('终端当前状态就是退运,无需变更!')
} else {
if (form.value.id) {
await quitRunningDeviceUpdate(form.value)
ElMessage.success('重新发起成功')
tableStore.index()
dialogVisible.value = false
} else {
await addRunningDevice(form.value)
//查询进线数据避免一直处于loading状态
ElMessage.success('申请成功')
tableStore.index()
dialogVisible.value = false
formRef.value.validate(async (valid: any) => {
if (valid) {
if (form.value.devOriginalStatus == '4') {
ElMessage.warning('终端当前状态就是退运,无需变更!')
} else {
if (form.value.id) {
await quitRunningDeviceUpdate(form.value)
ElMessage.success('重新发起成功')
tableStore.index()
dialogVisible.value = false
} else {
await addRunningDevice(form.value)
//查询进线数据避免一直处于loading状态
ElMessage.success('申请成功')
tableStore.index()
dialogVisible.value = false
}
}
}
}
}
})
})
}
/**
@@ -148,31 +140,31 @@ const submit = () => {
*/
const changeType = (event: any) => {
sourceData.value = lineList.value
form.value.deviceId = ''
data.value = sourceData.value
sourceData.value = lineList.value
form.value.deviceId = ''
data.value = sourceData.value
}
const changeDevStatus = async (event: any) => {
await getLineDetailData(event).then(res => {
//给当前设备赋值初始运行状态
switch (res.data.runFlag) {
case '投运':
form.value.devOriginalStatus = '0'
break
case '检修':
form.value.devOriginalStatus = '1'
break
case '停运':
form.value.devOriginalStatus = '2'
break
case '调试':
form.value.devOriginalStatus = '3'
break
default:
form.value.devOriginalStatus = '4'
break
}
})
await getLineDetailData(event).then(res => {
//给当前设备赋值初始运行状态
switch (res.data.runFlag) {
case '投运':
form.value.devOriginalStatus = '0'
break
case '检修':
form.value.devOriginalStatus = '1'
break
case '停运':
form.value.devOriginalStatus = '2'
break
case '调试':
form.value.devOriginalStatus = '3'
break
default:
form.value.devOriginalStatus = '4'
break
}
})
}
defineExpose({ open })
@@ -180,10 +172,10 @@ defineExpose({ open })
<style scoped>
.el-upload-list__item {
transition: none !important;
transition: none !important;
}
.el-select {
min-width: 180px;
min-width: 180px;
}
</style>

View File

@@ -1,214 +1,232 @@
<!--待办事项列表-->
<template>
<div class='default-main'>
<TableHeader date-picker>
<template v-slot:select>
<!-- <el-form-item label='任务名称'>-->
<!-- <el-input-->
<!-- v-model='tableStore.table.params.searchValue'-->
<!-- clearable-->
<!-- placeholder='请输入任务名称'-->
<!-- />-->
<!-- </el-form-item>-->
</template>
<template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='add'>新增</el-button>
</template>
</TableHeader>
<!--表格-->
<Table ref='tableRef'></Table>
<!--弹框-->
<device-quit-popup ref='deviceQuitPopup' />
</div>
<div class="default-main">
<TableHeader date-picker>
<template v-slot:select>
<!-- <el-form-item label='任务名称'>-->
<!-- <el-input-->
<!-- v-model='tableStore.table.params.searchValue'-->
<!-- clearable-->
<!-- placeholder='请输入任务名称'-->
<!-- />-->
<!-- </el-form-item>-->
</template>
<template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
</template>
</TableHeader>
<!--表格-->
<Table ref="tableRef"></Table>
<!--弹框-->
<device-quit-popup ref="deviceQuitPopup" />
</div>
</template>
<script setup lang='ts'>
<script setup lang="ts">
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
import { ElMessage } from 'element-plus'
import { ElMessageBox } from 'element-plus/es'
import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
defineOptions({
name: 'supervision/retire'
name: 'supervision/retire'
})
const { push } = useRouter()
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const deviceQuitPopup = ref()
const tableStore = new TableStore({
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
column: [
{
field: 'index',
title: '序号',
width: '60',
formatter: (row: any) => {
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
}
},
{ title: '供电公司', field: 'gdName', minWidth: 130 },
{ title: '变电站', field: 'subName', minWidth: 160 },
{ title: '终端名称', field: 'deviceName', minWidth: 130 },
{ title: '变更原因', field: 'propertyNo', minWidth: 160 },
{
title: '当前状态', field: 'devOriginalStatus', minWidth: 130,
render: 'tag',
custom: {
0: 'success',
1: 'warning',
2: 'danger',
3: 'warning',
4: 'info'
},
replaceValue: {
0: '运行',
1: '检修',
2: '运',
3: '调试',
4: '退运'
}
},
{
title: '变更状态', field: 'devStatus', minWidth: 130,
render: 'tag',
custom: {
0: 'success',
1: 'warning',
2: 'danger',
3: 'warning',
4: 'info'
},
replaceValue: {
0: '运行',
1: '检修',
2: '停运',
3: '调试',
4: '退运'
}
},
{
field: 'status', title: '审核状态', minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消'
}
},
{ field: 'createTime', title: '开始时间', minWidth: 170 },
url: '/supervision-boot/quitRunningDevice/list',
method: 'POST',
column: [
{
field: 'index',
title: '序号',
width: '60',
formatter: (row: any) => {
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
}
},
{ title: '供电公司', field: 'gdName', minWidth: 130 },
{ title: '变电站', field: 'subName', minWidth: 160 },
{ title: '终端名称', field: 'deviceName', minWidth: 130 },
{ title: '变更原因', field: 'propertyNo', minWidth: 160 },
{
title: '当前状态',
field: 'devOriginalStatus',
minWidth: 130,
render: 'tag',
custom: {
0: 'success',
1: 'warning',
2: 'danger',
3: 'warning',
4: 'info'
},
replaceValue: {
0: '运',
1: '检修',
2: '运',
3: '调试',
4: '退运'
}
},
{
title: '变更状态',
field: 'devStatus',
minWidth: 130,
render: 'tag',
custom: {
0: 'success',
1: 'warning',
2: 'danger',
3: 'warning',
4: 'info'
},
replaceValue: {
0: '运行',
1: '检修',
2: '停运',
3: '调试',
4: '退运'
}
},
{
field: 'status',
title: '审核状态',
minWidth: 100,
render: 'tag',
custom: {
1: 'primary',
2: 'success',
3: 'danger',
4: 'warning'
},
replaceValue: {
1: '审批中',
2: '审批通过',
3: '审批不通过',
4: '已取消'
}
},
{ field: 'createTime', title: '开始时间', minWidth: 170 },
{
title: '操作',
align: 'center',
minWidth: '150',
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status !== 3
},
click: row => {
deviceQuitPopup.value.open('重新发起终端状态变更', row)
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.status == 3 || row.status == 2 || row.status == 4
},
click: row => {
cancelLeave(row)
}
title: '操作',
align: 'center',
minWidth: '150',
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status !== 3
},
click: row => {
deviceQuitPopup.value.open('重新发起终端状态变更', row)
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status != 1
},
click: row => {
cancelLeave(row)
}
}
]
}
]
],
beforeSearchFun: () => {
for (let key in tableStore.table.params) {
if (tableStore.table.params[key] === '') {
delete tableStore.table.params[key]
}
}
tableStore.table.params.deviceType = 1
}
],
beforeSearchFun: () => {
for (let key in tableStore.table.params) {
if (tableStore.table.params[key] === '') {
delete tableStore.table.params[key]
}
}
tableStore.table.params.deviceType = 1
}
})
onMounted(() => {
// 加载数据
tableStore.index()
// 加载数据
tableStore.index()
})
tableStore.table.params.searchValue = ''
provide('tableStore', tableStore)
//新增退运设备信息
const add = () => {
deviceQuitPopup.value.open('新增终端状态变更')
deviceQuitPopup.value.open('新增终端状态变更')
}
/** 流程实例详情 */
const handleAudit = (instanceId: string, historyInstanceId: string) => {
push({
name: 'BpmProcessInstanceDetail',
state: {
id: instanceId,
historyInstanceId
}
})
push({
name: 'BpmProcessInstanceDetail',
state: {
id: instanceId,
historyInstanceId
}
})
}
/**取消流程操作*/
const cancelLeave = async (row: any) => {
// 二次确认
const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格
inputErrorMessage: '取消原因不能为空'
})
// 发起取消
let data = {
id: row.id,
processInstanceId: row.processInstanceId,
reason: value
}
await cancelQuitRunningDevice(data)
ElMessage.success('取消成功')
// 加载数据
tableStore.index()
// 二次确认
const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格
inputErrorMessage: '取消原因不能为空'
})
// 发起取消
let data = {
id: row.id,
processInstanceId: row.processInstanceId,
reason: value
}
await cancelQuitRunningDevice(data)
ElMessage.success('取消成功')
// 加载数据
tableStore.index()
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>

View File

@@ -1,35 +1,34 @@
<template>
<div>
<TableHeader ref='TableHeaderRef'>
<template #select>
<el-form-item label='用户名称'>
<el-input v-model='tableStore.table.params.projectName' clearable></el-input>
</el-form-item>
<el-form-item label='所属地市'>
<el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所属地市'>
<el-option
v-for='item in areaOptionList'
:key='item.id'
:label='item.name'
:value='item.name'
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation>
<el-button icon='el-icon-Download' type='primary' @click='exportExcelTemplate'>模板下载</el-button>
<el-button icon='el-icon-Download' type='primary' @click='importUserData'>批量导入</el-button>
</template>
</TableHeader>
<Table ref='tableRef' />
<el-dialog title='详情' width='80%' v-model='dialogShow'>
<DetailInfo :id='userId'></DetailInfo>
</el-dialog>
<sensitive-user-popup ref='sensitiveUserPopup' />
</div>
<div>
<TableHeader ref="TableHeaderRef">
<template #select>
<el-form-item label="用户名称">
<el-input v-model="tableStore.table.params.projectName" clearable></el-input>
</el-form-item>
<el-form-item label="所属地市">
<el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
<el-option
v-for="item in areaOptionList"
:key="item.id"
:label="item.name"
:value="item.name"
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation>
<el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate">模板下载</el-button>
<el-button icon="el-icon-Download" type="primary" @click="importUserData">批量导入</el-button>
</template>
</TableHeader>
<Table ref="tableRef" />
<el-dialog title="详情" width="80%" v-model="dialogShow">
<DetailInfo :id="userId"></DetailInfo>
</el-dialog>
<sensitive-user-popup ref="sensitiveUserPopup" />
</div>
</template>
<script setup lang='ts'>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
@@ -46,74 +45,85 @@ const areaOptionList = dictData.getBasicData('jibei_area')
const loadLevelOptionList = dictData.getBasicData('load_level')
const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
const tableStore = new TableStore({
url: '/supervision-boot/userReport/getSensitiveUserPage',
publicHeight: 65,
method: 'POST',
column: [
{
title: '序号',
width: 60,
formatter: (row: any) => {
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
}
},
{ field: 'projectName', title: '用户名称', minWidth: 170 },
{ field: 'city', title: '所属地市', minWidth: 80 },
// { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
{
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: 'userReportSensitivePO.loadLevel', title: '负荷级别', minWidth: 170,
formatter: (row: any) => {
return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
}
},
{
field: 'userReportSensitivePO.powerSupplyInfo', title: '供电电源情况', minWidth: 170,
formatter: (row: any) => {
return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
}
},
{
title: '操作',
minWidth: 150,
fixed: 'right',
render: 'buttons',
buttons: [
url: '/supervision-boot/userReport/getSensitiveUserPage',
publicHeight: 65,
method: 'POST',
column: [
{
name: 'productSetting',
title: '详细信息',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
lookInfo(row.id)
}
title: '序号',
width: 60,
formatter: (row: any) => {
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
}
},
{ field: 'projectName', title: '用户名称', minWidth: 170 },
{ field: 'city', title: '所属地市', minWidth: 80 },
// { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
{
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,
formatter: (row: any) => {
return row.cellValue ? row.cellValue : '/'
}
},
{
field: 'userReportSensitivePO.loadLevel',
title: '负荷级别',
minWidth: 170,
formatter: (row: any) => {
return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
}
},
{
field: 'userReportSensitivePO.powerSupplyInfo',
title: '供电电源情况',
minWidth: 170,
formatter: (row: any) => {
return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
}
},
{
title: '操作',
minWidth: 150,
fixed: 'right',
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '详细信息',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
lookInfo(row.id)
}
}
]
}
]
}
],
],
beforeSearchFun: () => {
tableStore.table.params.orgNo = tableStore.table.params.deptIndex
}
beforeSearchFun: () => {
tableStore.table.params.orgNo = tableStore.table.params.deptIndex
}
})
tableStore.table.params.city = ''
tableStore.table.params.projectName = ''
@@ -126,63 +136,59 @@ const userId = ref()
const dialogShow = ref(false)
const lookInfo = (id: string) => {
userId.value = id
dialogShow.value = true
userId.value = id
dialogShow.value = true
}
provide('tableStore', tableStore)
onMounted(() => {
tableStore.index()
tableStore.index()
})
/**获取用户性质*/
const getUserTypeName = (userType: any) => {
if (userType === 0) {
if (userType === 0) {
return '新建电网工程'
}
if (userType === 1) {
return '扩建电网工程'
}
if (userType === 2) {
return '新建非线性负荷用户'
}
if (userType === 3) {
return '扩建非线性负荷用户'
}
if (userType === 4) {
return '新建新能源发电站'
}
if (userType === 5) {
return '扩建新能源发电站'
}
if (userType === 6) {
return '敏感及重要用户'
}
return '新建电网工程'
}
if (userType === 1) {
return '扩建电网工程'
}
if (userType === 2) {
return '新建非线性负荷用户'
}
if (userType === 3) {
return '扩建非线性负荷用户'
}
if (userType === 4) {
return '新建新能源发电站'
}
if (userType === 5) {
return '扩建新能源发电站'
}
if (userType === 6) {
return '敏感及重要用户'
}
return '新建电网工程'
}
//导出模板
const exportExcelTemplate = () => {
downloadSensitiveUserTemplate().then((res: any) => {
let blob = new Blob([res], {
type: 'application/vnd.ms-excel'
downloadSensitiveUserTemplate().then((res: any) => {
let blob = new Blob([res], {
type: 'application/vnd.ms-excel'
})
const url = window.URL.createObjectURL(blob)
const link = document.createElement('a')
link.href = url
link.download = '敏感及重要用户模板'
document.body.appendChild(link)
link.click()
link.remove()
})
const url = window.URL.createObjectURL(blob)
const link = document.createElement('a')
link.href = url
link.download = '敏感及重要用户模板'
document.body.appendChild(link)
link.click()
link.remove()
})
}
//批量导入用户数据
const importUserData = () => {
sensitiveUserPopup.value.open('导入敏感及重要用户')
sensitiveUserPopup.value.open('导入敏感及重要用户')
}
</script>

View File

@@ -1,7 +1,7 @@
<template>
<el-dialog
v-model="dialogFormVisible"
title="申请联调"
:title="title"
width="30%"
:append-to-body="true"
:before-close="close"
@@ -41,7 +41,10 @@
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'
import {
addMointorPointTempLinedebug,
updateMointorPointTempLinedebug
} from '@/api/supervision-boot/jointDebugList/index'
const emits = defineEmits(['onSubmit'])
const props = defineProps({
debugId: {
@@ -58,7 +61,8 @@ const selectFormType = ref('')
selectFormType.value = '0'
const resetForm = () => {
form.value = {
reason: '' //填报人
reason: '', //填报人
id: ''
}
}
//初始化数据
@@ -82,8 +86,12 @@ watch(
immediate: true
}
)
const open = () => {
const title = ref('')
const open = (text: any, row: any) => {
dialogFormVisible.value = true
title.value = text
form.value.id = row.id
form.value.reason=row.reason
}
const close = () => {
//重置表单内容
@@ -107,15 +115,19 @@ const confirmForm = () => {
ruleFormRef.value.validate(valid => {
if (valid) {
//提交监测点联调信息
form.value = {
...form.value,
id: props.debugId
if (title.value != '重新发起') {
addMointorPointTempLinedebug(form.value).then(res => {
ruleFormRef.value.resetFields()
resetForm()
close()
})
} else {
updateMointorPointTempLinedebug(form.value).then(res => {
ruleFormRef.value.resetFields()
resetForm()
close()
})
}
addMointorPointTempLinedebug(form.value).then(res => {
ruleFormRef.value.resetFields()
resetForm()
close()
})
} else {
console.log('表单验证失败')
return false

View File

@@ -37,19 +37,20 @@ import { getLoadTypeUserList } from '@/api/process-boot/interference'
import { setTempLinedebugLedgerSync } from '@/api/supervision-boot/jointDebugList/index'
import debug from './debug.vue'
import { any } from 'vue-types'
import { cancelMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
const dictData = useDictData()
const { push, beforeEach } = useRouter()
beforeEach((to, from) => {
if (from.path == '/bpm/instanceDetail') {
console.log('联调333')
}
})
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
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,
@@ -65,6 +66,17 @@ const tableStore = new TableStore({
}
},
{ field: 'lineName', title: '监测点名称', minWidth: 170 },
{
field: 'reason',
title: '调试原因',
minWidth: 170,
formatter: (row: any) => {
return row.cellValue ? row.cellValue : '/'
}
},
{ field: 'lineId', title: '监测点编号', minWidth: 170 },
// { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 },
{ field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 },
{
field: 'status',
title: '审核状态',
@@ -86,17 +98,6 @@ const tableStore = new TableStore({
null: '/'
}
},
{
field: 'reason',
title: '调试原因',
minWidth: 170,
formatter: (row: any) => {
return row.cellValue ? row.cellValue : '/'
}
},
{ field: 'lineId', title: '监测点编号', minWidth: 170 },
// { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 },
{ field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 },
{
title: '操作',
minWidth: 150,
@@ -110,7 +111,8 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId)
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
},
disabled: row => {
return !row.processInstanceId
@@ -123,12 +125,40 @@ const tableStore = new TableStore({
icon: 'el-icon-add',
render: 'basicButton',
click: row => {
handleDebug(row)
// handleDebug(row)
debugForms.value.open('申请联调', row)
},
disabled: row => {
return row.reason
}
},
{
name: 'edit',
title: '重新发起',
type: 'warning',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status != 3
},
click: row => {
debugForms.value.open('重新发起', row)
}
},
{
name: 'cancel',
title: '取消',
type: 'danger',
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status != 1
},
click: row => {
cancelLeave(row)
}
},
{
name: 'productSetting',
title: '同步台账',
@@ -189,11 +219,12 @@ onMounted(() => {
})
/** 处理审批按钮 */
const handleAudit = (instanceId: any) => {
const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
id: instanceId
state: {
id: instanceId,
historyInstanceId
}
})
}
@@ -203,8 +234,40 @@ const debugId = ref('')
const handleDebug = (row: any) => {
debugId.value = row.id
console.log(debugId.value)
debugForms.value.open()
debugForms.value.open('申请联调', row)
}
/**取消流程操作*/
const cancelLeave = async (row: any) => {
// 二次确认
const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空,且非空格
inputErrorMessage: '取消原因不能为空'
})
// 发起取消
let data = {
id: row.id,
processInstanceId: row.processInstanceId,
reason: value
}
await cancelMointorPointTempLinedebug(data)
ElMessage.success('取消成功')
// 加载数据
tableStore.index()
}
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
</script>
<style scoped lang="scss">

View File

@@ -39,10 +39,10 @@
</el-upload>
</div>
<!-- 基础信息 -->
<el-form-item for="-" label="填报人:" prop="reporterName">
<el-form-item v-if="false" for="-" label="填报人:" prop="reporterName">
<el-input v-model="form.reporterName" autocomplete="off" placeholder="请输入填报人" :disabled="true" />
</el-form-item>
<el-form-item for="-" label="填报日期:" prop="reportDate">
<el-form-item v-if="false" for="-" label="填报日期:" prop="reportDate">
<el-date-picker
style="width: 100%"
v-model="form.reportDate"
@@ -53,10 +53,10 @@
placeholder="请选择填报日期"
/>
</el-form-item>
<el-form-item for="-" label="填报部门:" prop="orgId">
<el-form-item v-if="false" for="-" label="填报部门:" prop="orgId">
<el-input v-model="form.orgName" :disabled="true" autocomplete="off" />
</el-form-item>
<el-form-item for="-" label="工程投产日期:" prop="expectedProductionDate">
<el-form-item v-if="false" for="-" label="工程投产日期:" prop="expectedProductionDate">
<el-date-picker
style="width: 100%"
v-model="form.expectedProductionDate"
@@ -68,7 +68,7 @@
placeholder="请选择工程投产日期"
/>
</el-form-item>
<el-form-item for="-" label="所属地市:" prop="city">
<el-form-item v-if="false" for="-" label="所属地市:" prop="city">
<el-select
v-model="form.city"
clearable
@@ -84,7 +84,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item for="-" label="用户状态:" prop="userStatus">
<el-form-item v-if="false" for="-" label="用户状态:" prop="userStatus">
<el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="true" style="width: 100%">
<el-option
v-for="(item, index) in userStateList"

View File

@@ -200,7 +200,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item for="-" label="通讯状态:" prop="communicationStatus">
<el-form-item v-if="false" for="-" label="通讯状态:" prop="communicationStatus">
<el-select
v-model="form.communicationStatus"
clearable