diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts index 01a4dd9e..85d11f80 100644 --- a/src/api/data-collect/collector.ts +++ b/src/api/data-collect/collector.ts @@ -21,3 +21,24 @@ export const _validateField = (id: string, data?: any) => server.get(`/data-collect/point/${id}/_validate`, data); export const queryCodecProvider = () => server.get(`/things/collector/codecs`); + +export const updatePoint = (id: string, data: any) => + server.put(`/data-collect/point/${id}`, data); + +export const savePointBatch = (data: any) => + server.patch(`/data-collect/point`, data); + +export const savePoint = (data: any) => + server.post(`/data-collect/point`, data); + +export const batchDeletePoint = (data: any) => + server.post(`/data-collect/point/batch/_delete`, data); + +export const removePoint = (id: string) => + server.remove(`/data-collect/point/${id}`); + +export const readPoint = (collectorId: string, data: string[]) => + server.post(`/data-collect/collector/${collectorId}/points/_read`, data); + +export const writePoint = (collectorId: string, data: string[]) => + server.post(`/data-collect/collector/${collectorId}/points/_write`, data); diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue index d56586a0..1dd31cfd 100644 --- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue +++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue @@ -11,21 +11,10 @@ :model="formData" name="basic" autocomplete="off" + :rules="ModBusRules" + ref="formRef" > - + @@ -84,16 +61,7 @@ @@ -131,31 +101,18 @@ 'configuration', 'scaleFactor', ]" - :rules="[ - { - required: true, - message: '请输入缩放因子', - }, - ]" + :rules="ModBusRules.scaleFactor" > - - - + + --> + /> - - - 非标准协议写入配置 + + 非标准协议写入配置 @@ -240,6 +192,7 @@ placeholder="请输入采集频率" v-model:value="formData.configuration.interval" :min="1" + addon-after="ms" /> @@ -279,22 +232,16 @@ + + diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue new file mode 100644 index 00000000..d6863202 --- /dev/null +++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue @@ -0,0 +1,152 @@ + + + + diff --git a/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue b/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue index cb1aa934..31341aa5 100644 --- a/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue +++ b/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue @@ -1,10 +1,6 @@