From 3183720b272ce1cb4f2954dad7aa4ea3ce0c3e17 Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Thu, 30 Jul 2026 09:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E9=87=8F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hisdata/SurvHisdataFlowmeter.data.ts      | 91 +++++-------------
 .../components/SurvHisdataFlowmeterForm.vue   | 95 ++++++-------------
 .../realtime/SurvTransdataFlowmeter.data.ts   | 89 ++++++-----------
 .../components/SurvTransdataFlowmeterForm.vue | 92 ++++++------------
 .../survconfig/components/FSurvConfigForm.vue |  2 +-
 5 files changed, 114 insertions(+), 255 deletions(-)

diff --git a/src/views/appmana/flowmeter/hisdata/SurvHisdataFlowmeter.data.ts b/src/views/appmana/flowmeter/hisdata/SurvHisdataFlowmeter.data.ts
index 12a97f2..c2632fc 100644
--- a/src/views/appmana/flowmeter/hisdata/SurvHisdataFlowmeter.data.ts
+++ b/src/views/appmana/flowmeter/hisdata/SurvHisdataFlowmeter.data.ts
@@ -5,90 +5,49 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '租户号',
-    align: "center",
-    dataIndex: 'tenantId'
+    title: '设备编号',
+    align: 'center',
+    dataIndex: 'deployCode',
   },
   {
-    title: '乐观锁',
-    align: "center",
-    dataIndex: 'reVision'
+    title: '累计流量',
+    align: 'center',
+    dataIndex: 'sData1',
   },
   {
-    title: '创建人',
-    align: "center",
-    dataIndex: 'createdBy'
+    title: '瞬时流量',
+    align: 'center',
+    dataIndex: 'sData2',
   },
   {
-    title: '创建时间',
-    align: "center",
-    dataIndex: 'createTime',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
-    },
+    title: '空高值',
+    align: 'center',
+    dataIndex: 'sData3',
   },
   {
-    title: '更新人',
-    align: "center",
-    dataIndex: 'updatedBy'
+    title: '液位值',
+    align: 'center',
+    dataIndex: 'sData4',
   },
   {
-    title: '逻辑删除',
-    align: "center",
-    dataIndex: 'isDel'
-  },
-  {
-    title: '更新时间',
-    align: "center",
-    dataIndex: 'updatedTime',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
-    },
-  },
-  {
-    title: '数据1',
-    align: "center",
-    dataIndex: 'sData1'
-  },
-  {
-    title: '数据2',
-    align: "center",
-    dataIndex: 'sData2'
-  },
-  {
-    title: '数据3',
-    align: "center",
-    dataIndex: 'sData3'
-  },
-  {
-    title: '数据4',
-    align: "center",
-    dataIndex: 'sData4'
-  },
-  {
-    title: '数据5',
-    align: "center",
-    dataIndex: 'sData5'
+    title: '当前流速值',
+    align: 'center',
+    dataIndex: 'sData5',
   },
   {
     title: '数据更新时间',
-    align: "center",
-    dataIndex: 'sDateTime',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
+    align: 'center',
+    dataIndex: 'dataDateTime',
+    customRender: ({ text }) => {
+      return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
     },
   },
-  {
-    title: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据',
-    align: "center",
-    dataIndex: 'dataGatherType'
-  },
   {
     title: '转储时间',
-    align: "center",
+    align: 'center',
     dataIndex: 'transDate',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
+    customRender: ({ text }) => {
+      return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
     },
   },
 ];
