jiangbiao 2 lat temu
rodzic
commit
9e4943efdd

+ 1 - 1
master/src/main/java/com/ruoyi/project/apply/controller/TApplyLockController.java

@@ -63,7 +63,7 @@ public class TApplyLockController extends BaseController {
                 count = 0;
                 result.add(item);
                 item = new ArrayList<>();
-            } else if ((list.size() % 35)==(list.size()-i)) {
+            } else if ((list.size() % 35) == (list.size() - i)) {
                 result.add(list.subList(i, list.size()));
                 break;
             }

+ 3 - 0
master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -297,6 +297,9 @@ public class CommonController extends BaseController
         }else if( type.equals("thicknessData") ) {
             downloadname = "定点测厚数据导入模板.xlsx";
             url = "static/template/sems/thicknessData.xlsx";
+        }else if( type.equals("applyLock") ) {
+            downloadname = "锁开锁关导入模板.xlsx";
+            url = "static/template/apply/applyLock.xlsx";
         }
         InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(url);
 

+ 1 - 1
master/src/main/resources/mybatis/apply/TApplyLockMapper.xml

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTApplyLockVo"/>
         <where>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-            <if test="lockPost != null  and lockPost != ''"> and lock_post = #{lockPost}</if>
+            <if test="lockPost != null  and lockPost != ''"> and lock_post like concat(concat('%',#{lockPost}),'%')</if>
             <if test="pidNo != null  and pidNo != ''"> and pid_no = #{pidNo}</if>
             <if test="lockCode != null  and lockCode != ''"> and lock_code = #{lockCode}</if>
             <if test="medium != null  and medium != ''"> and medium = #{medium}</if>

BIN
master/src/main/resources/static/template/apply/applyLock.xlsx


+ 498 - 0
ui/src/views/apply/lock/index.vue

@@ -0,0 +1,498 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="单元" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单元"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编号" prop="lockCode">
+        <el-input
+          v-model="queryParams.lockCode"
+          placeholder="请输入编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="介质" prop="medium">
+        <el-input
+          v-model="queryParams.medium"
+          placeholder="请输入介质"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="位置描述" prop="position">
+        <el-input
+          v-model="queryParams.position"
+          placeholder="请输入位置描述"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['apply:lock:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['apply:lock:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['apply:lock:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['apply:lock:edit']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['apply:lock:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="lockList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="岗位" align="center" prop="lockPost" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="P&ID图号" align="center" prop="pidNo" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="130px" :formatter="statusFormat"/>
+      <el-table-column label="编号" align="center" prop="lockCode" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="介质" align="center" prop="medium" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="位置描述" align="center" prop="position" :show-overflow-tooltip="true" width="200px"/>
+      <el-table-column label="锁开锁关原因" align="center" prop="reason" :show-overflow-tooltip="true" width="200px"/>
+      <el-table-column label="安全阀/工艺" align="center" prop="technology" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="风险等级" align="center" prop="riskLevel" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="尺寸" align="center" prop="lockSize" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="阀门状态" align="center" prop="valveStatus" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="130px"/>
+      <el-table-column label="操作" align="center" fixed="right" width="130" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['apply:lock:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['apply:lock:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改破锁管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="单元" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单元" />
+        </el-form-item>
+        <el-form-item label="岗位" prop="lockPost">
+          <el-input v-model="form.lockPost" placeholder="请输入岗位" />
+        </el-form-item>
+        <el-form-item label="P&ID图号" prop="pidNo">
+          <el-input v-model="form.pidNo" placeholder="请输入P&ID图号" />
+        </el-form-item>
+        <el-form-item label="编号" prop="lockCode">
+          <el-input v-model="form.lockCode" placeholder="请输入编号" />
+        </el-form-item>
+        <el-form-item label="介质" prop="medium">
+          <el-input v-model="form.medium" placeholder="请输入介质" />
+        </el-form-item>
+        <el-form-item label="位置描述" prop="position">
+          <el-input v-model="form.position" placeholder="请输入位置描述" />
+        </el-form-item>
+        <el-form-item label="锁开锁关原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入锁开锁关原因" />
+        </el-form-item>
+        <el-form-item label="安全阀/工艺" prop="technology">
+          <el-input v-model="form.technology" placeholder="请输入安全阀/工艺" />
+        </el-form-item>
+        <el-form-item label="风险等级" prop="riskLevel">
+          <el-input v-model="form.riskLevel" placeholder="请输入风险等级" />
+        </el-form-item>
+        <el-form-item label="尺寸" prop="lockSize">
+          <el-input v-model="form.lockSize" placeholder="请输入尺寸" />
+        </el-form-item>
+        <el-form-item label="阀门状态" prop="valveStatus">
+          <el-input v-model="form.valveStatus" placeholder="请输入阀门状态" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="归属部门" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处,或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+          <input name="type" :value="upload.type" hidden />
+        </form>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLock, getLock, delLock, addLock, updateLock, exportLock, importTemplate} from "@/api/apply/lock";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Lock",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      statusList: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 破锁管理表格数据
+      lockList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+      // 用户导入参数
+      upload: {
+        //下载模板请求地址
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        //下载模板类型
+        type: "applyLock",
+        // 是否显示弹出层(用户导入)
+        open: false,
+        // 弹出层标题(用户导入)
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/apply/lock/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        unit: null,
+        lockPost: null,
+        pidNo: null,
+        lockCode: null,
+        medium: null,
+        position: null,
+        reason: null,
+        technology: null,
+        riskLevel: null,
+        lockSize: null,
+        remarks: null,
+        status: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        valveStatus: null,
+        deptId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight -250
+    })
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("lock_status").then(response => {
+      this.statusList = response.data;
+    });
+  },
+  methods: {
+    // 字典翻译
+    statusFormat(row, column) {
+      let s = this.selectDictLabel(this.statusList, row.status);
+      let type = '';
+      if (row.status === 0) {
+        type = 'success';
+      }else if (row.status === 1) {
+        type = 'danger';
+      }else if (row.status === 1) {
+        type = 'info';
+      }
+      return <el-tag type={type}>{s}</el-tag>;
+    },
+    /** 查询破锁管理列表 */
+    getList() {
+      this.loading = true;
+      listLock(this.queryParams).then(response => {
+        this.lockList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        unit: null,
+        lockPost: null,
+        pidNo: null,
+        lockCode: null,
+        medium: null,
+        position: null,
+        reason: null,
+        technology: null,
+        riskLevel: null,
+        lockSize: null,
+        remarks: null,
+        status: 0,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        valveStatus: null,
+        deptId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加破锁管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLock(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改破锁管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateLock(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLock(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delLock(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有破锁管理数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportLock(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.$refs['downloadFileForm'].submit()
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      if (response.data[0] != null) {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据') + "," + this.$t('第') + response.data + this.$t('行数据出现错误导入失败') + "。", this.$t('导入结果'), {dangerouslyUseHTMLString: true});
+      } else {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据'), this.$t('导入结果'), {dangerouslyUseHTMLString: true});
+      }
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>

+ 4 - 5
ui/src/views/apply/lock/lock-eu.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" :style="`height:${height}px`" id="parent"  >
+  <div class="app-container" :style="`height:${height}px`" id="parent">
     <vue-draggable-resizable v-drag
                              w="auto" h="auto" :draggable="dragMove" style="background-color:#fff;padding: 0px 20px">
       <div class="zoom" @wheel.prevent="handleTableWheel($event)" ref="branch">
@@ -41,7 +41,7 @@
 
 <script>
 import VueDraggableResizable from 'vue-draggable-resizable'
-import {listAllLock, listLock} from "@/api/apply/lock";
+import {listAllLock} from "@/api/apply/lock";
 
 export default {
   components: {VueDraggableResizable},
@@ -85,7 +85,7 @@ export default {
       drawer: false,
       data: [],
       index: null,
-      loading:true,
+      loading: true,
       visible: false,
       height: document.body.clientHeight - 155,
       colspan: 35,
@@ -138,8 +138,7 @@ export default {
       this.loading = true;
       listAllLock(this.queryParams).then(response => {
         this.data = response.data;
-        console.log(this.data)
-        this.loading=false;
+        this.loading = false;
       });
     },
     handleClick() {