From f33aed9b89b925618431d5a20844266d243516c8 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 18 Jun 2024 09:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E6=9C=AF=E7=9B=91?=
=?UTF-8?q?=E7=9D=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../package/theme/process-panel.scss | 2 +-
.../pqs/process/definition/editor/index.vue | 3 +-
.../panorama/components/line/info.vue | 2 +-
.../supervise/harmonicSurvey/test/detail.vue | 2 +-
.../normalizationManager/detail.vue | 18 +-
.../interferenceUserTable.vue | 2 +-
.../components/undocumented/detail.vue | 19 +-
.../components/undocumented/index.vue | 2 +-
.../pqs/supervise/plan/components/detail.vue | 44 ++--
src/views/pqs/supervise/technology/detail.vue | 2 +-
.../supervise/technology/feedbackPopup.vue | 2 +-
.../components/cycleDetection/detail.vue | 2 +-
.../components/jointDebugList/detail.vue | 10 +-
.../components/monitorpoint/addForm.vue | 81 ++++++--
.../components/monitorpoint/detail.vue | 8 +-
.../components/terminainal/detail.vue | 8 +-
.../supervise/testRun/components/detail.vue | 10 +-
src/views/system/bpm/model/editor/index.vue | 194 +++++++++---------
18 files changed, 233 insertions(+), 178 deletions(-)
diff --git a/src/components/bpmnProcessDesigner/package/theme/process-panel.scss b/src/components/bpmnProcessDesigner/package/theme/process-panel.scss
index f840cdde..08eba26a 100644
--- a/src/components/bpmnProcessDesigner/package/theme/process-panel.scss
+++ b/src/components/bpmnProcessDesigner/package/theme/process-panel.scss
@@ -3,7 +3,7 @@
padding: 0 8px;
border-left: 1px solid #eeeeee;
box-shadow: 0 0 8px #cccccc;
- max-height: 100%;
+ max-height: calc(100vh - 200px);
overflow-y: scroll;
}
.panel-tab__title {
diff --git a/src/views/pqs/process/definition/editor/index.vue b/src/views/pqs/process/definition/editor/index.vue
index 194a7678..356abcaa 100644
--- a/src/views/pqs/process/definition/editor/index.vue
+++ b/src/views/pqs/process/definition/editor/index.vue
@@ -117,7 +117,8 @@ onMounted(async () => {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
index 78e24f67..bfbdfe66 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
@@ -694,7 +694,7 @@ defineExpose({ open })
}
.conclusion {
display: inline-block;
- padding: 0 5px;
+ padding: 2px 5px;
height: 20px;
border-radius: 4px;
}
diff --git a/src/views/pqs/supervise/harmonicSurvey/test/detail.vue b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
index c2b67dd7..9c6692bc 100644
--- a/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
@@ -172,6 +172,6 @@ onMounted(() => {
\ No newline at end of file
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
index 8f4ead1c..3d433063 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue
@@ -652,17 +652,17 @@ onMounted(() => {
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index 36d054fe..439d8d55 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -47,7 +47,7 @@ import { getUserReportById } from '@/api/supervision-boot/userReport/form'
import BpmUserReportDetail from '../../components/undocumented/detail.vue'
import { useAdminInfo } from '@/stores/adminInfo'
const dictData = useDictData()
-const areaOptionList = dictData.getBasicData('jibei_area')
+const areaOptionList = dictData.getBasicData('jibei_area').filter(item => !(item.name == '超高压' || item.name == '风光储'))
const statusSelect = dictData.statusSelect()
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
index 17c03065..fc6dec4f 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
@@ -630,20 +630,21 @@ onMounted(() => {
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index 96a7c54d..77cc8569 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -61,7 +61,7 @@ const dictData = useDictData()
const { push, options, currentRoute } = useRouter()
const TableHeaderRef = ref()
const tableRef = ref()
-const areaOptionList = dictData.getBasicData('jibei_area')
+const areaOptionList = dictData.getBasicData('jibei_area').filter(item => !(item.name == '超高压' || item.name == '风光储'))
const statusSelect = dictData.statusSelect()
const addRef = ref()
const AuditRef = ref()
diff --git a/src/views/pqs/supervise/plan/components/detail.vue b/src/views/pqs/supervise/plan/components/detail.vue
index 326ca30c..29833a12 100644
--- a/src/views/pqs/supervise/plan/components/detail.vue
+++ b/src/views/pqs/supervise/plan/components/detail.vue
@@ -104,42 +104,42 @@
{{ detailData.otherRemark }}
-
-
+
+
{{ detailData?.factoryInspectionReport.name }}
-
-
+
+
{{ detailData?.informationSecurityTestReport.name }}
-
-
+
+
{{ detailData?.otherAttachments.name }}
-
-
+
+
{{ detailData?.performanceTestReport.name }}
-
-
+
+
{{ detailData?.typeExperimentReport.name }}
-
-
+
+
{{ detailData?.performanceTestReport.name }}
@@ -153,14 +153,14 @@ import { propTypes } from '@/utils/propTypes'
import { useDictData } from '@/stores/dictData'
import { getFileNameAndFilePath } from '@/api/system-boot/file'
import { getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
-import { Link } from '@element-plus/icons-vue'
+import { Link, View } from '@element-plus/icons-vue'
import { useAdminInfo } from '@/stores/adminInfo'
defineOptions({ name: 'BpmUserReportDetail' })
const { query } = useRoute() // 查询参数
const props = defineProps({
id: propTypes.string.def(undefined)
})
-console.log(propTypes.string.def(undefined),"999999999999传参");
+console.log(propTypes.string.def(undefined), '999999999999传参')
const detailLoading = ref(false) // 表单的加载中
const detailData = ref({}) // 详情数据
const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
@@ -199,7 +199,7 @@ getEffectUserList()
/** 获得数据 */
const getInfo = async () => {
detailLoading.value = true
- console.log(props.id , queryId ,"流程详情内部的id");
+ console.log(props.id, queryId, '流程详情内部的id')
try {
await getPlanDetailsById({ id: props.id || queryId }).then(res => {
detailData.value = res.data
@@ -287,6 +287,10 @@ const getFileNamePath = async (val: any, pathName: any) => {
}
})
}
+
+const openFile = (name: any) => {
+ window.open(window.location.origin + '/#/previewFile?' + name)
+}
defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
/** 初始化 **/
onMounted(() => {
@@ -299,8 +303,12 @@ onMounted(() => {
overflow: auto;
}
::v-deep.el-icon svg {
- margin: 5px !important;
- position: absolute !important;
- top: 20px !important;
+ // margin: 5px !important;
+ // position: absolute !important;
+ // top: 20px !important;
+}
+.elView {
+ cursor: pointer;
+ margin-right: 10px;
}
diff --git a/src/views/pqs/supervise/technology/detail.vue b/src/views/pqs/supervise/technology/detail.vue
index ab967edb..7cae3af5 100644
--- a/src/views/pqs/supervise/technology/detail.vue
+++ b/src/views/pqs/supervise/technology/detail.vue
@@ -106,6 +106,6 @@ onMounted(() => {
diff --git a/src/views/pqs/supervise/technology/feedbackPopup.vue b/src/views/pqs/supervise/technology/feedbackPopup.vue
index d8d734db..4f45a645 100644
--- a/src/views/pqs/supervise/technology/feedbackPopup.vue
+++ b/src/views/pqs/supervise/technology/feedbackPopup.vue
@@ -230,6 +230,6 @@ const uploadFileName = val => {
}
.elView {
cursor: pointer;
- margin-right: 5px;
+ margin-right: 10px;
}
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/detail.vue
index a10a4c12..00dddd30 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/detail.vue
@@ -118,6 +118,6 @@ onMounted(() => {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
index 1dce5b29..63f8e485 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue
@@ -59,8 +59,12 @@ onMounted(() => {
}
::v-deep.el-icon svg {
- margin: 5px !important;
- position: absolute !important;
- top: 20px !important;
+ // margin: 5px !important;
+ // position: absolute !important;
+ // top: 20px !important;
+}
+.elView {
+ cursor: pointer;
+ margin-right: 10px;
}
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index e2cb05cf..0939d07f 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -246,7 +246,6 @@
-
+
{
ptType: ptTypeList[0].id, //接线方式
num: numList[0].id //线路号
}
- let obj = {}
- getList(obj).then(res => {
+ getList({}).then(res => {
projectList.value = res.data
userNameList.value = res.data
//初始化
@@ -599,10 +597,11 @@ const resetForm = () => {
orgId: obj?.orgId,
orgName: obj?.orgName,
expectedProductionDate: obj?.expectedProductionDate,
- userName: userNameList.value[0]?.projectName,
+ userName: userNameList.value[0]?.id,
userId: userNameList.value[0]?.id,
objName: userNameList.value[0]?.projectName
}
+ changeUserName()
}
})
changevoltageDeviationLimit()
@@ -662,15 +661,16 @@ getTreeList()
const changeLoadType = async () => {
businessTypeList.value = loadTypeList.value.find(item => {
return item.id == form.value.loadType
- }).children
- form.value.businessType = businessTypeList.value[0]?.id
+ })?.children
+ // form.value.businessType = businessTypeList.value[0]?.id
}
//选择关联干扰源回显数据
const changeUserName = () => {
let obj: any = projectList.value.find((item: any) => {
return form.value.userName == item.id
})
- console.log(obj, '88888888')
+ // console.log('🚀 ~ letobj:any=projectList.value.find ~ projectList.value.find:', projectList.value)
+ // console.log(obj, '88888888')
form.value = {
...form.value,
city: obj?.city,
@@ -689,7 +689,7 @@ const changeUserName = () => {
//回显数据
if (obj.userType == '2' || obj.userType == '3' || obj.userType == '4' || obj.userType == '5') {
getUserReportById(obj.id).then(res => {
- console.log(res.data, '继续查询数据')
+ // console.log(res.data, '继续查询数据')
const obj = res.data
form.value = {
...form.value,
@@ -698,7 +698,47 @@ const changeUserName = () => {
devCapacity: obj.userReportSubstationPO?.pccEquipmentCapacity, //终端容量
standardCapacity: obj.userReportSubstationPO?.baseShortCircuitCapacity //基准容量
}
+ getDictTree(obj.userReportSubstationPO?.nonlinearLoadType)
})
+ } else if (obj.userType == '0' || obj.userType == '1') {
+ getUserReportById(obj.id).then(res => {
+ // console.log(res.data, '继续查询数据')
+ const obj = res.data
+ form.value = {
+ ...form.value,
+ shortCapacity: 0, // 短路容量
+ dealCapacity: obj.userReportProjectPO?.agreementCapacity, //协议容量
+ devCapacity: 0, //终端容量
+ standardCapacity: 0 //基准容量
+ }
+ getDictTree(obj.userReportProjectPO?.nonlinearDeviceType)
+ })
+ } else if (obj.userType == '6') {
+ getUserReportById(obj.id).then(res => {
+ // console.log(res.data, '继续查询数据')
+ const obj = res.data
+ form.value = {
+ ...form.value,
+ shortCapacity: 0, // 短路容量
+ dealCapacity: 0, //协议容量
+ devCapacity: 0, //终端容量
+ standardCapacity: 0 //基准容量
+ }
+ getDictTree()
+ })
+ }
+}
+const getDictTree = (e?: string) => {
+ if (e) {
+ getDictTreeById(e).then(res => {
+ form.value.loadType = res.data.pids.split(',')[1] || ''
+ form.value.businessType = res.data.pids.split(',')[2] || ''
+ changeLoadType()
+ })
+ } else {
+ form.value.businessType = ''
+ form.value.loadType = ''
+ businessTypeList.value = []
}
}
//定义校验规则
@@ -918,16 +958,17 @@ const rules = ref({
})
const resendId = ref('')
const rowValue: any = ref({})
-const open = (row: any) => {
+const open = async (row: any) => {
+ resetForm()
dialogFormVisible.value = true
title.value = row.title
//初始化数据
- resetForm()
- nextTick(() => {
+
+ nextTick(async () => {
if (row.row) {
resendId.value = row.row.id
rowValue.value = row.row
- getTempLineDetailsById({ id: row.row.id }).then(res => {
+ await getTempLineDetailsById({ id: row.row.id }).then(res => {
form.value = res.data
form.value.loadType = loadTypeList.value.filter((item: any) => item.name == res.data.loadType)[0]?.id
form.value.businessType = businessTypeList.value.filter(
@@ -955,9 +996,7 @@ const close = () => {
emits('onSubmit')
resetForm()
}
-onMounted(() => {
- console.log()
-})
+onMounted(() => {})
watch(
() => projectList.value,
@@ -966,7 +1005,7 @@ watch(
let obj: any = projectList.value.find((item: any) => {
return rowValue.value.createBy == item.createBy
})
- console.log(projectList.value, '000000', obj, rowValue.value.createBy)
+ // console.log(projectList.value, '000000', obj, rowValue.value.createBy)
form.value = {
...form.value,
reporter: obj?.reporter,
@@ -994,7 +1033,7 @@ const uploadFileName = val => {
}
//移除文件上传
const removeFile = (file: any, uploadFiles: any) => {
- console.log(file, uploadFiles)
+ // console.log(file, uploadFiles)
}
//监测点台账信息
const lineFilePath = ref('')
@@ -1059,7 +1098,7 @@ const confirmForm = () => {
})
} else {
confirmFormData.id = resendId.value
- console.log(confirmFormData, '99999999999')
+ // console.log(confirmFormData, '99999999999')
updateMointorPointFormData(confirmFormData).then(res => {
if (res.code == 'A0000') {
ElMessage({
@@ -1073,7 +1112,7 @@ const confirmForm = () => {
})
}
} else {
- console.log('表单验证失败')
+ // // console.log('表单验证失败')
return false
}
})
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
index 2f3169f8..30b6d9fd 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
@@ -265,12 +265,12 @@ onMounted(() => {
}
::v-deep.el-icon svg {
- margin: 5px !important;
- position: absolute !important;
- top: 20px !important;
+ // margin: 5px !important;
+ // position: absolute !important;
+ // top: 20px !important;
}
.elView {
cursor: pointer;
- margin-right: 5px;
+ margin-right: 10px;
}
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
index 91147e9e..f59a1b2c 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -487,12 +487,12 @@ onMounted(() => {
}
::v-deep.el-icon svg {
- margin: 5px !important;
- position: absolute !important;
- top: 20px !important;
+ // margin: 5px !important;
+ // position: absolute !important;
+ // top: 20px !important;
}
.elView {
cursor: pointer;
- margin-right: 5px;
+ margin-right: 10px;
}
diff --git a/src/views/pqs/supervise/testRun/components/detail.vue b/src/views/pqs/supervise/testRun/components/detail.vue
index 0bbb4bbf..1ca3331a 100644
--- a/src/views/pqs/supervise/testRun/components/detail.vue
+++ b/src/views/pqs/supervise/testRun/components/detail.vue
@@ -68,8 +68,12 @@ onMounted(() => {
}
::v-deep.el-icon svg {
- margin: 5px !important;
- position: absolute !important;
- top: 20px !important;
+ // margin: 5px !important;
+ // position: absolute !important;
+ // top: 20px !important;
+}
+.elView {
+ cursor: pointer;
+ margin-right: 10px;
}
diff --git a/src/views/system/bpm/model/editor/index.vue b/src/views/system/bpm/model/editor/index.vue
index 46176ce8..2c4fd95f 100644
--- a/src/views/system/bpm/model/editor/index.vue
+++ b/src/views/system/bpm/model/editor/index.vue
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-