diff --git a/src/components/cockpit/governanceReport/index.vue b/src/components/cockpit/governanceReport/index.vue
index c60a89a..8028b62 100644
--- a/src/components/cockpit/governanceReport/index.vue
+++ b/src/components/cockpit/governanceReport/index.vue
@@ -37,7 +37,7 @@ import TableHeader from '@/components/table/header/index.vue'
import { getTemplateList } from '@/api/harmonic-boot/luckyexcel'
import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
import { getTime } from '@/utils/formatTime'
-
+import { ElMessage } from 'element-plus'
const prop = defineProps({
w: { type: [String, Number] },
h: { type: [String, Number] },
@@ -118,12 +118,15 @@ const tableStore: any = new TableStore({
column: [],
beforeSearchFun: () => {
setTime()
- if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
- tableStore.table.params.sensitiveUserId = idList.value[0].id
- }
- if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
- tableStore.table.params.tempId = templateList.value[0].id
- }
+ // if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
+ // tableStore.table.params.sensitiveUserId = idList.value[0].id
+ // }
+ // if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
+ // tableStore.table.params.tempId = templateList.value[0].id
+ // }
+ // if( !tableStore.table.params.tempId){
+ // return ElMessage.warning('请选择模板')
+ // }
},
loadCallback: () => {
luckysheet.create({
diff --git a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue
index 23fcd64..432719b 100644
--- a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue
+++ b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue
@@ -14,7 +14,7 @@
@@ -24,11 +24,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 普通接口
+ 公用接口
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/auth/menu/popupMenu.vue b/src/views/auth/menu/popupMenu.vue
index 7f24ecd..13373ac 100644
--- a/src/views/auth/menu/popupMenu.vue
+++ b/src/views/auth/menu/popupMenu.vue
@@ -1,29 +1,43 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -46,6 +60,7 @@ import { updateMenu, addMenu } from '@/api/systerm'
defineOptions({
name: 'auth/menu/popupMenu'
})
+const formRef = ref()
const emits = defineEmits<{
(e: 'init'): void
}>()
@@ -71,7 +86,15 @@ const form: any = reactive({
const dialogVisible = ref(false)
const title = ref('新增菜单')
+const rules = {
+ name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
+ path: [{ required: true, message: '请输入菜单路由', trigger: 'blur' }],
+ icon: [{ required: true, message: '请选择图标', trigger: 'blur' }],
+ routeName: [{ required: true, message: '请输入组件路径', trigger: 'blur' }],
+ sort: [{ required: true, message: '请输入排序', trigger: 'blur' }]
+}
const open = (text: string, data: anyObj) => {
+ formRef.value?.resetFields()
title.value = text
// 重置表单
for (let key in form) {
@@ -91,17 +114,23 @@ const open = (text: string, data: anyObj) => {
dialogVisible.value = true
}
const submit = async () => {
- if (form.id) {
- form.pid = form.pid||'0'
- await updateMenu(form)
- } else {
- form.code = 'menu'
- let obj = JSON.parse(JSON.stringify(form))
- delete obj.id
- await addMenu(obj)
- }
- emits('init')
- dialogVisible.value = false
+ formRef.value.validate(async valid => {
+ if (valid) {
+ if (form.id) {
+ form.pid = form.pid || '0'
+ await updateMenu(form)
+ } else {
+ form.code = 'menu'
+ form.pid = form.pid || '0'
+ let obj = JSON.parse(JSON.stringify(form))
+ delete obj.id
+
+ await addMenu(obj)
+ }
+ emits('init')
+ dialogVisible.value = false
+ }
+ })
}
defineExpose({ open })
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index 9ca8ec6..bcc30b6 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -89,6 +89,7 @@
:rules="{ required: true, message: '请输入设备名称', trigger: 'blur' }"
>
-
-
-
-
-
-
-
-->
-
-
+
-
-
+
-
-
-
+ >
+ >
-
+ >
+ >
-
-
+
+ >
-
+ >
-
+ >
-
+ >
-
+
+
+
+
+
+
-
+
{
monitorUser: '',
devMac: '',
monitorObj: '',
+ position: '',
govern: 0,
runStatus: 0,
basicCapacity: 0,
@@ -1682,8 +1736,9 @@ const updateLineFunc = (id: any) => {
ct2Ratio: currentLine.ct2Ratio || 1,
monitorUser: currentLine.monitorUser || '',
monitorObj: currentLine.monitorObj || '',
- govern: currentLine.govern ,
- runStatus: currentLine.runStatus ,
+ position: currentLine.position || '',
+ govern: currentLine.govern,
+ runStatus: currentLine.runStatus,
basicCapacity: currentLine.basicCapacity || 0,
shortCircuitCapacity: currentLine.shortCircuitCapacity || 0,
devCapacity: currentLine.devCapacity || 0,
@@ -1878,6 +1933,7 @@ const next = async () => {
monitorUser: '',
devMac: '',
monitorObj: '',
+ position: '',
govern: 0,
runStatus: 0,
basicCapacity: 0,
@@ -1900,7 +1956,6 @@ const next = async () => {
}
}
})
-
}
// 撤销
@@ -1925,21 +1980,21 @@ const black = () => {
const onsubmit = async () => {
await mainForm.value.validate((valid: any) => {
if (valid) {
- if (pageStatus.value == 2) {
- // 新增
- // 检查是否是多层级新增还是单层级新增
- if (
- tempAllLevelData.value.engineering !== null ||
- tempAllLevelData.value.projects.length > 0 ||
- tempAllLevelData.value.devices.length > 0 ||
- tempAllLevelData.value.lines.length > 0
- ) {
- // 多层级新增,一次性提交所有数据
- submitAllLevelData()
- } else {
- // 单层级新增,使用原有的提交方式
- submitData()
- }
+ if (pageStatus.value == 2) {
+ // 新增
+ // 检查是否是多层级新增还是单层级新增
+ if (
+ tempAllLevelData.value.engineering !== null ||
+ tempAllLevelData.value.projects.length > 0 ||
+ tempAllLevelData.value.devices.length > 0 ||
+ tempAllLevelData.value.lines.length > 0
+ ) {
+ // 多层级新增,一次性提交所有数据
+ submitAllLevelData()
+ } else {
+ // 单层级新增,使用原有的提交方式
+ submitData()
+ }
} else if (pageStatus.value == 3) {
// 修改
switch (nodeLevel.value) {
@@ -1958,7 +2013,6 @@ const onsubmit = async () => {
}
}
}
-
})
}
@@ -2003,7 +2057,9 @@ const submitAllLevelData = async () => {
case 2: // 工程 + 项目 + 设备
// 工程信息
- const engineeringData2 = tempAllLevelData.value.engineering || { ...formData.value.engineeringParam }
+ const engineeringData2 = tempAllLevelData.value.engineering || {
+ ...formData.value.engineeringParam
+ }
// 项目信息
const projectData2 =
tempAllLevelData.value.projects.length > 0
@@ -2059,7 +2115,9 @@ const submitAllLevelData = async () => {
case 3: // 工程 + 项目 + 设备 + 监测点
case 4:
// 工程信息
- const engineeringData3 = tempAllLevelData.value.engineering || { ...formData.value.engineeringParam }
+ const engineeringData3 = tempAllLevelData.value.engineering || {
+ ...formData.value.engineeringParam
+ }
// 项目信息
const projectData3 =
@@ -2255,10 +2313,8 @@ const submitAllLevelData = async () => {
}
}, 100)
})
-
}
})
-
}
/**
* 重置所有表单
@@ -2302,6 +2358,7 @@ const resetAllForms = () => {
line.volGrade = ''
line.monitorUser = ''
line.monitorObj = ''
+ line.position = ''
line.govern = 0
line.runStatus = 0
line.basicCapacity = 0
@@ -2469,6 +2526,7 @@ const submitData = () => {
ct2Ratio: currentLine.ct2Ratio,
monitorUser: currentLine.monitorUser,
monitorObj: currentLine.monitorObj,
+ position: currentLine.position,
govern: currentLine.govern,
runStatus: currentLine.runStatus,
basicCapacity: currentLine.basicCapacity,
@@ -2620,7 +2678,9 @@ const handleBusBarTabsEdit = (targetName: any, action: any) => {
} else {
// 如果是新增模式下删除未保存的设备
formData.value.deviceInfoList.splice(busBarIndex.value, 1)
- busBarIndex.value = formData.value.deviceInfoList.length ? (formData.value.deviceInfoList.length - 1).toString() : '0'
+ busBarIndex.value = formData.value.deviceInfoList.length
+ ? (formData.value.deviceInfoList.length - 1).toString()
+ : '0'
lineIndex.value = '0'
ElMessage({
type: 'success',
@@ -2656,6 +2716,7 @@ const handleLineTabsEdit = (targetName: any, action: any) => {
devMac: '',
monitorUser: '',
monitorObj: '',
+ position: '',
govern: 0,
runStatus: 0,
basicCapacity: 0,
@@ -2682,14 +2743,18 @@ const handleLineTabsEdit = (targetName: any, action: any) => {
// 从列表中移除
formData.value.lineInfoList.splice(lineIndex.value, 1)
// 重新设置当前选中的tab
- lineIndex.value = formData.value.lineInfoList.length ? (formData.value.lineInfoList.length - 1).toString() : '0'
+ lineIndex.value = formData.value.lineInfoList.length
+ ? (formData.value.lineInfoList.length - 1).toString()
+ : '0'
pageStatus.value = 1
treedata()
})
} else {
// 如果是新增模式下删除未保存的监测点
formData.value.lineInfoList.splice(lineIndex.value, 1)
- lineIndex.value = formData.value.lineInfoList.length ? (formData.value.lineInfoList.length - 1).toString() : '0'
+ lineIndex.value = formData.value.lineInfoList.length
+ ? (formData.value.lineInfoList.length - 1).toString()
+ : '0'
ElMessage({
type: 'success',
message: '删除成功'
@@ -2777,6 +2842,9 @@ const area = () => {
getDicDataByTypeCode({ dictTypeCode: 'M_Obj_Types' }).then(res => {
monitorObjList.value = res.data
})
+ getDicDataByTypeCode({ dictTypeCode: 'Line_Position' }).then(res => {
+ linePosition.value = res.data
+ })
}
onMounted(() => {
diff --git a/src/views/govern/device/disposition/index.vue b/src/views/govern/device/disposition/index.vue
index 532d1b7..2926be9 100644
--- a/src/views/govern/device/disposition/index.vue
+++ b/src/views/govern/device/disposition/index.vue
@@ -4,8 +4,8 @@
-
- 添加工程
+
+ 绑定工程
@@ -29,7 +29,7 @@
-
+
diff --git a/src/views/govern/device/officialUser/index.vue b/src/views/govern/device/officialUser/index.vue
index 8c48808..cac8849 100644
--- a/src/views/govern/device/officialUser/index.vue
+++ b/src/views/govern/device/officialUser/index.vue
@@ -3,7 +3,7 @@
@@ -41,7 +41,7 @@
-
-
-
+
+
+
+
diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue
index deb8d8d..bd7a23a 100644
--- a/src/views/govern/manage/basic/popupVersion.vue
+++ b/src/views/govern/manage/basic/popupVersion.vue
@@ -88,7 +88,7 @@
>
-
+
{
})
}
const submit = () => {
-
- if (fileList.value.length == 0) {
- ElMessage.warning('请上传升级文件')
- return
- }
-
// console.log(formRef)
formRef.value.validate(async (valid: boolean) => {
// console.log(valid)
if (valid) {
+ if (fileList.value.length == 0) {
+ ElMessage.warning('请上传升级文件')
+ return
+ }
let submitForm = new FormData()
for (let key in form) {
submitForm.append(key, form[key])
diff --git a/src/views/govern/reportCore/statisticsWx/index_zl.vue b/src/views/govern/reportCore/statisticsWx/index_zl.vue
index 9ba7eaf..8b9d8ce 100644
--- a/src/views/govern/reportCore/statisticsWx/index_zl.vue
+++ b/src/views/govern/reportCore/statisticsWx/index_zl.vue
@@ -79,6 +79,7 @@ import DatePicker from '@/components/form/datePicker/time.vue'
import { Splitpanes, Pane } from 'splitpanes'
import CloudDeviceEntryTree from '@/components/tree/govern/cloudDeviceEntryTreeZL.vue'
import { getListByIds } from '@/api/harmonic-boot/cockpit/cockpit'
+import { ElMessage } from 'element-plus'
// import data from './123.json'
defineOptions({
name: 'govern/reportCore/statisticsWx/indexZL'
@@ -101,9 +102,12 @@ const tableStore = new TableStore({
beforeSearchFun: () => {
tableStore.table.params.tempId = Template.value.id
tableStore.table.params.lineId = dotList.value.id
- tableStore.table.params.sensitiveUserId = dotList.value.id
+ tableStore.table.params.sensitiveUserId = dotList.value.id
// ;(tableStore.table.params.startTime = datePickerRef.value.timeValue[0]),
// (tableStore.table.params.endTime = datePickerRef.value.timeValue[1]),
+ if (!tableStore.table.params.tempId) {
+ return ElMessage.warning('请选择模板')
+ }
delete tableStore.table.params.searchBeginTime
delete tableStore.table.params.searchEndTime
delete tableStore.table.params.timeFlag
diff --git a/src/views/govern/sensitiveLoadMange/detail.vue b/src/views/govern/sensitiveLoadMange/detail.vue
index 07c2248..1e863ab 100644
--- a/src/views/govern/sensitiveLoadMange/detail.vue
+++ b/src/views/govern/sensitiveLoadMange/detail.vue
@@ -1,6 +1,6 @@
-
+
@@ -18,13 +18,13 @@
-
+
-
+
-
+
@@ -74,6 +74,7 @@ const rules = {
const dialogVisible = ref(false)
const title = ref('新增')
const open = (text: string, data?: anyObj) => {
+ formRef.value?.resetFields()
title.value = text
dialogVisible.value = true
if (data) {
diff --git a/src/views/govern/setting/statisticalType/add.vue b/src/views/govern/setting/statisticalType/add.vue
index cf4ccc5..6c03d02 100644
--- a/src/views/govern/setting/statisticalType/add.vue
+++ b/src/views/govern/setting/statisticalType/add.vue
@@ -17,7 +17,7 @@
-
+
diff --git a/src/views/pqs/cockpit/setUp/components/popup.vue b/src/views/pqs/cockpit/setUp/components/popup.vue
index 15fea32..c6290f1 100644
--- a/src/views/pqs/cockpit/setUp/components/popup.vue
+++ b/src/views/pqs/cockpit/setUp/components/popup.vue
@@ -1,49 +1,11 @@
-
+
保存
-
-
-
+
+
@@ -70,7 +32,7 @@
-
+
@@ -208,6 +170,9 @@ import { useAdminInfo } from '@/stores/adminInfo'
const tableName = ref('')
const tableName1 = ref('')
import { useNavTabs } from '@/stores/navTabs'
+import { getSystemByRoleId } from '@/api/user-boot/roleFuction'
+import { forEach } from 'jszip'
+import { id } from 'element-plus/es/locale'
// defineOptions({
// name: 'cockpit/popup'
// })
@@ -218,7 +183,7 @@ const { go } = useRouter()
const navTabs = useNavTabs()
const { query } = useRoute()
const router = useRouter()
-const height = mainHeight(295)
+const height = mainHeight(265)
const indicatorHeight = mainHeight(180)
const rowHeight = ref(0)
const pageList: any = ref([])
@@ -258,7 +223,7 @@ const layout: any = ref([
])
const treeComponents: any = ref([]) //组件树
const treeComponentsCopy: any = ref([]) //组件树
-const info = () => {
+const info = async () => {
pageList.value = router
.getRoutes()
.filter(item => item?.meta?.component == '/src/views/pqs/cockpit/homePage/index.vue')
@@ -268,17 +233,26 @@ const info = () => {
activeNames.value = []
activeNames1.value = []
- componentTree().then(res => {
- treeComponents.value = res.data
+
+ let systemList: any[] = []
+ await adminInfo.roleList.forEach((item: any) => {
+ getSystemByRoleId({ id: item }).then(res => {
+ systemList = [...new Set([...systemList, ...res.data.systemIds])]
+ })
+ })
+
+ await componentTree().then(res => {
+ let list = res.data.filter(item => systemList.includes(item.id))
+ treeComponents.value = list
tableName.value = tableName.value == '' ? treeComponents.value[0].name : tableName.value
tableName1.value = tableName1.value == '' ? treeComponents.value[0].children[0].name : tableName1.value
activeNames.value = treeComponents.value.map(item => item.id)
- res.data.forEach(item => {
+ list.forEach(item => {
item.children.forEach(k => {
activeNames1.value.push(k.id)
})
})
- treeComponentsCopy.value = tree2List(JSON.parse(JSON.stringify(res.data)), 0)
+ treeComponentsCopy.value = tree2List(JSON.parse(JSON.stringify(list)), 0)
})
if (query.id) {
@@ -439,7 +413,6 @@ const onSubmit = () => {
if (layout.value.length == 0) {
return ElMessage.warning('页面设计不能为空!')
}
- console.log(123, findDuplicateNames(layout.value))
let repeat = findDuplicateNames(layout.value) || []
if (repeat.length > 0) {
return ElMessage.warning(repeat.join('、') + ' 组件重复,请删除重复组件!')
@@ -493,31 +466,72 @@ const onSubmit = () => {
})
}
// 查找重复的name
+// const findDuplicateNames = (arr: any) => {
+// // 用于记录每个name出现的次数
+// const nameCount = {}
+// // 用于存储重复的name
+// const duplicates = []
+
+// // 遍历数组统计每个name的出现次数
+// arr.forEach(item => {
+// const name = item.name
+// if (nameCount[name]) {
+// nameCount[name]++
+// } else {
+// nameCount[name] = 1
+// }
+// })
+
+// // 筛选出出现次数大于1的name
+// for (const name in nameCount) {
+// if (nameCount[name] > 1) {
+// duplicates.push(name)
+// }
+// }
+
+// return duplicates
+// }
+// 查找重复的path,并返回对应的重复name
const findDuplicateNames = (arr: any) => {
- // 用于记录每个name出现的次数
- const nameCount = {}
- // 用于存储重复的name
+ // 用于记录每个path出现的次数
+ const pathCount: any = {}
+ // 用于存储path对应的name(避免重复存储)
+ const pathToNameMap = new Map()
+ // 用于存储重复path对应的name
const duplicates = []
- // 遍历数组统计每个name的出现次数
+ // 遍历数组统计每个path的出现次数,并记录path和name的映射
arr.forEach(item => {
+ const path = item.path
const name = item.name
- if (nameCount[name]) {
- nameCount[name]++
+
+ // 记录path和name的对应关系(只存第一次的,避免覆盖)
+ if (!pathToNameMap.has(path)) {
+ pathToNameMap.set(path, name)
+ }
+
+ // 统计path出现次数
+ if (pathCount[path]) {
+ pathCount[path]++
} else {
- nameCount[name] = 1
+ pathCount[path] = 1
}
})
- // 筛选出出现次数大于1的name
- for (const name in nameCount) {
- if (nameCount[name] > 1) {
- duplicates.push(name)
+ // 筛选出出现次数大于1的path,并获取对应的name
+ for (const path in pathCount) {
+ if (pathCount[path] > 1) {
+ const name = pathToNameMap.get(path)
+ // 避免重复添加相同的name(如果多个重复path对应同一个name)
+ if (!duplicates.includes(name)) {
+ duplicates.push(name)
+ }
}
}
return duplicates
}
+
const getImg = throttle((path: string) => {
if (path != undefined) return treeComponentsCopy.value.filter(item => item.path == path)[0]?.image
})
@@ -652,4 +666,20 @@ onBeforeUnmount(() => {
// border: 1px solid #000;
box-shadow: var(--el-box-shadow-light);
}
+.elButton {
+ position: absolute;
+ right: 10px;
+ top: 13px;
+ z-index: 1;
+}
+
+:deep(.vgl-item__resizer) {
+ width: 20px;
+ height: 20px;
+ background: linear-gradient(45deg, var(--el-color-primary));
+
+ clip-path: polygon(100% 0, 100% 100%, 0 100%);
+ /* 可选:添加阴影增强视觉效果 */
+ box-shadow: 2px 2px 8px var(--el-color-primary);
+}
diff --git a/src/views/setting/dictionary/component/add.vue b/src/views/setting/dictionary/component/add.vue
index de66981..ccc54cc 100644
--- a/src/views/setting/dictionary/component/add.vue
+++ b/src/views/setting/dictionary/component/add.vue
@@ -24,7 +24,7 @@
style="width: 100%"
/>
-
+
@@ -42,17 +42,7 @@
日
-
-
-
-
-
+
@@ -103,7 +93,6 @@ const form = ref({
system: [],
timeKeys: ['1', '2', '3', '4', '5'],
code: '',
- systemIds: [],
path: ''
})
const props = { label: 'name', value: 'id', multiple: true }
@@ -114,36 +103,48 @@ const rules = {
icon: [{ required: true, message: '请先择组件图标', trigger: 'change' }],
path: [{ required: true, message: '请输入组件路径', trigger: 'blur' }],
sort: [{ required: true, message: '请输入排序', trigger: 'blur' }],
- timeKeys: [{ required: true, message: '请选择组件查询时间', trigger: 'change' }],
- systemIds: [{ required: true, message: '请选择组件绑定系统', trigger: 'change' }]
+ timeKeys: [{ required: true, message: '请选择组件查询时间', trigger: 'change' }]
}
const customDeptOption: any = ref([])
-const systemList = dictData.getBasicData('System_Type')
-onMounted(() => {
- customDeptOption.value = dictData.getBasicData('Component_Type')
+onMounted(() => {})
+const getSystem = async () => {
+ // customDeptOption.value = dictData.getBasicData('System_Type')
+ // await customDeptOption.value.forEach((item: any) => {
+ // getFatherComponent({ systemType: item.id }).then(res => {
+ // item.children = res.data.filter(item => item.name != '无')
+ // })
+ // })
+ customDeptOption.value = dictData.getBasicData('System_Type')
- customDeptOption.value.forEach((item: any) => {
- getFatherComponent({ systemType: item.id }).then(res => {
- item.children = res.data.filter(item => item.name != '无')
- })
+ // 创建所有异步请求的 Promise 数组
+ const promises = customDeptOption.value.map(async (item: any) => {
+ try {
+ const res = await getFatherComponent({ systemType: item.id })
+ item.children = res.data.sort((a, b) => a.sort - b.sort)
+ } catch (error) {
+ console.error('加载组件失败:', error)
+ item.children = []
+ }
})
-})
+ // 等待所有请求完成
+ await Promise.all(promises)
+ // 所有 children 数据都已加载完成
+ return customDeptOption.value
+}
-const open = (text: string, data?: anyObj) => {
- console.log(data)
+const open = async (text: string, data?: anyObj) => {
title.value = text
dialogVisible.value = true
+ await getSystem()
if (data) {
let Data = JSON.parse(JSON.stringify(data))
form.value = Data
- form.value.system = [Data.systemType, Data.pid]
- // form.value.timeKeys = Data.timeKeys.split(',').map(Number)
+ form.value.system = getSystemComponentPairs(customDeptOption.value, Data.componentType)
+
form.value.timeKeys = Data.timeKeys || []
}
}
const submit = () => {
- console.log('🚀 ~ submit ~ form.value:', form.value)
-
formRef.value.validate(async (valid: boolean) => {
if (valid) {
let url = ''
@@ -168,11 +169,9 @@ const submit = () => {
if (title.value == '新增组件') {
await componentAdd({
...form.value,
- systemType: form.value.system
- .map(subArr => (subArr.length > 1 ? subArr.at(-1) : null))
- .filter(item => item !== null),
- // systemType: form.value.system[0],
- pid: form.value.system[1],
+ systemType: formatFirstIdToString(form.value.system, 0),
+ componentType: formatFirstIdToString(form.value.system, 1),
+ pid: '123',
image: url
}).then(res => {
ElMessage.success('新增成功!')
@@ -182,11 +181,9 @@ const submit = () => {
} else {
await componentEdit({
...form.value,
- // systemType: form.value.system[0],
- systemType: form.value.system
- .map(subArr => (subArr.length > 1 ? subArr.at(-1) : null))
- .filter(item => item !== null),
- pid: form.value.system[1],
+ systemType: formatFirstIdToString(form.value.system, 0),
+ componentType: formatFirstIdToString(form.value.system, 1),
+ pid: '123',
image: url
}).then(res => {
ElMessage.success('修改成功!')
@@ -199,6 +196,41 @@ const submit = () => {
}
})
}
+// 处理函数:提取子数组第一个元素 + 去重 + 拼接
+const formatFirstIdToString = (data: any, num: number) => {
+ // 1. 提取每个子数组的第一个元素
+ const firstIds = data.map(item => item[num])
+ // 2. 去重(利用Set特性)
+ const uniqueFirstIds = [...new Set(firstIds)]
+ // 3. 拼接成逗号分隔的字符串
+ return uniqueFirstIds.join(',')
+}
+// 根据id 找二位数组回显
+function getSystemComponentPairs(data: any, idsStr: string) {
+ const targetIds = idsStr.split(',')
+ const result: any[] = []
+
+ // 遍历所有数据
+ data.forEach(system => {
+ const systemId = system.id
+ const children = system.children || []
+
+ // 在children中查找匹配的ID
+ children.forEach(child => {
+ if (targetIds.includes(child.id)) {
+ result.push([systemId, child.id])
+ }
+ })
+ })
+
+ // 按照提供的ID顺序排序
+ return result.sort((a, b) => {
+ const indexA = targetIds.indexOf(a[1])
+ const indexB = targetIds.indexOf(b[1])
+ return indexA - indexB
+ })
+}
+
// 组件映射
const componentMap = reactive(new Map())
// 动态注册组件
diff --git a/src/views/setting/dictionary/component/index.vue b/src/views/setting/dictionary/component/index.vue
index 5544b43..d86b07f 100644
--- a/src/views/setting/dictionary/component/index.vue
+++ b/src/views/setting/dictionary/component/index.vue
@@ -226,6 +226,10 @@ const editTree = (row: any, num: number) => {
}
// 删除
const del = (row: any) => {
+ if (row.children?.length > 0) {
+ ElMessage.warning('请先删除节点下的组件!')
+ return
+ }
ElMessageBox.confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -362,10 +366,13 @@ span {
height: calc(100vh - 210px) !important;
}
}
-.elButton{
+.elButton {
position: absolute;
top: 13px;
right: 10px;
z-index: 1;
}
+.custom-tabs-label {
+ font-size: 14px;
+}
diff --git a/src/views/system/scheduledTasks/form.vue b/src/views/system/scheduledTasks/form.vue
index c810f01..e12b607 100644
--- a/src/views/system/scheduledTasks/form.vue
+++ b/src/views/system/scheduledTasks/form.vue
@@ -1,108 +1,108 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vite.config.ts.timestamp-1767789689835-b2c93f7aab877.mjs b/vite.config.ts.timestamp-1767789689835-b2c93f7aab877.mjs
new file mode 100644
index 0000000..83221c9
--- /dev/null
+++ b/vite.config.ts.timestamp-1767789689835-b2c93f7aab877.mjs
@@ -0,0 +1,114 @@
+// vite.config.ts
+import { defineConfig } from "file:///D:/%E9%A1%B9%E7%9B%AE/%E7%81%BF%E8%83%BD/admin-govern/node_modules/.pnpm/vite@5.4.8_@types+node@20.16.9_sass@1.79.3/node_modules/vite/dist/node/index.js";
+import vue from "file:///D:/%E9%A1%B9%E7%9B%AE/%E7%81%BF%E8%83%BD/admin-govern/node_modules/.pnpm/@vitejs+plugin-vue@4.6.2_vite@5.4.8_vue@3.5.9/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import vueJsx from "file:///D:/%E9%A1%B9%E7%9B%AE/%E7%81%BF%E8%83%BD/admin-govern/node_modules/.pnpm/@vitejs+plugin-vue-jsx@3.1.0_vite@5.4.8_vue@3.5.9/node_modules/@vitejs/plugin-vue-jsx/dist/index.mjs";
+import path from "path";
+import AutoImport from "file:///D:/%E9%A1%B9%E7%9B%AE/%E7%81%BF%E8%83%BD/admin-govern/node_modules/.pnpm/unplugin-auto-import@0.16.7_@vueuse+core@10.11.1/node_modules/unplugin-auto-import/dist/vite.js";
+
+// src/components/icon/svg/index.ts
+import { readFileSync, readdirSync } from "fs";
+var idPerfix = "";
+var iconNames = [];
+var svgTitle = /", "");
+ svgRes.push(svg);
+ }
+ }
+ return svgRes;
+}
+var svgBuilder = (path2, perfix = "local") => {
+ if (path2 === "") return;
+ idPerfix = perfix;
+ const res = findSvgFile(path2);
+ return {
+ name: "svg-transform",
+ transformIndexHtml(html) {
+ return html.replace(
+ "",
+ `
+
+
+ `
+ );
+ }
+ };
+};
+
+// vite.config.ts
+var __vite_injected_original_dirname = "D:\\\u9879\u76EE\\\u707F\u80FD\\admin-govern";
+var nodeResolve = (dir) => path.resolve(__vite_injected_original_dirname, ".", dir);
+var vite_config_default = defineConfig({
+ plugins: [
+ vue(),
+ svgBuilder("./src/assets/icons/"),
+ vueJsx(),
+ AutoImport({
+ //自动引入
+ imports: ["vue", "vue-router", "pinia"]
+ })
+ ],
+ server: {
+ host: "0.0.0.0",
+ open: true,
+ proxy: {
+ "/api": {
+ // target: 'http://192.168.1.81:10215', //数据中心
+ // target: 'http://192.168.1.24:10215', //
+ // target: 'http://192.168.1.122:10215', //gfh
+ // target: 'http://192.168.1.127:10215', //cdf
+ // target: 'http://192.168.1.125:10215',
+ target: "http://192.168.2.126:10215",
+ // target: 'https://pqmcn.com:8092/api', //治理
+ // target:'http://www.zhilitest.com:8089/api',
+ changeOrigin: true,
+ rewrite: (path2) => path2.replace(/^\/api/, "")
+ //路径重写,把'/api'替换为''
+ }
+ }
+ // port:'3000'
+ },
+ resolve: {
+ alias: {
+ "/@": nodeResolve(".src"),
+ "@": nodeResolve("src"),
+ "~": nodeResolve("public")
+ }
+ }
+});
+export {
+ vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "src/components/icon/svg/index.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\\u9879\u76EE\\\\\u707F\u80FD\\\\admin-govern\";const __vite_injected_original_filename = \"D:\\\\\u9879\u76EE\\\\\u707F\u80FD\\\\admin-govern\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/%E9%A1%B9%E7%9B%AE/%E7%81%BF%E8%83%BD/admin-govern/vite.config.ts\";import { defineConfig } from 'vite'\nimport vue from '@vitejs/plugin-vue'\nimport vueJsx from '@vitejs/plugin-vue-jsx'\nimport path from 'path'\nimport AutoImport from 'unplugin-auto-import/vite'\nimport { svgBuilder } from '/@/components/icon/svg/index'\n\nconst nodeResolve = (dir: string) => path.resolve(__dirname, '.', dir)\n// https://vitejs.dev/config/\nexport default defineConfig({\n    plugins: [\n        vue(),\n        svgBuilder('./src/assets/icons/'),\n        vueJsx(),\n        AutoImport({\n            //\u81EA\u52A8\u5F15\u5165\n            imports: ['vue', 'vue-router', 'pinia']\n        })\n    ],\n    server: {\n        host: '0.0.0.0',\n        open: true,\n        proxy: {\n            '/api': {\n                // target: 'http://192.168.1.81:10215', //\u6570\u636E\u4E2D\u5FC3\n                // target: 'http://192.168.1.24:10215', //\n                // target: 'http://192.168.1.122:10215', //gfh \n                // target: 'http://192.168.1.127:10215', //cdf\n                // target: 'http://192.168.1.125:10215',\n                target: 'http://192.168.2.126:10215',\n                // target: 'https://pqmcn.com:8092/api', //\u6CBB\u7406\n                // target:'http://www.zhilitest.com:8089/api',\n                changeOrigin: true,\n                rewrite: path => path.replace(/^\\/api/, '') //\u8DEF\u5F84\u91CD\u5199\uFF0C\u628A'/api'\u66FF\u6362\u4E3A''\n            }\n        }\n        // port:'3000'\n    },\n\n    resolve: {\n        alias: {\n            '/@': nodeResolve('.src'),\n            '@': nodeResolve('src'),\n            '~': nodeResolve('public')\n        }\n    }\n})\n", "const __vite_injected_original_dirname = \"D:\\\\\u9879\u76EE\\\\\u707F\u80FD\\\\admin-govern\\\\src\\\\components\\\\icon\\\\svg\";const __vite_injected_original_filename = \"D:\\\\\u9879\u76EE\\\\\u707F\u80FD\\\\admin-govern\\\\src\\\\components\\\\icon\\\\svg\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/%E9%A1%B9%E7%9B%AE/%E7%81%BF%E8%83%BD/admin-govern/src/components/icon/svg/index.ts\";import { readFileSync, readdirSync } from 'fs'\r\n\r\nlet idPerfix = ''\r\nconst iconNames: string[] = []\r\nconst svgTitle = /<svg([^>+].*?)>/\r\nconst clearHeightWidth = /(width|height)=\"([^>+].*?)\"/g\r\nconst hasViewBox = /(viewBox=\"[^>+].*?\")/g\r\nconst clearReturn = /(\\r)|(\\n)/g\r\n// \u6E05\u7406 svg \u7684 fill\r\nconst clearFill = /(fill=\"[^>+].*?\")/g\r\n\r\nfunction findSvgFile(dir: string): string[] {\r\n    const svgRes = []\r\n    const dirents = readdirSync(dir, {\r\n        withFileTypes: true,\r\n    })\r\n    for (const dirent of dirents) {\r\n        iconNames.push(`${idPerfix}-${dirent.name.replace('.svg', '')}`)\r\n        if (dirent.isDirectory()) {\r\n            svgRes.push(...findSvgFile(dir + dirent.name + '/'))\r\n        } else {\r\n            const svg = readFileSync(dir + dirent.name)\r\n                .toString()\r\n                .replace(clearReturn, '')\r\n                .replace(clearFill, 'fill=\"\"')\r\n                .replace(svgTitle, ($1, $2) => {\r\n                    let width = 0\r\n                    let height = 0\r\n                    let content = $2.replace(clearHeightWidth, (s1: string, s2: string, s3: number) => {\r\n                        if (s2 === 'width') {\r\n                            width = s3\r\n                        } else if (s2 === 'height') {\r\n                            height = s3\r\n                        }\r\n                        return ''\r\n                    })\r\n                    if (!hasViewBox.test($2)) {\r\n                        content += `viewBox=\"0 0 ${width} ${height}\"`\r\n                    }\r\n                    return `<symbol id=\"${idPerfix}-${dirent.name.replace('.svg', '')}\" ${content}>`\r\n                })\r\n                .replace('</svg>', '</symbol>')\r\n            svgRes.push(svg)\r\n        }\r\n    }\r\n    return svgRes\r\n}\r\n\r\nexport const svgBuilder = (path: string, perfix = 'local') => {\r\n    if (path === '') return\r\n    idPerfix = perfix\r\n    const res = findSvgFile(path)\r\n    return {\r\n        name: 'svg-transform',\r\n        transformIndexHtml(html: string) {\r\n            /* eslint-disable */\r\n            return html.replace(\r\n                '<body>',\r\n                `\r\n                <body>\r\n                <svg id=\"local-icon\" data-icon-name=\"${iconNames.join(\r\n                    ','\r\n                )}\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"position: absolute; width: 0; height: 0\">\r\n                ${res.join('')}\r\n                </svg>\r\n                `\r\n            )\r\n            /* eslint-enable */\r\n        },\r\n    }\r\n}\r\n"],
  "mappings": ";AAAyR,SAAS,oBAAoB;AACtT,OAAO,SAAS;AAChB,OAAO,YAAY;AACnB,OAAO,UAAU;AACjB,OAAO,gBAAgB;;;ACJsU,SAAS,cAAc,mBAAmB;AAEvY,IAAI,WAAW;AACf,IAAM,YAAsB,CAAC;AAC7B,IAAM,WAAW;AACjB,IAAM,mBAAmB;AACzB,IAAM,aAAa;AACnB,IAAM,cAAc;AAEpB,IAAM,YAAY;AAElB,SAAS,YAAY,KAAuB;AACxC,QAAM,SAAS,CAAC;AAChB,QAAM,UAAU,YAAY,KAAK;AAAA,IAC7B,eAAe;AAAA,EACnB,CAAC;AACD,aAAW,UAAU,SAAS;AAC1B,cAAU,KAAK,GAAG,QAAQ,IAAI,OAAO,KAAK,QAAQ,QAAQ,EAAE,CAAC,EAAE;AAC/D,QAAI,OAAO,YAAY,GAAG;AACtB,aAAO,KAAK,GAAG,YAAY,MAAM,OAAO,OAAO,GAAG,CAAC;AAAA,IACvD,OAAO;AACH,YAAM,MAAM,aAAa,MAAM,OAAO,IAAI,EACrC,SAAS,EACT,QAAQ,aAAa,EAAE,EACvB,QAAQ,WAAW,SAAS,EAC5B,QAAQ,UAAU,CAAC,IAAI,OAAO;AAC3B,YAAI,QAAQ;AACZ,YAAI,SAAS;AACb,YAAI,UAAU,GAAG,QAAQ,kBAAkB,CAAC,IAAY,IAAY,OAAe;AAC/E,cAAI,OAAO,SAAS;AAChB,oBAAQ;AAAA,UACZ,WAAW,OAAO,UAAU;AACxB,qBAAS;AAAA,UACb;AACA,iBAAO;AAAA,QACX,CAAC;AACD,YAAI,CAAC,WAAW,KAAK,EAAE,GAAG;AACtB,qBAAW,gBAAgB,KAAK,IAAI,MAAM;AAAA,QAC9C;AACA,eAAO,eAAe,QAAQ,IAAI,OAAO,KAAK,QAAQ,QAAQ,EAAE,CAAC,KAAK,OAAO;AAAA,MACjF,CAAC,EACA,QAAQ,UAAU,WAAW;AAClC,aAAO,KAAK,GAAG;AAAA,IACnB;AAAA,EACJ;AACA,SAAO;AACX;AAEO,IAAM,aAAa,CAACA,OAAc,SAAS,YAAY;AAC1D,MAAIA,UAAS,GAAI;AACjB,aAAW;AACX,QAAM,MAAM,YAAYA,KAAI;AAC5B,SAAO;AAAA,IACH,MAAM;AAAA,IACN,mBAAmB,MAAc;AAE7B,aAAO,KAAK;AAAA,QACR;AAAA,QACA;AAAA;AAAA,uDAEuC,UAAU;AAAA,UAC7C;AAAA,QACJ,CAAC;AAAA,kBACC,IAAI,KAAK,EAAE,CAAC;AAAA;AAAA;AAAA,MAGlB;AAAA,IAEJ;AAAA,EACJ;AACJ;;;ADtEA,IAAM,mCAAmC;AAOzC,IAAM,cAAc,CAAC,QAAgB,KAAK,QAAQ,kCAAW,KAAK,GAAG;AAErE,IAAO,sBAAQ,aAAa;AAAA,EACxB,SAAS;AAAA,IACL,IAAI;AAAA,IACJ,WAAW,qBAAqB;AAAA,IAChC,OAAO;AAAA,IACP,WAAW;AAAA;AAAA,MAEP,SAAS,CAAC,OAAO,cAAc,OAAO;AAAA,IAC1C,CAAC;AAAA,EACL;AAAA,EACA,QAAQ;AAAA,IACJ,MAAM;AAAA,IACN,MAAM;AAAA,IACN,OAAO;AAAA,MACH,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,QAMJ,QAAQ;AAAA;AAAA;AAAA,QAGR,cAAc;AAAA,QACd,SAAS,CAAAC,UAAQA,MAAK,QAAQ,UAAU,EAAE;AAAA;AAAA,MAC9C;AAAA,IACJ;AAAA;AAAA,EAEJ;AAAA,EAEA,SAAS;AAAA,IACL,OAAO;AAAA,MACH,MAAM,YAAY,MAAM;AAAA,MACxB,KAAK,YAAY,KAAK;AAAA,MACtB,KAAK,YAAY,QAAQ;AAAA,IAC7B;AAAA,EACJ;AACJ,CAAC;",
  "names": ["path", "path"]
}
