diff --git a/src/api/advance-boot/bearingCapacity.ts b/src/api/advance-boot/bearingCapacity.ts
new file mode 100644
index 00000000..9ca48c90
--- /dev/null
+++ b/src/api/advance-boot/bearingCapacity.ts
@@ -0,0 +1,34 @@
+import createAxios from '@/utils/request'
+
+//承载能力评估用户新增
+export function addUse(data) {
+ return createAxios({
+ url: '/advance-boot/carrycapacityuser/add',
+ method: 'post',
+ data
+ })
+}
+//承载能力评估用户编辑
+export function updateUse(data) {
+ return createAxios({
+ url: '/advance-boot/carrycapacityuser/update',
+ method: 'post',
+ params: data
+ })
+}
+//承载能力评估用户批量删除
+export function removeUse(data) {
+ return createAxios({
+ url: '/advance-boot/carrycapacityuser/remove',
+ method: 'post',
+ params: data
+ })
+}
+//承载能力评估-台账树
+export function carryCapacityTree() {
+ return createAxios({
+ url: '/advance-boot/carrycapacity/carryCapacityTree',
+ method: 'get',
+
+ })
+}
diff --git a/src/api/common.ts b/src/api/common.ts
index 7b8a3a8d..df0d4904 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -30,10 +30,3 @@ export function analyseWave(params:string) {
method: 'get'
})
}
-// // 123
-// export function queyDetailUser(params:string) {
-// return createAxios({
-// url: '/cs-harmonic-boot/event/analyseWave?eventId=' + params,
-// method: 'get'
-// })
-// }
diff --git a/src/components/tree/pms/Terminal.vue b/src/components/tree/pqs/Terminal.vue
similarity index 100%
rename from src/components/tree/pms/Terminal.vue
rename to src/components/tree/pqs/Terminal.vue
diff --git a/src/components/tree/pms/index.vue b/src/components/tree/pqs/index.vue
similarity index 100%
rename from src/components/tree/pms/index.vue
rename to src/components/tree/pqs/index.vue
diff --git a/src/components/tree/pqs/loadBearingTree.vue b/src/components/tree/pqs/loadBearingTree.vue
new file mode 100644
index 00000000..bbab82c7
--- /dev/null
+++ b/src/components/tree/pqs/loadBearingTree.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
diff --git a/src/components/tree/pms/pointTree.vue b/src/components/tree/pqs/pointTree.vue
similarity index 100%
rename from src/components/tree/pms/pointTree.vue
rename to src/components/tree/pqs/pointTree.vue
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 48dea649..3c409174 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -55,9 +55,6 @@ function createAxios>(
// 请求拦截
Axios.interceptors.request.use(
config => {
-
-
-
// 取消重复请求
removePending(config)
options.CancelDuplicateRequest && addPending(config)
@@ -77,10 +74,7 @@ function createAxios>(
config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
}
}
- if(config.url?.substring(0, 4)=='/hzj'){
- config.url=config.url?.slice(4)
- config.baseURL='/hzj'
- }
+
return config
},
error => {
diff --git a/src/views/pqs/bearingCapacity/evaluationList/charge.vue b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
similarity index 100%
rename from src/views/pqs/bearingCapacity/evaluationList/charge.vue
rename to src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
diff --git a/src/views/pqs/bearingCapacity/evaluationList/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
similarity index 99%
rename from src/views/pqs/bearingCapacity/evaluationList/photovoltaic.vue
rename to src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
index b3629f63..f89813cd 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/photovoltaic.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
@@ -85,10 +85,10 @@
import { onMounted, ref, provide } from 'vue'
import 'splitpanes/dist/splitpanes.css'
import { Splitpanes, Pane } from 'splitpanes'
-import PointTree from '@/components/tree/pms/pointTree.vue'
+import PointTree from '@/components/tree/pqs/loadBearingTree.vue'
import DatePicker from '@/components/form/datePicker/index.vue'
import { mainHeight } from '@/utils/layout'
-import { text } from './text'
+import { text } from '../text'
import MyEChart from '@/components/echarts/MyEchart.vue'
import { useMonitoringPoint } from '@/stores/monitoringPoint'
import { defaultAttribute } from '@/components/table/defaultAttribute'
diff --git a/src/views/pqs/bearingCapacity/evaluationList/policy.vue b/src/views/pqs/bearingCapacity/evaluationList/components/policy.vue
similarity index 100%
rename from src/views/pqs/bearingCapacity/evaluationList/policy.vue
rename to src/views/pqs/bearingCapacity/evaluationList/components/policy.vue
diff --git a/src/views/pqs/bearingCapacity/evaluationList/index.vue b/src/views/pqs/bearingCapacity/evaluationList/index.vue
index b535f0c2..325e441b 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/index.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/index.vue
@@ -78,9 +78,9 @@ import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import Area from '@/components/form/area/index.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import policy from './policy.vue'
-import photovoltaic from './photovoltaic.vue'
-import charge from './charge.vue'
+import policy from './components/policy.vue'
+import photovoltaic from './components/photovoltaic.vue'
+import charge from './components/charge.vue'
import { mainHeight } from '@/utils/layout'
import { useDictData } from '@/stores/dictData'
@@ -123,7 +123,7 @@ const rules = {
const ruleFormRef = ref()
const tableStore = new TableStore({
- url: '/advance-boot/process/querySagEventsPage',
+ url: '/advance-boot/carrycapacity/queryCarryCapacityData',
method: 'POST',
column: [
{ width: '60', type: 'checkbox' },
@@ -198,6 +198,7 @@ const tableStore = new TableStore({
}
})
tableStore.table.params.searchValue = ''
+tableStore.table.params.userId = dictData.state.area[0].id
provide('tableStore', tableStore)
onMounted(() => {
diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue
index 353794e3..2f6a94a2 100644
--- a/src/views/pqs/bearingCapacity/userManagement/index.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/index.vue
@@ -4,31 +4,32 @@
-
+ collapse-tagsplaceholder="请选择用户类型"
+ >
+
+
新增
-
-
-
+
+
-
-
+
+
@@ -71,6 +72,7 @@ import Area from '@/components/form/area/index.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { mainHeight } from '@/utils/layout'
import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
defineOptions({
name: 'estimate/userManagement'
})
@@ -82,40 +84,34 @@ const disabled = ref(false)
const TableHeaderRef = ref()
const title = ref('')
interface RuleForm {
- name: string
- level: string
- deptIndex: string
+ area: string
+ city: string
+ province: string
+ region: string
+ userName: string
userType: string
- type: string
- mav1: string
- mav2: string
- user: string
- time: string
- detailed: string
+ voltage: string
}
const form = ref({
- name: '',
- level: '',
- deptIndex: dictData.state.area[0].id,
- userType: '光伏电站',
- type: '光伏电站',
- mav1: '100',
- mav2: '100',
- user: 'Admin',
- time: '2024-01-03',
- detailed: '详细地址'
+ area: '',
+ city: '',
+ province: '',
+ region: '',
+ userName: '',
+ userType: '',
+ voltage: ''
})
const rules = {
- name: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
+ userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
userType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
- level: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
+ voltage: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
mav1: [{ required: true, message: '请输入用户协议容量', trigger: 'blur' }],
mav2: [{ required: true, message: '请输入拟接入容量', trigger: 'blur' }],
detailed: [{ required: true, message: '请输入详细地址', trigger: 'blur' }]
}
const ruleFormRef = ref()
const tableStore = new TableStore({
- url: '/hzj/carrycapacityuser/queyDetailUser',
+ url: '/advance-boot/carrycapacityuser/queyDetailUser',
method: 'POST',
column: [
{ width: '60', type: 'checkbox' },
@@ -186,7 +182,9 @@ const tableStore = new TableStore({
title: '确定删除?'
},
click: row => {
-
+ removeUse({ userIds: row.id }).then(res => {
+ ElMessage.success('删除成功')
+ })
}
}
]
@@ -196,6 +194,7 @@ const tableStore = new TableStore({
loadCallback: () => {
tableStore.table.data = [
{
+ id: '123',
name: '光伏电站用户1',
type: '光伏电站',
Area: '中国',
@@ -209,29 +208,8 @@ const tableStore = new TableStore({
]
}
})
-// "area": "",
-// "city": "",
-// "endTime": "",
-// "pageNum": {},
-// "pageSize": {},
-// "protocolCapacity": 0,
-// "province": "",
-// "region": "",
-// "startTime": "",
-// "userId": "",
-// "userName": "",
-// "userType": "",
-// "voltage": ""
-tableStore.table.params.searchValue = ''
-tableStore.table.params.area = ''
-tableStore.table.params.city = ''
-tableStore.table.params.protocolCapacity = 0
-tableStore.table.params.province = ''
-tableStore.table.params.region = ''
-tableStore.table.params.userId = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.userType = ''
-tableStore.table.params.voltage = ''
+
+// tableStore.table.params.searchValue = ''
provide('tableStore', tableStore)
onMounted(() => {
@@ -250,7 +228,13 @@ const onSubmit = () => {
ruleFormRef.value.validate((valid: boolean) => {
if (valid) {
if (title.value == '新增承载能力预评估用户') {
+ addUse(form.value).then(res => {
+ tableStore.index()
+ })
} else if (title.value == '编辑承载能力预评估用户') {
+ updateUse(form.value).then(res => {
+ tableStore.index()
+ })
}
}
})
diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue
index 5f2c7e35..a72ce708 100644
--- a/src/views/pqs/business/terminal/deviceter/index.vue
+++ b/src/views/pqs/business/terminal/deviceter/index.vue
@@ -1430,7 +1430,7 @@ defineOptions({
name: 'device-boot/deviceter'
})
import { LocationInformation } from '@element-plus/icons-vue'
-import Terminal from '@/components/tree/pms/Terminal.vue'
+import Terminal from '@/components/tree/pqs/Terminal.vue'
import { mainHeight } from '@/utils/layout'
import { areaTree } from '@/api/system-boot/dicData'
import { queryTerminal, nodeAllList, delTerminal, updateTerminal, addTerminal } from '@/api/device-boot/Business.ts'
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
index 45bf27ac..d422e969 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
@@ -54,7 +54,7 @@
import { defineOptions, watch, onMounted, ref, nextTick } from 'vue'
import 'splitpanes/dist/splitpanes.css'
import { Splitpanes, Pane } from 'splitpanes'
-import PointTree from '@/components/tree/pms/pointTree.vue'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
import { useMonitoringPoint } from '@/stores/monitoringPoint'
import { mainHeight } from '@/utils/layout'
import Wentaizonghepinggu from './wentaizonghepinggu/index.vue'
diff --git a/src/views/pqs/voltageSags/Region/statistics/index.vue b/src/views/pqs/voltageSags/Region/statistics/index.vue
index 10c016d2..ce872e1d 100644
--- a/src/views/pqs/voltageSags/Region/statistics/index.vue
+++ b/src/views/pqs/voltageSags/Region/statistics/index.vue
@@ -13,7 +13,14 @@
-
+
-