From 805a0fbd03b881fa94a28cbcdb66f2ba90166d1b Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Sat, 29 Nov 2025 18:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=94=E5=B8=B8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../air/hisdata/SurvHisdataAir.data.ts | 9 +- .../air/realtime/SurvTransdataAir.data.ts | 9 +- .../appmana/deploy/SurvDeviceDeploy.api.ts | 8 + .../components/SurvDeviceDeployForm.vue | 7 + .../hisdata/SurvHisdataOrientwater.data.ts | 59 ++-- .../components/SurvHisdataOrientwaterForm.vue | 147 ++++----- .../realtime/SurvTransdataOrientwater.data.ts | 59 ++-- .../SurvTransdataOrientwaterForm.vue | 139 ++++---- .../soil/hisdata/SurvHisdataSoil.data.ts | 40 ++- .../soil/hisdata/SurvHisdataSoilList.vue | 65 ++-- .../components/SurvHisdataSoilForm.vue | 83 ++--- .../soil/realtime/SurvTransdataSoil.data.ts | 40 ++- .../soil/realtime/SurvTransdataSoilList.vue | 64 ++-- .../components/SurvTransdataSoilForm.vue | 87 +++-- .../water/hisdata/SurvHisdataSoil.api.ts | 72 +++++ .../water/hisdata/SurvHisdataSoil.data.ts | 143 +++++++++ .../water/hisdata/SurvHisdataSoilList.vue | 297 ++++++++++++++++++ .../components/SurvHisdataSoilForm.vue | 193 ++++++++++++ .../components/SurvHisdataSoilModal.vue | 75 +++++ .../water/realtime/SurvTransdataSoil.api.ts | 72 +++++ .../water/realtime/SurvTransdataSoil.data.ts | 133 ++++++++ .../water/realtime/SurvTransdataSoilList.vue | 295 +++++++++++++++++ .../components/SurvTransdataSoilForm.vue | 186 +++++++++++ .../components/SurvTransdataSoilModal.vue | 75 +++++ .../Analysis/components/VisitAnalysis.vue | 46 +-- 25 files changed, 2018 insertions(+), 385 deletions(-) create mode 100644 src/views/appmana/water/hisdata/SurvHisdataSoil.api.ts create mode 100644 src/views/appmana/water/hisdata/SurvHisdataSoil.data.ts create mode 100644 src/views/appmana/water/hisdata/SurvHisdataSoilList.vue create mode 100644 src/views/appmana/water/hisdata/components/SurvHisdataSoilForm.vue create mode 100644 src/views/appmana/water/hisdata/components/SurvHisdataSoilModal.vue create mode 100644 src/views/appmana/water/realtime/SurvTransdataSoil.api.ts create mode 100644 src/views/appmana/water/realtime/SurvTransdataSoil.data.ts create mode 100644 src/views/appmana/water/realtime/SurvTransdataSoilList.vue create mode 100644 src/views/appmana/water/realtime/components/SurvTransdataSoilForm.vue create mode 100644 src/views/appmana/water/realtime/components/SurvTransdataSoilModal.vue diff --git a/src/views/appmana/air/hisdata/SurvHisdataAir.data.ts b/src/views/appmana/air/hisdata/SurvHisdataAir.data.ts index db1c371..c2af0f8 100644 --- a/src/views/appmana/air/hisdata/SurvHisdataAir.data.ts +++ b/src/views/appmana/air/hisdata/SurvHisdataAir.data.ts @@ -9,10 +9,15 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'stationName', }, + // { + // title: '设备编号', + // align: "center", + // dataIndex: 'deviceCode', + // }, { - title: '设备编号', + title: '设备名称', align: "center", - dataIndex: 'deviceCode', + dataIndex: 'deviceName', }, { title: '数据更新时间', diff --git a/src/views/appmana/air/realtime/SurvTransdataAir.data.ts b/src/views/appmana/air/realtime/SurvTransdataAir.data.ts index 990a2ee..cf2d980 100644 --- a/src/views/appmana/air/realtime/SurvTransdataAir.data.ts +++ b/src/views/appmana/air/realtime/SurvTransdataAir.data.ts @@ -9,10 +9,15 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'stationName', }, + // { + // title: '设备编号', + // align: "center", + // dataIndex: 'deviceCode', + // }, { - title: '设备编号', + title: '设备名称', align: "center", - dataIndex: 'deviceCode', + dataIndex: 'deviceName', }, { title: '数据更新时间', diff --git a/src/views/appmana/deploy/SurvDeviceDeploy.api.ts b/src/views/appmana/deploy/SurvDeviceDeploy.api.ts index ba8224b..08b65c6 100644 --- a/src/views/appmana/deploy/SurvDeviceDeploy.api.ts +++ b/src/views/appmana/deploy/SurvDeviceDeploy.api.ts @@ -20,6 +20,7 @@ enum Api { cameraStartApi = '/appmana/survDeviceDeploy/cameraStart', cameraStopApi = '/appmana/survDeviceDeploy/cameraStop', getDeviceCateList = '/appmana/fDictDeviceCate/getDeviceCateList', + getDeviceList='/appmana/survDeviceDeploy/getDeviceList', } /** @@ -171,3 +172,10 @@ export const cameraStop = (params) => { * @param params */ export const getDeviceCateList = (params) => defHttp.get({ url: Api.getDeviceCateList, params }); + + +/** + * 列表接口 + * @param params + */ +export const getDeviceList = (params) => defHttp.post({ url: Api.getDeviceList, params }); diff --git a/src/views/appmana/deploy/components/SurvDeviceDeployForm.vue b/src/views/appmana/deploy/components/SurvDeviceDeployForm.vue index fd63165..031de60 100644 --- a/src/views/appmana/deploy/components/SurvDeviceDeployForm.vue +++ b/src/views/appmana/deploy/components/SurvDeviceDeployForm.vue @@ -211,6 +211,12 @@ + + + + + + - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114,7 +119,7 @@ import { getValueType } from '/@/utils'; import { saveOrUpdate } from '../SurvHisdataOrientwater.api'; import { Form } from 'ant-design-vue'; - + const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: ()=>{} }, @@ -125,23 +130,23 @@ const emit = defineEmits(['register', 'ok']); const formData = reactive>({ id: '', - tenantId: '', + tenantId: '', reVision: undefined, - createdBy: '', - createTime: '', - updatedBy: '', + createdBy: '', + createTime: '', + updatedBy: '', isDel: undefined, - updatedTime: '', - dataId: '', - dataWaterTp: '', - dataWaterTn: '', - dataWaterNo: '', - dataDateTime: '', - dataGatherType: '', - transDate: '', - deviceName: '', - deviceCode: '', - stationName: '', + updatedTime: '', + dataId: '', + dataWaterTp: '', + dataWaterTn: '', + dataWaterNo: '', + dataDateTime: '', + dataGatherType: '', + transDate: '', + deviceName: '', + deviceCode: '', + stationName: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); @@ -164,7 +169,7 @@ return props.formDisabled; }); - + /** * 新增 */ diff --git a/src/views/appmana/orientwater/realtime/SurvTransdataOrientwater.data.ts b/src/views/appmana/orientwater/realtime/SurvTransdataOrientwater.data.ts index 8265c5b..1df7ce8 100644 --- a/src/views/appmana/orientwater/realtime/SurvTransdataOrientwater.data.ts +++ b/src/views/appmana/orientwater/realtime/SurvTransdataOrientwater.data.ts @@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [ { title: '设备编号', align: "center", - dataIndex: 'deviceCode', + dataIndex: 'deployCode', }, { title: '数据更新时间', @@ -34,36 +34,41 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'dataWaterTn' }, + // { + // title: '硝态氮(mg/L)', + // align: "center", + // dataIndex: 'dataWaterNo' + // }, { - title: '硝态氮(mg/L)', + title: '化学需氧量(mg/L)', align: "center", - dataIndex: 'dataWaterNo' - }, - { - title: '1#球阀状态', - align: "center", - dataIndex: 'firstValveStatus', - customRender: ({ text }) => { - if (!text || text == '00') { - return '开'; - } else if (text == '01') { - return '关'; - } - }, - }, - { - title: '2#球阀状态', - align: "center", - dataIndex: 'secondValveStatus', - customRender: ({ text }) => { - if (!text || text == '00') { - return '开'; - } else if (text == '01') { - return '关'; - } - }, + dataIndex: 'dataWaterCod' }, // { + // title: '1#球阀状态', + // align: "center", + // dataIndex: 'firstValveStatus', + // customRender: ({ text }) => { + // if (!text || text == '00') { + // return '开'; + // } else if (text == '01') { + // return '关'; + // } + // }, + // }, + // { + // title: '2#球阀状态', + // align: "center", + // dataIndex: 'secondValveStatus', + // customRender: ({ text }) => { + // if (!text || text == '00') { + // return '开'; + // } else if (text == '01') { + // return '关'; + // } + // }, + // }, + // { // title: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据', // align: "center", // dataIndex: 'dataGatherType' diff --git a/src/views/appmana/orientwater/realtime/components/SurvTransdataOrientwaterForm.vue b/src/views/appmana/orientwater/realtime/components/SurvTransdataOrientwaterForm.vue index 44d2c4b..e062fab 100644 --- a/src/views/appmana/orientwater/realtime/components/SurvTransdataOrientwaterForm.vue +++ b/src/views/appmana/orientwater/realtime/components/SurvTransdataOrientwaterForm.vue @@ -32,61 +32,66 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109,7 +114,7 @@ import { getValueType } from '/@/utils'; import { saveOrUpdate } from '../SurvTransdataOrientwater.api'; import { Form } from 'ant-design-vue'; - + const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: ()=>{} }, @@ -120,22 +125,22 @@ const emit = defineEmits(['register', 'ok']); const formData = reactive>({ id: '', - tenantId: '', + tenantId: '', reVision: undefined, - createdBy: '', - createTime: '', - updatedBy: '', + createdBy: '', + createTime: '', + updatedBy: '', isDel: undefined, - updatedTime: '', - dataId: '', - dataWaterTp: '', - dataWaterTn: '', - dataWaterNo: '', - dataDateTime: '', + updatedTime: '', + dataId: '', + dataWaterTp: '', + dataWaterTn: '', + dataWaterNo: '', + dataDateTime: '', dataGatherType: '', - deviceName: '', - deviceCode: '', - stationName: '', + deviceName: '', + deviceCode: '', + stationName: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); @@ -158,7 +163,7 @@ return props.formDisabled; }); - + /** * 新增 */ diff --git a/src/views/appmana/soil/hisdata/SurvHisdataSoil.data.ts b/src/views/appmana/soil/hisdata/SurvHisdataSoil.data.ts index 78046d6..926cb6b 100644 --- a/src/views/appmana/soil/hisdata/SurvHisdataSoil.data.ts +++ b/src/views/appmana/soil/hisdata/SurvHisdataSoil.data.ts @@ -4,15 +4,20 @@ import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ + // { + // title: '站点名称', + // align: "center", + // dataIndex: 'stationName', + // }, + // { + // title: '设备部署编号', + // align: "center", + // dataIndex: 'deployCode', + // }, { - title: '站点名称', + title: '设备名称', align: "center", - dataIndex: 'stationName', - }, - { - title: '设备部署编号', - align: "center", - dataIndex: 'deviceCode', + dataIndex: 'deployDes', }, { title: '数据更新时间', @@ -20,20 +25,35 @@ export const columns: BasicColumn[] = [ dataIndex: 'dataDateTime', }, { - title: '20CM土壤温度(℃)', + title: '土壤温度(℃)', align: "center", dataIndex: 'dataSoilTemp' }, { - title: '20CM土壤湿度(%)', + title: '土壤湿度(%)', align: "center", dataIndex: 'dataSoilWet' }, { - title: '20CM土壤盐分(uS/cm)', + title: '电导率(uS/cm)', align: "center", dataIndex: 'dataSoilDdl' }, + { + title: '氮离子(mg/KG)', + align: "center", + dataIndex: 'dataSoilNion' + }, + { + title: '磷离子(mg/KG)', + align: "center", + dataIndex: 'dataSoilPion' + }, + { + title: '钾离子(mg/KG)', + align: "center", + dataIndex: 'dataSoilKion' + }, // { // title: '数据类型', diff --git a/src/views/appmana/soil/hisdata/SurvHisdataSoilList.vue b/src/views/appmana/soil/hisdata/SurvHisdataSoilList.vue index da86050..bf8a6dc 100644 --- a/src/views/appmana/soil/hisdata/SurvHisdataSoilList.vue +++ b/src/views/appmana/soil/hisdata/SurvHisdataSoilList.vue @@ -4,21 +4,37 @@
+ + + + + + + + + + + + + + + + - - - - + + + + @@ -107,12 +123,14 @@ import { ApiSelect} from '/@/components/Form/index'; import { getStationList } from '../../station/SurvStationInfo.api'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; + import { getDeviceList } from '/@/views/appmana/deploy/SurvDeviceDeploy.api'; const formRef = ref(); const queryParam = reactive({}); const toggleSearchStatus = ref(false); const registerModal = ref(); const stationType = { stationType: 'orient' }; + const deployType = { deployTypes: ['soil'] }; //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -126,6 +144,7 @@ fixed: 'right', }, beforeFetch: (params) => { + params.deployType = 'soil'; return Object.assign(params, queryParam); }, }, @@ -156,7 +175,7 @@ registerModal.value.disableSubmit = false; registerModal.value.add(); } - + /** * 编辑事件 */ @@ -164,7 +183,7 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } - + /** * 详情 */ @@ -172,28 +191,28 @@ registerModal.value.disableSubmit = true; registerModal.value.edit(record); } - + /** * 删除事件 */ async function handleDelete(record) { await deleteOne({ id: record.id }, handleSuccess); } - + /** * 批量删除事件 */ async function batchHandleDelete() { await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); } - + /** * 成功回调 */ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -217,7 +236,7 @@ }, ]; } - + /** * 下拉操作栏 */ @@ -242,7 +261,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -252,7 +271,7 @@ //刷新数据 reload(); } - + diff --git a/src/views/appmana/soil/hisdata/components/SurvHisdataSoilForm.vue b/src/views/appmana/soil/hisdata/components/SurvHisdataSoilForm.vue index 729dedb..38ef135 100644 --- a/src/views/appmana/soil/hisdata/components/SurvHisdataSoilForm.vue +++ b/src/views/appmana/soil/hisdata/components/SurvHisdataSoilForm.vue @@ -2,64 +2,49 @@ + + + + + - - + + - - + + - - - - - - + - + - + - - + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + @@ -104,6 +119,7 @@ import SurvTransdataSoilModal from './components/SurvTransdataSoilModal.vue' import { ApiSelect} from '/@/components/Form/index'; import { getStationList } from '../../station/SurvStationInfo.api'; + import {getDeviceList} from '../../deploy/SurvDeviceDeploy.api'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; const formRef = ref(); @@ -111,6 +127,7 @@ const toggleSearchStatus = ref(false); const registerModal = ref(); const stationType = { stationType: 'orient' }; + const deployType = { deployTypes: ['soil'] }; //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -124,6 +141,7 @@ fixed: 'right', }, beforeFetch: (params) => { + params.deployType = 'soil'; return Object.assign(params, queryParam); }, }, @@ -154,7 +172,7 @@ registerModal.value.disableSubmit = false; registerModal.value.add(); } - + /** * 编辑事件 */ @@ -162,7 +180,7 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } - + /** * 详情 */ @@ -170,28 +188,28 @@ registerModal.value.disableSubmit = true; registerModal.value.edit(record); } - + /** * 删除事件 */ async function handleDelete(record) { await deleteOne({ id: record.id }, handleSuccess); } - + /** * 批量删除事件 */ async function batchHandleDelete() { await batchDelete({ ids: selectedRowKeys.value }, handleSuccess); } - + /** * 成功回调 */ function handleSuccess() { (selectedRowKeys.value = []) && reload(); } - + /** * 操作栏 */ @@ -203,7 +221,7 @@ }, ]; } - + /** * 下拉操作栏 */ @@ -241,7 +259,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -251,7 +269,7 @@ //刷新数据 reload(); } - + diff --git a/src/views/appmana/soil/realtime/components/SurvTransdataSoilForm.vue b/src/views/appmana/soil/realtime/components/SurvTransdataSoilForm.vue index 5e6beb3..35cf640 100644 --- a/src/views/appmana/soil/realtime/components/SurvTransdataSoilForm.vue +++ b/src/views/appmana/soil/realtime/components/SurvTransdataSoilForm.vue @@ -2,64 +2,49 @@ + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/appmana/water/hisdata/components/SurvHisdataSoilForm.vue b/src/views/appmana/water/hisdata/components/SurvHisdataSoilForm.vue new file mode 100644 index 0000000..7ead9c7 --- /dev/null +++ b/src/views/appmana/water/hisdata/components/SurvHisdataSoilForm.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/appmana/water/hisdata/components/SurvHisdataSoilModal.vue b/src/views/appmana/water/hisdata/components/SurvHisdataSoilModal.vue new file mode 100644 index 0000000..7ec667f --- /dev/null +++ b/src/views/appmana/water/hisdata/components/SurvHisdataSoilModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/appmana/water/realtime/SurvTransdataSoil.api.ts b/src/views/appmana/water/realtime/SurvTransdataSoil.api.ts new file mode 100644 index 0000000..c0c2428 --- /dev/null +++ b/src/views/appmana/water/realtime/SurvTransdataSoil.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/appmana/survTransdataSoil/list', + save='/appmana/survTransdataSoil/add', + edit='/appmana/survTransdataSoil/edit', + deleteOne = '/appmana/survTransdataSoil/delete', + deleteBatch = '/appmana/survTransdataSoil/deleteBatch', + importExcel = '/appmana/survTransdataSoil/importExcel', + exportXls = '/appmana/survTransdataSoil/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/src/views/appmana/water/realtime/SurvTransdataSoil.data.ts b/src/views/appmana/water/realtime/SurvTransdataSoil.data.ts new file mode 100644 index 0000000..c29ab46 --- /dev/null +++ b/src/views/appmana/water/realtime/SurvTransdataSoil.data.ts @@ -0,0 +1,133 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + // { + // title: '站点名称', + // align: "center", + // dataIndex: 'stationName', + // }, + // { + // title: '设备部署编号', + // align: "center", + // dataIndex: 'deployCode', + // }, + { + title: '设备名称', + align: "center", + dataIndex: 'deployDes', + }, + { + title: '数据更新时间', + align: "center", + dataIndex: 'dataDateTime', + }, + { + title: '浊度(ntu)', + align: "center", + dataIndex: 'dataWaterNtu' + }, + { + title: '溶解氧(mg/L)', + align: "center", + dataIndex: 'dataWaterDo' + }, + { + title: 'pH', + align: "center", + dataIndex: 'dataWaterPh' + }, + { + title: '水温(℃)', + align: "center", + dataIndex: 'dataWaterTemp' + }, + { + title: '电导率(uS/cm)', + align: "center", + dataIndex: 'dataWaterDdl' + }, + + // { + // title: '数据类型', + // align: "center", + // dataIndex: 'dataGatherType' + // }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '租户号', + field: 'tenantId', + component: 'Input', + }, + { + label: '乐观锁', + field: 'reVision', + component: 'InputNumber', + }, + { + label: '创建人', + field: 'createdBy', + component: 'Input', + }, + { + label: '创建时间', + field: 'createTime', + component: 'DatePicker', + }, + { + label: '更新人', + field: 'updatedBy', + component: 'Input', + }, + { + label: '逻辑删除', + field: 'isDel', + component: 'InputNumber', + }, + { + label: '更新时间', + field: 'updatedTime', + component: 'DatePicker', + }, + { + label: '土壤温度;106', + field: 'dataSoilTemp', + component: 'Input', + }, + { + label: '土壤湿度;107', + field: 'dataSoilWet', + component: 'Input', + }, + { + label: '土壤盐分;198', + field: 'dataSoilSalt', + component: 'Input', + }, + { + label: '数据更新时间', + field: 'dataDateTime', + component: 'DatePicker', + }, + { + label: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据', + field: 'dataGatherType', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/appmana/water/realtime/SurvTransdataSoilList.vue b/src/views/appmana/water/realtime/SurvTransdataSoilList.vue new file mode 100644 index 0000000..dd6c4f4 --- /dev/null +++ b/src/views/appmana/water/realtime/SurvTransdataSoilList.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/src/views/appmana/water/realtime/components/SurvTransdataSoilForm.vue b/src/views/appmana/water/realtime/components/SurvTransdataSoilForm.vue new file mode 100644 index 0000000..b1401bb --- /dev/null +++ b/src/views/appmana/water/realtime/components/SurvTransdataSoilForm.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/appmana/water/realtime/components/SurvTransdataSoilModal.vue b/src/views/appmana/water/realtime/components/SurvTransdataSoilModal.vue new file mode 100644 index 0000000..5ce85b2 --- /dev/null +++ b/src/views/appmana/water/realtime/components/SurvTransdataSoilModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/dashboard/Analysis/components/VisitAnalysis.vue b/src/views/dashboard/Analysis/components/VisitAnalysis.vue index 0501ee1..e86b4fb 100644 --- a/src/views/dashboard/Analysis/components/VisitAnalysis.vue +++ b/src/views/dashboard/Analysis/components/VisitAnalysis.vue @@ -71,7 +71,7 @@ onMounted(() => { }else{ value=value.format(dateFormat) } - + getSummary(searchStationCode.value,value); }; @@ -161,17 +161,17 @@ onMounted(() => { color: '#019680', }, }, - { - smooth: true, - name: '硝态氮', - stack: 'mg/L', - data: summaryNoDataList.value, - type: 'line', - areaStyle: {}, - itemStyle: { - color: '#019634', - }, - }, + // { + // smooth: true, + // name: '硝态氮', + // stack: 'mg/L', + // data: summaryNoDataList.value, + // type: 'line', + // areaStyle: {}, + // itemStyle: { + // color: '#019634', + // }, + // }, { smooth: true, name: '化学需氧量', @@ -183,17 +183,17 @@ onMounted(() => { color: '#a65107', }, }, - { - smooth: true, - name: '氨氮', - stack: 'mg/L', - data: summaryNhDataList.value, - type: 'line', - areaStyle: {}, - itemStyle: { - color: '#075ca6', - }, - }, + // { + // smooth: true, + // name: '氨氮', + // stack: 'mg/L', + // data: summaryNhDataList.value, + // type: 'line', + // areaStyle: {}, + // itemStyle: { + // color: '#075ca6', + // }, + // }, ], }); } else {