From 8c8eaa11be1ef871ecc7a9fcd0039e52bb47e0a0 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 13 Sep 2024 11:11:21 +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=A3=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/device-boot/device.ts | 16 ++-
src/api/supervision-boot/database/index.ts | 12 ++-
src/api/supervision-boot/delete/index.ts | 10 ++
src/components/table/fieldRender/index.vue | 2 +-
.../LN/newEnergy/highAndLowPressure/index.vue | 3 +-
.../pqs/business/terminal/deviceter/index.vue | 61 +++++++++--
.../pqs/database/case/components/drawer.vue | 35 ++++++
.../pqs/database/case/components/form.vue | 101 ++++++++++++++----
src/views/pqs/database/case/index.vue | 48 ++++++++-
.../components/sensitiveUserTable.vue | 34 +++++-
.../components/jointDebugList/index.vue | 32 +++++-
11 files changed, 312 insertions(+), 42 deletions(-)
create mode 100644 src/views/pqs/database/case/components/drawer.vue
diff --git a/src/api/device-boot/device.ts b/src/api/device-boot/device.ts
index 43b7473f..cc43509c 100644
--- a/src/api/device-boot/device.ts
+++ b/src/api/device-boot/device.ts
@@ -3,8 +3,16 @@ import request from '@/utils/request'
// 获取区域中断终端
export function getAreaOffDev(data) {
return request({
- url: "/device-boot/device/getAreaOffDev",
- method: "post",
+ url: '/device-boot/device/getAreaOffDev',
+ method: 'post',
data
- });
-}
\ No newline at end of file
+ })
+}
+// 获取区域中断终端
+export function getYwZtSubstation(data) {
+ return request({
+ url: '/device-boot/ywZt/getYwZtSubstation',
+ method: 'GET',
+ params: data
+ })
+}
diff --git a/src/api/supervision-boot/database/index.ts b/src/api/supervision-boot/database/index.ts
index 9b71ec32..d6332095 100644
--- a/src/api/supervision-boot/database/index.ts
+++ b/src/api/supervision-boot/database/index.ts
@@ -49,7 +49,7 @@ export const libcaseAdd = (data: any) => {
})
}
/**
- * 算法库删除
+ * 案例库删除
*/
export const libcaseBeleteyById = (data: any) => {
return createAxios({
@@ -58,3 +58,13 @@ export const libcaseBeleteyById = (data: any) => {
params:data
})
}
+/**
+ * 案例库修改
+ */
+export const updateCaseLibrary = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/libcase/updateCaseLibrary',
+ method: 'POST',
+ data
+ })
+}
diff --git a/src/api/supervision-boot/delete/index.ts b/src/api/supervision-boot/delete/index.ts
index 6148663a..a0e6ede6 100644
--- a/src/api/supervision-boot/delete/index.ts
+++ b/src/api/supervision-boot/delete/index.ts
@@ -79,3 +79,13 @@ export const deleteSurveyPlanTest = (data: any) => {
data
})
}
+/**
+ * 监测点联调列表删除流程
+ */
+export const deleteTempLineDebugReport = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/tempLinedebug/deleteTempLineDebugReport',
+ method: 'POST',
+ data
+ })
+}
diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue
index d9400930..e185c488 100644
--- a/src/components/table/fieldRender/index.vue
+++ b/src/components/table/fieldRender/index.vue
@@ -28,7 +28,7 @@
-
+
{{ field.replaceValue ? field.replaceValue[fieldValue] : fieldValue }}
diff --git a/src/views/LN/newEnergy/highAndLowPressure/index.vue b/src/views/LN/newEnergy/highAndLowPressure/index.vue
index b6d4f758..87e2339a 100644
--- a/src/views/LN/newEnergy/highAndLowPressure/index.vue
+++ b/src/views/LN/newEnergy/highAndLowPressure/index.vue
@@ -42,9 +42,10 @@
-
+
+
+
+
+
+
{
callback(new Error('请输入正确IP/MAC地址'))
}
})
-selectDown().then(res => {
- newStationIdArr.value = res.data
-})
+
/**经度 */
const lngff: any = ref((rule: any, value: any, callback: any) => {
let reg1 = /^(([1-9]\d?)|(1[0-7]\d))(\.\d{1,6})|180|0(\.\d{1,6})?/
@@ -2002,6 +2028,14 @@ const add = () => {
monitorPointDetail.value.businessType = industryTypeArr[0].value
monitorPointDetail.value.loadType = loadTypeArr[0].id
}
+//变电站变化
+const subStationChange=(e:any)=>{
+ let list= powerStationList.value.filter((item:any)=>item.name==e)
+ AddProjectBO.value.subStationParam.lng=list[0].lng||0
+ AddProjectBO.value.subStationParam.lat=list[0].lat||0
+ AddProjectBO.value.subStationParam.scale=list[0].scale
+ console.log("🚀 ~ subStationChange ~ list:", list)
+}
/**新增项目 */
const addProject = () => {
nodeLevel.value = 100
@@ -2087,7 +2121,7 @@ const remove = () => {
const next = async () => {
await mainForm.value.validate((valid: any) => {
if (valid) {
- console.log("🚀 ~ awaitmainForm.value.validate ~ nodeLevel.value:", nodeLevel.value)
+ console.log('🚀 ~ awaitmainForm.value.validate ~ nodeLevel.value:', nodeLevel.value)
switch (nodeLevel.value) {
case 100:
@@ -2323,7 +2357,7 @@ const getNodeIndex = () => {
}
/**查询节点内容 */
const queryNodeContent = () => {
- console.log("🚀 ~ queryNodeContent ~ nodeData.value:", nodeData.value)
+ console.log('🚀 ~ queryNodeContent ~ nodeData.value:', nodeData.value)
if (nodeData.value.id == null) {
// ElMessage.warning('1111111')
@@ -2814,11 +2848,24 @@ const area = () => {
deviceBODetail.value.updateTime = year + '-' + month + '-' + day
deviceBODetail.value.nextTimeCheck = year + 1 + '-' + month + '-' + (day - 1 > 10 ? day - 1 : '0' + (day - 1))
}
+const setDown = () => {
+ selectDown().then(res => {
+ newStationIdArr.value = res.data
+ })
+}
+
onMounted(() => {
const dom = document.getElementById('navigation-splitpanes')
if (dom) {
size.value = Math.round((180 / dom.offsetHeight) * 100)
}
+ if (VITE_FLAG) {
+ getYwZtSubstation({ orgId: '' }).then(res => {
+ powerStationList.value=res.data
+ })
+ } else {
+ setDown()
+ }
})
area()
diff --git a/src/views/pqs/database/case/components/drawer.vue b/src/views/pqs/database/case/components/drawer.vue
new file mode 100644
index 00000000..652e5580
--- /dev/null
+++ b/src/views/pqs/database/case/components/drawer.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pqs/database/case/components/form.vue b/src/views/pqs/database/case/components/form.vue
index bc027f9e..92e9bf88 100644
--- a/src/views/pqs/database/case/components/form.vue
+++ b/src/views/pqs/database/case/components/form.vue
@@ -1,5 +1,12 @@
-
+
@@ -51,6 +58,11 @@
上传
+
+
+ 上传
+
+
@@ -60,7 +72,7 @@
@@ -73,12 +85,13 @@ import { ElMessage } from 'element-plus'
import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
import editor from '@/components/wangEditor/index.vue'
import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
-import { libcaseAdd } from '@/api/supervision-boot/database/index'
+import { libcaseAdd, updateCaseLibrary } from '@/api/supervision-boot/database/index'
const emit = defineEmits(['onSubmit'])
const dialogVisible = ref(false)
const title = ref('')
const formRef = ref()
const fileList: any = ref([])
+const caseList: any = ref([])
// 注意不要和表单ref的命名冲突
const form = reactive
({
type: '',
@@ -86,6 +99,8 @@ const form = reactive({
location: '',
process: '',
measures: '',
+ summary: '',
+ caseUrl: '',
effect: '',
url: ''
})
@@ -104,19 +119,31 @@ const open = (text: string, data?: anyObj) => {
dialogVisible.value = true
if (data) {
fileList.value = []
+ caseList.value = []
// 表单赋值
for (let key in form) {
form[key] = data[key]
}
- data.url.split(',').forEach((item: string) => {
- console.log('🚀 ~ data.url.split ~ item:', item)
- getFileNameAndFilePath({ filePath: item }).then(res => {
- fileList.value.push({
+ form.id = data.id
+ if (data.url.length > 0) {
+ data.url.split(',').forEach((item: string) => {
+ getFileNameAndFilePath({ filePath: item }).then(res => {
+ fileList.value.push({
+ name: res.data.fileName,
+ url: res.data.name
+ })
+ })
+ })
+ }
+
+ if (data.caseUrl.length > 0) {
+ getFileNameAndFilePath({ filePath: data.caseUrl }).then(res => {
+ caseList.value.push({
name: res.data.fileName,
url: res.data.name
})
})
- })
+ }
} else {
// 在此处恢复默认表单
for (let key in form) {
@@ -125,19 +152,21 @@ const open = (text: string, data?: anyObj) => {
}
}
const submit = () => {
- console.log(`1111`, fileList.value)
-
formRef.value.validate(async (valid: boolean) => {
if (valid) {
if (fileList.value.length > 0) {
const promises = fileList.value.map(async item => {
- return new Promise((resolve, reject) => {
- uploadFile(item.raw, '/supervision/')
- .then((res: any) => {
- resolve(res.data.name)
- })
- .catch(reject)
- })
+ if (item.raw) {
+ return new Promise((resolve, reject) => {
+ uploadFile(item.raw, '/supervision/')
+ .then((res: any) => {
+ resolve(res.data.name)
+ })
+ .catch(reject)
+ })
+ } else {
+ return item.url
+ }
})
try {
@@ -147,17 +176,47 @@ const submit = () => {
console.error('上传文件出错', error)
return
}
+ } else {
+ form.url = ''
+ }
+
+ if (caseList.value.length > 0) {
+ const promises = caseList.value.map(async item => {
+ if (caseList.value[0].raw) {
+ return new Promise((resolve, reject) => {
+ uploadFile(item.raw, '/supervision/')
+ .then((res: any) => {
+ resolve(res.data.name)
+ })
+ .catch(reject)
+ })
+ } else {
+ return item.url
+ }
+ })
+
+ try {
+ const fileNames = await Promise.all(promises)
+ form.caseUrl = fileNames.join(',') + ''
+ } catch (error) {
+ console.error('上传文件出错', error)
+ return
+ }
+ } else {
+ form.caseUrl = ''
}
setTimeout(() => {
if (title.value === '新增案例') {
- console.log('🚀 ~ libcaseAdd ~ form:', form)
-
libcaseAdd(form).then(res => {
+ ElMessage.success(title.value + '成功!')
handleClose()
})
} else {
- // 其他逻辑
+ ElMessage.success(title.value + '成功!')
+ updateCaseLibrary(form).then(res => {
+ handleClose()
+ })
}
}, 100)
}
@@ -165,7 +224,7 @@ const submit = () => {
}
const handleClose = () => {
- ElMessage.success(title.value + '成功!')
+ fileList.value = []
emit('onSubmit')
dialogVisible.value = false
}
diff --git a/src/views/pqs/database/case/index.vue b/src/views/pqs/database/case/index.vue
index c0c316ba..e9ca4c30 100644
--- a/src/views/pqs/database/case/index.vue
+++ b/src/views/pqs/database/case/index.vue
@@ -9,6 +9,12 @@
+
+
+
+
+
+