diff --git a/src/views/appmana/flowmeter/hisdata/components/SurvHisdataFlowmeterForm.vue b/src/views/appmana/flowmeter/hisdata/components/SurvHisdataFlowmeterForm.vue
index 721c789..8c6d36d 100644
--- a/src/views/appmana/flowmeter/hisdata/components/SurvHisdataFlowmeterForm.vue
+++ b/src/views/appmana/flowmeter/hisdata/components/SurvHisdataFlowmeterForm.vue
@@ -3,76 +3,41 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="租户号" v-bind="validateInfos.tenantId">
-            <a-input v-model:value="formData.tenantId" placeholder="请输入租户号" :disabled="disabled"></a-input>
+          <a-form-item label="设备编号" v-bind="validateInfos.deployCode">
+            <a-input v-model:value="formData.deployCode" placeholder="请输入设备编号" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="乐观锁" v-bind="validateInfos.reVision">
-	          <a-input-number v-model:value="formData.reVision" placeholder="请输入乐观锁" style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="数据更新时间" v-bind="validateInfos.dataDateTime">
+            <a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.dataDateTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="创建人" v-bind="validateInfos.createdBy">
-            <a-input v-model:value="formData.createdBy" placeholder="请输入创建人" :disabled="disabled"></a-input>
+          <a-form-item label="累计流量" v-bind="validateInfos.sData1">
+            <a-input v-model:value="formData.sData1" placeholder="请输入累计流量" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="创建时间" v-bind="validateInfos.createTime">
-		        <a-date-picker placeholder="请选择创建时间" v-model:value="formData.createTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="瞬时流量" v-bind="validateInfos.sData2">
+            <a-input v-model:value="formData.sData2" placeholder="请输入瞬时流量" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="更新人" v-bind="validateInfos.updatedBy">
-            <a-input v-model:value="formData.updatedBy" placeholder="请输入更新人" :disabled="disabled"></a-input>
+          <a-form-item label="空高值" v-bind="validateInfos.sData3">
+            <a-input v-model:value="formData.sData3" placeholder="请输入空高值" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="逻辑删除" v-bind="validateInfos.isDel">
-	          <a-input-number v-model:value="formData.isDel" placeholder="请输入逻辑删除" style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="液位值" v-bind="validateInfos.sData4">
+            <a-input v-model:value="formData.sData4" placeholder="请输入液位值" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="更新时间" v-bind="validateInfos.updatedTime">
-		        <a-date-picker placeholder="请选择更新时间" v-model:value="formData.updatedTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="当前流速值" v-bind="validateInfos.sData5">
+            <a-input v-model:value="formData.sData5" placeholder="请输入当前流速值" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据1" v-bind="validateInfos.sData1">
-            <a-input v-model:value="formData.sData1" placeholder="请输入数据1" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据2" v-bind="validateInfos.sData2">
-            <a-input v-model:value="formData.sData2" placeholder="请输入数据2" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据3" v-bind="validateInfos.sData3">
-            <a-input v-model:value="formData.sData3" placeholder="请输入数据3" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据4" v-bind="validateInfos.sData4">
-            <a-input v-model:value="formData.sData4" placeholder="请输入数据4" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据5" v-bind="validateInfos.sData5">
-            <a-input v-model:value="formData.sData5" placeholder="请输入数据5" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据更新时间" v-bind="validateInfos.sDateTime">
-		        <a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.sDateTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" v-bind="validateInfos.dataGatherType">
-            <a-input v-model:value="formData.dataGatherType" placeholder="请输入数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
+
           <a-form-item label="转储时间" v-bind="validateInfos.transDate">
 		        <a-date-picker placeholder="请选择转储时间" v-model:value="formData.transDate" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
           </a-form-item>
@@ -89,7 +54,7 @@
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../SurvHisdataFlowmeter.api';
   import { Form } from 'ant-design-vue';
-  
+
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: ()=>{} },
@@ -100,21 +65,21 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    tenantId: '',   
+    tenantId: '',
     reVision: undefined,
-    createdBy: '',   
-    createTime: '',   
-    updatedBy: '',   
+    createdBy: '',
+    createTime: '',
+    updatedBy: '',
     isDel: undefined,
-    updatedTime: '',   
-    sData1: '',   
-    sData2: '',   
-    sData3: '',   
-    sData4: '',   
-    sData5: '',   
-    sDateTime: '',   
-    dataGatherType: '',   
-    transDate: '',   
+    updatedTime: '',
+    sData1: '',
+    sData2: '',
+    sData3: '',
+    sData4: '',
+    sData5: '',
+    sDateTime: '',
+    dataGatherType: '',
+    transDate: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -137,7 +102,7 @@
     return props.formDisabled;
   });
 
-  
+
   /**
    * 新增
    */
