fix: 全局批量优化分页问题

src/views/iot/configuration/list/index.vue

@@ -38,7 +38,7 @@
       </el-table-column>
     </el-table>
     <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-    <EditForm ref="editFormRef" @getList="getList()"></EditForm>
+    <EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
   </el-card>
 </template>
 

src/views/iot/configuration/screen/index.vue

@@ -29,7 +29,7 @@
       </el-table-column>
     </el-table>
     <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-    <EditForm ref="editFormRef" @getList="getList()"></EditForm>
+    <EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
   </el-card>
 </template>
 

src/views/iot/device/channel/component/detail.vue

@@ -47,7 +47,7 @@
 				</el-table>
 
 				<pagination v-if="total > 0" :total="total" v-model:page="listQuery.page" v-model:limit="listQuery.size" @pagination="getList()" />
-				<TaskDialog ref="taskDialog" :formatOptions="formatOptions" @finish="getList" />
+				<TaskDialog ref="taskDialog" :formatOptions="formatOptions" @finish="getList(1)" />
 			</el-tab-pane>
 			<el-tab-pane label="通道码流" name="3">
 				<div>

src/views/iot/device/channel/index.vue

@@ -54,7 +54,7 @@
 			<pagination v-if="params.total" :total="params.total" v-model:page="params.page" v-model:limit="params.size" @pagination="getList()" />
 		</el-card>
 		<EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
-		<detailForm ref="detailFormRef" @getList="getList()"></detailForm>
+		<detailForm ref="detailFormRef" @getList="getList(1)"></detailForm>
 	</div>
 </template>
 

src/views/iot/device/template/index.vue

@@ -48,7 +48,7 @@
 			</el-table>
 			<pagination v-if="params.total" :total="params.total" v-model:page="params.page" v-model:limit="params.size" @pagination="getList()" />
 		</el-card>
-		<EditForm ref="editFormRef" @getList="getList()"></EditForm>
+		<EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
 		<ImportFile ref="importFile" />
 	</div>
 </template>

src/views/iot/ice104/device/component/deviceTaskTable.vue

@@ -2,10 +2,10 @@
     <div>
         <el-form :model="params" :inline="true" ref="queryRef">
             <el-form-item label="任务名称" prop="title">
-                <el-input v-model="params.title" placeholder="请输入任务名称" clearablestyle="width: 240px" @keyup.enter.native="getList()" />
+                <el-input v-model="params.title" placeholder="请输入任务名称" clearablestyle="width: 240px" @submit.prevent />
             </el-form-item>
             <el-form-item>
-                <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList()">
+                <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
                     <el-icon>
                         <ele-Search />
                     </el-icon>
@@ -27,17 +27,17 @@
         </el-form>
         <el-table :data="tableData" style="width: 100%" v-loading="loading">
             <el-table-column v-col="'index'" type="index" label="序号" width="80" align="center" />
-            <el-table-column v-col="'title'" prop="title" label="任务名称"  align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column v-col="'title'" prop="title" label="任务名称" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column v-col="'deviceNumber'" prop="deviceNumber" label="设备编码" min-width="120" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column v-col="'interval'" prop="interval" label="执行间隔（s）" min-width="120" align="center" show-overflow-tooltip></el-table-column>
             <el-table-column v-col="'jobType'" prop="jobType" label="任务类型" min-width="120" align="center" show-overflow-tooltip>
                 <template #default="scope">
-						<el-tag type="info" size="small" v-if="scope.row.jobType == 100">总召唤</el-tag>
-						<el-tag type="info" size="small" v-if="scope.row.jobType == 101">电度召唤</el-tag>
-						<el-tag type="info" size="small" v-if="scope.row.jobType == 103">时钟同步</el-tag>
-					</template>
+                    <el-tag type="info" size="small" v-if="scope.row.jobType == 100">总召唤</el-tag>
+                    <el-tag type="info" size="small" v-if="scope.row.jobType == 101">电度召唤</el-tag>
+                    <el-tag type="info" size="small" v-if="scope.row.jobType == 103">时钟同步</el-tag>
+                </template>
             </el-table-column>
