修改

jinlin

2024-03-14 948b700ff39a9d11dc5e7870d605737857c2ceb8

修改

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/TyProductModelController.java

@@ -53,8 +53,6 @@
    @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 = "nodeType", value = "节点类型", dataType = Constant.QT.STRING),
@@ -62,9 +60,9 @@
        @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")

 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")

 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}")

 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

 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>

 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>

 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>

 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>