diff --git a/src/views/appmana/flowmeter/realtime/SurvTransdataFlowmeter.data.ts b/src/views/appmana/flowmeter/realtime/SurvTransdataFlowmeter.data.ts
index 3d1c893..05d594c 100644
--- a/src/views/appmana/flowmeter/realtime/SurvTransdataFlowmeter.data.ts
+++ b/src/views/appmana/flowmeter/realtime/SurvTransdataFlowmeter.data.ts
@@ -5,83 +5,50 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '租户号',
-    align: "center",
-    dataIndex: 'tenantId'
+    title: '设备编号',
+    align: 'center',
+    dataIndex: 'deployCode',
   },
   {
-    title: '乐观锁',
-    align: "center",
-    dataIndex: 'reVision'
+    title: '累计流量',
+    align: 'center',
+    dataIndex: 'sData1',
   },
   {
-    title: '创建人',
-    align: "center",
-    dataIndex: 'createdBy'
+    title: '瞬时流量',
+    align: 'center',
+    dataIndex: 'sData2',
   },
   {
-    title: '创建时间',
-    align: "center",
-    dataIndex: 'createTime',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
-    },
+    title: '空高值',
+    align: 'center',
+    dataIndex: 'sData3',
   },
   {
-    title: '更新人',
-    align: "center",
-    dataIndex: 'updatedBy'
+    title: '液位值',
+    align: 'center',
+    dataIndex: 'sData4',
   },
   {
-    title: '逻辑删除',
-    align: "center",
-    dataIndex: 'isDel'
-  },
-  {
-    title: '更新时间',
-    align: "center",
-    dataIndex: 'updatedTime',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
-    },
-  },
-  {
-    title: '数据1',
-    align: "center",
-    dataIndex: 'sData1'
-  },
-  {
-    title: '数据2',
-    align: "center",
-    dataIndex: 'sData2'
-  },
-  {
-    title: '数据3',
-    align: "center",
-    dataIndex: 'sData3'
-  },
-  {
-    title: '数据4',
-    align: "center",
-    dataIndex: 'sData4'
-  },
-  {
-    title: '数据5',
-    align: "center",
-    dataIndex: 'sData5'
+    title: '当前流速值',
+    align: 'center',
+    dataIndex: 'sData5',
   },
   {
     title: '数据更新时间',
-    align: "center",
-    dataIndex: 'sDateTime',
-    customRender:({text}) =>{
-      return !text?"":(text.length>10?text.substr(0,10):text);
+    align: 'center',
+    dataIndex: 'dataDateTime',
+    customRender: ({ text }) => {
+      return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
     },
   },
   {
-    title: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据',
-    align: "center",
-    dataIndex: 'dataGatherType'
+    title: '转储时间',
+    align: 'center',
+    dataIndex: 'transDate',
+    customRender: ({ text }) => {
+      return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
+    },
   },
 ];
 