-             <el-table-column v-col="'handle'" fixed="right" label="操作" width="100" align="center">
+            <el-table-column v-col="'handle'" fixed="right" label="操作" width="100" align="center">
                 <template #default="scope">
                     <el-button size="small" v-auth="'edit'" text type="primary" @click="addOrEdit(scope.row)">修改</el-button>
                     <el-button size="small" v-auth="'del'" text type="info" @click="onDel(scope.row)">删除</el-button>
@@ -45,7 +45,7 @@
             </el-table-column>
         </el-table>
         <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-        <EditForm ref="editFormRef" @updateList="getList()"></EditForm>
+        <EditForm ref="editFormRef" @updateList="getList(1)"></EditForm>
     </div>
 </template>
 <script lang="ts" setup>
@@ -70,29 +70,29 @@ const queryRef = ref();
  * 新增设备任务
  */
 const addOrEdit = async (row?: any) => {
-    const data = {...row};
-	editFormRef.value.open(data);
+    const data = { ...row };
+    editFormRef.value.open(data);
 };
 
 /**
  * 单一删除
  */
 const onDel = (row: any) => {
-	ElMessageBox.confirm(`此操作将删除接口：“${row.title}”，是否继续?`, '提示', {
-		confirmButtonText: '确认',
-		cancelButtonText: '取消',
-		type: 'warning',
-	}).then(async () => {
-		await api.job.deleteItem({number: row.number});
-		ElMessage.success('删除成功');
-		getList();
-	});
+    ElMessageBox.confirm(`此操作将删除接口：“${row.title}”，是否继续?`, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+    }).then(async () => {
+        await api.job.deleteItem({ number: row.number });
+        ElMessage.success('删除成功');
+        getList();
+    });
 };
 
 // 重置表单
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getList();
+    queryRef.value.resetFields();
+    getList();
 };
 
 // 页面加载时
@@ -104,6 +104,6 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .width100 {
-	width: 100%;
+    width: 100%;
 }
 </style>

src/views/iot/ice104/device/index.vue

@@ -10,12 +10,12 @@
 	<div class="page page-full">
 		<el-card shadow="hover" class="page-full-part">
 			<div class="search">
-				<el-form :model="params" :inline="true" ref="queryRef">
+				<el-form :model="params" :inline="true" ref="queryRef" @submit.prevent>
 					<el-form-item label="设备名称" prop="title">
-						<el-input v-model="params.title" placeholder="请输入设备名称" clearablestyle="width: 240px" @keyup.enter.native="getList()" />
+						<el-input v-model="params.title" placeholder="请输入设备名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
 					</el-form-item>
 					<el-form-item>
-						<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList()">
+						<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
 							<el-icon>
 								<ele-Search />
 							</el-icon>
@@ -57,7 +57,7 @@
 			</el-table>
 			<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
 		</el-card>
-		<EditForm ref="editFormRef" @updateList="getList()"></EditForm>
+		<EditForm ref="editFormRef" @updateList="getList(1)"></EditForm>
 	</div>
 </template>
 

src/views/iot/ice104/template/component/templateTaskTable.vue

@@ -2,10 +2,10 @@
     <div>
         <el-form :model="params" :inline="true" ref="queryRef">
             <el-form-item label="点位名称" prop="title">
-                <el-input v-model="params.title" placeholder="请输入点位名称" clearablestyle="width: 240px" @keyup.enter.native="getList()" />
+                <el-input v-model="params.title" placeholder="请输入点位名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
             </el-form-item>
             <el-form-item>
-                <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList()">
+                <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
                     <el-icon>
                         <ele-Search />
                     </el-icon>
@@ -39,7 +39,7 @@
             </el-table-column>
         </el-table>
         <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-        <EditForm ref="editFormRef" @updateList="getList()"></EditForm>
