From 1061cc4cff7603d2b63aec11b2cd4936796276e6 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 30 Jun 2025 15:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=A4=B9?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiRequestLog.api.ts}                     | 14 +++++-----
 .../ApiRequestLog.data.ts}                    |  0
 .../ApiRequestLogList.vue}                    | 14 +++++-----
 .../components/ApiRequestLogForm.vue}         | 24 ++++++++---------
 .../components/ApiRequestLogModal.vue}        |  4 +--
 .../DeviceSyncLogList.vue}                    |  8 +++---
 .../DeviceSyncLogListModal.vue}               |  4 +--
 .../ElectricitySyncLog.api.ts}                | 14 +++++-----
 .../ElectricitySyncLog.data.ts}               |  0
 .../ElectricitySyncLogList.vue}               |  8 +++---
 .../ElectricitySyncLogListModal.vue}          |  4 +--
 .../WaterSyncLogList.vue                      |  8 +++---
 .../WaterSyncLogListModal.vue                 |  0
 .../NuIotTqElectricitySyncLogForm.vue         | 20 +++++++-------
 .../NuIotTqElectricitySyncLogModal.vue        |  4 +--
 .../iot/tq/electricity/apilog/ApiLogList.vue  | 26 +++++++++----------
 .../tq/electricity/apilog/WaterApiLogList.vue | 26 +++++++++----------
 src/views/iot/tq/electricity/index.vue        |  4 +--
 src/views/iot/tq/water/index.vue              |  2 +-
 src/views/iot/yiweilian/index.vue             |  4 +--
 20 files changed, 94 insertions(+), 94 deletions(-)
 rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts => ApiRequestLog/ApiRequestLog.api.ts} (74%)
 rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts => ApiRequestLog/ApiRequestLog.data.ts} (100%)
 rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue => ApiRequestLog/ApiRequestLogList.vue} (92%)
 rename src/views/iot/tq/{nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue => ApiRequestLog/components/ApiRequestLogForm.vue} (88%)
 rename src/views/iot/tq/{nuIotTqApiRequestLog/components/NuIotTqApiRequestLogModal.vue => ApiRequestLog/components/ApiRequestLogModal.vue} (87%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog/HumidDeviceSyncLogList.vue => SyncLog/DeviceSyncLogList.vue} (93%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue => SyncLog/DeviceSyncLogListModal.vue} (85%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts => SyncLog/ElectricitySyncLog.api.ts} (71%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.data.ts => SyncLog/ElectricitySyncLog.data.ts} (100%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogList.vue => SyncLog/ElectricitySyncLogList.vue} (93%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog/HumidDeviceSyncLogListModal.vue => SyncLog/ElectricitySyncLogListModal.vue} (87%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog => SyncLog}/WaterSyncLogList.vue (93%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog => SyncLog}/WaterSyncLogListModal.vue (100%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog => SyncLog}/components/NuIotTqElectricitySyncLogForm.vue (88%)
 rename src/views/iot/tq/{nuIotTqElectricitySyncLog => SyncLog}/components/NuIotTqElectricitySyncLogModal.vue (86%)

diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts
similarity index 74%
rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts
rename to src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts
index 66086fb..3ea2e98 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts
+++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/list',
-  save='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/add',
-  edit='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/edit',
-  deleteOne = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/delete',
-  deleteBatch = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/deleteBatch',
-  importExcel = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/importExcel',
-  exportXls = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/exportXls',
+  list = '/iot/tq/apiRequestLog/list',
+  save='/iot/tq/apiRequestLog/add',
+  edit='/iot/tq/apiRequestLog/edit',
+  deleteOne = '/iot/tq/apiRequestLog/delete',
+  deleteBatch = '/iot/tq/apiRequestLog/deleteBatch',
+  importExcel = '/iot/tq/apiRequestLog/importExcel',
+  exportXls = '/iot/tq/apiRequestLog/exportXls',
 }
 
 /**
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.data.ts
similarity index 100%
rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts
rename to src/views/iot/tq/ApiRequestLog/ApiRequestLog.data.ts
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
similarity index 92%
rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue
rename to src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
index 464a5fe..ea645cc 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue
+++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
@@ -40,18 +40,18 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <NuIotTqApiRequestLogModal ref="registerModal" @success="handleSuccess"></NuIotTqApiRequestLogModal>
+    <ApiRequestLogModal ref="registerModal" @success="handleSuccess"></ApiRequestLogModal>
   </div>
 </template>
 
-<script lang="ts" name="nuIotTqApiRequestLog-nuIotTqApiRequestLog" setup>
+<script lang="ts" name="ApiRequestLog-ApiRequestLog" setup>
   import { ref, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './NuIotTqApiRequestLog.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqApiRequestLog.api';
+  import { columns, superQuerySchema } from './ApiRequestLog.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ApiRequestLog.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import NuIotTqApiRequestLogModal from './components/NuIotTqApiRequestLogModal.vue'
+  import ApiRequestLogModal from './components/ApiRequestLogModal.vue'
   import { useUserStore } from '/@/store/modules/user';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
@@ -167,7 +167,7 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
-        auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:edit'
+        auth: 'ApiRequestLog:nu_iot_tq_api_request_log:edit'
       },
     ];
   }
@@ -187,7 +187,7 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
-        auth: 'nuIotTqApiRequestLog:nu_iot_tq_api_request_log:delete'
+        auth: 'ApiRequestLog:nu_iot_tq_api_request_log:delete'
       }
     ]
   }
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue b/src/views/iot/tq/ApiRequestLog/components/ApiRequestLogForm.vue
similarity index 88%
rename from src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue
rename to src/views/iot/tq/ApiRequestLog/components/ApiRequestLogForm.vue
index 68e5fd6..521d4ee 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue
+++ b/src/views/iot/tq/ApiRequestLog/components/ApiRequestLogForm.vue
@@ -2,55 +2,55 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuIotTqApiRequestLogForm">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ApiRequestLogForm">
           <a-row>
 						<a-col :span="24">
-							<a-form-item label="设备号" v-bind="validateInfos.address" id="NuIotTqApiRequestLogForm-address" name="address">
+							<a-form-item label="设备号" v-bind="validateInfos.address" id="ApiRequestLogForm-address" name="address">
 								<a-input v-model:value="formData.address" placeholder="请输入设备号"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="类型" v-bind="validateInfos.type" id="NuIotTqApiRequestLogForm-type" name="type">
+							<a-form-item label="类型" v-bind="validateInfos.type" id="ApiRequestLogForm-type" name="type">
 								<j-dict-select-tag v-model:value="formData.type" dictCode="dbsb_type" placeholder="请选择类型"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="请求时的值" v-bind="validateInfos.requestValue" id="NuIotTqApiRequestLogForm-requestValue" name="requestValue">
+							<a-form-item label="请求时的值" v-bind="validateInfos.requestValue" id="ApiRequestLogForm-requestValue" name="requestValue">
 								<a-input v-model:value="formData.requestValue" placeholder="请输入请求时的值"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="请求时间" v-bind="validateInfos.requestTime" id="NuIotTqApiRequestLogForm-requestTime" name="requestTime">
+							<a-form-item label="请求时间" v-bind="validateInfos.requestTime" id="ApiRequestLogForm-requestTime" name="requestTime">
 								<a-input v-model:value="formData.requestTime" placeholder="请输入请求时间"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="请求状态" v-bind="validateInfos.requestStatus" id="NuIotTqApiRequestLogForm-requestStatus" name="requestStatus">
+							<a-form-item label="请求状态" v-bind="validateInfos.requestStatus" id="ApiRequestLogForm-requestStatus" name="requestStatus">
 								<j-dict-select-tag v-model:value="formData.requestStatus" dictCode="" placeholder="请选择请求状态"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="请求描述" v-bind="validateInfos.requestRemark" id="NuIotTqApiRequestLogForm-requestRemark" name="requestRemark">
+							<a-form-item label="请求描述" v-bind="validateInfos.requestRemark" id="ApiRequestLogForm-requestRemark" name="requestRemark">
 								<a-input v-model:value="formData.requestRemark" placeholder="请输入请求描述"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="反馈值" v-bind="validateInfos.resolveValue" id="NuIotTqApiRequestLogForm-resolveValue" name="resolveValue">
+							<a-form-item label="反馈值" v-bind="validateInfos.resolveValue" id="ApiRequestLogForm-resolveValue" name="resolveValue">
 								<a-input v-model:value="formData.resolveValue" placeholder="请输入反馈值"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="反馈时间" v-bind="validateInfos.resolveTime" id="NuIotTqApiRequestLogForm-resolveTime" name="resolveTime">
+							<a-form-item label="反馈时间" v-bind="validateInfos.resolveTime" id="ApiRequestLogForm-resolveTime" name="resolveTime">
 								<a-input v-model:value="formData.resolveTime" placeholder="请输入反馈时间"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="反馈状态" v-bind="validateInfos.resolveStatus" id="NuIotTqApiRequestLogForm-resolveStatus" name="resolveStatus">
+							<a-form-item label="反馈状态" v-bind="validateInfos.resolveStatus" id="ApiRequestLogForm-resolveStatus" name="resolveStatus">
 								<j-dict-select-tag v-model:value="formData.resolveStatus" dictCode="dbsb_status" placeholder="请选择反馈状态"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="反馈描述" v-bind="validateInfos.resolveRemark" id="NuIotTqApiRequestLogForm-resolveRemark" name="resolveRemark">
+							<a-form-item label="反馈描述" v-bind="validateInfos.resolveRemark" id="ApiRequestLogForm-resolveRemark" name="resolveRemark">
 								<a-input v-model:value="formData.resolveRemark" placeholder="请输入反馈描述"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
@@ -67,7 +67,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../NuIotTqApiRequestLog.api';
+  import { saveOrUpdate } from '../ApiRequestLog.api';
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   const props = defineProps({
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogModal.vue b/src/views/iot/tq/ApiRequestLog/components/ApiRequestLogModal.vue
similarity index 87%
rename from src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogModal.vue
rename to src/views/iot/tq/ApiRequestLog/components/ApiRequestLogModal.vue
index 200466a..69f8796 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogModal.vue
+++ b/src/views/iot/tq/ApiRequestLog/components/ApiRequestLogModal.vue
@@ -1,12 +1,12 @@
 <template>
   <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <NuIotTqApiRequestLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIotTqApiRequestLogForm>
+    <ApiRequestLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ApiRequestLogForm>
   </j-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
-  import NuIotTqApiRequestLogForm from './NuIotTqApiRequestLogForm.vue'
+  import ApiRequestLogForm from './ApiRequestLogForm.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogList.vue b/src/views/iot/tq/SyncLog/DeviceSyncLogList.vue
similarity index 93%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogList.vue
rename to src/views/iot/tq/SyncLog/DeviceSyncLogList.vue
index 3479b09..c60a479 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogList.vue
+++ b/src/views/iot/tq/SyncLog/DeviceSyncLogList.vue
@@ -43,14 +43,14 @@
   </div>
 </template>
 
-<script lang="ts" name="nuIotTqElectricitySyncLog-nuIotTqElectricitySyncLog" setup>
+<script lang="ts" name="ElectricitySyncLog-ElectricitySyncLog" setup>
   import { ref, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './NuIotTqElectricitySyncLog.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqElectricitySyncLog.api';
+  import { columns, superQuerySchema } from './ElectricitySyncLog.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElectricitySyncLog.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import NuIotTqElectricitySyncLogModal from './components/NuIotTqElectricitySyncLogModal.vue'
+  import ElectricitySyncLogModal from './components/ElectricitySyncLogModal.vue'
   import { useUserStore } from '/@/store/modules/user';
 import { defHttp } from '/@/utils/http/axios';
 
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue b/src/views/iot/tq/SyncLog/DeviceSyncLogListModal.vue
similarity index 85%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue
rename to src/views/iot/tq/SyncLog/DeviceSyncLogListModal.vue
index 131b9a4..564d75e 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue
+++ b/src/views/iot/tq/SyncLog/DeviceSyncLogListModal.vue
@@ -1,12 +1,12 @@
 <template>
   <j-modal :title="title" width="80%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <NuIotTqElectricitySyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIotTqElectricitySyncLogList>
+    <DeviceSyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DeviceSyncLogList>
   </j-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
-  import NuIotTqElectricitySyncLogList from './NuIotTqElectricitySyncLogList.vue'
+  import DeviceSyncLogList from './DeviceSyncLogList.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts b/src/views/iot/tq/SyncLog/ElectricitySyncLog.api.ts
similarity index 71%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts
rename to src/views/iot/tq/SyncLog/ElectricitySyncLog.api.ts
index ec2b2f8..d81848e 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts
+++ b/src/views/iot/tq/SyncLog/ElectricitySyncLog.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/list',
-  save='/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/add',
-  edit='/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/edit',
-  deleteOne = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/delete',
-  deleteBatch = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/deleteBatch',
-  importExcel = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/importExcel',
-  exportXls = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/exportXls',
+  list = '/iot/tq/syncLog/list',
+  save='/iot/tq/syncLog/add',
+  edit='/iot/tq/syncLog/edit',
+  deleteOne = '/iot/tq/syncLog/delete',
+  deleteBatch = '/iot/tq/syncLog/deleteBatch',
+  importExcel = '/iot/tq/syncLog/importExcel',
+  exportXls = '/iot/tq/syncLog/exportXls',
 }
 
 /**
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.data.ts b/src/views/iot/tq/SyncLog/ElectricitySyncLog.data.ts
similarity index 100%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.data.ts
rename to src/views/iot/tq/SyncLog/ElectricitySyncLog.data.ts
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogList.vue b/src/views/iot/tq/SyncLog/ElectricitySyncLogList.vue
similarity index 93%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogList.vue
rename to src/views/iot/tq/SyncLog/ElectricitySyncLogList.vue
index eca39bf..2a8abd5 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogList.vue
+++ b/src/views/iot/tq/SyncLog/ElectricitySyncLogList.vue
@@ -43,14 +43,14 @@
   </div>
 </template>
 
-<script lang="ts" name="nuIotTqElectricitySyncLog-nuIotTqElectricitySyncLog" setup>
+<script lang="ts" name="ElectricitySyncLog-ElectricitySyncLog" setup>
   import { ref, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './NuIotTqElectricitySyncLog.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqElectricitySyncLog.api';
+  import { columns, superQuerySchema } from './ElectricitySyncLog.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElectricitySyncLog.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import NuIotTqElectricitySyncLogModal from './components/NuIotTqElectricitySyncLogModal.vue'
+  import ElectricitySyncLogModal from './components/ElectricitySyncLogModal.vue'
   import { useUserStore } from '/@/store/modules/user';
 import { defHttp } from '/@/utils/http/axios';
 
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogListModal.vue b/src/views/iot/tq/SyncLog/ElectricitySyncLogListModal.vue
similarity index 87%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogListModal.vue
rename to src/views/iot/tq/SyncLog/ElectricitySyncLogListModal.vue
index 5b73fe4..f8aac52 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogListModal.vue
+++ b/src/views/iot/tq/SyncLog/ElectricitySyncLogListModal.vue
@@ -1,12 +1,12 @@
 <template>
   <j-modal :title="title" width="80%" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <HumidDeviceSyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></HumidDeviceSyncLogList>
+    <ElectricitySyncLogList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ElectricitySyncLogList>
   </j-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
-  import HumidDeviceSyncLogList from './HumidDeviceSyncLogList.vue'
+  import ElectricitySyncLogList from './ElectricitySyncLogList.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/WaterSyncLogList.vue b/src/views/iot/tq/SyncLog/WaterSyncLogList.vue
similarity index 93%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/WaterSyncLogList.vue
rename to src/views/iot/tq/SyncLog/WaterSyncLogList.vue
index cd5b1f1..fdba465 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/WaterSyncLogList.vue
+++ b/src/views/iot/tq/SyncLog/WaterSyncLogList.vue
@@ -43,14 +43,14 @@
   </div>
 </template>
 
-<script lang="ts" name="nuIotTqElectricitySyncLog-nuIotTqElectricitySyncLog" setup>
+<script lang="ts" name="ElectricitySyncLog-ElectricitySyncLog" setup>
   import { ref, reactive } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './NuIotTqElectricitySyncLog.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuIotTqElectricitySyncLog.api';
+  import { columns, superQuerySchema } from './ElectricitySyncLog.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElectricitySyncLog.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-  import NuIotTqElectricitySyncLogModal from './components/NuIotTqElectricitySyncLogModal.vue'
+  import ElectricitySyncLogModal from './components/ElectricitySyncLogModal.vue'
   import { useUserStore } from '/@/store/modules/user';
 import { defHttp } from '/@/utils/http/axios';
 
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/WaterSyncLogListModal.vue b/src/views/iot/tq/SyncLog/WaterSyncLogListModal.vue
similarity index 100%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/WaterSyncLogListModal.vue
rename to src/views/iot/tq/SyncLog/WaterSyncLogListModal.vue
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogForm.vue b/src/views/iot/tq/SyncLog/components/NuIotTqElectricitySyncLogForm.vue
similarity index 88%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogForm.vue
rename to src/views/iot/tq/SyncLog/components/NuIotTqElectricitySyncLogForm.vue
index 8606a52..ff375fa 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogForm.vue
+++ b/src/views/iot/tq/SyncLog/components/NuIotTqElectricitySyncLogForm.vue
@@ -2,45 +2,45 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuIotTqElectricitySyncLogForm">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ElectricitySyncLogForm">
           <a-row>
 						<a-col :span="24">
-							<a-form-item label="主表名称" v-bind="validateInfos.mainName" id="NuIotTqElectricitySyncLogForm-mainName" name="mainName">
+							<a-form-item label="主表名称" v-bind="validateInfos.mainName" id="ElectricitySyncLogForm-mainName" name="mainName">
 								<a-input v-model:value="formData.mainName" placeholder="请输入主表名称"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="同步类型" v-bind="validateInfos.syncType" id="NuIotTqElectricitySyncLogForm-syncType" name="syncType">
+							<a-form-item label="同步类型" v-bind="validateInfos.syncType" id="ElectricitySyncLogForm-syncType" name="syncType">
 								<a-input v-model:value="formData.syncType" placeholder="请输入同步类型"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="原机构名称" v-bind="validateInfos.orgName" id="NuIotTqElectricitySyncLogForm-orgName" name="orgName">
+							<a-form-item label="原机构名称" v-bind="validateInfos.orgName" id="ElectricitySyncLogForm-orgName" name="orgName">
 								<a-input v-model:value="formData.orgName" placeholder="请输入原机构名称"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="原机构编码" v-bind="validateInfos.orgCode" id="NuIotTqElectricitySyncLogForm-orgCode" name="orgCode">
+							<a-form-item label="原机构编码" v-bind="validateInfos.orgCode" id="ElectricitySyncLogForm-orgCode" name="orgCode">
 								<a-input v-model:value="formData.orgCode" placeholder="请输入原机构编码"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="新机构名称" v-bind="validateInfos.newOrgName" id="NuIotTqElectricitySyncLogForm-newOrgName" name="newOrgName">
+							<a-form-item label="新机构名称" v-bind="validateInfos.newOrgName" id="ElectricitySyncLogForm-newOrgName" name="newOrgName">
 								<a-input v-model:value="formData.newOrgName" placeholder="请输入新机构名称"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="新机构编码" v-bind="validateInfos.newOrgCode" id="NuIotTqElectricitySyncLogForm-newOrgCode" name="newOrgCode">
+							<a-form-item label="新机构编码" v-bind="validateInfos.newOrgCode" id="ElectricitySyncLogForm-newOrgCode" name="newOrgCode">
 								<a-input v-model:value="formData.newOrgCode" placeholder="请输入新机构编码"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="状态" v-bind="validateInfos.status" id="NuIotTqElectricitySyncLogForm-status" name="status">
+							<a-form-item label="状态" v-bind="validateInfos.status" id="ElectricitySyncLogForm-status" name="status">
 								<a-input v-model:value="formData.status" placeholder="请输入状态"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="备注" v-bind="validateInfos.content" id="NuIotTqElectricitySyncLogForm-content" name="content">
+							<a-form-item label="备注" v-bind="validateInfos.content" id="ElectricitySyncLogForm-content" name="content">
 								<a-input v-model:value="formData.content" placeholder="请输入备注"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
@@ -56,7 +56,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../NuIotTqElectricitySyncLog.api';
+  import { saveOrUpdate } from '../ElectricitySyncLog.api';
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   const props = defineProps({
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogModal.vue b/src/views/iot/tq/SyncLog/components/NuIotTqElectricitySyncLogModal.vue
similarity index 86%
rename from src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogModal.vue
rename to src/views/iot/tq/SyncLog/components/NuIotTqElectricitySyncLogModal.vue
index 7d1c8ec..df77198 100644
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogModal.vue
+++ b/src/views/iot/tq/SyncLog/components/NuIotTqElectricitySyncLogModal.vue
@@ -1,12 +1,12 @@
 <template>
   <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <NuIotTqElectricitySyncLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIotTqElectricitySyncLogForm>
+    <ElectricitySyncLogForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ElectricitySyncLogForm>
   </j-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
-  import NuIotTqElectricitySyncLogForm from './NuIotTqElectricitySyncLogForm.vue'
+  import ElectricitySyncLogForm from './ElectricitySyncLogForm.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
diff --git a/src/views/iot/tq/electricity/apilog/ApiLogList.vue b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
index 42e8ee6..8615e77 100644
--- a/src/views/iot/tq/electricity/apilog/ApiLogList.vue
+++ b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
@@ -2,16 +2,16 @@
   <div class="p-2">
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="3" tab="抄表" >
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal3"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal3"></ApiRequestLogList>
       </a-tab-pane>
       <a-tab-pane key="9" tab="清零" force-render>
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal9"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal9"></ApiRequestLogList>
       </a-tab-pane>
       <a-tab-pane key="10" tab="电表拉闸" force-render>
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal10"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal10"></ApiRequestLogList>
       </a-tab-pane>
       <a-tab-pane key="11" tab="电表合闸" force-render>
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal11"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal11"></ApiRequestLogList>
       </a-tab-pane>
     </a-tabs>
   </div>
@@ -20,14 +20,14 @@
 <script lang="ts" name="departUtils-sysDepart" setup>
   import { ref, reactive } from 'vue';
 
-  import NuIotTqApiRequestLogList from '/@/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue';
+  import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
 
 const activeKey= ref('3');
 const dbsbInfo = ref<any>({});
-const nuIotTqApiRequestLogListModal9 = ref();
-const nuIotTqApiRequestLogListModal3 = ref();
-const nuIotTqApiRequestLogListModal10 = ref();
-const nuIotTqApiRequestLogListModal11 = ref();
+const ApiRequestLogListModal9 = ref();
+const ApiRequestLogListModal3 = ref();
+const ApiRequestLogListModal10 = ref();
+const ApiRequestLogListModal11 = ref();
   function initLog(record){
     activeKey.value = "3";
     getDataList(activeKey.value, record);
@@ -41,13 +41,13 @@ const nuIotTqApiRequestLogListModal11 = ref();
       cid: record.cid
     }
     if(type == '9'){
-      nuIotTqApiRequestLogListModal9.value.init(params);
+      ApiRequestLogListModal9.value.init(params);
     }else if(type == '3'){
-      nuIotTqApiRequestLogListModal3.value.init(params);
+      ApiRequestLogListModal3.value.init(params);
     }else if(type == '10'){
-      nuIotTqApiRequestLogListModal10.value.init(params);
+      ApiRequestLogListModal10.value.init(params);
     }else if(type == '11'){
-      nuIotTqApiRequestLogListModal11.value.init(params);
+      ApiRequestLogListModal11.value.init(params);
     }
   }
   
diff --git a/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue b/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
index d32a6d6..41f3c8b 100644
--- a/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
+++ b/src/views/iot/tq/electricity/apilog/WaterApiLogList.vue
@@ -2,16 +2,16 @@
   <div class="p-2">
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
       <a-tab-pane key="42" tab="抄表" >
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal42"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal42"></ApiRequestLogList>
       </a-tab-pane>
       <a-tab-pane key="49" tab="清零" force-render>
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal49"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal49"></ApiRequestLogList>
       </a-tab-pane>
       <a-tab-pane key="43" tab="开阀" force-render>
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal43"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal43"></ApiRequestLogList>
       </a-tab-pane>
       <a-tab-pane key="53" tab="关阀" force-render>
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal43"></NuIotTqApiRequestLogList>
+        <ApiRequestLogList ref="ApiRequestLogListModal43"></ApiRequestLogList>
       </a-tab-pane>
     </a-tabs>
   </div>
@@ -20,14 +20,14 @@
 <script lang="ts" name="departUtils-sysDepart" setup>
   import { ref, reactive } from 'vue';
 
-  import NuIotTqApiRequestLogList from '/@/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue';
+  import ApiRequestLogList from '/@/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue';
 
 const activeKey= ref('42');
 const dbsbInfo = ref<any>({});
-const nuIotTqApiRequestLogListModal42 = ref();
-const nuIotTqApiRequestLogListModal43 = ref();
-const nuIotTqApiRequestLogListModal49 = ref();
-const nuIotTqApiRequestLogListModal53 = ref();
+const ApiRequestLogListModal42 = ref();
+const ApiRequestLogListModal43 = ref();
+const ApiRequestLogListModal49 = ref();
+const ApiRequestLogListModal53 = ref();
   function initLog(record){
     activeKey.value = "42";
     getDataList(activeKey.value, record);
@@ -41,13 +41,13 @@ const nuIotTqApiRequestLogListModal53 = ref();
       cid: record.cid
     }
     if(type == '42'){
-      nuIotTqApiRequestLogListModal42.value.init(params);
+      ApiRequestLogListModal42.value.init(params);
     }else if(type == '43'){
-      nuIotTqApiRequestLogListModal43.value.init(params);
+      ApiRequestLogListModal43.value.init(params);
     }else if(type == '49'){
-      nuIotTqApiRequestLogListModal49.value.init(params);
+      ApiRequestLogListModal49.value.init(params);
     }else if(type == '53'){
-      nuIotTqApiRequestLogListModal53.value.init(params);
+      ApiRequestLogListModal53.value.init(params);
     }
   }
   
diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue
index 9d8bd88..6e5a20d 100644
--- a/src/views/iot/tq/electricity/index.vue
+++ b/src/views/iot/tq/electricity/index.vue
@@ -47,7 +47,7 @@
     </BasicTable>
     <HldyUtilsModal ref="hldyUtilsModal" @success="handleHldyParams" ></HldyUtilsModal>
     <ApiLogModal ref="apiLogModal"></ApiLogModal>
-    <NuIotTqElectricitySyncLogListModal ref="syncLogModal"></NuIotTqElectricitySyncLogListModal>
+    <ElectricitySyncLogListModal ref="syncLogModal"></ElectricitySyncLogListModal>
   </div>
 </template>
 
@@ -63,7 +63,7 @@
 
   import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue";
   import ApiLogModal from "@/views/iot/tq/electricity/apilog/ApiLogModal.vue";
-  import NuIotTqElectricitySyncLogListModal from "/@/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue";
+  import ElectricitySyncLogListModal from "/@/views/iot/tq/SyncLog/ElectricitySyncLogListModal.vue";
 import { defHttp } from '/@/utils/http/axios';
 
   const queryParam = reactive<any>({});
diff --git a/src/views/iot/tq/water/index.vue b/src/views/iot/tq/water/index.vue
index e03dc3e..a09de23 100644
--- a/src/views/iot/tq/water/index.vue
+++ b/src/views/iot/tq/water/index.vue
@@ -74,7 +74,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue";
   import ApiLogModal from "@/views/iot/tq/electricity/apilog/WaterApiLogModal.vue";
-  import SyncLogListModal from "/@/views/iot/tq/nuIotTqElectricitySyncLog/WaterSyncLogListModal.vue";
+  import SyncLogListModal from "/@/views/iot/tq/SyncLog/WaterSyncLogListModal.vue";
 
   const queryParam = reactive<any>({});
   const apiLogModal = ref();
diff --git a/src/views/iot/yiweilian/index.vue b/src/views/iot/yiweilian/index.vue
index fa54325..0a96007 100644
--- a/src/views/iot/yiweilian/index.vue
+++ b/src/views/iot/yiweilian/index.vue
@@ -36,7 +36,7 @@
     <DeviceInfoDrawer @register="registerDrawer" @success="handleSuccess" />
     <ApiLogAlarmModal ref="apiLogAlarmModal"></ApiLogAlarmModal>
     <HldyUtilsModal ref="hldyUtilsModal" @success="handleHldyParams" ></HldyUtilsModal>
-    <HumidDeviceSyncLogListModal ref="syncLogModal"></HumidDeviceSyncLogListModal>
+    <DeviceSyncLogListModal ref="syncLogModal"></DeviceSyncLogListModal>
   </div>
 </template>
 
@@ -52,7 +52,7 @@
   import {useDrawer} from "@/components/Drawer";
   import ApiLogAlarmModal from './components/ApiLogAlarmModal.vue'
   import HldyUtilsModal from "@/views/utils/nuUtils/HldyUtilsModal.vue";
-  import HumidDeviceSyncLogListModal from "/@/views/iot/tq/nuIotTqElectricitySyncLog/HumidDeviceSyncLogListModal.vue";
+  import DeviceSyncLogListModal from "/@/views/iot/tq/SyncLog/DeviceSyncLogListModal.vue";
   import DeviceInfoDrawer from "./components/DeviceInfoDrawer.vue";
   import { defHttp } from '/@/utils/http/axios';
   const apiLogAlarmModal = ref();