From 948b700ff39a9d11dc5e7870d605737857c2ceb8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 14 三月 2024 09:39:53 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/basicInfo/SelectPicture.vue | 3 ++-
web/src/views/modules/basicInfo/XhProductModel.vue | 1 +
web/src/views/modules/sysPictureBase/SysPictureBase.vue | 1 +
modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java | 7 +++----
web/src/views/modules/taskReliability/ModelRbd.vue | 8 ++++----
web/src/views/modules/basicInfo/SelectTyModel.vue | 1 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 6 ++----
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java | 8 +++-----
8 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
index 8be74ca..84387dc 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java
@@ -53,18 +53,16 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "nodeType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "reliabDistrib", value = "鍙潬鎬у垎甯�", dataType = Constant.QT.STRING, format = "reliab_distrib^EQ"),
@ApiImplicitParam(name = "repairDistrib", value = "缁翠慨鍒嗗竷", dataType = Constant.QT.STRING, format = "repair_distrib^EQ"),
@ApiImplicitParam(name = "pid", value = "涓婄骇鑺傜偣", dataType = Constant.QT.STRING)
})
- public PageResult<TyProductModel> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ public Result<List<TyProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- return PageResult.ok(tyProductModelService.page(queryFilter));
+ return Result.ok(tyProductModelService.page(queryFilter));
}
@GetMapping("tree")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index fde09e8..a8ad858 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -54,16 +54,14 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
@ApiImplicitParam(name = "nodeType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "node_type^EQ"),
@ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
})
- public PageResult<XhProductModel> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- return PageResult.ok(xhProductModelService.page(queryFilter));
+ public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ return Result.ok(xhProductModelService.page(queryFilter));
}
@GetMapping("tree")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java
index 5d3d060..20da472 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/sysPictureBase/controller/SysPictureBaseController.java
@@ -37,6 +37,7 @@
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*;
+import java.util.List;
/**
@@ -60,14 +61,12 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "contentType", value = "妫�绱㈠叧閿瓧", dataType = Constant.QT.STRING, format = "CONTENT_TYPE^LK"), @ApiImplicitParam(name = "systemMark", value = "绯荤粺鏍囪瘑", dataType = Constant.QT.STRING, format = "SYSTEM_MARK^LK")})
- public PageResult<SysPictureBase> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
+ public Result<List<SysPictureBase>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
- return PageResult.ok(sysPictureBaseService.page(queryFilter));
+ return Result.ok(sysPictureBaseService.page(queryFilter));
}
@GetMapping("{id}")
diff --git a/web/src/views/modules/basicInfo/SelectPicture.vue b/web/src/views/modules/basicInfo/SelectPicture.vue
index c608b6b..29203ab 100644
--- a/web/src/views/modules/basicInfo/SelectPicture.vue
+++ b/web/src/views/modules/basicInfo/SelectPicture.vue
@@ -2,7 +2,8 @@
<zt-dialog ref="dialog" column="2" title="閫夋嫨鍥剧墖" append-to-body :editAble="false" :hasConfirm="false">
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sysPictureBase-sysPictureBase}">
- <zt-table-wraper query-url="/sysPictureBase/SysPictureBase/page"
+ <zt-table-wraper query-url="/sysPictureBase/page"
+ :paging='false'
v-slot="{ table }">
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
border
diff --git a/web/src/views/modules/basicInfo/SelectTyModel.vue b/web/src/views/modules/basicInfo/SelectTyModel.vue
index 96f09b6..894e6ae 100644
--- a/web/src/views/modules/basicInfo/SelectTyModel.vue
+++ b/web/src/views/modules/basicInfo/SelectTyModel.vue
@@ -4,6 +4,7 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-tyProductModel-tyProductModel}">
<zt-table-wraper :query-url=url
+ :paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
</el-form>
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 298433d..35a464b 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -10,6 +10,7 @@
<div class="mod-basicInfo-xhProductModel}">
<zt-table-wraper ref="tableObj" query-url="/basicInfo/XhProductModel/page"
delete-url="/basicInfo/XhProductModel/ "
+ :paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase.vue b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
index 5dfca12..03fd11b 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
@@ -2,6 +2,7 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sysPictureBase-sysPictureBase}">
<zt-table-wraper query-url="/sysPictureBase/page" delete-url="/sysPictureBase/"
+ :paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index c2ff638..a73e8eb 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -25,11 +25,11 @@
<el-table-column prop="modelName" label="妯″瀷鍚嶇О"/>
<el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
<el-table-column prop="citedNum" label="琚紩鐢ㄦ暟"/>
- <el-table-column prop="modelState" label="妯″瀷鐘舵��"/>
- <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��"/>
+ <el-table-column prop="modelState" label="妯″瀷鐘舵��" align="center"/>
+ <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>
<el-table-column prop="remark" label="澶囨敞"/>
- <zt-table-column-handle :table="table" edit-perm="taskReliability:update"
- delete-perm="taskReliability::delete" :has-view="false">
+ <zt-table-column-handle :table="table"
+ delete-perm="taskReliability::delete" :has-view="false" width="180px">
<template v-slot="{ row }">
<el-button type="primary" @click="drawRBD(row)">妯″瀷璁捐</el-button>
</template>
--
Gitblit v1.9.1