+        <EditForm ref="editFormRef" @updateList="getList(1)"></EditForm>
     </div>
 </template>
 <script lang="ts" setup>

src/views/iot/ice104/template/index.vue

@@ -56,7 +56,7 @@
 			</el-table>
 			<pagination v-if="params.total" :total="params.total" v-model:page="params.page" v-model:limit="params.size" @pagination="getList()" />
 		</el-card>
-		<EditForm ref="editFormRef" @updateList="getList()"></EditForm>
+		<EditForm ref="editFormRef" @updateList="getList(1)"></EditForm>
 	</div>
 </template>
 

src/views/iot/ota-update/module/index.vue

@@ -1,69 +1,62 @@
 <template>
-	<div class="ota-module-container">
-		<el-card shadow="hover">
-			<div class="ota-module-search mb15">
-				<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-					<el-form-item label="模块名称" prop="name">
-						<el-input
-							v-model="tableData.param.keyWord"
-							placeholder="请输入产品名称"
-							clearable
-							size="default"
-							style="width: 200px;"
-							@keyup.enter.native="getList"
-						/>
-					</el-form-item>
-					<el-form-item label="所属产品" prop="productId">
-						<el-select v-model="tableData.param.productId" filterable placeholder="请选择产品">
-							<el-option v-for="item in productData" :key="item.id" :label="item.name" :value="item.id.toString()" value-key="id"> </el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="getList">
-							<el-icon>
-								<ele-Search />
-							</el-icon>
-							查询
-						</el-button>
-						<el-button size="default" @click="resetQuery(queryRef)">
-							<el-icon>
-								<ele-Refresh />
-							</el-icon>
-							重置
-						</el-button>
-						<el-button type="primary" v-auth="'add'" @click="onOpenAddDic()">
-							<el-icon>
-								<ele-FolderAdd />
-							</el-icon>
-							添加模块
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
+  <div class="ota-module-container">
+    <el-card shadow="hover">
+      <div class="ota-module-search mb15">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px" @keyup.enter.native="getList(1)">
+          <el-form-item label="模块名称" prop="name">
+            <el-input v-model="tableData.param.keyWord" placeholder="请输入产品名称" clearable size="default" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="所属产品" prop="productId">
+            <el-select v-model="tableData.param.productId" filterable placeholder="请选择产品">
+              <el-option v-for="item in productData" :key="item.id" :label="item.name" :value="item.id.toString()" value-key="id"> </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="default" type="primary" class="ml10" @click="getList(1)">
+              <el-icon>
+                <ele-Search />
+              </el-icon>
+              查询
+            </el-button>
+            <el-button size="default" @click="resetQuery(queryRef)">
+              <el-icon>
+                <ele-Refresh />
+              </el-icon>
+              重置
+            </el-button>
+            <el-button type="primary" v-auth="'add'" @click="onOpenAddDic()">
+              <el-icon>
+                <ele-FolderAdd />
+              </el-icon>
+              添加模块
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
 
-			<el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
-				<el-table-column label="ID" v-col="'id'" align="center" prop="id" width="60" />
-				<el-table-column label="模块名称" v-col="'name'" prop="name" :show-overflow-tooltip="true" />
-				<el-table-column label="模块别名" v-col="'nameAs'" prop="nameAs" :show-overflow-tooltip="true" />
-				<el-table-column label="所属产品" v-col="'ProductName'" prop="ProductName" width="260" />
-				<el-table-column label="创建时间" prop="createdAt" align="center" />
-				<el-table-column label="操作" width="100" v-col="'handle'" align="center" fixed="right">
+      <el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
+        <el-table-column label="ID" v-col="'id'" align="center" prop="id" width="60" />
+        <el-table-column label="模块名称" v-col="'name'" prop="name" :show-overflow-tooltip="true" />
+        <el-table-column label="模块别名" v-col="'nameAs'" prop="nameAs" :show-overflow-tooltip="true" />
+        <el-table-column label="所属产品" v-col="'ProductName'" prop="ProductName" width="260" />
+        <el-table-column label="创建时间" prop="createdAt" align="center" />
+        <el-table-column label="操作" width="100" v-col="'handle'" align="center" fixed="right">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
             <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
           </template>
