diff --git a/src/api/supervision-boot/delete/index.ts b/src/api/supervision-boot/delete/index.ts
new file mode 100644
index 00000000..6148663a
--- /dev/null
+++ b/src/api/supervision-boot/delete/index.ts
@@ -0,0 +1,81 @@
+import createAxios from '@/utils/request'
+/**
+ * 干扰源接入功能删除流程
+ */
+export const deleteUserReport = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/userReport/deleteUserReport',
+ method: 'POST',
+ data
+ })
+}
+/**
+ * 终端入网检测删除流程
+ */
+export const deleteDevReport = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/deVReport/deleteDevReport',
+ method: 'POST',
+ data
+ })
+}
+/**
+ * 监测点台账录入删除流程
+ */
+export const deleteTempLineReport = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/tempLine/deleteTempLineReport',
+ method: 'POST',
+ data
+ })
+}
+/**
+ * 试运行评估删除流程
+ */
+export const deleteTempLineRunTestReport = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/supervisionTempLineRunTest/deleteTempLineRunTestReport',
+ method: 'POST',
+ data
+ })
+}
+/**
+ * 预告警单删除流程
+ */
+export const deleteWarningLeaflet = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/warningLeaflet/deleteWarningLeaflet',
+ method: 'POST',
+ data
+ })
+}
+/**
+ * 设备退运管理删除流程
+ */
+export const deleteQuitRunningDevice = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/quitRunningDevice/deleteQuitRunningDevice',
+ method: 'POST',
+ data
+ })
+}
+/**
+ * 技术监督计划管理删除流程
+ */
+export const deleteSurveyPlan = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/surveyPlan/deleteSurveyPlan',
+ method: 'POST',
+ data
+ })
+}
+/**
+ * 技术监督测试管理删除流程
+ */
+export const deleteSurveyPlanTest = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/surveyTest/deleteSurveyPlanTest',
+ method: 'POST',
+ data
+ })
+}
diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss
index 6a44cc17..91bb0c04 100644
--- a/src/styles/vxeTable.scss
+++ b/src/styles/vxeTable.scss
@@ -66,4 +66,7 @@
// }
.vxe-table--tooltip-wrapper {
z-index: 10000 !important;
- }
\ No newline at end of file
+}
+.is--disabled {
+ background-color: var(--vxe-input-disabled-color);
+}
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue
index e6bb8de6..48c2286b 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/components/timePopUpBox.vue
@@ -101,7 +101,7 @@ const tableStore = new TableStore({
],
beforeSearchFun: () => {
tableStore.table.params.field = props.timePopUpBox.field
- tableStore.table.params.lineId = '6469e77fda42db12c7ca6620a092f03c' //props.timePopUpBox.lineId
+ tableStore.table.params.lineId = props.timePopUpBox.lineId
tableStore.table.params.searchBeginTime = props.timePopUpBox.time
tableStore.table.params.searchEndTime = props.timePopUpBox.time
tableStore.table.params.statisticalId = radio2.value
diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
index 1cd159b6..451dcafc 100644
--- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
@@ -67,7 +67,7 @@
有功率区间占比
-
+
@@ -148,12 +148,12 @@
-
+
{{ row.flicker == '1' ? '越限' : '合格' }}
@@ -534,13 +534,14 @@ const tableStore = new TableStore({
yAxis: {
show: false
},
+
dataZoom: { show: false },
options: {
series: [
{
type: 'pie',
- center: ['50%', '55%'],
+ center: ['50%', '52%'],
selectedOffset: 30,
label: {
show: true,
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index b212044b..714afe86 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -24,10 +24,10 @@
新增计划
-
+ 删除
-
+
@@ -46,7 +46,7 @@ import { useRouter } from 'vue-router'
import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
import { getUserByRoleType } from '@/api/user-boot/user'
import { useDictData } from '@/stores/dictData'
-
+import { deleteSurveyPlan } from '@/api/supervision-boot/delete/index'
const dictData = useDictData()
const supvTypeOptionList = dictData.getBasicData('supv_type')
const statusSelect = dictData.statusSelect()
@@ -64,6 +64,10 @@ const tableStore = new TableStore({
publicHeight: 65,
method: 'POST',
column: [
+ {
+ width: '60',
+ type: 'checkbox'
+ },
{
title: '序号',
width: 60,
@@ -213,7 +217,30 @@ const add = () => {
// title.value = '普测计划新增'
planAddRef.value.open('计划新增')
}
-
+// 禁止点击
+const checkboxConfig = reactive({
+ checkMethod: ({ row }) => {
+ return adminInfo.roleCode.includes('delete_info')
+ ? true
+ : row.createBy == adminInfo.$state.id && row.status == 0
+ }
+})
+const deleteEven = () => {
+ if (tableStore.table.selection.length == 0) {
+ ElMessage({
+ type: 'warning',
+ message: '请选择要删除的数据'
+ })
+ } else {
+ deleteSurveyPlan(tableStore.table.selection.map(item => item.id)).then(res => {
+ ElMessage({
+ type: 'success',
+ message: '删除成功!'
+ })
+ tableStore.index()
+ })
+ }
+}
const exportFn = () => {
let form = JSON.parse(JSON.stringify(tableStore.table.params))
form.pageNum = 1
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index 95c96305..0eac9d2f 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -23,10 +23,10 @@
-
+ 删除
-
+
@@ -42,7 +42,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { cancelTest } from '@/api/process-boot/generalTest'
import planTest from './planTest.vue'
import { useRouter } from 'vue-router'
-
+import { deleteSurveyPlanTest } from '@/api/supervision-boot/delete/index'
import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
import { getUserByRoleType } from '@/api/user-boot/user'
@@ -63,6 +63,10 @@ const tableStore = new TableStore({
publicHeight: 65,
method: 'POST',
column: [
+ {
+ width: '60',
+ type: 'checkbox'
+ },
{
title: '序号',
width: 60,
@@ -228,7 +232,30 @@ provide('tableStore', tableStore)
const add = (id: string) => {
planTestRef.value.open('计划测试填报', id, true)
}
-
+// 禁止点击
+const checkboxConfig = reactive({
+ checkMethod: ({ row }) => {
+ return adminInfo.roleCode.includes('delete_info')
+ ? true
+ : row.createBy == adminInfo.$state.id && row.status == 0
+ }
+})
+const deleteEven = () => {
+ if (tableStore.table.selection.length == 0) {
+ ElMessage({
+ type: 'warning',
+ message: '请选择要删除的数据'
+ })
+ } else {
+ deleteSurveyPlanTest(tableStore.table.selection.map(item => item.id)).then(res => {
+ ElMessage({
+ type: 'success',
+ message: '删除成功!'
+ })
+ tableStore.index()
+ })
+ }
+}
const exportFn = () => {
let form = JSON.parse(JSON.stringify(tableStore.table.params))
form.pageNum = 1
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index e1c0f085..a85bd829 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -159,7 +159,7 @@
-
+
新增
+ 删除
-
+
@@ -41,7 +42,7 @@