diff --git a/src/api/process-boot/generalTest.ts b/src/api/process-boot/generalTest.ts
new file mode 100644
index 00000000..232aa300
--- /dev/null
+++ b/src/api/process-boot/generalTest.ts
@@ -0,0 +1,137 @@
+import createAxios from '@/utils/request'
+
+//查询普测计划-新建页面
+export function queryPlan(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/queryPlan',
+ method: 'post',
+ data
+ })
+}
+//导出普测计划信息
+export function exportSurveyPlan(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/exportSurveyPlan',
+ method: 'post',
+ data,
+ responseType: 'blob'
+ })
+}
+//新增
+export function getGeneratrixByCondition(data:any) {
+ return createAxios({
+ url: '/device-boot/pms/generatrixWire/getGeneratrixByCondition',
+ method: 'post',
+ data
+ })
+}
+// 获取变电站名称
+export function getstatationStatList(data:any) {
+ return createAxios({
+ url: '/device-boot/pms/statationStat/getstatationStatList',
+ method: 'post',
+ data
+ })
+}
+// 新增-修改普测计划
+export function addPlan(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/addPlan',
+ method: 'post',
+ data
+ })
+}
+
+//查询普测计划-审核页面
+export function queryPlanAudit(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/queryPlanAudit',
+ method: 'post',
+ data
+ })
+}
+//查询普测计划-结果页面
+export function queryPlanResult(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/queryPlanResult',
+ method: 'post',
+ data
+ })
+}
+//下载普测结果报告
+export function surveyResultDownload(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/surveyResultDownload?planNo=' + data.planNo,
+ method: 'post'
+ // responseType: 'blob',
+ })
+}
+//下载
+export function downLoadData(data:any) {
+ return createAxios({
+ url: data
+ })
+}
+export function MultipartFile(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/surveyResultUpload',
+ method: 'post',
+ headers: { 'Content-Type': 'multipart/form-data' }, //多文件上传这一句必须加
+ data
+ })
+}
+export function initDetpStataionTree(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/initDetpStataionTree',
+ method: 'post',
+ params: data
+ })
+}
+// 普测计划-审核
+export function checkPlanAudit(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/checkPlanAudit',
+ method: 'post',
+ data
+ })
+}
+// 普测计划-审核
+export function queryPlanConfig(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/queryPlanConfig',
+ method: 'post',
+ data
+ })
+}
+// 增加普测计划参数
+export function addPlanConfig(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/addPlanConfig',
+ method: 'post',
+ data
+ })
+}
+// 电站勾选接口
+export function querySubStatation(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/querySubStatation',
+ method: 'post',
+ params: data
+ })
+}
+// 设置普测周期
+export function addPlanCycle(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/addPlanCycle',
+ method: 'post',
+ params: data
+ })
+}
+// 批量提交审核
+export function planStatus(data:any) {
+ return createAxios({
+ url: '/process-boot/rGeneralSurveyPlan/planStatus',
+ method: 'post',
+ data
+ })
+}
diff --git a/src/components/tree/pqs/generalTestTree.vue b/src/components/tree/pqs/generalTestTree.vue
new file mode 100644
index 00000000..7f763618
--- /dev/null
+++ b/src/components/tree/pqs/generalTestTree.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+ 自动
+ 手动
+ 排除
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
new file mode 100644
index 00000000..73af079c
--- /dev/null
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
@@ -0,0 +1,133 @@
+.
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加电站
+
+
+
+
+
+
+ 提交
+ 取消
+
+
+
+
+
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index 4ecacb97..bca99a46 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -2,7 +2,7 @@
-
+
-
-
-
-
- 基本信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加电站
-
-
-
-
-
- 提交
- 取消
-
-
+
+
diff --git a/src/views/pqs/supervise/terminal/components/cycleTab.vue b/src/views/pqs/supervise/terminal/components/cycleTab.vue
index 80fc7860..91a6e819 100644
--- a/src/views/pqs/supervise/terminal/components/cycleTab.vue
+++ b/src/views/pqs/supervise/terminal/components/cycleTab.vue
@@ -68,8 +68,8 @@
-
-
+
选择文件
- (*传入的检测报告文件格式(终端编号-检测报告(yyyy-MM-dd).docx))
+
+ (*传入的检测报告文件格式(终端编号-检测报告(yyyy-MM-dd).docx))
+
取 消
@@ -103,7 +105,7 @@ import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { DownloadExport, reportDownload, batchTerminal, delTerminal ,importReport} from '@/api/process-boot/terminal'
+import { DownloadExport, reportDownload, batchTerminal, importReport } from '@/api/process-boot/terminal'
import { useDictData } from '@/stores/dictData'
const dictData = useDictData()
@@ -121,7 +123,6 @@ const testResultsList = [
const TableHeaderRef = ref()
const showBatchUpload = ref(false)
-const ruleFormRef = ref()
const fileList: any = ref([])
const tableStore = new TableStore({
url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
@@ -138,7 +139,13 @@ const tableStore = new TableStore({
},
{ field: 'installPlace', title: '安装位置' },
{ field: 'inspectionUnit', title: '送检单位' },
- { field: 'testResults', title: '检测结果' },
+ {
+ field: 'testResults',
+ title: '检测结果',
+ formatter(row: any) {
+ return row.cellValue == 0 ? '未展开' : '已展开'
+ }
+ },
{ field: 'nextInspectionTime', title: '下次检测时间' },
{
title: '操作',
@@ -146,32 +153,6 @@ const tableStore = new TableStore({
render: 'buttons',
fixed: 'right',
buttons: [
- {
- name: 'edit',
- title: '编辑',
- type: 'primary',
- icon: 'el-icon-EditPen',
- render: 'basicButton',
- click: row => {}
- },
- {
- title: '删除',
- type: 'danger',
- icon: 'el-icon-Delete',
- render: 'confirmButton',
- popconfirm: {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- confirmButtonType: 'danger',
- title: '确定删除吗?'
- },
- click: row => {
- delTerminal([row.id]).then(() => {
- ElMessage.success('删除成功')
- tableStore.index()
- })
- }
- },
{
name: 'edit',
title: '下载原始数据报告',
@@ -215,7 +196,7 @@ provide('tableStore', tableStore)
const onsubmit = () => {}
// 下载模版
const Export = () => {
- DownloadExport().then(res => {
+ DownloadExport().then((res: any) => {
let blob = new Blob([res], {
type: 'application/vnd.ms-excel'
})
@@ -233,7 +214,7 @@ const download = (row: any, type: number) => {
reportDownload({
id: row.id,
type: type
- }).then(res => {
+ }).then((res: any) => {
let blob = new Blob([res], {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
})
@@ -273,12 +254,12 @@ const UploadOriginal = () => {
// 上传
const BatchUpload = () => {
let form = new FormData()
- form.append('type', 1)
- fileList.value.forEach(item => {
+ form.append('type', '1')
+ fileList.value.forEach((item: any) => {
form.append('files', item.raw)
})
importReport(form)
- .then(res => {
+ .then((res: any) => {
if (res.type == 'application/json') {
ElMessage.success('上传成功!')
handleClose()
@@ -296,7 +277,7 @@ const chooseBatch = (e: any) => {
fileList.value.push(e)
}
const handleRemove = (e: any) => {
- fileList.value = fileList.value.filter(item => item.uid !== e.uid)
+ fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
}
const handleClose = () => {
fileList.value = []
diff --git a/src/views/pqs/supervise/terminal/components/networkEch.vue b/src/views/pqs/supervise/terminal/components/networkEch.vue
index 2ac1f8fa..73ed2907 100644
--- a/src/views/pqs/supervise/terminal/components/networkEch.vue
+++ b/src/views/pqs/supervise/terminal/components/networkEch.vue
@@ -28,7 +28,7 @@ const tableStore = new TableStore({
data: ['日检测终端数量']
},
xAxis: {
- data: tableStore.table.data.dateStatistics.map(item => item.statisticsDate)
+ data: tableStore.table.data.dateStatistics.map((item:any) => item.statisticsDate)
},
yAxis: {
name: '台'
@@ -38,7 +38,7 @@ const tableStore = new TableStore({
name: '日检测终端数量',
type: 'bar',
- data: tableStore.table.data.dateStatistics.map(item => item.count)
+ data: tableStore.table.data.dateStatistics.map((item:any) => item.count)
}
]
}
@@ -47,7 +47,7 @@ const tableStore = new TableStore({
data: ['检测终端数量']
},
xAxis: {
- data: tableStore.table.data.orgStatistics.map(item => item.orgName)
+ data: tableStore.table.data.orgStatistics.map((item:any) => item.orgName)
},
yAxis: {
name: '台'
@@ -57,7 +57,7 @@ const tableStore = new TableStore({
name: '检测终端数量',
type: 'bar',
- data: tableStore.table.data.orgStatistics.map(item => item.count)
+ data: tableStore.table.data.orgStatistics.map((item:any) => item.count)
}
]
}
diff --git a/src/views/pqs/supervise/terminal/components/networkTab.vue b/src/views/pqs/supervise/terminal/components/networkTab.vue
index 4434119d..bac4d1d9 100644
--- a/src/views/pqs/supervise/terminal/components/networkTab.vue
+++ b/src/views/pqs/supervise/terminal/components/networkTab.vue
@@ -88,7 +88,7 @@
accept=".doc,.docx"
:file-list="fileList"
:on-remove="handleRemove"
- :on-change="chooseBatch"
+ :on-change="chooseBatch"
ref="upload"
>
选择文件
@@ -251,7 +251,7 @@ const add = () => {
// 下载模版
const Export = () => {
- DownloadExport().then(res => {
+ DownloadExport().then((res: any) => {
let blob = new Blob([res], {
type: 'application/vnd.ms-excel'
})
@@ -269,7 +269,7 @@ const download = (row: any, type: number) => {
reportDownload({
id: row.id,
type: type
- }).then(res => {
+ }).then((res: any) => {
let blob = new Blob([res], {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
})
@@ -327,12 +327,12 @@ const UploadOriginal = () => {
// 上传
const BatchUpload = () => {
let form = new FormData()
- form.append('type', 0)
- fileList.value.forEach(item => {
+ form.append('type', '0')
+ fileList.value.forEach((item: any) => {
form.append('files', item.raw)
})
importReport(form)
- .then(res => {
+ .then((res: any) => {
if (res.type == 'application/json') {
ElMessage.success('上传成功!')
handleClose()
@@ -350,7 +350,7 @@ const chooseBatch = (e: any) => {
fileList.value.push(e)
}
const handleRemove = (e: any) => {
- fileList.value = fileList.value.filter(item => item.uid !== e.uid)
+ fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
}
const handleClose = () => {
fileList.value = []