-				</el-table-column>
+        </el-table-column>
       </el-table>
       <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="getList" />
-			<EditConfig ref="editDicRef" @getList="getList" />
-		</el-card>
-	</div>
+      <EditConfig ref="editDicRef" @getList="getList(1)" />
+    </el-card>
+  </div>
 </template>
   
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance } from 'vue';
 import api from '/@/api/ota'
-import { ElMessageBox, ElMessage, FormInstance} from 'element-plus'
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus'
 // import EditConfig from './edit.vue'
 import EditConfig from '/@/views/iot/ota-update/module/component/edit.vue';
 
@@ -99,9 +92,9 @@ export default defineComponent({
     const addDicRef = ref();
     const editDicRef = ref();
     const queryRef = ref();
-    const tabDataList = ref([{dictLabel: '全部', dictValue: ''}]);
+    const tabDataList = ref([{ dictLabel: '全部', dictValue: '' }]);
     const state = reactive<TableDataState>({
-	  ids: [],
+      ids: [],
       tableData: {
         data: [],
         total: 0,
@@ -114,7 +107,7 @@ export default defineComponent({
           productId: '',
         },
       },
-	  productData: [],
+      productData: [],
     });
     // 页面加载时
     onMounted(() => {
@@ -124,7 +117,8 @@ export default defineComponent({
     const initTableData = () => {
       moduleList();
     };
-    const getList = () => {
+    const getList = (pageNum: number) => {
+      typeof pageNum === 'number' && (state.tableData.param.pageNum = pageNum)
       state.tableData.loading = true;
       api.module
         .getList(state.tableData.param)
@@ -161,11 +155,11 @@ export default defineComponent({
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-          api.module.del(ids).then(() => {
-            ElMessage.success('删除成功');
-            getList();
-          });
-        })
+        api.module.del(ids).then(() => {
+          ElMessage.success('删除成功');
+          getList();
+        });
+      })
         .catch(() => { });
     };
     /** 重置按钮操作 */

src/views/iot/ota-update/update/component/batch.vue

@@ -2,14 +2,13 @@
   <div class="ota-module-container">
     <el-card shadow="hover">
       <div class="ota-module-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="90px">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="90px" @keyup.enter.native="getList(1)">
           <el-form-item label="批次名称：" prop="name">
-            <el-input v-model="tableData.param.keyWord" placeholder="请输入批次名称" clearable size="default" style="width: 240px"
-              @keyup.enter.native="getList" />
+            <el-input v-model="tableData.param.keyWord" placeholder="请输入批次名称" clearable size="default" style="width: 240px" />
           </el-form-item>
 
           <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="getList">
+            <el-button size="default" type="primary" class="ml10" @click="getList(1)">
               <el-icon>
                 <ele-Search />
               </el-icon>
@@ -29,7 +28,7 @@
             </el-button>
           </el-form-item>
 
-			  </el-form>
+        </el-form>
       </div>
       <el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
         <el-table-column prop="id" label="ID" width="60" />
@@ -62,19 +61,19 @@
           </template>
         </el-table-column> -->
       </el-table>
-<!--      <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize"-->
-<!--        @pagination="getList()" />-->
-<!--      <CheckForm ref="checkFormRef" @getList="getList()"></CheckForm>-->
+      <!--      <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize"-->
+      <!--        @pagination="getList()" />-->
+      <!--      <CheckForm ref="checkFormRef" @getList="getList()"></CheckForm>-->
       <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="getList" />
-      <CheckConfig ref="checkRef" @getList="getList" />
-	  </el-card>
+      <CheckConfig ref="checkRef" @getList="getList(1)" />
+    </el-card>
   </div>
 </template>
   
 <script lang="ts">
 import api from '/@/api/ota';
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
-import { ElMessageBox, ElMessage, FormInstance} from 'element-plus'
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus'
 import CheckConfig from '/@/views/iot/ota-update/update/component/check.vue';
 
 // 定义接口来定义对象的类型
@@ -114,7 +113,7 @@ export default defineComponent({
   setup(props) {
     const checkRef = ref();
     const queryRef = ref();
-    const tabDataList = ref([{dictLabel: '全部', dictValue: ''}]);
+    const tabDataList = ref([{ dictLabel: '全部', dictValue: '' }]);
     const state = reactive<TableDataState>({
       ids: [],
       tableData: {
@@ -139,16 +138,17 @@ export default defineComponent({
     const initTableData = () => {
       batchList();
     };
-    const getList = () => {
+    const getList = (pageNum: number) => {
+      typeof pageNum === 'number' && (state.tableData.param.pageNum = pageNum)
       state.tableData.loading = true;
       state.tableData.param.devOtaFirewareId = props.detail.id;
       api.batch
-          .getList(state.tableData.param)
-          .then((res: any) => {
-            state.tableData.data = res.Data;
-            state.tableData.total = res.Total;
-          })
-          .finally(() => (state.tableData.loading = false));
+        .getList(state.tableData.param)
+        .then((res: any) => {
+          state.tableData.data = res.Data;
+          state.tableData.total = res.Total;
+        })
+        .finally(() => (state.tableData.loading = false));
     };
     // 打开新增弹窗
     const onOpenAdd = () => {
@@ -179,7 +179,7 @@ export default defineComponent({
           getList();
         });
       })
-          .catch(() => { });
+        .catch(() => { });
     };
     /** 重置按钮操作 */
     const resetQuery = (formEl: FormInstance | undefined) => {

src/views/iot/ota-update/update/component/device.vue

@@ -3,20 +3,19 @@
 		<div class="search">
 			<el-form :inline="true" ref="queryRef">
 				<el-form-item label="设备名称：" prop="name">
-					<el-input v-model="params.keyWord" placeholder="请输入产品名称" clearable size="default" style="width: 240px"
-						@keyup.enter.native="getList" />
+					<el-input v-model="params.keyWord" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @submit.prevent />
 				</el-form-item>
 
 				<el-form-item>
 
-					<el-button size="default" type="primary" class="ml10" @click="getList()">
+					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 							<ele-Search />
 						</el-icon>
 						查询
 					</el-button>
 				</el-form-item>
-				
+
 			</el-form>
 		</div>
 		<el-table :data="tableData" style="width: 100%" row-key="id" v-loading="loading">
@@ -51,8 +50,7 @@
 				</template>
 			</el-table-column> -->
 		</el-table>
-		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize"
-			@pagination="getList()" />
+		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
 
 	</el-card>
 </template>
@@ -72,7 +70,7 @@ const props = defineProps({
 const queryRef = ref();
 
 
-const { params, tableData, getList, loading } = useSearch<any[]>(api.device.getList, 'fireware', {devOtaFirewareId: props.detail.id});
+const { params, tableData, getList, loading } = useSearch<any[]>(api.device.getList, 'fireware', { devOtaFirewareId: props.detail.id });
 
 getList();
 

src/views/iot/ota-update/update/index.vue

@@ -10,10 +10,10 @@
 							clearable
 							size="default"
 							style="width: 240px;"
-							@keyup.enter.native="getList" />
+							@keyup.enter.native="getList(1)" />
 					</el-form-item>
 					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="getList">
+						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
 							<el-icon>
 								<ele-Search />
 							</el-icon>
@@ -64,9 +64,9 @@
 				</el-table-column>
 			</el-table>
 			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="getList" />
-			<EditConfig ref="editRef" @getList="getList" />
+			<EditConfig ref="editRef" @getList="getList(1)" />
     
-      <CheckConfig ref="checkRef" @getList="getList" />
+      <CheckConfig ref="checkRef" @getList="getList(1)" />
 		</el-card>
 	</div>
 </template>
@@ -136,7 +136,8 @@ export default defineComponent({
     const initTableData = () => {
       manageList();
     };
-    const getList = () => {
+    const getList = (pageNum: number) => {
+      typeof pageNum === 'number' && (state.tableData.param.pageNum = pageNum)
       state.tableData.loading = true;
       api.manage
         .getList(state.tableData.param)

src/views/iot/rule-engine/index.vue

@@ -40,7 +40,7 @@
 			</el-table-column>
 		</el-table>
 		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-		<EditForm ref="editFormRef" @getList="getList()" :types="0"></EditForm>
+		<EditForm ref="editFormRef" @getList="getList(1)" :types="0"></EditForm>
 	</el-card>
 </template>
 

src/views/iot/rule-engine/send.vue

@@ -40,7 +40,7 @@
       </el-table-column>
     </el-table>
     <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-    <EditForm ref="editFormRef" @getList="getList()" :types="1"></EditForm>
+    <EditForm ref="editFormRef" @getList="getList(1)" :types="1"></EditForm>
   </el-card>
 </template>
 

src/views/iot/scene/list/index.vue

@@ -3,8 +3,7 @@
 		<div class="search">
 			<el-form :inline="true" ref="queryRef">
 				<el-form-item label="场景名称：" prop="name">
-					<el-input v-model="params.keyWord" placeholder="请输入产品名称" clearable size="default" style="width: 240px"
-						@keyup.enter.native="getList" />
+					<el-input v-model="params.keyWord" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @keyup.enter.native="getList(1)" />
 				</el-form-item>
 				<el-form-item label="状态" prop="status" style="width: 200px;">
 					<el-select v-model="params.status" placeholder="发布状态" clearable size="default" style="width: 240px">
@@ -14,13 +13,11 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="执行时间" prop="dateRange">
-					<el-date-picker v-model="params.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD"
-						type="daterange" range-separator="-" start-placeholder="开始日期"
-						end-placeholder="结束日期"></el-date-picker>
+					<el-date-picker v-model="params.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 				</el-form-item>
 				<el-form-item>
 
-					<el-button size="default" type="primary" class="ml10" @click="getList()">
+					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 							<ele-Search />
 						</el-icon>
@@ -43,14 +40,12 @@
 			<el-table-column prop="createdAt" label="执行时间" min-width="100" align="center"></el-table-column>
 			<el-table-column label="操作" width="200" align="center">
 				<template #default="scope">
-					<el-button size="small" text type="primary" v-if="!scope.row.folderName"
-						@click="view(scope.row)">详情</el-button>
+					<el-button size="small" text type="primary" v-if="!scope.row.folderName" @click="view(scope.row)">详情</el-button>
 					<el-button size="small" text type="info" v-auth="'del'" @click="del(scope.row)">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
-		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize"
-			@pagination="getList()" />
+		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
 	</el-card>
 </template>
 

src/views/iot/scene/manage/index.vue

@@ -1,10 +1,9 @@
 <template>
 	<el-card shadow="hover">
 		<div class="search">
-			<el-form :inline="true" ref="queryRef">
+			<el-form :inline="true" ref="queryRef" @keyup.enter="getList(1)">
 				<el-form-item label="场景名称：" prop="keyWord">
-					<el-input v-model="params.keyWord" placeholder="请输入场景名称" clearable size="default" style="width: 240px"
-						@keyup.enter.native="getList" />
+					<el-input v-model="params.keyWord" placeholder="请输入场景名称" clearable size="default" style="width: 240px" />
 				</el-form-item>
 
 				<el-form-item label="触发方式" prop="sceneType" style="width: 200px;">
@@ -25,7 +24,7 @@
 
 				<el-form-item>
 
-					<el-button size="default" type="primary" class="ml10" @click="getList()">
+					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 							<ele-Search />
 						</el-icon>
@@ -54,31 +53,27 @@
 				</template>
 			</el-table-column>
 
-			<el-table-column prop="status" label="状态" align="center"  v-col="'status'">
+			<el-table-column prop="status" label="状态" align="center" v-col="'status'">
 				<template #default="scope">
 					<el-tag size="small" type="success" v-if="scope.row.status == 1">启用</el-tag>
 					<el-tag size="small" type="info" v-if="scope.row.status == 0">未启用</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column prop="description" label="描述" show-overflow-tooltip  v-col="'description'"></el-table-column>
+			<el-table-column prop="description" label="描述" show-overflow-tooltip v-col="'description'"></el-table-column>
 
 			<el-table-column prop="createdAt" label="创建时间" align="center" v-col="'createdAt'"></el-table-column>
 			<el-table-column label="操作" width="200" align="center">
 				<template #default="scope">
-					<el-button size="small" text type="primary" v-if="!scope.row.folderName"
-						@click="toDetail(scope.row.id)">详情</el-button>
+					<el-button size="small" text type="primary" v-if="!scope.row.folderName" @click="toDetail(scope.row.id)">详情</el-button>
 					<el-button size="small" text type="warning" v-auth="'edit'" @click="addOrEdit(scope.row)">编辑</el-button>
-					<el-button size="small" text type="success" @click="onActionStatus(scope.row)"
-						v-if="scope.row.status == 0" v-auth="'startOrStop'">启用</el-button>
-					<el-button size="small" text type="primary" @click="onActionStatus(scope.row)"
-						v-if="scope.row.status > 0" v-auth="'startOrStop'">停用</el-button>
+					<el-button size="small" text type="success" @click="onActionStatus(scope.row)" v-if="scope.row.status == 0" v-auth="'startOrStop'">启用</el-button>
+					<el-button size="small" text type="primary" @click="onActionStatus(scope.row)" v-if="scope.row.status > 0" v-auth="'startOrStop'">停用</el-button>
 					<el-button size="small" text type="info" v-auth="'del'" @click="del(scope.row)">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
-		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize"
-			@pagination="getList()" />
-		<EditForm ref="editFormRef" @getList="getList()"></EditForm>
+		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
+		<EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
 	</el-card>
 </template>
 

src/views/system/api/index.vue

@@ -72,8 +72,8 @@
 			</el-table>
 			<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
 		</el-card>
-		<EditForm ref="editFormRef" @getList="getList()"></EditForm>
-		<bindVue ref="bindRef" @getList="getList()"></bindVue>
+		<EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
+		<bindVue ref="bindRef" @getList="getList(1)"></bindVue>
 	</div>
 </template>
 

src/views/system/application/index.vue

@@ -2,18 +2,11 @@
 	<el-card shadow="hover">
 		<div class="search">
 			<el-form :inline="true" ref="queryRef">
-				<el-form-item label="应用名称：" prop="name">
-					<el-input
-						v-model="params.keyWord"
-						placeholder="请输入应用名称"
-						clearable
-						size="default"
-						style="width: 240px"
-						@keyup.enter.native="getList"
-					/>
+				<el-form-item label="应用名称：" prop="name" @submit.prevent>
+					<el-input v-model="params.keyWord" placeholder="请输入应用名称" clearable size="default" style="width: 240px" @keyup.enter.native="getList(1)" />
 				</el-form-item>
 				<el-form-item>
-					<el-button size="default" type="primary" class="ml10" @click="getList()">
+					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 							<ele-Search />
 						</el-icon>
@@ -35,30 +28,28 @@
 			</el-form>
 		</div>
 		<el-table :data="tableData" style="width: 100%" row-key="id" v-loading="loading">
-			<el-table-column prop="id" label="ID" width="60" show-overflow-tooltip  v-col="'id'"></el-table-column>
+			<el-table-column prop="id" label="ID" width="60" show-overflow-tooltip v-col="'id'"></el-table-column>
 			<el-table-column prop="appId" label="应用标识" show-overflow-tooltip v-col="'appId'"></el-table-column>
-			<el-table-column prop="name" label="应用名称"  show-overflow-tooltip v-col="'name'"></el-table-column>
-			<el-table-column prop="desc" label="描述"  show-overflow-tooltip  v-col="'desc'"></el-table-column>
-			<el-table-column prop="status" label="应用状态"  width="80" align="center" v-col="'status'">
+			<el-table-column prop="name" label="应用名称" show-overflow-tooltip v-col="'name'"></el-table-column>
+			<el-table-column prop="desc" label="描述" show-overflow-tooltip v-col="'desc'"></el-table-column>
+			<el-table-column prop="status" label="应用状态" width="80" align="center" v-col="'status'">
 				<template #default="scope">
 					<el-tag size="small" type="success" v-if="scope.row.status == 1">启用</el-tag>
 					<el-tag size="small" type="info" v-if="scope.row.status == 0">未启用</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column prop="createdAt" label="创建时间" width="160" align="center"  v-col="'createdAt'"></el-table-column>
+			<el-table-column prop="createdAt" label="创建时间" width="160" align="center" v-col="'createdAt'"></el-table-column>
 			<el-table-column label="操作" width="200" align="center">
 				<template #default="scope">
-					<el-button size="small" text type="success" @click="onActionStatus(scope.row)"
-						v-if="scope.row.status == 0" v-auth="'startOrStop'">启用</el-button>
-					<el-button size="small" text type="primary" @click="onActionStatus(scope.row)" v-if="scope.row.status > 0"
-						v-auth="'startOrStop'">停用</el-button>
+					<el-button size="small" text type="success" @click="onActionStatus(scope.row)" v-if="scope.row.status == 0" v-auth="'startOrStop'">启用</el-button>
+					<el-button size="small" text type="primary" @click="onActionStatus(scope.row)" v-if="scope.row.status > 0" v-auth="'startOrStop'">停用</el-button>
 					<el-button size="small" text type="warning" v-auth="'edit'" @click="addOrEdit(scope.row)">编辑</el-button>
 					<el-button size="small" text type="danger" v-auth="'del'" @click="del(scope.row)">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
 		<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-		<EditForm ref="editFormRef"  :deptData="deptData" @getList="getList()"></EditForm>
+		<EditForm ref="editFormRef" :deptData="deptData" @getList="getList(1)"></EditForm>
 	</el-card>
 </template>
   
@@ -82,19 +73,19 @@ const resetQuery = (formEl: any) => {
 	getList();
 };
 const initTableData = () => {
-	user.dept.getList({status:1}).then((res: any) => {
+	user.dept.getList({ status: 1 }).then((res: any) => {
 		deptData.value = res;
 	});
 };
 initTableData();
 const onActionStatus = (item: any) => {
 	if (item.status == 0) {
-		api.status({ id: item.id,status:1 }).then((res: any) => {
+		api.status({ id: item.id, status: 1 }).then((res: any) => {
 			getList();
 			ElMessage.success(res.message || '操作成功');
 		});
 	} else {
-		api.status({ id: item.id,status:0 }).then((res: any) => {
+		api.status({ id: item.id, status: 0 }).then((res: any) => {
 			getList();
 			ElMessage.success(res.message || '操作成功');
 		});

src/views/system/monitor/notice/index.vue

@@ -21,7 +21,7 @@
 			</el-table>
 			<pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
 		</el-card>
-		<EditForm ref="editFormRef" @getList="getList()"></EditForm>
+		<EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
 	</div>
 </template>
 

src/views/system/monitor/plugin/index.vue

@@ -61,7 +61,7 @@
 
 	    <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
 		</el-card>
-		<EditForm ref="editFormRef" @getList="getList()"></EditForm>
+		<EditForm ref="editFormRef" @getList="getList(1)"></EditForm>
 	</div>
 </template>