diff --git a/src/views/appmana/flowmeter/realtime/components/SurvTransdataFlowmeterForm.vue b/src/views/appmana/flowmeter/realtime/components/SurvTransdataFlowmeterForm.vue
index fa52ec5..6d23bb0 100644
--- a/src/views/appmana/flowmeter/realtime/components/SurvTransdataFlowmeterForm.vue
+++ b/src/views/appmana/flowmeter/realtime/components/SurvTransdataFlowmeterForm.vue
@@ -3,74 +3,42 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="租户号" v-bind="validateInfos.tenantId">
-            <a-input v-model:value="formData.tenantId" placeholder="请输入租户号" :disabled="disabled"></a-input>
+          <a-form-item label="设备编号" v-bind="validateInfos.deployCode">
+            <a-input v-model:value="formData.deployCode" placeholder="请输入设备编号" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="乐观锁" v-bind="validateInfos.reVision">
-	          <a-input-number v-model:value="formData.reVision" placeholder="请输入乐观锁" style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="数据更新时间" v-bind="validateInfos.dataDateTime">
+            <a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.dataDateTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="创建人" v-bind="validateInfos.createdBy">
-            <a-input v-model:value="formData.createdBy" placeholder="请输入创建人" :disabled="disabled"></a-input>
+          <a-form-item label="累计流量" v-bind="validateInfos.sData1">
+            <a-input v-model:value="formData.sData1" placeholder="请输入累计流量" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="创建时间" v-bind="validateInfos.createTime">
-		        <a-date-picker placeholder="请选择创建时间" v-model:value="formData.createTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="瞬时流量" v-bind="validateInfos.sData2">
+            <a-input v-model:value="formData.sData2" placeholder="请输入瞬时流量" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="更新人" v-bind="validateInfos.updatedBy">
-            <a-input v-model:value="formData.updatedBy" placeholder="请输入更新人" :disabled="disabled"></a-input>
+          <a-form-item label="空高值" v-bind="validateInfos.sData3">
+            <a-input v-model:value="formData.sData3" placeholder="请输入空高值" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="逻辑删除" v-bind="validateInfos.isDel">
-	          <a-input-number v-model:value="formData.isDel" placeholder="请输入逻辑删除" style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="液位值" v-bind="validateInfos.sData4">
+            <a-input v-model:value="formData.sData4" placeholder="请输入液位值" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="更新时间" v-bind="validateInfos.updatedTime">
-		        <a-date-picker placeholder="请选择更新时间" v-model:value="formData.updatedTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
+          <a-form-item label="当前流速值" v-bind="validateInfos.sData5">
+            <a-input v-model:value="formData.sData5" placeholder="请输入当前流速值" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据1" v-bind="validateInfos.sData1">
-            <a-input v-model:value="formData.sData1" placeholder="请输入数据1" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据2" v-bind="validateInfos.sData2">
-            <a-input v-model:value="formData.sData2" placeholder="请输入数据2" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据3" v-bind="validateInfos.sData3">
-            <a-input v-model:value="formData.sData3" placeholder="请输入数据3" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据4" v-bind="validateInfos.sData4">
-            <a-input v-model:value="formData.sData4" placeholder="请输入数据4" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据5" v-bind="validateInfos.sData5">
-            <a-input v-model:value="formData.sData5" placeholder="请输入数据5" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据更新时间" v-bind="validateInfos.sDateTime">
-		        <a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.sDateTime" value-format="YYYY-MM-DD"  style="width: 100%" :disabled="disabled"/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" v-bind="validateInfos.dataGatherType">
-            <a-input v-model:value="formData.dataGatherType" placeholder="请输入数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" :disabled="disabled"></a-input>
-          </a-form-item>
+
+
         </a-col>
       </a-row>
     </a-form>
@@ -84,7 +52,7 @@
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../SurvTransdataFlowmeter.api';
   import { Form } from 'ant-design-vue';
-  
+
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: ()=>{} },
@@ -95,20 +63,20 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    tenantId: '',   
+    tenantId: '',
     reVision: undefined,
-    createdBy: '',   
-    createTime: '',   
-    updatedBy: '',   
+    createdBy: '',
+    createTime: '',
+    updatedBy: '',
     isDel: undefined,
-    updatedTime: '',   
-    sData1: '',   
-    sData2: '',   
-    sData3: '',   
-    sData4: '',   
-    sData5: '',   
-    sDateTime: '',   
-    dataGatherType: '',   
+    updatedTime: '',
+    sData1: '',
+    sData2: '',
+    sData3: '',
+    sData4: '',
+    sData5: '',
+    sDateTime: '',
+    dataGatherType: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -131,7 +99,7 @@
     return props.formDisabled;
   });
 
-  
+
   /**
    * 新增
    */
diff --git a/src/views/appmana/survconfig/components/FSurvConfigForm.vue b/src/views/appmana/survconfig/components/FSurvConfigForm.vue
index bb94c84..139fa49 100644
--- a/src/views/appmana/survconfig/components/FSurvConfigForm.vue
+++ b/src/views/appmana/survconfig/components/FSurvConfigForm.vue
@@ -104,7 +104,7 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = {
-    tenantId: [{ required: true, message: '主体不能为空', trigger: 'blur' }],
+    // tenantId: [{ required: true, message: '主体不能为空', trigger: 'blur' }],
     configName: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
     configType: [{ required: true, message: '参数类型不能为空', trigger: 'blur' }],
   };